Moves integration tests to E2E test project

.github/workflows/ci.yaml

@@ -1,5 +1,4 @@
 name: LoRa CI
-# the lora ci
 on: # rebuild any PRs and main branch changes
   pull_request:
     branches:
@@ -24,20 +23,22 @@ on: # rebuild any PRs and main branch changes
 env:
   buildConfiguration: 'Release'
   AZURE_FUNCTIONAPP_NAME: loramoduleintegrationtest
+  TESTS_FOLDER: Tests
+  TESTS_RESULTS_FOLDER: Tests/TestResults
 
 jobs:
   env_var:
     name: Set environment variables
     runs-on: ubuntu-latest
     steps:
-    - id: set-integration-matrix
-      name: Set integration Matrix
+    - id: e2e_list_step
+      name: Set E2E tests to run
       run: |
         if [ ${{ github.event_name }} == 'workflow_dispatch' ]; then
           echo "Set up for workflow dispatch"
-          echo "::set-output name=IntegrationTestsToRun::${{ github.event.inputs.TestsToRun }}"
+          echo "::set-output name=E2ETestsToRun::${{ github.event.inputs.TestsToRun }}"
         else
-          echo "::set-output name=IntegrationTestsToRun::[\"SensorDecodingTest\",\"OTAAJoinTest\",\"ABPTest\",\"OTAATest\",\"MacTest\",\"ClassCTest\",\"C2DMessageTest\",\"MultiGatewayTest\"]"
+          echo "::set-output name=E2ETestsToRun::[\"SensorDecodingTest\",\"OTAAJoinTest\",\"ABPTest\",\"OTAATest\",\"MacTest\",\"ClassCTest\",\"C2DMessageTest\",\"MultiGatewayTest\"]"
         fi
 
     - id: check-if-run
@@ -56,7 +57,7 @@ jobs:
     outputs:
       AZURE_FUNCTIONAPP_NAME: ${{ env.AZURE_FUNCTIONAPP_NAME }}
       RunTestsOnly: ${{ github.event.inputs.RunTestsOnly == 'true' || contains(github.event.client_payload.labels.*.name, 'RunTestsOnly') == true}}
-      IntegrationTestsToRun: ${{ steps.set-integration-matrix.outputs.IntegrationTestsToRun }}
+      E2ETestsToRun: ${{ steps.e2e_list_step.outputs.E2ETestsToRun }}
       StopFullCi: ${{ steps.check-if-run.outputs.StopFullCi }}
 
   build_and_test:
@@ -87,7 +88,7 @@ jobs:
     # Run unit tests
     - name: Run unit tests
       run: |
-        dotnet test --configuration ${{ env.buildConfiguration }} --logger trx -r Tests/TestResults \
+        dotnet test --configuration ${{ env.buildConfiguration }} --logger trx -r ${{ env.TESTS_RESULTS_FOLDER }}/Unit \
           /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura \
           --filter 'FullyQualifiedName~LoRaWanTest|FullyQualifiedName~LoRaWan.NetworkServer.Test|FullyQualifiedName~LoraKeysManagerFacade.Test' \
           LoRaEngine
@@ -97,7 +98,7 @@ jobs:
       if: success() || failure()
       with:
         name: unit-test-results
-        path: Tests/TestResults
+        path: ${{ env.TESTS_RESULTS_FOLDER }}/Unit
 
     - name: Upload to Codecov
       uses: codecov/codecov-action@v2
@@ -239,14 +240,14 @@ jobs:
           # TODO We might want to revisit this once there are some options to check that the network server started.
           sleep 3m
 
-# Runs integration tests in dedicated agent, while having modules deployed into PI (arm32v7)
-  integration_test_ :
-    name: Run Test
+# Runs E2E tests in dedicated agent, while having modules deployed into PI (arm32v7)
+  e2e_tests_job :
+    name: Run E2E Tests
     strategy:
       fail-fast: false
       max-parallel: 1
       matrix:
-        testsToRun: ${{ fromjson(needs.env_var.outputs.IntegrationTestsToRun) }}
+        testsToRun: ${{ fromjson(needs.env_var.outputs.E2ETestsToRun) }}
     if: always() && (needs.env_var.outputs.RunTestsOnly == 'true' || (needs.deploy_arm_gw_iot_edge.result == 'success' && needs.deploy_facade_function.result == 'success' && needs.build_and_test.result == 'success'))
     needs:
       - deploy_arm_gw_iot_edge
