decouple AppLibTests

A1i98 · Dec 15, 2024 · ce0157f · ce0157f
1 parent dfbd0f2
commit ce0157f
Show file tree

Hide file tree

Showing 22 changed files with 233 additions and 183 deletions.
diff --git a/Src/Core/VpnHood.Core.Client.Device.WinDivert/WinDivertDevice.cs b/Src/Core/VpnHood.Core.Client.Device.WinDivert/WinDivertDevice.cs
@@ -1,6 +1,4 @@
-using VpnHood.Core.Client.Device;
-
-namespace VpnHood.Core.Client.Device.WinDivert;
+namespace VpnHood.Core.Client.Device.WinDivert;
 
 public class WinDivertDevice : IDevice
 {

diff --git a/Src/Core/VpnHood.Core.Client.Device.WinDivert/WinDivertPacketCapture.cs b/Src/Core/VpnHood.Core.Client.Device.WinDivert/WinDivertPacketCapture.cs
@@ -6,8 +6,6 @@
 using PacketDotNet;
 using SharpPcap;
 using SharpPcap.WinDivert;
-using VpnHood.Core.Client.Device;
-using VpnHood.Core.Client.Device.WinDivert;
 using VpnHood.Core.Common.Logging;
 using VpnHood.Core.Common.Net;
 using ProtocolType = PacketDotNet.ProtocolType;

diff --git a/Tests/VpnHood.AppLib.Test/MSTestSettings.cs b/Tests/VpnHood.AppLib.Test/MSTestSettings.cs
diff --git a/.../VpnHood.Test/Providers/TestAdProvider.cs → ...d.AppLib.Test/Providers/TestAdProvider.cs b/.../VpnHood.Test/Providers/TestAdProvider.cs → ...d.AppLib.Test/Providers/TestAdProvider.cs
@@ -3,7 +3,7 @@
 using VpnHood.Core.Common.Exceptions;
 using VpnHood.Test.AccessManagers;
 
-namespace VpnHood.Test.Providers;
+namespace VpnHood.AppLib.Test.Providers;
 
 public class TestAdProvider(TestAccessManager accessManager, AppAdType adType = AppAdType.RewardedAd) : IAppAdProvider
 {

diff --git a/Tests/VpnHood.AppLib.Test/Test1.cs b/Tests/VpnHood.AppLib.Test/Test1.cs
diff --git a/Tests/VpnHood.AppLib.Test/TestAppHelper.cs b/Tests/VpnHood.AppLib.Test/TestAppHelper.cs
@@ -0,0 +1,58 @@
+using VpnHood.Core.Client.Device;
+using VpnHood.Core.Common.Net;
+using VpnHood.Core.Common.Utils;
+using VpnHood.Test;
+using VpnHood.Test.Device;
+using VpnHood.Test.Providers;
+
+namespace VpnHood.AppLib.Test;
+
+public class TestAppHelper : TestHelper
+{
+    public static Task WaitForAppState(VpnHoodApp app, AppConnectionState connectionSate, int timeout = 5000)
+    {
+        return VhTestUtil.AssertEqualsWait(connectionSate, () => app.State.ConnectionState,
+            "App state didn't reach the expected value.", timeout);
+    }
+
+    public static AppOptions CreateAppOptions()
+    {
+        var tracker = new TestTrackerProvider();
+        var appOptions = new AppOptions("com.vpnhood.client.test", isDebugMode: true) {
+            StorageFolderPath = Path.Combine(WorkingPath, "AppData_" + Guid.CreateVersion7()),
+            SessionTimeout = TimeSpan.FromSeconds(2),
+            Ga4MeasurementId = null,
+            Tracker = tracker,
+            UseInternalLocationService = false,
+            UseExternalLocationService = false,
+            AllowEndPointTracker = true,
+            LogVerbose = LogVerbose,
+            ServerQueryTimeout = TimeSpan.FromSeconds(2),
+            AutoDiagnose = false,
+            SingleLineConsoleLog = false,
+            CanExtendByRewardedAdThreshold = TimeSpan.Zero,
+            AdOptions = new AppAdOptions {
+                ShowAdPostDelay = TimeSpan.Zero,
+                LoadAdPostDelay = TimeSpan.Zero
+            }
+        };
+        return appOptions;
+    }
+
+    public static VpnHoodApp CreateClientApp(AppOptions? appOptions = default, IDevice? device = default)
+    {
+        appOptions ??= CreateAppOptions();
+        device ??= new TestDevice(() => new TestNullPacketCapture());
+
+        //create app
+        var clientApp = VpnHoodApp.Init(device, appOptions);
+        clientApp.Diagnoser.HttpTimeout = 2000;
+        clientApp.Diagnoser.NsTimeout = 2000;
+        clientApp.UserSettings.PacketCaptureIncludeIpRanges = TestIpAddresses.Select(x => new IpRange(x)).ToArray();
+        clientApp.UserSettings.Logging.LogAnonymous = false;
+        clientApp.TcpTimeout = TimeSpan.FromSeconds(2);
+        ActiveUiContext.Context = new TestAppUiContext();
+
+        return clientApp;
+    }
+}
diff --git a/Tests/VpnHood.AppLib.Test/TestAssembly.cs b/Tests/VpnHood.AppLib.Test/TestAssembly.cs
@@ -0,0 +1,20 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using VpnHood.Test;
+
+namespace VpnHood.AppLib.Test;
+
+[TestClass]
+public class TestAssembly
+{
+    [AssemblyInitialize]
+    public static void AssemblyInit(TestContext _)
+    {
+        TestHelper.Init();
+    }
+
+    [AssemblyCleanup]
+    public static void AssemblyCleanup()
+    {
+        TestHelper.Cleanup();
+    }
+}
diff --git a/Tests/VpnHood.Test/Tests/AdTest.cs → Tests/VpnHood.AppLib.Test/Tests/AdTest.cs b/Tests/VpnHood.Test/Tests/AdTest.cs → Tests/VpnHood.AppLib.Test/Tests/AdTest.cs
@@ -1,14 +1,15 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using VpnHood.AppLib;
 using VpnHood.AppLib.Abstractions;
+using VpnHood.AppLib.Test.Providers;
 using VpnHood.Core.Client.Device;
 using VpnHood.Core.Common.Exceptions;
 using VpnHood.Core.Common.Messaging;
 using VpnHood.Core.Common.Tokens;
+using VpnHood.Test;
 using VpnHood.Test.Device;
-using VpnHood.Test.Providers;
+using VpnHood.Test.Tests;
 
-namespace VpnHood.Test.Tests;
+namespace VpnHood.AppLib.Test.Tests;
 
 [TestClass]
 public class AdTest : TestBase
@@ -24,11 +25,11 @@ public async Task flexible_ad_should_not_close_session_if_load_ad_failed()
         var accessToken = accessManager.AccessTokenService.Create(adRequirement: AdRequirement.Flexible);
 
         // create client app
-        var appOptions = TestHelper.CreateAppOptions();
+        var appOptions = TestAppHelper.CreateAppOptions();
         var adProvider = new TestAdProvider(accessManager);
         var adProviderItem = new AppAdProviderItem { AdProvider = new TestAdProvider(accessManager, AppAdType.InterstitialAd) };
         appOptions.AdProviderItems = [adProviderItem];
-        await using var app = TestHelper.CreateClientApp(appOptions: appOptions);
+        await using var app = TestAppHelper.CreateClientApp(appOptions: appOptions);
         adProvider.FailLoad = true;
         adProvider.FailShow = true; // should not reach this state
 
@@ -45,18 +46,18 @@ public async Task flexible_ad_should_close_session_if_display_ad_failed()
         await using var server = await TestHelper.CreateServer(accessManager);
 
         // create client app
-        var appOptions = TestHelper.CreateAppOptions();
+        var appOptions = TestAppHelper.CreateAppOptions();
         var adProviderItem = new AppAdProviderItem { AdProvider = new TestAdProvider(accessManager, AppAdType.InterstitialAd ) };
         appOptions.AdProviderItems = [adProviderItem];
-        await using var app = TestHelper.CreateClientApp(appOptions: appOptions);
+        await using var app = TestAppHelper.CreateClientApp(appOptions: appOptions);
         ActiveUiContext.Context = null;
         //adProviderItem.FailShow = true;
 
         // connect
         var token = accessManager.CreateToken(adRequirement: AdRequirement.Flexible);
         var clientProfile = app.ClientProfileService.ImportAccessKey(token.ToAccessKey());
         await Assert.ThrowsExceptionAsync<ShowAdNoUiException>(() => app.Connect(clientProfile.ClientProfileId));
-        await TestHelper.WaitForAppState(app, AppConnectionState.None);
+        await TestAppHelper.WaitForAppState(app, AppConnectionState.None);
     }
 
     [TestMethod]
@@ -67,16 +68,16 @@ public async Task flexible_ad_should_not_be_displayed_on_trial()
         await using var server = await TestHelper.CreateServer(accessManager);
 
         // create client app
-        var appOptions = TestHelper.CreateAppOptions();
-        await using var app = TestHelper.CreateClientApp(appOptions: appOptions);
+        var appOptions = TestAppHelper.CreateAppOptions();
+        await using var app = TestAppHelper.CreateClientApp(appOptions: appOptions);
         ActiveUiContext.Context = null;
         //adProviderItem.FailShow = true;
 
         // connect
         var token = accessManager.CreateToken(adRequirement: AdRequirement.Flexible);
         var clientProfile = app.ClientProfileService.ImportAccessKey(token.ToAccessKey());
         await app.Connect(clientProfile.ClientProfileId, planId: ConnectPlanId.PremiumByTrial);
-        await TestHelper.WaitForAppState(app, AppConnectionState.Connected);
+        await TestAppHelper.WaitForAppState(app, AppConnectionState.Connected);
     }
 
     [TestMethod]
