From 7c1e566113d59699af1624186c64eca67f063fc6 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Mon, 20 Apr 2020 19:09:33 -0400 Subject: Upgraded Unity --- .../UnityEditor.TestRunner/TestRun/Tasks.meta | 8 - .../TestRun/Tasks/BuildActionTaskBase.cs | 86 ----------- .../TestRun/Tasks/BuildActionTaskBase.cs.meta | 11 -- .../TestRun/Tasks/BuildTestTreeTask.cs | 61 -------- .../TestRun/Tasks/BuildTestTreeTask.cs.meta | 11 -- .../TestRun/Tasks/CleanupVerificationTask.cs | 47 ------ .../TestRun/Tasks/CleanupVerificationTask.cs.meta | 11 -- .../TestRun/Tasks/FileCleanupVerifierTaskBase.cs | 14 -- .../Tasks/FileCleanupVerifierTaskBase.cs.meta | 11 -- .../TestRun/Tasks/LegacyEditModeRunTask.cs | 26 ---- .../TestRun/Tasks/LegacyEditModeRunTask.cs.meta | 11 -- .../TestRun/Tasks/LegacyPlayModeRunTask.cs | 26 ---- .../TestRun/Tasks/LegacyPlayModeRunTask.cs.meta | 11 -- .../TestRun/Tasks/LegacyPlayerRunTask.cs | 18 --- .../TestRun/Tasks/LegacyPlayerRunTask.cs.meta | 11 -- .../TestRun/Tasks/PerformUndoTask.cs | 39 ----- .../TestRun/Tasks/PerformUndoTask.cs.meta | 11 -- .../TestRun/Tasks/PrebuildSetupTask.cs | 20 --- .../TestRun/Tasks/PrebuildSetupTask.cs.meta | 11 -- .../RegisterFilesForCleanupVerificationTask.cs | 13 -- ...RegisterFilesForCleanupVerificationTask.cs.meta | 11 -- .../TestRun/Tasks/SaveModiedSceneTask.cs | 22 --- .../TestRun/Tasks/SaveModiedSceneTask.cs.meta | 11 -- .../TestRun/Tasks/SaveUndoIndexTask.cs | 15 -- .../TestRun/Tasks/SaveUndoIndexTask.cs.meta | 11 -- .../TestRun/Tasks/TestTaskBase.cs | 16 -- .../TestRun/Tasks/TestTaskBase.cs.meta | 11 -- .../UnityEditor.TestRunner/TestRun/TestJobData.cs | 49 ------ .../TestRun/TestJobData.cs.meta | 11 -- .../TestRun/TestJobDataHolder.cs | 28 ---- .../TestRun/TestJobDataHolder.cs.meta | 11 -- .../TestRun/TestJobRunner.cs | 166 --------------------- .../TestRun/TestJobRunner.cs.meta | 11 -- .../TestRun/TestRunCanceledException.cs | 9 -- .../TestRun/TestRunCanceledException.cs.meta | 11 -- 35 files changed, 850 deletions(-) delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/BuildActionTaskBase.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/BuildActionTaskBase.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/BuildTestTreeTask.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/BuildTestTreeTask.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/CleanupVerificationTask.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/CleanupVerificationTask.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/FileCleanupVerifierTaskBase.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/FileCleanupVerifierTaskBase.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyEditModeRunTask.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyEditModeRunTask.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyPlayModeRunTask.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyPlayModeRunTask.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyPlayerRunTask.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyPlayerRunTask.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/PerformUndoTask.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/PerformUndoTask.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/PrebuildSetupTask.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/PrebuildSetupTask.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/RegisterFilesForCleanupVerificationTask.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/RegisterFilesForCleanupVerificationTask.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/SaveModiedSceneTask.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/SaveModiedSceneTask.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/SaveUndoIndexTask.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/SaveUndoIndexTask.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/TestTaskBase.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/TestTaskBase.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobData.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobData.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobDataHolder.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobDataHolder.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobRunner.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobRunner.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestRunCanceledException.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestRunCanceledException.cs.meta (limited to 'Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun') diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks.meta deleted file mode 100644 index d1a1aeb..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6dba53789da15814387fa5b1445e81e0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/BuildActionTaskBase.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/BuildActionTaskBase.cs deleted file mode 100644 index 016ea54..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/BuildActionTaskBase.cs +++ /dev/null @@ -1,86 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using NUnit.Framework.Interfaces; -using UnityEngine; -using UnityEngine.TestTools.Logging; -using UnityEngine.TestTools.TestRunner; - -namespace UnityEditor.TestTools.TestRunner.TestRun.Tasks -{ - internal abstract class BuildActionTaskBase : TestTaskBase - { - private string typeName; - internal IAttributeFinder attributeFinder; - internal RuntimePlatform targetPlatform = Application.platform; - internal Action logAction = Debug.Log; - internal Func logScopeProvider = () => new LogScope(); - internal Func createInstance = Activator.CreateInstance; - - protected BuildActionTaskBase(IAttributeFinder attributeFinder) - { - this.attributeFinder = attributeFinder; - typeName = typeof(T).Name; - } - - protected abstract void Action(T target); - - public override IEnumerator Execute(TestJobData testJobData) - { - if (testJobData.testTree == null) - { - throw new Exception($"Test tree is not available for {GetType().Name}."); - } - - var enumerator = ExecuteMethods(testJobData.testTree, testJobData.executionSettings.BuildNUnitFilter()); - while (enumerator.MoveNext()) - { - yield return null; - } - } - - protected IEnumerator ExecuteMethods(ITest testTree, ITestFilter testRunnerFilter) - { - var exceptions = new List(); - - foreach (var targetClassType in attributeFinder.Search(testTree, testRunnerFilter, targetPlatform)) - { - try - { - var targetClass = (T) createInstance(targetClassType); - - logAction($"Executing {typeName} for: {targetClassType.FullName}."); - - using (var logScope = logScopeProvider()) - { - Action(targetClass); - - if (logScope.AnyFailingLogs()) - { - var failingLog = logScope.FailingLogs.First(); - throw new UnhandledLogMessageException(failingLog); - } - - if (logScope.ExpectedLogs.Any()) - { - var expectedLogs = logScope.ExpectedLogs.First(); - throw new UnexpectedLogMessageException(expectedLogs); - } - } - } - catch (Exception ex) - { - exceptions.Add(ex); - } - - yield return null; - } - - if (exceptions.Count > 0) - { - throw new AggregateException($"One or more exceptions when executing {typeName}.", exceptions); - } - } - } -} \ No newline at end of file diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/BuildActionTaskBase.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/BuildActionTaskBase.cs.meta deleted file mode 100644 index e4fd79f..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/BuildActionTaskBase.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c2441d353f9c42a44af6e224e4901b52 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/BuildTestTreeTask.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/BuildTestTreeTask.cs deleted file mode 100644 index fa45752..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/BuildTestTreeTask.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System; -using System.Collections; -using System.Linq; -using UnityEditor.TestTools.TestRunner.Api; -using UnityEngine.TestRunner.NUnitExtensions; -using UnityEngine.TestTools; -using UnityEngine.TestTools.NUnitExtensions; - -namespace UnityEditor.TestTools.TestRunner.TestRun.Tasks -{ - internal class BuildTestTreeTask : TestTaskBase - { - private TestPlatform m_TestPlatform; - - public BuildTestTreeTask(TestPlatform testPlatform) - { - m_TestPlatform = testPlatform; - } - - internal IEditorLoadedTestAssemblyProvider m_testAssemblyProvider = new EditorLoadedTestAssemblyProvider(new EditorCompilationInterfaceProxy(), new EditorAssembliesProxy()); - internal IAsyncTestAssemblyBuilder m_testAssemblyBuilder = new UnityTestAssemblyBuilder(); - internal ICallbacksDelegator m_CallbacksDelegator = CallbacksDelegator.instance; - - public override IEnumerator Execute(TestJobData testJobData) - { - if (testJobData.testTree != null) - { - yield break; - } - - var assembliesEnumerator = m_testAssemblyProvider.GetAssembliesGroupedByTypeAsync(m_TestPlatform); - while (assembliesEnumerator.MoveNext()) - { - yield return null; - } - - if (assembliesEnumerator.Current == null) - { - throw new Exception("Assemblies not retrieved."); - } - - var assemblies = assembliesEnumerator.Current.Where(pair => m_TestPlatform.IsFlagIncluded(pair.Key)).SelectMany(pair => pair.Value).Select(x => x.Assembly).ToArray(); - var buildSettings = UnityTestAssemblyBuilder.GetNUnitTestBuilderSettings(m_TestPlatform); - var enumerator = m_testAssemblyBuilder.BuildAsync(assemblies, Enumerable.Repeat(m_TestPlatform, assemblies.Length).ToArray(), buildSettings); - while (enumerator.MoveNext()) - { - yield return null; - } - - var testList = enumerator.Current; - if (testList== null) - { - throw new Exception("Test list not retrieved."); - } - - testList.ParseForNameDuplicates(); - testJobData.testTree = testList; - m_CallbacksDelegator.TestTreeRebuild(testList); - } - } -} \ No newline at end of file diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/BuildTestTreeTask.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/BuildTestTreeTask.cs.meta deleted file mode 100644 index ff4c0f7..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/BuildTestTreeTask.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a0288e1c9324e824bab7e2044a72a434 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/CleanupVerificationTask.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/CleanupVerificationTask.cs deleted file mode 100644 index 3da9a30..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/CleanupVerificationTask.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; -using System.Collections; -using System.IO; -using System.Linq; -using UnityEngine; - -namespace UnityEditor.TestTools.TestRunner.TestRun.Tasks -{ - internal class CleanupVerificationTask : FileCleanupVerifierTaskBase - { - private const string k_Indent = " "; - - internal Action logAction = Debug.LogWarning; - - public override IEnumerator Execute(TestJobData testJobData) - { - var currentFiles = GetAllFilesInAssetsDirectory(); - var existingFiles = testJobData.existingFiles; - - if (currentFiles.Length != existingFiles.Length) - { - LogWarningForFilesIfAny(currentFiles.Where(file => !testJobData.existingFiles.Contains(file)).ToArray()); - } - - yield return null; - } - - private void LogWarningForFilesIfAny(string[] filePaths) - { - if (!filePaths.Any()) - { - return; - } - - var stringWriter = new StringWriter(); - stringWriter.WriteLine("Files generated by test without cleanup."); - stringWriter.WriteLine(k_Indent + "Found {0} new files.", filePaths.Length); - - foreach (var filePath in filePaths) - { - stringWriter.WriteLine(k_Indent + filePath); - } - - logAction(stringWriter.ToString()); - } - } -} \ No newline at end of file diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/CleanupVerificationTask.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/CleanupVerificationTask.cs.meta deleted file mode 100644 index 749b832..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/CleanupVerificationTask.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 93eb6389f4fb6924987867ce0bc339ee -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/FileCleanupVerifierTaskBase.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/FileCleanupVerifierTaskBase.cs deleted file mode 100644 index 18dc47b..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/FileCleanupVerifierTaskBase.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; - -namespace UnityEditor.TestTools.TestRunner.TestRun.Tasks -{ - internal abstract class FileCleanupVerifierTaskBase : TestTaskBase - { - internal Func GetAllAssetPathsAction = AssetDatabase.GetAllAssetPaths; - - protected string[] GetAllFilesInAssetsDirectory() - { - return GetAllAssetPathsAction(); - } - } -} \ No newline at end of file diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/FileCleanupVerifierTaskBase.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/FileCleanupVerifierTaskBase.cs.meta deleted file mode 100644 index 64b8002..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/FileCleanupVerifierTaskBase.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ad7bb166069f8414e9ad26606b305e66 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyEditModeRunTask.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyEditModeRunTask.cs deleted file mode 100644 index 2186048..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyEditModeRunTask.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections; -using UnityEngine; -using UnityEngine.TestTools; - -namespace UnityEditor.TestTools.TestRunner.TestRun.Tasks -{ - internal class LegacyEditModeRunTask : TestTaskBase - { - public LegacyEditModeRunTask() : base(true) - { - - } - - public override IEnumerator Execute(TestJobData testJobData) - { - var testLauncher = new EditModeLauncher(testJobData.executionSettings.filters, TestPlatform.EditMode, testJobData.executionSettings.runSynchronously); - testJobData.editModeRunner = testLauncher.m_EditModeRunner; - testLauncher.Run(); - - while (testJobData.editModeRunner != null && !testJobData.editModeRunner.RunFinished) - { - yield return null; - } - } - } -} \ No newline at end of file diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyEditModeRunTask.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyEditModeRunTask.cs.meta deleted file mode 100644 index a4f66d6..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyEditModeRunTask.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b4246555189b5ee43b4857220f9fd29b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyPlayModeRunTask.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyPlayModeRunTask.cs deleted file mode 100644 index 1be2a80..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyPlayModeRunTask.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections; -using System.Linq; -using UnityEngine.TestTools.TestRunner; - -namespace UnityEditor.TestTools.TestRunner.TestRun.Tasks -{ - internal class LegacyPlayModeRunTask : TestTaskBase - { - public LegacyPlayModeRunTask() : base(true) - { - - } - public override IEnumerator Execute(TestJobData testJobData) - { - var settings = PlaymodeTestsControllerSettings.CreateRunnerSettings(testJobData.executionSettings.filters.Select(filter => filter.ToTestRunnerFilter()).ToArray()); - var launcher = new PlaymodeLauncher(settings); - - launcher.Run(); - - while (PlaymodeLauncher.IsRunning) - { - yield return null; - } - } - } -} \ No newline at end of file diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyPlayModeRunTask.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyPlayModeRunTask.cs.meta deleted file mode 100644 index f37f78d..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyPlayModeRunTask.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4769fe1e7475c8843b092338acbcad25 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyPlayerRunTask.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyPlayerRunTask.cs deleted file mode 100644 index 7ee1913..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyPlayerRunTask.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Linq; -using UnityEngine.TestTools.TestRunner; - -namespace UnityEditor.TestTools.TestRunner.TestRun.Tasks -{ - internal class LegacyPlayerRunTask : TestTaskBase - { - public override IEnumerator Execute(TestJobData testJobData) - { - var executionSettings = testJobData.executionSettings; - var settings = PlaymodeTestsControllerSettings.CreateRunnerSettings(executionSettings.filters.Select(filter => filter.ToTestRunnerFilter()).ToArray()); - var launcher = new PlayerLauncher(settings, executionSettings.targetPlatform, executionSettings.overloadTestRunSettings, executionSettings.playerHeartbeatTimeout); - launcher.Run(); - yield return null; - } - } -} \ No newline at end of file diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyPlayerRunTask.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyPlayerRunTask.cs.meta deleted file mode 100644 index e2046bb..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/LegacyPlayerRunTask.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b93fe5bbea454ae438fcec241c5fa85b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/PerformUndoTask.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/PerformUndoTask.cs deleted file mode 100644 index df64442..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/PerformUndoTask.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections; -using UnityEngine; - -namespace UnityEditor.TestTools.TestRunner.TestRun.Tasks -{ - internal class PerformUndoTask : TestTaskBase - { - private const double warningThreshold = 1000; - - internal Action RevertAllDownToGroup = Undo.RevertAllDownToGroup; - internal Action LogWarning = Debug.LogWarning; - internal Action DisplayProgressBar = EditorUtility.DisplayProgressBar; - internal Action ClearProgressBar = EditorUtility.ClearProgressBar; - internal Func TimeNow = () => DateTime.Now; - - public override IEnumerator Execute(TestJobData testJobData) - { - if (testJobData.undoGroup < 0) - { - yield break; - } - - DisplayProgressBar("Undo", "Reverting changes to the scene", 0); - - var undoStartTime = TimeNow(); - - RevertAllDownToGroup(testJobData.undoGroup); - - var timeDelta = TimeNow() - undoStartTime; - if (timeDelta.TotalMilliseconds >= warningThreshold) - { - LogWarning($"Undo after editor test run took {timeDelta.Seconds} second{(timeDelta.Seconds == 1 ? "" : "s")}."); - } - - ClearProgressBar(); - } - } -} \ No newline at end of file diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/PerformUndoTask.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/PerformUndoTask.cs.meta deleted file mode 100644 index be55331..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/PerformUndoTask.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fb1abebffd37bd4458c84e15a5d7ab04 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/PrebuildSetupTask.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/PrebuildSetupTask.cs deleted file mode 100644 index 34e03e3..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/PrebuildSetupTask.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections; -using NUnit.Framework.Interfaces; -using UnityEngine; -using UnityEngine.TestTools; - -namespace UnityEditor.TestTools.TestRunner.TestRun.Tasks -{ - internal class PrebuildSetupTask : BuildActionTaskBase - { - public PrebuildSetupTask() : base(new PrebuildSetupAttributeFinder()) - { - } - - protected override void Action(IPrebuildSetup target) - { - target.Setup(); - } - } -} \ No newline at end of file diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/PrebuildSetupTask.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/PrebuildSetupTask.cs.meta deleted file mode 100644 index 009894d..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/PrebuildSetupTask.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fc039194235714f48a39bd364885e744 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/RegisterFilesForCleanupVerificationTask.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/RegisterFilesForCleanupVerificationTask.cs deleted file mode 100644 index 7a4cf64..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/RegisterFilesForCleanupVerificationTask.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Collections; - -namespace UnityEditor.TestTools.TestRunner.TestRun.Tasks -{ - internal class RegisterFilesForCleanupVerificationTask : FileCleanupVerifierTaskBase - { - public override IEnumerator Execute(TestJobData testJobData) - { - testJobData.existingFiles = GetAllFilesInAssetsDirectory(); - yield return null; - } - } -} \ No newline at end of file diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/RegisterFilesForCleanupVerificationTask.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/RegisterFilesForCleanupVerificationTask.cs.meta deleted file mode 100644 index a2ef8c8..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/RegisterFilesForCleanupVerificationTask.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a398fde47a0349a40a9bdf8988c392c9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/SaveModiedSceneTask.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/SaveModiedSceneTask.cs deleted file mode 100644 index a2ec975..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/SaveModiedSceneTask.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections; -using UnityEditor.SceneManagement; - -namespace UnityEditor.TestTools.TestRunner.TestRun.Tasks -{ - internal class SaveModiedSceneTask : TestTaskBase - { - internal Func SaveCurrentModifiedScenesIfUserWantsTo = - EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo; - public override IEnumerator Execute(TestJobData testJobData) - { - var cancelled = !SaveCurrentModifiedScenesIfUserWantsTo(); - if (cancelled) - { - throw new TestRunCanceledException(); - } - - yield break; - } - } -} \ No newline at end of file diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/SaveModiedSceneTask.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/SaveModiedSceneTask.cs.meta deleted file mode 100644 index b710751..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/SaveModiedSceneTask.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c321246872d389b469bd0cb86d3701ed -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/SaveUndoIndexTask.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/SaveUndoIndexTask.cs deleted file mode 100644 index 45b1227..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/SaveUndoIndexTask.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections; - -namespace UnityEditor.TestTools.TestRunner.TestRun.Tasks -{ - internal class SaveUndoIndexTask : TestTaskBase - { - internal Func GetUndoGroup = Undo.GetCurrentGroup; - public override IEnumerator Execute(TestJobData testJobData) - { - testJobData.undoGroup = GetUndoGroup(); - yield break; - } - } -} \ No newline at end of file diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/SaveUndoIndexTask.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/SaveUndoIndexTask.cs.meta deleted file mode 100644 index d79dc22..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/SaveUndoIndexTask.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cc0ce06a7515c044bb8db4c75db84114 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/TestTaskBase.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/TestTaskBase.cs deleted file mode 100644 index d83490b..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/TestTaskBase.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections; - -namespace UnityEditor.TestTools.TestRunner.TestRun.Tasks -{ - internal abstract class TestTaskBase - { - public bool SupportsResumingEnumerator; - - protected TestTaskBase(bool supportsResumingEnumerator = false) - { - SupportsResumingEnumerator = supportsResumingEnumerator; - } - - public abstract IEnumerator Execute(TestJobData testJobData); - } -} \ No newline at end of file diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/TestTaskBase.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/TestTaskBase.cs.meta deleted file mode 100644 index 89edb19..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/Tasks/TestTaskBase.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 342d9ef4da0a19b49877f576c2deec14 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobData.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobData.cs deleted file mode 100644 index 06358df..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobData.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System; -using NUnit.Framework.Interfaces; -using UnityEditor.TestTools.TestRunner.Api; -using UnityEngine; - -namespace UnityEditor.TestTools.TestRunner.TestRun -{ - [Serializable] - internal class TestJobData - { - [SerializeField] - public string guid; - - [SerializeField] - public int taskIndex; - - [SerializeField] - public int taskPC; - - [SerializeField] - public bool isRunning; - - [SerializeField] - public ExecutionSettings executionSettings; - - [SerializeField] - public string[] existingFiles; - - [SerializeField] - public int undoGroup = -1; - - [SerializeField] - public EditModeRunner editModeRunner; - - [NonSerialized] - public bool isHandledByRunner; - - public ITest testTree; - - public TestJobData(ExecutionSettings settings) - { - guid = Guid.NewGuid().ToString(); - executionSettings = settings; - isRunning = false; - taskIndex = 0; - taskPC = 0; - } - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobData.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobData.cs.meta deleted file mode 100644 index 34a3c41..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobData.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 80ac8f5b2a7fa904dbc80111be88c8be -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobDataHolder.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobDataHolder.cs deleted file mode 100644 index 8f1309e..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobDataHolder.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; - -namespace UnityEditor.TestTools.TestRunner.TestRun -{ - internal class TestJobDataHolder : ScriptableSingleton - { - [SerializeField] - public List TestRuns = new List(); - - [InitializeOnLoadMethod] - private static void ResumeRunningJobs() - { - foreach (var testRun in instance.TestRuns.ToArray()) - { - if (testRun.isRunning) - { - var runner = new TestJobRunner(); - runner.RunJob(testRun); - } - else - { - instance.TestRuns.Remove(testRun); - } - } - } - } -} \ No newline at end of file diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobDataHolder.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobDataHolder.cs.meta deleted file mode 100644 index fdc9a90..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobDataHolder.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 612b00d793cac3c49808ab3ee5428f16 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobRunner.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobRunner.cs deleted file mode 100644 index 5485688..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobRunner.cs +++ /dev/null @@ -1,166 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using UnityEditor.TestTools.TestRunner.Api; -using UnityEditor.TestTools.TestRunner.TestRun.Tasks; -using UnityEngine; -using UnityEngine.TestTools; - -namespace UnityEditor.TestTools.TestRunner.TestRun -{ - internal class TestJobRunner - { - private static IEnumerable GetTaskList(ExecutionSettings settings) - { - if (settings == null) - { - yield break; - } - - if (settings.EditModeIncluded() || (PlayerSettings.runPlayModeTestAsEditModeTest && settings.PlayModeInEditorIncluded())) - { - yield return new SaveModiedSceneTask(); - yield return new RegisterFilesForCleanupVerificationTask(); - yield return new SaveUndoIndexTask(); - yield return new BuildTestTreeTask(TestPlatform.EditMode); - yield return new PrebuildSetupTask(); - yield return new LegacyEditModeRunTask(); - yield return new PerformUndoTask(); - yield return new CleanupVerificationTask(); - yield break; - } - - if (settings.PlayModeInEditorIncluded() && !PlayerSettings.runPlayModeTestAsEditModeTest) - { - yield return new SaveModiedSceneTask(); - yield return new LegacyPlayModeRunTask(); - yield break; - } - - if (settings.PlayerIncluded()) - { - yield return new LegacyPlayerRunTask(); - yield break; - } - } - - internal List SavedTestJobData = TestJobDataHolder.instance.TestRuns; - internal Action SubscribeCallback = (callback) => EditorApplication.update += callback; - // ReSharper disable once DelegateSubtraction - internal Action UnsubscribeCallback = (callback) => EditorApplication.update -= callback; - internal TestCommandPcHelper PcHelper = new EditModePcHelper(); - internal Func> GetTasks = GetTaskList; - internal Action LogException = Debug.LogException; - internal Action LogError = Debug.LogError; - internal Action ReportRunFailed = CallbacksDelegator.instance.RunFailed; - - private TestJobData m_JobData; - private TestTaskBase[] Tasks; - private IEnumerator m_Enumerator = null; - - public string RunJob(TestJobData data) - { - if (data == null) - { - throw new ArgumentException(null, nameof(data)); - } - - if (m_JobData != null && m_JobData.isRunning) - { - throw new Exception("TestJobRunner is already running a job."); - } - - if (data.isHandledByRunner) - { - throw new Exception("Test job is already being handled."); - } - - m_JobData = data; - m_JobData.isHandledByRunner = true; - - if (!m_JobData.isRunning) - { - m_JobData.isRunning = true; - SavedTestJobData.Add(m_JobData); - } - - Tasks = GetTasks(data.executionSettings).ToArray(); - if (!data.executionSettings.runSynchronously) - { - SubscribeCallback(ExecuteStep); - } - else - { - while (data.isRunning) - { - ExecuteStep(); - } - } - - return data.guid; - } - - private void ExecuteStep() - { - try - { - if (m_JobData.taskIndex >= Tasks.Length) - { - StopRun(); - return; - } - - if (m_Enumerator == null) - { - var task = Tasks[m_JobData.taskIndex]; - m_Enumerator = task.Execute(m_JobData); - if (task.SupportsResumingEnumerator) - { - PcHelper.SetEnumeratorPC(m_Enumerator, m_JobData.taskPC); - } - } - - if (!m_Enumerator.MoveNext()) - { - m_JobData.taskIndex++; - m_JobData.taskPC = 0; - m_Enumerator = null; - return; - } - - if (Tasks[m_JobData.taskIndex].SupportsResumingEnumerator) - { - m_JobData.taskPC = PcHelper.GetEnumeratorPC(m_Enumerator); - } - } - catch (TestRunCanceledException) - { - StopRun(); - } - catch (AggregateException ex) - { - StopRun(); - LogError(ex.Message); - foreach (var innerException in ex.InnerExceptions) - { - LogException(innerException); - } - ReportRunFailed("Multiple unexpected errors happened while running tests."); - } - catch (Exception ex) - { - StopRun(); - LogException(ex); - ReportRunFailed("An unexpected error happened while running tests."); - } - } - - private void StopRun() - { - m_JobData.isRunning = false; - UnsubscribeCallback(ExecuteStep); - SavedTestJobData.Remove(m_JobData); - } - } -} \ No newline at end of file diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobRunner.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobRunner.cs.meta deleted file mode 100644 index bb3f48d..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestJobRunner.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0b677ddfd54046c498a20446baa4f932 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestRunCanceledException.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestRunCanceledException.cs deleted file mode 100644 index faf67f6..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestRunCanceledException.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; - -namespace UnityEditor.TestTools.TestRunner.TestRun -{ - internal class TestRunCanceledException : Exception - { - - } -} \ No newline at end of file diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestRunCanceledException.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestRunCanceledException.cs.meta deleted file mode 100644 index bf2f3f0..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRun/TestRunCanceledException.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1d45b9d3cf85bee4f99c1492fca8438a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -- cgit v1.2.3