Skip to content

Commit 7045acd

Browse files
committed
Removed controller type validation for .NET 4.5.1 (#168)
1 parent 3280aa5 commit 7045acd

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

samples/MusicStore/MusicStore.Test/TestStartup.cs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public void ConfigureTestServices(IServiceCollection services)
2727
services.ReplaceSingleton<SignInManager<ApplicationUser>, MockedSignInManager>();
2828

2929
// temporary workaround while DependencyContext issues are fixed for .NET 4.5.1
30+
// controller type validation is also removed for .NET 4.5.1
3031
#if NET451
3132
var mvc = services.AddMvc();
3233
var applicationParts = mvc.PartManager.ApplicationParts;
@@ -35,11 +36,15 @@ public void ConfigureTestServices(IServiceCollection services)
3536

3637
TestHelper.HttpFeatureRegistrationPlugins.Add(new SessionTestPlugin());
3738

38-
services.ReplaceDbContext();
39-
services.ReplaceMemoryCache();
40-
services.ReplaceSession();
41-
services.ReplaceOptions();
42-
services.ReplaceTempDataProvider();
39+
services
40+
.AddCoreTesting()
41+
.AddControllersTesting()
42+
.AddRoutingTesting()
43+
.ReplaceDbContext()
44+
.ReplaceMemoryCache()
45+
.ReplaceSession()
46+
.ReplaceOptions()
47+
.ReplaceTempDataProvider();
4348
#endif
4449
}
4550
}

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplication.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,10 @@ public static TestConfiguration TestConfiguration
166166
TestConfiguration.ApplicationName
167167
?? TestAssemblyName
168168
?? PlatformServices.Default.Application.ApplicationName;
169-
169+
170170
public static void TryInitialize()
171171
{
172-
lock(Sync)
172+
lock (Sync)
173173
{
174174
if (!initialiazed && TestConfiguration.AutomaticStartup)
175175
{
@@ -231,7 +231,7 @@ internal static void LoadPlugins()
231231
internal static Type TryFindDefaultStartupType()
232232
{
233233
var applicationAssembly = Assembly.Load(new AssemblyName(testAssemblyName));
234-
234+
235235
var startupName = TestConfiguration.FullStartupName ?? $"{Environment.EnvironmentName}Startup";
236236

237237
// check root of the test project
@@ -312,7 +312,7 @@ private static IServiceCollection GetInitialServiceCollection()
312312
serviceCollection.AddTransient<IStartupFilter, AutoRequestServicesStartupFilter>();
313313

314314
serviceCollection.AddSingleton<ObjectPoolProvider, DefaultObjectPoolProvider>();
315-
315+
316316
return serviceCollection;
317317
}
318318

@@ -362,7 +362,7 @@ private static void PrepareServices(IServiceCollection serviceCollection, Startu
362362
}
363363

364364
AdditionalServices?.Invoke(serviceCollection);
365-
365+
366366
TryReplaceKnownServices(serviceCollection);
367367
PrepareRoutingServices(serviceCollection);
368368

@@ -409,7 +409,7 @@ private static void PrepareRoutingServices(IServiceCollection serviceCollection)
409409
private static void PrepareApplicationAndRouting(StartupMethods startupMethods)
410410
{
411411
var applicationBuilder = new MockedApplicationBuilder(serviceProvider);
412-
412+
413413
startupMethods?.ConfigureDelegate?.Invoke(applicationBuilder);
414414

415415
AdditionalApplicationConfiguration?.Invoke(applicationBuilder);
@@ -438,7 +438,7 @@ private static void PrepareApplicationAndRouting(StartupMethods startupMethods)
438438

439439
router = routeBuilder.Build();
440440
}
441-
441+
442442
private static void TryLockedInitialization()
443443
{
444444
if (!initialiazed)

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Controllers/ControllerBuilder.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ public ControllerBuilder(ControllerTestContext testContext)
3838

3939
this.EnabledValidation = TestApplication.TestConfiguration.ModelStateValidation;
4040

41+
#if NETSTANDARD1_6
4142
this.ValidateControllerType();
43+
#endif
4244
}
4345

4446
private TController Controller

0 commit comments

Comments
 (0)