Merge Upstream-Develop

Author: StayTalm

Assets/Samples/Visualizers/InputControlVisualizer.cs

@@ -281,7 +281,7 @@ private static void OnEvent(InputEventPtr eventPtr, InputDevice device)
             for (var i = 0; i < s_EnabledInstances.Count; ++i)
             {
                 var component = s_EnabledInstances[i];
-                if (component.m_Control.device != device || component.m_Visualizer == null)
+                if (component.m_Control?.device != device || component.m_Visualizer == null)
                     continue;
 
                 component.OnEventImpl(eventPtr);

Assets/Tests/InputSystem/APIVerificationTests.cs

@@ -138,13 +138,16 @@ public void API_MethodReturnTypesAreNotIntPtr()
 
     [Test]
     [Category("API")]
-    public void API_ControlTypesHavePreserveAttribute()
+    [TestCase(typeof(InputControl))]
+    [TestCase(typeof(IInputInteraction))]
+    [TestCase(typeof(InputBindingComposite))]
+    [TestCase(typeof(InputProcessor))]
+    public void API_TypesCreatedByReflectionHavePreserveAttribute(Type type)
     {
-        var controlType = typeof(InputControl);
-        var controlTypes = controlType.Assembly.GetTypes().Where(t => controlType.IsAssignableFrom(t));
-        Assert.That(controlTypes, Is.Not.Empty);
-        var controlTypesWithoutPreserveAttribute = controlTypes.Where(t => !t.CustomAttributes.Any(a => a.AttributeType.Name.Contains("PreserveAttribute")));
-        Assert.That(controlTypesWithoutPreserveAttribute, Is.Empty);
+        var types = type.Assembly.GetTypes().Where(t => type.IsAssignableFrom(t)).Concat(typeof(APIVerificationTests).Assembly.GetTypes().Where(t => type.IsAssignableFrom(t)));
+        Assert.That(types, Is.Not.Empty);
+        var typesWithoutPreserveAttribute = types.Where(t => !t.CustomAttributes.Any(a => a.AttributeType.Name.Contains("PreserveAttribute")));
+        Assert.That(typesWithoutPreserveAttribute, Is.Empty);
     }
 
     [Test]

Assets/Tests/InputSystem/CoreTests_Actions.cs

@@ -5,6 +5,7 @@
 using System.Text.RegularExpressions;
 using NUnit.Framework;
 using UnityEngine;
+using UnityEngine.Scripting;
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.Composites;
 using UnityEngine.InputSystem.Controls;
@@ -1389,8 +1390,16 @@ public void Actions_WithMultipleBoundControls_DriveInteractionsFromControlWithGr
             // binding makes that order dependent on the order of controls in Gamepad.
             //
             // So in effect, we get a sequence of Performed calls here that is a little surprising.
+            //
+            // However, it also turns out that our stripping code may not keep the order of controls when rewriting the
+            // updated assemblies, which makes this test indeterministic in players. So we test for the specific callbacks
+            // only in the editor. In players, we just make sure that the first and last callbacks match our expectations.
             actions = trace.ToArray();
+
+            #if UNITY_EDITOR
             Assert.That(actions, Has.Length.EqualTo(5));
+            #endif
+
             Assert.That(actions[0].phase, Is.EqualTo(InputActionPhase.Started));
             Assert.That(actions[0].control, Is.SameAs(gamepad.buttonSouth));
             Assert.That(actions[0].action, Is.SameAs(buttonAction));
@@ -1399,21 +1408,25 @@ public void Actions_WithMultipleBoundControls_DriveInteractionsFromControlWithGr
             Assert.That(actions[1].control, Is.SameAs(gamepad.buttonSouth));
             Assert.That(actions[1].action, Is.SameAs(buttonAction));
             Assert.That(actions[1].ReadValue<float>(), Is.EqualTo(1).Within(0.00001));
+
+            #if UNITY_EDITOR
             Assert.That(actions[2].phase, Is.EqualTo(InputActionPhase.Performed));
             Assert.That(actions[2].control, Is.SameAs(gamepad.buttonWest)); // Control immediately following buttonSouth in list of controls.
             Assert.That(actions[2].action, Is.SameAs(buttonAction));
             Assert.That(actions[2].ReadValue<float>(), Is.EqualTo(1).Within(0.00001));
-            Assert.That(actions[3].phase, Is.EqualTo(InputActionPhase.Performed)); // Control following buttonWest in list of controls.
-            Assert.That(actions[3].control, Is.SameAs(gamepad.buttonNorth));
-            Assert.That(actions[3].action, Is.SameAs(buttonAction));
-            Assert.That(actions[3].ReadValue<float>(), Is.EqualTo(1).Within(0.00001));
-            Assert.That(actions[4].phase, Is.EqualTo(InputActionPhase.Canceled));
-            Assert.That(actions[4].control, Is.SameAs(gamepad.buttonNorth));
-            Assert.That(actions[4].action, Is.SameAs(buttonAction));
-            Assert.That(actions[4].ReadValue<float>(), Is.Zero.Within(0.00001));
+            #endif
+
+            Assert.That(actions[actions.Length - 2].phase, Is.EqualTo(InputActionPhase.Performed)); // Last control to be actuated.
+            Assert.That(actions[actions.Length - 2].control, Is.SameAs(gamepad.buttonNorth));
+            Assert.That(actions[actions.Length - 2].action, Is.SameAs(buttonAction));
+            Assert.That(actions[actions.Length - 2].ReadValue<float>(), Is.EqualTo(1).Within(0.00001));
+            Assert.That(actions[actions.Length - 1].control, Is.SameAs(gamepad.buttonNorth));
+            Assert.That(actions[actions.Length - 1].action, Is.SameAs(buttonAction));
+            Assert.That(actions[actions.Length - 1].ReadValue<float>(), Is.Zero.Within(0.00001));
         }
     }
 