@@ -87,10 +88,10 @@ public async Task Session_must_be_closed_after_few_minutes_if_ad_is_not_accepted
         await using var server = await TestHelper.CreateServer(accessManager);
 
         // create client app
-        var appOptions = TestHelper.CreateAppOptions();
+        var appOptions = TestAppHelper.CreateAppOptions();
         var adProviderItem = new AppAdProviderItem { AdProvider = new TestAdProvider(accessManager) };
         appOptions.AdProviderItems = [adProviderItem];
-        await using var app = TestHelper.CreateClientApp(appOptions: appOptions);
+        await using var app = TestAppHelper.CreateClientApp(appOptions: appOptions);
         ActiveUiContext.Context = null;
         //adProviderItem.FailShow = true;
 
@@ -100,7 +101,7 @@ public async Task Session_must_be_closed_after_few_minutes_if_ad_is_not_accepted
         await Assert.ThrowsExceptionAsync<ShowAdNoUiException>(() => 
             app.Connect(clientProfile.ClientProfileId, ConnectPlanId.PremiumByRewardedAd));
 
-        await TestHelper.WaitForAppState(app, AppConnectionState.None);
+        await TestAppHelper.WaitForAppState(app, AppConnectionState.None);
     }
 
     [TestMethod]
@@ -115,10 +116,10 @@ public async Task RewardedAd_expiration_must_be_increased_by_plan_id(bool accept
         accessManager.RejectAllAds = !acceptAd;
 
         // create client app
-        var appOptions = TestHelper.CreateAppOptions();
+        var appOptions = TestAppHelper.CreateAppOptions();
         var adProviderItem = new AppAdProviderItem { AdProvider = new TestAdProvider(accessManager) };
         appOptions.AdProviderItems = [adProviderItem];
-        await using var app = TestHelper.CreateClientApp(appOptions: appOptions);
+        await using var app = TestAppHelper.CreateClientApp(appOptions: appOptions);
 
         // create access token
         var token = accessManager.CreateToken();
@@ -147,11 +148,11 @@ public async Task RewardedAd_expiration_must_be_increased_by_user(bool acceptAd)
         accessManager.RejectAllAds = !acceptAd;
 
         // create client app
-        var appOptions = TestHelper.CreateAppOptions();
+        var appOptions = TestAppHelper.CreateAppOptions();
         var adProviderItem = new AppAdProviderItem { AdProvider = new TestAdProvider(accessManager) };
         appOptions.AdProviderItems = [adProviderItem];
         var device = new TestDevice(() => new NullPacketCapture { CanDetectInProcessPacket = true });
-        await using var app = TestHelper.CreateClientApp(appOptions: appOptions, device: device);
+        await using var app = TestAppHelper.CreateClientApp(appOptions: appOptions, device: device);
 
         // create access token
         var token = accessManager.CreateToken();
@@ -173,7 +174,7 @@ public async Task RewardedAd_expiration_must_be_increased_by_user(bool acceptAd)
             var ex = await Assert.ThrowsExceptionAsync<SessionException>(() => app.ExtendByRewardedAd(CancellationToken.None));
             Assert.AreEqual(SessionErrorCode.RewardedAdRejected, ex.SessionResponse.ErrorCode);
             await Task.Delay(500);
-            await TestHelper.WaitForAppState(app, AppConnectionState.Connected);
+            await TestAppHelper.WaitForAppState(app, AppConnectionState.Connected);
         }
     }
 
