From 88192856a95fbb2961d6c0368147fd597b01d512 Mon Sep 17 00:00:00 2001 From: Christopher Date: Mon, 19 Sep 2016 13:43:08 +0100 Subject: [PATCH 1/3] Fixed missing Process class error in Unity5.5b3 --- Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaEnvironment.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaEnvironment.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaEnvironment.cs index b6e02a41..66c87f53 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaEnvironment.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaEnvironment.cs @@ -5,6 +5,7 @@ using System.Collections; using System.Collections.Generic; using System; +using System.Diagnostics; using System.Linq; using MoonSharp.Interpreter; using MoonSharp.Interpreter.Loaders; From 55193b234928481b41e30b3c7a7605f62da45daf Mon Sep 17 00:00:00 2001 From: Christopher Date: Mon, 19 Sep 2016 14:31:28 +0100 Subject: [PATCH 2/3] Updated project to Unity 5.4.1 --- ProjectSettings/ProjectSettings.asset | 3 +++ ProjectSettings/ProjectVersion.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index b8e98a07..c4884f20 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -74,6 +74,7 @@ PlayerSettings: ignoreAlphaClear: 0 xboxOneResolution: 0 xboxOneMonoLoggingLevel: 0 + xboxOneLoggingLevel: 1 ps3SplashScreen: {fileID: 0} videoMemoryForVertexBuffers: 0 psp2PowerMode: 0 @@ -287,6 +288,7 @@ PlayerSettings: ps4PatchPkgPath: ps4PatchLatestPkgPath: ps4PatchChangeinfoPath: + ps4PatchDayOne: 0 ps4attribUserManagement: 0 ps4attribMoveSupport: 0 ps4attrib3DSupport: 0 @@ -375,6 +377,7 @@ PlayerSettings: tizenSigningProfileName: tizenGPSPermissions: 0 tizenMicrophonePermissions: 0 + tizenMinOSVersion: 0 n3dsUseExtSaveData: 0 n3dsCompressStaticMem: 1 n3dsExtSaveDataNumber: 0x12345 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 069bc88e..96b25e7c 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.4.0f3 +m_EditorVersion: 5.4.1f1 m_StandardAssetsVersion: 0 From ced4d79cff9e387cb990cfa19d0099ad1bc04e17 Mon Sep 17 00:00:00 2001 From: Christopher Date: Mon, 19 Sep 2016 14:42:34 +0100 Subject: [PATCH 3/3] Updated Unity Test Tools --- Assets/UnityTestTools.meta | 2 +- .../Editor/AssertionComponentEditor.cs | 2 +- .../Assertions/MemberResolver.cs | 8 +++---- .../Editor/ResultWriter/XmlResultWriter.cs | 2 +- Assets/UnityTestTools/Common/Settings.meta | 2 +- .../IntegrationTestsRunnerSettings.asset.meta | 2 +- .../Libs/Mono.Cecil.Mdb.dll.meta | 4 ---- .../Libs/Mono.Cecil.dll.meta | 4 ---- .../TestRunner/DTOFormatter.cs | 7 ++++++ .../TestRunner/Editor/Batch.cs | 5 ++--- .../IntegrationTestsHierarchyAnnotation.cs | 1 + .../PlatformRunner/NetworkResultsReceiver.cs | 14 ++++++------ .../Editor/PlatformRunner/PlatformRunner.cs | 10 +-------- .../PlatformRunnerConfiguration.cs | 4 ++-- .../PlatformRunnerSettingsWindow.cs | 22 ++++++++++--------- .../Editor/Renderer/IntegrationTestLine.cs | 14 ++++++------ .../Renderer/IntegrationTestRendererBase.cs | 12 +++++----- .../TestRunner/Editor/TestComponentEditor.cs | 18 +++++++-------- .../TestRunner/TestComponent.cs | 14 ++++++------ .../TestRunner/TestRunnerConfigurator.cs | 3 +-- .../TestingAssets/CubeCollisionFailure.prefab | 8 +++++-- .../TestingAssets/CubeCollisionSuccess.prefab | 8 +++++-- .../TestingAssets/CubeTriggerFailure.prefab | 8 +++++-- .../TestingAssets/CubeTriggerSuccess.prefab | 8 +++++-- .../TestingAssets/Materials/green.mat | 22 +++++++++---------- .../TestingAssets/Materials/red.mat | 22 +++++++++---------- .../Editor/NSubstitute/NSubstitute.dll.meta | 17 +------------- Assets/UnityTestTools/changelog.txt | 5 +++++ 28 files changed, 121 insertions(+), 127 deletions(-) diff --git a/Assets/UnityTestTools.meta b/Assets/UnityTestTools.meta index 8710489a..64ee9765 100644 --- a/Assets/UnityTestTools.meta +++ b/Assets/UnityTestTools.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 5c8e5d66ff19140a1bf3cfdc3955859c folderAsset: yes -timeCreated: 1458650910 +timeCreated: 1474291595 licenseType: Free DefaultImporter: userData: diff --git a/Assets/UnityTestTools/Assertions/Editor/AssertionComponentEditor.cs b/Assets/UnityTestTools/Assertions/Editor/AssertionComponentEditor.cs index d4a1dc35..71307e48 100644 --- a/Assets/UnityTestTools/Assertions/Editor/AssertionComponentEditor.cs +++ b/Assets/UnityTestTools/Assertions/Editor/AssertionComponentEditor.cs @@ -26,7 +26,7 @@ namespace UnityTest private readonly GUIContent m_GUIRepeatCheckFrameGuiContent = new GUIContent("Repeat check", "Should the check be repeated."); #endregion - private static List allComparersList = null; + private static List allComparersList = null; public AssertionComponentEditor() { diff --git a/Assets/UnityTestTools/Assertions/MemberResolver.cs b/Assets/UnityTestTools/Assertions/MemberResolver.cs index 65f7351c..abd292a7 100644 --- a/Assets/UnityTestTools/Assertions/MemberResolver.cs +++ b/Assets/UnityTestTools/Assertions/MemberResolver.cs @@ -42,11 +42,11 @@ namespace UnityTest var member = fullCallStack[i]; result = GetValueFromMember(result, member); tempCallstack.Add(member); - if (result == null) return null; - var type = result.GetType(); + if (result == null) return null; + var type = result.GetType(); - //String is not a value type but we don't want to cache it - if (!IsValueType(type) && type != typeof(System.String)) + //String is not a value type but we don't want to cache it + if (!IsValueType(type) && type != typeof(System.String)) { tempCallstack.Clear(); m_CallingObjectRef = result; diff --git a/Assets/UnityTestTools/Common/Editor/ResultWriter/XmlResultWriter.cs b/Assets/UnityTestTools/Common/Editor/ResultWriter/XmlResultWriter.cs index 3115e4f2..ac4ca731 100644 --- a/Assets/UnityTestTools/Common/Editor/ResultWriter/XmlResultWriter.cs +++ b/Assets/UnityTestTools/Common/Editor/ResultWriter/XmlResultWriter.cs @@ -280,7 +280,7 @@ namespace UnityTest private void WriteCData(string text) { if (string.IsNullOrEmpty(text)) - return; + return; m_ResultWriter.AppendFormat("", text); m_ResultWriter.AppendLine(); } diff --git a/Assets/UnityTestTools/Common/Settings.meta b/Assets/UnityTestTools/Common/Settings.meta index 2d93ae55..69e5303c 100644 --- a/Assets/UnityTestTools/Common/Settings.meta +++ b/Assets/UnityTestTools/Common/Settings.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 4f7795beea73b4d50bd536d0012e8e85 folderAsset: yes -timeCreated: 1458650919 +timeCreated: 1474291611 licenseType: Free DefaultImporter: userData: diff --git a/Assets/UnityTestTools/Common/Settings/IntegrationTestsRunnerSettings.asset.meta b/Assets/UnityTestTools/Common/Settings/IntegrationTestsRunnerSettings.asset.meta index 12f73ac0..52360ff1 100644 --- a/Assets/UnityTestTools/Common/Settings/IntegrationTestsRunnerSettings.asset.meta +++ b/Assets/UnityTestTools/Common/Settings/IntegrationTestsRunnerSettings.asset.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: ec24e4a07acd24ffaa1cd1df7fa11d54 -timeCreated: 1458650919 +timeCreated: 1474291611 licenseType: Free NativeFormatImporter: userData: diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.Mdb.dll.meta b/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.Mdb.dll.meta index a040b4f3..4be4950f 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.Mdb.dll.meta +++ b/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.Mdb.dll.meta @@ -15,10 +15,6 @@ PluginImporter: enabled: 1 settings: DefaultValueInitialized: true - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.dll.meta b/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.dll.meta index 88805bdd..1123a8ae 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.dll.meta +++ b/Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.dll.meta @@ -15,10 +15,6 @@ PluginImporter: enabled: 1 settings: DefaultValueInitialized: true - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/DTOFormatter.cs b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/DTOFormatter.cs index 1d084728..653666d6 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/DTOFormatter.cs +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/DTOFormatter.cs @@ -84,7 +84,9 @@ namespace UnityTest remain -= bytesRead; index += bytesRead; } while (remain > 0); +#if !UNITY_WSA val = Encoding.BigEndianUnicode.GetString(bytes); +#endif } } @@ -131,9 +133,14 @@ namespace UnityTest public object Deserialize (Stream stream) { +#if !UNITY_WSA var result = (ResultDTO)FormatterServices.GetSafeUninitializedObject(typeof(ResultDTO)); Transfer (result, new Reader(stream)); return result; +#else + return null; +#endif } } + } \ No newline at end of file diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Batch.cs b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Batch.cs index 6d850f2b..25c22605 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Batch.cs +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Batch.cs @@ -6,7 +6,6 @@ using UnityEditor; using UnityEditorInternal; using UnityEngine; using UnityTest.IntegrationTests; - #if UNITY_5_3_OR_NEWER using UnityEditor.SceneManagement; #endif @@ -14,8 +13,8 @@ using UnityEditor.SceneManagement; namespace UnityTest { public static partial class Batch - { - const string k_ResultFilePathParam = "-resultFilePath="; + { + const string k_ResultFilePathParam = "-resultFilePath="; private const string k_TestScenesParam = "-testscenes="; private const string k_OtherBuildScenesParam = "-includeBuildScenes="; const string k_TargetPlatformParam = "-targetPlatform="; diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/IntegrationTestsHierarchyAnnotation.cs b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/IntegrationTestsHierarchyAnnotation.cs index 2c0099f8..4aa5dc41 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/IntegrationTestsHierarchyAnnotation.cs +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/IntegrationTestsHierarchyAnnotation.cs @@ -40,4 +40,5 @@ namespace UnityTest EditorGUIUtility.SetIconSize(Vector2.zero); } } + } \ No newline at end of file diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/NetworkResultsReceiver.cs b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/NetworkResultsReceiver.cs index c2994c48..1f8d7656 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/NetworkResultsReceiver.cs +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/NetworkResultsReceiver.cs @@ -167,9 +167,9 @@ namespace UnityTest } if (m_RunFinished) { + Close(); if (InternalEditorUtility.inBatchMode) EditorApplication.Exit(m_TestFailed ? Batch.returnCodeTestsFailed : Batch.returnCodeTestsOk); - Close(); } if (m_Repaint) Repaint(); } @@ -254,12 +254,12 @@ namespace UnityTest public static void StopReceiver() { if (Instance == null) return; - try{ - Instance.Close(); - }catch(Exception e){ - Debug.LogException(e); - DestroyImmediate(Instance); - } + try{ + Instance.Close(); + }catch(Exception e){ + Debug.LogException(e); + DestroyImmediate(Instance); + } } } } diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlatformRunner.cs b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlatformRunner.cs index 3df90de3..5c548bfc 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlatformRunner.cs +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlatformRunner.cs @@ -109,10 +109,6 @@ namespace UnityTest.IntegrationTests { case BuildTargetGroup.Android: return BuildTarget.Android; - #if !UNITY_5_4_OR_NEWER - case BuildTargetGroup.WebPlayer: - return BuildTarget.WebPlayer; - #endif default: { switch (Application.platform) @@ -124,11 +120,7 @@ namespace UnityTest.IntegrationTests case RuntimePlatform.LinuxPlayer: return BuildTarget.StandaloneLinux; } - #if UNITY_5_4_OR_NEWER - return BuildTarget.WebGL; - #else - return BuildTarget.WebPlayer; - #endif + return BuildTarget.WebGL; } } } diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlatformRunnerConfiguration.cs b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlatformRunnerConfiguration.cs index c8a54971..ee17648a 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlatformRunnerConfiguration.cs +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlatformRunnerConfiguration.cs @@ -56,12 +56,12 @@ public class PlatformRunnerConfiguration case BuildTarget.StandaloneWindows64: return path + ".exe"; case BuildTarget.StandaloneOSXIntel: + case BuildTarget.StandaloneOSXIntel64: + case BuildTarget.StandaloneLinuxUniversal: return path + ".app"; case BuildTarget.Android: return path + ".apk"; default: - if (buildTarget.ToString() == "BlackBerry" || buildTarget.ToString() == "BB10") - return path + ".bar"; return path; } } diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlatformRunnerSettingsWindow.cs b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlatformRunnerSettingsWindow.cs index 71145de1..7bca8514 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlatformRunnerSettingsWindow.cs +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlatformRunnerSettingsWindow.cs @@ -21,7 +21,9 @@ namespace UnityTest.IntegrationTests private List m_OtherScenesToBuild; private List m_AllScenesInProject; - private Vector2 m_ScrollPosition; + private Vector2 m_ScrollPositionIntegrationTests; + private Vector2 m_ScrollPositionOtherScenes; + private Vector2 m_ScrollPositionAllScenes; private readonly List m_Interfaces = new List(); private readonly List m_SelectedScenes = new List(); @@ -37,7 +39,7 @@ namespace UnityTest.IntegrationTests readonly GUIContent m_Label = new GUIContent("Results target directory", "Directory where the results will be saved. If no value is specified, the results will be generated in project's data folder."); - public PlatformRunnerSettingsWindow() + void Awake() { if (m_OtherScenesToBuild == null) m_OtherScenesToBuild = new List (); @@ -103,7 +105,7 @@ namespace UnityTest.IntegrationTests } EditorGUI.EndDisabledGroup(); - DrawVerticalSceneList (ref m_IntegrationTestScenes, ref m_SelectedSceneInTest); + DrawVerticalSceneList (ref m_IntegrationTestScenes, ref m_SelectedSceneInTest, ref m_ScrollPositionIntegrationTests); EditorGUILayout.EndVertical (); // Extra scenes to include in build @@ -119,14 +121,14 @@ namespace UnityTest.IntegrationTests } EditorGUI.EndDisabledGroup(); - DrawVerticalSceneList (ref m_OtherScenesToBuild, ref m_SelectedSceneInBuild); + DrawVerticalSceneList (ref m_OtherScenesToBuild, ref m_SelectedSceneInBuild, ref m_ScrollPositionOtherScenes); EditorGUILayout.EndVertical (); EditorGUILayout.Separator (); // All Scenes EditorGUILayout.BeginVertical (); - label = new GUIContent("Availble Scenes", "These are all the scenes within your project, please select some to run tests"); + label = new GUIContent("Available Scenes", "These are all the scenes within your project, please select some to run tests"); EditorGUILayout.LabelField(label, EditorStyles.boldLabel, GUILayout.Height(20f)); @@ -147,7 +149,7 @@ namespace UnityTest.IntegrationTests EditorGUILayout.EndHorizontal (); - DrawVerticalSceneList (ref m_AllScenesInProject, ref m_SelectedSceneInAll); + DrawVerticalSceneList (ref m_AllScenesInProject, ref m_SelectedSceneInAll, ref m_ScrollPositionAllScenes); EditorGUILayout.EndVertical (); // ButtoNetworkResultsReceiverns to edit scenes in lists @@ -180,9 +182,9 @@ namespace UnityTest.IntegrationTests } } - private void DrawVerticalSceneList(ref List sourceList, ref string selectString) + private void DrawVerticalSceneList(ref List sourceList, ref string selectString, ref Vector2 scrollPosition) { - m_ScrollPosition = EditorGUILayout.BeginScrollView(m_ScrollPosition, Styles.testList); + scrollPosition = EditorGUILayout.BeginScrollView(scrollPosition, Styles.testList); EditorGUI.indentLevel++; foreach (var scenePath in sourceList) { @@ -209,7 +211,7 @@ namespace UnityTest.IntegrationTests public static List GetScenesWithTestComponents(List allScenes) { - List results = EditorReferencesUtil.FindScenesWhichContainAsset("TestComponent.cs"); + List results = EditorReferencesUtil.FindScenesWhichContainAsset("TestComponent.cs"); List integrationTestScenes = new List(); foreach (Object obj in results) { @@ -261,7 +263,7 @@ namespace UnityTest.IntegrationTests } } - EditorGUI.EndDisabledGroup(); + EditorGUI.EndDisabledGroup(); if (EditorGUI.EndChangeCheck()) { diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Renderer/IntegrationTestLine.cs b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Renderer/IntegrationTestLine.cs index e0b5d1ac..9f4f35db 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Renderer/IntegrationTestLine.cs +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Renderer/IntegrationTestLine.cs @@ -18,17 +18,17 @@ namespace UnityTest protected internal override void DrawLine(Rect rect, GUIContent label, bool isSelected, RenderingOptions options) { if(Event.current.type != EventType.repaint) - return; + return; - Styles.testName.Draw (rect, label, false, false, false, isSelected); + Styles.testName.Draw (rect, label, false, false, false, isSelected); if (m_Result.IsTimeout) { - float min, max; - Styles.testName.CalcMinMaxWidth(label, out min, out max); - var timeoutRect = new Rect(rect); - timeoutRect.x += min - 12; - Styles.testName.Draw(timeoutRect, s_GUITimeoutIcon, false, false, false, isSelected); + float min, max; + Styles.testName.CalcMinMaxWidth(label, out min, out max); + var timeoutRect = new Rect(rect); + timeoutRect.x += min - 12; + Styles.testName.Draw(timeoutRect, s_GUITimeoutIcon, false, false, false, isSelected); } } diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Renderer/IntegrationTestRendererBase.cs b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Renderer/IntegrationTestRendererBase.cs index 5b026987..0ab3125a 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Renderer/IntegrationTestRendererBase.cs +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Renderer/IntegrationTestRendererBase.cs @@ -77,13 +77,13 @@ namespace UnityTest protected void OnSelect() { - if (!Event.current.control && !Event.current.command) - { - Selection.objects = new Object[0]; - GUIUtility.keyboardControl = 0; - } + if (!Event.current.control && !Event.current.command) + { + Selection.objects = new Object[0]; + GUIUtility.keyboardControl = 0; + } - if ((Event.current.control || Event.current.command) && Selection.gameObjects.Contains(test.gameObject)) + if ((Event.current.control || Event.current.command) && Selection.gameObjects.Contains(test.gameObject)) Selection.objects = Selection.gameObjects.Where(o => o != test.gameObject).ToArray(); else Selection.objects = Selection.gameObjects.Concat(new[] { test.gameObject }).ToArray(); diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/TestComponentEditor.cs b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/TestComponentEditor.cs index 3e72b184..cdaab5ca 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/TestComponentEditor.cs +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/TestComponentEditor.cs @@ -50,15 +50,15 @@ namespace UnityTest if (component.dynamic) { - if(GUILayout.Button("Reload dynamic tests")) - { - TestComponent.DestroyAllDynamicTests(); - Selection.objects = new Object[0]; - IntegrationTestsRunnerWindow.selectedInHierarchy = false; - GUIUtility.ExitGUI(); - return; - } - EditorGUILayout.HelpBox("This is a test generated from code. No changes in the component will be persisted.", MessageType.Info); + if(GUILayout.Button("Reload dynamic tests")) + { + TestComponent.DestroyAllDynamicTests(); + Selection.objects = new Object[0]; + IntegrationTestsRunnerWindow.selectedInHierarchy = false; + GUIUtility.ExitGUI(); + return; + } + EditorGUILayout.HelpBox("This is a test generated from code. No changes in the component will be persisted.", MessageType.Info); } if (component.IsTestGroup()) diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/TestComponent.cs b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/TestComponent.cs index 9f3012c6..7895102a 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/TestComponent.cs +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/TestComponent.cs @@ -59,16 +59,16 @@ namespace UnityTest } public bool IsExceptionExpected(string exception) - { - exception = exception.Trim(); + { + exception = exception.Trim(); if (!expectException) - return false; - if(string.IsNullOrEmpty(expectedExceptionList.Trim())) - return true; + return false; + if(string.IsNullOrEmpty(expectedExceptionList.Trim())) + return true; foreach (var expectedException in expectedExceptionList.Split(',').Select(e => e.Trim())) { if (exception == expectedException) - return true; + return true; var exceptionType = Type.GetType(exception) ?? GetTypeByName(exception); var expectedExceptionType = Type.GetType(expectedException) ?? GetTypeByName(expectedException); if (exceptionType != null && expectedExceptionType != null && IsAssignableFrom(expectedExceptionType, exceptionType)) @@ -313,7 +313,7 @@ namespace UnityTest #if UNITY_5_3_OR_NEWER return TestComponent.GetTypesWithHelpAttribute(SceneManager.GetActiveScene().name).Any(); #else - return TestComponent.GetTypesWithHelpAttribute(Application.loadedLevelName).Any(); + return TestComponent.GetTypesWithHelpAttribute(Application.loadedLevelName).Any(); #endif } diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/TestRunnerConfigurator.cs b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/TestRunnerConfigurator.cs index b1b8153a..b0b270d4 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/TestRunnerConfigurator.cs +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/TestRunnerConfigurator.cs @@ -59,9 +59,8 @@ namespace UnityTest { return (UnityEditor.EditorBuildSettingsScene[] )serializer.Deserialize(textReader); } - catch (System.Xml.XmlException e) + catch (System.Xml.XmlException) { - Debug.Log(e); return null; } } diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionFailure.prefab b/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionFailure.prefab index c1a23a92..7f2202dd 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionFailure.prefab +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionFailure.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -5.1736994, y: 3.9978147, z: -16.24892} m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -40,17 +41,20 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 03f3b4747259a364b800508ac27e1c17, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 0 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionSuccess.prefab b/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionSuccess.prefab index 6fecda2b..d9cd7c23 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionSuccess.prefab +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionSuccess.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -5.1736994, y: 3.9978147, z: -16.24892} m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -40,17 +41,20 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 43da3275cd08d41429f56675d70c58df, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 0 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerFailure.prefab b/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerFailure.prefab index a8289830..1a6c7acf 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerFailure.prefab +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerFailure.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -40,17 +41,20 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 03f3b4747259a364b800508ac27e1c17, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 0 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerSuccess.prefab b/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerSuccess.prefab index cc6f8965..142df442 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerSuccess.prefab +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerSuccess.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -40,17 +41,20 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 43da3275cd08d41429f56675d70c58df, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 0 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/Materials/green.mat b/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/Materials/green.mat index 7a2022eb..e0940f5a 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/Materials/green.mat +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/Materials/green.mat @@ -15,16 +15,14 @@ Material: m_SavedProperties: serializedVersion: 2 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: 928be703400f4eb48af2f94d55bf3f74, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: {} + - first: + name: _MainTex + second: + m_Texture: {fileID: 2800000, guid: 928be703400f4eb48af2f94d55bf3f74, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: [] m_Colors: - data: - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} + - first: + name: _Color + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/Materials/red.mat b/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/Materials/red.mat index 3f06b36a..9e2dc547 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/Materials/red.mat +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/Materials/red.mat @@ -15,16 +15,14 @@ Material: m_SavedProperties: serializedVersion: 2 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: 591632297e74ba34fa4c65d1265d370a, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: {} + - first: + name: _MainTex + second: + m_Texture: {fileID: 2800000, guid: 591632297e74ba34fa4c65d1265d370a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: [] m_Colors: - data: - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} + - first: + name: _Color + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/UnityTestTools/UnitTesting/Editor/NSubstitute/NSubstitute.dll.meta b/Assets/UnityTestTools/UnitTesting/Editor/NSubstitute/NSubstitute.dll.meta index 1cb4f6b3..38d55f5f 100644 --- a/Assets/UnityTestTools/UnitTesting/Editor/NSubstitute/NSubstitute.dll.meta +++ b/Assets/UnityTestTools/UnitTesting/Editor/NSubstitute/NSubstitute.dll.meta @@ -1,22 +1,7 @@ fileFormatVersion: 2 guid: 3c5e1afc6e0d68849ae6639aff58cfc7 -PluginImporter: +MonoAssemblyImporter: serializedVersion: 1 iconMap: {} executionOrder: {} - isPreloaded: 0 - platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - DefaultValueInitialized: true - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UnityTestTools/changelog.txt b/Assets/UnityTestTools/changelog.txt index 8c190f27..84563daa 100644 --- a/Assets/UnityTestTools/changelog.txt +++ b/Assets/UnityTestTools/changelog.txt @@ -1,3 +1,8 @@ +Version 1.5.9 + +- Updated tools for Unity 5.4 +- Bugfixes + Version 1.5.8 - Bugfixes