+    [Preserve]
     private class ReleaseOnlyTestInteraction : IInputInteraction<float>
     {
         private bool m_WaitingForRelease;
@@ -2688,6 +2701,7 @@ public void Actions_IncompatibleProcessorIsIgnored()
     }
 
     // ReSharper disable once ClassNeverInstantiated.Local
+    [Preserve]
     private class ConstantVector2TestProcessor : InputProcessor<Vector2>
     {
         public override Vector2 Process(Vector2 value, InputControl<Vector2> control)
@@ -2876,6 +2890,7 @@ public void Actions_CanFindEnabledActions()
     }
 
     // ReSharper disable once ClassNeverInstantiated.Local
+    [Preserve]
     private class TestInteraction : IInputInteraction
     {
 #pragma warning disable CS0649
@@ -4266,6 +4281,7 @@ public void Actions_RegisteringExistingCompositeUnderNewName_CreatesAlias()
     #endif // UNITY_EDITOR
 
     #pragma warning disable CS0649
+    [Preserve]
     private class CompositeWithParameters : InputBindingComposite<float>
     {
         public int intParameter;
@@ -4685,6 +4701,7 @@ public void Actions_CanCreateComposite_WithPartsBeingOutOfOrder()
         }
     }
 
+    [Preserve]
     private class LogInteraction : IInputInteraction
     {
         public void Process(ref InputInteractionContext context)
@@ -5008,6 +5025,7 @@ public void Actions_CompositesReportControlThatTriggeredTheCompositeInCallback()
         LogAssert.NoUnexpectedReceived();
     }
 
+    [Preserve]
     private class CompositeWithVector2Part : InputBindingComposite<Vector2>
     {
         [InputControlAttribute(layout = "Vector2")]
@@ -5041,6 +5059,7 @@ public void Actions_CanCreateCompositeWithVector2PartBinding()
         }
     }
 
+    [Preserve]
     private class CompositeAskingForSourceControl : InputBindingComposite<float>
     {
         [InputControl(layout = "Button")]
@@ -5818,6 +5837,7 @@ public void Actions_ExceptionsInCallbacksAreCaughtAndLogged()
         LogAssert.NoUnexpectedReceived();
     }
 
