Normalize cr/lf/tab
This commit is contained in:
Stephan
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Xml;
|
||||
@@ -18,10 +18,10 @@ using Umbraco.Core.Models.Membership;
|
||||
|
||||
namespace Umbraco.Tests.Cache.PublishedCache
|
||||
{
|
||||
[TestFixture]
|
||||
[TestFixture]
|
||||
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
|
||||
public class PublishMediaCacheTests : BaseWebTest
|
||||
{
|
||||
{
|
||||
protected override void Compose()
|
||||
{
|
||||
base.Compose();
|
||||
@@ -31,45 +31,45 @@ namespace Umbraco.Tests.Cache.PublishedCache
|
||||
.Append<DefaultUrlSegmentProvider>();
|
||||
}
|
||||
|
||||
private IMediaType MakeNewMediaType(IUser user, string text, int parentId = -1)
|
||||
{
|
||||
var mt = new MediaType(parentId) { Name = text, Alias = text, Thumbnail = "icon-folder", Icon = "icon-folder" };
|
||||
private IMediaType MakeNewMediaType(IUser user, string text, int parentId = -1)
|
||||
{
|
||||
var mt = new MediaType(parentId) { Name = text, Alias = text, Thumbnail = "icon-folder", Icon = "icon-folder" };
|
||||
ServiceContext.MediaTypeService.Save(mt);
|
||||
return mt;
|
||||
}
|
||||
return mt;
|
||||
}
|
||||
|
||||
private IMedia MakeNewMedia(string name, IMediaType mediaType, IUser user, int parentId)
|
||||
{
|
||||
var m = ServiceContext.MediaService.CreateMediaWithIdentity(name, parentId, mediaType.Alias);
|
||||
return m;
|
||||
}
|
||||
private IMedia MakeNewMedia(string name, IMediaType mediaType, IUser user, int parentId)
|
||||
{
|
||||
var m = ServiceContext.MediaService.CreateMediaWithIdentity(name, parentId, mediaType.Alias);
|
||||
return m;
|
||||
}
|
||||
|
||||
//NOTE: This is "Without_Examine" too
|
||||
[Test]
|
||||
public void Get_Root_Docs()
|
||||
{
|
||||
public void Get_Root_Docs()
|
||||
{
|
||||
var user = ServiceContext.UserService.GetUserById(0);
|
||||
var mType = MakeNewMediaType(user, "TestMediaType");
|
||||
var mRoot1 = MakeNewMedia("MediaRoot1", mType, user, -1);
|
||||
var mRoot2 = MakeNewMedia("MediaRoot2", mType, user, -1);
|
||||
var mChild1 = MakeNewMedia("Child1", mType, user, mRoot1.Id);
|
||||
var mChild2 = MakeNewMedia("Child2", mType, user, mRoot2.Id);
|
||||
var mRoot1 = MakeNewMedia("MediaRoot1", mType, user, -1);
|
||||
var mRoot2 = MakeNewMedia("MediaRoot2", mType, user, -1);
|
||||
var mChild1 = MakeNewMedia("Child1", mType, user, mRoot1.Id);
|
||||
var mChild2 = MakeNewMedia("Child2", mType, user, mRoot2.Id);
|
||||
|
||||
var ctx = GetUmbracoContext("/test");
|
||||
var ctx = GetUmbracoContext("/test");
|
||||
var cache = new PublishedMediaCache(new XmlStore((XmlDocument) null), ServiceContext.MediaService, ServiceContext.UserService, new StaticCacheProvider(), ContentTypesCache);
|
||||
var roots = cache.GetAtRoot();
|
||||
Assert.AreEqual(2, roots.Count());
|
||||
Assert.IsTrue(roots.Select(x => x.Id).ContainsAll(new[] {mRoot1.Id, mRoot2.Id}));
|
||||
var roots = cache.GetAtRoot();
|
||||
Assert.AreEqual(2, roots.Count());
|
||||
Assert.IsTrue(roots.Select(x => x.Id).ContainsAll(new[] {mRoot1.Id, mRoot2.Id}));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Get_Item_Without_Examine()
|
||||
{
|
||||
[Test]
|
||||
public void Get_Item_Without_Examine()
|
||||
{
|
||||
var user = ServiceContext.UserService.GetUserById(0);
|
||||
var mType = MakeNewMediaType(user, "TestMediaType");
|
||||
var mRoot = MakeNewMedia("MediaRoot", mType, user, -1);
|
||||
var mChild1 = MakeNewMedia("Child1", mType, user, mRoot.Id);
|
||||
var mRoot = MakeNewMedia("MediaRoot", mType, user, -1);
|
||||
var mChild1 = MakeNewMedia("Child1", mType, user, mRoot.Id);
|
||||
|
||||
//var publishedMedia = PublishedMediaTests.GetNode(mRoot.Id, GetUmbracoContext("/test", 1234));
|
||||
var umbracoContext = GetUmbracoContext("/test");
|
||||
@@ -77,59 +77,59 @@ namespace Umbraco.Tests.Cache.PublishedCache
|
||||
var publishedMedia = cache.GetById(mRoot.Id);
|
||||
Assert.IsNotNull(publishedMedia);
|
||||
|
||||
Assert.AreEqual(mRoot.Id, publishedMedia.Id);
|
||||
Assert.AreEqual(mRoot.CreateDate.ToString("dd/MM/yyyy HH:mm:ss"), publishedMedia.CreateDate.ToString("dd/MM/yyyy HH:mm:ss"));
|
||||
Assert.AreEqual(mRoot.CreatorId, publishedMedia.CreatorId);
|
||||
//Assert.AreEqual(mRoot.User.Name, publishedMedia.CreatorName);
|
||||
Assert.AreEqual(mRoot.ContentType.Alias, publishedMedia.DocumentTypeAlias);
|
||||
Assert.AreEqual(mRoot.ContentType.Id, publishedMedia.DocumentTypeId);
|
||||
Assert.AreEqual(mRoot.Level, publishedMedia.Level);
|
||||
Assert.AreEqual(mRoot.Name, publishedMedia.Name);
|
||||
Assert.AreEqual(mRoot.Path, publishedMedia.Path);
|
||||
Assert.AreEqual(mRoot.SortOrder, publishedMedia.SortOrder);
|
||||
Assert.IsNull(publishedMedia.Parent);
|
||||
}
|
||||
Assert.AreEqual(mRoot.Id, publishedMedia.Id);
|
||||
Assert.AreEqual(mRoot.CreateDate.ToString("dd/MM/yyyy HH:mm:ss"), publishedMedia.CreateDate.ToString("dd/MM/yyyy HH:mm:ss"));
|
||||
Assert.AreEqual(mRoot.CreatorId, publishedMedia.CreatorId);
|
||||
//Assert.AreEqual(mRoot.User.Name, publishedMedia.CreatorName);
|
||||
Assert.AreEqual(mRoot.ContentType.Alias, publishedMedia.DocumentTypeAlias);
|
||||
Assert.AreEqual(mRoot.ContentType.Id, publishedMedia.DocumentTypeId);
|
||||
Assert.AreEqual(mRoot.Level, publishedMedia.Level);
|
||||
Assert.AreEqual(mRoot.Name, publishedMedia.Name);
|
||||
Assert.AreEqual(mRoot.Path, publishedMedia.Path);
|
||||
Assert.AreEqual(mRoot.SortOrder, publishedMedia.SortOrder);
|
||||
Assert.IsNull(publishedMedia.Parent);
|
||||
}
|
||||
|
||||
[TestCase("id")]
|
||||
[TestCase("nodeId")]
|
||||
[TestCase("__NodeId")]
|
||||
public void DictionaryDocument_Id_Keys(string key)
|
||||
{
|
||||
var dicDoc = GetDictionaryDocument(idKey: key);
|
||||
DoAssert(dicDoc);
|
||||
}
|
||||
[TestCase("id")]
|
||||
[TestCase("nodeId")]
|
||||
[TestCase("__NodeId")]
|
||||
public void DictionaryDocument_Id_Keys(string key)
|
||||
{
|
||||
var dicDoc = GetDictionaryDocument(idKey: key);
|
||||
DoAssert(dicDoc);
|
||||
}
|
||||
|
||||
[TestCase("template")]
|
||||
[TestCase("templateId")]
|
||||
public void DictionaryDocument_Template_Keys(string key)
|
||||
{
|
||||
var dicDoc = GetDictionaryDocument(templateKey: key);
|
||||
DoAssert(dicDoc);
|
||||
}
|
||||
[TestCase("template")]
|
||||
[TestCase("templateId")]
|
||||
public void DictionaryDocument_Template_Keys(string key)
|
||||
{
|
||||
var dicDoc = GetDictionaryDocument(templateKey: key);
|
||||
DoAssert(dicDoc);
|
||||
}
|
||||
|
||||
[TestCase("nodeName")]
|
||||
[TestCase("__nodeName")]
|
||||
public void DictionaryDocument_NodeName_Keys(string key)
|
||||
{
|
||||
var dicDoc = GetDictionaryDocument(nodeNameKey: key);
|
||||
DoAssert(dicDoc);
|
||||
}
|
||||
[TestCase("nodeName")]
|
||||
[TestCase("__nodeName")]
|
||||
public void DictionaryDocument_NodeName_Keys(string key)
|
||||
{
|
||||
var dicDoc = GetDictionaryDocument(nodeNameKey: key);
|
||||
DoAssert(dicDoc);
|
||||
}
|
||||
|
||||
[TestCase("nodeTypeAlias")]
|
||||
[TestCase("__NodeTypeAlias")]
|
||||
public void DictionaryDocument_NodeTypeAlias_Keys(string key)
|
||||
{
|
||||
var dicDoc = GetDictionaryDocument(nodeTypeAliasKey: key);
|
||||
DoAssert(dicDoc);
|
||||
}
|
||||
[TestCase("nodeTypeAlias")]
|
||||
[TestCase("__NodeTypeAlias")]
|
||||
public void DictionaryDocument_NodeTypeAlias_Keys(string key)
|
||||
{
|
||||
var dicDoc = GetDictionaryDocument(nodeTypeAliasKey: key);
|
||||
DoAssert(dicDoc);
|
||||
}
|
||||
|
||||
[TestCase("path")]
|
||||
[TestCase("__Path")]
|
||||
public void DictionaryDocument_Path_Keys(string key)
|
||||
{
|
||||
var dicDoc = GetDictionaryDocument(pathKey: key);
|
||||
DoAssert(dicDoc);
|
||||
}
|
||||
[TestCase("path")]
|
||||
[TestCase("__Path")]
|
||||
public void DictionaryDocument_Path_Keys(string key)
|
||||
{
|
||||
var dicDoc = GetDictionaryDocument(pathKey: key);
|
||||
DoAssert(dicDoc);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DictionaryDocument_Key()
|
||||
@@ -139,82 +139,82 @@ namespace Umbraco.Tests.Cache.PublishedCache
|
||||
DoAssert(dicDoc, keyVal: key);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DictionaryDocument_Get_Children()
|
||||
{
|
||||
var child1 = GetDictionaryDocument(idVal: 222333);
|
||||
var child2 = GetDictionaryDocument(idVal: 444555);
|
||||
[Test]
|
||||
public void DictionaryDocument_Get_Children()
|
||||
{
|
||||
var child1 = GetDictionaryDocument(idVal: 222333);
|
||||
var child2 = GetDictionaryDocument(idVal: 444555);
|
||||
|
||||
var dicDoc = GetDictionaryDocument(children: new List<IPublishedContent>()
|
||||
{
|
||||
child1, child2
|
||||
});
|
||||
var dicDoc = GetDictionaryDocument(children: new List<IPublishedContent>()
|
||||
{
|
||||
child1, child2
|
||||
});
|
||||
|
||||
Assert.AreEqual(2, dicDoc.Children.Count());
|
||||
Assert.AreEqual(222333, dicDoc.Children.ElementAt(0).Id);
|
||||
Assert.AreEqual(444555, dicDoc.Children.ElementAt(1).Id);
|
||||
}
|
||||
Assert.AreEqual(2, dicDoc.Children.Count());
|
||||
Assert.AreEqual(222333, dicDoc.Children.ElementAt(0).Id);
|
||||
Assert.AreEqual(444555, dicDoc.Children.ElementAt(1).Id);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Convert_From_Search_Result()
|
||||
{
|
||||
{
|
||||
var ctx = GetUmbracoContext("/test");
|
||||
var key = Guid.NewGuid();
|
||||
var key = Guid.NewGuid();
|
||||
|
||||
var result = new SearchResult()
|
||||
{
|
||||
LongId = 1234,
|
||||
Score = 1
|
||||
};
|
||||
result.Fields.Add("__IndexType", "media");
|
||||
result.Fields.Add("__NodeId", "1234");
|
||||
result.Fields.Add("__NodeTypeAlias", Constants.Conventions.MediaTypes.Image);
|
||||
result.Fields.Add("__Path", "-1,1234");
|
||||
result.Fields.Add("__nodeName", "Test");
|
||||
result.Fields.Add("id", "1234");
|
||||
var result = new SearchResult()
|
||||
{
|
||||
LongId = 1234,
|
||||
Score = 1
|
||||
};
|
||||
result.Fields.Add("__IndexType", "media");
|
||||
result.Fields.Add("__NodeId", "1234");
|
||||
result.Fields.Add("__NodeTypeAlias", Constants.Conventions.MediaTypes.Image);
|
||||
result.Fields.Add("__Path", "-1,1234");
|
||||
result.Fields.Add("__nodeName", "Test");
|
||||
result.Fields.Add("id", "1234");
|
||||
result.Fields.Add("key", key.ToString());
|
||||
result.Fields.Add("urlName", "/media/test.jpg");
|
||||
result.Fields.Add("nodeType", "0");
|
||||
result.Fields.Add("sortOrder", "0");
|
||||
result.Fields.Add("level", "2");
|
||||
result.Fields.Add("nodeName", "Test");
|
||||
result.Fields.Add("nodeTypeAlias", Constants.Conventions.MediaTypes.Image);
|
||||
result.Fields.Add("parentID", "-1");
|
||||
result.Fields.Add("path", "-1,1234");
|
||||
result.Fields.Add("updateDate", DateTime.Parse("2012-07-16T10:34:09").Ticks.ToString());
|
||||
result.Fields.Add("nodeTypeAlias", Constants.Conventions.MediaTypes.Image);
|
||||
result.Fields.Add("parentID", "-1");
|
||||
result.Fields.Add("path", "-1,1234");
|
||||
result.Fields.Add("updateDate", DateTime.Parse("2012-07-16T10:34:09").Ticks.ToString());
|
||||
result.Fields.Add("createDate", DateTime.Parse("2012-07-17T10:34:09").Ticks.ToString());
|
||||
result.Fields.Add("creatorID", "0");
|
||||
result.Fields.Add("creatorName", "Shannon");
|
||||
|
||||
var store = new PublishedMediaCache(new XmlStore((XmlDocument)null), ServiceContext.MediaService, ServiceContext.UserService, new StaticCacheProvider(), ContentTypesCache);
|
||||
var doc = store.CreateFromCacheValues(store.ConvertFromSearchResult(result));
|
||||
var doc = store.CreateFromCacheValues(store.ConvertFromSearchResult(result));
|
||||
|
||||
DoAssert(doc, 1234, key, 0, 0, "/media/test.jpg", "Image", 0, "Shannon", "Shannon", 0, 0, "-1,1234", DateTime.Parse("2012-07-17T10:34:09"), DateTime.Parse("2012-07-16T10:34:09"), 2);
|
||||
Assert.AreEqual(null, doc.Parent);
|
||||
}
|
||||
DoAssert(doc, 1234, key, 0, 0, "/media/test.jpg", "Image", 0, "Shannon", "Shannon", 0, 0, "-1,1234", DateTime.Parse("2012-07-17T10:34:09"), DateTime.Parse("2012-07-16T10:34:09"), 2);
|
||||
Assert.AreEqual(null, doc.Parent);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Convert_From_XPath_Navigator()
|
||||
{
|
||||
{
|
||||
var ctx = GetUmbracoContext("/test");
|
||||
var key = Guid.NewGuid();
|
||||
|
||||
var xmlDoc = GetMediaXml();
|
||||
var xmlDoc = GetMediaXml();
|
||||
((XmlElement)xmlDoc.DocumentElement.FirstChild).SetAttribute("key", key.ToString());
|
||||
var navigator = xmlDoc.SelectSingleNode("/root/Image").CreateNavigator();
|
||||
var cache = new PublishedMediaCache(new XmlStore((XmlDocument)null), ServiceContext.MediaService, ServiceContext.UserService, new StaticCacheProvider(), ContentTypesCache);
|
||||
var doc = cache.CreateFromCacheValues(cache.ConvertFromXPathNavigator(navigator, true));
|
||||
var doc = cache.CreateFromCacheValues(cache.ConvertFromXPathNavigator(navigator, true));
|
||||
|
||||
DoAssert(doc, 2000, key, 0, 2, "image1", "Image", 2044, "Shannon", "Shannon", 33, 33, "-1,2000", DateTime.Parse("2012-06-12T14:13:17"), DateTime.Parse("2012-07-20T18:50:43"), 1);
|
||||
Assert.AreEqual(null, doc.Parent);
|
||||
Assert.AreEqual(2, doc.Children.Count());
|
||||
Assert.AreEqual(2001, doc.Children.ElementAt(0).Id);
|
||||
Assert.AreEqual(2002, doc.Children.ElementAt(1).Id);
|
||||
}
|
||||
DoAssert(doc, 2000, key, 0, 2, "image1", "Image", 2044, "Shannon", "Shannon", 33, 33, "-1,2000", DateTime.Parse("2012-06-12T14:13:17"), DateTime.Parse("2012-07-20T18:50:43"), 1);
|
||||
Assert.AreEqual(null, doc.Parent);
|
||||
Assert.AreEqual(2, doc.Children.Count());
|
||||
Assert.AreEqual(2001, doc.Children.ElementAt(0).Id);
|
||||
Assert.AreEqual(2002, doc.Children.ElementAt(1).Id);
|
||||
}
|
||||
|
||||
private XmlDocument GetMediaXml()
|
||||
{
|
||||
var xml = @"<?xml version=""1.0"" encoding=""utf-8""?>
|
||||
private XmlDocument GetMediaXml()
|
||||
{
|
||||
var xml = @"<?xml version=""1.0"" encoding=""utf-8""?>
|
||||
<!DOCTYPE root[
|
||||
<!ELEMENT Home ANY>
|
||||
<!ATTLIST Home id ID #REQUIRED>
|
||||
@@ -222,67 +222,67 @@ namespace Umbraco.Tests.Cache.PublishedCache
|
||||
<!ATTLIST CustomDocument id ID #REQUIRED>
|
||||
]>
|
||||
<root id=""-1"">
|
||||
<Image id=""2000"" parentID=""-1"" level=""1"" writerID=""33"" creatorID=""33"" nodeType=""2044"" template=""0"" sortOrder=""2"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Image1"" urlName=""image1"" writerName=""Shannon"" creatorName=""Shannon"" path=""-1,2000"" isDoc="""">
|
||||
<file><![CDATA[/media/1234/image1.png]]></file>
|
||||
<Image id=""2001"" parentID=""2000"" level=""2"" writerID=""33"" creatorID=""33"" nodeType=""2044"" template=""0"" sortOrder=""2"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Image1"" urlName=""image1"" writerName=""Shannon"" creatorName=""Shannon"" path=""-1,2000,2001"" isDoc="""">
|
||||
<file><![CDATA[/media/1234/image1.png]]></file>
|
||||
</Image>
|
||||
<Image id=""2002"" parentID=""2000"" level=""2"" writerID=""33"" creatorID=""33"" nodeType=""2044"" template=""0"" sortOrder=""2"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Image1"" urlName=""image1"" writerName=""Shannon"" creatorName=""Shannon"" path=""-1,2000,2002"" isDoc="""">
|
||||
<file><![CDATA[/media/1234/image1.png]]></file>
|
||||
</Image>
|
||||
</Image>
|
||||
<Image id=""2000"" parentID=""-1"" level=""1"" writerID=""33"" creatorID=""33"" nodeType=""2044"" template=""0"" sortOrder=""2"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Image1"" urlName=""image1"" writerName=""Shannon"" creatorName=""Shannon"" path=""-1,2000"" isDoc="""">
|
||||
<file><![CDATA[/media/1234/image1.png]]></file>
|
||||
<Image id=""2001"" parentID=""2000"" level=""2"" writerID=""33"" creatorID=""33"" nodeType=""2044"" template=""0"" sortOrder=""2"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Image1"" urlName=""image1"" writerName=""Shannon"" creatorName=""Shannon"" path=""-1,2000,2001"" isDoc="""">
|
||||
<file><![CDATA[/media/1234/image1.png]]></file>
|
||||
</Image>
|
||||
<Image id=""2002"" parentID=""2000"" level=""2"" writerID=""33"" creatorID=""33"" nodeType=""2044"" template=""0"" sortOrder=""2"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Image1"" urlName=""image1"" writerName=""Shannon"" creatorName=""Shannon"" path=""-1,2000,2002"" isDoc="""">
|
||||
<file><![CDATA[/media/1234/image1.png]]></file>
|
||||
</Image>
|
||||
</Image>
|
||||
</root>";
|
||||
|
||||
var xmlDoc = new XmlDocument();
|
||||
xmlDoc.LoadXml(xml);
|
||||
return xmlDoc;
|
||||
}
|
||||
var xmlDoc = new XmlDocument();
|
||||
xmlDoc.LoadXml(xml);
|
||||
return xmlDoc;
|
||||
}
|
||||
|
||||
private Dictionary<string, string> GetDictionary(
|
||||
int id,
|
||||
private Dictionary<string, string> GetDictionary(
|
||||
int id,
|
||||
Guid key,
|
||||
int parentId,
|
||||
string idKey,
|
||||
string templateKey,
|
||||
string nodeNameKey,
|
||||
string nodeTypeAliasKey,
|
||||
string pathKey)
|
||||
{
|
||||
return new Dictionary<string, string>()
|
||||
{
|
||||
{idKey, id.ToString()},
|
||||
int parentId,
|
||||
string idKey,
|
||||
string templateKey,
|
||||
string nodeNameKey,
|
||||
string nodeTypeAliasKey,
|
||||
string pathKey)
|
||||
{
|
||||
return new Dictionary<string, string>()
|
||||
{
|
||||
{idKey, id.ToString()},
|
||||
{"key", key.ToString()},
|
||||
{templateKey, "0"},
|
||||
{"sortOrder", "44"},
|
||||
{nodeNameKey, "Testing"},
|
||||
{"urlName", "testing"},
|
||||
{nodeTypeAliasKey, "myType"},
|
||||
{"nodeType", "22"},
|
||||
{"writerName", "Shannon"},
|
||||
{"creatorName", "Shannon"},
|
||||
{"writerID", "33"},
|
||||
{"creatorID", "33"},
|
||||
{pathKey, "1,2,3,4,5"},
|
||||
{"createDate", "2012-01-02"},
|
||||
{"updateDate", "2012-01-02"},
|
||||
{"level", "3"},
|
||||
{"parentID", parentId.ToString()}
|
||||
};
|
||||
}
|
||||
{templateKey, "0"},
|
||||
{"sortOrder", "44"},
|
||||
{nodeNameKey, "Testing"},
|
||||
{"urlName", "testing"},
|
||||
{nodeTypeAliasKey, "myType"},
|
||||
{"nodeType", "22"},
|
||||
{"writerName", "Shannon"},
|
||||
{"creatorName", "Shannon"},
|
||||
{"writerID", "33"},
|
||||
{"creatorID", "33"},
|
||||
{pathKey, "1,2,3,4,5"},
|
||||
{"createDate", "2012-01-02"},
|
||||
{"updateDate", "2012-01-02"},
|
||||
{"level", "3"},
|
||||
{"parentID", parentId.ToString()}
|
||||
};
|
||||
}
|
||||
|
||||
private PublishedMediaCache.DictionaryPublishedContent GetDictionaryDocument(
|
||||
string idKey = "id",
|
||||
string templateKey = "template",
|
||||
string nodeNameKey = "nodeName",
|
||||
string nodeTypeAliasKey = "nodeTypeAlias",
|
||||
string pathKey = "path",
|
||||
int idVal = 1234,
|
||||
private PublishedMediaCache.DictionaryPublishedContent GetDictionaryDocument(
|
||||
string idKey = "id",
|
||||
string templateKey = "template",
|
||||
string nodeNameKey = "nodeName",
|
||||
string nodeTypeAliasKey = "nodeTypeAlias",
|
||||
string pathKey = "path",
|
||||
int idVal = 1234,
|
||||
Guid keyVal = default(Guid),
|
||||
int parentIdVal = 321,
|
||||
IEnumerable<IPublishedContent> children = null)
|
||||
{
|
||||
if (children == null)
|
||||
children = new List<IPublishedContent>();
|
||||
int parentIdVal = 321,
|
||||
IEnumerable<IPublishedContent> children = null)
|
||||
{
|
||||
if (children == null)
|
||||
children = new List<IPublishedContent>();
|
||||
var dicDoc = new PublishedMediaCache.DictionaryPublishedContent(
|
||||
//the dictionary
|
||||
GetDictionary(idVal, keyVal, parentIdVal, idKey, templateKey, nodeNameKey, nodeTypeAliasKey, pathKey),
|
||||
@@ -312,81 +312,81 @@ namespace Umbraco.Tests.Cache.PublishedCache
|
||||
null,
|
||||
// not from examine
|
||||
false);
|
||||
return dicDoc;
|
||||
}
|
||||
return dicDoc;
|
||||
}
|
||||
|
||||
private void DoAssert(
|
||||
PublishedMediaCache.DictionaryPublishedContent dicDoc,
|
||||
int idVal = 1234,
|
||||
Guid keyVal = default(Guid),
|
||||
int templateIdVal = 0,
|
||||
int sortOrderVal = 44,
|
||||
string urlNameVal = "testing",
|
||||
string nodeTypeAliasVal = "myType",
|
||||
int nodeTypeIdVal = 22,
|
||||
string writerNameVal = "Shannon",
|
||||
string creatorNameVal = "Shannon",
|
||||
int writerIdVal = 33,
|
||||
int creatorIdVal = 33,
|
||||
string pathVal = "1,2,3,4,5",
|
||||
DateTime? createDateVal = null,
|
||||
DateTime? updateDateVal = null,
|
||||
int levelVal = 3,
|
||||
int parentIdVal = 321)
|
||||
{
|
||||
if (!createDateVal.HasValue)
|
||||
createDateVal = DateTime.Parse("2012-01-02");
|
||||
if (!updateDateVal.HasValue)
|
||||
updateDateVal = DateTime.Parse("2012-01-02");
|
||||
|
||||
DoAssert((IPublishedContent)dicDoc, idVal, keyVal, templateIdVal, sortOrderVal, urlNameVal, nodeTypeAliasVal, nodeTypeIdVal, writerNameVal,
|
||||
creatorNameVal, writerIdVal, creatorIdVal, pathVal, createDateVal, updateDateVal, levelVal);
|
||||
|
||||
//now validate the parentId that has been parsed, this doesn't exist on the IPublishedContent
|
||||
Assert.AreEqual(parentIdVal, dicDoc.ParentId);
|
||||
}
|
||||
|
||||
private void DoAssert(
|
||||
IPublishedContent doc,
|
||||
int idVal = 1234,
|
||||
private void DoAssert(
|
||||
PublishedMediaCache.DictionaryPublishedContent dicDoc,
|
||||
int idVal = 1234,
|
||||
Guid keyVal = default(Guid),
|
||||
int templateIdVal = 0,
|
||||
int sortOrderVal = 44,
|
||||
string urlNameVal = "testing",
|
||||
string nodeTypeAliasVal = "myType",
|
||||
int nodeTypeIdVal = 22,
|
||||
string writerNameVal = "Shannon",
|
||||
string creatorNameVal = "Shannon",
|
||||
int writerIdVal = 33,
|
||||
int creatorIdVal = 33,
|
||||
string pathVal = "1,2,3,4,5",
|
||||
DateTime? createDateVal = null,
|
||||
DateTime? updateDateVal = null,
|
||||
int levelVal = 3)
|
||||
{
|
||||
if (!createDateVal.HasValue)
|
||||
createDateVal = DateTime.Parse("2012-01-02");
|
||||
if (!updateDateVal.HasValue)
|
||||
updateDateVal = DateTime.Parse("2012-01-02");
|
||||
int sortOrderVal = 44,
|
||||
string urlNameVal = "testing",
|
||||
string nodeTypeAliasVal = "myType",
|
||||
int nodeTypeIdVal = 22,
|
||||
string writerNameVal = "Shannon",
|
||||
string creatorNameVal = "Shannon",
|
||||
int writerIdVal = 33,
|
||||
int creatorIdVal = 33,
|
||||
string pathVal = "1,2,3,4,5",
|
||||
DateTime? createDateVal = null,
|
||||
DateTime? updateDateVal = null,
|
||||
int levelVal = 3,
|
||||
int parentIdVal = 321)
|
||||
{
|
||||
if (!createDateVal.HasValue)
|
||||
createDateVal = DateTime.Parse("2012-01-02");
|
||||
if (!updateDateVal.HasValue)
|
||||
updateDateVal = DateTime.Parse("2012-01-02");
|
||||
|
||||
Assert.AreEqual(idVal, doc.Id);
|
||||
DoAssert((IPublishedContent)dicDoc, idVal, keyVal, templateIdVal, sortOrderVal, urlNameVal, nodeTypeAliasVal, nodeTypeIdVal, writerNameVal,
|
||||
creatorNameVal, writerIdVal, creatorIdVal, pathVal, createDateVal, updateDateVal, levelVal);
|
||||
|
||||
//now validate the parentId that has been parsed, this doesn't exist on the IPublishedContent
|
||||
Assert.AreEqual(parentIdVal, dicDoc.ParentId);
|
||||
}
|
||||
|
||||
private void DoAssert(
|
||||
IPublishedContent doc,
|
||||
int idVal = 1234,
|
||||
Guid keyVal = default(Guid),
|
||||
int templateIdVal = 0,
|
||||
int sortOrderVal = 44,
|
||||
string urlNameVal = "testing",
|
||||
string nodeTypeAliasVal = "myType",
|
||||
int nodeTypeIdVal = 22,
|
||||
string writerNameVal = "Shannon",
|
||||
string creatorNameVal = "Shannon",
|
||||
int writerIdVal = 33,
|
||||
int creatorIdVal = 33,
|
||||
string pathVal = "1,2,3,4,5",
|
||||
DateTime? createDateVal = null,
|
||||
DateTime? updateDateVal = null,
|
||||
int levelVal = 3)
|
||||
{
|
||||
if (!createDateVal.HasValue)
|
||||
createDateVal = DateTime.Parse("2012-01-02");
|
||||
if (!updateDateVal.HasValue)
|
||||
updateDateVal = DateTime.Parse("2012-01-02");
|
||||
|
||||
Assert.AreEqual(idVal, doc.Id);
|
||||
Assert.AreEqual(keyVal, doc.Key);
|
||||
Assert.AreEqual(templateIdVal, doc.TemplateId);
|
||||
Assert.AreEqual(sortOrderVal, doc.SortOrder);
|
||||
Assert.AreEqual(urlNameVal, doc.UrlName);
|
||||
Assert.AreEqual(nodeTypeAliasVal, doc.DocumentTypeAlias);
|
||||
Assert.AreEqual(nodeTypeIdVal, doc.DocumentTypeId);
|
||||
Assert.AreEqual(writerNameVal, doc.WriterName);
|
||||
Assert.AreEqual(creatorNameVal, doc.CreatorName);
|
||||
Assert.AreEqual(writerIdVal, doc.WriterId);
|
||||
Assert.AreEqual(creatorIdVal, doc.CreatorId);
|
||||
Assert.AreEqual(pathVal, doc.Path);
|
||||
Assert.AreEqual(createDateVal.Value, doc.CreateDate);
|
||||
Assert.AreEqual(updateDateVal.Value, doc.UpdateDate);
|
||||
Assert.AreEqual(levelVal, doc.Level);
|
||||
Assert.AreEqual(templateIdVal, doc.TemplateId);
|
||||
Assert.AreEqual(sortOrderVal, doc.SortOrder);
|
||||
Assert.AreEqual(urlNameVal, doc.UrlName);
|
||||
Assert.AreEqual(nodeTypeAliasVal, doc.DocumentTypeAlias);
|
||||
Assert.AreEqual(nodeTypeIdVal, doc.DocumentTypeId);
|
||||
Assert.AreEqual(writerNameVal, doc.WriterName);
|
||||
Assert.AreEqual(creatorNameVal, doc.CreatorName);
|
||||
Assert.AreEqual(writerIdVal, doc.WriterId);
|
||||
Assert.AreEqual(creatorIdVal, doc.CreatorId);
|
||||
Assert.AreEqual(pathVal, doc.Path);
|
||||
Assert.AreEqual(createDateVal.Value, doc.CreateDate);
|
||||
Assert.AreEqual(updateDateVal.Value, doc.UpdateDate);
|
||||
Assert.AreEqual(levelVal, doc.Level);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user