From 7c1e566113d59699af1624186c64eca67f063fc6 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Mon, 20 Apr 2020 19:09:33 -0400 Subject: Upgraded Unity --- .../TestSettings/ITestSettings.cs | 22 --- .../TestSettings/ITestSettings.cs.meta | 11 -- .../TestSettings/ITestSettingsDeserializer.cs | 7 - .../TestSettings/ITestSettingsDeserializer.cs.meta | 11 -- .../TestSettings/TestSettings.cs | 160 --------------------- .../TestSettings/TestSettings.cs.meta | 11 -- .../TestSettings/TestSettingsDeserializer.cs | 130 ----------------- .../TestSettings/TestSettingsDeserializer.cs.meta | 11 -- 8 files changed, 363 deletions(-) delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/ITestSettings.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/ITestSettings.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/ITestSettingsDeserializer.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/ITestSettingsDeserializer.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/TestSettings.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/TestSettings.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/TestSettingsDeserializer.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/TestSettingsDeserializer.cs.meta (limited to 'Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings') diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/ITestSettings.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/ITestSettings.cs deleted file mode 100644 index f5b97a4..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/ITestSettings.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; - -namespace UnityEditor.TestTools.TestRunner -{ - internal interface ITestSettings : IDisposable - { - ScriptingImplementation? scriptingBackend { get; set; } - - string Architecture { get; set; } - - ApiCompatibilityLevel? apiProfile { get; set; } - - bool? appleEnableAutomaticSigning { get; set; } - string appleDeveloperTeamID { get; set; } - ProvisioningProfileType? iOSManualProvisioningProfileType { get; set; } - string iOSManualProvisioningProfileID { get; set; } - ProvisioningProfileType? tvOSManualProvisioningProfileType { get; set; } - string tvOSManualProvisioningProfileID { get; set; } - - void SetupProjectParameters(); - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/ITestSettings.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/ITestSettings.cs.meta deleted file mode 100644 index bcdad73..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/ITestSettings.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 83eda34b7da01e04aa894f268158b0c0 -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/TestSettings/ITestSettingsDeserializer.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/ITestSettingsDeserializer.cs deleted file mode 100644 index ac3845e..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/ITestSettingsDeserializer.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace UnityEditor.TestTools.TestRunner -{ - interface ITestSettingsDeserializer - { - ITestSettings GetSettingsFromJsonFile(string jsonFilePath); - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/ITestSettingsDeserializer.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/ITestSettingsDeserializer.cs.meta deleted file mode 100644 index 57ca510..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/ITestSettingsDeserializer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d208a1684f8aa6a40ad91d6aa9600c14 -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/TestSettings/TestSettings.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/TestSettings.cs deleted file mode 100644 index 6964d22..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/TestSettings.cs +++ /dev/null @@ -1,160 +0,0 @@ -using System; - -namespace UnityEditor.TestTools.TestRunner -{ - internal class TestSettings : ITestSettings - { - private readonly TestSetting[] m_Settings = - { - new TestSetting( - settings => settings.scriptingBackend, - () => PlayerSettings.GetScriptingBackend(EditorUserBuildSettings.activeBuildTargetGroup), - implementation => PlayerSettings.SetScriptingBackend(EditorUserBuildSettings.activeBuildTargetGroup, implementation.Value)), - new TestSetting( - settings => settings.Architecture, - () => EditorUserBuildSettings.activeBuildTarget == BuildTarget.Android ? PlayerSettings.Android.targetArchitectures.ToString() : null, - architecture => - { - if (EditorUserBuildSettings.activeBuildTarget == BuildTarget.Android) - { - if (!string.IsNullOrEmpty(architecture)) - { - var targetArchitectures = (AndroidArchitecture)Enum.Parse(typeof(AndroidArchitecture), architecture, true); - PlayerSettings.Android.targetArchitectures = targetArchitectures; - } - } - }), - new TestSetting( - settings => settings.apiProfile, - () => PlayerSettings.GetApiCompatibilityLevel(EditorUserBuildSettings.activeBuildTargetGroup), - implementation => - { - if (Enum.IsDefined(typeof(ApiCompatibilityLevel), implementation.Value)) - { - PlayerSettings.SetApiCompatibilityLevel(EditorUserBuildSettings.activeBuildTargetGroup, - implementation.Value); - } - }), - new TestSetting( - settings => settings.appleEnableAutomaticSigning, - () => PlayerSettings.iOS.appleEnableAutomaticSigning, - enableAutomaticSigning => - { - if (enableAutomaticSigning != null) - PlayerSettings.iOS.appleEnableAutomaticSigning = enableAutomaticSigning.Value; - }), - new TestSetting( - settings => settings.appleDeveloperTeamID, - () => PlayerSettings.iOS.appleDeveloperTeamID, - developerTeam => - { - if (developerTeam != null) - PlayerSettings.iOS.appleDeveloperTeamID = developerTeam; - }), - new TestSetting( - settings => settings.iOSManualProvisioningProfileType, - () => PlayerSettings.iOS.iOSManualProvisioningProfileType, - profileType => - { - if (profileType != null) - PlayerSettings.iOS.iOSManualProvisioningProfileType = profileType.Value; - }), - new TestSetting( - settings => settings.iOSManualProvisioningProfileID, - () => PlayerSettings.iOS.iOSManualProvisioningProfileID, - provisioningUUID => - { - if (provisioningUUID != null) - PlayerSettings.iOS.iOSManualProvisioningProfileID = provisioningUUID; - }), - new TestSetting( - settings => settings.tvOSManualProvisioningProfileType, - () => PlayerSettings.iOS.tvOSManualProvisioningProfileType, - profileType => - { - if (profileType != null) - PlayerSettings.iOS.tvOSManualProvisioningProfileType = profileType.Value; - }), - new TestSetting( - settings => settings.tvOSManualProvisioningProfileID, - () => PlayerSettings.iOS.tvOSManualProvisioningProfileID, - provisioningUUID => - { - if (provisioningUUID != null) - PlayerSettings.iOS.tvOSManualProvisioningProfileID = provisioningUUID; - }), - }; - - private bool m_Disposed; - - public ScriptingImplementation? scriptingBackend { get; set; } - - public string Architecture { get; set; } - - public ApiCompatibilityLevel? apiProfile { get; set; } - - public bool? appleEnableAutomaticSigning { get; set; } - public string appleDeveloperTeamID { get; set; } - public ProvisioningProfileType? iOSManualProvisioningProfileType { get; set; } - public string iOSManualProvisioningProfileID { get; set; } - public ProvisioningProfileType? tvOSManualProvisioningProfileType { get; set; } - public string tvOSManualProvisioningProfileID { get; set; } - - public void Dispose() - { - if (!m_Disposed) - { - foreach (var testSetting in m_Settings) - { - testSetting.Cleanup(); - } - - m_Disposed = true; - } - } - - public void SetupProjectParameters() - { - foreach (var testSetting in m_Settings) - { - testSetting.Setup(this); - } - } - - private abstract class TestSetting - { - public abstract void Setup(TestSettings settings); - public abstract void Cleanup(); - } - - private class TestSetting : TestSetting - { - private T m_ValueBeforeSetup; - private Func m_GetFromSettings; - private Func m_GetCurrentValue; - private Action m_SetValue; - - public TestSetting(Func getFromSettings, Func getCurrentValue, Action setValue) - { - m_GetFromSettings = getFromSettings; - m_GetCurrentValue = getCurrentValue; - m_SetValue = setValue; - } - - public override void Setup(TestSettings settings) - { - m_ValueBeforeSetup = m_GetCurrentValue(); - var newValue = m_GetFromSettings(settings); - if (newValue != null) - { - m_SetValue(newValue); - } - } - - public override void Cleanup() - { - m_SetValue(m_ValueBeforeSetup); - } - } - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/TestSettings.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/TestSettings.cs.meta deleted file mode 100644 index 37a7522..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/TestSettings.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6b32b6725087a0d4bb1670818d26996e -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/TestSettings/TestSettingsDeserializer.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/TestSettingsDeserializer.cs deleted file mode 100644 index c59ec57..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/TestSettingsDeserializer.cs +++ /dev/null @@ -1,130 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using UnityEngine; - -namespace UnityEditor.TestTools.TestRunner -{ - /// - /// Handles deserialization of TestSettings from a provided json file path. - /// - internal class TestSettingsDeserializer : ITestSettingsDeserializer - { - private static readonly SettingsMap[] s_SettingsMapping = - { - new SettingsMap("scriptingBackend", (settings, value) => settings.scriptingBackend = value), - new SettingsMap("architecture", (settings, value) => settings.Architecture = value), - new SettingsMap("apiProfile", (settings, value) => settings.apiProfile = value), - new SettingsMap("appleEnableAutomaticSigning", (settings, value) => settings.appleEnableAutomaticSigning = value), - new SettingsMap("appleDeveloperTeamID", (settings, value) => settings.appleDeveloperTeamID = value), - new SettingsMap("iOSManualProvisioningProfileType", (settings, value) => settings.iOSManualProvisioningProfileType = value), - new SettingsMap("iOSManualProvisioningProfileID", (settings, value) => settings.iOSManualProvisioningProfileID = value), - new SettingsMap("tvOSManualProvisioningProfileType", (settings, value) => settings.tvOSManualProvisioningProfileType = value), - new SettingsMap("tvOSManualProvisioningProfileID", (settings, value) => settings.tvOSManualProvisioningProfileID = value), - }; - - private readonly Func m_TestSettingsFactory; - public TestSettingsDeserializer(Func testSettingsFactory) - { - m_TestSettingsFactory = testSettingsFactory; - } - - public ITestSettings GetSettingsFromJsonFile(string jsonFilePath) - { - var text = File.ReadAllText(jsonFilePath); - var settingsDictionary = Json.Deserialize(text) as Dictionary; - - var testSettings = m_TestSettingsFactory(); - if (settingsDictionary == null) - { - return testSettings; - } - - foreach (var settingsMap in s_SettingsMapping) - { - if (!settingsDictionary.ContainsKey(settingsMap.Key)) - { - continue; - } - - if (settingsMap.Type.IsEnum) - { - SetEnumValue(settingsMap.Key, settingsDictionary[settingsMap.Key], settingsMap.Type, value => settingsMap.ApplyToSettings(testSettings, value)); - } - else - { - SetValue(settingsMap.Key, settingsDictionary[settingsMap.Key], settingsMap.Type, value => settingsMap.ApplyToSettings(testSettings, value)); - } - } - - return testSettings; - } - - private abstract class SettingsMap - { - public string Key { get; } - public Type Type { get; } - protected SettingsMap(string key, Type type) - { - Key = key; - Type = type; - } - - public abstract void ApplyToSettings(ITestSettings settings, object value); - } - - private class SettingsMap : SettingsMap - { - private Action m_Setter; - public SettingsMap(string key, Action setter) : base(key, typeof(T)) - { - m_Setter = setter; - } - - public override void ApplyToSettings(ITestSettings settings, object value) - { - m_Setter(settings, (T)value); - } - } - - private static void SetEnumValue(string key, object value, Type type, Action setter) - { - object enumValue; - if (TryGetEnum(value as string, type, out enumValue)) - { - setter(enumValue); - return; - } - - var acceptedValues = string.Join(", ", Enum.GetValues(type).OfType().Select(val => val.ToString()).ToArray()); - - Debug.LogFormat("Could not convert '{0}' argument '{1}' to a valid {2}. Accepted values: {3}.", key, value, type.Name, acceptedValues); - } - - private static bool TryGetEnum(string value, Type type, out object enumValue) - { - try - { - enumValue = Enum.Parse(type, value, true); - return true; - } - catch (Exception) - { - enumValue = null; - return false; - } - } - - private static void SetValue(string key, object value, Type type, Action setter) - { - if (type.IsInstanceOfType(value)) - { - setter(value); - return; - } - - Debug.LogFormat("Could not convert '{0}' argument '{1}' to a valid {2}.", key, value, type.Name); - } - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/TestSettingsDeserializer.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/TestSettingsDeserializer.cs.meta deleted file mode 100644 index decd785..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEditor.TestRunner/TestSettings/TestSettingsDeserializer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 75e7d7a9a57458841a85fe42d9c9141f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -- cgit v1.2.3