Fixes up some more mappings, adds another test to simulate persisting an updated type from the display model - which isn't working so need to fix more.

src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using AutoMapper;
 using Moq;
 using NUnit.Framework;
+using umbraco;
 using umbraco.cms.presentation;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
@@ -177,11 +178,35 @@ namespace Umbraco.Tests.Models.Mapping
             Assert.AreEqual(display.Thumbnail, result.Thumbnail);
             Assert.AreEqual(display.IsContainer, result.IsContainer);
             Assert.AreEqual(display.AllowAsRoot, result.AllowedAsRoot);
+            Assert.AreEqual(display.CreateDate, result.CreateDate);
+            Assert.AreEqual(display.UpdateDate, result.UpdateDate);
             
             //TODO: Now we need to assert all of the more complicated parts
-            Assert.AreEqual(1, result.PropertyGroups.Count);
-            Assert.AreEqual(1, result.PropertyGroups[0].PropertyTypes.Count);
+            Assert.AreEqual(display.Groups.Count(), result.PropertyGroups.Count);
+            for (var i = 0; i < display.Groups.Count(); i++)
+            {
+                Assert.AreEqual(display.Groups.ElementAt(i).Id, result.PropertyGroups.ElementAt(i).Id);
+                Assert.AreEqual(display.Groups.ElementAt(i).Name, result.PropertyGroups.ElementAt(i).Name);
+                var propTypes = display.Groups.ElementAt(i).Properties;
+                Assert.AreEqual(propTypes.Count(), result.PropertyTypes.Count());
+                for (var j = 0; j < propTypes.Count(); j++)
+                {
+                    Assert.AreEqual(propTypes.ElementAt(j).Id, result.PropertyTypes.ElementAt(j).Id);
+                    Assert.AreEqual(propTypes.ElementAt(j).DataTypeId, result.PropertyTypes.ElementAt(j).DataTypeDefinitionId);
+                }
+            }
+
             Assert.AreEqual(display.AllowedTemplates.Count(), result.AllowedTemplates.Count());
+            for (var i = 0; i < display.AllowedTemplates.Count(); i++)
+            {
+                Assert.AreEqual(display.AllowedTemplates.ElementAt(i).Id, result.AllowedTemplates.ElementAt(i).Id);
+            }
+
+            Assert.AreEqual(display.AllowedContentTypes.Count(), result.AllowedContentTypes.Count());
+            for (var i = 0; i < display.AllowedContentTypes.Count(); i++)
+            {
+                Assert.AreEqual(display.AllowedContentTypes.ElementAt(i), result.AllowedContentTypes.ElementAt(i).Id.Value);
+            }
         }
 
         [Test]
@@ -231,13 +256,39 @@ namespace Umbraco.Tests.Models.Mapping
             Assert.AreEqual(contentType.Path, result.Path);
             Assert.AreEqual(contentType.Thumbnail, result.Thumbnail);
             Assert.AreEqual(contentType.IsContainer, result.IsContainer);
-
+            Assert.AreEqual(contentType.CreateDate, result.CreateDate);
+            Assert.AreEqual(contentType.UpdateDate, result.UpdateDate);
             Assert.AreEqual(contentType.DefaultTemplate.Alias, result.DefaultTemplate.Alias);
 
             //TODO: Now we need to assert all of the more complicated parts
-            Assert.AreEqual(2, result.Groups.Count());
-            Assert.AreEqual(2, result.Groups.ElementAt(0).Properties.Count());
-            Assert.AreEqual(2, result.Groups.ElementAt(1).Properties.Count());
+
+            Assert.AreEqual(contentType.PropertyGroups.Count(), result.Groups.Count());
+            for (var i = 0; i < contentType.PropertyGroups.Count(); i++)
+            {
+                Assert.AreEqual(contentType.PropertyGroups.ElementAt(i).Id, result.Groups.ElementAt(i).Id);
+                Assert.AreEqual(contentType.PropertyGroups.ElementAt(i).Name, result.Groups.ElementAt(i).Name);
+                var propTypes = contentType.PropertyGroups.ElementAt(i).PropertyTypes;
+
+                Assert.AreEqual(propTypes.Count(), result.Groups.ElementAt(i).Properties.Count());
+                for (var j = 0; j < propTypes.Count(); j++)
+                {
+                    Assert.AreEqual(propTypes.ElementAt(j).Id, result.Groups.ElementAt(i).Properties.ElementAt(j).Id);
+                    Assert.AreEqual(propTypes.ElementAt(j).DataTypeDefinitionId, result.Groups.ElementAt(i).Properties.ElementAt(j).DataTypeId);
+                }
+            }
+
+            Assert.AreEqual(contentType.AllowedTemplates.Count(), result.AllowedTemplates.Count());
+            for (var i = 0; i < contentType.AllowedTemplates.Count(); i++)
+            {
+                Assert.AreEqual(contentType.AllowedTemplates.ElementAt(i).Id, result.AllowedTemplates.ElementAt(i).Id);
+            }
+
+            Assert.AreEqual(contentType.AllowedContentTypes.Count(), result.AllowedContentTypes.Count());
+            for (var i = 0; i < contentType.AllowedContentTypes.Count(); i++)
+            {
+                Assert.AreEqual(contentType.AllowedContentTypes.ElementAt(i).Id.Value, result.AllowedContentTypes.ElementAt(i));
+            }
+
         }
 
         private ContentTypeDisplay CreateSimpleContentTypeDisplay()
@@ -246,7 +297,22 @@ namespace Umbraco.Tests.Models.Mapping
             {
                 Alias = "test",     
                 AllowAsRoot = true,
-                AllowedTemplates = new List<EntityBasic>(),
+                AllowedTemplates = new List<EntityBasic>
+                {
+                    new EntityBasic
+                    {
+                        Id = 555,
+                        Alias = "template1",
+                        Name = "Template1"
+                    },
+                    new EntityBasic
+                    {
+                        Id = 556,
+                        Alias = "template2",
+                        Name = "Template2"
+                    }
+                },
+                AllowedContentTypes = new [] {666, 667},
                 AvailableCompositeContentTypes = new List<EntityBasic>(),
                 DefaultTemplate = new EntityBasic(){ Alias = "test" },
                 Description = "hello world",