@@ -256,16 +257,16 @@ jobs:
     runs-on: [ self-hosted, x64 ]
     timeout-minutes: 60
     env:
-      INTEGRATIONTEST_LeafDeviceSerialPort: '/dev/ttyACM0'
-      INTEGRATIONTEST_IoTHubEventHubConsumerGroup: 'reserved_integrationtest_amd'
-      INTEGRATIONTEST_LeafDeviceGatewayID: primary
-      INTEGRATIONTEST_DevicePrefix: '01'
-      INTEGRATIONTEST_EnsureHasEventDelayBetweenReadsInSeconds: 15
-      INTEGRATIONTEST_EnsureHasEventMaximumTries: 5
-      INTEGRATIONTEST_IoTHubConnectionString: ${{ secrets.IOTHUB_CONNECTION_STRING }}
-      INTEGRATIONTEST_IoTHubEventHubConnectionString: ${{ secrets.IOTHUB_EVENT_HUB_CONNECTION_STRING }}
-      INTEGRATIONTEST_FunctionAppCode: ${{ secrets.FUNCTION_AUTH_CODE }}
-      INTEGRATIONTEST_FunctionAppBaseUrl: "https://${{ needs.env_var.outputs.AZURE_FUNCTIONAPP_NAME }}.azurewebsites.net/api/"
+      E2ETESTS_LeafDeviceSerialPort: '/dev/ttyACM0'
+      E2ETESTS_IoTHubEventHubConsumerGroup: 'reserved_integrationtest_amd'
+      E2ETESTS_LeafDeviceGatewayID: primary
+      E2ETESTS_DevicePrefix: '01'
+      E2ETESTS_EnsureHasEventDelayBetweenReadsInSeconds: 15
+      E2ETESTS_EnsureHasEventMaximumTries: 5
+      E2ETESTS_IoTHubConnectionString: ${{ secrets.IOTHUB_CONNECTION_STRING }}
+      E2ETESTS_IoTHubEventHubConnectionString: ${{ secrets.IOTHUB_EVENT_HUB_CONNECTION_STRING }}
+      E2ETESTS_FunctionAppCode: ${{ secrets.FUNCTION_AUTH_CODE }}
+      E2ETESTS_FunctionAppBaseUrl: "https://${{ needs.env_var.outputs.AZURE_FUNCTIONAPP_NAME }}.azurewebsites.net/api/"
 
     steps:
     - uses: actions/checkout@v2
@@ -281,34 +282,36 @@ jobs:
     - name: .NET SDK Information
       run: dotnet --info
 
-    - name: 'Configure test in **/test/LoRaWan.IntegrationTest/appsettings.json'
+    - name: Configuration for E2E tests
       uses: cschleiden/replace-tokens@v1
       if: contains(github.event.pull_request.labels.*.name, matrix.testsToRun ) != true
       with:
-        files: '**/test/LoRaWan.IntegrationTest/appsettings.json'
+        files: '**/${{ env.TESTS_FOLDER }}/E2E/appsettings.json'
 
-    # Runs Integration tests
-    - name: Build IntegrationTest
+    # Builds and runs E2E tests
+    - name: Build E2E tests
       if: contains(github.event.pull_request.labels.*.name, matrix.testsToRun ) != true
-      run: dotnet build --configuration ${{ env.buildConfiguration }} **/test/LoRaWan.IntegrationTest/LoRaWan.IntegrationTest.csproj
+      run: dotnet build --configuration ${{ env.buildConfiguration }} **/${{ env.TESTS_FOLDER }}/E2E/LoRaWan.Tests.E2E.csproj
 
-    - name: Integration test ${{ matrix.testsToRun }}
+    - name: Runs E2E tests ${{ matrix.testsToRun }}
       if: contains(github.event.pull_request.labels.*.name, matrix.testsToRun ) != true
-      id: integration_test
+      id: e2e_tests_step
       run: |
         echo ${{ matrix.testsToRun }}
