Commit 0ae97693 authored by yangxiaodong's avatar yangxiaodong

Remove dependencies of Microsoft.AspNetCore.Testing

parent 1430fd13
using System.Threading.Tasks; using System.Threading.Tasks;
using DotNetCore.CAP.Infrastructure; using DotNetCore.CAP.Infrastructure;
using Microsoft.AspNetCore.Builder.Internal; using Microsoft.AspNetCore.Builder.Internal;
using Microsoft.AspNetCore.Testing.xunit;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Xunit; using Xunit;
...@@ -33,10 +32,7 @@ namespace DotNetCore.CAP.EntityFrameworkCore.Test ...@@ -33,10 +32,7 @@ namespace DotNetCore.CAP.EntityFrameworkCore.Test
} }
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
[OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)]
public async Task EnsureStartupUsageWorks() public async Task EnsureStartupUsageWorks()
{ {
var messageStore = _builder.ApplicationServices.GetRequiredService<ICapMessageStore>(); var messageStore = _builder.ApplicationServices.GetRequiredService<ICapMessageStore>();
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" /> <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
<PackageReference Include="System.Data.SqlClient" Version="4.3.1" /> <PackageReference Include="System.Data.SqlClient" Version="4.3.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.2" /> <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="1.2.0-preview1-22815" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
...@@ -3,8 +3,6 @@ using System.Linq; ...@@ -3,8 +3,6 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using DotNetCore.CAP.Infrastructure; using DotNetCore.CAP.Infrastructure;
using DotNetCore.CAP.Test; using DotNetCore.CAP.Test;
using Microsoft.AspNetCore.Testing;
using Microsoft.AspNetCore.Testing.xunit;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Xunit; using Xunit;
...@@ -20,11 +18,6 @@ namespace DotNetCore.CAP.EntityFrameworkCore.Test ...@@ -20,11 +18,6 @@ namespace DotNetCore.CAP.EntityFrameworkCore.Test
_fixture = fixture; _fixture = fixture;
} }
protected override bool ShouldSkipDbTests()
{
return TestPlatformHelper.IsMono || !TestPlatformHelper.IsWindows;
}
public class ApplicationDbContext : CapDbContext public class ApplicationDbContext : CapDbContext
{ {
public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : base(options) public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : base(options)
...@@ -32,10 +25,7 @@ namespace DotNetCore.CAP.EntityFrameworkCore.Test ...@@ -32,10 +25,7 @@ namespace DotNetCore.CAP.EntityFrameworkCore.Test
} }
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
[OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)]
public void CanCreateSentMessageUsingEF() public void CanCreateSentMessageUsingEF()
{ {
using (var db = CreateContext()) using (var db = CreateContext())
...@@ -54,10 +44,7 @@ namespace DotNetCore.CAP.EntityFrameworkCore.Test ...@@ -54,10 +44,7 @@ namespace DotNetCore.CAP.EntityFrameworkCore.Test
} }
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono)]
[OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)]
public async Task CanCreateUsingManager() public async Task CanCreateUsingManager()
{ {
var manager = CreateManager(); var manager = CreateManager();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment