New integration tests project

.github/workflows/ci.yaml

@@ -80,10 +80,6 @@ jobs:
     - name: Build C# Samples/DecoderSample
       run: dotnet build --configuration ${{ env.buildConfiguration }} Samples/DecoderSample
 
-    # Pull Redis Cache docker image
-    - name: Pulling Redis Cache image
-      run: docker pull redis:5.0.4-alpine
-
     # Run unit tests
     - name: Run unit tests
       run: |
@@ -102,6 +98,17 @@ jobs:
     - name: Upload to Codecov
       uses: codecov/codecov-action@v2
 
+    # Pull Redis Cache docker image
+    - name: Pulling Redis Cache image
+      run: docker pull redis:5.0.4-alpine
+
+    # Run integration tests
+    - name: Run integration tests
+      run: |
+        dotnet test --configuration ${{ env.buildConfiguration }} --logger trx -r Tests/TestResults/Integration \
+          /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura \
+          tests/Integration/LoRaWan.Tests.Integration.csproj
+
   check_if_deploy:
     needs:
       - env_var

LoRaEngine/LoRaEngine.sln

@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29025.244
@@ -17,9 +16,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logger", "modules\LoRaWanNe
 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}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{A3AF6806-947C-426F-8063-7229B71A4472}"
 	ProjectSection(SolutionItems) = preProject
-		test\.editorconfig = test\.editorconfig
+		..\Tests\.editorconfig = ..\Tests\.editorconfig
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoRaWanNetworkServer.Test", "test\LoRaWanNetworkServer.Test\LoRaWanNetworkServer.Test.csproj", "{D65BF8E2-DB42-4EA9-8A5E-CD7E671C4305}"
@@ -39,6 +38,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.Integration", "..\Tests\Integration\LoRaWan.Tests.Integration.csproj", "{8F615E91-40E2-4BF4-8573-577CEC7701FF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -143,6 +144,14 @@ 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
+		{8F615E91-40E2-4BF4-8573-577CEC7701FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F615E91-40E2-4BF4-8573-577CEC7701FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F615E91-40E2-4BF4-8573-577CEC7701FF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8F615E91-40E2-4BF4-8573-577CEC7701FF}.Debug|x86.Build.0 = Debug|Any CPU
+		{8F615E91-40E2-4BF4-8573-577CEC7701FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F615E91-40E2-4BF4-8573-577CEC7701FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F615E91-40E2-4BF4-8573-577CEC7701FF}.Release|x86.ActiveCfg = Release|Any CPU
+		{8F615E91-40E2-4BF4-8573-577CEC7701FF}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -155,6 +164,7 @@ Global
 		{0A3CCF9E-46E8-4901-8C9A-BCFC0EBD213B} = {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}
+		{8F615E91-40E2-4BF4-8573-577CEC7701FF} = {A3AF6806-947C-426F-8063-7229B71A4472}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FD60E938-DB16-4486-8BEF-4F2CE460E71D}

LoRaEngine/LoraKeysManagerFacade/AssemblyInfo.cs

@@ -2,5 +2,5 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 using System.Runtime.CompilerServices;
 
-// Lets test assembly access internal methods
 [assembly: InternalsVisibleTo("LoraKeysManagerFacade.Test")]
+[assembly: InternalsVisibleTo("LoRaWan.Tests.Integration")]

LoRaEngine/LoraKeysManagerFacade/HttpUtilities.cs