@@ -187,11 +188,11 @@ public async Task RewardedAd_should_toggle_by_canDetectInProcessPacket(bool canD
         accessManager.CanExtendPremiumByAd = true;
 
         // create client app
-        var appOptions = TestHelper.CreateAppOptions();
+        var appOptions = TestAppHelper.CreateAppOptions();
         var adProviderItem = new AppAdProviderItem { AdProvider = new TestAdProvider(accessManager) };
         appOptions.AdProviderItems = [adProviderItem];
         var device = new TestDevice(() => new NullPacketCapture { CanDetectInProcessPacket = canDetectInProcessPacket });
-        await using var app = TestHelper.CreateClientApp(device: device, appOptions: appOptions);
+        await using var app = TestAppHelper.CreateClientApp(device: device, appOptions: appOptions);
 
         // create token
         var token = accessManager.CreateToken();
@@ -217,11 +218,11 @@ public async Task RewardedAd_should_toggle_by_access_manager(bool enable)
         accessManager.CanExtendPremiumByAd = enable;
 
         // create client app
-        var appOptions = TestHelper.CreateAppOptions();
+        var appOptions = TestAppHelper.CreateAppOptions();
         var adProviderItem = new AppAdProviderItem { AdProvider = new TestAdProvider(accessManager) };
         appOptions.AdProviderItems = [adProviderItem];
         var device = new TestDevice(() => new NullPacketCapture { CanDetectInProcessPacket = true });
-        await using var app = TestHelper.CreateClientApp(device: device, appOptions: appOptions);
+        await using var app = TestAppHelper.CreateClientApp(device: device, appOptions: appOptions);
 
         // create token
         var token = accessManager.CreateToken();

diff --git a/...VpnHood.Test/Tests/CheckNewVersionTest.cs → ....AppLib.Test/Tests/CheckNewVersionTest.cs b/...VpnHood.Test/Tests/CheckNewVersionTest.cs → ....AppLib.Test/Tests/CheckNewVersionTest.cs
@@ -1,9 +1,10 @@
 using System.Text.Json;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using VpnHood.AppLib;
 using VpnHood.Core.Common.Utils;
+using VpnHood.Test;
+using VpnHood.Test.Tests;
 
-namespace VpnHood.Test.Tests;
+namespace VpnHood.AppLib.Test.Tests;
 
 [TestClass]
 public class CheckNewVersionTest : TestBase
@@ -33,9 +34,9 @@ private static void SetNewRelease(Version version, DateTime releaseDate, TimeSpa
     [TestMethod]
     public async Task Remote_is_unknown_if_remote_is_unreachable()
     {
-        var appOptions = TestHelper.CreateAppOptions();
+        var appOptions = TestAppHelper.CreateAppOptions();
         appOptions.UpdateInfoUrl = new Uri("https://localhost:39999");
-        await using var app = TestHelper.CreateClientApp(appOptions: appOptions);
+        await using var app = TestAppHelper.CreateClientApp(appOptions: appOptions);
 
         await Task.Delay(1000);
         await VhTestUtil.AssertEqualsWait(VersionStatus.Unknown, () => app.State.VersionStatus);
@@ -47,10 +48,10 @@ public async Task Current_is_latest()
     {
         SetNewRelease(CurrentAppVersion, DateTime.UtcNow, TimeSpan.Zero);
 
-        var appOptions = TestHelper.CreateAppOptions();
+        var appOptions = TestAppHelper.CreateAppOptions();
         appOptions.UpdateInfoUrl = TestHelper.WebServer.FileHttpUrl1;
         appOptions.VersionCheckInterval = TimeSpan.FromMilliseconds(500);
-        await using var app = TestHelper.CreateClientApp(appOptions: appOptions);
+        await using var app = TestAppHelper.CreateClientApp(appOptions: appOptions);
 
         await VhTestUtil.AssertEqualsWait(VersionStatus.Latest, () => app.State.VersionStatus);
     }
@@ -62,10 +63,10 @@ public async Task Current_is_deprecated()
             DateTime.UtcNow,
             TimeSpan.Zero, CurrentAppVersion);
 
-        var appOptions = TestHelper.CreateAppOptions();
+        var appOptions = TestAppHelper.CreateAppOptions();
         appOptions.UpdateInfoUrl = TestHelper.WebServer.FileHttpUrl1;
         appOptions.VersionCheckInterval = TimeSpan.FromMilliseconds(500);
-        await using var app = TestHelper.CreateClientApp(appOptions: appOptions);
+        await using var app = TestAppHelper.CreateClientApp(appOptions: appOptions);
 
         await VhTestUtil.AssertEqualsWait(VersionStatus.Deprecated, () => app.State.VersionStatus);
     }
@@ -76,10 +77,10 @@ public async Task Current_is_old_by_job()
         SetNewRelease(CurrentAppVersion, DateTime.UtcNow, TimeSpan.Zero);
 
         // create client
-        var appOptions = TestHelper.CreateAppOptions();
+        var appOptions = TestAppHelper.CreateAppOptions();
         appOptions.UpdateInfoUrl = TestHelper.WebServer.FileHttpUrl1;
         appOptions.VersionCheckInterval = TimeSpan.FromMilliseconds(500);
-        await using var app = TestHelper.CreateClientApp(appOptions: appOptions);
+        await using var app = TestAppHelper.CreateClientApp(appOptions: appOptions);
 
         // version should be latest
         await VhTestUtil.AssertEqualsWait(VersionStatus.Latest, () => app.State.VersionStatus);
@@ -96,10 +97,10 @@ public async Task Current_is_old_but_wait_for_notification_delay()
         SetNewRelease(new Version(CurrentAppVersion.Major, CurrentAppVersion.Minor, CurrentAppVersion.Build + 1),
             DateTime.UtcNow, TimeSpan.FromSeconds(2));
 
-        var appOptions = TestHelper.CreateAppOptions();
+        var appOptions = TestAppHelper.CreateAppOptions();
         appOptions.UpdateInfoUrl = TestHelper.WebServer.FileHttpUrl1;
         appOptions.VersionCheckInterval = TimeSpan.FromMilliseconds(500);
-        await using var app = TestHelper.CreateClientApp(appOptions: appOptions);
+        await using var app = TestAppHelper.CreateClientApp(appOptions: appOptions);
 
         await VhTestUtil.AssertEqualsWait(VersionStatus.Latest, () => app.State.VersionStatus);
         await VhTestUtil.AssertEqualsWait(VersionStatus.Old, () => app.State.VersionStatus);
@@ -111,10 +112,10 @@ public async Task Current_is_old_before_connect_to_vpn()
         SetNewRelease(new Version(CurrentAppVersion.Major, CurrentAppVersion.Minor, CurrentAppVersion.Build + 1),
             DateTime.UtcNow, TimeSpan.Zero);
 
-        var appOptions = TestHelper.CreateAppOptions();
+        var appOptions = TestAppHelper.CreateAppOptions();
         appOptions.UpdateInfoUrl = TestHelper.WebServer.FileHttpUrl1;
         appOptions.VersionCheckInterval = TimeSpan.FromMilliseconds(500);
-        await using var app = TestHelper.CreateClientApp(appOptions: appOptions);
+        await using var app = TestAppHelper.CreateClientApp(appOptions: appOptions);
 
         await VhTestUtil.AssertEqualsWait(VersionStatus.Old, () => app.State.VersionStatus);
     }
