yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes build issues

Browse Source
This commit is contained in:
Shannon
2014-04-17 18:52:07 +10:00
parent 8c303893d2
commit 15f4de4ed0
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Tests/Models/PropertyGroupTests.cs
View File

@@ -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",

4
src/Umbraco.Tests/Models/PropertyTypeTests.cs
View File

@@ -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",

8
src/Umbraco.Tests/Models/UmbracoEntityTests.cs
View File

@@ -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);

7
src/Umbraco.Tests/Services/PreValueConverterTests.cs
View File

@@ -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>(() =>
{