@@ -4,7 +4,7 @@
 namespace LoraKeysManagerFacade
 {
     using System.Linq;
-    using LoRaWan.Shared;
+    using LoRaTools.CommonAPI;
     using Microsoft.AspNetCore.Http;
 
     /// <summary>

LoRaEngine/LoraKeysManagerFacade/LoraKeysManagerFacade.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <AzureFunctionsVersion>v3</AzureFunctionsVersion>
@@ -15,9 +15,6 @@
   </ItemGroup>
 
   <!-- Add shared files -->
-  <ItemGroup>
-    <Compile Include="../modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/ApiVersion.cs" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="..\.editorconfig" Link=".editorconfig" />
   </ItemGroup>
@@ -33,5 +30,4 @@
   <ItemGroup>
     <ProjectReference Include="..\modules\LoRaWanNetworkSrvModule\LoraTools\LoRaTools.csproj" />
   </ItemGroup>
-
 </Project>

LoRaEngine/LoraKeysManagerFacade/SearchDeviceByDevEUI.cs

@@ -5,7 +5,7 @@ namespace LoraKeysManagerFacade
 {
     using System.Collections.Generic;
     using System.Threading.Tasks;
-    using LoRaWan.Shared;
+    using LoRaTools.CommonAPI;
     using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Azure.Devices;

LoRaEngine/LoraKeysManagerFacade/VersionValidator.cs

@@ -3,7 +3,7 @@
 
 namespace LoraKeysManagerFacade
 {
-    using LoRaWan.Shared;
+    using LoRaTools.CommonAPI;
     using Microsoft.AspNetCore.Http;
 
     public static class VersionValidator

LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/AssemblyInfo.cs

@@ -2,5 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 using System.Runtime.CompilerServices;
 
-// Lets test assembly access internal methods
 [assembly: InternalsVisibleTo("LoRaWanNetworkServer.Test")]
+[assembly: InternalsVisibleTo("LoRaWan.Tests.Shared")]
+[assembly: InternalsVisibleTo("LoRaWan.Tests.Integration")]

LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/ServiceFacadeHttpClientHandler.cs

@@ -3,6 +3,7 @@
 
 namespace LoRaWan.Shared
 {
+    using LoRaTools.CommonAPI;
     using System;
     using System.Linq;
     using System.Net;

LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/ServiceFacadeHttpClientProvider.cs

@@ -3,10 +3,11 @@
 
 namespace LoRaWan.NetworkServer
 {
+    using LoRaTools.CommonAPI;
+    using LoRaWan.Shared;
     using System;
     using System.Net;
     using System.Net.Http;
-    using LoRaWan.Shared;
 
     /// <summary>
     /// Default implementation for <see cref="IServiceFacadeHttpClientProvider"/>.

LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/UdpServer.cs

@@ -13,10 +13,10 @@ namespace LoRaWan.NetworkServer
     using System.Threading.Tasks;
     using LoRaTools;
     using LoRaTools.ADR;
+    using LoRaTools.CommonAPI;
     using LoRaTools.LoRaPhysical;
     using LoRaTools.Utils;
     using LoRaWan.NetworkServer.ADR;
-    using LoRaWan.Shared;
     using Microsoft.Azure.Devices.Client;
     using Microsoft.Azure.Devices.Shared;
     using Microsoft.Extensions.Caching.Memory;

LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/ApiVersion.cs → LoRaEngine/modules/LoRaWanNetworkSrvModule/LoraTools/CommonAPI/ApiVersion.cs

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
-namespace LoRaWan.Shared
+namespace LoRaTools.CommonAPI
 {
     using System;
     using System.Collections.Generic;

LoRaEngine/test/LoRaWan.IntegrationTest/LoRaWan.IntegrationTest.csproj

@@ -41,7 +41,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\modules\LoRaWanNetworkSrvModule\LoRaWan.NetworkServer\ApiVersion.cs" Link="ApiVersion.cs" />
     <Compile Include="..\..\modules\LoRaWanNetworkSrvModule\LoRaWan.NetworkServer\ServiceFacadeHttpClientHandler.cs" Link="ServiceFacadeHttpClientHandler.cs" />
   </ItemGroup>
 

LoRaEngine/test/LoRaWanNetworkServer.Test/DeduplicationStrategyTest.cs

@@ -4,6 +4,7 @@
 namespace LoRaWan.NetworkServer.Test
 {
     using System.Threading.Tasks;
+    using LoRaWan.Tests.Shared;
     using Moq;
     using Xunit;
 

LoRaEngine/test/LoRaWanNetworkServer.Test/LoRaCloudToDeviceMessageWrapperTest.cs

@@ -8,6 +8,7 @@ namespace LoRaWan.NetworkServer.Test
     using System.Text;
     using LoRaTools;
     using LoRaWan.NetworkServer;
+    using LoRaWan.Tests.Shared;
     using Microsoft.Azure.Devices.Client;
     using Moq;
     using Xunit;

LoRaEngine/test/LoRaWanNetworkServer.Test/LoRaDeviceTest.cs

@@ -7,6 +7,7 @@ namespace LoRaWan.NetworkServer.Test
     using System.Collections.Generic;
     using System.Threading.Tasks;
     using LoRaTools.Regions;
+    using LoRaWan.Tests.Shared;
     using Microsoft.Azure.Devices.Shared;
     using Microsoft.Extensions.Caching.Memory;
     using Moq;

LoRaEngine/test/LoRaWanNetworkServer.Test/LoRaPayloadDecoderTest.cs

@@ -8,6 +8,7 @@ namespace LoRaWan.NetworkServer.Test
     using System.Text;
     using System.Threading.Tasks;
     using LoRaWan.NetworkServer;
+    using LoRaWan.Tests.Shared;
     using Newtonsoft.Json;
     using Xunit;
 

LoRaEngine/test/LoRaWanNetworkServer.Test/MultiGatewayFrameCounterUpdateStrategyTest.cs

@@ -5,6 +5,7 @@ namespace LoRaWan.NetworkServer.Test
 {
     using System.Threading.Tasks;
     using LoRaWan.NetworkServer;
+    using LoRaWan.Tests.Shared;
     using Microsoft.Azure.Devices.Shared;
     using Moq;
     using Xunit;

LoRaEngine/test/LoRaWanNetworkServer.Test/ServiceFacadeHttpClientHandlerTest.cs

@@ -8,6 +8,7 @@ namespace LoRaWan.NetworkServer.Test
     using System.Net.Http;
     using System.Threading;
     using System.Threading.Tasks;
+    using LoRaTools.CommonAPI;
     using LoRaWan.Shared;
     using Xunit;
 

LoRaEngine/test/LoRaWanNetworkServer.Test/SingleGatewayFrameCounterUpdateStrategyTest.cs

@@ -5,6 +5,7 @@ namespace LoRaWan.NetworkServer.Test
 {
     using System.Threading.Tasks;
     using LoRaWan.NetworkServer;
+    using LoRaWan.Tests.Shared;
     using Microsoft.Azure.Devices.Shared;
     using Moq;
     using Xunit;

LoRaEngine/test/LoraKeysManagerFacade.Test/ADRFunctionTest.cs

@@ -7,6 +7,7 @@ namespace LoraKeysManagerFacade.Test
     using System.Threading.Tasks;
     using LoraKeysManagerFacade.FunctionBundler;
     using LoRaTools.ADR;
+    using LoRaWan.Tests.Shared;
     using Moq;
     using Xunit;
 

LoRaEngine/test/LoraKeysManagerFacade.Test/ApiValidationTest.cs

@@ -7,7 +7,7 @@ namespace LoraKeysManagerFacade.Test
     using System.Collections.Generic;
     using System.Threading.Tasks;
     using LoraKeysManagerFacade.FunctionBundler;
-    using LoRaWan.Shared;
+    using LoRaTools.CommonAPI;
     using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Http.Internal;
     using Microsoft.AspNetCore.Mvc;

LoRaEngine/test/LoraKeysManagerFacade.Test/ApiVersionTest.cs

@@ -8,7 +8,7 @@ namespace LoraKeysManagerFacade.Test
     using System.Linq;
     using System.Threading.Tasks;
     using LoraKeysManagerFacade.FunctionBundler;
-    using LoRaWan.Shared;
+    using LoRaTools.CommonAPI;
     using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Http.Internal;
     using Microsoft.AspNetCore.Mvc;

LoRaEngine/test/LoraKeysManagerFacade.Test/DeviceGetterTest.cs

@@ -6,6 +6,7 @@ namespace LoraKeysManagerFacade.Test
     using System;
     using System.Collections.Generic;
     using System.Text;
+    using LoRaWan.Tests.Shared;
     using Microsoft.Azure.Devices;
     using Microsoft.Azure.Devices.Shared;
     using Moq;

LoRaEngine/test/LoraKeysManagerFacade.Test/FCntCacheCheckTest.cs

@@ -3,6 +3,7 @@
 
 namespace LoraKeysManagerFacade.Test
 {
+    using LoRaWan.Tests.Shared;
     using System.Threading.Tasks;
     using Xunit;
 

LoRaEngine/test/LoraKeysManagerFacade.Test/FunctionBundlerTest.cs

@@ -10,6 +10,7 @@ namespace LoraKeysManagerFacade.Test
     using LoraKeysManagerFacade.FunctionBundler;
     using LoRaTools.ADR;
     using LoRaTools.CommonAPI;
+    using LoRaWan.Tests.Shared;
     using Microsoft.Extensions.Logging.Abstractions;
     using Moq;
     using Xunit;

LoRaEngine/test/LoraKeysManagerFacade.Test/HttpUtilitiesTest.cs

@@ -4,7 +4,7 @@
 namespace LoraKeysManagerFacade.Test
 {
     using System.Collections.Generic;
-    using LoRaWan.Shared;
+    using LoRaTools.CommonAPI;
     using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Http.Internal;
     using Microsoft.Extensions.Primitives;

LoRaEngine/test/LoraKeysManagerFacade.Test/MessageDeduplicationTests.cs

@@ -5,6 +5,7 @@ namespace LoraKeysManagerFacade.Test
 {
     using System.Threading.Tasks;
     using LoraKeysManagerFacade.FunctionBundler;
+    using LoRaWan.Tests.Shared;
     using Xunit;
 
     public class MessageDeduplicationTests : FunctionTestBase

LoRaEngine/test/LoraKeysManagerFacade.Test/SearchDeviceByDevEUITest.cs

@@ -7,7 +7,7 @@ namespace LoraKeysManagerFacade.Test
     using System.Collections.Generic;
     using System.Text;
     using System.Threading.Tasks;
-    using LoRaWan.Shared;
+    using LoRaTools.CommonAPI;
     using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Azure.Devices;

LoRaEngine/test/LoRaWanNetworkServer.Test/DeduplicationStrategy_End2End_Tests.cs → Tests/Integration/DeduplicationStrategyTests.cs

@@ -1,23 +1,24 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace LoRaWan.NetworkServer.Test
+namespace LoRaWan.Tests.Integration
 {
     using System;
     using System.Collections.Generic;
     using System.Threading;
     using System.Threading.Tasks;
+    using LoRaWan.NetworkServer;
     using LoRaWan.Tests.Shared;
     using Microsoft.Azure.Devices.Client;
     using Moq;
     using Xunit;
 
-    public class DeduplicationStrategy_End2End_Tests : MessageProcessorMultipleGatewayTest
+    public class DeduplicationStrategyTests : MessageProcessorMultipleGatewayTest
     {
         private readonly DeduplicationStrategyFactory factory;
         private readonly Mock<ILoRaDeviceClient> loRaDeviceClient;
 
-        public DeduplicationStrategy_End2End_Tests()
+        public DeduplicationStrategyTests()
         {
             this.factory = new DeduplicationStrategyFactory(this.LoRaDeviceApi.Object);
             this.loRaDeviceClient = new Mock<ILoRaDeviceClient>(MockBehavior.Strict);