From 7c1e566113d59699af1624186c64eca67f063fc6 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Mon, 20 Apr 2020 19:09:33 -0400 Subject: Upgraded Unity --- .../Attributes/ConditionalIgnoreAttribute.cs | 36 -------------- .../Attributes/ConditionalIgnoreAttribute.cs.meta | 11 ----- .../NUnitExtensions/Attributes/TestEnumerator.cs | 52 -------------------- .../Attributes/TestEnumerator.cs.meta | 11 ----- .../Attributes/TestMustExpectAllLogsAttribute.cs | 28 ----------- .../TestMustExpectAllLogsAttribute.cs.meta | 11 ----- .../Attributes/UnityCombinatorialStrategy.cs | 20 -------- .../Attributes/UnityCombinatorialStrategy.cs.meta | 11 ----- .../Attributes/UnityPlatformAttribute.cs | 56 ---------------------- .../Attributes/UnityPlatformAttribute.cs.meta | 11 ----- .../Attributes/UnitySetUpAttribute.cs | 10 ---- .../Attributes/UnitySetUpAttribute.cs.meta | 11 ----- .../Attributes/UnityTearDownAttribute.cs | 10 ---- .../Attributes/UnityTearDownAttribute.cs.meta | 11 ----- .../Attributes/UnityTestAttribute.cs | 33 ------------- .../Attributes/UnityTestAttribute.cs.meta | 11 ----- 16 files changed, 333 deletions(-) delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/ConditionalIgnoreAttribute.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/ConditionalIgnoreAttribute.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/TestEnumerator.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/TestEnumerator.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/TestMustExpectAllLogsAttribute.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/TestMustExpectAllLogsAttribute.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityCombinatorialStrategy.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityCombinatorialStrategy.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityPlatformAttribute.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityPlatformAttribute.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnitySetUpAttribute.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnitySetUpAttribute.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityTearDownAttribute.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityTearDownAttribute.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityTestAttribute.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityTestAttribute.cs.meta (limited to 'Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes') diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/ConditionalIgnoreAttribute.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/ConditionalIgnoreAttribute.cs deleted file mode 100644 index 3cf9714..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/ConditionalIgnoreAttribute.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Collections.Generic; -using NUnit.Framework; -using NUnit.Framework.Interfaces; -using NUnit.Framework.Internal; - -namespace UnityEngine.TestTools -{ - public class ConditionalIgnoreAttribute : NUnitAttribute, IApplyToTest - { - string m_ConditionKey; - string m_IgnoreReason; - - public ConditionalIgnoreAttribute(string conditionKey, string ignoreReason) - { - m_ConditionKey = conditionKey; - m_IgnoreReason = ignoreReason; - } - - public void ApplyToTest(Test test) - { - var key = m_ConditionKey.ToLowerInvariant(); - if (m_ConditionMap.ContainsKey(key) && m_ConditionMap[key]) - { - test.RunState = RunState.Ignored; - string skipReason = string.Format(m_IgnoreReason); - test.Properties.Add(PropertyNames.SkipReason, skipReason); - } - } - - static Dictionary m_ConditionMap = new Dictionary(); - public static void AddConditionalIgnoreMapping(string key, bool value) - { - m_ConditionMap.Add(key.ToLowerInvariant(), value); - } - } -} \ No newline at end of file diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/ConditionalIgnoreAttribute.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/ConditionalIgnoreAttribute.cs.meta deleted file mode 100644 index b1601ee..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/ConditionalIgnoreAttribute.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c82a8473f4a8f7b42a004c91e06d2f2b -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/UnityEngine.TestRunner/NUnitExtensions/Attributes/TestEnumerator.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/TestEnumerator.cs deleted file mode 100644 index 18bb46c..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/TestEnumerator.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System; -using System.Collections; -using NUnit.Framework; -using NUnit.Framework.Interfaces; -using NUnit.Framework.Internal; - -namespace UnityEngine.TestTools -{ - internal class TestEnumerator - { - private readonly ITestExecutionContext m_Context; - private static IEnumerator m_TestEnumerator; - - public static IEnumerator Enumerator { get { return m_TestEnumerator; } } - - public TestEnumerator(ITestExecutionContext context, IEnumerator testEnumerator) - { - m_Context = context; - m_TestEnumerator = testEnumerator; - } - - public IEnumerator Execute() - { - m_Context.CurrentResult.SetResult(ResultState.Success); - - while (true) - { - object current = null; - try - { - if (!m_TestEnumerator.MoveNext()) - { - yield break; - } - - if (!m_Context.CurrentResult.ResultState.Equals(ResultState.Success)) - { - yield break; - } - - current = m_TestEnumerator.Current; - } - catch (Exception exception) - { - m_Context.CurrentResult.RecordException(exception); - yield break; - } - yield return current; - } - } - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/TestEnumerator.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/TestEnumerator.cs.meta deleted file mode 100644 index 3a6022e..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/TestEnumerator.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 750aad009559b814dbc27001341fc1c3 -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/UnityEngine.TestRunner/NUnitExtensions/Attributes/TestMustExpectAllLogsAttribute.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/TestMustExpectAllLogsAttribute.cs deleted file mode 100644 index 8f2ea0f..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/TestMustExpectAllLogsAttribute.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; - -namespace UnityEngine.TestTools -{ - /// - /// The presence of this attribute will cause the test runner to require that every single log is expected. By - /// default, the runner will only automatically fail on any error logs, so this adds warnings and infos as well. - /// It is the same as calling `LogAssert.NoUnexpectedReceived()` at the bottom of every affected test. - /// - /// This attribute can be applied to test assemblies (will affect every test in the assembly), fixtures (will - /// affect every test in the fixture), or on individual test methods. It is also automatically inherited from base - /// fixtures. - /// - /// The MustExpect property (on by default) lets you selectively enable or disable the higher level value. For - /// example when migrating an assembly to this more strict checking method, you might attach - /// `[assembly:TestMustExpectAllLogs]` to the assembly itself, but then whitelist failing fixtures and test methods - /// with `[TestMustExpectAllLogs(MustExpect=false)]` until they can be migrated. This also means new tests in that - /// assembly would be required to have the more strict checking. - /// - [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] - public class TestMustExpectAllLogsAttribute : Attribute - { - public TestMustExpectAllLogsAttribute(bool mustExpect = true) - => MustExpect = mustExpect; - - public bool MustExpect { get; } - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/TestMustExpectAllLogsAttribute.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/TestMustExpectAllLogsAttribute.cs.meta deleted file mode 100644 index 6ae8514..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/TestMustExpectAllLogsAttribute.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3803f736886e77842995ddbc3531afaa -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/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityCombinatorialStrategy.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityCombinatorialStrategy.cs deleted file mode 100644 index 144f78c..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityCombinatorialStrategy.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using NUnit.Framework.Interfaces; -using NUnit.Framework.Internal.Builders; - -namespace UnityEngine.TestTools -{ - internal class UnityCombinatorialStrategy : CombinatorialStrategy, ICombiningStrategy - { - public new IEnumerable GetTestCases(IEnumerable[] sources) - { - var testCases = base.GetTestCases(sources); - foreach (var testCase in testCases) - { - testCase.GetType().GetProperty("ExpectedResult").SetValue(testCase, new object(), null); - } - return testCases; - } - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityCombinatorialStrategy.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityCombinatorialStrategy.cs.meta deleted file mode 100644 index 422dd17..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityCombinatorialStrategy.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7af6ac3e6b51b8d4aab04adc85b8de2f -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/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityPlatformAttribute.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityPlatformAttribute.cs deleted file mode 100644 index 68f7816..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityPlatformAttribute.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using NUnit.Framework; -using NUnit.Framework.Interfaces; -using NUnit.Framework.Internal; - -namespace UnityEngine.TestTools -{ - [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true, Inherited = false)] - public class UnityPlatformAttribute : NUnitAttribute, IApplyToTest - { - public RuntimePlatform[] include { get; set; } - public RuntimePlatform[] exclude { get; set; } - - private string m_skippedReason; - - public UnityPlatformAttribute() - { - include = new List().ToArray(); - exclude = new List().ToArray(); - } - - public UnityPlatformAttribute(params RuntimePlatform[] include) - : this() - { - this.include = include; - } - - public void ApplyToTest(Test test) - { - if (test.RunState == RunState.NotRunnable || test.RunState == RunState.Ignored || IsPlatformSupported(Application.platform)) - { - return; - } - test.RunState = RunState.Skipped; - test.Properties.Add("_SKIPREASON", m_skippedReason); - } - - internal bool IsPlatformSupported(RuntimePlatform testTargetPlatform) - { - if (include.Any() && !include.Any(x => x == testTargetPlatform)) - { - m_skippedReason = string.Format("Only supported on {0}", string.Join(", ", include.Select(x => x.ToString()).ToArray())); - return false; - } - - if (exclude.Any(x => x == testTargetPlatform)) - { - m_skippedReason = string.Format("Not supported on {0}", string.Join(", ", include.Select(x => x.ToString()).ToArray())); - return false; - } - return true; - } - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityPlatformAttribute.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityPlatformAttribute.cs.meta deleted file mode 100644 index bb41d89..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityPlatformAttribute.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5440c1153b397e14c9c7b1d6eb83b9f9 -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/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnitySetUpAttribute.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnitySetUpAttribute.cs deleted file mode 100644 index cdb8a82..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnitySetUpAttribute.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using NUnit.Framework; - -namespace UnityEngine.TestTools -{ - [AttributeUsage(AttributeTargets.Method)] - public class UnitySetUpAttribute : NUnitAttribute - { - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnitySetUpAttribute.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnitySetUpAttribute.cs.meta deleted file mode 100644 index 1668931..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnitySetUpAttribute.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cc6401f13df54ba44bfd7cdc93c7d64d -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/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityTearDownAttribute.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityTearDownAttribute.cs deleted file mode 100644 index d159d39..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityTearDownAttribute.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using NUnit.Framework; - -namespace UnityEngine.TestTools -{ - [AttributeUsage(AttributeTargets.Method)] - public class UnityTearDownAttribute : NUnitAttribute - { - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityTearDownAttribute.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityTearDownAttribute.cs.meta deleted file mode 100644 index 169eefb..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityTearDownAttribute.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 600f4b74746dbf944901257f81a8af6d -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/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityTestAttribute.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityTestAttribute.cs deleted file mode 100644 index 5d2b5f1..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityTestAttribute.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using NUnit.Framework; -using NUnit.Framework.Internal.Commands; -using NUnit.Framework.Interfaces; -using NUnit.Framework.Internal; -using NUnit.Framework.Internal.Builders; -using UnityEngine.TestRunner.NUnitExtensions.Runner; - -namespace UnityEngine.TestTools -{ - [AttributeUsage(AttributeTargets.Method)] - public class UnityTestAttribute : CombiningStrategyAttribute, ISimpleTestBuilder, IImplyFixture - { - public UnityTestAttribute() : base(new UnityCombinatorialStrategy(), new ParameterDataSourceProvider()) {} - - private readonly NUnitTestCaseBuilder _builder = new NUnitTestCaseBuilder(); - - TestMethod ISimpleTestBuilder.BuildFrom(IMethodInfo method, Test suite) - { - TestCaseParameters parms = new TestCaseParameters - { - ExpectedResult = new object(), - HasExpectedResult = true - }; - - var t = _builder.BuildTestMethod(method, suite, parms); - - if (t.parms != null) - t.parms.HasExpectedResult = false; - return t; - } - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityTestAttribute.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityTestAttribute.cs.meta deleted file mode 100644 index a7572d4..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/NUnitExtensions/Attributes/UnityTestAttribute.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fedb0f9e5006b1943abae52f52f08a1a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -- cgit v1.2.3