Skip to content

Commit 655a4e7

Browse files
nowsprintingnowsprinting
committed
Upgrade test-helper packages
1 parent bb948d0 commit 655a4e7

File tree

7 files changed

+246
-49
lines changed

7 files changed

+246
-49
lines changed

‎Assets/InputSystemExample/Tests/Runtime/MonkeyTest.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2021-2023 Koji Hasegawa.
1+
// Copyright (c) 2021-2025 Koji Hasegawa.
22
// This software is released under the MIT License.
33

44
using System.Diagnostics.CodeAnalysis;
@@ -45,7 +45,7 @@ public void TearDown()
4545
[Test]
4646
public async Task MonkeyTesting()
4747
{
48-
var random = new RandomImpl(); // 擬似乱数生成器
48+
var random = new RandomWrapper(); // 擬似乱数生成器
4949
Debug.Log($"Random that monkey uses: {random}"); // シード値をログ出力（再現可能にするため）
5050

5151
await SceneManager.LoadSceneAsync("InputSystemExample");
@@ -57,8 +57,8 @@ public async Task MonkeyTesting()
5757

5858
using (var tokenSource = new CancellationTokenSource())
5959
{
60-
PressKeys(new RandomImpl(random.Next()), tokenSource.Token).Forget();
61-
MoveMouse(new RandomImpl(random.Next()), tokenSource.Token).Forget();
60+
PressKeys(new RandomWrapper(random.Next()), tokenSource.Token).Forget();
61+
MoveMouse(new RandomWrapper(random.Next()), tokenSource.Token).Forget();
6262

6363
var expireTime = Time.time + 10.0f; // 10秒間動作させる（3分以上にする場合はTimeout属性でタイムアウト時間を延長）
6464
while (Time.time < expireTime)
@@ -117,7 +117,7 @@ private async UniTask MoveMouse(IRandom random, CancellationToken token)
117117
while (true)
118118
{
119119
var mouseDelta = random.NextNormalizedVector2(); // マウスの移動量を抽選
120-
_input.Set(mouse.delta, mouseDelta); // マウス移動
120+
_input.Set(mouse.delta, mouseDelta); // マウス移動
121121

122122
await UniTask.NextFrame(cancellationToken: token);
123123
}

‎Assets/UGUIExample/Tests/Runtime/MonkeyTest.cs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
// Copyright (c) 2021-2023 Koji Hasegawa.
1+
// Copyright (c) 2021-2025 Koji Hasegawa.
22
// This software is released under the MIT License.
33

44
using System;
55
using System.Threading.Tasks;
6-
using Cysharp.Threading.Tasks;
76
using NUnit.Framework;
8-
using TestHelper.Monkey;
9-
using TestHelper.Random;
107
using UnityEngine;
118
using UnityEngine.SceneManagement;
129

@@ -22,18 +19,18 @@ public class MonkeyTest
2219
[Test]
2320
public async Task MonkeyTesting()
2421
{
25-
var random = new RandomImpl(); // 擬似乱数生成器
22+
var random = new RandomWrapper(); // 擬似乱数生成器
2623
Debug.Log($"Random that monkey uses: {random}"); // シード値をログ出力
2724

2825
await SceneManager.LoadSceneAsync("MainMenu");
2926
// Note: ランダム要素のあるSceneの場合、擬似乱数シードにrandom.Next()を使用すると再現に必要なシード値が1つで済んで便利です
3027

3128
var config = new MonkeyConfig
3229
{
33-
Lifetime = TimeSpan.FromSeconds(5), // 5秒間動作（3分以上にする場合はTimeout属性でテスト自体のタイムウトを延ばすこと）
34-
DelayMillis = 200, // 操作間隔は200ms
30+
Lifetime = TimeSpan.FromSeconds(5), // 5秒間動作（3分以上にする場合はTimeout属性でテスト自体のタイムウトを延ばすこと）
31+
DelayMillis = 200, // 操作間隔は200ms
3532
SecondsToErrorForNoInteractiveComponent = 5, // 5秒無操作で失敗扱い
36-
Random = random, // 擬似乱数生成器を指定
33+
Random = random, // 擬似乱数生成器を指定
3734
};
3835

3936
await Monkey.Run(config);

‎Assets/UGUIExample/Tests/Runtime/UGUIExample.Tests.asmdef‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"name": "UGUIExample.Tests",
3+
"rootNamespace": "",
34
"references": [
45
"UnityEngine.TestRunner",
56
"UnityEditor.TestRunner",
67
"UGUIExample",
78
"UniTask",
89
"TestHelper",
9-
"TestHelper.Monkey",
10-
"TestHelper.Random"
10+
"TestHelper.Random",
11+
"TestHelper.UI"
1112
],
1213
"includePlatforms": [],
1314
"excludePlatforms": [],

‎Packages/manifest.json‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"dependencies": {
33
"com.cysharp.unitask": "2.5.0",
4-
"com.nowsprinting.create-script-folders-with-tests": "1.2.1",
4+
"com.nowsprinting.create-script-folders-with-tests": "1.2.3",
55
"com.nowsprinting.local-package-sample": "file:../LocalPackages/com.nowsprinting.local-package-sample",
6-
"com.nowsprinting.test-helper": "0.3.0",
7-
"com.nowsprinting.test-helper.input": "1.0.0",
8-
"com.nowsprinting.test-helper.monkey": "0.5.1",
9-
"com.nowsprinting.test-helper.random": "0.2.0",
6+
"com.nowsprinting.test-helper": "1.2.1",
7+
"com.nowsprinting.test-helper.input": "1.0.1",
8+
"com.nowsprinting.test-helper.random": "1.0.0",
9+
"com.nowsprinting.test-helper.ui": "1.0.1",
1010
"com.unity.collab-proxy": "1.14.18",
1111
"com.unity.ide.rider": "3.0.34",
1212
"com.unity.ide.visualstudio": "2.0.22",
@@ -55,14 +55,21 @@
5555
],
5656
"scopedRegistries": [
5757
{
58-
"name": "package.openupm.com",
58+
"name": "OpenUPM",
5959
"url": "https://package.openupm.com",
6060
"scopes": [
61-
"com.cysharp",
6261
"com.nowsprinting",
63-
"com.openupm",
62+
"com.cysharp",
6463
"net.tnrd.nsubstitute"
6564
]
65+
},
66+
{
67+
"name": "UnityNuGet",
68+
"url": "https://package.openupm.com",
69+
"scopes": [
70+
"org.nuget"
71+
],
72+
"overrideBuiltIns": true
6673
}
6774
]
6875
}

‎Packages/packages-lock.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"url": "https://package.openupm.com"
99
},
1010
"com.nowsprinting.create-script-folders-with-tests": {
11-
"version": "1.2.1",
11+
"version": "1.2.3",
1212
"depth": 0,
1313
"source": "registry",
1414
"dependencies": {},
@@ -27,40 +27,40 @@
2727
"dependencies": {}
2828
},
2929
"com.nowsprinting.test-helper": {
30-
"version": "0.4.2",
31-
"depth": 1,
30+
"version": "1.2.1",
31+
"depth": 0,
3232
"source": "registry",
3333
"dependencies": {
3434
"com.unity.test-framework": "1.3.4"
3535
},
3636
"url": "https://package.openupm.com"
3737
},
3838
"com.nowsprinting.test-helper.input": {
39+
"version": "1.0.1",
40+
"depth": 0,
41+
"source": "registry",
42+
"dependencies": {},
43+
"url": "https://package.openupm.com"
44+
},
45+
"com.nowsprinting.test-helper.random": {
3946
"version": "1.0.0",
4047
"depth": 0,
4148
"source": "registry",
4249
"dependencies": {},
4350
"url": "https://package.openupm.com"
4451
},
45-
"com.nowsprinting.test-helper.monkey": {
46-
"version": "0.5.1",
52+
"com.nowsprinting.test-helper.ui": {
53+
"version": "1.0.1",
4754
"depth": 0,
4855
"source": "registry",
4956
"dependencies": {
5057
"com.cysharp.unitask": "2.3.3",
51-
"com.nowsprinting.test-helper": "0.4.2",
52-
"com.nowsprinting.test-helper.random": "0.2.0",
58+
"com.nowsprinting.test-helper": "1.1.1",
59+
"com.nowsprinting.test-helper.random": "1.0.0",
5360
"com.unity.ugui": "1.0.0"
5461
},
5562
"url": "https://package.openupm.com"
5663
},
57-
"com.nowsprinting.test-helper.random": {
58-
"version": "0.2.0",
59-
"depth": 0,
60-
"source": "registry",
61-
"dependencies": {},
62-
"url": "https://package.openupm.com"
63-
},
6464
"com.unity.addressables": {
6565
"version": "1.17.15",
6666
"depth": 1,

‎ProjectSettings/PackageManagerSettings.asset‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,38 @@ MonoBehaviour:
2020
m_Url: https://packages.unity.com
2121
m_Scopes: []
2222
m_IsDefault: 1
23-
- m_Id: scoped:package.openupm.com
24-
m_Name: package.openupm.com
23+
- m_Id: scoped:OpenUPM
24+
m_Name: OpenUPM
2525
m_Url: https://package.openupm.com
2626
m_Scopes:
27-
- com.cysharp
2827
- com.nowsprinting
29-
- com.openupm
28+
- com.cysharp
3029
- net.tnrd.nsubstitute
3130
m_IsDefault: 0
31+
- m_Id: scoped:UnityNuGet
32+
m_Name: UnityNuGet
33+
m_Url: https://package.openupm.com
34+
m_Scopes:
35+
- org.nuget
36+
m_IsDefault: 0
3237
m_UserSelectedRegistryName:
3338
m_UserAddingNewScopedRegistry: 0
3439
m_RegistryInfoDraft:
3540
m_ErrorMessage:
3641
m_Original:
37-
m_Id: scoped:package.openupm.com
38-
m_Name: package.openupm.com
42+
m_Id: scoped:OpenUPM
43+
m_Name: OpenUPM
3944
m_Url: https://package.openupm.com
4045
m_Scopes:
41-
- com.cysharp
4246
- com.nowsprinting
43-
- com.openupm
47+
- com.cysharp
4448
- net.tnrd.nsubstitute
4549
m_IsDefault: 0
4650
m_Modified: 0
47-
m_Name: package.openupm.com
51+
m_Name: OpenUPM
4852
m_Url: https://package.openupm.com
4953
m_Scopes:
50-
- com.cysharp
5154
- com.nowsprinting
52-
- com.openupm
55+
- com.cysharp
5356
- net.tnrd.nsubstitute
5457
m_SelectedScopeIndex: 0

0 commit comments

Comments
 (0)