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

Merge branch origin/dev-v7 into dev-v7-deploy

Browse Source
This commit is contained in:
Stephan
2016-08-18 12:38:38 +02:00
parent 01990394dd f658613fad
commit acae05d287
665 changed files with 22645 additions and 17351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Tests/Models/ContentTests.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Linq;
@@ -382,7 +383,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(content);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
/*[Test]

7
src/Umbraco.Tests/Models/ContentTypeTests.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using System.Linq;
using NUnit.Framework;
using Umbraco.Core;
@@ -285,7 +286,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(contentType);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
[Test]
@@ -390,7 +391,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(contentType);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
[Test]
@@ -498,7 +499,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(contentType);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
}
}

3
src/Umbraco.Tests/Models/DataTypeDefinitionTests.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using NUnit.Framework;
using Umbraco.Core.Models;
using Umbraco.Core.Serialization;
@@ -75,7 +76,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(dtd);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
}

3
src/Umbraco.Tests/Models/DictionaryItemTests.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using System.Linq;
using NUnit.Framework;
using Umbraco.Core.Models;
@@ -130,7 +131,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(item);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
}
}

3
src/Umbraco.Tests/Models/DictionaryTranslationTests.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using System.Linq;
using NUnit.Framework;
using Umbraco.Core.Models;
@@ -74,7 +75,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(item);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
}
}

3
src/Umbraco.Tests/Models/LanguageTests.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using NUnit.Framework;
using Umbraco.Core.Models;
using Umbraco.Core.Serialization;
@@ -56,7 +57,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(item);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
}
}

8
src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -212,7 +213,12 @@ namespace Umbraco.Tests.Models.Mapping
Assert.AreEqual(p.Alias, pDto.Alias);
Assert.AreEqual(p.Id, pDto.Id);
Assert.IsTrue(p.Value == null ? pDto.Value == string.Empty : pDto.Value == p.Value);
if (p.Value == null)
Assert.AreEqual(pDto.Value, string.Empty);
else if (p.Value is decimal)
Assert.AreEqual(pDto.Value, ((decimal) p.Value).ToString(NumberFormatInfo.InvariantInfo));
else
Assert.AreEqual(pDto.Value, p.Value.ToString());
}
private void AssertProperty<TPersisted>(ContentItemBasic<ContentPropertyDto, TPersisted> result, Property p)

3
src/Umbraco.Tests/Models/MemberGroupTests.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using NUnit.Framework;
using Umbraco.Core.Models;
using Umbraco.Core.Serialization;
@@ -66,7 +67,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(group);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
}

3
src/Umbraco.Tests/Models/MemberTests.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using System.Linq;
using NUnit.Framework;
using Umbraco.Core.Models;
@@ -150,7 +151,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(member);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
}
}

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

@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using NUnit.Framework;
using Umbraco.Core.Models;
using Umbraco.Core.Serialization;
@@ -136,7 +137,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(pg);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
}
}

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

@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using NUnit.Framework;
using Umbraco.Core.Models;
using Umbraco.Core.Serialization;
@@ -80,7 +81,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(pt);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
}

3
src/Umbraco.Tests/Models/RelationTests.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using NUnit.Framework;
using Umbraco.Core.Models;
using Umbraco.Core.Serialization;
@@ -65,7 +66,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(item);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
}
}

3
src/Umbraco.Tests/Models/RelationTypeTests.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using NUnit.Framework;
using Umbraco.Core.Models;
using Umbraco.Core.Serialization;
@@ -59,7 +60,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(item);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
}
}

15
src/Umbraco.Tests/Models/StylesheetTests.cs
View File

@@ -1,14 +1,22 @@
using System;
using System.Diagnostics;
using System.Linq;
using NUnit.Framework;
using Umbraco.Core.Models;
using Umbraco.Core.Serialization;
using Umbraco.Tests.TestHelpers;
namespace Umbraco.Tests.Models
{
[TestFixture]
public class StylesheetTests
{
[SetUp]
public virtual void Initialize()
{
SettingsForTests.Reset();
}
[Test]
public void Can_Create_Stylesheet()
{
@@ -55,7 +63,10 @@ namespace Umbraco.Tests.Models
public void Can_Update_Property()
{
// Arrange
var stylesheet = new Stylesheet("/css/styles.css") { Content = @"body { color:#000; } /**umb_name:Hello*/p{font-size:2em;} .bold {font-weight:bold;}" };
var stylesheet = new Stylesheet("/css/styles.css")
{
Content = @"body { color:#000; } /**umb_name:Hello*/p{font-size:2em;} .bold {font-weight:bold;}"
};
var prop = stylesheet.Properties.Single();
prop.Alias = "li";
@@ -102,7 +113,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(stylesheet);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
}
}

3
src/Umbraco.Tests/Models/TaskTests.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using NUnit.Framework;
using Umbraco.Core.Models;
using Umbraco.Core.Serialization;
@@ -70,7 +71,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(item);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
}

3
src/Umbraco.Tests/Models/TaskTypeTests.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using NUnit.Framework;
using Umbraco.Core.Models;
using Umbraco.Core.Serialization;
@@ -55,7 +56,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(item);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
}
}

3
src/Umbraco.Tests/Models/TemplateTests.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using NUnit.Framework;
@@ -75,7 +76,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(item);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
}

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

@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using NUnit.Framework;
using Umbraco.Core.Models;
using Umbraco.Core.Serialization;
@@ -133,7 +134,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(item);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
}
}

3
src/Umbraco.Tests/Models/UserTests.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using System.Linq;
using NUnit.Framework;
using Umbraco.Core.Models.Membership;
@@ -108,7 +109,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(item);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
}
}

3
src/Umbraco.Tests/Models/UserTypeTests.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using System.Linq;
using NUnit.Framework;
using Umbraco.Core.Models.Membership;
@@ -54,7 +55,7 @@ namespace Umbraco.Tests.Models
var result = ss.ToStream(item);
var json = result.ResultStream.ToJsonString();
Console.WriteLine(json);
Debug.Print(json);
}
}
}