Skip to content

Commit 0895d8f

Browse files
nowsprintingnowsprinting
committed
Fix tests
1 parent 0832f82 commit 0895d8f

File tree

8 files changed

+110
-50
lines changed

8 files changed

+110
-50
lines changed

‎Samples~/uGUI Demo/Scripts/Runtime/MonkeyTestButton.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace TestHelper.UI.Samples.UguiDemo
1515
public class MonkeyTestButton : MonoBehaviour
1616
{
1717
[field: SerializeField]
18-
private int LifetimeSeconds { get; set; } = 10;
18+
public int LifetimeSeconds { get; set; } = 10;
1919

2020
[field: SerializeField]
2121
private int DelayMillis { get; set; } = 200;

‎Samples~/uGUI Demo/Tests/Runtime/ClickOperatorsTest.cs‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,35 +26,38 @@ public async Task SetUp()
2626

2727
[Test]
2828
[LoadScene(ScenePath)]
29-
public async Task Click()
29+
public async Task ClickClickButton()
3030
{
31-
var button = await _finder.FindByMatcherAsync(new ButtonMatcher(text: "Button"));
31+
var button = await _finder.FindByNameAsync("ClickButton");
3232
var clickOperator = new UguiClickOperator();
3333
Assume.That(clickOperator.CanOperate(button.GameObject), Is.True);
3434

3535
await clickOperator.OperateAsync(button.GameObject);
36+
await Task.Delay(1000); // wait for show popup
3637
}
3738

3839
[Test]
3940
[LoadScene(ScenePath)]
40-
public async Task DoubleClick()
41+
public async Task ClickDoubleClickButton()
4142
{
42-
var button = await _finder.FindByMatcherAsync(new ButtonMatcher(text: "Button"));
43+
var button = await _finder.FindByNameAsync("DoubleClickButton");
4344
var clickOperator = new UguiDoubleClickOperator();
4445
Assume.That(clickOperator.CanOperate(button.GameObject), Is.True);
4546

4647
await clickOperator.OperateAsync(button.GameObject);
48+
await Task.Delay(1000); // wait for show popup
4749
}
4850

4951
[Test]
5052
[LoadScene(ScenePath)]
51-
public async Task ClickAndHold()
53+
public async Task ClickClickAndHoldButton()
5254
{
53-
var button = await _finder.FindByMatcherAsync(new ButtonMatcher(text: "Button"));
55+
var button = await _finder.FindByNameAsync("ClickAndHoldButton");
5456
var clickOperator = new UguiClickAndHoldOperator();
5557
Assume.That(clickOperator.CanOperate(button.GameObject), Is.True);
5658

5759
await clickOperator.OperateAsync(button.GameObject);
60+
await Task.Delay(1000 + 1000); // wait for hold and show popup
5861
}
5962
}
6063
}

‎Samples~/uGUI Demo/Tests/Runtime/DragOperatorsTest.cs‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,38 @@ public async Task SetUp()
2626

2727
[Test]
2828
[LoadScene(ScenePath)]
29-
public async Task DragAndDrop()
29+
public async Task ClickDragButton()
3030
{
31-
var image = await _finder.FindByNameAsync("DraggableImage");
32-
var dragOperator = new UguiDragAndDropOperator();
33-
Assume.That(dragOperator.CanOperate(image.GameObject), Is.True);
31+
var button = await _finder.FindByNameAsync("DragButton");
32+
var clickOperator = new UguiClickOperator();
33+
Assume.That(clickOperator.CanOperate(button.GameObject), Is.True);
3434

35-
await dragOperator.OperateAsync(image.GameObject);
35+
await clickOperator.OperateAsync(button.GameObject);
36+
await Task.Delay(400 + 1000); // wait for drag and show popup
3637
}
3738

3839
[Test]
3940
[LoadScene(ScenePath)]
40-
public async Task Swipe()
41+
public async Task ClickFlickButton()
4142
{
42-
var image = await _finder.FindByNameAsync("DraggableImage");
43-
var dragOperator = new UguiSwipeOperator();
44-
Assume.That(dragOperator.CanOperate(image.GameObject), Is.True);
43+
var button = await _finder.FindByNameAsync("FlickButton");
44+
var clickOperator = new UguiClickOperator();
45+
Assume.That(clickOperator.CanOperate(button.GameObject), Is.True);
4546

46-
await dragOperator.OperateAsync(image.GameObject);
47+
await clickOperator.OperateAsync(button.GameObject);
48+
await Task.Delay(400 + 1000); // wait for drag and show popup
49+
}
50+
51+
[Test]
52+
[LoadScene(ScenePath)]
53+
public async Task ClickSwipeButton()
54+
{
55+
var button = await _finder.FindByNameAsync("SwipeButton");
56+
var clickOperator = new UguiClickOperator();
57+
Assume.That(clickOperator.CanOperate(button.GameObject), Is.True);
58+
59+
await clickOperator.OperateAsync(button.GameObject);
60+
await Task.Delay(400 + 1000); // wait for swipe and show popup
4761
}
4862
}
4963
}

