Browse Source

Merge branch 'master' of https://github.com/snozbot/fungus into refactor-folders

master
Christopher 8 years ago
parent
commit
582676a31f
  1. 1
      Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaEnvironment.cs
  2. 2
      Assets/UnityTestTools.meta
  3. 2
      Assets/UnityTestTools/Assertions/Editor/AssertionComponentEditor.cs
  4. 8
      Assets/UnityTestTools/Assertions/MemberResolver.cs
  5. 2
      Assets/UnityTestTools/Common/Editor/ResultWriter/XmlResultWriter.cs
  6. 2
      Assets/UnityTestTools/Common/Settings.meta
  7. 2
      Assets/UnityTestTools/Common/Settings/IntegrationTestsRunnerSettings.asset.meta
  8. 7
      Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/DTOFormatter.cs
  9. 5
      Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Batch.cs
  10. 1
      Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/IntegrationTestsHierarchyAnnotation.cs
  11. 14
      Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/NetworkResultsReceiver.cs
  12. 10
      Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlatformRunner.cs
  13. 4
      Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlatformRunnerConfiguration.cs
  14. 22
      Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlatformRunnerSettingsWindow.cs
  15. 14
      Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Renderer/IntegrationTestLine.cs
  16. 12
      Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Renderer/IntegrationTestRendererBase.cs
  17. 18
      Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/TestComponentEditor.cs
  18. 14
      Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/TestComponent.cs
  19. 3
      Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/TestRunnerConfigurator.cs
  20. 8
      Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionFailure.prefab
  21. 8
      Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionSuccess.prefab
  22. 8
      Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerFailure.prefab
  23. 8
      Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerSuccess.prefab
  24. 22
      Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/Materials/green.mat
  25. 22
      Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/Materials/red.mat
  26. 5
      Assets/UnityTestTools/changelog.txt
  27. 3
      ProjectSettings/ProjectSettings.asset
  28. 2
      ProjectSettings/ProjectVersion.txt

1
Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaEnvironment.cs vendored

@ -5,6 +5,7 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System; using System;
using System.Diagnostics;
using System.Linq; using System.Linq;
using MoonSharp.Interpreter; using MoonSharp.Interpreter;
using MoonSharp.Interpreter.Loaders; using MoonSharp.Interpreter.Loaders;

2
Assets/UnityTestTools.meta

@ -1,7 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 5c8e5d66ff19140a1bf3cfdc3955859c guid: 5c8e5d66ff19140a1bf3cfdc3955859c
folderAsset: yes folderAsset: yes
timeCreated: 1458650910 timeCreated: 1474291595
licenseType: Free licenseType: Free
DefaultImporter: DefaultImporter:
userData: userData:

