* 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.6 KiB
C#
109 lines
4.6 KiB
C#
using Examine;
|
|
using Examine.Lucene;
|
|
using Examine.Lucene.Directories;
|
|
using Examine.Lucene.Providers;
|
|
using Microsoft.Extensions.Logging;
|
|
using Microsoft.IdentityModel.Tokens;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core.Models.PublishedContent;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Cms.Infrastructure;
|
|
using Umbraco.Cms.Infrastructure.Examine;
|
|
using Umbraco.Cms.Tests.Common.Attributes;
|
|
using Umbraco.Cms.Tests.Common.Testing;
|
|
using Directory = Lucene.Net.Store.Directory;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine;
|
|
|
|
[TestFixture]
|
|
[UmbracoTest(Database = UmbracoTestOptions.Database.None)]
|
|
internal sealed class PublishedContentQueryTests : ExamineBaseTest
|
|
{
|
|
private class TestIndex : LuceneIndex, IUmbracoIndex
|
|
{
|
|
private readonly string[] _fieldNames;
|
|
|
|
public TestIndex(ILoggerFactory loggerFactory, string name, Directory luceneDirectory, string[] fieldNames)
|
|
: base(
|
|
loggerFactory,
|
|
name,
|
|
IndexInitializer.GetOptions(
|
|
name,
|
|
new LuceneDirectoryIndexOptions
|
|
{
|
|
DirectoryFactory = new GenericDirectoryFactory(s => luceneDirectory)
|
|
})) =>
|
|
_fieldNames = fieldNames;
|
|
|
|
public bool EnableDefaultEventHandler => throw new NotImplementedException();
|
|
public bool PublishedValuesOnly => throw new NotImplementedException();
|
|
public bool SupportProtectedContent => throw new NotImplementedException();
|
|
public IEnumerable<string> GetFields() => _fieldNames;
|
|
}
|
|
|
|
private TestIndex CreateTestIndex(Directory luceneDirectory, (string Name, string Culture)[] fields)
|
|
{
|
|
var index = new TestIndex(LoggerFactory, "TestIndex", luceneDirectory, fields.Select(f => f.Name).ToArray());
|
|
|
|
using (index.WithThreadingMode(IndexThreadingMode.Synchronous))
|
|
{
|
|
// populate with some test data
|
|
for (var i = 0; i < fields.Length; i++)
|
|
{
|
|
var (name, culture) = fields[i];
|
|
|
|
index.IndexItem(new ValueSet(
|
|
$"{i + 1}",
|
|
"content",
|
|
new Dictionary<string, object>
|
|
{
|
|
[name] = "Hello world, there are products here",
|
|
[UmbracoExamineFieldNames.VariesByCultureFieldName] = string.IsNullOrEmpty(culture) ? "n" : "y",
|
|
[string.IsNullOrEmpty(culture) ? UmbracoExamineFieldNames.PublishedFieldName : $"{UmbracoExamineFieldNames.PublishedFieldName}_{culture}"] = "y"
|
|
}));
|
|
}
|
|
}
|
|
|
|
return index;
|
|
}
|
|
|
|
private PublishedContentQuery CreatePublishedContentQuery(IIndex indexer)
|
|
{
|
|
var examineManager = new Mock<IExamineManager>();
|
|
var outarg = indexer;
|
|
examineManager.Setup(x => x.TryGetIndex("TestIndex", out outarg)).Returns(true);
|
|
|
|
var contentCache = new Mock<IPublishedContentCache>();
|
|
contentCache.Setup(x => x.GetById(It.IsAny<int>()))
|
|
.Returns((int intId) => Mock.Of<IPublishedContent>(x => x.Id == intId));
|
|
var variationContext = new VariationContext();
|
|
var variationContextAccessor = Mock.Of<IVariationContextAccessor>(x => x.VariationContext == variationContext);
|
|
|
|
return new PublishedContentQuery(variationContextAccessor, examineManager.Object, contentCache.Object, Mock.Of<IPublishedMediaCache>());
|
|
}
|
|
|
|
[TestCase("fr-fr", ExpectedResult = "1, 3", Description = "Search Culture: fr-fr. Must return both fr-fr and invariant results")]
|
|
[TestCase("en-us", ExpectedResult = "1, 2", Description = "Search Culture: en-us. Must return both en-us and invariant results")]
|
|
[TestCase("*", ExpectedResult = "1, 2, 3", Description = "Search Culture: *. Must return all cultures and all invariant results")]
|
|
[TestCase(null, ExpectedResult = "1", Description = "Search Culture: null. Must return only invariant results")]
|
|
[LongRunning]
|
|
public string Search(string culture)
|
|
{
|
|
using (var luceneDir = new RandomIdRAMDirectory())
|
|
{
|
|
var fields = new[] { (Name: "title", Culture: null), (Name: "title_en-us", Culture: "en-us"), (Name: "title_fr-fr", Culture: "fr-fr") };
|
|
using (var indexer = CreateTestIndex(luceneDir, fields))
|
|
{
|
|
var pcq = CreatePublishedContentQuery(indexer);
|
|
|
|
var results = pcq.Search("Products", culture, "TestIndex");
|
|
|
|
var ids = results.Select(x => x.Content.Id).ToArray();
|
|
|
|
return string.Join(", ", ids);
|
|
}
|
|
}
|
|
}
|
|
}
|