Skip to content

Commit b0201e1

Browse files
ritamerklritamerkl
committed
added defines and outsourced code duplication
1 parent b1cf800 commit b0201e1

File tree

1 file changed

+25
-61
lines changed

1 file changed

+25
-61
lines changed

‎Assets/Tests/InputSystem/CoreTests_MouseEvents.cs‎

Lines changed: 25 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#if UNITY_6000_3_OR_NEWER
12
using System;
23
using System.Collections;
34
using NUnit.Framework;
@@ -21,19 +22,25 @@ public override void TearDown()
2122
base.TearDown();
2223
}
2324

25+
internal GameObject SetUpScene()
26+
{
27+
var gameObject = GameObject.CreatePrimitive(PrimitiveType.Cube);
28+
gameObject.transform.position = Vector3.zero;
29+
var camera = new GameObject("MainCamera").AddComponent<Camera>();
30+
camera.transform.position = new Vector3(0, 0, -2f);
31+
camera.tag = "MainCamera";
32+
return gameObject;
33+
}
34+
2435
#region Mouse
2536
[UnityTest]
2637
[Category("MouseEvents")]
2738
public IEnumerator MouseEvents_CanReceiveOnMouseDown()
2839
{
2940
var mouse = InputSystem.AddDevice<Mouse>();
3041

31-
var gameObject = GameObject.CreatePrimitive(PrimitiveType.Cube);
42+
var gameObject = SetUpScene();
3243
gameObject.AddComponent<OnMouseEventsTest>();
33-
gameObject.transform.position = Vector3.zero;
34-
var camera = new GameObject("MainCamera").AddComponent<Camera>();
35-
camera.transform.position = new Vector3(0, 0, -2f);
36-
camera.tag = "MainCamera";
3744
var vec = Camera.main.WorldToScreenPoint(gameObject.transform.position);
3845
SetMouse(mouse, new Vector2(vec.x, vec.y), 1f);
3946

@@ -48,12 +55,8 @@ public IEnumerator MouseEvents_CanReceiveOnMouseUp()
4855
{
4956
var mouse = InputSystem.AddDevice<Mouse>();
5057

51-
var gameObject = GameObject.CreatePrimitive(PrimitiveType.Cube);
58+
var gameObject = SetUpScene();
5259
gameObject.AddComponent<OnMouseEventsTest>();
53-
gameObject.transform.position = Vector3.zero;
54-
var camera = new GameObject("MainCamera").AddComponent<Camera>();
55-
camera.transform.position = new Vector3(0, 0, -2f);
56-
camera.tag = "MainCamera";
5760
var vec = Camera.main.WorldToScreenPoint(gameObject.transform.position);
5861
SetMouse(mouse, new Vector2(vec.x, vec.y), 1f);
5962
yield return null;
@@ -68,12 +71,8 @@ public IEnumerator MouseEvents_CanReceiveOnMouseUpAsButton()
6871
{
6972
var mouse = InputSystem.AddDevice<Mouse>();
7073

71-
var gameObject = GameObject.CreatePrimitive(PrimitiveType.Cube);
74+
var gameObject = SetUpScene();
7275
gameObject.AddComponent<OnMousEventTestTwo>();
73-
gameObject.transform.position = Vector3.zero;
74-
var camera = new GameObject("MainCamera").AddComponent<Camera>();
75-
camera.transform.position = new Vector3(0, 0, -2f);
76-
camera.tag = "MainCamera";
7776
var vec = Camera.main.WorldToScreenPoint(gameObject.transform.position);
7877
SetMouse(mouse, new Vector2(vec.x, vec.y), 1f);
7978
yield return null;
@@ -88,12 +87,8 @@ public IEnumerator MouseEvents_CanReceiveOnMouseDrag()
8887
{
8988
var mouse = InputSystem.AddDevice<Mouse>();
9089

91-
var gameObject = GameObject.CreatePrimitive(PrimitiveType.Cube);
90+
var gameObject = SetUpScene();
9291
gameObject.AddComponent<OnMouseEventsTest>();
93-
gameObject.transform.position = Vector3.zero;
94-
var camera = new GameObject("MainCamera").AddComponent<Camera>();
95-
camera.transform.position = new Vector3(0, 0, -2f);
96-
camera.tag = "MainCamera";
9792
var vec = Camera.main.WorldToScreenPoint(gameObject.transform.position);
9893
SetMouse(mouse, new Vector2(vec.x, vec.y), 0f);
9994
yield return null;
@@ -112,12 +107,8 @@ public IEnumerator MouseEvents_CanReceiveOnMouseEnterAndMouseExit()
112107
{
113108
var mouse = InputSystem.AddDevice<Mouse>();
114109

115-
var gameObject = GameObject.CreatePrimitive(PrimitiveType.Cube);
110+
var gameObject = SetUpScene();
116111
gameObject.AddComponent<OnMouseEventsTest>();
117-
gameObject.transform.position = Vector3.zero;
118-
var camera = new GameObject("MainCamera").AddComponent<Camera>();
119-
camera.transform.position = new Vector3(0, 0, -2f);
120-
camera.tag = "MainCamera";
121112
var vec = Camera.main.WorldToScreenPoint(gameObject.transform.position);
122113
SetMouse(mouse, new Vector2(0, 0), 0f);
123114
yield return null;
@@ -136,12 +127,8 @@ public IEnumerator MouseEvents_CanReceiveOnMouseOver()
136127
{
137128
var mouse = InputSystem.AddDevice<Mouse>();
138129

139-
var gameObject = GameObject.CreatePrimitive(PrimitiveType.Cube);
130+
var gameObject = SetUpScene();
140131
gameObject.AddComponent<OnMousEventTestTwo>();
141-
gameObject.transform.position = Vector3.zero;
142-
var camera = new GameObject("MainCamera").AddComponent<Camera>();
143-
camera.transform.position = new Vector3(0, 0, -2f);
144-
camera.tag = "MainCamera";
145132
var vec = Camera.main.WorldToScreenPoint(gameObject.transform.position);
146133
SetMouse(mouse, new Vector2(vec.x, vec.y), 0f);
147134
yield return null;
@@ -171,12 +158,8 @@ public IEnumerator PenEvents_CanReceiveOnMouseDown()
171158
{
172159
var pen = InputSystem.AddDevice<Pen>();
173160

174-
var gameObject = GameObject.CreatePrimitive(PrimitiveType.Cube);
161+
var gameObject = SetUpScene();
175162
gameObject.AddComponent<OnMouseEventsTest>();
176-
gameObject.transform.position = Vector3.zero;
177-
var camera = new GameObject("MainCamera").AddComponent<Camera>();
178-
camera.transform.position = new Vector3(0, 0, -2f);
179-
camera.tag = "MainCamera";
180163
var vec = Camera.main.WorldToScreenPoint(gameObject.transform.position);
181164
SetPen(pen, new Vector2(vec.x, vec.y), 1f);
182165

@@ -191,12 +174,8 @@ public IEnumerator PenEvents_CanReceiveOnMouseUp()
191174
{
192175
var pen = InputSystem.AddDevice<Pen>();
193176

194-
var gameObject = GameObject.CreatePrimitive(PrimitiveType.Cube);
177+
var gameObject = SetUpScene();
195178
gameObject.AddComponent<OnMouseEventsTest>();
196-
gameObject.transform.position = Vector3.zero;
197-
var camera = new GameObject("MainCamera").AddComponent<Camera>();
198-
camera.transform.position = new Vector3(0, 0, -2f);
199-
camera.tag = "MainCamera";
200179
var vec = Camera.main.WorldToScreenPoint(gameObject.transform.position);
201180
SetPen(pen, new Vector2(vec.x, vec.y), 1f);
202181
yield return null;
@@ -211,12 +190,8 @@ public IEnumerator PenEvents_CanReceiveOnMouseUpAsButton()
211190
{
212191
var pen = InputSystem.AddDevice<Pen>();
213192

214-
var gameObject = GameObject.CreatePrimitive(PrimitiveType.Cube);
193+
var gameObject = SetUpScene();
215194
gameObject.AddComponent<OnMousEventTestTwo>();
216-
gameObject.transform.position = Vector3.zero;
217-
var camera = new GameObject("MainCamera").AddComponent<Camera>();
218-
camera.transform.position = new Vector3(0, 0, -2f);
219-
camera.tag = "MainCamera";
220195
var vec = Camera.main.WorldToScreenPoint(gameObject.transform.position);
221196
SetPen(pen, new Vector2(vec.x, vec.y), 1f);
222197
yield return null;
@@ -231,12 +206,8 @@ public IEnumerator PenEvents_CanReceiveOnMouseDrag()
231206
{
232207
var pen = InputSystem.AddDevice<Pen>();
233208

234-
var gameObject = GameObject.CreatePrimitive(PrimitiveType.Cube);
235-
gameObject.AddComponent<OnMousEventTestTwo>();
236-
gameObject.transform.position = Vector3.zero;
237-
var camera = new GameObject("MainCamera").AddComponent<Camera>();
238-
camera.transform.position = new Vector3(0, 0, -2f);
239-
camera.tag = "MainCamera";
209+
var gameObject = SetUpScene();
210+
gameObject.AddComponent<OnMouseEventsTest>();
240211
var vec = Camera.main.WorldToScreenPoint(gameObject.transform.position);
241212
SetPen(pen, new Vector2(vec.x, vec.y), 0f);
242213
yield return null;
@@ -255,12 +226,8 @@ public IEnumerator PenEvents_CanReceiveOnMouseEnterAndMouseExit()
255226
{
256227
var pen = InputSystem.AddDevice<Pen>();
257228

258-
var gameObject = GameObject.CreatePrimitive(PrimitiveType.Cube);
229+
var gameObject = SetUpScene();
259230
gameObject.AddComponent<OnMouseEventsTest>();
260-
gameObject.transform.position = Vector3.zero;
261-
var camera = new GameObject("MainCamera").AddComponent<Camera>();
262-
camera.transform.position = new Vector3(0, 0, -2f);
263-
camera.tag = "MainCamera";
264231
var vec = Camera.main.WorldToScreenPoint(gameObject.transform.position);
265232
SetPen(pen, new Vector2(0, 0), 0f);
266233
yield return null;
@@ -279,12 +246,8 @@ public IEnumerator PenEvents_CanReceiveOnMouseOver()
279246
{
280247
var pen = InputSystem.AddDevice<Pen>();
281248

282-
var gameObject = GameObject.CreatePrimitive(PrimitiveType.Cube);
249+
var gameObject = SetUpScene();
283250
gameObject.AddComponent<OnMousEventTestTwo>();
284-
gameObject.transform.position = Vector3.zero;
285-
var camera = new GameObject("MainCamera").AddComponent<Camera>();
286-
camera.transform.position = new Vector3(0, 0, -2f);
287-
camera.tag = "MainCamera";
288251
var vec = Camera.main.WorldToScreenPoint(gameObject.transform.position);
289252
SetPen(pen, new Vector2(vec.x, vec.y), 0f);
290253
yield return null;
@@ -352,3 +315,4 @@ private void OnMouseDrag()
352315
gameObject.transform.position = new Vector3(0, 0, 3);
353316
}
354317
}
318+
#endif

0 commit comments

Comments
 (0)