* Update to dotnet 9 and update nuget packages * Update umbraco code version * Update Directory.Build.props Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> * Include preview version in pipeline * update template projects * update global json with specific version * Update version.json to v15 * Rename TrimStart and TrimEnd to string specific * Rename to Exact * Update global.json Co-authored-by: Ronald Barendse <ronald@barend.se> * Remove includePreviewVersion * Rename to trim exact * Add new Hybridcache project * Add tests * Start implementing PublishedContent.cs * Implement repository for content * Refactor to use async everywhere * Add cache refresher * make public as needed for serialization * Use content type cache to get content type out * Refactor to use ContentCacheNode model, that goes in the memory cache * Remove content node kit as its not needed * Implement tests for ensuring caching * Implement better asserts * Implement published property * Refactor to use mapping * Rename to document tests * Update to test properties * Create more tests * Refactor mock tests into own file * Update property test * Fix published version of content * Change default cache level to elements * Refactor to always have draft * Refactor to not use PublishedModelFactory * Added tests * Added and updated tests * Fixed tests * Don't return empty object with id * More tests * Added key * Another key * Refactor CacheService to be responsible for using the hybrid cache * Use notification handler to remove deleted content from cache * Add more tests for missing functions * Implement missing methods * Remove HasContent as it pertains to routing * Fik up test * formatting * refactor variable names * Implement variant tests * Map all the published content properties * Get item out of cache first, to assert updated * Implement member cache * Add member test * Implement media cache * Implement property tests for media tests * Refactor tests to use extension method * Add more media tests * Refactor properties to no longer have element caching * Don't use property cache level * Start implementing seeding * Only seed when main * Add Immutable for performance * Implement permanent seeding of content * Implement cache settings * Implement tests for seeding * Update package version * start refactoring nurepo * Refactor so draft & published nodes are cached individually * Refactor RefreshContent to take node instead of IContent * Refactor media to also use cache nodes * Remove member from repo as it isn't cached * Refactor media to not include preview, as media has no draft * create new benchmark project * POC Integration benchmarks with custom api controllers * Start implementing content picker tests * Implement domain cache * Rework content cache to implement interface * Start implementing elements cache * Implement published snapshot service * Publish snapshot tests * Use snapshot for elements cache * Create test proving we don't clear cache when updating content picker * Clear entire elements cache * Remove properties from element cache, when content gets updated. * Rename methods to async * Refactor to use old cache interfaces instead of new ones * Remove snapshot, as it is no longer needed * Fix tests building * Refactor domaincache to not have snapshots * Delete benchmarks * Delete benchmarks * Add HybridCacheProject to Umbraco * Add comment to route value transformer * Implement is draft * remove snapshot from property * V15 updated the hybrid caching integration tests to use ContentEditingService (#16947) * Added builder extension withParentKey * Created builder with ContentEditingService * Added usage of the ContentEditingService to SETUP * Started using ContentEditingService builder in tests * Updated builder extensions * Fixed builder * Clean up * Clean up, not done * Added Ids * Remove entries from cache on delete * Fix up seeding logic * Don't register hybrid cache twice * Change seeded entry options * Update hybrid cache package * Fix up published property to work with delivery api again * Fix dependency injection to work with tests * Fix naming * Dont make caches nullable * Make content node sealed * Remove path and other unused from content node * Remove hacky 2 phase ctor * Refactor to actually set content templates * Remove umbraco context * Remove "HasBy" methods * rename property data * Delete obsolete legacy stuff * Add todo for making expiration configurable * Add todo in UmbracoContext * Add clarifying comment in content factory * Remove xml stuff from published property * Fix according to review * Make content type cache injectible * Make content type cache injectible * Rename to database cache repository * Rename to document cache * Add TODO * Refactor to async * Rename to async * Make everything async * Remove duplicate line from json schema * Move Hybrid cache project * Remove leftover file * Refactor to use keys * Refactor published content to no longer have content data, as it is on the node itself * Refactor to member to use proper content node ctor * Move tests to own folder * Add immutable objects to property and content data for performance * Make property data public * Fix member caching to be singleton * Obsolete GetContentType * Remove todo * Fix naming * Fix lots of exposed errors due to scope test * Add final scope tests * Rename to document cache service * Rename test files * Create new doc type tests * Add ignore to tests * Start implementing refresh for content type save * Clear contenttype cache when contenttype is updated * Fix test Teh contenttype is not upated unless the property is dirty * Updated tests * Added tests * Use init for ContentSourceDto * Startup of setup * Fix get by key in PublishedContentTypeCache * Remove ContentType from PublishedContentTypeCache when contenttype is deleted * Created interfaces for the builder with the necessary properties * Created builder for PropertyTypeContainer * Created builder for PropertyTypeEditing * Created builder for PropertyTypeValidationEditing * Made adjustments to the builder * Updated name of usage * Commented out to test * Cleaned up builders * Updated integration test setup * Moved tests * Added interface * Add IDocumentSeedKeyProvider and migrate existing logic to seed key provider * Added functionality to the INavigationQueryService to get root keys * Fixed issue with navigation * Created helper to Convert a IContentType to ContentTypeUpdateModel * Added interfaces * Added builder * Cleaned up builders and added fixes * Added tests for PublishedContentTypeCache * Applied changes in builder * Add BreadthFirstKeyProvider * Use ISet for seedkey providers * Implement GetContentSource by key * Seed the cache with keys provided by seed key providers * Builder updates * Test setup updates * Updated tests * Dont require contenttype keys for seeding * Fix cache settings * Don't inject cache settings into SeedingNotificationHandler * Fix tests * Use enlistment for setting updated cache item * Pin seeded nodes for longer * Fix BreadthFirstKeyProvider * Fix ContentTypeSeedKeyProvider * Fix tests * Only seed published documents * Only cache published if contentCacheNode is not draft * Fix incorrect templateId * Removed unnecessary setup * initialized value * Fixed template test * Removed test * Updated tests * Removed code that was not used * Removed unused cacheSettings * Re-organize to support media cache seeding * Add MediaBreadthFirstKeyProvider * Seed media * Don't use IdKeyMap when removing content from cache * Don't clear IdKeyMap in DocumentCacheService * Add unit tests * Don't use IdKeyMap when deleting media * Add default value to timespan * Use cancellation tokens when doing loop * Fixed Models Builder error --------- Co-authored-by: Zeegaan <skrivdetud@gmail.com> Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Co-authored-by: Ronald Barendse <ronald@barend.se> Co-authored-by: Andreas Zerbst <andr317c@live.dk> Co-authored-by: Sven Geusens <sge@umbraco.dk> Co-authored-by: Andreas Zerbst <73799582+andr317c@users.noreply.github.com> Co-authored-by: Bjarke Berg <mail@bergmania.dk>
496 lines
17 KiB
C#
496 lines
17 KiB
C#
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.Models.ContentEditing;
|
|
using Umbraco.Cms.Core.Models.PublishedContent;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Tests.Common.Testing;
|
|
using Umbraco.Cms.Tests.Integration.Testing;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.PublishedCache.HybridCache;
|
|
|
|
[TestFixture]
|
|
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
|
|
[Platform("Linux", Reason = "This uses too much memory when running both caches, should be removed when nuchache is removed")]
|
|
public class DocumentHybridCacheTests : UmbracoIntegrationTestWithContentEditing
|
|
{
|
|
protected override void CustomTestSetup(IUmbracoBuilder builder) => builder.AddUmbracoHybridCache();
|
|
|
|
private IPublishedContentCache PublishedContentHybridCache => GetRequiredService<IPublishedContentCache>();
|
|
|
|
private IContentEditingService ContentEditingService => GetRequiredService<IContentEditingService>();
|
|
|
|
private IContentPublishingService ContentPublishingService => GetRequiredService<IContentPublishingService>();
|
|
|
|
private const string NewName = "New Name";
|
|
private const string NewTitle = "New Title";
|
|
|
|
[Test]
|
|
public async Task Can_Get_Draft_Content_By_Id()
|
|
{
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(TextpageId, true);
|
|
|
|
// Assert
|
|
AssertTextPage(textPage);
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Draft_Content_By_Key()
|
|
{
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(Textpage.Key.Value, true);
|
|
|
|
// Assert
|
|
AssertTextPage(textPage);
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Published_Content_By_Id()
|
|
{
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(PublishedTextPageId);
|
|
|
|
// Assert
|
|
AssertPublishedTextPage(textPage);
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Published_Content_By_Key()
|
|
{
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(PublishedTextPage.Key.Value);
|
|
|
|
// Assert
|
|
AssertPublishedTextPage(textPage);
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Draft_Of_Published_Content_By_Id()
|
|
{
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(PublishedTextPageId, true);
|
|
|
|
// Assert
|
|
AssertPublishedTextPage(textPage);
|
|
Assert.IsFalse(textPage.IsPublished());
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Draft_Of_Published_Content_By_Key()
|
|
{
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(PublishedTextPage.Key.Value, true);
|
|
|
|
// Assert
|
|
AssertPublishedTextPage(textPage);
|
|
Assert.IsFalse(textPage.IsPublished());
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Updated_Draft_Content_By_Id()
|
|
{
|
|
// Arrange
|
|
Textpage.InvariantName = NewName;
|
|
ContentUpdateModel updateModel = new ContentUpdateModel
|
|
{
|
|
InvariantName = NewName,
|
|
InvariantProperties = Textpage.InvariantProperties,
|
|
Variants = Textpage.Variants,
|
|
TemplateKey = Textpage.TemplateKey,
|
|
};
|
|
await ContentEditingService.UpdateAsync(Textpage.Key.Value, updateModel, Constants.Security.SuperUserKey);
|
|
|
|
// Act
|
|
var updatedPage = await PublishedContentHybridCache.GetByIdAsync(TextpageId, true);
|
|
|
|
// Assert
|
|
Assert.AreEqual(NewName, updatedPage.Name);
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Updated_Draft_Content_By_Key()
|
|
{
|
|
// Arrange
|
|
Textpage.InvariantName = NewName;
|
|
ContentUpdateModel updateModel = new ContentUpdateModel
|
|
{
|
|
InvariantName = NewName,
|
|
InvariantProperties = Textpage.InvariantProperties,
|
|
Variants = Textpage.Variants,
|
|
TemplateKey = Textpage.TemplateKey,
|
|
};
|
|
await ContentEditingService.UpdateAsync(Textpage.Key.Value, updateModel, Constants.Security.SuperUserKey);
|
|
|
|
// Act
|
|
var updatedPage = await PublishedContentHybridCache.GetByIdAsync(Textpage.Key.Value, true);
|
|
|
|
// Assert
|
|
Assert.AreEqual(NewName, updatedPage.Name);
|
|
}
|
|
|
|
[Test]
|
|
[TestCase(true, true)]
|
|
[TestCase(false, false)]
|
|
// BETTER NAMING, CURRENTLY THIS IS TESTING BOTH THE PUBLISHED AND THE DRAFT OF THE PUBLISHED.
|
|
public async Task Can_Get_Updated_Draft_Published_Content_By_Id(bool preview, bool result)
|
|
{
|
|
// Arrange
|
|
PublishedTextPage.InvariantName = NewName;
|
|
ContentUpdateModel updateModel = new ContentUpdateModel
|
|
{
|
|
InvariantName = NewName,
|
|
InvariantProperties = PublishedTextPage.InvariantProperties,
|
|
Variants = PublishedTextPage.Variants,
|
|
TemplateKey = PublishedTextPage.TemplateKey,
|
|
};
|
|
await ContentEditingService.UpdateAsync(PublishedTextPage.Key.Value, updateModel, Constants.Security.SuperUserKey);
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(PublishedTextPageId, preview);
|
|
|
|
// Assert
|
|
Assert.AreEqual(result, NewName.Equals(textPage.Name));
|
|
}
|
|
|
|
[Test]
|
|
[TestCase(true, true)]
|
|
[TestCase(false, false)]
|
|
// BETTER NAMING, CURRENTLY THIS IS TESTING BOTH THE PUBLISHED AND THE DRAFT OF THE PUBLISHED.
|
|
public async Task Can_Get_Updated_Draft_Published_Content_By_Key(bool preview, bool result)
|
|
{
|
|
// Arrange
|
|
PublishedTextPage.InvariantName = NewName;
|
|
ContentUpdateModel updateModel = new ContentUpdateModel
|
|
{
|
|
InvariantName = NewName,
|
|
InvariantProperties = PublishedTextPage.InvariantProperties,
|
|
Variants = PublishedTextPage.Variants,
|
|
TemplateKey = PublishedTextPage.TemplateKey,
|
|
};
|
|
await ContentEditingService.UpdateAsync(PublishedTextPage.Key.Value, updateModel, Constants.Security.SuperUserKey);
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(PublishedTextPage.Key.Value, preview);
|
|
|
|
// Assert
|
|
Assert.AreEqual(result, NewName.Equals(textPage.Name));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Draft_Content_Property_By_Id()
|
|
{
|
|
// Arrange
|
|
var titleValue = Textpage.InvariantProperties.First(x => x.Alias == "title").Value;
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(TextpageId, true);
|
|
|
|
// Assert
|
|
Assert.AreEqual(titleValue, textPage.Value("title"));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Draft_Content_Property_By_Key()
|
|
{
|
|
// Arrange
|
|
var titleValue = Textpage.InvariantProperties.First(x => x.Alias == "title").Value;
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(Textpage.Key.Value, true);
|
|
|
|
// Assert
|
|
Assert.AreEqual(titleValue, textPage.Value("title"));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Published_Content_Property_By_Id()
|
|
{
|
|
// Arrange
|
|
var titleValue = PublishedTextPage.InvariantProperties.First(x => x.Alias == "title").Value;
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(PublishedTextPageId, true);
|
|
|
|
// Assert
|
|
Assert.AreEqual(titleValue, textPage.Value("title"));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Published_Content_Property_By_Key()
|
|
{
|
|
// Arrange
|
|
var titleValue = PublishedTextPage.InvariantProperties.First(x => x.Alias == "title").Value;
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(PublishedTextPage.Key.Value, true);
|
|
|
|
// Assert
|
|
Assert.AreEqual(titleValue, textPage.Value("title"));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Draft_Of_Published_Content_Property_By_Id()
|
|
{
|
|
// Arrange
|
|
var titleValue = PublishedTextPage.InvariantProperties.First(x => x.Alias == "title").Value;
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(PublishedTextPageId, true);
|
|
|
|
// Assert
|
|
Assert.AreEqual(titleValue, textPage.Value("title"));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Draft_Of_Published_Content_Property_By_Key()
|
|
{
|
|
// Arrange
|
|
var titleValue = PublishedTextPage.InvariantProperties.First(x => x.Alias == "title").Value;
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(PublishedTextPage.Key.Value, true);
|
|
|
|
// Assert
|
|
Assert.AreEqual(titleValue, textPage.Value("title"));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Updated_Draft_Content_Property_By_Id()
|
|
{
|
|
// Arrange
|
|
Textpage.InvariantProperties.First(x => x.Alias == "title").Value = NewTitle;
|
|
ContentUpdateModel updateModel = new ContentUpdateModel
|
|
{
|
|
InvariantName = Textpage.InvariantName,
|
|
InvariantProperties = Textpage.InvariantProperties,
|
|
Variants = Textpage.Variants,
|
|
TemplateKey = Textpage.TemplateKey,
|
|
};
|
|
await ContentEditingService.UpdateAsync(Textpage.Key.Value, updateModel, Constants.Security.SuperUserKey);
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(TextpageId, true);
|
|
|
|
// Assert
|
|
Assert.AreEqual(NewTitle, textPage.Value("title"));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Updated_Draft_Content_Property_By_Key()
|
|
{
|
|
// Arrange
|
|
Textpage.InvariantProperties.First(x => x.Alias == "title").Value = NewTitle;
|
|
ContentUpdateModel updateModel = new ContentUpdateModel
|
|
{
|
|
InvariantName = Textpage.InvariantName,
|
|
InvariantProperties = Textpage.InvariantProperties,
|
|
Variants = Textpage.Variants,
|
|
TemplateKey = Textpage.TemplateKey,
|
|
};
|
|
await ContentEditingService.UpdateAsync(Textpage.Key.Value, updateModel, Constants.Security.SuperUserKey);
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(Textpage.Key.Value, true);
|
|
|
|
// Assert
|
|
Assert.AreEqual(NewTitle, textPage.Value("title"));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Updated_Published_Content_Property_By_Id()
|
|
{
|
|
// Arrange
|
|
PublishedTextPage.InvariantProperties.First(x => x.Alias == "title").Value = NewTitle;
|
|
ContentUpdateModel updateModel = new ContentUpdateModel
|
|
{
|
|
InvariantName = PublishedTextPage.InvariantName,
|
|
InvariantProperties = PublishedTextPage.InvariantProperties,
|
|
Variants = PublishedTextPage.Variants,
|
|
TemplateKey = PublishedTextPage.TemplateKey,
|
|
};
|
|
await ContentEditingService.UpdateAsync(PublishedTextPage.Key.Value, updateModel, Constants.Security.SuperUserKey);
|
|
await ContentPublishingService.PublishAsync(PublishedTextPage.Key.Value, CultureAndSchedule, Constants.Security.SuperUserKey);
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(PublishedTextPage.Key.Value, true);
|
|
|
|
// Assert
|
|
Assert.AreEqual(NewTitle, textPage.Value("title"));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Updated_Published_Content_Property_By_Key()
|
|
{
|
|
// Arrange
|
|
PublishedTextPage.InvariantProperties.First(x => x.Alias == "title").Value = NewTitle;
|
|
ContentUpdateModel updateModel = new ContentUpdateModel
|
|
{
|
|
InvariantName = PublishedTextPage.InvariantName,
|
|
InvariantProperties = PublishedTextPage.InvariantProperties,
|
|
Variants = PublishedTextPage.Variants,
|
|
TemplateKey = PublishedTextPage.TemplateKey,
|
|
};
|
|
await ContentEditingService.UpdateAsync(PublishedTextPage.Key.Value, updateModel, Constants.Security.SuperUserKey);
|
|
await ContentPublishingService.PublishAsync(PublishedTextPage.Key.Value, CultureAndSchedule, Constants.Security.SuperUserKey);
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(PublishedTextPage.Key.Value);
|
|
|
|
// Assert
|
|
Assert.AreEqual(NewTitle, textPage.Value("title"));
|
|
}
|
|
|
|
[Test]
|
|
[TestCase(true, "New Title")]
|
|
[TestCase(false, "Welcome to our Home page")]
|
|
public async Task Can_Get_Updated_Draft_Of_Published_Content_Property_By_Id(bool preview, string titleName)
|
|
{
|
|
// Arrange
|
|
PublishedTextPage.InvariantProperties.First(x => x.Alias == "title").Value = NewTitle;
|
|
ContentUpdateModel updateModel = new ContentUpdateModel
|
|
{
|
|
InvariantName = PublishedTextPage.InvariantName,
|
|
InvariantProperties = PublishedTextPage.InvariantProperties,
|
|
Variants = PublishedTextPage.Variants,
|
|
TemplateKey = PublishedTextPage.TemplateKey,
|
|
};
|
|
await ContentEditingService.UpdateAsync(PublishedTextPage.Key.Value, updateModel, Constants.Security.SuperUserKey);
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(PublishedTextPageId, preview);
|
|
|
|
// Assert
|
|
Assert.AreEqual(titleName, textPage.Value("title"));
|
|
}
|
|
|
|
[Test]
|
|
[TestCase(true, "New Name")]
|
|
[TestCase(false, "Welcome to our Home page")]
|
|
public async Task Can_Get_Updated_Draft_Of_Published_Content_Property_By_Key(bool preview, string titleName)
|
|
{
|
|
// Arrange
|
|
PublishedTextPage.InvariantProperties.First(x => x.Alias == "title").Value = titleName;
|
|
ContentUpdateModel updateModel = new ContentUpdateModel
|
|
{
|
|
InvariantName = PublishedTextPage.InvariantName,
|
|
InvariantProperties = PublishedTextPage.InvariantProperties,
|
|
Variants = PublishedTextPage.Variants,
|
|
TemplateKey = PublishedTextPage.TemplateKey,
|
|
};
|
|
await ContentEditingService.UpdateAsync(PublishedTextPage.Key.Value, updateModel, Constants.Security.SuperUserKey);
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(PublishedTextPage.Key.Value, true);
|
|
|
|
// Assert
|
|
Assert.AreEqual(titleName, textPage.Value("title"));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Not_Get_Deleted_Content_By_Id()
|
|
{
|
|
// Arrange
|
|
var content = await PublishedContentHybridCache.GetByIdAsync(Subpage1Id, true);
|
|
Assert.IsNotNull(content);
|
|
await ContentEditingService.DeleteAsync(Subpage1.Key.Value, Constants.Security.SuperUserKey);
|
|
|
|
// Act
|
|
var textPagePublishedContent = await PublishedContentHybridCache.GetByIdAsync(Subpage1Id, false);
|
|
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(Subpage1Id, true);
|
|
|
|
// Assert
|
|
Assert.IsNull(textPage);
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Not_Get_Deleted_Content_By_Key()
|
|
{
|
|
// Arrange
|
|
await PublishedContentHybridCache.GetByIdAsync(Subpage1.Key.Value, true);
|
|
var hasContent = await PublishedContentHybridCache.GetByIdAsync(Subpage1Id, true);
|
|
Assert.IsNotNull(hasContent);
|
|
await ContentEditingService.DeleteAsync(Subpage1.Key.Value, Constants.Security.SuperUserKey);
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(Subpage1.Key.Value, true);
|
|
|
|
// Assert
|
|
Assert.IsNull(textPage);
|
|
}
|
|
|
|
[Test]
|
|
[TestCase(true)]
|
|
[TestCase(false)]
|
|
public async Task Can_Not_Get_Deleted_Published_Content_By_Id(bool preview)
|
|
{
|
|
// Arrange
|
|
await ContentEditingService.DeleteAsync(PublishedTextPage.Key.Value, Constants.Security.SuperUserKey);
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(PublishedTextPageId, preview);
|
|
|
|
// Assert
|
|
Assert.IsNull(textPage);
|
|
}
|
|
|
|
[Test]
|
|
[TestCase(true)]
|
|
[TestCase(false)]
|
|
public async Task Can_Not_Get_Deleted_Published_Content_By_Key(bool preview)
|
|
{
|
|
// Arrange
|
|
await ContentEditingService.DeleteAsync(PublishedTextPage.Key.Value, Constants.Security.SuperUserKey);
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(PublishedTextPage.Key.Value, preview);
|
|
|
|
// Assert
|
|
Assert.IsNull(textPage);
|
|
}
|
|
|
|
private void AssertTextPage(IPublishedContent textPage)
|
|
{
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.IsNotNull(textPage);
|
|
Assert.AreEqual(Textpage.Key, textPage.Key);
|
|
Assert.AreEqual(Textpage.ContentTypeKey, textPage.ContentType.Key);
|
|
Assert.AreEqual(Textpage.InvariantName, textPage.Name);
|
|
});
|
|
|
|
AssertProperties(Textpage.InvariantProperties, textPage.Properties);
|
|
}
|
|
|
|
private void AssertPublishedTextPage(IPublishedContent textPage)
|
|
{
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.IsNotNull(textPage);
|
|
Assert.AreEqual(PublishedTextPage.Key, textPage.Key);
|
|
Assert.AreEqual(PublishedTextPage.ContentTypeKey, textPage.ContentType.Key);
|
|
Assert.AreEqual(PublishedTextPage.InvariantName, textPage.Name);
|
|
});
|
|
|
|
AssertProperties(PublishedTextPage.InvariantProperties, textPage.Properties);
|
|
}
|
|
|
|
private void AssertProperties(IEnumerable<PropertyValueModel> propertyCollection, IEnumerable<IPublishedProperty> publishedProperties)
|
|
{
|
|
foreach (var prop in propertyCollection)
|
|
{
|
|
AssertProperty(prop, publishedProperties.First(x => x.Alias == prop.Alias));
|
|
}
|
|
}
|
|
|
|
private void AssertProperty(PropertyValueModel property, IPublishedProperty publishedProperty)
|
|
{
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.AreEqual(property.Alias, publishedProperty.Alias);
|
|
Assert.AreEqual(property.Value, publishedProperty.GetSourceValue());
|
|
});
|
|
}
|
|
}
|