Merge pull request #273 from nowsprinting/chore/fix_misc_in_tests

Fix misc in tests

Author: nowsprinting

Tests/Runtime/MonkeyTest.cs

@@ -213,7 +213,7 @@ public async Task Run_usingConfigObjects()
 
         [Test]
         [LoadScene(TestScene)]
-        [Description("Shown Gizmos, See for yourself! Be a witness!!")]
+        [Obsolete("MonkeyConfig.Gizmos is obsolete.")]
         public async Task Run_withGizmos_showGizmosAndReverted()
         {
             Assume.That(GameViewControlHelper.GetGizmos(), Is.False);

Tests/Runtime/Operators/UguiDragAndDropOperatorTest.cs

@@ -16,6 +16,7 @@ namespace TestHelper.UI.Operators
     [TestFixture]
     public class UguiDragAndDropOperatorTest
     {
+        private const string TestScene = "../../Scenes/Canvas.unity";
         private const int RandomTestRepeatCount = 10;
 
         private readonly IOperator _sut = new UguiDragAndDropOperator();
@@ -29,9 +30,7 @@ public void SetUp()
 
         private void SetOnCanvas(MonoBehaviour handler)
         {
-#pragma warning disable CS0618 // Type or member is obsolete
-            var canvas = GameObject.FindObjectOfType<Canvas>();
-#pragma warning restore CS0618 // Type or member is obsolete
+            var canvas = GameObject.Find("Canvas").GetComponent<Canvas>();
             Assume.That(canvas, Is.Not.Null, "Canvas not found in the scene.");
 
             handler.transform.SetParent(canvas.transform);
@@ -181,7 +180,7 @@ public void LotteryComponent_Empty_ReturnsNull()
         }
 
         [Test]
-        [LoadScene("../../Scenes/Canvas.unity")]
+        [LoadScene(TestScene)]
         public async Task LotteryComponent_OnlyNotReachable_ReturnsNull()
         {
             var notReachableHandler = CreateSpyDropHandler();
@@ -199,7 +198,7 @@ public async Task LotteryComponent_OnlyNotReachable_ReturnsNull()
         }
 
         [Test]
-        [LoadScene("../../Scenes/Canvas.unity")]
+        [LoadScene(TestScene)]
         [Repeat(5)]
         public async Task LotteryComponent_IncludeValidComponent_ReturnsComponent()
         {
@@ -221,7 +220,7 @@ public async Task LotteryComponent_IncludeValidComponent_ReturnsComponent()
         }
 
         [Test]
-        [LoadScene("../../Scenes/Canvas.unity")]
+        [LoadScene(TestScene)]
         [Repeat(5)]
         public async Task OperateAsync_ExistDropAnnotation_DropOnTarget()
         {
@@ -245,7 +244,7 @@ public async Task OperateAsync_ExistDropAnnotation_DropOnTarget()
         }
 
         [Test]
-        [LoadScene("../../Scenes/Canvas.unity")]
+        [LoadScene(TestScene)]
         public async Task OperateAsync_ExistDropHandlerObject_DropOnTarget()
         {
             var dragHandler = CreateSpyDragHandler();
@@ -264,7 +263,7 @@ public async Task OperateAsync_ExistDropHandlerObject_DropOnTarget()
         }
 
         [Test]
-        [LoadScene("../../Scenes/Canvas.unity")]
+        [LoadScene(TestScene)]
         [Repeat(RandomTestRepeatCount)]
         public async Task OperateAsync_NotExistDropTarget_DropOnRandomScreenPoint()
         {
@@ -286,7 +285,7 @@ public async Task OperateAsync_NotExistDropTarget_DropOnRandomScreenPoint()
         }
 
         [Test]
-        [LoadScene("../../Scenes/Canvas.unity")]
+        [LoadScene(TestScene)]
         public async Task OperateAsync_SpecifyDropTargetObject_DropOnTarget()
         {
             var dragHandler = CreateSpyDragHandler();
@@ -301,7 +300,7 @@ public async Task OperateAsync_SpecifyDropTargetObject_DropOnTarget()
         }
 
         [Test]
-        [LoadScene("../../Scenes/Canvas.unity")]
+        [LoadScene(TestScene)]
         public async Task OperateAsync_SpecifyDropTargetPoint_DropOnTarget()
         {
             var dragHandler = CreateSpyDragHandler();

Tests/Runtime/Operators/UguiScrollWheelOperatorTest.cs

@@ -250,20 +250,22 @@ public async Task OperateAsync_Cancel_ScrollCancelled()
             var rectTransform = content.GetComponent<RectTransform>();
             var beforePosition = rectTransform.position;
 
-            var cancellationTokenSource = new CancellationTokenSource();
-            var cancellationToken = cancellationTokenSource.Token;
+            using (var cancellationTokenSource = new CancellationTokenSource())
+            {
+                var cancellationToken = cancellationTokenSource.Token;
 
-            var sut = new UguiScrollWheelOperator(ScrollSpeed);
-            var task = sut.OperateAsync(_scrollView, Vector2.up, 300, cancellationToken: cancellationToken);
-            await UniTask.NextFrame(cancellationToken);
+                var sut = new UguiScrollWheelOperator(ScrollSpeed);
+                var task = sut.OperateAsync(_scrollView, Vector2.up, 300, cancellationToken: cancellationToken);
+                await UniTask.NextFrame(cancellationToken);
 
-            var frameSpeed = ScrollSpeed * Time.deltaTime;
-            var expectedPositionY = beforePosition.y - frameSpeed;
+                var frameSpeed = ScrollSpeed * Time.deltaTime;
+                var expectedPositionY = beforePosition.y - frameSpeed;
 
-            cancellationTokenSource.Cancel();
-            await task; // Cancelled
+                cancellationTokenSource.Cancel();
+                await task; // Cancelled
 
-            Assert.That(rectTransform.position.y, Is.EqualTo(expectedPositionY).Within(10.0f));
+                Assert.That(rectTransform.position.y, Is.EqualTo(expectedPositionY).Within(10.0f));
+            }
         }
 
         private static IEnumerable<TestCaseData> DirectionAndDistanceCases()
@@ -322,6 +324,7 @@ public async Task OperateAsync_OnPointerEnterAndExitCalled()
         [TestCase(30f, 20f)]
         [TestCase(-30f, -20f)]
         [LoadScene(TestScene)]
+        [Obsolete("UguiScrollWheelOperator.OperateAsync(GameObject, Vector2) is obsoleted.")]
         public async Task OperateAsync_WithDestination_Scrolled(float x, float y)
         {
             var destination = new Vector2(x, y);