From 7c1e566113d59699af1624186c64eca67f063fc6 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Mon, 20 Apr 2020 19:09:33 -0400 Subject: Upgraded Unity --- .../TestRunner/Messages/EnterPlayMode.cs | 39 -------------- .../TestRunner/Messages/EnterPlayMode.cs.meta | 11 ---- .../TestRunner/Messages/ExitPlayMode.cs | 32 ----------- .../TestRunner/Messages/ExitPlayMode.cs.meta | 11 ---- .../TestRunner/Messages/RecompileScripts.cs | 63 ---------------------- .../TestRunner/Messages/RecompileScripts.cs.meta | 11 ---- .../TestRunner/Messages/WaitForDomainReload.cs | 44 --------------- .../Messages/WaitForDomainReload.cs.meta | 11 ---- 8 files changed, 222 deletions(-) delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/EnterPlayMode.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/EnterPlayMode.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/ExitPlayMode.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/ExitPlayMode.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/RecompileScripts.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/RecompileScripts.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/WaitForDomainReload.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/WaitForDomainReload.cs.meta (limited to 'Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages') diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/EnterPlayMode.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/EnterPlayMode.cs deleted file mode 100644 index e1ad8c7..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/EnterPlayMode.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections; -using UnityEditor; - -namespace UnityEngine.TestTools -{ - public class EnterPlayMode : IEditModeTestYieldInstruction - { - public bool ExpectDomainReload { get; } - public bool ExpectedPlaymodeState { get; private set; } - - public EnterPlayMode(bool expectDomainReload = true) - { - ExpectDomainReload = expectDomainReload; - } - - public IEnumerator Perform() - { - if (EditorApplication.isPlaying) - { - throw new Exception("Editor is already in PlayMode"); - } - if (EditorUtility.scriptCompilationFailed) - { - throw new Exception("Script compilation failed"); - } - yield return null; - ExpectedPlaymodeState = true; - - EditorApplication.UnlockReloadAssemblies(); - EditorApplication.isPlaying = true; - - while (!EditorApplication.isPlaying) - { - yield return null; - } - } - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/EnterPlayMode.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/EnterPlayMode.cs.meta deleted file mode 100644 index f1775e7..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/EnterPlayMode.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9bd5a110ed89025499ddee8c7e73778e -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/TestRunner/Messages/ExitPlayMode.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/ExitPlayMode.cs deleted file mode 100644 index 85ef889..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/ExitPlayMode.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections; -using UnityEditor; - -namespace UnityEngine.TestTools -{ - public class ExitPlayMode : IEditModeTestYieldInstruction - { - public bool ExpectDomainReload { get; } - public bool ExpectedPlaymodeState { get; private set; } - - public ExitPlayMode() - { - ExpectDomainReload = false; - ExpectedPlaymodeState = false; - } - - public IEnumerator Perform() - { - if (!EditorApplication.isPlayingOrWillChangePlaymode) - { - throw new Exception("Editor is already in EditMode"); - } - - EditorApplication.isPlaying = false; - while (EditorApplication.isPlaying) - { - yield return null; - } - } - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/ExitPlayMode.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/ExitPlayMode.cs.meta deleted file mode 100644 index 19c058a..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/ExitPlayMode.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 408674d91d506a54aac9a7f07951c018 -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/TestRunner/Messages/RecompileScripts.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/RecompileScripts.cs deleted file mode 100644 index 96dc8f3..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/RecompileScripts.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System; -using System.Collections; -using UnityEditor; - -namespace UnityEngine.TestTools -{ - public class RecompileScripts : IEditModeTestYieldInstruction - { - public RecompileScripts() : this(true) - { - } - - public RecompileScripts(bool expectScriptCompilation) : this(expectScriptCompilation, true) - { - } - - public RecompileScripts(bool expectScriptCompilation, bool expectScriptCompilationSuccess) - { - ExpectScriptCompilation = expectScriptCompilation; - ExpectScriptCompilationSuccess = expectScriptCompilationSuccess; - ExpectDomainReload = true; - } - - public bool ExpectDomainReload { get; private set; } - public bool ExpectedPlaymodeState { get; } - public bool ExpectScriptCompilation { get; private set; } - public bool ExpectScriptCompilationSuccess { get; private set; } - public static RecompileScripts Current { get; private set; } - - public IEnumerator Perform() - { - Current = this; - - // We need to yield, to give the test runner a chance to prepare for the domain reload - // If the script compilation happens very fast, then EditModeRunner.MoveNextAndUpdateYieldObject will not have a chance to set m_CurrentYieldObject - // This really should be fixed in EditModeRunner.MoveNextAndUpdateYieldObject - yield return null; - - AssetDatabase.Refresh(); - - if (ExpectScriptCompilation && !EditorApplication.isCompiling) - { - Current = null; - throw new Exception("Editor does not need to recompile scripts"); - } - - EditorApplication.UnlockReloadAssemblies(); - - while (EditorApplication.isCompiling) - { - yield return null; - } - - Current = null; - - if (ExpectScriptCompilationSuccess && EditorUtility.scriptCompilationFailed) - { - EditorApplication.LockReloadAssemblies(); - throw new Exception("Script compilation failed"); - } - } - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/RecompileScripts.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/RecompileScripts.cs.meta deleted file mode 100644 index 07895f3..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/RecompileScripts.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9202fbba95ea8294cb5e718f028f21b0 -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/TestRunner/Messages/WaitForDomainReload.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/WaitForDomainReload.cs deleted file mode 100644 index 19920a1..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/WaitForDomainReload.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Collections; -using UnityEditor; - -namespace UnityEngine.TestTools -{ - public class WaitForDomainReload : IEditModeTestYieldInstruction - { - public WaitForDomainReload() - { - ExpectDomainReload = true; - } - - public bool ExpectDomainReload { get;  } - public bool ExpectedPlaymodeState { get; } - - public IEnumerator Perform() - { - EditorApplication.UnlockReloadAssemblies(); - - // Detect if AssetDatabase.Refresh was called (true) or if it will be called on next tick - bool isAsync = EditorApplication.isCompiling; - - yield return null; - - if (!isAsync) - { - EditorApplication.LockReloadAssemblies(); - throw new Exception("Expected domain reload, but it did not occur"); - } - - while (EditorApplication.isCompiling) - { - yield return null; - } - - if (EditorUtility.scriptCompilationFailed) - { - EditorApplication.LockReloadAssemblies(); - throw new Exception("Script compilation failed"); - } - } - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/WaitForDomainReload.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/WaitForDomainReload.cs.meta deleted file mode 100644 index b827ea8..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestRunner/Messages/WaitForDomainReload.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5df3c21c5237c994db89660fbdfee07d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -- cgit v1.2.3