Skip to content

Commit c870b7e

Browse files
committed
refactored to use TestCase instead of array of parameters
1 parent a9cff76 commit c870b7e

File tree

1 file changed

+23
-11
lines changed

1 file changed

+23
-11
lines changed

Assets/Tests/InputSystem/CoreTests_MouseEvents.cs

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
partial class CoreTests
1212
{
13-
internal GameObject SetUpScene(Type pointerType, out Pointer pointer)
13+
private GameObject SetUpScene(string pointerType, out Pointer pointer)
1414
{
1515
var gameObject = GameObject.CreatePrimitive(PrimitiveType.Cube);
1616
gameObject.transform.position = Vector3.zero;
@@ -22,13 +22,12 @@ internal GameObject SetUpScene(Type pointerType, out Pointer pointer)
2222
return gameObject;
2323
}
2424

25-
private static readonly Type[] _testDevices = new Type[] { typeof(Mouse), typeof(Pen), typeof(Touchscreen) };
26-
// OnMouseOver/Exit and Hover events are not supported for touch
27-
private static readonly Type[] _testDevicesNoTouch = new Type[] { typeof(Mouse), typeof(Pen) };
28-
2925
[UnityTest]
26+
[TestCase("Pen", ExpectedResult = null)]
27+
[TestCase("Touchscreen", ExpectedResult = null)]
28+
[TestCase("Mouse", ExpectedResult = null)]
3029
[Category("MouseEvents")]
31-
public IEnumerator MouseEvents_CanReceiveOnMouseDown([ValueSource(nameof(_testDevices))] Type pointerType)
30+
public IEnumerator MouseEvents_CanReceiveOnMouseDown(string pointerType)
3231
{
3332
var gameObject = SetUpScene(pointerType, out var pointer);
3433
gameObject.AddComponent<OnMouseEventsTest>();
@@ -41,8 +40,11 @@ public IEnumerator MouseEvents_CanReceiveOnMouseDown([ValueSource(nameof(_testDe
4140
}
4241

4342
[UnityTest]
43+
[TestCase("Pen", ExpectedResult = null)]
44+
[TestCase("Touchscreen", ExpectedResult = null)]
45+
[TestCase("Mouse", ExpectedResult = null)]
4446
[Category("MouseEvents")]
45-
public IEnumerator MouseEvents_CanReceiveOnMouseUp([ValueSource(nameof(_testDevices))] Type pointerType)
47+
public IEnumerator MouseEvents_CanReceiveOnMouseUp(string pointerType)
4648
{
4749
var gameObject = SetUpScene(pointerType, out var pointer);
4850
gameObject.AddComponent<OnMouseEventsTest>();
@@ -55,8 +57,11 @@ public IEnumerator MouseEvents_CanReceiveOnMouseUp([ValueSource(nameof(_testDevi
5557
}
5658

5759
[UnityTest]
60+
[TestCase("Pen", ExpectedResult = null)]
61+
[TestCase("Touchscreen", ExpectedResult = null)]
62+
[TestCase("Mouse", ExpectedResult = null)]
5863
[Category("MouseEvents")]
59-
public IEnumerator MouseEvents_CanReceiveOnMouseUpAsButton([ValueSource(nameof(_testDevices))] Type pointerType)
64+
public IEnumerator MouseEvents_CanReceiveOnMouseUpAsButton(string pointerType)
6065
{
6166
var gameObject = SetUpScene(pointerType, out var pointer);
6267
gameObject.AddComponent<OnMousEventTestTwo>();
@@ -69,8 +74,11 @@ public IEnumerator MouseEvents_CanReceiveOnMouseUpAsButton([ValueSource(nameof(_
6974
}
7075

7176
[UnityTest]
77+
[TestCase("Pen", ExpectedResult = null)]
78+
[TestCase("Touchscreen", ExpectedResult = null)]
79+
[TestCase("Mouse", ExpectedResult = null)]
7280
[Category("MouseEvents")]
73-
public IEnumerator MouseEvents_CanReceiveOnMouseDrag([ValueSource(nameof(_testDevices))] Type pointerType)
81+
public IEnumerator MouseEvents_CanReceiveOnMouseDrag(string pointerType)
7482
{
7583
var gameObject = SetUpScene(pointerType, out var pointer);
7684
gameObject.AddComponent<OnMouseEventsTest>();
@@ -85,8 +93,10 @@ public IEnumerator MouseEvents_CanReceiveOnMouseDrag([ValueSource(nameof(_testDe
8593
}
8694

8795
[UnityTest]
96+
[TestCase("Pen", ExpectedResult = null)]
97+
[TestCase("Mouse", ExpectedResult = null)]
8898
[Category("MouseEvents")]
89-
public IEnumerator MouseEvents_CanReceiveOnMouseEnterAndMouseExit([ValueSource(nameof(_testDevicesNoTouch))] Type pointerType)
99+
public IEnumerator MouseEvents_CanReceiveOnMouseEnterAndMouseExit(string pointerType)
90100
{
91101
var gameObject = SetUpScene(pointerType, out var pointer);
92102
gameObject.AddComponent<OnMouseEventsTest>();
@@ -103,8 +113,10 @@ public IEnumerator MouseEvents_CanReceiveOnMouseEnterAndMouseExit([ValueSource(n
103113
}
104114

105115
[UnityTest]
116+
[TestCase("Pen", ExpectedResult = null)]
117+
[TestCase("Mouse", ExpectedResult = null)]
106118
[Category("MouseEvents")]
107-
public IEnumerator MouseEvents_CanReceiveOnMouseOver([ValueSource(nameof(_testDevicesNoTouch))] Type pointerType)
119+
public IEnumerator MouseEvents_CanReceiveOnMouseOver(string pointerType)
108120
{
109121
var gameObject = SetUpScene(pointerType, out var pointer);
110122
gameObject.AddComponent<OnMousEventTestTwo>();

0 commit comments

Comments
 (0)