Unity-Technologies · tomzig16 · May 13, 2020 · May 13, 2020 · May 13, 2020 · May 13, 2020
diff --git a/TestProjects/UniversalGraphicsTest/Assets/Test/TestFilters.meta b/TestProjects/UniversalGraphicsTest/Assets/Test/TestFilters.meta
diff --git a/TestProjects/UniversalGraphicsTest/Assets/Test/TestFilters/TestCaseFilters.asset b/TestProjects/UniversalGraphicsTest/Assets/Test/TestFilters/TestCaseFilters.asset
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 62df9b4638bed4b5686466de1f45958f, type: 3}
+  m_Name: TestCaseFilters
+  m_EditorClassIdentifier: 
+  filters: []
diff --git a/TestProjects/UniversalGraphicsTest/Assets/Test/TestFilters/TestCaseFilters.asset.meta b/TestProjects/UniversalGraphicsTest/Assets/Test/TestFilters/TestCaseFilters.asset.meta
@@ -106,14 +106,52 @@ public void Setup(string rootImageTemplatePath)
 
             var sceneIndex = 0;
             var totalScenes = EditorBuildSettings.scenes.Length;
-
-            foreach( EditorBuildSettingsScene scene in EditorBuildSettings.scenes)
+
+            string[] filterGUIDs = AssetDatabase.FindAssets("t:TestFilters");
+
+            List<TestFilters> filters = new List<TestFilters>();
+            foreach (var filterGUID in filterGUIDs)
+            {
+                string filterPath = AssetDatabase.GUIDToAssetPath(filterGUID);
+                filters.Add(AssetDatabase.LoadAssetAtPath(filterPath, typeof(TestFilters)) as TestFilters);
+            }
+            // Disabling scenes directly in EditorBuildSettings.scenes does not work
+            // As a solution - disabling scenes in temporary variable and then assigning it back to EditorBuildSettings.scenes
+            EditorBuildSettingsScene[] scenes = EditorBuildSettings.scenes;
+
+            foreach( EditorBuildSettingsScene scene in scenes)
             {
                 if (!scene.enabled) continue;
 
+                if (filters.Count > 0)
+                {
+                    // Right now leaving only single filter available per project.
+                    var filtersForScene = filters.First().filters.Where(f => AssetDatabase.GetAssetPath(f.FilteredScene) == scene.path);
+                    bool enableScene = true;
+                    string filterReasons = "";
+
+                    foreach (var filter in filtersForScene)
+                    {
+                        if ((filter.BuildPlatform == buildPlatform || filter.BuildPlatform == BuildTarget.NoTarget) &&
+                            (filter.GraphicsDevice == graphicsDevices.First() || filter.GraphicsDevice == GraphicsDeviceType.Null) &&
+                            (filter.ColorSpace == colorSpace || filter.ColorSpace == ColorSpace.Uninitialized))
+                        {
+                            // Adding reasons in case when same test is ignored several times
+                            filterReasons += filter.Reason + "\n";
+                            enableScene = false;
+                        }
+                    }
+                    scene.enabled = enableScene;
+                    if (!enableScene)
+                    {
+                        Debug.Log(string.Format("Removed scene {0} from build settings because {1}", Path.GetFileNameWithoutExtension(scene.path), filterReasons));
+                        continue;
+                    }
+                }
+
                 SceneAsset sceneAsset = AssetDatabase.LoadAssetAtPath<SceneAsset>(scene.path);
                 var labels = new System.Collections.Generic.List<string>(AssetDatabase.GetLabels(sceneAsset));
-                
+
                 // if we successfully retrieved the names of the selected scenes, we filter using this list
                 if (selectedScenes.Length > 0 && !selectedScenes.Contains(sceneAsset.name))
                     continue;
@@ -141,8 +179,9 @@ public void Setup(string rootImageTemplatePath)
 
                 sceneIndex++;
             }
-            
+
             EditorUtility.ClearProgressBar();
+            EditorBuildSettings.scenes = scenes;
 
             if (!IsBuildingForEditorPlaymode)
                 new CreateSceneListFileFromBuildSettings().Setup();
@@ -169,7 +208,7 @@ string[] GetSelectedScenes()
                 );
 
                 dynamic testRunnerFilterArray = getSelectedTestsAsFilterMethod.Invoke(playModeListGUIValue, new object[] { selectedItems });
-                
+
                 var testNamesField = testRunnerFilterArray[0].GetType().GetField("testNames", BindingFlags.Instance | BindingFlags.Public);
 
                 List< string > testNames = new List<string>();