2
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."); private readonly GUIContent m_GUIRepeatCheckFrameGuiContent = new GUIContent("Repeat check", "Should the check be repeated.");
#endregion #endregion
private static List<Type> allComparersList = null; private static List<Type> allComparersList = null;
public AssertionComponentEditor() public AssertionComponentEditor()
{ {

8
Assets/UnityTestTools/Assertions/MemberResolver.cs

@ -42,11 +42,11 @@ namespace UnityTest
var member = fullCallStack[i]; var member = fullCallStack[i];
result = GetValueFromMember(result, member); result = GetValueFromMember(result, member);
tempCallstack.Add(member); tempCallstack.Add(member);
if (result == null) return null; if (result == null) return null;
var type = result.GetType(); var type = result.GetType();
//String is not a value type but we don't want to cache it //String is not a value type but we don't want to cache it
if (!IsValueType(type) && type != typeof(System.String)) if (!IsValueType(type) && type != typeof(System.String))
{ {
tempCallstack.Clear(); tempCallstack.Clear();
m_CallingObjectRef = result; m_CallingObjectRef = result;

2
Assets/UnityTestTools/Common/Editor/ResultWriter/XmlResultWriter.cs

@ -280,7 +280,7 @@ namespace UnityTest
private void WriteCData(string text) private void WriteCData(string text)
{ {
if (string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(text))
return; return;
m_ResultWriter.AppendFormat("<![CDATA[{0}]]>", text); m_ResultWriter.AppendFormat("<![CDATA[{0}]]>", text);
m_ResultWriter.AppendLine(); m_ResultWriter.AppendLine();
} }

2
Assets/UnityTestTools/Common/Settings.meta

@ -1,7 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 4f7795beea73b4d50bd536d0012e8e85 guid: 4f7795beea73b4d50bd536d0012e8e85
folderAsset: yes folderAsset: yes
timeCreated: 1458650919 timeCreated: 1474291611
licenseType: Free licenseType: Free
DefaultImporter: DefaultImporter:
userData: userData:

2
Assets/UnityTestTools/Common/Settings/IntegrationTestsRunnerSettings.asset.meta

@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: ec24e4a07acd24ffaa1cd1df7fa11d54 guid: ec24e4a07acd24ffaa1cd1df7fa11d54
timeCreated: 1458650919 timeCreated: 1474291611
licenseType: Free licenseType: Free
NativeFormatImporter: NativeFormatImporter:
userData: userData:

7
Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/DTOFormatter.cs

@ -84,7 +84,9 @@ namespace UnityTest
remain -= bytesRead; remain -= bytesRead;
index += bytesRead; index += bytesRead;
} while (remain > 0); } while (remain > 0);
#if !UNITY_WSA
val = Encoding.BigEndianUnicode.GetString(bytes); val = Encoding.BigEndianUnicode.GetString(bytes);
#endif
} }
} }
@ -131,9 +133,14 @@ namespace UnityTest
public object Deserialize (Stream stream) public object Deserialize (Stream stream)
{ {
#if !UNITY_WSA
var result = (ResultDTO)FormatterServices.GetSafeUninitializedObject(typeof(ResultDTO)); var result = (ResultDTO)FormatterServices.GetSafeUninitializedObject(typeof(ResultDTO));
Transfer (result, new Reader(stream)); Transfer (result, new Reader(stream));
return result; return result;
#else
return null;
#endif
} }
} }
} }

5
Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Batch.cs

@ -6,7 +6,6 @@ using UnityEditor;
using UnityEditorInternal; using UnityEditorInternal;
using UnityEngine; using UnityEngine;
using UnityTest.IntegrationTests; using UnityTest.IntegrationTests;
#if UNITY_5_3_OR_NEWER #if UNITY_5_3_OR_NEWER
using UnityEditor.SceneManagement; using UnityEditor.SceneManagement;
#endif #endif
@ -14,8 +13,8 @@ using UnityEditor.SceneManagement;
namespace UnityTest namespace UnityTest
{ {
public static partial class Batch 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_TestScenesParam = "-testscenes=";
private const string k_OtherBuildScenesParam = "-includeBuildScenes="; private const string k_OtherBuildScenesParam = "-includeBuildScenes=";
const string k_TargetPlatformParam = "-targetPlatform="; const string k_TargetPlatformParam = "-targetPlatform=";

1
Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/IntegrationTestsHierarchyAnnotation.cs

@ -40,4 +40,5 @@ namespace UnityTest
EditorGUIUtility.SetIconSize(Vector2.zero); EditorGUIUtility.SetIconSize(Vector2.zero);
} }
} }
} }

14
Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/NetworkResultsReceiver.cs

@ -167,9 +167,9 @@ namespace UnityTest
} }
if (m_RunFinished) if (m_RunFinished)
{ {
Close();
if (InternalEditorUtility.inBatchMode) if (InternalEditorUtility.inBatchMode)
EditorApplication.Exit(m_TestFailed ? Batch.returnCodeTestsFailed : Batch.returnCodeTestsOk); EditorApplication.Exit(m_TestFailed ? Batch.returnCodeTestsFailed : Batch.returnCodeTestsOk);
Close();
} }
if (m_Repaint) Repaint(); if (m_Repaint) Repaint();
} }
@ -254,12 +254,12 @@ namespace UnityTest
public static void StopReceiver() public static void StopReceiver()
{ {
if (Instance == null) return; if (Instance == null) return;
try{ try{
Instance.Close(); Instance.Close();
}catch(Exception e){ }catch(Exception e){
Debug.LogException(e); Debug.LogException(e);
DestroyImmediate(Instance); DestroyImmediate(Instance);
} }
} }
} }
} }

10
Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlatformRunner.cs

@ -109,10 +109,6 @@ namespace UnityTest.IntegrationTests
{ {
case BuildTargetGroup.Android: case BuildTargetGroup.Android:
return BuildTarget.Android; return BuildTarget.Android;
#if !UNITY_5_4_OR_NEWER
case BuildTargetGroup.WebPlayer:
return BuildTarget.WebPlayer;
#endif
default: default:
{ {
switch (Application.platform) switch (Application.platform)
@ -124,11 +120,7 @@ namespace UnityTest.IntegrationTests
case RuntimePlatform.LinuxPlayer: case RuntimePlatform.LinuxPlayer:
return BuildTarget.StandaloneLinux; return BuildTarget.StandaloneLinux;
} }
#if UNITY_5_4_OR_NEWER return BuildTarget.WebGL;
return BuildTarget.WebGL;
#else
return BuildTarget.WebPlayer;
#endif
} }
} }
} }

4
Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlatformRunnerConfiguration.cs

@ -56,12 +56,12 @@ public class PlatformRunnerConfiguration
case BuildTarget.StandaloneWindows64: case BuildTarget.StandaloneWindows64:
return path + ".exe"; return path + ".exe";
case BuildTarget.StandaloneOSXIntel: case BuildTarget.StandaloneOSXIntel:
case BuildTarget.StandaloneOSXIntel64:
case BuildTarget.StandaloneLinuxUniversal:
return path + ".app"; return path + ".app";
case BuildTarget.Android: case BuildTarget.Android:
return path + ".apk"; return path + ".apk";
default: default:
if (buildTarget.ToString() == "BlackBerry" || buildTarget.ToString() == "BB10")
return path + ".bar";
return path; return path;
} }
} }

22
Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlatformRunnerSettingsWindow.cs

@ -21,7 +21,9 @@ namespace UnityTest.IntegrationTests
private List<string> m_OtherScenesToBuild; private List<string> m_OtherScenesToBuild;
private List<string> m_AllScenesInProject; private List<string> m_AllScenesInProject;
private Vector2 m_ScrollPosition; private Vector2 m_ScrollPositionIntegrationTests;
private Vector2 m_ScrollPositionOtherScenes;
private Vector2 m_ScrollPositionAllScenes;
private readonly List<string> m_Interfaces = new List<string>(); private readonly List<string> m_Interfaces = new List<string>();
private readonly List<string> m_SelectedScenes = new List<string>(); private readonly List<string> m_SelectedScenes = new List<string>();
@ -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."); 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) if (m_OtherScenesToBuild == null)
m_OtherScenesToBuild = new List<string> (); m_OtherScenesToBuild = new List<string> ();
@ -103,7 +105,7 @@ namespace UnityTest.IntegrationTests
} }
EditorGUI.EndDisabledGroup(); EditorGUI.EndDisabledGroup();
DrawVerticalSceneList (ref m_IntegrationTestScenes, ref m_SelectedSceneInTest); DrawVerticalSceneList (ref m_IntegrationTestScenes, ref m_SelectedSceneInTest, ref m_ScrollPositionIntegrationTests);
EditorGUILayout.EndVertical (); EditorGUILayout.EndVertical ();
// Extra scenes to include in build // Extra scenes to include in build
@ -119,14 +121,14 @@ namespace UnityTest.IntegrationTests
} }
EditorGUI.EndDisabledGroup(); EditorGUI.EndDisabledGroup();
DrawVerticalSceneList (ref m_OtherScenesToBuild, ref m_SelectedSceneInBuild); DrawVerticalSceneList (ref m_OtherScenesToBuild, ref m_SelectedSceneInBuild, ref m_ScrollPositionOtherScenes);
EditorGUILayout.EndVertical (); EditorGUILayout.EndVertical ();
EditorGUILayout.Separator (); EditorGUILayout.Separator ();
// All Scenes // All Scenes
EditorGUILayout.BeginVertical (); 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)); EditorGUILayout.LabelField(label, EditorStyles.boldLabel, GUILayout.Height(20f));
@ -147,7 +149,7 @@ namespace UnityTest.IntegrationTests
EditorGUILayout.EndHorizontal (); EditorGUILayout.EndHorizontal ();
DrawVerticalSceneList (ref m_AllScenesInProject, ref m_SelectedSceneInAll); DrawVerticalSceneList (ref m_AllScenesInProject, ref m_SelectedSceneInAll, ref m_ScrollPositionAllScenes);
EditorGUILayout.EndVertical (); EditorGUILayout.EndVertical ();
// ButtoNetworkResultsReceiverns to edit scenes in lists // ButtoNetworkResultsReceiverns to edit scenes in lists
@ -180,9 +182,9 @@ namespace UnityTest.IntegrationTests
} }
} }
private void DrawVerticalSceneList(ref List<string> sourceList, ref string selectString) private void DrawVerticalSceneList(ref List<string> sourceList, ref string selectString, ref Vector2 scrollPosition)
{ {
m_ScrollPosition = EditorGUILayout.BeginScrollView(m_ScrollPosition, Styles.testList); scrollPosition = EditorGUILayout.BeginScrollView(scrollPosition, Styles.testList);
EditorGUI.indentLevel++; EditorGUI.indentLevel++;
foreach (var scenePath in sourceList) foreach (var scenePath in sourceList)
{ {
@ -209,7 +211,7 @@ namespace UnityTest.IntegrationTests
public static List<string> GetScenesWithTestComponents(List<string> allScenes) public static List<string> GetScenesWithTestComponents(List<string> allScenes)
{ {
List<Object> results = EditorReferencesUtil.FindScenesWhichContainAsset("TestComponent.cs"); List<Object> results = EditorReferencesUtil.FindScenesWhichContainAsset("TestComponent.cs");
List<string> integrationTestScenes = new List<string>(); List<string> integrationTestScenes = new List<string>();
foreach (Object obj in results) { foreach (Object obj in results) {
@ -261,7 +263,7 @@ namespace UnityTest.IntegrationTests
} }
} }
EditorGUI.EndDisabledGroup(); EditorGUI.EndDisabledGroup();
if (EditorGUI.EndChangeCheck()) if (EditorGUI.EndChangeCheck())
{ {

14
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) protected internal override void DrawLine(Rect rect, GUIContent label, bool isSelected, RenderingOptions options)
{ {
if(Event.current.type != EventType.repaint) 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) if (m_Result.IsTimeout)
{ {
float min, max; float min, max;
Styles.testName.CalcMinMaxWidth(label, out min, out max); Styles.testName.CalcMinMaxWidth(label, out min, out max);
var timeoutRect = new Rect(rect); var timeoutRect = new Rect(rect);
timeoutRect.x += min - 12; timeoutRect.x += min - 12;
Styles.testName.Draw(timeoutRect, s_GUITimeoutIcon, false, false, false, isSelected); Styles.testName.Draw(timeoutRect, s_GUITimeoutIcon, false, false, false, isSelected);
} }
} }

12
Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Renderer/IntegrationTestRendererBase.cs

@ -77,13 +77,13 @@ namespace UnityTest
protected void OnSelect() protected void OnSelect()
{ {
if (!Event.current.control && !Event.current.command) if (!Event.current.control && !Event.current.command)
{ {
Selection.objects = new Object[0]; Selection.objects = new Object[0];
GUIUtility.keyboardControl = 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(); Selection.objects = Selection.gameObjects.Where(o => o != test.gameObject).ToArray();
else else
Selection.objects = Selection.gameObjects.Concat(new[] { test.gameObject }).ToArray(); Selection.objects = Selection.gameObjects.Concat(new[] { test.gameObject }).ToArray();

18
Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/TestComponentEditor.cs

@ -50,15 +50,15 @@ namespace UnityTest
if (component.dynamic) if (component.dynamic)
{ {
if(GUILayout.Button("Reload dynamic tests")) if(GUILayout.Button("Reload dynamic tests"))
{ {
TestComponent.DestroyAllDynamicTests(); TestComponent.DestroyAllDynamicTests();
Selection.objects = new Object[0]; Selection.objects = new Object[0];
IntegrationTestsRunnerWindow.selectedInHierarchy = false; IntegrationTestsRunnerWindow.selectedInHierarchy = false;
GUIUtility.ExitGUI(); GUIUtility.ExitGUI();
return; return;
} }
EditorGUILayout.HelpBox("This is a test generated from code. No changes in the component will be persisted.", MessageType.Info); EditorGUILayout.HelpBox("This is a test generated from code. No changes in the component will be persisted.", MessageType.Info);
} }
if (component.IsTestGroup()) if (component.IsTestGroup())

14
Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/TestComponent.cs

@ -59,16 +59,16 @@ namespace UnityTest
} }
public bool IsExceptionExpected(string exception) public bool IsExceptionExpected(string exception)
{ {
exception = exception.Trim(); exception = exception.Trim();
if (!expectException) if (!expectException)
return false; return false;
if(string.IsNullOrEmpty(expectedExceptionList.Trim())) if(string.IsNullOrEmpty(expectedExceptionList.Trim()))
return true; return true;
foreach (var expectedException in expectedExceptionList.Split(',').Select(e => e.Trim())) foreach (var expectedException in expectedExceptionList.Split(',').Select(e => e.Trim()))
{ {
if (exception == expectedException) if (exception == expectedException)
return true; return true;
var exceptionType = Type.GetType(exception) ?? GetTypeByName(exception); var exceptionType = Type.GetType(exception) ?? GetTypeByName(exception);
var expectedExceptionType = Type.GetType(expectedException) ?? GetTypeByName(expectedException); var expectedExceptionType = Type.GetType(expectedException) ?? GetTypeByName(expectedException);
if (exceptionType != null && expectedExceptionType != null && IsAssignableFrom(expectedExceptionType, exceptionType)) if (exceptionType != null && expectedExceptionType != null && IsAssignableFrom(expectedExceptionType, exceptionType))
@ -313,7 +313,7 @@ namespace UnityTest
#if UNITY_5_3_OR_NEWER #if UNITY_5_3_OR_NEWER
return TestComponent.GetTypesWithHelpAttribute(SceneManager.GetActiveScene().name).Any(); return TestComponent.GetTypesWithHelpAttribute(SceneManager.GetActiveScene().name).Any();
#else #else
return TestComponent.GetTypesWithHelpAttribute(Application.loadedLevelName).Any(); return TestComponent.GetTypesWithHelpAttribute(Application.loadedLevelName).Any();
#endif #endif
} }

3
Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/TestRunnerConfigurator.cs

@ -59,9 +59,8 @@ namespace UnityTest
{ {
return (UnityEditor.EditorBuildSettingsScene[] )serializer.Deserialize(textReader); return (UnityEditor.EditorBuildSettingsScene[] )serializer.Deserialize(textReader);
} }
catch (System.Xml.XmlException e) catch (System.Xml.XmlException)
{ {
Debug.Log(e);
return null; return null;
} }
} }

8
Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionFailure.prefab

@ -28,6 +28,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5.1736994, y: 3.9978147, z: -16.24892} m_LocalPosition: {x: -5.1736994, y: 3.9978147, z: -16.24892}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
@ -40,17 +41,20 @@ MeshRenderer:
m_Enabled: 1 m_Enabled: 1
m_CastShadows: 0 m_CastShadows: 0
m_ReceiveShadows: 0 m_ReceiveShadows: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 1
m_Materials: m_Materials:
- {fileID: 2100000, guid: 03f3b4747259a364b800508ac27e1c17, type: 2} - {fileID: 2100000, guid: 03f3b4747259a364b800508ac27e1c17, type: 2}
m_SubsetIndices: m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0} m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_ReflectionProbeUsage: 1
m_ProbeAnchor: {fileID: 0} m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1 m_ScaleInLightmap: 1
m_PreserveUVs: 0 m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0 m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0 m_ImportantGI: 0
m_SelectedWireframeHidden: 0
m_MinimumChartSize: 4 m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89

8
Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionSuccess.prefab

@ -28,6 +28,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5.1736994, y: 3.9978147, z: -16.24892} m_LocalPosition: {x: -5.1736994, y: 3.9978147, z: -16.24892}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
@ -40,17 +41,20 @@ MeshRenderer:
m_Enabled: 1 m_Enabled: 1
m_CastShadows: 0 m_CastShadows: 0
m_ReceiveShadows: 0 m_ReceiveShadows: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 1
m_Materials: m_Materials:
- {fileID: 2100000, guid: 43da3275cd08d41429f56675d70c58df, type: 2} - {fileID: 2100000, guid: 43da3275cd08d41429f56675d70c58df, type: 2}
m_SubsetIndices: m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0} m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_ReflectionProbeUsage: 1
m_ProbeAnchor: {fileID: 0} m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1 m_ScaleInLightmap: 1
m_PreserveUVs: 0 m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0 m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0 m_ImportantGI: 0
m_SelectedWireframeHidden: 0
m_MinimumChartSize: 4 m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89

8
Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerFailure.prefab

@ -28,6 +28,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
@ -40,17 +41,20 @@ MeshRenderer:
m_Enabled: 1 m_Enabled: 1
m_CastShadows: 0 m_CastShadows: 0
m_ReceiveShadows: 0 m_ReceiveShadows: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 1
m_Materials: m_Materials:
- {fileID: 2100000, guid: 03f3b4747259a364b800508ac27e1c17, type: 2} - {fileID: 2100000, guid: 03f3b4747259a364b800508ac27e1c17, type: 2}
m_SubsetIndices: m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0} m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_ReflectionProbeUsage: 1
m_ProbeAnchor: {fileID: 0} m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1 m_ScaleInLightmap: 1
m_PreserveUVs: 0 m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0 m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0 m_ImportantGI: 0
m_SelectedWireframeHidden: 0
m_MinimumChartSize: 4 m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89

8
Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerSuccess.prefab

@ -28,6 +28,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
@ -40,17 +41,20 @@ MeshRenderer:
m_Enabled: 1 m_Enabled: 1
m_CastShadows: 0 m_CastShadows: 0
m_ReceiveShadows: 0 m_ReceiveShadows: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 1
m_Materials: m_Materials:
- {fileID: 2100000, guid: 43da3275cd08d41429f56675d70c58df, type: 2} - {fileID: 2100000, guid: 43da3275cd08d41429f56675d70c58df, type: 2}
m_SubsetIndices: m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0} m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_ReflectionProbeUsage: 1
m_ProbeAnchor: {fileID: 0} m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1 m_ScaleInLightmap: 1
m_PreserveUVs: 0 m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0 m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0 m_ImportantGI: 0
m_SelectedWireframeHidden: 0
m_MinimumChartSize: 4 m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89

22
Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/Materials/green.mat

@ -15,16 +15,14 @@ Material:
m_SavedProperties: m_SavedProperties:
serializedVersion: 2 serializedVersion: 2
m_TexEnvs: m_TexEnvs:
data: - first:
first: name: _MainTex
name: _MainTex second:
second: m_Texture: {fileID: 2800000, guid: 928be703400f4eb48af2f94d55bf3f74, type: 3}
m_Texture: {fileID: 2800000, guid: 928be703400f4eb48af2f94d55bf3f74, type: 3} m_Scale: {x: 1, y: 1}
m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0}
m_Offset: {x: 0, y: 0} m_Floats: []
m_Floats: {}
m_Colors: m_Colors:
data: - first:
first: name: _Color
name: _Color second: {r: 1, g: 1, b: 1, a: 1}
second: {r: 1, g: 1, b: 1, a: 1}

22
Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/Materials/red.mat

@ -15,16 +15,14 @@ Material:
m_SavedProperties: m_SavedProperties:
serializedVersion: 2 serializedVersion: 2
m_TexEnvs: m_TexEnvs:
data: - first:
first: name: _MainTex
name: _MainTex second:
second: m_Texture: {fileID: 2800000, guid: 591632297e74ba34fa4c65d1265d370a, type: 3}
m_Texture: {fileID: 2800000, guid: 591632297e74ba34fa4c65d1265d370a, type: 3} m_Scale: {x: 1, y: 1}
m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0}
m_Offset: {x: 0, y: 0} m_Floats: []
m_Floats: {}
m_Colors: m_Colors:
data: - first:
first: name: _Color
name: _Color second: {r: 1, g: 1, b: 1, a: 1}
second: {r: 1, g: 1, b: 1, a: 1}

5
Assets/UnityTestTools/changelog.txt

@ -1,3 +1,8 @@
Version 1.5.9
- Updated tools for Unity 5.4
- Bugfixes
Version 1.5.8 Version 1.5.8
- Bugfixes - Bugfixes

3
ProjectSettings/ProjectSettings.asset

@ -74,6 +74,7 @@ PlayerSettings:
ignoreAlphaClear: 0 ignoreAlphaClear: 0
xboxOneResolution: 0 xboxOneResolution: 0
xboxOneMonoLoggingLevel: 0 xboxOneMonoLoggingLevel: 0
xboxOneLoggingLevel: 1
ps3SplashScreen: {fileID: 0} ps3SplashScreen: {fileID: 0}
videoMemoryForVertexBuffers: 0 videoMemoryForVertexBuffers: 0
psp2PowerMode: 0 psp2PowerMode: 0
@ -287,6 +288,7 @@ PlayerSettings:
ps4PatchPkgPath: ps4PatchPkgPath:
ps4PatchLatestPkgPath: ps4PatchLatestPkgPath:
ps4PatchChangeinfoPath: ps4PatchChangeinfoPath:
ps4PatchDayOne: 0
ps4attribUserManagement: 0 ps4attribUserManagement: 0
ps4attribMoveSupport: 0 ps4attribMoveSupport: 0
ps4attrib3DSupport: 0 ps4attrib3DSupport: 0
@ -375,6 +377,7 @@ PlayerSettings:
tizenSigningProfileName: tizenSigningProfileName:
tizenGPSPermissions: 0 tizenGPSPermissions: 0
tizenMicrophonePermissions: 0 tizenMicrophonePermissions: 0
tizenMinOSVersion: 0
n3dsUseExtSaveData: 0 n3dsUseExtSaveData: 0
n3dsCompressStaticMem: 1 n3dsCompressStaticMem: 1
n3dsExtSaveDataNumber: 0x12345 n3dsExtSaveDataNumber: 0x12345

2
ProjectSettings/ProjectVersion.txt

@ -1,2 +1,2 @@
m_EditorVersion: 5.4.0f3 m_EditorVersion: 5.4.1f1
m_StandardAssetsVersion: 0 m_StandardAssetsVersion: 0

Loading…
Cancel
Save