Updated test Projects and codes and NuGetPackages

This commit is contained in:
rafsanulhasan 2018-08-12 05:03:21 +06:00
parent 6413692cb3
commit e6f329de48
8 changed files with 398 additions and 388 deletions

View File

@ -1,9 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.1</TargetFramework>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<!--<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>-->
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute> <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute> <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute> <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
@ -44,10 +43,11 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.0.1" /> <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.1" />
<PackageReference Include="xunit" Version="2.3.1" /> <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" /> <PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.1</TargetFramework>
<AssemblyName>IntegrationTests</AssemblyName> <AssemblyName>IntegrationTests</AssemblyName>
<PackageId>IntegrationTests</PackageId> <PackageId>IntegrationTests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@ -44,13 +44,14 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" /> <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" />
<PackageReference Include="Moq" Version="4.8.1" /> <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" /> <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.0.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" /> <PackageReference Include="Moq" Version="4.9.0" />
<PackageReference Include="xunit" Version="2.3.1" /> <PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.6" />
<PackageReference Include="StackExchange.Redis.strongname" Version="1.2.6" /> <PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -53,7 +53,8 @@ namespace IntegrationTests.Services.Catalog
var response = await server.CreateClient() var response = await server.CreateClient()
.GetAsync(Get.ItemById(int.MaxValue)); .GetAsync(Get.ItemById(int.MaxValue));
Assert.Equal( HttpStatusCode.NotFound, response.StatusCode); //Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
Assert.True(HttpStatusCode.NotFound == response.StatusCode);
} }
} }
@ -66,6 +67,8 @@ namespace IntegrationTests.Services.Catalog
.GetAsync(Get.ItemByName(".NET")); .GetAsync(Get.ItemByName(".NET"));
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
} }
} }
@ -79,6 +82,8 @@ namespace IntegrationTests.Services.Catalog
.GetAsync(Get.ItemByName(".NET", paginated)); .GetAsync(Get.ItemByName(".NET", paginated));
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
} }
} }

View File

@ -21,6 +21,8 @@
.GetAsync(Get.Campaigns); .GetAsync(Get.Campaigns);
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
} }
} }
@ -75,7 +77,7 @@
var campaignResponse = await server.CreateClient() var campaignResponse = await server.CreateClient()
.PostAsync(Post.AddNewCampaign, content); .PostAsync(Post.AddNewCampaign, content);
if (int.TryParse(campaignResponse.Headers.Location.Segments[4], out int id)) if (int.TryParse(campaignResponse?.Headers.Location.Segments[4], out int id))
{ {
var response = await server.CreateClient() var response = await server.CreateClient()
.DeleteAsync(Delete.CampaignBy(id)); .DeleteAsync(Delete.CampaignBy(id));
@ -99,6 +101,9 @@
var campaignResponse = await server.CreateClient() var campaignResponse = await server.CreateClient()
.PostAsync(Post.AddNewCampaign, content); .PostAsync(Post.AddNewCampaign, content);
campaignResponse.EnsureSuccessStatusCode();
Assert.Equal(HttpStatusCode.Created, campaignResponse.StatusCode);
if (int.TryParse(campaignResponse.Headers.Location.Segments[4], out int id)) if (int.TryParse(campaignResponse.Headers.Location.Segments[4], out int id))
{ {
fakeCampaignDto.Description = "FakeCampaignUpdatedDescription"; fakeCampaignDto.Description = "FakeCampaignUpdatedDescription";
@ -106,10 +111,8 @@
var response = await server.CreateClient() var response = await server.CreateClient()
.PutAsync(Put.CampaignBy(id), content); .PutAsync(Put.CampaignBy(id), content);
Assert.True(response.StatusCode == HttpStatusCode.Created); Assert.True(response.StatusCode == HttpStatusCode.NoContent);
} }
campaignResponse.EnsureSuccessStatusCode();
} }
} }

View File

@ -29,7 +29,7 @@
{ {
using (var server = CreateServer()) using (var server = CreateServer())
{ {
var content = new StringContent(BuildOrder(), UTF8Encoding.UTF8, "application/json"); var content = new StringContent(BuildOrder(), Encoding.UTF8, "application/json");
var response = await server.CreateIdempotentClient() var response = await server.CreateIdempotentClient()
.PutAsync(Put.CancelOrder, content); .PutAsync(Put.CancelOrder, content);
@ -42,7 +42,7 @@
{ {
using (var server = CreateServer()) using (var server = CreateServer())
{ {
var content = new StringContent(BuildOrder(), UTF8Encoding.UTF8, "application/json"); var content = new StringContent(BuildOrder(), Encoding.UTF8, "application/json");
var response = await server.CreateIdempotentClient() var response = await server.CreateIdempotentClient()
.PutAsync(Put.ShipOrder, content); .PutAsync(Put.ShipOrder, content);

View File

@ -1,10 +1,10 @@
{ {
"CheckUpdateTime": "30000",
"ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;", "ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;",
"EventBusConnection": "localhost",
"ExternalCatalogBaseUrl": "http://localhost:5101", "ExternalCatalogBaseUrl": "http://localhost:5101",
"GracePeriodTime": "1",
"IdentityUrl": "http://localhost:5105", "IdentityUrl": "http://localhost:5105",
"isTest": "true", "isTest": "true",
"EventBusConnection": "localhost",
"CheckUpdateTime": "30000",
"GracePeriodTime": "1",
"SubscriptionClientName": "Ordering" "SubscriptionClientName": "Ordering"
} }

View File

@ -94,7 +94,7 @@ namespace UnitTest.Ordering.Application
{ {
//Arrange //Arrange
var fakeDynamicResult = Enumerable.Empty<OrderSummary>(); var fakeDynamicResult = Enumerable.Empty<OrderSummary>();
_orderQueriesMock.Setup(x => x.GetOrdersAsync()) _orderQueriesMock.Setup(x => x.GetOrdersFromUserAsync(Guid.NewGuid()))
.Returns(Task.FromResult(fakeDynamicResult)); .Returns(Task.FromResult(fakeDynamicResult));
//Act //Act

View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.1</TargetFramework>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute> <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@ -20,13 +20,14 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" /> <PackageReference Include="MediatR" Version="5.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" /> <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" /> <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
<PackageReference Include="MediatR" Version="4.0.1" /> <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.1"/>
<PackageReference Include="Moq" Version="4.8.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="xunit" Version="2.3.1" /> <PackageReference Include="Moq" Version="4.9.0" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.0.1" /> <PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>