From 7c1e566113d59699af1624186c64eca67f063fc6 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Mon, 20 Apr 2020 19:09:33 -0400 Subject: Upgraded Unity --- .../RemoteHelpers/IRemoteTestResultDataFactory.cs | 11 ----- .../IRemoteTestResultDataFactory.cs.meta | 11 ----- .../RemoteHelpers/PlayerConnectionMessageIds.cs | 14 ------ .../PlayerConnectionMessageIds.cs.meta | 11 ----- .../TestRunner/RemoteHelpers/RemoteTestData.cs | 56 ---------------------- .../RemoteHelpers/RemoteTestData.cs.meta | 11 ----- .../RemoteHelpers/RemoteTestResultData.cs | 54 --------------------- .../RemoteHelpers/RemoteTestResultData.cs.meta | 11 ----- .../RemoteHelpers/RemoteTestResultDataFactory.cs | 51 -------------------- .../RemoteTestResultDataFactory.cs.meta | 11 ----- .../RemoteTestResultDataWithTestData.cs | 15 ------ .../RemoteTestResultDataWithTestData.cs.meta | 11 ----- 12 files changed, 267 deletions(-) delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/IRemoteTestResultDataFactory.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/IRemoteTestResultDataFactory.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/PlayerConnectionMessageIds.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/PlayerConnectionMessageIds.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestData.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestData.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultData.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultData.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultDataFactory.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultDataFactory.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultDataWithTestData.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultDataWithTestData.cs.meta (limited to 'Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers') diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/IRemoteTestResultDataFactory.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/IRemoteTestResultDataFactory.cs deleted file mode 100644 index 1032e6a..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/IRemoteTestResultDataFactory.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using NUnit.Framework.Interfaces; - -namespace UnityEngine.TestRunner.TestLaunchers -{ - internal interface IRemoteTestResultDataFactory - { - RemoteTestResultDataWithTestData CreateFromTestResult(ITestResult result); - RemoteTestResultDataWithTestData CreateFromTest(ITest test); - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/IRemoteTestResultDataFactory.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/IRemoteTestResultDataFactory.cs.meta deleted file mode 100644 index 173f175..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/IRemoteTestResultDataFactory.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 874c0713cdc44f549b0161750b48d2c2 -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/TestRunner/RemoteHelpers/PlayerConnectionMessageIds.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/PlayerConnectionMessageIds.cs deleted file mode 100644 index 58f6263..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/PlayerConnectionMessageIds.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; - -namespace UnityEngine.TestRunner.TestLaunchers -{ - internal static class PlayerConnectionMessageIds - { - public static Guid runStartedMessageId { get { return new Guid("6a7f53dd-4672-461d-a7b5-9467e9393fd3"); } } - public static Guid runFinishedMessageId { get { return new Guid("ffb622fc-34ad-4901-8d7b-47fb04b0bdd4"); } } - public static Guid testStartedMessageId { get { return new Guid("b54d241e-d88d-4dba-8c8f-ee415d11c030"); } } - public static Guid testFinishedMessageId { get { return new Guid("72f7b7f4-6829-4cd1-afde-78872b9d5adc"); } } - public static Guid quitPlayerMessageId { get { return new Guid("ab44bfe0-bb50-4ee6-9977-69d2ea6bb3a0"); } } - public static Guid playerAliveHeartbeat { get { return new Guid("8c0c307b-f7fd-4216-8623-35b4b3f55fb6"); } } - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/PlayerConnectionMessageIds.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/PlayerConnectionMessageIds.cs.meta deleted file mode 100644 index 1b606e4..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/PlayerConnectionMessageIds.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 41d60936b62cc6d4ca7fe628b22b0e40 -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/TestRunner/RemoteHelpers/RemoteTestData.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestData.cs deleted file mode 100644 index eaf7078..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestData.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Linq; -using NUnit.Framework.Interfaces; -using NUnit.Framework.Internal; -using UnityEngine.TestRunner.NUnitExtensions; - -namespace UnityEngine.TestRunner.TestLaunchers -{ - [Serializable] - internal class RemoteTestData - { - public string id; - public string name; - public string fullName; - public int testCaseCount; - public int ChildIndex; - public bool hasChildren; - public bool isSuite; - public string[] childrenIds; - public int testCaseTimeout; - public string[] Categories; - public bool IsTestAssembly; - public RunState RunState; - public string Description; - public string SkipReason; - public string ParentId; - public string UniqueName; - public string ParentUniqueName; - public string ParentFullName; - - internal RemoteTestData(ITest test) - { - id = test.Id; - name = test.Name; - fullName = test.FullName; - testCaseCount = test.TestCaseCount; - ChildIndex = -1; - if (test.Properties["childIndex"].Count > 0) - { - ChildIndex = (int)test.Properties["childIndex"][0]; - } - hasChildren = test.HasChildren; - isSuite = test.IsSuite; - childrenIds = test.Tests.Select(t => t.Id).ToArray(); - Categories = test.GetAllCategoriesFromTest().ToArray(); - IsTestAssembly = test is TestAssembly; - RunState = (RunState)Enum.Parse(typeof(RunState), test.RunState.ToString()); - Description = (string)test.Properties.Get(PropertyNames.Description); - SkipReason = test.GetSkipReason(); - ParentId = test.GetParentId(); - UniqueName = test.GetUniqueName(); - ParentUniqueName = test.GetParentUniqueName(); - ParentFullName = test.GetParentFullName(); - } - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestData.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestData.cs.meta deleted file mode 100644 index 34b9c5a..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestData.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b135ec222fdcd11468014c90d11d6821 -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/TestRunner/RemoteHelpers/RemoteTestResultData.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultData.cs deleted file mode 100644 index a0a34c3..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultData.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using NUnit.Framework.Interfaces; - -namespace UnityEngine.TestRunner.TestLaunchers -{ - [Serializable] - internal class RemoteTestResultData - { - public string testId; - public string name; - public string fullName; - public string resultState; - public TestStatus testStatus; - public double duration; - public DateTime startTime; - public DateTime endTime; - public string message; - public string stackTrace; - public int assertCount; - public int failCount; - public int passCount; - public int skipCount; - public int inconclusiveCount; - public bool hasChildren; - public string output; - public string xml; - public string[] childrenIds; - - internal RemoteTestResultData(ITestResult result) - { - testId = result.Test.Id; - name = result.Name; - fullName = result.FullName; - resultState = result.ResultState.ToString(); - testStatus = result.ResultState.Status; - duration = result.Duration; - startTime = result.StartTime; - endTime = result.EndTime; - message = result.Message; - stackTrace = result.StackTrace; - assertCount = result.AssertCount; - failCount = result.FailCount; - passCount = result.PassCount; - skipCount = result.SkipCount; - inconclusiveCount = result.InconclusiveCount; - hasChildren = result.HasChildren; - output = result.Output; - xml = result.ToXml(true).OuterXml; - childrenIds = result.Children.Select(child => child.Test.Id).ToArray(); - } - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultData.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultData.cs.meta deleted file mode 100644 index 247a8a3..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultData.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 03e4d63665d06f04c8a6cf68133c1592 -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/TestRunner/RemoteHelpers/RemoteTestResultDataFactory.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultDataFactory.cs deleted file mode 100644 index 356a39d..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultDataFactory.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using NUnit.Framework.Interfaces; -using UnityEngine.TestRunner.NUnitExtensions.Runner; - -namespace UnityEngine.TestRunner.TestLaunchers -{ - internal class RemoteTestResultDataFactory : IRemoteTestResultDataFactory - { - public RemoteTestResultDataWithTestData CreateFromTestResult(ITestResult result) - { - var tests = CreateTestDataList(result.Test); - tests.First().testCaseTimeout = UnityTestExecutionContext.CurrentContext.TestCaseTimeout; - return new RemoteTestResultDataWithTestData() - { - results = CreateTestResultDataList(result), - tests = tests - }; - } - - public RemoteTestResultDataWithTestData CreateFromTest(ITest test) - { - var tests = CreateTestDataList(test); - if (UnityTestExecutionContext.CurrentContext != null) - { - tests.First().testCaseTimeout = UnityTestExecutionContext.CurrentContext.TestCaseTimeout; - } - - return new RemoteTestResultDataWithTestData() - { - tests = tests - }; - } - - private RemoteTestData[] CreateTestDataList(ITest test) - { - var list = new List(); - list.Add(new RemoteTestData(test)); - list.AddRange(test.Tests.SelectMany(CreateTestDataList)); - return list.ToArray(); - } - - private static RemoteTestResultData[] CreateTestResultDataList(ITestResult result) - { - var list = new List(); - list.Add(new RemoteTestResultData(result)); - list.AddRange(result.Children.SelectMany(CreateTestResultDataList)); - return list.ToArray(); - } - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultDataFactory.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultDataFactory.cs.meta deleted file mode 100644 index 575b017..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultDataFactory.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 826b6becaef90fb458eedebe4c2f3664 -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/TestRunner/RemoteHelpers/RemoteTestResultDataWithTestData.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultDataWithTestData.cs deleted file mode 100644 index 5b28f49..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultDataWithTestData.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using NUnit.Framework.Interfaces; -using UnityEngine.TestRunner.NUnitExtensions.Runner; - -namespace UnityEngine.TestRunner.TestLaunchers -{ - [Serializable] - internal class RemoteTestResultDataWithTestData - { - public RemoteTestResultData[] results; - public RemoteTestData[] tests; - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultDataWithTestData.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultDataWithTestData.cs.meta deleted file mode 100644 index ea1a860..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/TestRunner/RemoteHelpers/RemoteTestResultDataWithTestData.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 475e3699f219c854f8581a9838135002 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -- cgit v1.2.3