Merge pull request #85 from Ali-YousefiTelori/develop

add delay
EasyMicroservices · Nov 26, 2023 · b3a0c7b · b3a0c7b
2 parents a29edfb + 18b6d5d
commit b3a0c7b
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 41 deletions.
diff --git a/src/CSharp/EasyMicroservices.Cores.AspCore.Tests/BasicTests.cs b/src/CSharp/EasyMicroservices.Cores.AspCore.Tests/BasicTests.cs
@@ -7,7 +7,7 @@
 
 namespace EasyMicroservices.Cores.AspCore.Tests
 {
-    public abstract class BasicTests : IClassFixture<WhiteLabelLaboratoryFixture>
+    public abstract class BasicTests
     {
         protected static HttpClient HttpClient { get; set; } = new HttpClient();
         public abstract int AppPort { get; }

diff --git a/src/CSharp/EasyMicroservices.Cores.AspCore.Tests/Fixtures/AuthorizationFixture.cs b/src/CSharp/EasyMicroservices.Cores.AspCore.Tests/Fixtures/AuthorizationFixture.cs
@@ -7,7 +7,7 @@ public class AuthorizationFixture : IAsyncLifetime
     public IServiceProvider ServiceProvider { get; private set; }
     public Task InitializeAsync()
     {
-        return BaseFixture.Init(4565, (sc) =>
+        return BaseFixture.Init(4565, 6044, (sc) =>
         {
             sc.AddScoped<IAuthorization, AppAuthorization>();
         });

diff --git a/...arp/EasyMicroservices.Cores.AspCore.Tests/Fixtures/AuthorizationRolePermissionsFixture.cs b/...arp/EasyMicroservices.Cores.AspCore.Tests/Fixtures/AuthorizationRolePermissionsFixture.cs
@@ -11,7 +11,7 @@ public class AuthorizationRolePermissionsFixture : IAsyncLifetime
     public IServiceProvider ServiceProvider { get; private set; }
     public Task InitializeAsync()
     {
-        return BaseFixture.Init(4566, (services) =>
+        return BaseFixture.Init(4566,6043, (services) =>
         {
             services.AddScoped<IAuthorization, AspCoreAuthorization>();
             services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme).AddJwtBearer(options =>

diff --git a/src/CSharp/EasyMicroservices.Cores.AspCore.Tests/Fixtures/BaseFixture.cs b/src/CSharp/EasyMicroservices.Cores.AspCore.Tests/Fixtures/BaseFixture.cs
@@ -6,12 +6,13 @@
 using EasyMicroservices.Cores.Database.Managers;
 using EasyMicroservices.Cores.Relational.EntityFrameworkCore.Intrerfaces;
 using EasyMicroservices.Cores.Tests.DatabaseLogics.Database.Contexts;
+using EasyMicroservices.Cores.Tests.Fixtures;
 
 namespace EasyMicroservices.Cores.AspCore.Tests.Fixtures;
 
 public class BaseFixture
 {
-    public static async Task<IServiceProvider> Init(long port, Action<IServiceCollection> changeCollection = null)
+    public static async Task<IServiceProvider> Init(int port, int whiteLabelPort, Action<IServiceCollection> changeCollection = null)
     {
         string microserviceName = "TestExample";
         WebApplicationBuilder app = StartUpExtensions.Create<MyTestContext>(null);
@@ -25,12 +26,14 @@ public static async Task<IServiceProvider> Init(long port, Action<IServiceCollec
             return new DefaultUniqueIdentityManager(provider.GetService<WhiteLabelManager>().CurrentWhiteLabel);
         });
         changeCollection?.Invoke(app.Services);
-        StartUpExtensions.AddWhiteLabelRoute(microserviceName, $"http://localhost:6041");
+        await BaseWhiteLabelFixture.Run(whiteLabelPort);
+        StartUpExtensions.AddWhiteLabelRoute(microserviceName, $"http://localhost:{whiteLabelPort}");
         app.Services.AddControllers().AddApplicationPart(typeof(UserController).Assembly);
         app.WebHost.UseUrls($"http://localhost:{port}");
         var build = await app.Build<MyTestContext>(true);
         build.MapControllers();
         _ = build.RunAsync();
+        //await Task.Delay(TimeSpan.FromSeconds(2));
         return build.Services;
     }
 }
diff --git a/src/CSharp/EasyMicroservices.Cores.AspCore.Tests/Fixtures/NormalFixture.cs b/src/CSharp/EasyMicroservices.Cores.AspCore.Tests/Fixtures/NormalFixture.cs
@@ -5,7 +5,7 @@ public class NormalFixture : IAsyncLifetime
     public IServiceProvider ServiceProvider { get; private set; }
     public Task InitializeAsync()
     {
-        return BaseFixture.Init(4564);
+        return BaseFixture.Init(4564,6042);
     }
 
     public Task DisposeAsync()

diff --git a/src/CSharp/EasyMicroservices.Cores.Tests/EasyMicroservices.Cores.Tests.csproj b/src/CSharp/EasyMicroservices.Cores.Tests/EasyMicroservices.Cores.Tests.csproj
@@ -19,7 +19,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="EasyMicroservices.WhiteLabelsMicroservice.VirtualServerForTests" Version="0.0.0.6" />
+    <PackageReference Include="EasyMicroservices.WhiteLabelsMicroservice.VirtualServerForTests" Version="0.0.0.7" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">

diff --git a/src/CSharp/EasyMicroservices.Cores.Tests/Fixtures/BaseWhiteLabelFixture.cs b/src/CSharp/EasyMicroservices.Cores.Tests/Fixtures/BaseWhiteLabelFixture.cs
@@ -0,0 +1,22 @@
+using EasyMicroservices.Cores.Tests.Database;
+using EasyMicroservices.Cores.Tests.DatabaseLogics.Database.Contexts;
+using EasyMicroservices.WhiteLabelsMicroservice.VirtualServerForTests;
+using EasyMicroservices.WhiteLabelsMicroservice.VirtualServerForTests.TestResources;
+
+namespace EasyMicroservices.Cores.Tests.Fixtures;
+public class BaseWhiteLabelFixture
+{
+    public static async Task Run(int port)
+    {
+        var whiteLabelVirtualTestManager = new WhiteLabelVirtualTestManager();
+
+        if (await whiteLabelVirtualTestManager.OnInitialize(port))
+        {
+            Console.WriteLine($"WhiteLabelVirtualTestManager Initialized! {port}");
+            foreach (var item in WhiteLabelResource.GetResources(new MyTestContext(new DatabaseBuilder()), "TextExample"))
+            {
+                whiteLabelVirtualTestManager.AppendService(port, item.Key, item.Value);
+            }
+        }
+    }
+}
diff --git a/src/CSharp/EasyMicroservices.Cores.Tests/Fixtures/WhiteLabelLaboratoryFixture.cs b/src/CSharp/EasyMicroservices.Cores.Tests/Fixtures/WhiteLabelLaboratoryFixture.cs
@@ -1,8 +1,4 @@
-using EasyMicroservices.Cores.Tests.Database;
-using EasyMicroservices.Cores.Tests.DatabaseLogics.Database.Contexts;
-using EasyMicroservices.WhiteLabelsMicroservice.VirtualServerForTests;
-using EasyMicroservices.WhiteLabelsMicroservice.VirtualServerForTests.TestResources;
-using System.Text;
+using System.Text;
 
 namespace EasyMicroservices.Cores.Tests.Fixtures
 {
@@ -17,33 +13,6 @@ public WhiteLabelLaboratoryFixture()
             _routeAddress = $"http://{localhost}:{Port}";
         }
 
-        protected static WhiteLabelVirtualTestManager WhiteLabelVirtualTestManager { get; set; } = new WhiteLabelVirtualTestManager();
-
-        static bool _isInitialized = false;
-        static SemaphoreSlim Semaphore = new SemaphoreSlim(1);
-        protected async Task OnInitialize()
-        {
-            try
-            {
-                await Semaphore.WaitAsync();
-                if (_isInitialized)
-                    return;
-                if (await WhiteLabelVirtualTestManager.OnInitialize(Port))
-                {
-                    Console.WriteLine($"WhiteLabelVirtualTestManager Initialized! {Port}");
-                    foreach (var item in WhiteLabelResource.GetResources(new MyTestContext(new DatabaseBuilder()), "TextExample"))
-                    {
-                        WhiteLabelVirtualTestManager.AppendService(Port, item.Key, item.Value);
-                    }
-                }
-                _isInitialized = true;
-            }
-            finally
-            {
-                Semaphore.Release();
-            }
-        }
-
         [Fact]
         public async Task WhiteLabelGetAllTest()
         {
@@ -97,9 +66,9 @@ public async Task ContextTableGetAllTest()
             Assert.True(all.Result.Count >= 5);
         }
 
-        public async Task InitializeAsync()
+        public Task InitializeAsync()
         {
-            await OnInitialize();
+            return BaseWhiteLabelFixture.Run(6041);
         }
 
         public Task DisposeAsync()