Merge branch 'develop' into isx-2279-spike-module-dependency

Author: ekcoh

.github/codecov.yml

@@ -0,0 +1,41 @@
+codecov:
+  max_report_age: false
+  require_ci_to_pass: false
+  notify:
+    wait_for_ci: true
+
+coverage:
+  precision: 2
+  round: down
+  range: "50...70"
+  status:
+    patch:
+      default:
+        target: auto
+        threshold: 1%
+        base: auto
+        if_ci_failed: success
+        informational: true
+        only_pulls: true
+    default_rules:
+      flag_coverage_not_uploaded_behavior: exclude
+    project:
+      default:
+        target: auto
+        threshold: 1%
+        base: auto
+        if_ci_failed: success
+        informational: true
+        only_pulls: true
+
+comment:
+  layout: "diff,flags,files"
+  behavior: default
+  require_changes: false
+  require_base: true
+  require_head: true
+  after_n_builds: 1
+
+flag_management:
+  default_rules:
+    carryforward: true

.yamato/analyze.yml

@@ -17,10 +17,7 @@ code_analyser:
     - upm-ci project test --project-path Tools/CodeAnalyzerTestProject -u 2021.3
   triggers:
     cancel_old_ci: true
-    pull_requests:
-      - targets:
-          only:
-            - "develop"
+    expression: pull_request.(target eq "develop" AND NOT changes.all match "**/*.md")
   artifacts:
     UTR_Output.zip:
       paths:

.yamato/config.metadata

@@ -6,6 +6,8 @@ editors:
     run_tvos: false
   - version: 6000.1
     run_tvos: false
+  - version: 6000.2
+    run_tvos: false
   - version: trunk
     run_tvos: false    
 

.yamato/format.yml

@@ -12,7 +12,4 @@ check_formatting:
     - perl unity-meta/Tools/Format/format.pl Assets Packages --dry-run
   triggers:
     cancel_old_ci: true
-    pull_requests:
-      - targets:
-          only:
-            - "develop"
+    expression: pull_request.(target eq "develop" AND NOT changes.all match "**/*.md")

.yamato/test-samples.yml

@@ -14,10 +14,7 @@ test_sample_projects_{{ editor.version }}:
     - Editor=.Editor/Unity.app/Contents/MacOS/Unity Method=DryRun sh ExternalSampleProjects/publish.sh 
   triggers:
     cancel_old_ci: true
-    pull_requests:
-      - targets:
-          only:
-            - "develop"
+    expression: pull_request.(target eq "develop" AND NOT changes.all match "**/*.md")
   artifacts:
     UTR_Output.zip:
       paths:

.yamato/upm-ci.yml