@@ -0,0 +1,13 @@
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEditor;
+
+[System.Serializable]
+public class TestFilterConfig
+{
+    public SceneAsset FilteredScene;
+    public ColorSpace ColorSpace = ColorSpace.Uninitialized;
+    public BuildTarget BuildPlatform = BuildTarget.NoTarget;
+    public GraphicsDeviceType GraphicsDevice = GraphicsDeviceType.Null;
+    public string Reason;
+}
@@ -0,0 +1,25 @@
+#if UNITY_EDITOR
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+
+[System.Serializable]
+[CreateAssetMenu(fileName = "TestCaseFilters", menuName = "Test Filter ScriptableObject", order = 1)]
+public class TestFilters : ScriptableObject
+{
+    public TestFilterConfig[] filters;
+
+    public TestFilters()
+    {
+        filters = new TestFilterConfig[1];
+    }
+
+    public void SortBySceneName()
+    {
+        Array.Sort(filters,
+            (a, b) => a.FilteredScene == null ? 1 : b.FilteredScene == null ? -1 : a.FilteredScene.name.CompareTo(b.FilteredScene.name));
+    }
+}
+#endif
@@ -0,0 +1,90 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+using UnityEditor.TestTools.Graphics;
+using UnityEngine.Rendering;
+using System;
+using System.Linq;
+
+[CustomEditor(typeof(TestFilters))]
+public class TestFiltersEditor : Editor
+{
+    SerializedProperty filters;
+
+    public void OnEnable()
+    {
+        filters = serializedObject.FindProperty("filters");
+    }
+
+    public override void OnInspectorGUI()
+    {
+        serializedObject.Update();
+        var lastSceneName = string.Empty;
+        var fieldLayoutOptions = new GUILayoutOption[]
+        {
+            GUILayout.MinWidth(40f),
+            GUILayout.MaxWidth(180f)
+        };
+
+
+        EditorGUILayout.BeginHorizontal();
+        GUILayout.Space(40);
+
+        EditorGUILayout.LabelField(new GUIContent("Scene", "The scene to apply this filter to"), fieldLayoutOptions);
+        EditorGUILayout.LabelField(new GUIContent("Reason", "The reason this config is filtered"), fieldLayoutOptions);
+        EditorGUILayout.LabelField(new GUIContent("Color Space", "Color space to filter, Unitialized will filter all color spaces."), fieldLayoutOptions);
+        EditorGUILayout.LabelField(new GUIContent("Platform", "The build platform to filter, No Target will filter all platforms."), fieldLayoutOptions);
+        EditorGUILayout.LabelField(new GUIContent("Graphics API", "The graphics api to filter, Null filters all apis."), fieldLayoutOptions);
+
+        EditorGUILayout.EndHorizontal();
+
+        for (int i = 0; i < filters.arraySize; i++)
+        {
+            var filterElement = filters.GetArrayElementAtIndex(i);
+
+            var scene = filterElement.FindPropertyRelative("FilteredScene");
+            var colorSpace = filterElement.FindPropertyRelative("ColorSpace");
+            var buildPlatform = filterElement.FindPropertyRelative("BuildPlatform");
+            var graphicsType = filterElement.FindPropertyRelative("GraphicsDevice");
+            var reason = filterElement.FindPropertyRelative("Reason");
+
+            EditorGUILayout.BeginHorizontal();
+            if (GUILayout.Button("del"))
+            {
+                filters.DeleteArrayElementAtIndex(i);
+                continue;
+            }
+
+            EditorGUILayout.PropertyField(scene, GUIContent.none, fieldLayoutOptions);
+            EditorGUILayout.PropertyField(reason, GUIContent.none, fieldLayoutOptions);
+            EditorGUILayout.PropertyField(colorSpace, GUIContent.none, fieldLayoutOptions);
+            EditorGUILayout.PropertyField(buildPlatform, GUIContent.none, fieldLayoutOptions);
+            EditorGUILayout.PropertyField(graphicsType, GUIContent.none, fieldLayoutOptions);
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        if (GUILayout.Button(new GUIContent("New Filter", "Add new filter"), EditorStyles.miniButtonMid))
+        {
+            filters.arraySize += 1;
+            var lastFilter = filters.GetArrayElementAtIndex(filters.arraySize - 1);
+            lastFilter.serializedObject.FindProperty("filters.Array.data[" + (filters.arraySize - 1) + "].FilteredScene").objectReferenceValue = null;
+            lastFilter.serializedObject.FindProperty("filters.Array.data[" + (filters.arraySize - 1) + "].Reason").stringValue = "";
+            lastFilter.serializedObject.FindProperty("filters.Array.data[" + (filters.arraySize - 1) + "].ColorSpace").intValue = (int)ColorSpace.Uninitialized;
+            lastFilter.serializedObject.FindProperty("filters.Array.data[" + (filters.arraySize - 1) + "].BuildPlatform").intValue = (int)BuildTarget.NoTarget;
+            lastFilter.serializedObject.FindProperty("filters.Array.data[" + (filters.arraySize - 1) + "].GraphicsDevice").intValue = (int)GraphicsDeviceType.Null;
+        }
+
+        serializedObject.ApplyModifiedProperties();
+
+        if (GUILayout.Button(new GUIContent("Sort", "Sort filters by scene name.")))
+        {
+            var filterObjectPath = AssetDatabase.GetAssetPath(target.GetInstanceID());
+            var filterObject = AssetDatabase.LoadAssetAtPath<TestFilters>(filterObjectPath);
+            filterObject.SortBySceneName();
+            EditorUtility.SetDirty(filterObject);
+            AssetDatabase.SaveAssets();
+        }
+    }
+}