diff --git a/Adaptation/EC.Tests.csproj b/Adaptation/EC.Tests.csproj
index 3d9f78b..0d3c3e8 100644
--- a/Adaptation/EC.Tests.csproj
+++ b/Adaptation/EC.Tests.csproj
@@ -43,7 +43,7 @@
NU1701
NU1701
-
+
@@ -63,7 +63,7 @@
-
+
diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/EC.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/EC.cs
index b7f51d3..54274d3 100644
--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/EC.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/EC.cs
@@ -40,7 +40,7 @@ public class EC : EAFLoggingUnitTesting
[ClassCleanup()]
public static void ClassCleanup()
{
- EAFLoggingUnitTesting.Logger?.LogInformation("Cleanup");
+ EAFLoggingUnitTesting?.Logger?.LogInformation("Cleanup");
EAFLoggingUnitTesting?.Dispose();
}
diff --git a/Adaptation/_Tests/Shared/LoggingUnitTesting.cs b/Adaptation/_Tests/Shared/LoggingUnitTesting.cs
index f5c6a40..9628850 100644
--- 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;
diff --git a/Adaptation/_Tests/Shared/UnitTesting.cs b/Adaptation/_Tests/Shared/UnitTesting.cs
index 38cf36f..1833834 100644
--- 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();
- 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();
+ 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;
}
diff --git a/Adaptation/_Tests/Static/EC.cs b/Adaptation/_Tests/Static/EC.cs
index a296d05..669e9ab 100644
--- a/Adaptation/_Tests/Static/EC.cs
+++ b/Adaptation/_Tests/Static/EC.cs
@@ -34,7 +34,7 @@ public class EC : LoggingUnitTesting, IDisposable
[ClassCleanup()]
public static void ClassCleanup()
{
- LoggingUnitTesting.Logger?.LogInformation("Cleanup");
+ LoggingUnitTesting?.Logger?.LogInformation("Cleanup");
LoggingUnitTesting?.Dispose();
}
diff --git a/EC.csproj b/EC.csproj
index ca33220..7d3984f 100644
--- a/EC.csproj
+++ b/EC.csproj
@@ -11,7 +11,7 @@
EC
EC
v4.8
- win-x64
+ win-x86
win
512