* Removed obsoletes from IConfigManipulator. * Removed obsolete models builder extensions. * Removed the obsolete ContentDashboardSettings. * Removed the obsolete InstallMissingDatabase setting on GlobalSettings. * Removed obsolete NuCache settings. * Removed obsolete RuntimeMinificationSettings. * Removed obsolete health check constant. * Removed obsolete icon constant. * Removed obsolete telemetry constant. * Removed obsolete property and constructor on UmbracoBuilder. * Removed obsolete constructor on AuditNotificationsHandler. * Removed obsolete constructor on HTTP header health checks. * Removed obsolete constructor on MediaFileManager. * Removed obsolete GetDefaultFileContent on ViewHelper. * Remove obsoleted methods on embed providers. * Fix tests. * Removed obsolete constructors on BlockEditorDataConverter. * Removed obsolete SeedCacheDuration property on CacheSettings. * Removed obsolete PublishCulture on ContentRepositoryExtensions. * Removed obsolete MonitorLock. * Removed obsolete synchronous HasSavedValues from IDataTypeUsageService and IDataTypeUsageRepository. * Removed obsolete HasSavedPropertyValues from IPropertyTypeUsageService and IPropertyTypeUsageRepository. * Removed obsolete methods in ITrackedReferencesService and ITrackedReferencesRepository. * Removed obsolete DateValueEditor constructors. * Removed obsolete GetAutomaticRelationTypesAliases. * Removed obsolete constructor on TextOnlyValueEditor. * Removed obsolete constructors on RegexValidator and RequiredValidator. * Removed obsolete constructs on SliderValueConverter and TagsValueConverter. * Removed obsolete GetContentType methods from IPublishedCache. * Removed ContentFinderByIdPath. * Removed obsolete constructor on DefaultMediaUrlProvider. * Removed obsolete constructor on Domain. * Removed obsolete constructor on PublishedRequest. * Removed obsolete methods on CheckPermissions. * Removed obsolete GetUserId from IBackOfficeSecurity. * Removed obsolete methods on LegacyPasswordSecurity. * Removed obsolete constructors on AuditService. * Removed obsolete methods on IContentEditingService. * Remove obsolete constructors and methods on ContentService/IContentService. * Removed obsolete constructor in ContentTypeEditingService. * Removed obsolete constructor in MediaTypeEditingService. * Removed obsolete constructor in MemberTypeEditingService. * Removed obsolete constructor in ContentTypeService. * Removed obsolete constructors in ContentTypeServiceBase. * Removed obsolete constructors and methods in ContentVersionService. * Removed obsolete constructor in DataTypeUsageService. * Removed obsolete constructor in DomainService. * Removed obsolete constructor in FileService. * Removes obsolete AttemptMove from IContentService. * Removes obsolete SetPreventCleanup from IContentVersionService. * Removes obsolete GetReferences from IDataTypeService. * Removed obsolete SetConsentLevel from IMetricsConsentService. * Removed obsolete methods from IPackageDataInstallation. * Removed obsolete methods from IPackagingService. * Removed obsolete methods on ITwoFactorLoginService. Removed obsolete ITemporaryMediaService. * Removed obsolete constructor from MediaService, MemberTypeService and MediaTypeService. * More obsolete constructors. * Removed obsoleted overloads on IPropertyValidationService. * Fixed build for tests. * Removed obsolete constructor for PublicAccessService, UserService and RelationService. * Removed GetDefaultMemberType. * Removed obsolete user group functionality from IUserService. * Removed obsolete extension methods on IUserService. * Removed obsolete method from ITelemetryService. * Removed obsolete UdiParserServiceConnectors. * Removed obsolete method on ICookieManager. * Removed obsolete DynamicContext. * Removed obsolete XmlHelper. * Fixed failing integration tests. * Removed obsoletes in Umbraco.Cms.Api.Common * Removed obsoletes in Umbraco.Cms.Api.Delivery * Removed obsoletes in Umbraco.Cms.Api.Management * Removed obsoletes in Umbraco.Examine.Lucene * Removed obsoletes in Umbraco.Infrastructure * Fix failing delivery API contract integration test. * Made integration tests internal. * Removed obsoletes from web projects. * Fix build. * Removed Twitter OEmbed provider * Removed obsolete constructor on PublishedDataType. * Removed obsolete constructors on PublishedCacheBase. * Removed the obsolete PropertyEditorTagsExtensions. * Removed obsoletion properties on configuration response models (#18697) * Removed obsolete methods from server-side models. * Update client-side types and sdk. * Update client-side files. * Removed obsoletion of Utf8ToAsciiConverter.ToAsciiString overload. (#18694) * Removed obsolete method in UserService. (#18710) * Removed obsoleted group alias keys from being publicly available. (#18682) * Removed unneceessary ApiVersion attribute. * Clean-up obsoletions on MemberService (#18703) * Removed obsoleted method on MemberService, added future obsoletion to interface and updated all callers. * Removed obsoletion on member service method that's not obsolete on the interface.
109 lines
4.1 KiB
C#
109 lines
4.1 KiB
C#
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using Examine;
|
|
using Examine.Search;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core.Models;
|
|
using Umbraco.Cms.Core.Persistence.Querying;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Infrastructure.Examine;
|
|
using Umbraco.Cms.Tests.Common.Attributes;
|
|
using Umbraco.Cms.Tests.Common.Testing;
|
|
using Umbraco.Extensions;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine;
|
|
|
|
[TestFixture]
|
|
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Logger = UmbracoTestOptions.Logger.Console)]
|
|
internal sealed class SearchTests : ExamineBaseTest
|
|
{
|
|
private IDocumentUrlService DocumentUrlService => GetRequiredService<IDocumentUrlService>();
|
|
|
|
[SetUp]
|
|
public void Setup()
|
|
{
|
|
DocumentUrlService.InitAsync(false, CancellationToken.None).GetAwaiter().GetResult();
|
|
}
|
|
|
|
|
|
[Test]
|
|
[LongRunning]
|
|
public void Test_Sort_Order_Sorting()
|
|
{
|
|
long totalRecs;
|
|
var demoData = new ExamineDemoDataContentService(TestFiles.umbraco_sort);
|
|
var allRecs = demoData.GetLatestContentByXPath("//*[@isDoc]")
|
|
.Root
|
|
.Elements()
|
|
.Select(x => Mock.Of<IContent>(
|
|
m =>
|
|
m.Id == (int)x.Attribute("id") &&
|
|
m.ParentId == (int)x.Attribute("parentID") &&
|
|
m.Level == (int)x.Attribute("level") &&
|
|
m.CreatorId == 0 &&
|
|
m.SortOrder == (int)x.Attribute("sortOrder") &&
|
|
m.CreateDate == (DateTime)x.Attribute("createDate") &&
|
|
m.UpdateDate == (DateTime)x.Attribute("updateDate") &&
|
|
m.Name == (string)x.Attribute(UmbracoExamineFieldNames.NodeNameFieldName) &&
|
|
m.GetCultureName(It.IsAny<string>()) ==
|
|
(string)x.Attribute(UmbracoExamineFieldNames.NodeNameFieldName) &&
|
|
m.Path == (string)x.Attribute("path") &&
|
|
m.Properties == new PropertyCollection() &&
|
|
m.Published == true &&
|
|
m.ContentType == Mock.Of<ISimpleContentType>(mt =>
|
|
mt.Icon == "test" &&
|
|
mt.Alias == x.Name.LocalName &&
|
|
mt.Id == (int)x.Attribute("nodeType"))))
|
|
.ToArray();
|
|
var contentService = Mock.Of<IContentService>(
|
|
x => x.GetPagedDescendants(
|
|
It.IsAny<int>(), It.IsAny<long>(), It.IsAny<int>(), out totalRecs, It.IsAny<IQuery<IContent>>(), It.IsAny<Ordering>())
|
|
==
|
|
allRecs);
|
|
|
|
using (GetSynchronousContentIndex(false, out var index, out var contentRebuilder, out _, null, contentService))
|
|
{
|
|
index.CreateIndex();
|
|
contentRebuilder.Populate(index);
|
|
|
|
var searcher = index.Searcher;
|
|
|
|
Assert.Greater(searcher.CreateQuery().All().Execute().TotalItemCount, 0);
|
|
|
|
var numberSortedCriteria = searcher.CreateQuery()
|
|
.ParentId(1148)
|
|
.OrderBy(new SortableField("sortOrder", SortType.Int));
|
|
var numberSortedResult = numberSortedCriteria.Execute();
|
|
|
|
var stringSortedCriteria = searcher.CreateQuery()
|
|
.ParentId(1148)
|
|
.OrderBy(new SortableField("sortOrder")); //will default to string
|
|
var stringSortedResult = stringSortedCriteria.Execute();
|
|
|
|
Assert.AreEqual(12, numberSortedResult.TotalItemCount);
|
|
Assert.AreEqual(12, stringSortedResult.TotalItemCount);
|
|
|
|
Assert.IsTrue(IsSortedByNumber(numberSortedResult));
|
|
Assert.IsFalse(IsSortedByNumber(stringSortedResult));
|
|
}
|
|
}
|
|
|
|
private bool IsSortedByNumber(IEnumerable<ISearchResult> results)
|
|
{
|
|
var currentSort = 0;
|
|
foreach (var searchResult in results)
|
|
{
|
|
var sort = int.Parse(searchResult.Values["sortOrder"]);
|
|
if (currentSort >= sort)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
currentSort = sort;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
}
|