-        dotnet test --logger trx --no-build --configuration ${{ env.buildConfiguration }} -p:ParallelizeTestCollections=false --filter "${{ matrix.testsToRun }}" **/test/LoRaWan.IntegrationTest/LoRaWan.IntegrationTest.csproj
+        dotnet test --logger trx --no-build --configuration ${{ env.buildConfiguration }} \
+        -p:ParallelizeTestCollections=false -r ${{ env.TESTS_RESULTS_FOLDER }}/E2E/ --filter "${{ matrix.testsToRun }}" \
+        **/${{ env.TESTS_FOLDER }}/E2E/LoRaWan.Tests.E2E.csproj
 
     # Upload test results as artifact
     - uses: actions/upload-artifact@v1
       if: (success() || failure()) && contains(github.event.pull_request.labels.*.name, matrix.testsToRun ) != true
       with:
-        name: ${{ matrix.testsToRun }}-results
-        path: LoRaEngine/test/LoRaWan.IntegrationTest/TestResults
+        name: e2e-test-results
+        path: ${{ env.TESTS_RESULTS_FOLDER }}/E2E/
 
     - name: Add ${{ matrix.testsToRun }} Test Label
       uses: buildsville/add-remove-label@v1
-      if: github.event_name == 'pull_request' && steps.integration_test.conclusion == 'Success' && contains(github.event.pull_request.labels.*.name, matrix.testsToRun ) != true
+      if: github.event_name == 'pull_request' && steps.e2e_tests_step.conclusion == 'Success' && contains(github.event.pull_request.labels.*.name, matrix.testsToRun ) != true
       with:
         token: ${{secrets.GITHUB_TOKEN}}
         label: '${{ matrix.testsToRun }}'

LoRaEngine/LoRaEngine.sln

@@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoRaWanTest", "modules\LoRa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logger", "modules\LoRaWanNetworkSrvModule\Logger\Logger.csproj", "{0F8CDB3B-34C9-4C14-B4B2-34BCAD232D45}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoRaWan.IntegrationTest", "test\LoRaWan.IntegrationTest\LoRaWan.IntegrationTest.csproj", "{26DF2637-43E0-4FFF-92BD-F4395C88DD50}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A3AF6806-947C-426F-8063-7229B71A4472}"
 	ProjectSection(SolutionItems) = preProject
 		test\.editorconfig = test\.editorconfig
@@ -28,7 +26,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoraKeysManagerFacade.Test"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoRaWan.SimulatedTest", "test\LoRaWan.SimulatedTest\LoRaWan.SimulatedTest.csproj", "{4FA0718D-15A2-4D4E-9310-7FB17B285757}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XunitRetryHelper", "test\XunitRetryHelper\XunitRetryHelper.csproj", "{25916C24-E17B-4FB3-8E18-A386A18FC9D0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{67C7C34B-B11C-4E10-9D97-728FB122683F}"
 	ProjectSection(SolutionItems) = preProject
@@ -39,6 +36,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoRaWan.Tests.Shared", "..\Tests\Shared\LoRaWan.Tests.Shared.csproj", "{0A3CCF9E-46E8-4901-8C9A-BCFC0EBD213B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoRaWan.Tests.E2E", "..\Tests\E2E\LoRaWan.Tests.E2E.csproj", "{A871D30D-2634-4321-A0EB-B116A1BA1CD3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -95,14 +94,6 @@ Global
 		{0F8CDB3B-34C9-4C14-B4B2-34BCAD232D45}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0F8CDB3B-34C9-4C14-B4B2-34BCAD232D45}.Release|x86.ActiveCfg = Release|Any CPU
 		{0F8CDB3B-34C9-4C14-B4B2-34BCAD232D45}.Release|x86.Build.0 = Release|Any CPU
-		{26DF2637-43E0-4FFF-92BD-F4395C88DD50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26DF2637-43E0-4FFF-92BD-F4395C88DD50}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26DF2637-43E0-4FFF-92BD-F4395C88DD50}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{26DF2637-43E0-4FFF-92BD-F4395C88DD50}.Debug|x86.Build.0 = Debug|Any CPU
-		{26DF2637-43E0-4FFF-92BD-F4395C88DD50}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26DF2637-43E0-4FFF-92BD-F4395C88DD50}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26DF2637-43E0-4FFF-92BD-F4395C88DD50}.Release|x86.ActiveCfg = Release|Any CPU
-		{26DF2637-43E0-4FFF-92BD-F4395C88DD50}.Release|x86.Build.0 = Release|Any CPU
 		{D65BF8E2-DB42-4EA9-8A5E-CD7E671C4305}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D65BF8E2-DB42-4EA9-8A5E-CD7E671C4305}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D65BF8E2-DB42-4EA9-8A5E-CD7E671C4305}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -127,14 +118,6 @@ Global
 		{4FA0718D-15A2-4D4E-9310-7FB17B285757}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4FA0718D-15A2-4D4E-9310-7FB17B285757}.Release|x86.ActiveCfg = Release|Any CPU
 		{4FA0718D-15A2-4D4E-9310-7FB17B285757}.Release|x86.Build.0 = Release|Any CPU
