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

Fix fallback

Browse Source
This commit is contained in:
Stephan
2019-01-21 17:36:25 +01:00
parent 358a36dd87
commit 9e811ddd50
3 changed files with 79 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs
View File

@@ -63,14 +63,20 @@ namespace Umbraco.Tests.PublishedContent
var prop1Type = factory.CreatePropertyType("prop1", 1, variations: ContentVariation.Culture);
var welcomeType = factory.CreatePropertyType("welcomeText", 1, variations: ContentVariation.Culture);
var welcome2Type = factory.CreatePropertyType("welcomeText2", 1, variations: ContentVariation.Culture);
var nopropType = factory.CreatePropertyType("noprop", 1, variations: ContentVariation.Culture);
var props = new[]
{
prop1Type,
welcomeType,
welcome2Type,
nopropType
};
var contentType1 = factory.CreateContentType(1, "ContentType1", Enumerable.Empty<string>(), props);
var prop3Type = factory.CreatePropertyType("prop3", 1, variations: ContentVariation.Culture);
var contentType2 = factory.CreateContentType(2, "contentType2", Enumerable.Empty<string>(), new[] { prop3Type });
var prop1 = new SolidPublishedPropertyWithLanguageVariants
{
Alias = "welcomeText",
@@ -99,6 +105,14 @@ namespace Umbraco.Tests.PublishedContent
prop3.SetSourceValue("en-US", "Welcome", true);
prop3.SetValue("en-US", "Welcome", true);
var noprop = new SolidPublishedProperty
{
Alias = "noprop",
PropertyType = nopropType
};
noprop.SolidHasValue = false; // has no value
noprop.SolidValue = "xxx"; // but returns something
var item1 = new SolidPublishedContent(contentType1)
{
Id = 1,
@@ -112,7 +126,7 @@ namespace Umbraco.Tests.PublishedContent
ChildIds = new[] { 2 },
Properties = new Collection<IPublishedProperty>
{
prop1, prop2
prop1, prop2, noprop
}
};
@@ -126,18 +140,47 @@ namespace Umbraco.Tests.PublishedContent
Level = 2,
Url = "/content-1/content-2",
ParentId = 1,
ChildIds = new int[] { },
ChildIds = new int[] { 3 },
Properties = new Collection<IPublishedProperty>
{
prop3
}
};
var prop4 = new SolidPublishedPropertyWithLanguageVariants
{
Alias = "prop3",
PropertyType = prop3Type
};
prop4.SetSourceValue("en-US", "Oxxo", true);
prop4.SetValue("en-US", "Oxxo", true);
var item3 = new SolidPublishedContent(contentType2)
{
Id = 3,
SortOrder = 0,
Name = "Content 3",
UrlSegment = "content-3",
Path = "/1/2/3",
Level = 3,
Url = "/content-1/content-2/content-3",
ParentId = 2,
ChildIds = new int[] { },
Properties = new Collection<IPublishedProperty>
{
prop4
}
};
item1.Children = new List<IPublishedContent> { item2 };
item2.Parent = item1;
item2.Children = new List<IPublishedContent> { item3 };
item3.Parent = item2;
cache.Add(item1);
cache.Add(item2);
cache.Add(item3);
}
[Test]
@@ -212,6 +255,34 @@ namespace Umbraco.Tests.PublishedContent
Assert.AreEqual("Welcome", value);
}
[Test]
public void Do_Not_Get_Content_Recursively_Unless_Requested2()
{
var content = UmbracoContext.Current.ContentCache.GetAtRoot().First().Children.First().Children().First();
Assert.IsNull(content.GetProperty("welcomeText2"));
var value = content.Value("welcomeText2");
Assert.IsNull(value);
}
[Test]
public void Can_Get_Content_Recursively2()
{
var content = UmbracoContext.Current.ContentCache.GetAtRoot().First().Children.First().Children().First();
Assert.IsNull(content.GetProperty("welcomeText2"));
var value = content.Value("welcomeText2", fallback: Fallback.ToAncestors);
Assert.AreEqual("Welcome", value);
}
[Test]
public void Can_Get_Content_Recursively3()
{
var content = UmbracoContext.Current.ContentCache.GetAtRoot().First().Children.First().Children().First();
Assert.IsNull(content.GetProperty("noprop"));
var value = content.Value("noprop", fallback: Fallback.ToAncestors);
// property has no value but we still get the value (ie, the converter would do something)
Assert.AreEqual("xxx", value);
}
[Test]
public void Can_Get_Content_With_Recursive_Priority()
{