Finish implementation

More tests are needed References #21
Lawo · Apr 28, 2016 · b5c670e · b5c670e
1 parent 9c8b7db
commit b5c670e
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 10 deletions.
diff --git a/Lawo.EmberPlusSharp/Glow/GlowLogInterpreter.cs b/Lawo.EmberPlusSharp/Glow/GlowLogInterpreter.cs
@@ -71,7 +71,10 @@ public void ApplyPayload()
                 using (var dummyWriter = new EmberWriter(Stream.Null))
                 {
                     this.root.Read(emberReader, this.pendingInvocations, this.streamedParameters);
+                    dummyWriter.WriteStartApplicationDefinedType(
+                        GlowGlobal.Root.OuterId, GlowRootElementCollection.InnerNumber);
                     this.root.WriteRequest(dummyWriter, this.streamedParameters);
+                    dummyWriter.WriteEndContainer();
                     this.root.SetComplete();
                     this.root.UpdateRetrievalState(true);
                 }

diff --git a/Lawo.EmberPlusSharp/Model/Consumer.cs b/Lawo.EmberPlusSharp/Model/Consumer.cs
@@ -17,6 +17,7 @@ namespace Lawo.EmberPlusSharp.Model
     using System.Threading.Tasks;
 
     using Ember;
+    using Glow;
     using IO;
     using S101;
 
@@ -466,7 +467,10 @@ private bool WriteRequest(out MemoryStream stream)
             using (stream = new MemoryStream())
             using (var writer = new EmberWriter(stream))
             {
-                return this.root.WriteRequest(writer, this.streamedParameters);
+                writer.WriteStartApplicationDefinedType(GlowGlobal.Root.OuterId, GlowRootElementCollection.InnerNumber);
+                var result = this.root.WriteRequest(writer, this.streamedParameters);
+                writer.WriteEndContainer();
+                return result;
             }
         }
 

diff --git a/Lawo.EmberPlusSharp/Model/NodeBase.cs b/Lawo.EmberPlusSharp/Model/NodeBase.cs
@@ -54,6 +54,11 @@ public ChildrenRetrievalPolicy ChildrenRetrievalPolicy
                     }
 
                     this.SetRetrieveDetailsChangeStatus(() => this.SetValue(ref this.childrenRetrievalPolicy, value));
+
+                    if (this.RetrieveDetailsChangeStatus != RetrieveDetailsChangeStatus.Unchanged)
+                    {
+                        this.HasChanges = true;
+                    }
                 }
             }
         }
@@ -134,9 +139,9 @@ internal void WriteChangesCollection(EmberWriter writer, IInvocationCollection p
         {
             if (this.children.Count == 0)
             {
-                if (this.RetrieveDetails && (this.RetrieveDetailsChangeStatus == RetrieveDetailsChangeStatus.Changed))
+                if (this.RetrieveDetails && (this.RetrieveDetailsChangeStatus != RetrieveDetailsChangeStatus.Unchanged))
                 {
-                    this.WriteCommandCollection(writer, GlowCommandNumber.GetDirectory, RetrievalState.RequestSent);
+                    this.WriteRequest(writer, null);
                 }
             }
             else

diff --git a/Lawo.EmberPlusSharp/Model/Root.cs b/Lawo.EmberPlusSharp/Model/Root.cs
@@ -135,10 +135,7 @@ internal sealed override bool ReadChildrenCore(EmberReader reader)
         [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", Justification = "Method is not public, CA bug?")]
         internal sealed override bool WriteRequest(EmberWriter writer, IStreamedParameterCollection streamedParameters)
         {
-            writer.WriteStartApplicationDefinedType(GlowGlobal.Root.OuterId, GlowRootElementCollection.InnerNumber);
-            var result = this.WriteCommandCollection(writer, streamedParameters);
-            writer.WriteEndContainer();
-            return result;
+            return this.WriteCommandCollection(writer, streamedParameters);
         }
 
         [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", Justification = "Method is not public, CA bug?")]

diff --git a/Lawo.EmberPlusSharpTest/Model/ConsumerTest.cs b/Lawo.EmberPlusSharpTest/Model/ConsumerTest.cs
@@ -455,9 +455,34 @@ public void ChildrenRetrievalPolicyTest()
             AsyncPump.Run(
                 async () =>
                 {
-                    await ChildrenRetrievalPolicyTestCoreAsync(ChildrenRetrievalPolicy.None, "ChildrenRetrievalPolicyLog1.xml");
-                    await ChildrenRetrievalPolicyTestCoreAsync(ChildrenRetrievalPolicy.DirectOnly, "ChildrenRetrievalPolicyLog2.xml");
-                    await ChildrenRetrievalPolicyTestCoreAsync(ChildrenRetrievalPolicy.All, "ChildrenRetrievalPolicyLog3.xml");
+                    await ChildrenRetrievalPolicyTestCoreAsync(
+                        ChildrenRetrievalPolicy.None, "ChildrenRetrievalPolicyLog1.xml");
+                    await ChildrenRetrievalPolicyTestCoreAsync(
+                        ChildrenRetrievalPolicy.DirectOnly, "ChildrenRetrievalPolicyLog2.xml");
+                    await ChildrenRetrievalPolicyTestCoreAsync(
+                        ChildrenRetrievalPolicy.All, "ChildrenRetrievalPolicyLog3.xml");
+                    await TestWithRobot<ModelPayloads>(
+                        async client =>
+                        {
+                            using (var consumer = await Consumer<EmptyNodeRoot>.CreateAsync(
+                                client, Timeout.Infinite, ChildrenRetrievalPolicy.None))
+                            {
+                                var root = consumer.Root;
+                                Assert.IsNull(root.Node);
+                                Assert.AreEqual(ChildrenRetrievalPolicy.None, root.ChildrenRetrievalPolicy);
+                                root.ChildrenRetrievalPolicy = ChildrenRetrievalPolicy.DirectOnly;
+                                await consumer.SendAsync();
+                                Assert.IsNotNull(root.Node);
+                                Assert.AreEqual(ChildrenRetrievalPolicy.None, root.Node.ChildrenRetrievalPolicy);
+                                root.Node.ChildrenRetrievalPolicy = ChildrenRetrievalPolicy.All;
+                                await consumer.SendAsync();
+                            }
+                        },
+                        null,
+                        null,
+                        GlowTypes.Instance,
+                        false,
+                        "ChildrenRetrievalPolicyLog3.xml");
                 });
         }