Browse Source

Enable nullable annotations for Volo.Abp.TestBase

pull/17020/head
liangshiwei 3 years ago
parent
commit
34dd051d7c
  1. 2
      framework/src/Volo.Abp.TestBase/Volo.Abp.TestBase.csproj
  2. 8
      framework/src/Volo.Abp.TestBase/Volo/Abp/AbpTestBaseWithServiceProvider.cs
  3. 6
      framework/src/Volo.Abp.TestBase/Volo/Abp/Testing/AbpAsyncIntegratedTest.cs

2
framework/src/Volo.Abp.TestBase/Volo.Abp.TestBase.csproj

@ -5,6 +5,8 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<Nullable>enable</Nullable>
<WarningsAsErrors>Nullable</WarningsAsErrors>
<AssemblyName>Volo.Abp.TestBase</AssemblyName>
<PackageId>Volo.Abp.TestBase</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

8
framework/src/Volo.Abp.TestBase/Volo/Abp/AbpTestBaseWithServiceProvider.cs

@ -5,14 +5,14 @@ namespace Volo.Abp;
public abstract class AbpTestBaseWithServiceProvider
{
protected IServiceProvider ServiceProvider { get; set; }
protected IServiceProvider ServiceProvider { get; set; } = default!;
protected virtual T GetService<T>()
protected virtual T? GetService<T>()
{
return ServiceProvider.GetService<T>();
}
protected virtual T GetRequiredService<T>()
protected virtual T GetRequiredService<T>() where T : notnull
{
return ServiceProvider.GetRequiredService<T>();
}

6
framework/src/Volo.Abp.TestBase/Volo/Abp/Testing/AbpAsyncIntegratedTest.cs

@ -8,11 +8,11 @@ namespace Volo.Abp.Testing;
public class AbpAsyncIntegratedTest<TStartupModule> : AbpTestBaseWithServiceProvider
where TStartupModule : IAbpModule
{
protected IAbpApplication Application { get; set; }
protected IAbpApplication Application { get; set; } = default!;
protected IServiceProvider RootServiceProvider { get; set; }
protected IServiceProvider RootServiceProvider { get; set; } = default!;
protected IServiceScope TestServiceScope { get; set; }
protected IServiceScope TestServiceScope { get; set; } = default!;
public virtual async Task InitializeAsync()
{

Loading…
Cancel
Save