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

Fix up unit test but also uses constant for -1 as the parent id aka System Root Node Id

Browse Source
This commit is contained in:
Warren Buckley
2019-02-06 15:16:11 +00:00
parent de5b32749e
commit 51ad0f75d1
1 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/Umbraco.Tests/Services/ContentServiceTests.cs
View File

@@ -96,7 +96,7 @@ namespace Umbraco.Tests.Services
ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate);
contentTypeService.Save(contentType);
var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", -1);
var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", Constants.System.Root);
blueprint.SetValue("title", "blueprint 1");
blueprint.SetValue("bodyText", "blueprint 2");
blueprint.SetValue("keywords", "blueprint 3");
@@ -122,7 +122,7 @@ namespace Umbraco.Tests.Services
ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate);
contentTypeService.Save(contentType);
var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", -1);
var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", Constants.System.Root);
blueprint.SetValue("title", "blueprint 1");
blueprint.SetValue("bodyText", "blueprint 2");
blueprint.SetValue("keywords", "blueprint 3");
@@ -148,7 +148,7 @@ namespace Umbraco.Tests.Services
ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate);
contentTypeService.Save(contentType);
var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", -1);
var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", Constants.System.Root);
blueprint.SetValue("title", "blueprint 1");
blueprint.SetValue("bodyText", "blueprint 2");
blueprint.SetValue("keywords", "blueprint 3");
@@ -183,7 +183,7 @@ namespace Umbraco.Tests.Services
for (int i = 0; i < 10; i++)
{
var blueprint = MockedContent.CreateTextpageContent(i % 2 == 0 ? ct1 : ct2, "hello" + i, -1);
var blueprint = MockedContent.CreateTextpageContent(i % 2 == 0 ? ct1 : ct2, "hello" + i, Constants.System.Root);
contentService.SaveBlueprint(blueprint);
}
@@ -294,7 +294,7 @@ namespace Umbraco.Tests.Services
var contentService = ServiceContext.ContentService;
// Act
var content = contentService.CreateAndSave("Test", -1, "umbTextpage", Constants.Security.SuperUserId);
var content = contentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
content.ContentSchedule.Add(null, DateTime.Now.AddHours(2));
contentService.Save(content, Constants.Security.SuperUserId);
@@ -322,7 +322,7 @@ namespace Umbraco.Tests.Services
var contentService = ServiceContext.ContentService;
// Act
var content = contentService.CreateAndSave("Test", -1, "umbTextpage", Constants.Security.SuperUserId);
var content = contentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
for (var i = 0; i < 20; i++)
{
content.SetValue("bodyText", "hello world " + Guid.NewGuid());
@@ -347,7 +347,7 @@ namespace Umbraco.Tests.Services
var results = new List<IContent>();
for (var i = 0; i < 20; i++)
{
results.Add(contentService.CreateAndSave("Test", -1, "umbTextpage", 0));
results.Add(contentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage", 0));
}
var sortedGet = contentService.GetByIds(new[] {results[10].Id, results[5].Id, results[12].Id}).ToArray();
@@ -367,7 +367,7 @@ namespace Umbraco.Tests.Services
// Act
for (int i = 0; i < 20; i++)
{
contentService.CreateAndSave("Test", -1, "umbTextpage", Constants.Security.SuperUserId);
contentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
}
// Assert
@@ -386,7 +386,7 @@ namespace Umbraco.Tests.Services
// Act
for (int i = 0; i < 20; i++)
{
contentService.CreateAndSave("Test", -1, "umbBlah", Constants.Security.SuperUserId);
contentService.CreateAndSave("Test", Constants.System.Root, "umbBlah", Constants.Security.SuperUserId);
}
// Assert
@@ -401,7 +401,7 @@ namespace Umbraco.Tests.Services
var contentTypeService = ServiceContext.ContentTypeService;
var contentType = MockedContentTypes.CreateSimpleContentType("umbBlah", "test Doc Type");
contentTypeService.Save(contentType);
var parent = contentService.CreateAndSave("Test", -1, "umbBlah", Constants.Security.SuperUserId);
var parent = contentService.CreateAndSave("Test", Constants.System.Root, "umbBlah", Constants.Security.SuperUserId);
// Act
for (int i = 0; i < 20; i++)
@@ -421,7 +421,7 @@ namespace Umbraco.Tests.Services
var contentTypeService = ServiceContext.ContentTypeService;
var contentType = MockedContentTypes.CreateSimpleContentType("umbBlah", "test Doc Type");
contentTypeService.Save(contentType);
var parent = contentService.CreateAndSave("Test", -1, "umbBlah", Constants.Security.SuperUserId);
var parent = contentService.CreateAndSave("Test", Constants.System.Root, "umbBlah", Constants.Security.SuperUserId);
// Act
IContent current = parent;
@@ -455,7 +455,7 @@ namespace Umbraco.Tests.Services
var contentService = ServiceContext.ContentService;
// Act
var content = contentService.Create("Test", -1, "umbTextpage", Constants.Security.SuperUserId);
var content = contentService.Create("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
// Assert
Assert.That(content, Is.Not.Null);
@@ -469,7 +469,7 @@ namespace Umbraco.Tests.Services
var contentService = ServiceContext.ContentService;
// Act
var content = contentService.Create("Test", -1, "umbTextpage", Constants.Security.SuperUserId);
var content = contentService.Create("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
// Assert
Assert.That(content, Is.Not.Null);
@@ -483,12 +483,12 @@ namespace Umbraco.Tests.Services
var contentService = ServiceContext.ContentService;
// Act
var content = contentService.Create("Test", -1, "umbTextpage");
var content = contentService.Create("Test", Constants.System.Root, "umbTextpage");
// Assert
Assert.That(content, Is.Not.Null);
Assert.That(content.HasIdentity, Is.False);
Assert.That(content.CreatorId, Is.EqualTo(0)); //Default to 0 (unknown) since we didn't explicitly set this in the Create call
Assert.That(content.CreatorId, Is.EqualTo(Constants.Security.SuperUserId)); //Default to -1 aka SuperUser (unknown) since we didn't explicitly set this in the Create call
}
[Test]
@@ -502,7 +502,7 @@ namespace Umbraco.Tests.Services
RawPasswordValue = "test"
};
ServiceContext.UserService.Save(user);
var content = new Content("Test", -1, ServiceContext.ContentTypeService.Get("umbTextpage"));
var content = new Content("Test", Constants.System.Root, ServiceContext.ContentTypeService.Get("umbTextpage"));
// Act
ServiceContext.ContentService.Save(content, (int)user.Id);
@@ -519,7 +519,7 @@ namespace Umbraco.Tests.Services
var contentService = ServiceContext.ContentService;
// Act & Assert
Assert.Throws<Exception>(() => contentService.Create("Test", -1, "umbAliasDoesntExist"));
Assert.Throws<Exception>(() => contentService.Create("Test", Constants.System.Root, "umbAliasDoesntExist"));
}
[Test]
@@ -527,7 +527,7 @@ namespace Umbraco.Tests.Services
{
// Arrange
var contentService = ServiceContext.ContentService;
var content = new Content(string.Empty, -1, ServiceContext.ContentTypeService.Get("umbTextpage"));
var content = new Content(string.Empty, Constants.System.Root, ServiceContext.ContentTypeService.Get("umbTextpage"));
// Act & Assert
Assert.Throws<InvalidOperationException>(() => contentService.Save(content));
@@ -757,7 +757,7 @@ namespace Umbraco.Tests.Services
contentType.Variations = ContentVariation.Culture;
ServiceContext.ContentTypeService.Save(contentType);
IContent content = new Content("content", -1, contentType);
IContent content = new Content("content", Constants.System.Root, contentType);
content.SetCultureName("content-fr", langFr.IsoCode);
content.SetCultureName("content-en", langUk.IsoCode);
content.PublishCulture(langFr.IsoCode);
@@ -816,7 +816,7 @@ namespace Umbraco.Tests.Services
ServiceContext.ContentTypeService.Save(contentType);
IContent content = new Content("content", -1, contentType);
IContent content = new Content("content", Constants.System.Root, contentType);
content.SetCultureName("content-en", langGB.IsoCode);
content.SetCultureName("content-fr", langFr.IsoCode);
content.PublishCulture(langGB.IsoCode);
@@ -859,7 +859,7 @@ namespace Umbraco.Tests.Services
contentType.Variations = ContentVariation.Culture;
ServiceContext.ContentTypeService.Save(contentType);
IContent content = new Content("content", -1, contentType);
IContent content = new Content("content", Constants.System.Root, contentType);
content.SetCultureName("content-fr", langFr.IsoCode);
content.PublishCulture(langFr.IsoCode);
var published = ServiceContext.ContentService.SavePublishing(content);
@@ -892,7 +892,7 @@ namespace Umbraco.Tests.Services
contentType.Variations = ContentVariation.Culture;
ServiceContext.ContentTypeService.Save(contentType);
IContent content = new Content("content", -1, contentType);
IContent content = new Content("content", Constants.System.Root, contentType);
content.SetCultureName("content-fr", langFr.IsoCode);
content.SetCultureName("content-gb", langGB.IsoCode);
content.PublishCulture(langGB.IsoCode);
@@ -955,7 +955,7 @@ namespace Umbraco.Tests.Services
{
// Arrange
var contentService = ServiceContext.ContentService;
var parent = contentService.Create("parent", -1, "umbTextpage");
var parent = contentService.Create("parent", Constants.System.Root, "umbTextpage");
contentService.SaveAndPublish(parent);
var content = contentService.Create("child", parent, "umbTextpage");
@@ -1288,7 +1288,7 @@ namespace Umbraco.Tests.Services
{
// Arrange
var contentService = ServiceContext.ContentService;
var content = contentService.Create("Home US", -1, "umbTextpage", Constants.Security.SuperUserId);
var content = contentService.Create("Home US", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
content.SetValue("author", "Barack Obama");
// Act
@@ -1787,7 +1787,7 @@ namespace Umbraco.Tests.Services
ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
ServiceContext.ContentTypeService.Save(contentType);
var content = MockedContent.CreateSimpleContent(contentType, "Simple Tags Page", -1);
var content = MockedContent.CreateSimpleContent(contentType, "Simple Tags Page", Constants.System.Root);
content.AssignTags(propAlias, new[] {"hello", "world"});
contentService.Save(content);
@@ -1963,7 +1963,7 @@ namespace Umbraco.Tests.Services
ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
ServiceContext.ContentTypeService.Save(contentType);
var page = new Content("Page", -1, contentType)
var page = new Content("Page", Constants.System.Root, contentType)
{
Level = 1,
SortOrder = 1,
@@ -2190,7 +2190,7 @@ namespace Umbraco.Tests.Services
var contentType = MockedContentTypes.CreateAllTypesContentType("allDataTypes", "All DataTypes");
contentTypeService.Save(contentType);
var contentService = ServiceContext.ContentService;
var content = MockedContent.CreateAllTypesContent(contentType, "Random Content", -1);
var content = MockedContent.CreateAllTypesContent(contentType, "Random Content", Constants.System.Root);
contentService.Save(content);
var id = content.Id;
@@ -2243,7 +2243,7 @@ namespace Umbraco.Tests.Services
public void Ensure_Content_Xml_Created()
{
var contentService = ServiceContext.ContentService;
var content = contentService.Create("Home US", -1, "umbTextpage", Constants.Security.SuperUserId);
var content = contentService.Create("Home US", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
content.SetValue("author", "Barack Obama");
contentService.Save(content);
@@ -2265,7 +2265,7 @@ namespace Umbraco.Tests.Services
public void Ensure_Preview_Xml_Created()
{
var contentService = ServiceContext.ContentService;
var content = contentService.Create("Home US", -1, "umbTextpage", Constants.Security.SuperUserId);
var content = contentService.Create("Home US", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
content.SetValue("author", "Barack Obama");
contentService.Save(content);
@@ -2293,10 +2293,10 @@ namespace Umbraco.Tests.Services
}
long total;
var entities = service.GetPagedChildren(-1, 0, 6, out total).ToArray();
var entities = service.GetPagedChildren(Constants.System.Root, 0, 6, out total).ToArray();
Assert.That(entities.Length, Is.EqualTo(6));
Assert.That(total, Is.EqualTo(10));
entities = service.GetPagedChildren(-1, 1, 6, out total).ToArray();
entities = service.GetPagedChildren(Constants.System.Root, 1, 6, out total).ToArray();
Assert.That(entities.Length, Is.EqualTo(4));
Assert.That(total, Is.EqualTo(10));
}
@@ -2328,10 +2328,10 @@ namespace Umbraco.Tests.Services
long total;
// children in root including the folder - not the descendants in the folder
var entities = service.GetPagedChildren(-1, 0, 6, out total).ToArray();
var entities = service.GetPagedChildren(Constants.System.Root, 0, 6, out total).ToArray();
Assert.That(entities.Length, Is.EqualTo(6));
Assert.That(total, Is.EqualTo(10));
entities = service.GetPagedChildren(-1, 1, 6, out total).ToArray();
entities = service.GetPagedChildren(Constants.System.Root, 1, 6, out total).ToArray();
Assert.That(entities.Length, Is.EqualTo(4));
Assert.That(total, Is.EqualTo(10));
@@ -2347,7 +2347,7 @@ namespace Umbraco.Tests.Services
[Test]
public void PublishingTest()
{
var contentType = new ContentType(-1)
var contentType = new ContentType(Constants.System.Root)
{
Alias = "foo",
Name = "Foo"
@@ -2365,7 +2365,7 @@ namespace Umbraco.Tests.Services
ServiceContext.ContentTypeService.Save(contentType);
var contentService = ServiceContext.ContentService;
var content = contentService.Create("foo", -1, "foo");
var content = contentService.Create("foo", Constants.System.Root, "foo");
contentService.Save(content);
Assert.IsFalse(content.Published);
@@ -2493,7 +2493,7 @@ namespace Umbraco.Tests.Services
contentTypeService.Save(contentType);
var contentService = ServiceContext.ContentService;
var content = new Content(null, -1, contentType);
var content = new Content(null, Constants.System.Root, contentType);
content.SetCultureName("name-us", langUk.IsoCode);
content.SetCultureName("name-fr", langFr.IsoCode);
@@ -2528,7 +2528,7 @@ namespace Umbraco.Tests.Services
var contentService = ServiceContext.ContentService;
var content = new Content(null, -1, contentType);
var content = new Content(null, Constants.System.Root, contentType);
content.SetCultureName("root", langUk.IsoCode);
contentService.Save(content);
@@ -2570,13 +2570,13 @@ namespace Umbraco.Tests.Services
var o = new[] { 2, 1, 3, 0, 4 }; // randomly different
for (var i = 0; i < 5; i++)
{
var contentA = new Content(null, -1, contentType);
var contentA = new Content(null, Constants.System.Root, contentType);
contentA.SetCultureName("contentA" + i + "uk", langUk.IsoCode);
contentA.SetCultureName("contentA" + o[i] + "fr", langFr.IsoCode);
contentA.SetCultureName("contentX" + i + "da", langDa.IsoCode);
contentService.Save(contentA);
var contentB = new Content(null, -1, contentType);
var contentB = new Content(null, Constants.System.Root, contentType);
contentB.SetCultureName("contentB" + i + "uk", langUk.IsoCode);
contentB.SetCultureName("contentB" + o[i] + "fr", langFr.IsoCode);
contentB.SetCultureName("contentX" + i + "da", langDa.IsoCode);
@@ -2584,7 +2584,7 @@ namespace Umbraco.Tests.Services
}
// get all
var list = contentService.GetPagedChildren(-1, 0, 100, out var total).ToList();
var list = contentService.GetPagedChildren(Constants.System.Root, 0, 100, out var total).ToList();
Console.WriteLine("ALL");
WriteList(list);
@@ -2594,7 +2594,7 @@ namespace Umbraco.Tests.Services
Assert.AreEqual(11, list.Count);
// filter
list = contentService.GetPagedChildren(-1, 0, 100, out total,
list = contentService.GetPagedChildren(Constants.System.Root, 0, 100, out total,
SqlContext.Query<IContent>().Where(x => x.Name.Contains("contentX")),
Ordering.By("name", culture: langFr.IsoCode)).ToList();
@@ -2602,7 +2602,7 @@ namespace Umbraco.Tests.Services
Assert.AreEqual(0, list.Count);
// filter
list = contentService.GetPagedChildren(-1, 0, 100, out total,
list = contentService.GetPagedChildren(Constants.System.Root, 0, 100, out total,
SqlContext.Query<IContent>().Where(x => x.Name.Contains("contentX")),
Ordering.By("name", culture: langDa.IsoCode)).ToList();
@@ -2613,7 +2613,7 @@ namespace Umbraco.Tests.Services
Assert.AreEqual(10, list.Count);
// filter
list = contentService.GetPagedChildren(-1, 0, 100, out total,
list = contentService.GetPagedChildren(Constants.System.Root, 0, 100, out total,
SqlContext.Query<IContent>().Where(x => x.Name.Contains("contentA")),
Ordering.By("name", culture: langFr.IsoCode)).ToList();
@@ -2626,7 +2626,7 @@ namespace Umbraco.Tests.Services
for (var i = 0; i < 5; i++)
Assert.AreEqual("contentA" + i + "fr", list[i].GetCultureName(langFr.IsoCode));
list = contentService.GetPagedChildren(-1, 0, 100, out total,
list = contentService.GetPagedChildren(Constants.System.Root, 0, 100, out total,
SqlContext.Query<IContent>().Where(x => x.Name.Contains("contentA")),
Ordering.By("name", direction: Direction.Descending, culture: langFr.IsoCode)).ToList();
@@ -2671,7 +2671,7 @@ namespace Umbraco.Tests.Services
contentTypeService.Save(contentType);
var contentService = ServiceContext.ContentService;
var content = contentService.Create("Home US", -1, "umbTextpage");
var content = contentService.Create("Home US", Constants.System.Root, "umbTextpage");
// creating content with a name but no culture - will set the invariant name
// but, because that content is variant, as soon as we save, we'll need to