Fix a bug that prevented streamed changes for read-only parameters

References #8
Lawo · Jan 9, 2016 · f612f07 · f612f07
1 parent 45e2313
commit f612f07
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/Lawo.EmberPlusSharp/Model/IStreamedParameter.cs b/Lawo.EmberPlusSharp/Model/IStreamedParameter.cs
@@ -8,5 +8,6 @@ namespace Lawo.EmberPlusSharp.Model
 {
     internal interface IStreamedParameter : IParameter
     {
+        void SetProviderValue(object value);
     }
 }
diff --git a/Lawo.EmberPlusSharp/Model/ParameterBase.cs b/Lawo.EmberPlusSharp/Model/ParameterBase.cs
@@ -129,6 +129,11 @@ IReadOnlyList<KeyValuePair<string, int>> IParameter.EnumMap
             get { return this.EnumMapCore; }
         }
 
+        void IStreamedParameter.SetProviderValue(object value)
+        {
+            this.SetProviderValue(AssertValueType(value));
+        }
+
         internal ParameterBase() : base(RequestState.Complete)
         {
         }
@@ -266,11 +271,7 @@ internal override RequestState ReadContents(EmberReader reader, ElementType actu
                         this.Description = reader.AssertAndReadContentsAsString();
                         break;
                     case GlowParameterContents.Value.OuterNumber:
-                        if (!this.HasChanges)
-                        {
-                            this.SetValue(ref this.theValue, this.ReadValue(reader, out valueType), "Value");
-                        }
-
+                        this.SetProviderValue(this.ReadValue(reader, out valueType));
                         break;
                     case GlowParameterContents.Minimum.OuterNumber:
                         this.SetMinimum(this.ReadValue(reader, out dummyType));
@@ -360,6 +361,14 @@ internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollec
 
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+        private void SetProviderValue(TValue value)
+        {
+            if (!this.HasChanges)
+            {
+                this.SetValue(ref this.theValue, value, "Value");
+            }
+        }
+
         private List<KeyValuePair<string, int>> ReadEnumMap(EmberReader reader)
         {
             reader.AssertInnerNumber(GlowStringIntegerCollection.InnerNumber);

diff --git a/Lawo.EmberPlusSharp/Model/Root.cs b/Lawo.EmberPlusSharp/Model/Root.cs
@@ -267,7 +267,7 @@ private static void ReadStreamEntry(
 
                     try
                     {
-                        parameter.Value = value;
+                        parameter.SetProviderValue(value);
                     }
                     catch (ArgumentException ex)
                     {

diff --git a/Lawo.EmberPlusSharpTest/Model/ConsumerTest.cs b/Lawo.EmberPlusSharpTest/Model/ConsumerTest.cs
@@ -870,9 +870,9 @@ public void StreamTest()
                 };
 
             AsyncPump.Run(() => TestWithRobot<StreamRoot>(
-                consumer =>
+                async consumer =>
                 {
-                    return Task.FromResult(false);
+                    await Task.Delay(1000);
                 },
                 false,
                 "StreamLog.xml",
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,5 +8,6 @@ namespace Lawo.EmberPlusSharp.Model @@
     {
         internal interface IStreamedParameter : IParameter
         {
+            void SetProviderValue(object value);
         }
     }