Change int dotnet test

2023-02-13 07:10:19 -07:00 · 2023-02-13 07:10:19 -07:00 · 65d93ded96
commit 65d93ded96
parent f099b23f5f
30 changed files with 56 additions and 53 deletions
--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE2.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE2.cs
@ -42,7 +42,7 @@ public class CDE2 : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3-EQPT.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3-EQPT.cs
@ -43,7 +43,7 @@ public class CDE3_EQPT : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3.cs
@ -43,7 +43,7 @@ public class CDE3 : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE5.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE5.cs
@ -42,7 +42,7 @@ public class CDE5 : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/MET08RESIMAPCDE.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/MET08RESIMAPCDE.cs
@ -43,7 +43,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE2.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE2.cs
@ -42,7 +42,7 @@ public class CDE2 : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3-EQPT.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3-EQPT.cs
@ -43,7 +43,7 @@ public class CDE3_EQPT : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3.cs
@ -43,7 +43,7 @@ public class CDE3 : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE5.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE5.cs
@ -42,7 +42,7 @@ public class CDE5 : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08RESIMAPCDE.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08RESIMAPCDE.cs
@ -43,7 +43,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE2.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE2.cs
@ -42,7 +42,7 @@ public class CDE2 : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3-EQPT.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3-EQPT.cs
@ -43,7 +43,7 @@ public class CDE3_EQPT : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3.cs
@ -43,7 +43,7 @@ public class CDE3 : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE5.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE5.cs
@ -42,7 +42,7 @@ public class CDE5 : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/MET08RESIMAPCDE.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/MET08RESIMAPCDE.cs
@ -43,7 +43,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.3/CDE5-EQPT.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.3/CDE5-EQPT.cs
@ -43,7 +43,7 @@ public class CDE5_EQPT : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.3/CDE5.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.3/CDE5.cs
@ -43,7 +43,7 @@ public class CDE5 : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/CDE2.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/CDE2.cs
@ -43,7 +43,7 @@ public class CDE2 : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/CDE5.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/CDE5.cs
@ -43,7 +43,7 @@ public class CDE5 : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/MET08RESIMAPCDE.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.4/MET08RESIMAPCDE.cs
@ -43,7 +43,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/CDE2.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/CDE2.cs
@ -43,7 +43,7 @@ public class CDE2 : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/CDE5.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.0/CDE5.cs
@ -43,7 +43,7 @@ public class CDE5 : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/MET08RESIMAPCDE.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.1/MET08RESIMAPCDE.cs
@ -43,7 +43,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.2/CDE6-EQPT.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.2/CDE6-EQPT.cs
@ -43,7 +43,7 @@ public class CDE6_EQPT : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.2/CDE6.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.47.2/CDE6.cs
@ -43,7 +43,7 @@ public class CDE6 : EAFLoggingUnitTesting
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        EAFLoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/Shared/LoggingUnitTesting.cs
+++ b/Adaptation/_Tests/Shared/LoggingUnitTesting.cs
@ -26,7 +26,7 @@ public class LoggingUnitTesting : UnitTesting, IDisposable
        base(testContext, declaringType)
    {
        _LoggerFactory = new LoggerFactory();
-        if (testContext is null || declaringType is null)
+        if (testContext is null || declaringType is null || _IsEnvironment is null)
        {
            _ConfigurationRoot = null;
            _DefaultLogLevel = null;
--- a/Adaptation/_Tests/Shared/UnitTesting.cs
+++ b/Adaptation/_Tests/Shared/UnitTesting.cs
@ -29,40 +29,45 @@ public class UnitTesting
        {
            string waitFor = "\"WaitFor\":";
            string projectDirectory = GetProjectDirectory(testContext);
-            _TestContextPropertiesAsJson = JsonSerializer.Serialize(testContext.Properties, new JsonSerializerOptions { WriteIndented = true });
-            _HasWaitForProperty = _TestContextPropertiesAsJson.Contains(waitFor);
-            string vsCodeDirectory = Path.Combine(projectDirectory, ".vscode");
-            if (!Directory.Exists(vsCodeDirectory))
-                _ = Directory.CreateDirectory(vsCodeDirectory);
-            string launchText = GetLaunchText();
-            File.WriteAllText(Path.Combine(vsCodeDirectory, "launch.json"), launchText);
-            if (_HasWaitForProperty)
+            if (string.IsNullOrEmpty(projectDirectory))
+                _IsEnvironment = null;
+            else
            {
-                for (int i = 0; i < int.MaxValue; i++)
+                _TestContextPropertiesAsJson = JsonSerializer.Serialize(testContext.Properties, new JsonSerializerOptions { WriteIndented = true });
+                _HasWaitForProperty = _TestContextPropertiesAsJson.Contains(waitFor);
+                string vsCodeDirectory = Path.Combine(projectDirectory, ".vscode");
+                if (!Directory.Exists(vsCodeDirectory))
+                    _ = Directory.CreateDirectory(vsCodeDirectory);
+                string launchText = GetLaunchText();
+                File.WriteAllText(Path.Combine(vsCodeDirectory, "launch.json"), launchText);
+                if (_HasWaitForProperty)
                {
-                    if (!_TestContextPropertiesAsJson.Contains($"{waitFor} \"Debugger.IsAttached\"") || Debugger.IsAttached)
-                        break;
-                    Thread.Sleep(500);
+                    for (int i = 0; i < int.MaxValue; i++)
+                    {
+                        if (!_TestContextPropertiesAsJson.Contains($"{waitFor} \"Debugger.IsAttached\"") || Debugger.IsAttached)
+                            break;
+                        Thread.Sleep(500);
+                    }
                }
-            }
-            MethodBase methodBase = declaringType.GetMethod(testContext.TestName);
-            if (methodBase is not null)
-            {
-                TestCategoryAttribute testCategoryAttribute = methodBase.GetCustomAttribute<TestCategoryAttribute>();
-                if (testCategoryAttribute is not null)
+                MethodBase methodBase = declaringType.GetMethod(testContext.TestName);
+                if (methodBase is not null)
                {
-                    foreach (string testCategory in testCategoryAttribute.TestCategories)
-                        _IsEnvironment = new IsEnvironment(testCategory);
+                    TestCategoryAttribute testCategoryAttribute = methodBase.GetCustomAttribute<TestCategoryAttribute>();
+                    if (testCategoryAttribute is not null)
+                    {
+                        foreach (string testCategory in testCategoryAttribute.TestCategories)
+                            _IsEnvironment = new IsEnvironment(testCategory);
+                    }
                }
+                _IsEnvironment ??= new IsEnvironment(processesCount: null, nullASPNetCoreEnvironmentIsDevelopment: Debugger.IsAttached, nullASPNetCoreEnvironmentIsProduction: !Debugger.IsAttached);
            }
-            _IsEnvironment ??= new IsEnvironment(processesCount: null, nullASPNetCoreEnvironmentIsDevelopment: Debugger.IsAttached, nullASPNetCoreEnvironmentIsProduction: !Debugger.IsAttached);
        }
    }

    internal static string GetProjectDirectory(TestContext testContext)
    {
        string result;
-        string[] checkFiles = null;
+        string[] checkFiles;
        result = Path.GetDirectoryName(testContext.DeploymentDirectory);
        for (int i = 0; i < int.MaxValue; i++)
        {
@ -73,8 +78,6 @@ public class UnitTesting
                break;
            result = Path.GetDirectoryName(result);
        }
-        if (string.IsNullOrEmpty(result) || checkFiles is null || !checkFiles.Any())
-            throw new Exception(result);
        return result;
    }

--- a/Adaptation/_Tests/Static/MET08RESIMAPCDE.cs
+++ b/Adaptation/_Tests/Static/MET08RESIMAPCDE.cs
@ -34,7 +34,7 @@ public class MET08RESIMAPCDE : LoggingUnitTesting, IDisposable
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        LoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        LoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        LoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/Static/RsM.cs
+++ b/Adaptation/_Tests/Static/RsM.cs
@ -34,7 +34,7 @@ public class RsM : LoggingUnitTesting, IDisposable
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        LoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        LoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        LoggingUnitTesting?.Dispose();
    }

--- a/Adaptation/_Tests/Static/txt.cs
+++ b/Adaptation/_Tests/Static/txt.cs
@ -34,7 +34,7 @@ public class TXT : LoggingUnitTesting, IDisposable
    [ClassCleanup()]
    public static void ClassCleanup()
    {
-        LoggingUnitTesting.Logger?.LogInformation("Cleanup");
+        LoggingUnitTesting?.Logger?.LogInformation("Cleanup");
        LoggingUnitTesting?.Dispose();
    }