+    [Preserve]
     class TestInteractionCheckingDefaultState : IInputInteraction
     {
         public void Process(ref InputInteractionContext context)

Assets/Tests/InputSystem/CoreTests_Controls.cs

@@ -1011,6 +1011,7 @@ public void Controls_CanTurnControlPathIntoHumanReadableText()
         Assert.That(InputControlPath.ToHumanReadableString("*/{PrimaryMotion}/x"), Is.EqualTo("PrimaryMotion/x [Any]"));
         Assert.That(InputControlPath.ToHumanReadableString("<Gamepad>/buttonSouth"), Is.EqualTo("Button South [Gamepad]"));
         Assert.That(InputControlPath.ToHumanReadableString("<XInputController>/buttonSouth"), Is.EqualTo("A [Xbox Controller]"));
+        Assert.That(InputControlPath.ToHumanReadableString("<Touchscreen>/touch4/tap"), Is.EqualTo("Touch #4/Tap [Touchscreen]"));
 
         Assert.That(
             InputControlPath.ToHumanReadableString("<Gamepad>/buttonSouth",

Assets/Tests/InputSystem/CoreTests_Devices.cs

@@ -13,6 +13,7 @@
 using UnityEngine.InputSystem.DualShock;
 using UnityEngine.InputSystem.Utilities;
 using UnityEngine.Profiling;
+using UnityEngine.Scripting;
 using UnityEngine.TestTools;
 using UnityEngine.TestTools.Utils;
 using Gyroscope = UnityEngine.InputSystem.Gyroscope;
@@ -542,6 +543,7 @@ public void Devices_RemovingLastDeviceThatUsesBeforeRenderUpdates_CausesBeforeRe
         Assert.That(InputSystem.s_Manager.updateMask & InputUpdateType.BeforeRender, Is.EqualTo((InputUpdateType)0));
     }
 
+    [Preserve]
     private class TestDeviceReceivingAddAndRemoveNotification : Mouse
     {
         public int addedCount;
@@ -942,6 +944,7 @@ public void Devices_ChangingStateOfDevice_TriggersNotification()
         Assert.That(receivedEventPtr.IsA<StateEvent>(), Is.True);
     }
 
+    [Preserve]
     private class TestDeviceThatResetsStateInCallback : InputDevice, IInputStateCallbackReceiver
     {
         [InputControl(format = "FLT")]
@@ -1029,6 +1032,7 @@ private unsafe struct TestDeviceFullState : IInputStateTypeInfo
     }
 
     [InputControlLayout(stateType = typeof(TestDeviceFullState))]
+    [Preserve]
     private class TestDeviceIntegratingStateItself : InputDevice, IInputStateCallbackReceiver
     {
         public void OnNextUpdate()

Assets/Tests/InputSystem/CoreTests_Editor.cs

@@ -7,6 +7,7 @@
 using System.CodeDom.Compiler;
 using NUnit.Framework;
 using UnityEditor;
+using UnityEngine.Scripting;
 using UnityEditor.IMGUI.Controls;
 using UnityEngine;
 using UnityEngine.InputSystem;
@@ -1923,6 +1924,7 @@ public void Editor_CanGetValueTypeOfProcessor()
         Assert.That(InputProcessor.GetValueTypeFromType(typeof(ScaleProcessor)), Is.SameAs(typeof(float)));
     }
 
+    [Preserve]
     private class TestInteractionWithValueType : IInputInteraction<float>
     {
         public void Process(ref InputInteractionContext context)

Assets/Tests/InputSystem/CoreTests_Events.cs

@@ -5,6 +5,7 @@
 using NUnit.Framework;
 using Unity.Collections.LowLevel.Unsafe;
 using UnityEngine;
+using UnityEngine.Scripting;
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.Controls;
 using UnityEngine.InputSystem.Layouts;
@@ -624,6 +625,7 @@ struct StateWith2Bytes : IInputStateTypeInfo
     }
 
     [InputControlLayout(stateType = typeof(StateWith2Bytes))]
+    [Preserve]
     class DeviceWith2ByteState : InputDevice
     {
     }
@@ -840,6 +842,7 @@ private struct CustomDeviceState : IInputStateTypeInfo
     }
 
     [InputControlLayout(stateType = typeof(CustomDeviceState))]
+    [Preserve]
     private class CustomDevice : InputDevice
     {
         public AxisControl axis { get; private set; }
@@ -852,6 +855,7 @@ protected override void FinishSetup()
     }
 
     [InputControlLayout(stateType = typeof(CustomDeviceState))]
+    [Preserve]
     private class CustomDeviceWithUpdate : CustomDevice, IInputUpdateCallbackReceiver
     {
         public int onUpdateCallCount;