V17 - Content Finder unit tests cleanup (#19989)

* Removing ContentFinderByUrlAndTemplateTests.cs and dependencies

* Removing ContentFinderByAliasTests.cs

* Removing ContentFinderByAliasWithDomainsTests.cs

* Removing ContentFinderByIdentifierTestsBase.cs

* Removing ContentFinderByIdTests.cs

* Fixing ContentFinderByKeyTests.cs & ContentFinderByPageIdQueryTests.cs to work with new code

* Removing ContentFinderByUrlTests.cs & ContentFinderByUrlWithDomainsTests.cs

* Fixing ContentFinderByPageIdQueryTests.cs to actually test the result rather than force the result

* Removing comment and adding test scenario

Author: NillasKA

src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs

@@ -42,7 +42,6 @@ internal static void AddAllCoreCollectionBuilders(this IUmbracoBuilder builder)
             .Append<ContentFinderByPageIdQuery>()
             .Append<ContentFinderByUrlNew>()
             .Append<ContentFinderByKeyPath>()
-            /*.Append<ContentFinderByUrlAndTemplate>() // disabled, this is an odd finder */
             .Append<ContentFinderByUrlAlias>()
             .Append<ContentFinderByRedirectUrl>();
         builder.EditorValidators().Add(() => builder.TypeLoader.GetTypes<IEditorValidator>());

tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByAliasTests.cs

@@ -1,53 +1,58 @@
-// using Microsoft.Extensions.Logging;
-// using Microsoft.Extensions.Options;
-// using Moq;
-// using NUnit.Framework;
-// using Umbraco.Cms.Core.Configuration.Models;
-// using Umbraco.Cms.Core.Routing;
-// using Umbraco.Cms.Core.Web;
-// using Umbraco.Extensions;
-//
-// namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
-//
-// FIXME: Reintroduce if relevant
-// [TestFixture]
-// public class ContentFinderByKeyTests : ContentFinderByIdentifierTestsBase
-// {
-//     [SetUp]
-//     public override void Setup()
-//     {
-//         base.Setup();
-//     }
-//
-//     [TestCase("/1598901d-ebbe-4996-b7fb-6a6cbac13a62", "1598901d-ebbe-4996-b7fb-6a6cbac13a62", true)]
-//     [TestCase("/1598901d-ebbe-4996-b7fb-6a6cbac13a62", "a383f6ed-cc54-46f1-a577-33f42e7214de", false)]
-//     public async Task Lookup_By_Key(string urlAsString, string nodeKeyString, bool shouldSucceed)
-//     {
-//         var nodeKey = Guid.Parse(nodeKeyString);
-//
-//         PopulateCache(9999, nodeKey);
-//
-//         var umbracoContextAccessor = GetUmbracoContextAccessor(urlAsString);
-//         var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
-//         var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
-//         var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
-//         var webRoutingSettings = new WebRoutingSettings();
-//         var lookup = new ContentFinderByKeyPath(
-//             Mock.Of<IOptionsMonitor<WebRoutingSettings>>(x => x.CurrentValue == webRoutingSettings),
-//             Mock.Of<ILogger<ContentFinderByKeyPath>>(),
-//             Mock.Of<IRequestAccessor>(),
-//             umbracoContextAccessor);
-//
-//         var result = await lookup.TryFindContent(frequest);
-//
-//         Assert.AreEqual(shouldSucceed, result);
-//         if (shouldSucceed)
-//         {
-//             Assert.AreEqual(frequest.PublishedContent!.Key, nodeKey);
-//         }
-//         else
-//         {
-//             Assert.IsNull(frequest.PublishedContent);
-//         }
-//     }
-// }
+using AutoFixture.NUnit3;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.Models.PublishedContent;
+using Umbraco.Cms.Core.Routing;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Web;
+using Umbraco.Cms.Tests.UnitTests.AutoFixture;
+
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+[TestFixture]
+public class ContentFinderByKeyTests
+{
+    [Test]
+    [InlineAutoMoqData("/1598901d-ebbe-4996-b7fb-6a6cbac13a62", "1598901d-ebbe-4996-b7fb-6a6cbac13a62", true)]
+    [InlineAutoMoqData("/1598901d-ebbe-4996-b7fb-6a6cbac13a62", "9E966427-25AB-4909-B403-DED1F421D1A7", false)]
+    public async Task Lookup_By_Key(
+        string urlAsString,
+        string nodeKeyString,
+        bool shouldSucceed,
+        [Frozen] IPublishedContent publishedContent,
+        [Frozen] IUmbracoContextAccessor umbracoContextAccessor,
+        [Frozen] IUmbracoContext umbracoContext,
+        IFileService fileService)
+    {
+        var absoluteUrl = "http://localhost" + urlAsString;
+
+        Guid nodeKey = Guid.Parse(nodeKeyString);
+
+        Mock.Get(umbracoContextAccessor).Setup(x => x.TryGetUmbracoContext(out umbracoContext)).Returns(true);
+        Mock.Get(umbracoContext).Setup(x => x.Content.GetById(nodeKey)).Returns(publishedContent);
+        Mock.Get(publishedContent).Setup(x => x.Key).Returns(nodeKey);
+
+        var publishedRequestBuilder = new PublishedRequestBuilder(new Uri(absoluteUrl, UriKind.Absolute), fileService);
+        var webRoutingSettings = new WebRoutingSettings();
+
+        var sut = new ContentFinderByKeyPath(
+            Mock.Of<IOptionsMonitor<WebRoutingSettings>>(x => x.CurrentValue == webRoutingSettings),
+            Mock.Of<ILogger<ContentFinderByKeyPath>>(),
+            Mock.Of<IRequestAccessor>(),
+            umbracoContextAccessor);
+
+        await sut.TryFindContent(publishedRequestBuilder);
+
+        if (shouldSucceed)
+        {
+            Assert.AreEqual(publishedRequestBuilder.PublishedContent!.Key, nodeKey);
+        }
+        else
+        {
+            Assert.AreNotEqual(publishedRequestBuilder.PublishedContent!.Key, nodeKey);
+        }
+    }
+}