@@ -130,9 +131,9 @@ public async Task Current_is_old_after_connect_to_vpn()
         TestHelper.WebServer.FileContent1 = Guid.NewGuid().ToString();
 
         // create client app
-        var appOptions = TestHelper.CreateAppOptions();
+        var appOptions = TestAppHelper.CreateAppOptions();
         appOptions.UpdateInfoUrl = TestHelper.WebServer.FileHttpUrl1;
-        await using var app = TestHelper.CreateClientApp(appOptions: appOptions);
+        await using var app = TestAppHelper.CreateClientApp(appOptions: appOptions);
         var clientProfile = app.ClientProfileService.ImportAccessKey(token.ToAccessKey());
 
         await Task.Delay(1000);
@@ -142,7 +143,7 @@ public async Task Current_is_old_after_connect_to_vpn()
         SetNewRelease(new Version(CurrentAppVersion.Major, CurrentAppVersion.Minor, CurrentAppVersion.Build + 1),
             DateTime.UtcNow, TimeSpan.Zero);
         await app.Connect(clientProfile.ClientProfileId);
-        await TestHelper.WaitForAppState(app, AppConnectionState.Connected);
+        await TestAppHelper.WaitForAppState(app, AppConnectionState.Connected);
         await VhTestUtil.AssertEqualsWait(VersionStatus.Old, () => app.State.VersionStatus);
     }
 }