* 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.
209 lines
8.3 KiB
C#
209 lines
8.3 KiB
C#
using Microsoft.EntityFrameworkCore;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Infrastructure.Scoping;
|
|
using Umbraco.Cms.Persistence.EFCore.Scoping;
|
|
using Umbraco.Cms.Tests.Common.Testing;
|
|
using Umbraco.Cms.Tests.Integration.Testing;
|
|
using Umbraco.Cms.Tests.Integration.Umbraco.Persistence.EFCore.DbContext;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.Persistence.EFCore.Scoping;
|
|
|
|
[TestFixture]
|
|
[UmbracoTest(Database = UmbracoTestOptions.Database.NewEmptyPerTest)]
|
|
internal sealed class EFCoreScopeInfrastructureScopeTests : UmbracoIntegrationTest
|
|
{
|
|
private IEFCoreScopeProvider<TestUmbracoDbContext> EfCoreScopeProvider =>
|
|
GetRequiredService<IEFCoreScopeProvider<TestUmbracoDbContext>>();
|
|
|
|
private IScopeProvider InfrastructureScopeProvider =>
|
|
GetRequiredService<IScopeProvider>();
|
|
|
|
private EFCoreScopeAccessor<TestUmbracoDbContext> EfCoreScopeAccessor => (EFCoreScopeAccessor<TestUmbracoDbContext>)GetRequiredService<IEFCoreScopeAccessor<TestUmbracoDbContext>>();
|
|
|
|
private IScopeAccessor InfrastructureScopeAccessor => GetRequiredService<IScopeAccessor>();
|
|
|
|
[Test]
|
|
public void CanCreateNestedInfrastructureScope()
|
|
{
|
|
Assert.IsNull(EfCoreScopeAccessor.AmbientScope);
|
|
using (IEfCoreScope<TestUmbracoDbContext> scope = EfCoreScopeProvider.CreateScope())
|
|
{
|
|
Assert.IsInstanceOf<EFCoreScope<TestUmbracoDbContext>>(scope);
|
|
Assert.IsNotNull(EfCoreScopeAccessor.AmbientScope);
|
|
Assert.IsNotNull(InfrastructureScopeAccessor.AmbientScope);
|
|
Assert.AreSame(scope, EfCoreScopeAccessor.AmbientScope);
|
|
using (var infrastructureScope = InfrastructureScopeProvider.CreateScope())
|
|
{
|
|
Assert.AreSame(infrastructureScope, InfrastructureScopeAccessor.AmbientScope);
|
|
}
|
|
|
|
Assert.IsNotNull(InfrastructureScopeAccessor.AmbientScope);
|
|
}
|
|
|
|
Assert.IsNull(EfCoreScopeAccessor.AmbientScope);
|
|
Assert.IsNull(InfrastructureScopeAccessor.AmbientScope);
|
|
}
|
|
|
|
[Test]
|
|
public async Task? TransactionWithEfCoreScopeAsParent()
|
|
{
|
|
using (IEfCoreScope<TestUmbracoDbContext> parentScope = EfCoreScopeProvider.CreateScope())
|
|
{
|
|
await parentScope.ExecuteWithContextAsync<Task>(async database =>
|
|
{
|
|
await database.Database.ExecuteSqlAsync($"CREATE TABLE tmp3 (id INT, name NVARCHAR(64))");
|
|
});
|
|
|
|
// This should be using same transaction, so insert data into table we're creating
|
|
using (IScope childScope = InfrastructureScopeProvider.CreateScope())
|
|
{
|
|
childScope.Database.Execute("INSERT INTO tmp3 (id, name) VALUES (1, 'a')");
|
|
string n = ScopeAccessor.AmbientScope.Database.ExecuteScalar<string>(
|
|
"SELECT name FROM tmp3 WHERE id=1");
|
|
Assert.AreEqual("a", n);
|
|
childScope.Complete();
|
|
}
|
|
|
|
await parentScope.ExecuteWithContextAsync<Task>(async database =>
|
|
{
|
|
string? result = await database.Database.ExecuteScalarAsync<string>("SELECT name FROM tmp3 WHERE id=1");
|
|
Assert.AreEqual("a", result);
|
|
});
|
|
|
|
|
|
parentScope.Complete();
|
|
}
|
|
|
|
// Check that its not rolled back
|
|
using (IEfCoreScope<TestUmbracoDbContext> scope = EfCoreScopeProvider.CreateScope())
|
|
{
|
|
await scope.ExecuteWithContextAsync<Task>(async database =>
|
|
{
|
|
string? result = await database.Database.ExecuteScalarAsync<string>("SELECT name FROM tmp3 WHERE id=1");
|
|
Assert.IsNotNull(result);
|
|
});
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
public async Task? TransactionWithInfrastructureScopeAsParent()
|
|
{
|
|
using (IScope parentScope = InfrastructureScopeProvider.CreateScope())
|
|
{
|
|
parentScope.Database.Execute("CREATE TABLE tmp3 (id INT, name NVARCHAR(64))");
|
|
|
|
using (IEfCoreScope<TestUmbracoDbContext> scope = EfCoreScopeProvider.CreateScope())
|
|
{
|
|
await scope.ExecuteWithContextAsync<Task>(async database =>
|
|
{
|
|
await database.Database.ExecuteSqlAsync($"INSERT INTO tmp3 (id, name) VALUES (1, 'a')");
|
|
|
|
string? result =
|
|
await database.Database.ExecuteScalarAsync<string>("SELECT name FROM tmp3 WHERE id=1");
|
|
Assert.AreEqual("a", result);
|
|
});
|
|
|
|
scope.Complete();
|
|
}
|
|
|
|
parentScope.Complete();
|
|
}
|
|
|
|
// Check that its not rolled back
|
|
using (IEfCoreScope<TestUmbracoDbContext> scope = EfCoreScopeProvider.CreateScope())
|
|
{
|
|
await scope.ExecuteWithContextAsync<Task>(async database =>
|
|
{
|
|
string? result = await database.Database.ExecuteScalarAsync<string>("SELECT name FROM tmp3 WHERE id=1");
|
|
Assert.IsNotNull(result);
|
|
});
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
public async Task EFCoreAsParent_DontCompleteWhenChildScopeDoesNotComplete()
|
|
{
|
|
using (IEfCoreScope<TestUmbracoDbContext> scope = EfCoreScopeProvider.CreateScope())
|
|
{
|
|
await scope.ExecuteWithContextAsync<Task>(async database =>
|
|
{
|
|
await database.Database.ExecuteSqlAsync($"CREATE TABLE tmp3 (id INT, name NVARCHAR(64))");
|
|
});
|
|
scope.Complete();
|
|
}
|
|
|
|
using (IEfCoreScope<TestUmbracoDbContext> parentScope = EfCoreScopeProvider.CreateScope())
|
|
{
|
|
using (IScope scope = InfrastructureScopeProvider.CreateScope())
|
|
{
|
|
scope.Database.Execute("INSERT INTO tmp3 (id, name) VALUES (1, 'a')");
|
|
string n = ScopeAccessor.AmbientScope.Database.ExecuteScalar<string>("SELECT name FROM tmp3 WHERE id=1");
|
|
Assert.AreEqual("a", n);
|
|
}
|
|
|
|
await parentScope.ExecuteWithContextAsync<Task>(async database =>
|
|
{
|
|
// Should still be in transaction and not rolled back yet
|
|
string? result = await database.Database.ExecuteScalarAsync<string>("SELECT name FROM tmp3 WHERE id=1");
|
|
Assert.AreEqual("a", result);
|
|
});
|
|
|
|
parentScope.Complete();
|
|
}
|
|
|
|
// Check that its rolled back
|
|
using (IEfCoreScope<TestUmbracoDbContext> scope = EfCoreScopeProvider.CreateScope())
|
|
{
|
|
await scope.ExecuteWithContextAsync<Task>(async database =>
|
|
{
|
|
// Should still be in transaction and not rolled back yet
|
|
string? result = await database.Database.ExecuteScalarAsync<string>("SELECT name FROM tmp3 WHERE id=1");
|
|
Assert.IsNull(result);
|
|
});
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
public async Task InfrastructureScopeAsParent_DontCompleteWhenChildScopeDoesNotComplete()
|
|
{
|
|
using (IEfCoreScope<TestUmbracoDbContext> scope = EfCoreScopeProvider.CreateScope())
|
|
{
|
|
await scope.ExecuteWithContextAsync<Task>(async database =>
|
|
{
|
|
await database.Database.ExecuteSqlAsync($"CREATE TABLE tmp3 (id INT, name NVARCHAR(64))");
|
|
});
|
|
|
|
scope.Complete();
|
|
}
|
|
|
|
using (IScope parentScope = InfrastructureScopeProvider.CreateScope())
|
|
{
|
|
using (IEfCoreScope<TestUmbracoDbContext> scope = EfCoreScopeProvider.CreateScope())
|
|
{
|
|
await scope.ExecuteWithContextAsync<Task>(async database =>
|
|
{
|
|
await database.Database.ExecuteSqlAsync($"INSERT INTO tmp3 (id, name) VALUES (1, 'a')");
|
|
|
|
string? result = await database.Database.ExecuteScalarAsync<string>("SELECT name FROM tmp3 WHERE id=1");
|
|
Assert.AreEqual("a", result);
|
|
});
|
|
|
|
string n = parentScope.Database.ExecuteScalar<string>("SELECT name FROM tmp3 WHERE id=1");
|
|
Assert.AreEqual("a", n);
|
|
}
|
|
|
|
parentScope.Complete();
|
|
}
|
|
|
|
// Check that its rolled back
|
|
using (IEfCoreScope<TestUmbracoDbContext> scope = EfCoreScopeProvider.CreateScope())
|
|
{
|
|
await scope.ExecuteWithContextAsync<Task>(async database =>
|
|
{
|
|
string? result = await database.Database.ExecuteScalarAsync<string>("SELECT name FROM tmp3 WHERE id=1");
|
|
Assert.IsNull(result);
|
|
});
|
|
}
|
|
}
|
|
}
|