‎Samples~/uGUI Demo/Tests/Runtime/GameObjectFinderTest.cs‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
// Copyright (c) 2023-2025 Koji Hasegawa.
2+
// This software is released under the MIT License.
3+
4+
using System.Threading.Tasks;
5+
using NUnit.Framework;
6+
using TestHelper.Attributes;
7+
using TestHelper.UI.GameObjectMatchers;
8+
using TestHelper.UI.Operators;
9+
using UnityEngine.UI;
10+
11+
namespace TestHelper.UI.Samples.UguiDemo
12+
{
13+
[TestFixture]
14+
public class GameObjectFinderTest
15+
{
16+
private const string ScenePath = "../../Scenes/uGUIDemo.unity";
17+
private readonly GameObjectFinder _finder = new GameObjectFinder();
18+
19+
[SetUp]
20+
public async Task SetUp()
21+
{
22+
var matcher = new ComponentMatcher(componentType: typeof(Dropdown), name: "TabSwitcher");
23+
var dropdown = await _finder.FindByMatcherAsync(matcher);
24+
dropdown.GameObject.GetComponent<Dropdown>().value = 0; // FinderDemo
25+
}
26+
27+
[Test]
28+
[LoadScene(ScenePath)]
29+
public async Task ClickFindButton()
30+
{
31+
var button = await _finder.FindByNameAsync("FindButton");
32+
var clickOperator = new UguiClickOperator();
33+
Assume.That(clickOperator.CanOperate(button.GameObject), Is.True);
34+
35+
await clickOperator.OperateAsync(button.GameObject);
36+
await Task.Delay(200 * 3 + 1000); // wait for GameObjectFinder timeout and show popup
37+
}
38+
39+
[Test]
40+
[LoadScene(ScenePath)]
41+
public async Task ClickPaginatorButton()
42+
{
43+
var button = await _finder.FindByNameAsync("PaginatorButton");
44+
var clickOperator = new UguiClickOperator();
45+
Assume.That(clickOperator.CanOperate(button.GameObject), Is.True);
46+
47+
await clickOperator.OperateAsync(button.GameObject);
48+
await Task.Delay(1000); // wait for show popup
49+
}
50+
}
51+
}

‎Samples~/uGUI Demo/Tests/Runtime/GameObjectFinderTest.cs.meta‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Samples~/uGUI Demo/Tests/Runtime/MonkeyTest.cs‎

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
using TestHelper.Attributes;
88
using TestHelper.UI.GameObjectMatchers;
99
using TestHelper.UI.Operators;
10-
using TestHelper.UI.ScreenshotFilenameStrategies;
11-
using TestHelper.UI.Visualizers;
1210
using UnityEngine.UI;
1311

1412
namespace TestHelper.UI.Samples.UguiDemo
@@ -29,29 +27,18 @@ public async Task SetUp()
2927

3028
[Test]
3129
[LoadScene(ScenePath)]
32-
public async Task MonkeyTesting()
30+
public async Task ClickRunMonkeyTestButton()
3331
{
34-
var config = new MonkeyConfig()
35-
{
36-
Lifetime = TimeSpan.FromSeconds(10),
37-
Visualizer = new DefaultDebugVisualizer(),
38-
Screenshots = new ScreenshotOptions()
39-
{
40-
FilenameStrategy = new CounterBasedStrategy("UguiDemoTest"),
41-
},
42-
Operators = new IOperator[]
43-
{
44-
new UguiClickAndHoldOperator(),
45-
new UguiClickOperator(),
46-
new UguiDoubleClickOperator(),
47-
new UguiDragAndDropOperator(),
48-
new UguiScrollWheelOperator(),
49-
new UguiSwipeOperator(),
50-
new UguiTextInputOperator(),
51-
}
52-
};
32+
var button = await _finder.FindByNameAsync("RunMonkeyTest");
33+
var clickOperator = new UguiClickOperator();
34+
Assume.That(clickOperator.CanOperate(button.GameObject), Is.True);
5335

54-
await Monkey.Run(config);
36+
var monkeyTestButton = button.GameObject.GetComponent<MonkeyTestButton>();
37+
var lifetimeSeconds = monkeyTestButton.LifetimeSeconds;
38+
39+
await clickOperator.OperateAsync(button.GameObject);
40+
await Task.Delay(TimeSpan.FromSeconds(lifetimeSeconds)); // wait for monkey test to finish
41+
await Task.Delay(1000); // wait for show popup
5542
}
5643
}
5744
}

‎Samples~/uGUI Demo/Tests/Runtime/ScrollWheelTest.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ public async Task SetUp()
2626

2727
[Test]
2828
[LoadScene(ScenePath)]
29-
public async Task ScrollWheel()
29+
public async Task ClickScrollButton()
3030
{
31-
var image = await _finder.FindByNameAsync("Scroll View");
32-
var scrollOperator = new UguiScrollWheelOperator();
33-
Assume.That(scrollOperator.CanOperate(image.GameObject), Is.True);
31+
var button = await _finder.FindByNameAsync("ScrollButton");
32+
var clickOperator = new UguiClickOperator();
33+
Assume.That(clickOperator.CanOperate(button.GameObject), Is.True);
3434

35-
await scrollOperator.OperateAsync(image.GameObject);
35+
await clickOperator.OperateAsync(button.GameObject);
36+
await Task.Delay(400 + 1000); // wait for scroll and show popup
3637
}
3738
}
3839
}

‎Samples~/uGUI Demo/Tests/Runtime/TextInputOperatorTest.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ public async Task SetUp()
2626

2727
[Test]
2828
[LoadScene(ScenePath)]
29-
public async Task TextInput()
29+
public async Task ClickTextInputButton()
3030
{
31-
var inputField = await _finder.FindByNameAsync("InputField (Legacy)");
32-
var inputOperator = new UguiTextInputOperator();
33-
Assume.That(inputOperator.CanOperate(inputField.GameObject), Is.True);
31+
var button = await _finder.FindByNameAsync("TextInputButton");
32+
var clickOperator = new UguiClickOperator();
33+
Assume.That(clickOperator.CanOperate(button.GameObject), Is.True);
3434

35-
await inputOperator.OperateAsync(inputField.GameObject);
35+
await clickOperator.OperateAsync(button.GameObject);
36+
await Task.Delay(200 + 1000); // wait for input-text and show popup
3637
}
3738
}
3839
}

0 commit comments

Comments
 (0)