* Remove nucache reference from Web.Common * Get tests building-ish * Move ReservedFieldNamesService to the right project * Remove IPublishedSnapshotStatus * Added functionality to the INavigationQueryService to get root keys * Fixed issue with navigation * Remove IPublishedSnapshot from UmbracoContext * Begin removing usage of IPublishedSnapshot from PublishedContentExtensions * Fix PublishedContentExtensions.cs * Don't use snapshots in delivery media api * Use IPublishedMediaCache in QueryMediaApiController * Remove more usages of IPublishedSnapshotAccessor * Comment out tests * Remove more usages of PublishedSnapshotAccessor * Remove PublishedSnapshot from property * Fixed test build * Fix errors * Fix some tests * Delete NuCache 🎉 * Implement DatabaseCacheRebuilder * Remove usage of IPublishedSnapshotService * Remove IPublishedSnapshotService * Remove TestPublishedSnapshotAccessor and make tests build * Don't test Snapshot cachelevel It's no longer supported * Fix BlockEditorConverter Element != Element document type * Remember to set cachemanager * Fix RichTextParserTests * Implement TryGetLevel on INavigationQueryService * Fake level and obsolete it in PublishedContent * Remove ChildrenForAllCultures * Hack Path property on PublishedContent * Remove usages of IPublishedSnapshot in tests * More ConvertersTests * Add hybrid cache to integration tests We can actually do this now because we no longer save files on disk * Rename IPublishedSnapshotRebuilder to ICacheRebuilder * Comment out tests * V15: Replacing the usages of Parent (navigation data) from IPublishedContent (#17125) * Fix .Parent references in PublishedContentExtensions * Add missing methods to FriendlyPublishedContentExtensions (ones that you were able to call on the content directly as they now require extra params) * Fix references from the extension methods * Fix dependencies in tests * Replace IPublishedSnapshotAccessor with the content cache in tests * Resolving more .Parent references * Fix unit tests * Obsolete and use extension methods * Remove private method and use extension instead * Moving code around * Fix tests * Fix more references * Cleanup * Fix more usages * Resolve merge conflict * Fix tests * Cleanup * Fix more tests * Fixed unit tests * Cleanup * Replace last usages --------- Co-authored-by: Bjarke Berg <mail@bergmania.dk> * Remove usage of IPublishedSnapshotAccessor from IRequestItemProvider * Post merge fixup * Remo IPublishedSnapshot * Add HasAny to IDocumentUrlService * Fix TextBuilder * Fix modelsbuilder tests * Use explicit types * Implement GetByContentType * Support element types in PublishedContentTypeCache * Run enlistments before publishing notifications * Fix elements cache refreshing * Implement GetByUdi * Implement GetAtRoot * Implement GetByRoute * Reimplement GetRouteById * Fix blocks unit tests * Initialize domain cache on boot * Only return routes with domains on non default lanauges * V15: Replacing the usages of `Children` (navigation data) from `IPublishedContent` (#17159) * Update params in PublishedContentExtensions to the general interfaces for the published cache and navigation service, so that we can use the extension methods on both documents and media * Introduce GetParent() which uses the right services * Fix obsolete message on .Parent * Obsolete .Children * Fix usages of Children for ApiMediaQueryService * Fix usage in internal * Fix usages in views * Fix indentation * Fix issue with delete language * Update nuget pacakges * Clear elements cache when content is deleted instead of trying to update it * Reset publishedModelFactory * Fixed publishing --------- Co-authored-by: Bjarke Berg <mail@bergmania.dk> Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Co-authored-by: kjac <kja@umbraco.dk>
197 lines
7.4 KiB
C#
197 lines
7.4 KiB
C#
// using System.Collections.Generic;
|
|
// using System.Linq;
|
|
// using Moq;
|
|
// using NUnit.Framework;
|
|
// using Umbraco.Cms.Core.Models;
|
|
// using Umbraco.Cms.Core.Routing;
|
|
// using Umbraco.Cms.Core.Services;
|
|
// using Umbraco.Cms.Infrastructure.PublishedCache;
|
|
// using Umbraco.Cms.Tests.Common.Builders;
|
|
// using Umbraco.Cms.Tests.Common.Builders.Extensions;
|
|
// using Umbraco.Cms.Tests.UnitTests.TestHelpers;
|
|
// using Umbraco.Extensions;
|
|
//
|
|
// namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache;
|
|
//
|
|
// FIXME: Reintroduce if relevant
|
|
// /// <summary>
|
|
// /// Unit tests for IPublishedContent and extensions
|
|
// /// </summary>
|
|
// [TestFixture]
|
|
// public class PublishedContentDataTableTests : PublishedSnapshotServiceTestBase
|
|
// {
|
|
// private readonly DataType[] _dataTypes = GetDefaultDataTypes();
|
|
//
|
|
// private static ContentType CreateContentType(string name, IDataType dataType, IReadOnlyDictionary<string, string> propertyAliasesAndNames)
|
|
// {
|
|
// var contentType = new ContentType(TestHelper.ShortStringHelper, -1)
|
|
// {
|
|
// Alias = name,
|
|
// Name = name,
|
|
// Key = Guid.NewGuid(),
|
|
// Id = name.GetHashCode(),
|
|
// };
|
|
// foreach (var prop in propertyAliasesAndNames)
|
|
// {
|
|
// contentType.AddPropertyType(new PropertyType(TestHelper.ShortStringHelper, dataType, prop.Key)
|
|
// {
|
|
// Name = prop.Value,
|
|
// });
|
|
// }
|
|
//
|
|
// return contentType;
|
|
// }
|
|
//
|
|
// private IEnumerable<ContentNodeKit> CreateCache(
|
|
// bool createChildren,
|
|
// IDataType dataType,
|
|
// out ContentType[] contentTypes)
|
|
// {
|
|
// var result = new List<ContentNodeKit>();
|
|
// var valueCounter = 1;
|
|
// var parentId = 3;
|
|
//
|
|
// var properties = new Dictionary<string, string> { ["property1"] = "Property 1", ["property2"] = "Property 2" };
|
|
//
|
|
// var parentContentType = CreateContentType(
|
|
// "Parent",
|
|
// dataType,
|
|
// new Dictionary<string, string>(properties) { ["property3"] = "Property 3" });
|
|
// var childContentType = CreateContentType(
|
|
// "Child",
|
|
// dataType,
|
|
// new Dictionary<string, string>(properties) { ["property4"] = "Property 4" });
|
|
// var child2ContentType = CreateContentType(
|
|
// "Child2",
|
|
// dataType,
|
|
// new Dictionary<string, string>(properties) { ["property4"] = "Property 4" });
|
|
//
|
|
// contentTypes = new[] { parentContentType, childContentType, child2ContentType };
|
|
//
|
|
// var parentData = new ContentDataBuilder()
|
|
// .WithName("Page" + Guid.NewGuid())
|
|
// .WithProperties(new PropertyDataBuilder()
|
|
// .WithPropertyData("property1", "value" + valueCounter)
|
|
// .WithPropertyData("property2", "value" + (valueCounter + 1))
|
|
// .WithPropertyData("property3", "value" + (valueCounter + 2))
|
|
// .Build())
|
|
// .Build();
|
|
//
|
|
// var parent = ContentNodeKitBuilder.CreateWithContent(
|
|
// parentContentType.Id,
|
|
// parentId,
|
|
// $"-1,{parentId}",
|
|
// draftData: parentData,
|
|
// publishedData: parentData);
|
|
//
|
|
// result.Add(parent);
|
|
//
|
|
// if (createChildren)
|
|
// {
|
|
// for (var i = 0; i < 3; i++)
|
|
// {
|
|
// valueCounter += 3;
|
|
// var childId = parentId + i + 1;
|
|
//
|
|
// var childData = new ContentDataBuilder()
|
|
// .WithName("Page" + Guid.NewGuid())
|
|
// .WithProperties(new PropertyDataBuilder()
|
|
// .WithPropertyData("property1", "value" + valueCounter)
|
|
// .WithPropertyData("property2", "value" + (valueCounter + 1))
|
|
// .WithPropertyData("property4", "value" + (valueCounter + 2))
|
|
// .Build())
|
|
// .Build();
|
|
//
|
|
// var child = ContentNodeKitBuilder.CreateWithContent(
|
|
// i > 0 ? childContentType.Id : child2ContentType.Id,
|
|
// childId,
|
|
// $"-1,{parentId},{childId}",
|
|
// i,
|
|
// draftData: childData,
|
|
// publishedData: childData);
|
|
//
|
|
// result.Add(child);
|
|
// }
|
|
// }
|
|
//
|
|
// return result;
|
|
// }
|
|
//
|
|
// [Test]
|
|
// public void To_DataTable()
|
|
// {
|
|
// var cache = CreateCache(true, _dataTypes[0], out var contentTypes);
|
|
// InitializedCache(cache, contentTypes, _dataTypes);
|
|
//
|
|
// var snapshot = GetPublishedSnapshot();
|
|
// var root = snapshot.Content.GetAtRoot().First();
|
|
//
|
|
// var dt = root.ChildrenAsTable(
|
|
// VariationContextAccessor,
|
|
// ContentTypeService,
|
|
// MediaTypeService,
|
|
// Mock.Of<IMemberTypeService>(),
|
|
// Mock.Of<IPublishedUrlProvider>());
|
|
//
|
|
// Assert.AreEqual(11, dt.Columns.Count);
|
|
// Assert.AreEqual(3, dt.Rows.Count);
|
|
// Assert.AreEqual("value4", dt.Rows[0]["Property 1"]);
|
|
// Assert.AreEqual("value5", dt.Rows[0]["Property 2"]);
|
|
// Assert.AreEqual("value6", dt.Rows[0]["Property 4"]);
|
|
// Assert.AreEqual("value7", dt.Rows[1]["Property 1"]);
|
|
// Assert.AreEqual("value8", dt.Rows[1]["Property 2"]);
|
|
// Assert.AreEqual("value9", dt.Rows[1]["Property 4"]);
|
|
// Assert.AreEqual("value10", dt.Rows[2]["Property 1"]);
|
|
// Assert.AreEqual("value11", dt.Rows[2]["Property 2"]);
|
|
// Assert.AreEqual("value12", dt.Rows[2]["Property 4"]);
|
|
// }
|
|
//
|
|
// [Test]
|
|
// public void To_DataTable_With_Filter()
|
|
// {
|
|
// var cache = CreateCache(true, _dataTypes[0], out var contentTypes);
|
|
// InitializedCache(cache, contentTypes, _dataTypes);
|
|
//
|
|
// var snapshot = GetPublishedSnapshot();
|
|
// var root = snapshot.Content.GetAtRoot().First();
|
|
//
|
|
// var dt = root.ChildrenAsTable(
|
|
// VariationContextAccessor,
|
|
// ContentTypeService,
|
|
// MediaTypeService,
|
|
// Mock.Of<IMemberTypeService>(),
|
|
// Mock.Of<IPublishedUrlProvider>(),
|
|
// "Child");
|
|
//
|
|
// Assert.AreEqual(11, dt.Columns.Count);
|
|
// Assert.AreEqual(2, dt.Rows.Count);
|
|
// Assert.AreEqual("value7", dt.Rows[0]["Property 1"]);
|
|
// Assert.AreEqual("value8", dt.Rows[0]["Property 2"]);
|
|
// Assert.AreEqual("value9", dt.Rows[0]["Property 4"]);
|
|
// Assert.AreEqual("value10", dt.Rows[1]["Property 1"]);
|
|
// Assert.AreEqual("value11", dt.Rows[1]["Property 2"]);
|
|
// Assert.AreEqual("value12", dt.Rows[1]["Property 4"]);
|
|
// }
|
|
//
|
|
// [Test]
|
|
// public void To_DataTable_No_Rows()
|
|
// {
|
|
// var cache = CreateCache(false, _dataTypes[0], out var contentTypes);
|
|
// InitializedCache(cache, contentTypes, _dataTypes);
|
|
//
|
|
// var snapshot = GetPublishedSnapshot();
|
|
// var root = snapshot.Content.GetAtRoot().First();
|
|
//
|
|
// var dt = root.ChildrenAsTable(
|
|
// VariationContextAccessor,
|
|
// ContentTypeService,
|
|
// MediaTypeService,
|
|
// Mock.Of<IMemberTypeService>(),
|
|
// Mock.Of<IPublishedUrlProvider>());
|
|
//
|
|
// // will return an empty data table
|
|
// Assert.AreEqual(0, dt.Columns.Count);
|
|
// Assert.AreEqual(0, dt.Rows.Count);
|
|
// }
|
|
// }
|