@@ -0,0 +1,112 @@
+#if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS && UNITY_6000_0_OR_NEWER
+
+using System;
+using NUnit.Framework;
+using System.Collections;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.InputSystem;
+using UnityEngine.InputSystem.Editor;
+using UnityEngine.TestTools;
+using UnityEngine.UIElements;
+
+internal enum SomeEnum
+{
+    OptionA = 10,
+    OptionB = 20
+}
+
+#if UNITY_EDITOR
+[InitializeOnLoad]
+#endif
+internal class CustomProcessor : InputProcessor<float>
+{
+    public SomeEnum SomeEnum;
+
+#if UNITY_EDITOR
+    static CustomProcessor()
+    {
+        Initialize();
+    }
+
+#endif
+
+    [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
+    private static void Initialize()
+    {
+        InputSystem.RegisterProcessor<CustomProcessor>();
+    }
+
+    public override float Process(float value, InputControl control)
+    {
+        return value;
+    }
+}
+
+internal class CustomProcessorEnumTest : UIToolkitBaseTestWindow<InputActionsEditorWindow>
+{
+    InputActionAsset m_Asset;
+
+    public override void OneTimeSetUp()
+    {
+        base.OneTimeSetUp();
+        m_Asset = AssetDatabaseUtils.CreateAsset<InputActionAsset>();
+
+        var actionMap = m_Asset.AddActionMap("Action Map");
+
+        actionMap.AddAction("Action", InputActionType.Value, processors: "Custom(SomeEnum=10)");
+    }
+
+    public override void OneTimeTearDown()
+    {
+        AssetDatabaseUtils.Restore();
+        base.OneTimeTearDown();
+    }
+
+    public override IEnumerator UnitySetup()
+    {
+        m_Window = InputActionsEditorWindow.OpenEditor(m_Asset);
+        yield return null;
+    }
+
+    [UnityTest]
+    public IEnumerator ProcessorEnum_ShouldSerializeByValue_WhenSerializedToAsset()
+    {
+        // Serialize current asset to JSON, and check that initial JSON contains default enum value for OptionA
+        var json = m_Window.currentAssetInEditor.ToJson();
+
+        Assert.That(json.Contains("Custom(SomeEnum=10)"), Is.True,
+            "Serialized JSON does not contain the expected custom processor string for OptionA.");
+
+        // Query the dropdown with exactly two enum choices and check that the drop down is present in the UI
+        var dropdownList = m_Window.rootVisualElement.Query<DropdownField>().Where(d => d.choices.Count == 2).ToList();
+        Assume.That(dropdownList.Count > 0, Is.True, "Enum parameter dropdown not found in the UI.");
+
+        // Determine the new value to be set in the dropdown, focus the dropdown before dispatching the change
+        var dropdown = dropdownList.First();
+        var newValue = dropdown.choices[1];
+        dropdown.Focus();
+        dropdown.value = newValue;
+
+        // Create and send a change event from OptionA to OptionB
+        var changeEvent = ChangeEvent<Enum>.GetPooled(SomeEnum.OptionA, SomeEnum.OptionB);
+        changeEvent.target = dropdown;
+        dropdown.SendEvent(changeEvent);
+
+        // Find the save button in the window, focus and click the save button to persist the changes
+        var saveButton = m_Window.rootVisualElement.Q<Button>("save-asset-toolbar-button");
+        Assume.That(saveButton, Is.Not.Null, "Save Asset button not found in the UI.");
+        saveButton.Focus();
+        SimulateClickOn(saveButton);
+
+        Assert.That(dropdown.value, Is.EqualTo(newValue));
+
+        // Verify that the updated JSON contains the new enum value for OpitonB
+        var updatedJson = m_Window.currentAssetInEditor.ToJson();
+        Assert.That(updatedJson.Contains("Custom(SomeEnum=20)"), Is.True, "Serialized JSON does not contain the updated custom processor string for OptionB.");
+
+        yield return null;
+    }
+}
+#endif

Assets/Tests/InputSystem.Editor/CustomProcessorEnumTest.cs

@@ -74,7 +74,6 @@ IEnumerator WaitForActionRename(int index, bool isActive, double timeoutSecs = 5
     #endregion
 
     [Test]
-    [Ignore("Instability, see ISXB-1284")]
     public void CanListActionMaps()
     {
         var actionMapsContainer = m_Window.rootVisualElement.Q("action-maps-container");
@@ -88,7 +87,6 @@ public void CanListActionMaps()
     }
 
     [UnityTest]
-    [Ignore("Instability, see ISXB-1284")]
     public IEnumerator CanCreateActionMap()
     {
         var button = m_Window.rootVisualElement.Q<Button>("add-new-action-map-button");
@@ -117,7 +115,6 @@ public IEnumerator CanCreateActionMap()
     }
 
     [UnityTest]
-    [Ignore("Instability, see ISXB-1284")]
     public IEnumerator CanRenameActionMap()
     {
         var actionMapsContainer = m_Window.rootVisualElement.Q("action-maps-container");
@@ -166,7 +163,6 @@ public IEnumerator CanRenameActionMap()
     }
 
     [UnityTest]
-    [Ignore("Instability, see ISXB-1284")]
     public IEnumerator CanDeleteActionMap()
     {
         var actionMapsContainer = m_Window.rootVisualElement.Q("action-maps-container");
@@ -195,7 +191,6 @@ public IEnumerator CanDeleteActionMap()
     }
 
     [UnityTest]
-    [Ignore("Instability, see ISXB-1284")]
     public IEnumerator CanRenameAction()
     {
         var actionContainer = m_Window.rootVisualElement.Q("actions-container");
@@ -215,6 +210,8 @@ public IEnumerator CanRenameAction()
 
         // Click twice to start the rename
         SimulateClickOn(actionItem[1]);
+        yield return WaitForNotDirty();
+
         // If the item is already focused, don't click again
         if (!actionItem[1].IsFocused)
         {

Assets/Tests/InputSystem.Editor/CustomProcessorEnumTest.cs.meta

@@ -236,7 +236,7 @@ public void Report(string message)
         }
     }
 
-    [Test(Description = "Verifies that the default asset do not generate any verification errors (Regardless of existing requirements)")]
+    [Test(Description = "Verifies that the default asset does not generate any verification errors (Regardless of existing requirements)")]
     [Category(kTestCategory)]
     public void ProjectWideActions_ShouldSupportAssetVerification_AndHaveNoVerificationErrorsForDefaultAsset()
     {