From 5d2c6a85d73043e49a60f16864cace2aeb7bdaa0 Mon Sep 17 00:00:00 2001 From: NickAppLab Date: Tue, 26 Jul 2022 03:56:59 +0500 Subject: [PATCH] Tests fix --- .../RCSections/RCSectionFromNdmPrimitiveTest.cs | 8 +++----- .../Ndms/RCSections/RCSectionTest.cs | 7 +++---- .../Ndms/SteelSections/ReinforcementTest.cs | 6 +++--- .../Infrastructures/Logics/ExpectedProcessor.cs | 2 -- .../Ndms/RCSections/RCSectionTest.cs | 4 ---- StructureHelperTests/Properties/AssemblyInfo.cs | 1 - StructureHelperTests/StructureHelperTests.csproj | 7 ++++++- .../Triangulations/RectangleTriangulationTest.cs | 15 +-------------- 8 files changed, 16 insertions(+), 34 deletions(-) diff --git a/StructureHelperTests/FunctionalTests/Ndms/RCSections/RCSectionFromNdmPrimitiveTest.cs b/StructureHelperTests/FunctionalTests/Ndms/RCSections/RCSectionFromNdmPrimitiveTest.cs index 4a04d53..307e58e 100644 --- a/StructureHelperTests/FunctionalTests/Ndms/RCSections/RCSectionFromNdmPrimitiveTest.cs +++ b/StructureHelperTests/FunctionalTests/Ndms/RCSections/RCSectionFromNdmPrimitiveTest.cs @@ -1,17 +1,15 @@ using LoaderCalculator; -using LoaderCalculator.Data.Materials; using LoaderCalculator.Data.Matrix; using LoaderCalculator.Data.Ndms; using LoaderCalculator.Data.SourceData; using LoaderCalculator.Tests.Infrastructures.Logics; using NUnit.Framework; -using StructureHelperLogics.Data.Shapes; -using StructureHelperLogics.NdmCalculations.Entities; -using StructureHelperLogics.NdmCalculations.Materials; using StructureHelperLogics.NdmCalculations.Triangulations; using System.Collections.Generic; using System.Threading; -using StructureHelperLogics.Models.NdmPrimitives; +using StructureHelperCommon.Models.Entities; +using StructureHelperCommon.Models.NdmPrimitives; +using StructureHelperCommon.Models.Shapes; namespace StructureHelperTests.FunctionalTests.Ndms.RCSections { diff --git a/StructureHelperTests/FunctionalTests/Ndms/RCSections/RCSectionTest.cs b/StructureHelperTests/FunctionalTests/Ndms/RCSections/RCSectionTest.cs index bf02474..9574179 100644 --- a/StructureHelperTests/FunctionalTests/Ndms/RCSections/RCSectionTest.cs +++ b/StructureHelperTests/FunctionalTests/Ndms/RCSections/RCSectionTest.cs @@ -1,16 +1,15 @@ using LoaderCalculator; -using LoaderCalculator.Data.Materials; using LoaderCalculator.Data.Matrix; using LoaderCalculator.Data.Ndms; using LoaderCalculator.Data.SourceData; using LoaderCalculator.Tests.Infrastructures.Logics; using NUnit.Framework; -using StructureHelperLogics.Data.Shapes; -using StructureHelperLogics.NdmCalculations.Entities; -using StructureHelperLogics.NdmCalculations.Materials; using StructureHelperLogics.NdmCalculations.Triangulations; using System.Collections.Generic; using System.Threading; +using StructureHelperCommon.Models.Entities; +using StructureHelperCommon.Models.Materials; +using StructureHelperCommon.Models.Shapes; namespace StructureHelperTests.FunctionalTests.Ndms.RCSections { diff --git a/StructureHelperTests/FunctionalTests/Ndms/SteelSections/ReinforcementTest.cs b/StructureHelperTests/FunctionalTests/Ndms/SteelSections/ReinforcementTest.cs index 230ba3f..bd95006 100644 --- a/StructureHelperTests/FunctionalTests/Ndms/SteelSections/ReinforcementTest.cs +++ b/StructureHelperTests/FunctionalTests/Ndms/SteelSections/ReinforcementTest.cs @@ -3,12 +3,12 @@ using LoaderCalculator.Data.Matrix; using LoaderCalculator.Data.SourceData; using LoaderCalculator.Tests.Infrastructures.Logics; using NUnit.Framework; -using StructureHelperLogics.Data.Shapes; -using StructureHelperLogics.NdmCalculations.Entities; -using StructureHelperLogics.NdmCalculations.Materials; using StructureHelperLogics.NdmCalculations.Triangulations; using System.Collections.Generic; using System.Threading; +using StructureHelperCommon.Models.Entities; +using StructureHelperCommon.Models.Materials; +using StructureHelperCommon.Models.Shapes; namespace StructureHelperTests.FunctionalTests.Ndms.SteelSections { diff --git a/StructureHelperTests/Infrastructures/Logics/ExpectedProcessor.cs b/StructureHelperTests/Infrastructures/Logics/ExpectedProcessor.cs index f729eac..b35907f 100644 --- a/StructureHelperTests/Infrastructures/Logics/ExpectedProcessor.cs +++ b/StructureHelperTests/Infrastructures/Logics/ExpectedProcessor.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; namespace LoaderCalculator.Tests.Infrastructures.Logics { diff --git a/StructureHelperTests/LibrariesTests/Ndms/RCSections/RCSectionTest.cs b/StructureHelperTests/LibrariesTests/Ndms/RCSections/RCSectionTest.cs index f50917f..dc128e8 100644 --- a/StructureHelperTests/LibrariesTests/Ndms/RCSections/RCSectionTest.cs +++ b/StructureHelperTests/LibrariesTests/Ndms/RCSections/RCSectionTest.cs @@ -5,14 +5,10 @@ using LoaderCalculator.Data.Ndms; using LoaderCalculator.Data.Ndms.Transformations; using LoaderCalculator.Data.Planes; using LoaderCalculator.Data.SourceData; -using LoaderCalculator.Infrastructure; using LoaderCalculator.Tests.Infrastructures.Logics; using LoaderCalculator.Triangulations; -using Moq; using NUnit.Framework; -using System; using System.Collections.Generic; -using System.Linq; using System.Threading; namespace LoaderCalculator.Tests.FunctionalTests.SectionTests { diff --git a/StructureHelperTests/Properties/AssemblyInfo.cs b/StructureHelperTests/Properties/AssemblyInfo.cs index b03a2ce..97c282f 100644 --- a/StructureHelperTests/Properties/AssemblyInfo.cs +++ b/StructureHelperTests/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("StructureHelperTests")] diff --git a/StructureHelperTests/StructureHelperTests.csproj b/StructureHelperTests/StructureHelperTests.csproj index 6776db4..5caf80a 100644 --- a/StructureHelperTests/StructureHelperTests.csproj +++ b/StructureHelperTests/StructureHelperTests.csproj @@ -10,7 +10,7 @@ Properties StructureHelperTests StructureHelperTests - v4.7.2 + v4.8 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 15.0 @@ -20,6 +20,7 @@ UnitTest + true @@ -74,6 +75,10 @@ + + {5DFEC3FD-9677-47BB-9E88-EB71828B5913} + StructureHelperCommon + {330bef5b-15be-4d2c-a750-b1ae50fb2be3} StructureHelperLogics diff --git a/StructureHelperTests/UnitTests/Ndms/Triangulations/RectangleTriangulationTest.cs b/StructureHelperTests/UnitTests/Ndms/Triangulations/RectangleTriangulationTest.cs index 152ae97..46c04c7 100644 --- a/StructureHelperTests/UnitTests/Ndms/Triangulations/RectangleTriangulationTest.cs +++ b/StructureHelperTests/UnitTests/Ndms/Triangulations/RectangleTriangulationTest.cs @@ -1,21 +1,8 @@ using LoaderCalculator.Data.Materials; -using LoaderCalculator.Data.Materials.MaterialBuilders; -using LoaderCalculator.Data.Matrix; -using LoaderCalculator.Data.Ndms; -using LoaderCalculator.Data.Ndms.Transformations; -using LoaderCalculator.Data.Planes; -using LoaderCalculator.Data.SourceData; -using LoaderCalculator.Infrastructure; -using LoaderCalculator.Tests.Infrastructures.Logics; -using LoaderCalculator.Triangulations; -using Moq; using NUnit.Framework; -using System; -using System.Collections.Generic; using System.Linq; -using System.Threading; +using StructureHelperCommon.Models.Shapes; using StructureHelperLogics.NdmCalculations.Triangulations; -using StructureHelperLogics.Data.Shapes; namespace StructureHelperTests.UnitTests.Ndms.Triangulations {