diff --git a/test/Services/FunctionalTests/FunctionalTests.csproj b/test/Services/FunctionalTests/FunctionalTests.csproj index 96ed1510f..ed8abeb30 100644 --- a/test/Services/FunctionalTests/FunctionalTests.csproj +++ b/test/Services/FunctionalTests/FunctionalTests.csproj @@ -1,78 +1,78 @@  - - netcoreapp2.0 - true - - false - false - false - + + netcoreapp2.1 + true + false + false + false + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + - - - + + + \ No newline at end of file diff --git a/test/Services/IntegrationTests/IntegrationTests.csproj b/test/Services/IntegrationTests/IntegrationTests.csproj index bf176495a..1a9bd79f4 100644 --- a/test/Services/IntegrationTests/IntegrationTests.csproj +++ b/test/Services/IntegrationTests/IntegrationTests.csproj @@ -1,66 +1,67 @@  - - netcoreapp2.0 - IntegrationTests - IntegrationTests - true - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - false - false - false - + + netcoreapp2.1 + IntegrationTests + IntegrationTests + true + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + false + false + false + - - - + + + - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - PreserveNewest - - + + + PreserveNewest + + - - - + + + diff --git a/test/Services/IntegrationTests/Services/Catalog/CatalogScenarios.cs b/test/Services/IntegrationTests/Services/Catalog/CatalogScenarios.cs index 6414a57ea..d4ad542b7 100644 --- a/test/Services/IntegrationTests/Services/Catalog/CatalogScenarios.cs +++ b/test/Services/IntegrationTests/Services/Catalog/CatalogScenarios.cs @@ -3,145 +3,150 @@ using System.Net; namespace IntegrationTests.Services.Catalog { - using System.Threading.Tasks; - using Xunit; - - public class CatalogScenarios - : CatalogScenarioBase - { - [Fact] - public async Task Get_get_all_catalogitems_and_response_ok_status_code() - { - using (var server = CreateServer()) - { - var response = await server.CreateClient() - .GetAsync(Get.Items()); - - response.EnsureSuccessStatusCode(); - } - } - - [Fact] - public async Task Get_get_catalogitem_by_id_and_response_ok_status_code() - { - using (var server = CreateServer()) - { - var response = await server.CreateClient() - .GetAsync(Get.ItemById(1)); - - response.EnsureSuccessStatusCode(); - } - } - - [Fact] - public async Task Get_get_catalogitem_by_id_and_response_bad_request_status_code() - { - using (var server = CreateServer()) - { - var response = await server.CreateClient() - .GetAsync(Get.ItemById(int.MinValue)); - - Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); - } - } - - [Fact] - public async Task Get_get_catalogitem_by_id_and_response_not_found_status_code() - { - using (var server = CreateServer()) - { - var response = await server.CreateClient() - .GetAsync(Get.ItemById(int.MaxValue)); - - Assert.Equal( HttpStatusCode.NotFound, response.StatusCode); - } - } - - [Fact] - public async Task Get_get_catalogitem_by_name_and_response_ok_status_code() - { - using (var server = CreateServer()) - { - var response = await server.CreateClient() - .GetAsync(Get.ItemByName(".NET")); - - response.EnsureSuccessStatusCode(); - } - } - - [Fact] - public async Task Get_get_paginated_catalogitem_by_name_and_response_ok_status_code() - { - using (var server = CreateServer()) - { - const bool paginated = true; - var response = await server.CreateClient() - .GetAsync(Get.ItemByName(".NET", paginated)); - - response.EnsureSuccessStatusCode(); - } - } - - [Fact] - public async Task Get_get_paginated_catalog_items_and_response_ok_status_code() - { - using (var server = CreateServer()) - { - const bool paginated = true; - var response = await server.CreateClient() - .GetAsync(Get.Items(paginated)); - - response.EnsureSuccessStatusCode(); - } - } - - [Fact] - public async Task Get_get_filtered_catalog_items_and_response_ok_status_code() - { - using (var server = CreateServer()) - { - var response = await server.CreateClient() - .GetAsync(Get.Filtered(1, 1)); - - response.EnsureSuccessStatusCode(); - } - } - - [Fact] - public async Task Get_get_paginated_filtered_catalog_items_and_response_ok_status_code() - { - using (var server = CreateServer()) - { - const bool paginated = true; - var response = await server.CreateClient() - .GetAsync(Get.Filtered(1, 1, paginated)); - - response.EnsureSuccessStatusCode(); - } - } - - [Fact] - public async Task Get_catalog_types_response_ok_status_code() - { - using (var server = CreateServer()) - { - var response = await server.CreateClient() - .GetAsync(Get.Types); - - response.EnsureSuccessStatusCode(); - } - } - - [Fact] - public async Task Get_catalog_brands_response_ok_status_code() - { - using (var server = CreateServer()) - { - var response = await server.CreateClient() - .GetAsync(Get.Brands); - - response.EnsureSuccessStatusCode(); - } - } - } + using System.Threading.Tasks; + using Xunit; + + public class CatalogScenarios + : CatalogScenarioBase + { + [Fact] + public async Task Get_get_all_catalogitems_and_response_ok_status_code() + { + using (var server = CreateServer()) + { + var response = await server.CreateClient() + .GetAsync(Get.Items()); + + response.EnsureSuccessStatusCode(); + } + } + + [Fact] + public async Task Get_get_catalogitem_by_id_and_response_ok_status_code() + { + using (var server = CreateServer()) + { + var response = await server.CreateClient() + .GetAsync(Get.ItemById(1)); + + response.EnsureSuccessStatusCode(); + } + } + + [Fact] + public async Task Get_get_catalogitem_by_id_and_response_bad_request_status_code() + { + using (var server = CreateServer()) + { + var response = await server.CreateClient() + .GetAsync(Get.ItemById(int.MinValue)); + + Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); + } + } + + [Fact] + public async Task Get_get_catalogitem_by_id_and_response_not_found_status_code() + { + using (var server = CreateServer()) + { + var response = await server.CreateClient() + .GetAsync(Get.ItemById(int.MaxValue)); + + //Assert.Equal(HttpStatusCode.NotFound, response.StatusCode); + Assert.True(HttpStatusCode.NotFound == response.StatusCode); + } + } + + [Fact] + public async Task Get_get_catalogitem_by_name_and_response_ok_status_code() + { + using (var server = CreateServer()) + { + var response = await server.CreateClient() + .GetAsync(Get.ItemByName(".NET")); + + response.EnsureSuccessStatusCode(); + + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + } + + [Fact] + public async Task Get_get_paginated_catalogitem_by_name_and_response_ok_status_code() + { + using (var server = CreateServer()) + { + const bool paginated = true; + var response = await server.CreateClient() + .GetAsync(Get.ItemByName(".NET", paginated)); + + response.EnsureSuccessStatusCode(); + + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + } + + [Fact] + public async Task Get_get_paginated_catalog_items_and_response_ok_status_code() + { + using (var server = CreateServer()) + { + const bool paginated = true; + var response = await server.CreateClient() + .GetAsync(Get.Items(paginated)); + + response.EnsureSuccessStatusCode(); + } + } + + [Fact] + public async Task Get_get_filtered_catalog_items_and_response_ok_status_code() + { + using (var server = CreateServer()) + { + var response = await server.CreateClient() + .GetAsync(Get.Filtered(1, 1)); + + response.EnsureSuccessStatusCode(); + } + } + + [Fact] + public async Task Get_get_paginated_filtered_catalog_items_and_response_ok_status_code() + { + using (var server = CreateServer()) + { + const bool paginated = true; + var response = await server.CreateClient() + .GetAsync(Get.Filtered(1, 1, paginated)); + + response.EnsureSuccessStatusCode(); + } + } + + [Fact] + public async Task Get_catalog_types_response_ok_status_code() + { + using (var server = CreateServer()) + { + var response = await server.CreateClient() + .GetAsync(Get.Types); + + response.EnsureSuccessStatusCode(); + } + } + + [Fact] + public async Task Get_catalog_brands_response_ok_status_code() + { + using (var server = CreateServer()) + { + var response = await server.CreateClient() + .GetAsync(Get.Brands); + + response.EnsureSuccessStatusCode(); + } + } + } } diff --git a/test/Services/IntegrationTests/Services/Marketing/CampaignScenarios.cs b/test/Services/IntegrationTests/Services/Marketing/CampaignScenarios.cs index 068777473..2d70454b3 100644 --- a/test/Services/IntegrationTests/Services/Marketing/CampaignScenarios.cs +++ b/test/Services/IntegrationTests/Services/Marketing/CampaignScenarios.cs @@ -1,128 +1,131 @@ namespace IntegrationTests.Services.Marketing { - using System.Net.Http; - using System.Text; - using System.Threading.Tasks; - using Xunit; - using System; - using Newtonsoft.Json; - using System.Net; - using Microsoft.eShopOnContainers.Services.Marketing.API.Dto; - - public class CampaignScenarios - : CampaignScenarioBase - { - [Fact] - public async Task Get_get_all_campaigns_and_response_ok_status_code() - { - using (var server = CreateServer()) - { - var response = await server.CreateClient() - .GetAsync(Get.Campaigns); - - response.EnsureSuccessStatusCode(); - } - } - - [Fact] - public async Task Get_get_campaign_by_id_and_response_ok_status_code() - { - var campaignId = 1; - using (var server = CreateServer()) - { - var response = await server.CreateClient() - .GetAsync(Get.CampaignBy(campaignId)); - - response.EnsureSuccessStatusCode(); - } - } - - [Fact] - public async Task Get_get_campaign_by_id_and_response_not_found_status_code() - { - using (var server = CreateServer()) - { - var response = await server.CreateClient() - .GetAsync(Get.CampaignBy(int.MaxValue)); - - Assert.True(response.StatusCode == HttpStatusCode.NotFound); - } - } - - [Fact] - public async Task Post_add_new_campaign_and_response_ok_status_code() - { - using (var server = CreateServer()) - { - var fakeCampaignDto = GetFakeCampaignDto(); - var content = new StringContent(JsonConvert.SerializeObject(fakeCampaignDto), Encoding.UTF8, "application/json"); - var response = await server.CreateClient() - .PostAsync(Post.AddNewCampaign, content); - - response.EnsureSuccessStatusCode(); - } - } - - [Fact] - public async Task Delete_delete_campaign_and_response_not_content_status_code() - { - using (var server = CreateServer()) - { - var fakeCampaignDto = GetFakeCampaignDto(); - var content = new StringContent(JsonConvert.SerializeObject(fakeCampaignDto), Encoding.UTF8, "application/json"); - - //add campaign - var campaignResponse = await server.CreateClient() - .PostAsync(Post.AddNewCampaign, content); - - if (int.TryParse(campaignResponse.Headers.Location.Segments[4], out int id)) - { - var response = await server.CreateClient() - .DeleteAsync(Delete.CampaignBy(id)); - - Assert.True(response.StatusCode == HttpStatusCode.NoContent); - } - - campaignResponse.EnsureSuccessStatusCode(); - } - } - - [Fact] - public async Task Put_update_campaign_and_response_not_content_status_code() - { - using (var server = CreateServer()) - { - var fakeCampaignDto = GetFakeCampaignDto(); - var content = new StringContent(JsonConvert.SerializeObject(fakeCampaignDto), Encoding.UTF8, "application/json"); - - //add campaign - var campaignResponse = await server.CreateClient() - .PostAsync(Post.AddNewCampaign, content); - - if (int.TryParse(campaignResponse.Headers.Location.Segments[4], out int id)) - { - fakeCampaignDto.Description = "FakeCampaignUpdatedDescription"; - content = new StringContent(JsonConvert.SerializeObject(fakeCampaignDto), Encoding.UTF8, "application/json"); - var response = await server.CreateClient() - .PutAsync(Put.CampaignBy(id), content); - - Assert.True(response.StatusCode == HttpStatusCode.Created); - } - - campaignResponse.EnsureSuccessStatusCode(); - } - } - - private static CampaignDTO GetFakeCampaignDto() - { - return new CampaignDTO() - { - Name = "FakeCampaignName", - Description = "FakeCampaignDescription", - From = DateTime.Now, - To = DateTime.Now.AddDays(7), - PictureUri = "http://externalcatalogbaseurltobereplaced/api/v1/campaigns/0/pic" - }; - } - } + using System.Net.Http; + using System.Text; + using System.Threading.Tasks; + using Xunit; + using System; + using Newtonsoft.Json; + using System.Net; + using Microsoft.eShopOnContainers.Services.Marketing.API.Dto; + + public class CampaignScenarios + : CampaignScenarioBase + { + [Fact] + public async Task Get_get_all_campaigns_and_response_ok_status_code() + { + using (var server = CreateServer()) + { + var response = await server.CreateClient() + .GetAsync(Get.Campaigns); + + response.EnsureSuccessStatusCode(); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + + } + } + + [Fact] + public async Task Get_get_campaign_by_id_and_response_ok_status_code() + { + var campaignId = 1; + using (var server = CreateServer()) + { + var response = await server.CreateClient() + .GetAsync(Get.CampaignBy(campaignId)); + + response.EnsureSuccessStatusCode(); + } + } + + [Fact] + public async Task Get_get_campaign_by_id_and_response_not_found_status_code() + { + using (var server = CreateServer()) + { + var response = await server.CreateClient() + .GetAsync(Get.CampaignBy(int.MaxValue)); + + Assert.True(response.StatusCode == HttpStatusCode.NotFound); + } + } + + [Fact] + public async Task Post_add_new_campaign_and_response_ok_status_code() + { + using (var server = CreateServer()) + { + var fakeCampaignDto = GetFakeCampaignDto(); + var content = new StringContent(JsonConvert.SerializeObject(fakeCampaignDto), Encoding.UTF8, "application/json"); + var response = await server.CreateClient() + .PostAsync(Post.AddNewCampaign, content); + + response.EnsureSuccessStatusCode(); + } + } + + [Fact] + public async Task Delete_delete_campaign_and_response_not_content_status_code() + { + using (var server = CreateServer()) + { + var fakeCampaignDto = GetFakeCampaignDto(); + var content = new StringContent(JsonConvert.SerializeObject(fakeCampaignDto), Encoding.UTF8, "application/json"); + + //add campaign + var campaignResponse = await server.CreateClient() + .PostAsync(Post.AddNewCampaign, content); + + if (int.TryParse(campaignResponse?.Headers.Location.Segments[4], out int id)) + { + var response = await server.CreateClient() + .DeleteAsync(Delete.CampaignBy(id)); + + Assert.True(response.StatusCode == HttpStatusCode.NoContent); + } + + campaignResponse.EnsureSuccessStatusCode(); + } + } + + [Fact] + public async Task Put_update_campaign_and_response_not_content_status_code() + { + using (var server = CreateServer()) + { + var fakeCampaignDto = GetFakeCampaignDto(); + var content = new StringContent(JsonConvert.SerializeObject(fakeCampaignDto), Encoding.UTF8, "application/json"); + + //add campaign + var campaignResponse = await server.CreateClient() + .PostAsync(Post.AddNewCampaign, content); + + campaignResponse.EnsureSuccessStatusCode(); + Assert.Equal(HttpStatusCode.Created, campaignResponse.StatusCode); + + if (int.TryParse(campaignResponse.Headers.Location.Segments[4], out int id)) + { + fakeCampaignDto.Description = "FakeCampaignUpdatedDescription"; + content = new StringContent(JsonConvert.SerializeObject(fakeCampaignDto), Encoding.UTF8, "application/json"); + var response = await server.CreateClient() + .PutAsync(Put.CampaignBy(id), content); + + Assert.True(response.StatusCode == HttpStatusCode.NoContent); + } + } + } + + private static CampaignDTO GetFakeCampaignDto() + { + return new CampaignDTO() + { + Name = "FakeCampaignName", + Description = "FakeCampaignDescription", + From = DateTime.Now, + To = DateTime.Now.AddDays(7), + PictureUri = "http://externalcatalogbaseurltobereplaced/api/v1/campaigns/0/pic" + }; + } + } } diff --git a/test/Services/IntegrationTests/Services/Ordering/OrderingScenarios.cs b/test/Services/IntegrationTests/Services/Ordering/OrderingScenarios.cs index 2d87e8395..7f55c8f69 100644 --- a/test/Services/IntegrationTests/Services/Ordering/OrderingScenarios.cs +++ b/test/Services/IntegrationTests/Services/Ordering/OrderingScenarios.cs @@ -29,7 +29,7 @@ { 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() .PutAsync(Put.CancelOrder, content); @@ -42,7 +42,7 @@ { 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() .PutAsync(Put.ShipOrder, content); diff --git a/test/Services/IntegrationTests/Services/Ordering/settings.json b/test/Services/IntegrationTests/Services/Ordering/settings.json index 70f1af3c0..ffb7f1be6 100644 --- a/test/Services/IntegrationTests/Services/Ordering/settings.json +++ b/test/Services/IntegrationTests/Services/Ordering/settings.json @@ -1,10 +1,10 @@ { - "ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;", - "ExternalCatalogBaseUrl": "http://localhost:5101", - "IdentityUrl": "http://localhost:5105", - "isTest": "true", - "EventBusConnection": "localhost", - "CheckUpdateTime": "30000", - "GracePeriodTime": "1", - "SubscriptionClientName": "Ordering" + "CheckUpdateTime": "30000", + "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", + "GracePeriodTime": "1", + "IdentityUrl": "http://localhost:5105", + "isTest": "true", + "SubscriptionClientName": "Ordering" } diff --git a/test/Services/UnitTest/Ordering/Application/OrdersWebApiTest.cs b/test/Services/UnitTest/Ordering/Application/OrdersWebApiTest.cs index b6f047960..516f9ba54 100644 --- a/test/Services/UnitTest/Ordering/Application/OrdersWebApiTest.cs +++ b/test/Services/UnitTest/Ordering/Application/OrdersWebApiTest.cs @@ -94,7 +94,7 @@ namespace UnitTest.Ordering.Application { //Arrange var fakeDynamicResult = Enumerable.Empty(); - _orderQueriesMock.Setup(x => x.GetOrdersAsync()) + _orderQueriesMock.Setup(x => x.GetOrdersFromUserAsync(Guid.NewGuid())) .Returns(Task.FromResult(fakeDynamicResult)); //Act diff --git a/test/Services/UnitTest/UnitTest.csproj b/test/Services/UnitTest/UnitTest.csproj index ebc17095f..08676c18c 100644 --- a/test/Services/UnitTest/UnitTest.csproj +++ b/test/Services/UnitTest/UnitTest.csproj @@ -1,36 +1,37 @@  - - netcoreapp2.0 - true - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - false - false - false - + + netcoreapp2.1 + true + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + false + false + false + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - + + +