Merge branch 'master' into deprecate-ppv2package

Author: alex-vazquez-unity3d

.yamato/postprocessing-osx-metal.yml

@@ -11,8 +11,11 @@ PostProcessing_OSX_Metal_playmode_mono_Linear_trunk:
         UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
         UTR_VERSION: "current"
     commands:
-      -  brew tap Unity-Technologies/homebrew-unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git
-      -  brew install Unity-Technologies/homebrew-unity/unity-downloader-cli
+      - command: |-
+          brew tap Unity-Technologies/homebrew-unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git;
+          brew trust unity-technologies/unity;
+          brew install Unity-Technologies/homebrew-unity/unity-downloader-cli; 
+          brew upgrade Unity-Technologies/homebrew-unity/unity-downloader-cli;
       -  unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp  --wait --published-only
       -  command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
          retries: 2
@@ -50,8 +53,11 @@ PostProcessing_OSX_Metal_Standalone_mono_Linear_trunk:
         UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
         UTR_VERSION: "current"
     commands:
-      -  brew tap Unity-Technologies/homebrew-unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git
-      -  brew install Unity-Technologies/homebrew-unity/unity-downloader-cli
+      - command: |-
+          brew tap Unity-Technologies/homebrew-unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git;
+          brew trust unity-technologies/unity;
+          brew install Unity-Technologies/homebrew-unity/unity-downloader-cli; 
+          brew upgrade Unity-Technologies/homebrew-unity/unity-downloader-cli;
       -  unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp  --wait --published-only
       -  command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
          retries: 2
@@ -61,7 +67,7 @@ PostProcessing_OSX_Metal_Standalone_mono_Linear_trunk:
       -  command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
          retries: 2
       -  command: |2-
-              ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results --editor-location=/Users/bokken/Graphics/.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests --timeout=2400"
+              ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results --editor-location=/Users/bokken/Graphics/.Editor --platform=StandaloneOSX --architecture=x64 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests --timeout=2400"
               UTR_RESULT=$?
               scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results/ TestProjects/PostProcessing_Tests
               exit $UTR_RESULT

TestProjects/PostProcessing_Tests/Assets/CommonAssets/Scripts/PostProcessingGraphicsTests.cs

@@ -8,9 +8,8 @@
 public class PostProcessingGraphicsTests
 {
     [UnityTest, Category("PostProcessing")]
-    [PrebuildSetup("SetupGraphicsTestCases")]
-    [UseGraphicsTestCases]
-    public IEnumerator Run(GraphicsTestCase testCase)
+    [SceneGraphicsTest("Assets/Scenes")]
+    public IEnumerator Run(SceneGraphicsTestCase testCase)
     {
         SceneManager.LoadScene(testCase.ScenePath);
 
@@ -30,14 +29,14 @@ public IEnumerator Run(GraphicsTestCase testCase)
         for (int i = 0; i < settings.WaitFrames; i++)
             yield return null;
 
-        ImageAssert.AreEqual(testCase.ReferenceImage, camera, settings.ImageComparisonSettings);
+        ImageAssert.AreEqual(testCase.ReferenceImage.Image, camera, settings.ImageComparisonSettings);
     }
 
 #if UNITY_EDITOR
     [TearDown]
     public void DumpImagesInEditor()
     {
-        UnityEditor.TestTools.Graphics.ResultsUtility.ExtractImagesFromTestProperties(TestContext.CurrentContext.Test);
+        // TearDown is handled automatically by the graphics test framework
     }
 
 #endif

TestProjects/PostProcessing_Tests/Assets/CommonAssets/Scripts/Setup/SetupGraphicsTestCases.cs

@@ -4,9 +4,8 @@ public class SetupGraphicsTestCases : IPrebuildSetup
 {
     public void Setup()
     {
-        // Work around case #1033694, unable to use PrebuildSetup types directly from assemblies that don't have special names.
-        // Once that's fixed, this class can be deleted and the SetupGraphicsTestCases class in Unity.TestFramework.Graphics.Editor
-        // can be used directly instead.
-        UnityEditor.TestTools.Graphics.SetupGraphicsTestCases.Setup("Assets/ReferenceImages");
+        // This setup is no longer needed as of the new Graphics Test Framework.
+        // The setup is done automatically. If you wish to override the default settings,
+        // use the GraphicsTestBuildSettings asset instead.
     }
 }