Merge branch 'release/1.0.2' into production

Author: craigfowler

CSF.Zpt/Rendering/RenderingContext.cs

@@ -195,7 +195,7 @@ public virtual void CopyTo(IModelValueContainer container)
 
       foreach(var key in metalDefinitions.Keys)
       {
-        container.MetalModel.AddLocal(key, talDefinitions[key]);
+        container.MetalModel.AddLocal(key, metalDefinitions[key]);
       }
     }
 

Tests/Test.CSF.Zpt/Rendering/RenderingContextTests.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using CSF.Zpt.Rendering;
+using Moq;
+using NUnit.Framework;
+
+namespace Test.CSF.Zpt.Rendering
+{
+  [TestFixture]
+  public class RenderingContextTests
+  {
+    [Test]
+    public void CopyTo_copies_both_TAL_and_METAL_contexts()
+    {
+      // Arrange
+      var talDefinitions = new Dictionary<string,object> {
+        { "one", 1 },
+        { "two", 2 },
+        { "three", 3 },
+      };
+      var metalDefinitions = new Dictionary<string,object> {
+        { "metal-one", 1 },
+        { "metal-two", 2 },
+        { "metal-three", 3 },
+      };
+      var sut = GetSut(metalDefinitions, talDefinitions);
+      var container = GetContainer();
+
+      // Act
+      sut.CopyTo(container);
+
+      // Assert
+      foreach(var def in talDefinitions)
+      {
+        Mock.Get(container.TalModel).Verify(x => x.AddLocal(def.Key, def.Value),
+                                            Times.Once(),
+                                            $"Definition {def.Key} has been added to the receiving TAL model");
+      }
+
+      foreach(var def in metalDefinitions)
+      {
+        Mock.Get(container.MetalModel).Verify(x => x.AddLocal(def.Key, def.Value),
+                                              Times.Once(),
+                                              $"Definition {def.Key} has been added to the receiving METAL model");
+      }
+    }
+
+    IModel GetModel(IDictionary<string,object> defs)
+    {
+      var model = new Mock<IModel>();
+      model
+        .Setup(x => x.GetAllDefinitions())
+        .Returns(defs);
+      return model.Object;
+    }
+
+    IRenderingContext GetSut(IDictionary<string,object> metalDefs,
+                             IDictionary<string,object> talDefs)
+    {
+      var talModel = GetModel(talDefs);
+      var metalModel = GetModel(metalDefs);
+      return new RenderingContext(metalModel, talModel, Mock.Of<IZptElement>(), Mock.Of<IRenderingSettings>());
+    }
+
+    IModelValueContainer GetContainer()
+    {
+      var talReceiver = Mock.Of<IModelValueStore>();
+      var metalReceiver = Mock.Of<IModelValueStore>();
+      return Mock.Of<IModelValueContainer>(x => x.TalModel == talReceiver && x.MetalModel == metalReceiver);
+    }
+  }
+}

Tests/Test.CSF.Zpt/Test.CSF.Zpt.csproj

@@ -106,6 +106,7 @@
     <Compile Include="Metal\TestMacroExtensionSubstitutor.cs" />
     <Compile Include="SourceAnnotation\TestSourceAnnotator.cs" />
     <Compile Include="Metal\MetalMacroContainerTests.cs" />
+    <Compile Include="Rendering\RenderingContextTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\CSF.Zpt\CSF.Zpt.csproj">

version.ini

@@ -1,2 +1,2 @@
-semantic_version = 1.0.1
-build_number = 4
+semantic_version = 1.0.2
+build_number = 1