-		{25916C24-E17B-4FB3-8E18-A386A18FC9D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{25916C24-E17B-4FB3-8E18-A386A18FC9D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{25916C24-E17B-4FB3-8E18-A386A18FC9D0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{25916C24-E17B-4FB3-8E18-A386A18FC9D0}.Debug|x86.Build.0 = Debug|Any CPU
-		{25916C24-E17B-4FB3-8E18-A386A18FC9D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{25916C24-E17B-4FB3-8E18-A386A18FC9D0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{25916C24-E17B-4FB3-8E18-A386A18FC9D0}.Release|x86.ActiveCfg = Release|Any CPU
-		{25916C24-E17B-4FB3-8E18-A386A18FC9D0}.Release|x86.Build.0 = Release|Any CPU
 		{0A3CCF9E-46E8-4901-8C9A-BCFC0EBD213B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0A3CCF9E-46E8-4901-8C9A-BCFC0EBD213B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0A3CCF9E-46E8-4901-8C9A-BCFC0EBD213B}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -143,18 +126,25 @@ Global
 		{0A3CCF9E-46E8-4901-8C9A-BCFC0EBD213B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0A3CCF9E-46E8-4901-8C9A-BCFC0EBD213B}.Release|x86.ActiveCfg = Release|Any CPU
 		{0A3CCF9E-46E8-4901-8C9A-BCFC0EBD213B}.Release|x86.Build.0 = Release|Any CPU
+		{A871D30D-2634-4321-A0EB-B116A1BA1CD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A871D30D-2634-4321-A0EB-B116A1BA1CD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A871D30D-2634-4321-A0EB-B116A1BA1CD3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A871D30D-2634-4321-A0EB-B116A1BA1CD3}.Debug|x86.Build.0 = Debug|Any CPU
+		{A871D30D-2634-4321-A0EB-B116A1BA1CD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A871D30D-2634-4321-A0EB-B116A1BA1CD3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A871D30D-2634-4321-A0EB-B116A1BA1CD3}.Release|x86.ActiveCfg = Release|Any CPU
+		{A871D30D-2634-4321-A0EB-B116A1BA1CD3}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{E96EDB52-7BCD-4418-BE7D-0C914EAA874D} = {A3AF6806-947C-426F-8063-7229B71A4472}
-		{26DF2637-43E0-4FFF-92BD-F4395C88DD50} = {A3AF6806-947C-426F-8063-7229B71A4472}
 		{D65BF8E2-DB42-4EA9-8A5E-CD7E671C4305} = {A3AF6806-947C-426F-8063-7229B71A4472}
 		{BDC96E16-510C-41DA-A075-4336CB5D58A1} = {A3AF6806-947C-426F-8063-7229B71A4472}
 		{0A3CCF9E-46E8-4901-8C9A-BCFC0EBD213B} = {A3AF6806-947C-426F-8063-7229B71A4472}
+		{A871D30D-2634-4321-A0EB-B116A1BA1CD3} = {A3AF6806-947C-426F-8063-7229B71A4472}
 		{4FA0718D-15A2-4D4E-9310-7FB17B285757} = {A3AF6806-947C-426F-8063-7229B71A4472}
-		{25916C24-E17B-4FB3-8E18-A386A18FC9D0} = {A3AF6806-947C-426F-8063-7229B71A4472}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FD60E938-DB16-4486-8BEF-4F2CE460E71D}

LoRaEngine/test/LoRaWan.IntegrationTest/ABPTest.cs → Tests/E2E/ABPTest.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace LoRaWan.IntegrationTest
+namespace LoRaWan.Tests.E2E
 {
     using System;
     using System.Globalization;

LoRaEngine/test/LoRaWan.IntegrationTest/ArduinoDeviceFailedException.cs → Tests/E2E/ArduinoDeviceFailedException.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace LoRaWan.IntegrationTest
+namespace LoRaWan.Tests.E2E
 {
     using System;
     using System.Runtime.Serialization;

LoRaEngine/test/LoRaWan.IntegrationTest/C2DMessageTest.cs → Tests/E2E/C2DMessageTest.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace LoRaWan.IntegrationTest
+namespace LoRaWan.Tests.E2E
 {
     using System;
     using System.Globalization;

LoRaEngine/test/LoRaWan.IntegrationTest/ClassCTest.cs → Tests/E2E/ClassCTest.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace LoRaWan.IntegrationTest
+namespace LoRaWan.Tests.E2E
 {
     using System;
     using System.Threading.Tasks;

LoRaEngine/test/LoRaWan.IntegrationTest/Constants.cs → Tests/E2E/Constants.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace LoRaWan.IntegrationTest
+namespace LoRaWan.Tests.E2E
 {
     public static class Constants
     {

LoRaEngine/test/LoRaWan.IntegrationTest/IntegrationTestBaseCi.cs → Tests/E2E/IntegrationTestBaseCi.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace LoRaWan.IntegrationTest
+namespace LoRaWan.Tests.E2E
 {
     using System;
     using System.Globalization;

LoRaEngine/test/LoRaWan.IntegrationTest/IntegrationTestFixtureCI.cs → Tests/E2E/IntegrationTestFixtureCI.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace LoRaWan.IntegrationTest
+namespace LoRaWan.Tests.E2E
 {
     using System;
     using System.Globalization;

LoRaEngine/test/LoRaWan.IntegrationTest/LoRaAPIHelper.cs → Tests/E2E/LoRaAPIHelper.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace LoRaWan.IntegrationTest
+namespace LoRaWan.Tests.E2E
 {
     using System;
     using System.Net.Http;

LoRaEngine/test/LoRaWan.IntegrationTest/LoRaArduinoSerial.Helper.cs → Tests/E2E/LoRaArduinoSerial.Helper.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace LoRaWan.IntegrationTest
+namespace LoRaWan.Tests.E2E
 {
     using System;
     using System.IO.Ports;

LoRaEngine/test/LoRaWan.IntegrationTest/LoRaWan.IntegrationTest.csproj → Tests/E2E/LoRaWan.Tests.E2E.csproj

@@ -2,15 +2,14 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-
     <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../../modules/LoRaWanNetworkSrvModule/Logger/Logger.csproj" />
-    <ProjectReference Include="../../modules/LoRaWanNetworkSrvModule/LoraTools/LoRaTools.csproj" />
-    <ProjectReference Include="..\..\..\Tests\Shared\LoRaWan.Tests.Shared.csproj" />
-    <ProjectReference Include="..\XunitRetryHelper\XunitRetryHelper.csproj" />
+    <ProjectReference Include="..\..\LoRaEngine\modules\LoRaWanNetworkSrvModule\Logger\Logger.csproj" />
+    <ProjectReference Include="..\..\LoRaEngine\modules\LoRaWanNetworkSrvModule\LoraTools\LoRaTools.csproj" />
+    <ProjectReference Include="..\Shared\LoRaWan.Tests.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -41,8 +40,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\modules\LoRaWanNetworkSrvModule\LoRaWan.NetworkServer\ApiVersion.cs" Link="ApiVersion.cs" />
-    <Compile Include="..\..\modules\LoRaWanNetworkSrvModule\LoRaWan.NetworkServer\ServiceFacadeHttpClientHandler.cs" Link="ServiceFacadeHttpClientHandler.cs" />
+    <Compile Include="..\..\LoRaEngine\modules\LoRaWanNetworkSrvModule\LoRaWan.NetworkServer\ApiVersion.cs" Link="ApiVersion.cs" />
+    <Compile Include="..\..\LoRaEngine\modules\LoRaWanNetworkSrvModule\LoRaWan.NetworkServer\ServiceFacadeHttpClientHandler.cs" Link="ServiceFacadeHttpClientHandler.cs" />
   </ItemGroup>
 
 </Project>

LoRaEngine/test/LoRaWan.IntegrationTest/LoraArduinoSerial.cs → Tests/E2E/LoraArduinoSerial.cs

@@ -36,7 +36,7 @@ THE SOFTWARE.1  USA
 #pragma warning disable IDE1006 // Naming Styles
 
 
-namespace LoRaWan.IntegrationTest
+namespace LoRaWan.Tests.E2E
 {
     using System;
     using System.Collections.Concurrent;