From 15f4de4ed0aff717621a4e06013a3d69fbdaab53 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 17 Apr 2014 18:52:07 +1000
Subject: [PATCH] fixes build issues

---
 src/Umbraco.Tests/Models/PropertyGroupTests.cs       | 8 ++++----
 src/Umbraco.Tests/Models/PropertyTypeTests.cs        | 4 ++--
 src/Umbraco.Tests/Models/UmbracoEntityTests.cs       | 8 ++++----
 src/Umbraco.Tests/Services/PreValueConverterTests.cs | 7 ++++---
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Tests/Models/PropertyGroupTests.cs b/src/Umbraco.Tests/Models/PropertyGroupTests.cs
index f3dad6546f..b6b15c83e8 100644
--- a/src/Umbraco.Tests/Models/PropertyGroupTests.cs
+++ b/src/Umbraco.Tests/Models/PropertyGroupTests.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Tests.Models
             var pg = new PropertyGroup(
                 new PropertyTypeCollection(new[]
                 {
-                    new PropertyType(Guid.NewGuid(), DataTypeDatabaseType.Nvarchar)
+                    new PropertyType("TestPropertyEditor", DataTypeDatabaseType.Nvarchar)
                     {
                         Id = 3,
                         Alias = "test",
@@ -31,7 +31,7 @@ namespace Umbraco.Tests.Models
                         ValidationRegExp = "xxxx",
                         DataTypeDatabaseType = DataTypeDatabaseType.Nvarchar
                     },
-                    new PropertyType(Guid.NewGuid(), DataTypeDatabaseType.Nvarchar)
+                    new PropertyType("TestPropertyEditor", DataTypeDatabaseType.Nvarchar)
                     {
                         Id = 4,
                         Alias = "test2",
@@ -95,7 +95,7 @@ namespace Umbraco.Tests.Models
             var pg = new PropertyGroup(
                 new PropertyTypeCollection(new[]
                 {
-                    new PropertyType(Guid.NewGuid(), DataTypeDatabaseType.Nvarchar)
+                    new PropertyType("TestPropertyEditor", DataTypeDatabaseType.Nvarchar)
                     {
                         Id = 3,
                         Alias = "test",
@@ -112,7 +112,7 @@ namespace Umbraco.Tests.Models
                         ValidationRegExp = "xxxx",
                         DataTypeDatabaseType = DataTypeDatabaseType.Nvarchar
                     },
-                    new PropertyType(Guid.NewGuid(), DataTypeDatabaseType.Nvarchar)
+                    new PropertyType("TestPropertyEditor2", DataTypeDatabaseType.Nvarchar)
                     {
                         Id = 4,
                         Alias = "test2",
diff --git a/src/Umbraco.Tests/Models/PropertyTypeTests.cs b/src/Umbraco.Tests/Models/PropertyTypeTests.cs
index 6acb9aca7e..e051791faf 100644
--- a/src/Umbraco.Tests/Models/PropertyTypeTests.cs
+++ b/src/Umbraco.Tests/Models/PropertyTypeTests.cs
@@ -11,7 +11,7 @@ namespace Umbraco.Tests.Models
         [Test]
         public void Can_Deep_Clone()
         {
-            var pt = new PropertyType(Guid.NewGuid(), DataTypeDatabaseType.Nvarchar)
+            var pt = new PropertyType("TestPropertyEditor", DataTypeDatabaseType.Nvarchar)
             {
                 Id = 3,
                 Alias = "test",
@@ -61,7 +61,7 @@ namespace Umbraco.Tests.Models
         {
             var ss = new SerializationService(new JsonNetSerializer());
 
-            var pt = new PropertyType(Guid.NewGuid(), DataTypeDatabaseType.Nvarchar)
+            var pt = new PropertyType("TestPropertyEditor", DataTypeDatabaseType.Nvarchar)
             {
                 Id = 3,
                 Alias = "test",
diff --git a/src/Umbraco.Tests/Models/UmbracoEntityTests.cs b/src/Umbraco.Tests/Models/UmbracoEntityTests.cs
index 813594b54d..ac70364e67 100644
--- a/src/Umbraco.Tests/Models/UmbracoEntityTests.cs
+++ b/src/Umbraco.Tests/Models/UmbracoEntityTests.cs
@@ -50,12 +50,12 @@ namespace Umbraco.Tests.Models
             item.UmbracoProperties.Add(new UmbracoEntity.UmbracoProperty()
             {
                 Value = "test",
-                DataTypeControlId = Guid.NewGuid()
+                PropertyEditorAlias = "TestPropertyEditor"
             });
             item.UmbracoProperties.Add(new UmbracoEntity.UmbracoProperty()
             {
                 Value = "test2",
-                DataTypeControlId = Guid.NewGuid()
+                PropertyEditorAlias = "TestPropertyEditor2"
             });
 
             var clone = (UmbracoEntity)item.DeepClone();
@@ -128,12 +128,12 @@ namespace Umbraco.Tests.Models
             item.UmbracoProperties.Add(new UmbracoEntity.UmbracoProperty()
             {
                 Value = "test",
-                DataTypeControlId = Guid.NewGuid()
+                PropertyEditorAlias = "TestPropertyEditor"
             });
             item.UmbracoProperties.Add(new UmbracoEntity.UmbracoProperty()
             {
                 Value = "test2",
-                DataTypeControlId = Guid.NewGuid()
+                PropertyEditorAlias = "TestPropertyEditor2"
             });
 
             var result = ss.ToStream(item);
diff --git a/src/Umbraco.Tests/Services/PreValueConverterTests.cs b/src/Umbraco.Tests/Services/PreValueConverterTests.cs
index 63149a28fe..b4eb34ee9f 100644
--- a/src/Umbraco.Tests/Services/PreValueConverterTests.cs
+++ b/src/Umbraco.Tests/Services/PreValueConverterTests.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Services;
 
 namespace Umbraco.Tests.Services
@@ -21,7 +22,7 @@ namespace Umbraco.Tests.Services
                     new Tuple<PreValue, string, int>(new PreValue(13, "value4"), "key4", 1)
                 };
 
-            var result = DataTypeService.PreValueConverter.ConvertToPreValuesCollection(list);
+            var result = DataTypeDefinitionRepository.PreValueConverter.ConvertToPreValuesCollection(list);
 
             Assert.Throws<InvalidOperationException>(() =>
                 {
@@ -47,7 +48,7 @@ namespace Umbraco.Tests.Services
                     new Tuple<PreValue, string, int>(new PreValue(13, "value4"), "", 1)
                 };
 
-            var result = DataTypeService.PreValueConverter.ConvertToPreValuesCollection(list);
+            var result = DataTypeDefinitionRepository.PreValueConverter.ConvertToPreValuesCollection(list);
 
             Assert.Throws<InvalidOperationException>(() =>
                 {
@@ -73,7 +74,7 @@ namespace Umbraco.Tests.Services
                     new Tuple<PreValue, string, int>(new PreValue(13, "value4"), "key4", 1)
                 };
 
-            var result = DataTypeService.PreValueConverter.ConvertToPreValuesCollection(list);
+            var result = DataTypeDefinitionRepository.PreValueConverter.ConvertToPreValuesCollection(list);
 
             Assert.Throws<InvalidOperationException>(() =>
                 {