Merge pull request #163 from paq/rm2022

Remove Unity 2022 from test lanes

Author: paq

tests/README.md

@@ -15,7 +15,7 @@ dotnet run --project tests/UnityTestRunner --configuration Release -- --treenode
 dotnet run --project tests/UnityTestRunner --configuration Release -- --treenode-filter "/*/Alchemy.UnityTestRunner/Unity*EditorCaptureTests/*"
 ```
 
-Unity versions are registered explicitly in `UnityTestRunner/UnityVersionTests.cs`. Each version has an EditMode test and a PlayMode test.
+The active test lanes are Unity 6000.0, 6000.3, 6000.5, and 6000.7, registered explicitly in `UnityTestRunner/UnityVersionTests.cs`. Each version has an EditMode test and a PlayMode test.
 
 Unity Editor logs are stored under each version project's `Logs/UnityTestRunner/<run-id>` directory. Unity logs and NUnit reports are attached to their TUnit test, and warning-or-higher entries are written to stderr.
 

tests/UnityTestRunner/UnityEditorLifecycle.cs

@@ -14,11 +14,9 @@ internal async Task CloseRunningAsync(
         Action<string> writeProgress,
         CancellationToken cancellationToken)
     {
-        var connectedEditor = project.MajorVersion >= 6000
-            ? await unityCli.FindConnectedEditorAsync(
-                project,
-                cancellationToken)
-            : null;
+        var connectedEditor = await unityCli.FindConnectedEditorAsync(
+            project,
+            cancellationToken);
         if (connectedEditor is not null)
         {
             writeProgress(

tests/UnityTestRunner/UnityTest.cs

@@ -103,53 +103,29 @@ public static async Task RunAsync(
 
         var reportPath = Path.Combine(context.LogDirectory, $"{mode}.xml");
         var editorLogPath = Path.Combine(context.LogDirectory, $"{mode}.log");
-        var cliLogPath = project.MajorVersion >= 6000
-            ? string.Empty
-            : Path.Combine(context.LogDirectory, $"{mode}.cli.log");
 
         WriteProgress(project, $"{mode}: running...");
 
         try
         {
-            if (project.MajorVersion >= 6000)
-            {
-                await RunUnityProcessModeAsync(
-                    project,
-                    context,
-                    mode,
-                    reportPath,
-                    editorLogPath,
-                    cancellationToken);
-                ValidateReport(project, mode, reportPath);
-                return;
-            }
-
-            var result = await RunUnityAsync(
+            await RunUnityProcessModeAsync(
                 project,
-                context.EditorPath,
+                context,
                 mode,
                 reportPath,
                 editorLogPath,
                 cancellationToken);
             ValidateReport(project, mode, reportPath);
-            if (result.ExitCode != 0)
-            {
-                throw new UnityExecutionException(
-                    $"Unity {project.EditorVersion} {mode} exited with code " +
-                    $"{result.ExitCode} despite producing a passing report." +
-                    FormatProcessDiagnostic(result));
-            }
         }
         finally
         {
             var artifacts = new[]
             {
                 context.RefreshLogPath,
                 editorLogPath,
-                cliLogPath,
                 reportPath,
             };
-            WriteLogDiagnostics(project, [editorLogPath, cliLogPath]);
+            WriteLogDiagnostics(project, [editorLogPath]);
             AttachArtifacts(artifacts);
         }
     }
@@ -289,47 +265,6 @@ private static void ValidateReport(
         }
     }
 
-    private static async Task<ProcessResult> RunUnityAsync(
-        UnityProject project,
-        string editorPath,
-        TestMode mode,
-        string reportPath,
-        string editorLogPath,
-        CancellationToken cancellationToken)
-    {
-        var fileName = UnityEditorLifecycle.GetEditorExecutable(editorPath);
-        if (!File.Exists(fileName))
-        {
-            throw new UnityUnavailableException(
-                $"The installed Unity editor executable does not exist: {fileName}");
-        }
-
-        var arguments = BuildBatchModeArguments(
-            project,
-            mode,
-            reportPath,
-            editorLogPath);
-        var workingDirectory = project.ProjectPath;
-
-        try
-        {
-            var result = await ProcessRunner.RunAsync(
-                new ProcessSpec(
-                    fileName,
-                    arguments,
-                    workingDirectory,
-                    TerminateDescendantsOnExit: true),
-                cancellationToken);
-            return result;
-        }
-        catch (ProcessExecutionException exception)
-        {
-            throw new UnityExecutionException(
-                $"Could not start Unity {project.EditorVersion} for {mode}.",
-                exception);
-        }
-    }
-
     private static IReadOnlyList<string> BuildLibraryWarmupArguments(
         UnityProject project,
         string logPath)
@@ -348,31 +283,6 @@ private static IReadOnlyList<string> BuildLibraryWarmupArguments(
         ];
     }
 
-    private static IReadOnlyList<string> BuildBatchModeArguments(
-        UnityProject project,
-        TestMode mode,
-        string reportPath,
-        string logPath)
-    {
-        var command = mode == TestMode.EditMode
-            ? "Alchemy.Tests.TestCommands.RunAllEditModeTests"
-            : "Alchemy.Tests.TestCommands.RunAllPlayModeTests";
-        var arguments = CreateTestArguments(mode);
-        arguments.AddRange(
-        [
-            "-projectPath",
-            ".",
-            "-executeMethod",
-            command,
-            "-testResults",
-            reportPath,
-            "--auto-quit",
-            "-logFile",
-            logPath,
-        ]);
-        return arguments;
-    }
-
     private static List<string> CreateTestArguments(TestMode mode)
     {
         var arguments = new List<string> { "-batchmode" };
@@ -420,16 +330,6 @@ private static string FormatSummary(NUnitRunSummary summary)
                $"{summary.Skipped} skipped";
     }
 
-    private static string FormatProcessDiagnostic(ProcessResult result)
-    {
-        var diagnostic = string.IsNullOrWhiteSpace(result.StandardError)
-            ? result.StandardOutput
-            : result.StandardError;
-        return string.IsNullOrWhiteSpace(diagnostic)
-            ? string.Empty
-            : $"{Environment.NewLine}{diagnostic.Trim()}";
-    }
-
     private static void WriteProgress(UnityProject project, string message)
     {
         LiveOutput.WriteLine($"[{project.EditorVersion}] {message}");

tests/UnityTestRunner/UnityVersionTests.cs

@@ -2,24 +2,6 @@
 
 namespace Alchemy.UnityTestRunner;
 
-public sealed class Unity2022_3UnitTests
-{
-    private static readonly UnityProject Project =
-        UnityProject.Locate("../versions/Unity2022.3");
-
-    [Before(HookType.Class)]
-    public static Task Refresh(CancellationToken cancellationToken) =>
-        UnityTest.RefreshAsync(Project, cancellationToken);
-
-    [Test]
-    public Task EditMode(CancellationToken cancellationToken) =>
-        UnityTest.RunAsync(Project, TestMode.EditMode, cancellationToken);
-
-    [Test]
-    public Task PlayMode(CancellationToken cancellationToken) =>
-        UnityTest.RunAsync(Project, TestMode.PlayMode, cancellationToken);
-}
-
 public sealed class Unity6000_0UnitTests
 {
     private static readonly UnityProject Project =

tests/versions/Unity6000.3/ProjectSettings/ProjectSettings.asset

@@ -298,7 +298,99 @@ PlayerSettings:
   AndroidReportGooglePlayAppDependencies: 1
   androidSymbolsSizeThreshold: 800
   m_BuildTargetIcons: []
-  m_BuildTargetPlatformIcons: []
+  m_BuildTargetPlatformIcons:
+  - m_BuildTarget: Android
+    m_Icons:
+    - m_Textures: []
+      m_Width: 432
+      m_Height: 432
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 324
+      m_Height: 324
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 216
+      m_Height: 216
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 162
+      m_Height: 162
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 108
+      m_Height: 108
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 81
+      m_Height: 81
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 0
+      m_SubKind: 
   m_BuildTargetBatching: []
   m_BuildTargetShaderSettings: []
   m_BuildTargetGraphicsJobs: []

tests/versions/Unity6000.5/ProjectSettings/ProjectAuditorSettings.asset

@@ -19,10 +19,10 @@ MonoBehaviour:
     - PlatformGroup:
         m_String: Unknown
       m_SerializedParams:
-      - Key: StreamingAssetsFolderSizeLimit
-        Value: 50
       - Key: SpriteAtlasEmptySpaceLimit
         Value: 50
+      - Key: StreamingAssetsFolderSizeLimit
+        Value: 50
       - Key: TextureStreamingMipmapsSizeLimit
         Value: 4000
       - Key: StreamingClipThresholdBytes

tests/versions/Unity6000.7/ProjectSettings/ProjectAuditorSettings.asset

@@ -0,0 +1,36 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 53
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 0}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEditor.ProjectAuditorModule:Unity.ProjectAuditor.Editor:ProjectAuditorSettings
+  Rules:
+    rules: []
+  DiagnosticParams:
+    paramsStack:
+    - PlatformGroup:
+        m_String: Unknown
+      m_SerializedParams:
+      - Key: StreamingAssetsFolderSizeLimit
+        Value: 50
+      - Key: StreamingClipThresholdBytes
+        Value: 218294
+      - Key: LongDecompressedClipThresholdBytes
+        Value: 204800
+      - Key: LongCompressedMobileClipThresholdBytes
+        Value: 204800
+      - Key: LoadInBackGroundClipSizeThresholdBytes
+        Value: 204800
+      - Key: TextureStreamingMipmapsSizeLimit
+        Value: 4000
+      - Key: SpriteAtlasEmptySpaceLimit
+        Value: 50
+    CurrentParamsIndex: 0