diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/BaseIntegratedTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/BaseIntegratedTest.cs index 22cac7b0..61d3c46b 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/BaseIntegratedTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/BaseIntegratedTest.cs @@ -30,9 +30,11 @@ public abstract class BaseIntegratedTest : IDisposable /// /// Base class for integration tests. /// - public abstract class BaseIntegratedTest : IClassFixture>, IDisposable + /// Startup class used for booting the application. + public abstract class BaseIntegratedTest : IClassFixture>, IDisposable + where TStartup : class { - protected readonly WebApplicationFactory _factory; + protected readonly WebApplicationFactory _factory; #endif protected ITestOutputHelper _output; @@ -139,7 +141,7 @@ protected BaseIntegratedTest(string tempDbNamePrefix, bool useGisDataService = f /// Unit tests debug output. /// Prefix for temp database name. /// Use DataService with Gis support. - protected BaseIntegratedTest(CustomWebApplicationFactory factory, ITestOutputHelper output, string tempDbNamePrefix, bool useGisDataService = false) + protected BaseIntegratedTest(CustomWebApplicationFactory factory, ITestOutputHelper output, string tempDbNamePrefix, bool useGisDataService = false) { _factory = factory; _output = output; diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/BaseODataServiceIntegratedTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/BaseODataServiceIntegratedTest.cs index e904d023..eee8605f 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/BaseODataServiceIntegratedTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/BaseODataServiceIntegratedTest.cs @@ -35,7 +35,13 @@ /// /// Базовый класс для тестирования работы с данными через ODataService. /// +#if NETFRAMEWORK public class BaseODataServiceIntegratedTest : BaseIntegratedTest +#endif +#if NETCOREAPP + public class BaseODataServiceIntegratedTest : BaseIntegratedTest + where TStartup : class +#endif { protected IDataObjectEdmModelBuilder _builder; @@ -72,7 +78,7 @@ public BaseODataServiceIntegratedTest( } #endif #if NETCOREAPP - public BaseODataServiceIntegratedTest(CustomWebApplicationFactory factory, ITestOutputHelper output = null, bool useNamespaceInEntitySetName = false, bool useGisDataService = false, PseudoDetailDefinitions pseudoDetailDefinitions = null) + public BaseODataServiceIntegratedTest(CustomWebApplicationFactory factory, ITestOutputHelper output = null, bool useNamespaceInEntitySetName = false, bool useGisDataService = false, PseudoDetailDefinitions pseudoDetailDefinitions = null) : base(factory, output, "ODataDB", useGisDataService) { Init(useNamespaceInEntitySetName, pseudoDetailDefinitions); diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Create/BusinessServersTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Create/BusinessServersTest.cs index 6f1bfb16..27b8c4c4 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Create/BusinessServersTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Create/BusinessServersTest.cs @@ -13,7 +13,12 @@ /// /// Класс тестов для тестирования бизнес-серверов. /// +#if NETFRAMEWORK public class BusinessServersTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class BusinessServersTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -21,7 +26,7 @@ public class BusinessServersTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public BusinessServersTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public BusinessServersTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Create/ChangeMasterInBSTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Create/ChangeMasterInBSTest.cs index a340a454..ccae2f74 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Create/ChangeMasterInBSTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Create/ChangeMasterInBSTest.cs @@ -11,7 +11,12 @@ /// /// Класс тестов для тестирования изменения мастера при создании детейла. /// +#if NETFRAMEWORK public class ChangeMasterInBSTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class ChangeMasterInBSTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -19,7 +24,7 @@ public class ChangeMasterInBSTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public ChangeMasterInBSTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public ChangeMasterInBSTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Create/CreateWithPseudoDetailDefinedTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Create/CreateWithPseudoDetailDefinedTest.cs index f1aedc2b..7a364423 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Create/CreateWithPseudoDetailDefinedTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Create/CreateWithPseudoDetailDefinedTest.cs @@ -11,7 +11,12 @@ /// /// Unit-test class for creation entity instance with pseudodetail field defined through OData service. /// +#if NETFRAMEWORK public class CreateWithPseudoDetailDefinedTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class CreateWithPseudoDetailDefinedTest : BaseODataServiceIntegratedTest +#endif { private static PseudoDetailDefinitions GetPseudoDetailDefinitions() { @@ -31,7 +36,7 @@ public CreateWithPseudoDetailDefinedTest() : base(pseudoDetailDefinitions: GetPs } #endif #if NETCOREAPP - public CreateWithPseudoDetailDefinedTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output, pseudoDetailDefinitions: GetPseudoDetailDefinitions()) + public CreateWithPseudoDetailDefinedTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output, pseudoDetailDefinitions: GetPseudoDetailDefinitions()) { } #endif diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/GisCRUDTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/GisCRUDTest.cs index 104a1681..cd2d9985 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/GisCRUDTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/GisCRUDTest.cs @@ -21,7 +21,12 @@ /// /// Класс тестов для тестирования работы с гео-данными. /// +#if NETFRAMEWORK public class GisCRUDTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class GisCRUDTest : BaseODataServiceIntegratedTest +#endif { #if NETFRAMEWORK /// @@ -37,7 +42,7 @@ public GisCRUDTest() /// /// Фабрика для приложения. /// Вывод диагностической информации по тестам. - public GisCRUDTest(CustomWebApplicationFactory factory, ITestOutputHelper output) + public GisCRUDTest(CustomWebApplicationFactory factory, ITestOutputHelper output) : base(factory, output, false, true) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/MultiThreadTests.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/MultiThreadTests.cs index 238df9a2..6bcbfb42 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/MultiThreadTests.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/MultiThreadTests.cs @@ -33,7 +33,12 @@ namespace NewPlatform.Flexberry.ORM.ODataService.Tests.CRUD /// /// Тесты CRUD операций с множеством пользователей. /// +#if NETFRAMEWORK public class MultiThreadTests : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class MultiThreadTests : BaseODataServiceIntegratedTest +#endif { private const int ThreadCount = 50; @@ -54,7 +59,7 @@ public MultiThreadTests(Xunit.Abstractions.ITestOutputHelper output) /// /// Фабрика для приложения. /// Вывод отладочной информации. - public MultiThreadTests(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public MultiThreadTests(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } @@ -337,7 +342,7 @@ private static void RegisterCustomUser(IUnityContainer container) container.RegisterType(); #if NETCOREAPP container.RegisterType(); - #endif +#endif container.RegisterType(); } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/BuiltinQueryFunctionsTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/BuiltinQueryFunctionsTest.cs index 70df3068..0922578b 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/BuiltinQueryFunctionsTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/BuiltinQueryFunctionsTest.cs @@ -20,7 +20,12 @@ /// /// Класс тестов для тестирования применения $filter в OData-сервисе. /// +#if NETFRAMEWORK public class BuiltinQueryFunctionsTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class BuiltinQueryFunctionsTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -28,7 +33,7 @@ public class BuiltinQueryFunctionsTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public BuiltinQueryFunctionsTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public BuiltinQueryFunctionsTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/Excel/ExcelExportTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/Excel/ExcelExportTest.cs index 9eabb8aa..1ab78bf1 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/Excel/ExcelExportTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/Excel/ExcelExportTest.cs @@ -13,7 +13,12 @@ /// /// A class for testing exports from Excel. /// +#if NETFRAMEWORK public class ExcelExportTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class ExcelExportTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -21,7 +26,7 @@ public class ExcelExportTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public ExcelExportTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public ExcelExportTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterByMasterDetailFieldTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterByMasterDetailFieldTest.cs index 478014a6..4df72efb 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterByMasterDetailFieldTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterByMasterDetailFieldTest.cs @@ -16,7 +16,12 @@ /// /// Unit-test class for filtering data through OData service by master details fields. /// +#if NETFRAMEWORK public class FilterByMasterDetailFieldTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class FilterByMasterDetailFieldTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -24,7 +29,7 @@ public class FilterByMasterDetailFieldTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public FilterByMasterDetailFieldTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public FilterByMasterDetailFieldTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } @@ -145,42 +150,42 @@ public void TestFilterByDetailMaster() Медведь медведь3 = new Медведь() { ПорядковыйНомер = 3 }; Лес лес1 = new Лес() { Название = "Шишкин" }; - Лес лес2 = new Лес() { Название = "Ёжкин" }; + Лес лес2 = new Лес() { Название = "Ёжкин" }; Лес лес3 = new Лес() { Название = "Пыжкин" }; Берлога берлога1 = new Берлога() { Наименование = "Берлога 1", ЛесРасположения = лес1, Заброшена = true }; Берлога берлога2 = new Берлога() { Наименование = "Берлога 2", ЛесРасположения = лес1, Заброшена = false }; Берлога берлога3 = new Берлога() { Наименование = "Берлога 3", ЛесРасположения = лес2, Заброшена = false }; - Берлога берлога4 = new Берлога() { Наименование = "Берлога 4", ЛесРасположения = лес2, Заброшена = false }; + Берлога берлога4 = new Берлога() { Наименование = "Берлога 4", ЛесРасположения = лес2, Заброшена = false }; Берлога берлога5 = new Берлога() { Наименование = "Берлога 5", ЛесРасположения = лес3, Заброшена = false }; Берлога берлога6 = new Берлога() { Наименование = "Берлога 6", ЛесРасположения = лес3, Заброшена = true}; медведь1.Берлога.AddRange(берлога1, берлога2); - медведь2.Берлога.AddRange(берлога3, берлога4); + медведь2.Берлога.AddRange(берлога3, берлога4); медведь3.Берлога.AddRange(берлога5, берлога6); DataObject[] newDataObjects = new DataObject[] { лес1, лес2, лес3, медведь1, медведь2, берлога1, берлога2, берлога3, берлога4, берлога5, берлога6 }; args.DataService.UpdateObjects(ref newDataObjects); - ExternalLangDef.LanguageDef.DataService = args.DataService; - - // Act. + ExternalLangDef.LanguageDef.DataService = args.DataService; + + // Act. string requestUrl = string.Format( "http://localhost/odata/{0}?$filter={1}", args.Token.Model.GetEdmEntitySet(typeof(Берлога)).Name, "(Медведь/Берлога/any(f:(f/Заброшена eq true)))"); using (var response = args.HttpClient.GetAsync(requestUrl).Result) - { - // Assert. + { + // Assert. string receivedStr = response.Content.ReadAsStringAsync().Result.Beautify(); Assert.Equal(HttpStatusCode.OK, response.StatusCode); Dictionary receivedDict = JsonConvert.DeserializeObject>(receivedStr); Assert.Equal(4, ((JArray)receivedDict["value"]).Count); } }); - } - + } + /// /// Tests filtering data by detail enum field with complex predicate. /// @@ -188,39 +193,39 @@ public void TestFilterByDetailMaster() public void TestFilterByEnumDetailMaster() { ActODataService(args => - { - // Arrange. - Driver driver1 = new Driver { CarCount = 2, Documents = true, Name = "Driver1" }; - Driver driver2 = new Driver { CarCount = 2, Documents = true, Name = "Driver2" }; - Driver driver3 = new Driver { CarCount = 2, Documents = true, Name = "Driver3" }; + { + // Arrange. + Driver driver1 = new Driver { CarCount = 2, Documents = true, Name = "Driver1" }; + Driver driver2 = new Driver { CarCount = 2, Documents = true, Name = "Driver2" }; + Driver driver3 = new Driver { CarCount = 2, Documents = true, Name = "Driver3" }; Car car1d1 = new Car { Model = "ВАЗ", TipCar = tTip.sedan }; Car car2d1 = new Car { Model = "ГАЗ", TipCar = tTip.sedan }; Car car1d2 = new Car { Model = "BMW", TipCar = tTip.crossover }; Car car2d2 = new Car { Model = "Porsche", TipCar = tTip.sedan }; - + Car car1d3 = new Car { Model = "Lamborghini", TipCar = tTip.crossover }; - Car car2d3 = new Car { Model = "Subaru", TipCar = tTip.sedan }; - + Car car2d3 = new Car { Model = "Subaru", TipCar = tTip.sedan }; + driver1.Car.AddRange(car1d1, car2d1); - driver2.Car.AddRange(car1d2, car2d2); + driver2.Car.AddRange(car1d2, car2d2); driver3.Car.AddRange(car1d3, car2d3); DataObject[] newDataObjects = new DataObject[] { driver1, driver2, driver3, car1d1, car2d1, car1d2, car2d2, car1d3, car2d3 }; args.DataService.UpdateObjects(ref newDataObjects); - ExternalLangDef.LanguageDef.DataService = args.DataService; - - // Act. + ExternalLangDef.LanguageDef.DataService = args.DataService; + + // Act. string requestUrl = string.Format( "http://localhost/odata/{0}?$filter={1}", args.Token.Model.GetEdmEntitySet(typeof(Car)).Name, "(Driver/Car/any(f:(f/TipCar eq NewPlatform.Flexberry.ORM.ODataService.Tests.tTip'crossover')))"); using (var response = args.HttpClient.GetAsync(requestUrl).Result) - { - // Assert. + { + // Assert. string receivedStr = response.Content.ReadAsStringAsync().Result.Beautify(); Assert.Equal(HttpStatusCode.OK, response.StatusCode); Dictionary receivedDict = JsonConvert.DeserializeObject>(receivedStr); diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterByMasterFieldTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterByMasterFieldTest.cs index 283adb51..d6ae5e9b 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterByMasterFieldTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterByMasterFieldTest.cs @@ -15,15 +15,20 @@ /// /// Unit-test class for filtering data through OData service by master fields. /// +#if NETFRAMEWORK public class FilterByMasterFieldTest : BaseODataServiceIntegratedTest - { +#endif +#if NETCOREAPP + public class FilterByMasterFieldTest : BaseODataServiceIntegratedTest +#endif + { #if NETCOREAPP /// /// Конструктор по-умолчанию. /// /// Фабрика для приложения. /// Вывод отладочной информации. - public FilterByMasterFieldTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public FilterByMasterFieldTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterByMasterMasterDetailFieldTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterByMasterMasterDetailFieldTest.cs index f8298cab..8d983e31 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterByMasterMasterDetailFieldTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterByMasterMasterDetailFieldTest.cs @@ -16,7 +16,12 @@ namespace NewPlatform.Flexberry.ORM.ODataService.Tests.CRUD.Read /// /// Unit-test class for filtering data through OData service by master master details fields. /// +#if NETFRAMEWORK public class FilterByMasterMasterDetailFieldTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class FilterByMasterMasterDetailFieldTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -24,7 +29,7 @@ public class FilterByMasterMasterDetailFieldTest : BaseODataServiceIntegratedTes /// /// Фабрика для приложения. /// Вывод отладочной информации. - public FilterByMasterMasterDetailFieldTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public FilterByMasterMasterDetailFieldTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterByPseudoDetailFieldTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterByPseudoDetailFieldTest.cs index c9474cff..aa9a6fb4 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterByPseudoDetailFieldTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterByPseudoDetailFieldTest.cs @@ -16,7 +16,12 @@ /// /// Unit-test class for filtering data through OData service by pseudodetail field. /// +#if NETFRAMEWORK public class FilterByPseudoDetailFieldTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class FilterByPseudoDetailFieldTest : BaseODataServiceIntegratedTest +#endif { private static PseudoDetailDefinitions GetPseudoDetailDefinitions() { @@ -36,7 +41,7 @@ public FilterByPseudoDetailFieldTest() : base(pseudoDetailDefinitions: GetPseudo } #endif #if NETCOREAPP - public FilterByPseudoDetailFieldTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public FilterByPseudoDetailFieldTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output, pseudoDetailDefinitions: GetPseudoDetailDefinitions()) { IUnityContainer container = UnityFactory.GetContainer(); diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterTest.cs index d6cdbb27..affba784 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/FilterTest.cs @@ -19,7 +19,12 @@ /// /// Класс тестов для тестирования применения $filter в OData-сервисе. /// +#if NETFRAMEWORK public class FilterTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class FilterTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -27,7 +32,7 @@ public class FilterTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public FilterTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public FilterTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/GetTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/GetTest.cs index 019014ad..8b69831f 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/GetTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/GetTest.cs @@ -19,7 +19,12 @@ /// /// Класс тестов для проверки корректной обработки Get-запросов. /// +#if NETFRAMEWORK public class GetTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class GetTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -27,15 +32,15 @@ public class GetTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public GetTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public GetTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } #endif - /// - /// Проверка получения данных для классов, в которых есть нехранимые поля, который не содержат setter'ов. - /// (Такие варианты присутствуют в старом коде). + /// + /// Проверка получения данных для классов, в которых есть нехранимые поля, который не содержат setter'ов. + /// (Такие варианты присутствуют в старом коде). /// [Fact] public void TestGetNotStored() @@ -67,8 +72,8 @@ public void TestGetNotStored() }); } - /// - /// Проверка значение в атрибуте @odata.type. + /// + /// Проверка значение в атрибуте @odata.type. /// [Fact] public void TestGetWithMaster() diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/MetaDataTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/MetaDataTest.cs index e90fbf41..e3c9c00d 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/MetaDataTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/MetaDataTest.cs @@ -15,7 +15,12 @@ /// /// Класс тестов для тестирования метаданных, получаемых от OData-сервиса. /// +#if NETFRAMEWORK public class MetaDataTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class MetaDataTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -23,7 +28,7 @@ public class MetaDataTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public MetaDataTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public MetaDataTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/ReferenceToMasterTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/ReferenceToMasterTest.cs index ecbed583..14963a4f 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/ReferenceToMasterTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/ReferenceToMasterTest.cs @@ -18,7 +18,12 @@ /// /// Unit-test class for read data with reference to master through OData service. /// +#if NETFRAMEWORK public class ReferenceToMasterTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class ReferenceToMasterTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -26,7 +31,7 @@ public class ReferenceToMasterTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public ReferenceToMasterTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public ReferenceToMasterTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/SkipTopOrderByTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/SkipTopOrderByTest.cs index bc7f74ac..cc3c4ac9 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/SkipTopOrderByTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/SkipTopOrderByTest.cs @@ -20,7 +20,12 @@ /// /// Класс тестов для тестирования $skip, $top, $orderby. /// +#if NETFRAMEWORK public class SkipTopOrderByTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class SkipTopOrderByTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -28,7 +33,7 @@ public class SkipTopOrderByTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public SkipTopOrderByTest(CustomWebApplicationFactory factory, ITestOutputHelper output) + public SkipTopOrderByTest(CustomWebApplicationFactory factory, ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/UtfRequestsTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/UtfRequestsTest.cs index 931f1a75..adacb75c 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/UtfRequestsTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Read/UtfRequestsTest.cs @@ -18,15 +18,20 @@ /// /// Unit-test class for read data through OData service with using UTF8 requests. /// +#if NETFRAMEWORK public class UtfRequestsTest : BaseODataServiceIntegratedTest - { +#endif +#if NETCOREAPP + public class UtfRequestsTest : BaseODataServiceIntegratedTest +#endif + { #if NETCOREAPP /// /// Конструктор по-умолчанию. /// /// Фабрика для приложения. /// Вывод отладочной информации. - public UtfRequestsTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public UtfRequestsTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Update/BusinessServersTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Update/BusinessServersTest.cs index c10ae918..847d48e0 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Update/BusinessServersTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Update/BusinessServersTest.cs @@ -19,7 +19,12 @@ /// /// Класс тестов для тестирования бизнес-серверов. /// +#if NETFRAMEWORK public class BusinessServersTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class BusinessServersTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -27,7 +32,7 @@ public class BusinessServersTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public BusinessServersTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public BusinessServersTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Update/ModifyDataTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Update/ModifyDataTest.cs index ce6ed159..abd7631a 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Update/ModifyDataTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Update/ModifyDataTest.cs @@ -19,7 +19,12 @@ /// /// Класс тестов для тестирования операций модификации данных OData-сервисом (вставка, обновление, удаление). /// +#if NETFRAMEWORK public class ModifyDataTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class ModifyDataTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -27,7 +32,7 @@ public class ModifyDataTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public ModifyDataTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public ModifyDataTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Update/WebFileTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Update/WebFileTest.cs index 708d2bb5..672fe9ac 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Update/WebFileTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CRUD/Update/WebFileTest.cs @@ -13,7 +13,12 @@ using Unity; using Xunit; - public class WebFileTest: BaseODataServiceIntegratedTest +#if NETFRAMEWORK + public class WebFileTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class WebFileTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -21,7 +26,7 @@ public class WebFileTest: BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public WebFileTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public WebFileTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CustomWebApplicationFactory.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CustomWebApplicationFactory.cs index 926a4c23..98e815cc 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CustomWebApplicationFactory.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/CustomWebApplicationFactory.cs @@ -22,7 +22,7 @@ protected override IWebHostBuilder CreateWebHostBuilder() var webHostBuilder = new WebHostBuilder() .UseUnityServiceProvider(container) .UseContentRoot(contentRootDirectory) - .UseStartup(); + .UseStartup(); return webHostBuilder; } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/AfterGetTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/AfterGetTest.cs index 4e108989..1cd43dcb 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/AfterGetTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/AfterGetTest.cs @@ -11,7 +11,12 @@ /// Класс тестов для тестирования логики после операции считывания данных OData-сервисом. /// +#if NETFRAMEWORK public class AfterGetTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class AfterGetTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -19,7 +24,7 @@ public class AfterGetTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public AfterGetTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public AfterGetTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/AfterInternalServerErrorTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/AfterInternalServerErrorTest.cs index 428eccb4..aa771b4a 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/AfterInternalServerErrorTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/AfterInternalServerErrorTest.cs @@ -12,7 +12,12 @@ /// /// Класс тестов для тестирования логики после возникновения исключения. /// +#if NETFRAMEWORK public class AfterInternalServerErrorTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class AfterInternalServerErrorTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -20,7 +25,7 @@ public class AfterInternalServerErrorTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public AfterInternalServerErrorTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public AfterInternalServerErrorTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } @@ -48,13 +53,13 @@ public Exception AfterInternalServerError(Exception e, ref HttpStatusCode code) public void TestAfterInternalServerError() { ActODataService(args => - { + { #if NETFRAMEWORK args.Token.Events.CallbackAfterInternalServerError = AfterInternalServerError; #elif NETCOREAPP CustomExceptionFilter.CallbackAfterInternalServerError = AfterInternalServerError; #endif - + Медведь медв = new Медведь { Вес = 48, Пол = tПол.Мужской }; Медведь медв2 = new Медведь { Вес = 148, Пол = tПол.Мужской }; Лес лес = new Лес { Название = "Бор" }; diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/AfterSaveTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/AfterSaveTest.cs index 52d93515..3779edd7 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/AfterSaveTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/AfterSaveTest.cs @@ -23,7 +23,12 @@ /// /// Класс тестов для тестирования логики после операций модификации данных OData-сервисом (вставка, обновление, удаление). /// +#if NETFRAMEWORK public class AfterSaveTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class AfterSaveTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -31,7 +36,7 @@ public class AfterSaveTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public AfterSaveTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public AfterSaveTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/BeforeGetTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/BeforeGetTest.cs index 5644de97..ab3ef94a 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/BeforeGetTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/BeforeGetTest.cs @@ -1,14 +1,14 @@ namespace NewPlatform.Flexberry.ORM.ODataService.Tests.Events { - using System; - using System.Collections.Generic; + using System; + using System.Collections.Generic; using System.Net; using System.Net.Http; using ICSSoft.STORMNET; - using ICSSoft.STORMNET.Business; - using NewPlatform.Flexberry.ORM.ODataService.Tests.Extensions; - using Newtonsoft.Json; + using ICSSoft.STORMNET.Business; + using NewPlatform.Flexberry.ORM.ODataService.Tests.Extensions; + using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Xunit; @@ -16,7 +16,12 @@ /// /// Класс тестов для тестирования логики после операций модификации данных OData-сервисом (вставка, обновление, удаление). /// +#if NETFRAMEWORK public class BeforeGetTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class BeforeGetTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -24,7 +29,7 @@ public class BeforeGetTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public BeforeGetTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public BeforeGetTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } @@ -43,14 +48,14 @@ public bool BeforeGet(ref LoadingCustomizationStruct lcs) return true; } - /// - /// Блокирует получение объектов. - /// - /// LCS. - /// false - public bool FalseBeforeGet(ref LoadingCustomizationStruct lcs) - { - return false; + /// + /// Блокирует получение объектов. + /// + /// LCS. + /// false + public bool FalseBeforeGet(ref LoadingCustomizationStruct lcs) + { + return false; } /// diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/BeforeSaveTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/BeforeSaveTest.cs index 153301b1..0e17c3f2 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/BeforeSaveTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Events/BeforeSaveTest.cs @@ -17,7 +17,12 @@ /// /// Класс тестов для тестирования логики перед операциями модификации данных OData-сервисом (вставка, обновление, удаление). /// +#if NETFRAMEWORK public class BeforeSaveTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class BeforeSaveTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -25,7 +30,7 @@ public class BeforeSaveTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public BeforeSaveTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public BeforeSaveTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Files/FileControllerTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Files/FileControllerTest.cs index 9ba02a91..3c2f67bb 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Files/FileControllerTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Files/FileControllerTest.cs @@ -26,7 +26,12 @@ /// /// Тесты файлового контроллера , отвечающего за загрузку файлов на сервер и их скачивание. /// +#if NETFRAMEWORK public class FileControllerTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class FileControllerTest : BaseODataServiceIntegratedTest +#endif { private const string FileBaseUrl = "http://localhost/api/File"; @@ -61,7 +66,7 @@ public class FileControllerTest : BaseODataServiceIntegratedTest #if NETFRAMEWORK public FileControllerTest() #elif NETCOREAPP - public FileControllerTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public FileControllerTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) #endif { diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Functions/ActionsTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Functions/ActionsTest.cs index f5431b2a..8bba6c0e 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Functions/ActionsTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Functions/ActionsTest.cs @@ -29,7 +29,12 @@ /// /// Класс тестов для тестирования метаданных, получаемых от OData-сервиса. /// +#if NETFRAMEWORK public class ActionsTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class ActionsTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -37,7 +42,7 @@ public class ActionsTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public ActionsTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public ActionsTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Functions/DelegateFunctionsTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Functions/DelegateFunctionsTest.cs index f18e1521..fc083751 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Functions/DelegateFunctionsTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Functions/DelegateFunctionsTest.cs @@ -13,7 +13,12 @@ /// /// Unit test class for OData Service user-defined functions /// +#if NETFRAMEWORK public class DelegateFunctionsTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class DelegateFunctionsTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -21,7 +26,7 @@ public class DelegateFunctionsTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public DelegateFunctionsTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public DelegateFunctionsTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Functions/FunctionsTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Functions/FunctionsTest.cs index a43b8ef3..ac38d289 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Functions/FunctionsTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Functions/FunctionsTest.cs @@ -28,7 +28,12 @@ /// /// Класс тестов для тестирования метаданных, получаемых от OData-сервиса. /// +#if NETFRAMEWORK public class FunctionsTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class FunctionsTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// @@ -36,7 +41,7 @@ public class FunctionsTest : BaseODataServiceIntegratedTest /// /// Фабрика для приложения. /// Вывод отладочной информации. - public FunctionsTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public FunctionsTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Model/CustomizationEdmModelNames.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Model/CustomizationEdmModelNames.cs index 0b8b0703..00c8b141 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Model/CustomizationEdmModelNames.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Model/CustomizationEdmModelNames.cs @@ -15,14 +15,19 @@ /// /// Класс тестов для тестирования метаданных, получаемых от OData-сервиса. /// +#if NETFRAMEWORK public class CustomizationEdmModelNames : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class CustomizationEdmModelNames : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// /// Конструктор по-умолчанию. /// /// Фабрика для приложения. - public CustomizationEdmModelNames(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public CustomizationEdmModelNames(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Offline/DefaultOfflineManagerIntegratedTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Offline/DefaultOfflineManagerIntegratedTest.cs index 53e435ae..b1bf2388 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Offline/DefaultOfflineManagerIntegratedTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Offline/DefaultOfflineManagerIntegratedTest.cs @@ -15,13 +15,18 @@ using NewPlatform.Flexberry.ORM.ODataService.Tests.Extensions; using NewPlatform.Flexberry.Services; +#if NETFRAMEWORK public class DefaultOfflineManagerIntegratedTest : BaseODataServiceIntegratedTest +#endif +#if NETCOREAPP + public class DefaultOfflineManagerIntegratedTest : BaseODataServiceIntegratedTest +#endif { #if NETCOREAPP /// /// Конструктор по-умолчанию. /// - public DefaultOfflineManagerIntegratedTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) + public DefaultOfflineManagerIntegratedTest(CustomWebApplicationFactory factory, Xunit.Abstractions.ITestOutputHelper output) : base(factory, output) { } #endif diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Offline/OfflineAuditServiceIntegratedTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Offline/OfflineAuditServiceIntegratedTest.cs index 96e4b461..042cf1ae 100644 --- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Offline/OfflineAuditServiceIntegratedTest.cs +++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Offline/OfflineAuditServiceIntegratedTest.cs @@ -13,7 +13,12 @@ /// ORM-integrated unit test for . /// /// +#if NETFRAMEWORK public class OfflineAuditServiceIntegratedTest : BaseIntegratedTest +#endif +#if NETCOREAPP + public class OfflineAuditServiceIntegratedTest : BaseIntegratedTest +#endif { #if NETFRAMEWORK /// @@ -28,7 +33,7 @@ public OfflineAuditServiceIntegratedTest() /// /// Initializes a new instance of the class. /// - public OfflineAuditServiceIntegratedTest(CustomWebApplicationFactory factory, ITestOutputHelper output) + public OfflineAuditServiceIntegratedTest(CustomWebApplicationFactory factory, ITestOutputHelper output) : base(factory, output, "offline") { }