Skip to content

Commit caa9e5c

Browse files
nowsprintingnowsprinting
authored
Merge pull request #33 from nowsprinting/chore/bump_ci_unity
Upgrade test-framework to v1.4.6
2 parents 814aa93 + 07d8049 commit caa9e5c

File tree

6 files changed

+34
-27
lines changed

6 files changed

+34
-27
lines changed

‎.github/workflows/test-integration.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ jobs:
4242
unityVersion: # Available versions see: https://game.ci/docs/docker/versions
4343
- 2019.4.40f1
4444
- 2020.3.48f1
45-
- 2021.3.42f1
46-
- 2022.3.42f1
45+
- 2021.3.45f1
46+
- 2022.3.57f1
4747
- 2023.2.20f1
48-
- 6000.0.22f1
48+
- 6000.0.37f1
4949
testMode:
5050
- All # run tests in editor
5151
include:
52-
- unityVersion: 2023.2.20f1
52+
- unityVersion: 6000.0.37f1
5353
testMode: Standalone # run tests on player
5454

5555
steps:

‎.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ jobs:
4343
unityVersion: # Available versions see: https://game.ci/docs/docker/versions
4444
- 2019.4.40f1
4545
- 2020.3.48f1
46-
- 2021.3.42f1
47-
- 2022.3.42f1
46+
- 2021.3.45f1
47+
- 2022.3.57f1
4848
- 2023.2.20f1
49-
- 6000.0.22f1
49+
- 6000.0.37f1
5050
testMode:
5151
- All # run tests in editor
5252
include:
5353
- unityVersion: 2019.4.40f1
5454
octocov: true
55-
- unityVersion: 2023.2.20f1
55+
- unityVersion: 6000.0.37f1
5656
testMode: Standalone # run tests on player
5757

5858
steps:

‎Assets/APIExamples/Tests/Runtime/NUnit/ConstraintExample.cs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
using NUnit.Framework.Constraints;
1111
using UnityEngine;
1212
using UnityEngine.TestTools;
13+
using AssertionException = UnityEngine.Assertions.AssertionException;
14+
#if UNITY_EDITOR
15+
using UnityEditor;
16+
#endif
1317

1418
#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
1519

@@ -536,7 +540,7 @@ public class ファイルとディレクトリ
536540
public void EmptyDirectoryConstraint_ディレクトリが空であること()
537541
{
538542
#if UNITY_EDITOR
539-
var dir = UnityEditor.FileUtil.GetUniqueTempPathInProject();
543+
var dir = FileUtil.GetUniqueTempPathInProject();
540544
var actual = Directory.CreateDirectory(dir);
541545

542546
Assert.That(actual, Is.Empty);
@@ -553,7 +557,7 @@ public void EmptyDirectoryConstraint_ディレクトリが空であること()
553557
public void FileOrDirectoryExistsConstraint_ファイルまたはディレクトリが存在すること()
554558
{
555559
#if UNITY_EDITOR
556-
var dir = Path.GetFileName(UnityEditor.FileUtil.GetUniqueTempPathInProject());
560+
var dir = Path.GetFileName(FileUtil.GetUniqueTempPathInProject());
557561
var directoryInfo = Directory.CreateDirectory(dir);
558562
var file = Path.Combine(dir, "test");
559563
var fileInfo = new FileInfo(file);
@@ -783,7 +787,7 @@ public void ThrowsConstraint_UnityEngineのAssert失敗を期待する()
783787
{
784788
void GetAssert() => UnityEngine.Assertions.Assert.IsTrue(false);
785789

786-
Assert.That(() => GetAssert(), Throws.TypeOf<UnityEngine.Assertions.AssertionException>());
790+
Assert.That(() => GetAssert(), Throws.TypeOf<AssertionException>());
787791
// 失敗時メッセージ例:
788792
// Expected: <NUnit.Framework.AssertionException>
789793
// But was: <UnityEngine.Assertions.AssertionException>
@@ -934,6 +938,8 @@ public void XmlSerializableConstraint_XMLシリアル化が可能であること
934938
public class 破棄されたGameObject
935939
{
936940
[Test]
941+
[UnityPlatform(RuntimePlatform.OSXEditor, RuntimePlatform.WindowsEditor, RuntimePlatform.LinuxEditor)]
942+
// Note: プレイヤーではnull判定されるため除外
937943
public void Boolキャストオペレーターで破棄されたGameObjectを検証する例()
938944
{
939945
var cube = new GameObject("Cube");

‎Assets/APIExamples/Tests/Runtime/NUnit/CustomConstraintExample.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public void CustomConstraint_Constraintの実装だけで可能な書きかた()
3636

3737
[Test]
3838
[UnityPlatform(RuntimePlatform.OSXEditor, RuntimePlatform.WindowsEditor, RuntimePlatform.LinuxEditor)]
39+
// Note: プレイヤーではnull判定されるため除外
3940
public void CustomConstraint_Extensionsの実装も行なうと可能な書きかた()
4041
{
4142
var actual = CreateDestroyedObject();

‎Packages/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"com.nowsprinting.test-helper.monkey": "0.5.1",
99
"com.nowsprinting.test-helper.random": "0.2.0",
1010
"com.unity.collab-proxy": "1.14.18",
11-
"com.unity.ide.rider": "3.0.26",
11+
"com.unity.ide.rider": "3.0.34",
1212
"com.unity.ide.visualstudio": "2.0.22",
1313
"com.unity.inputsystem": "1.7.0",
14-
"com.unity.test-framework": "1.4.5",
14+
"com.unity.test-framework": "1.4.6",
1515
"com.unity.testframework.graphics": "7.17.0-exp.1",
1616
"com.unity.testtools.codecoverage": "1.2.4",
1717
"com.unity.textmeshpro": "2.1.6",

‎Packages/packages-lock.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@
6666
"depth": 1,
6767
"source": "registry",
6868
"dependencies": {
69-
"com.unity.scriptablebuildpipeline": "1.17.0",
7069
"com.unity.modules.assetbundle": "1.0.0",
71-
"com.unity.modules.imageconversion": "1.0.0",
7270
"com.unity.modules.jsonserialize": "1.0.0",
71+
"com.unity.modules.imageconversion": "1.0.0",
7372
"com.unity.modules.unitywebrequest": "1.0.0",
73+
"com.unity.scriptablebuildpipeline": "1.17.0",
7474
"com.unity.modules.unitywebrequestassetbundle": "1.0.0"
7575
},
7676
"url": "https://packages.unity.com"
@@ -99,7 +99,7 @@
9999
"url": "https://packages.unity.com"
100100
},
101101
"com.unity.ide.rider": {
102-
"version": "3.0.26",
102+
"version": "3.0.34",
103103
"depth": 0,
104104
"source": "registry",
105105
"dependencies": {
@@ -154,7 +154,7 @@
154154
"url": "https://packages.unity.com"
155155
},
156156
"com.unity.test-framework": {
157-
"version": "1.4.5",
157+
"version": "1.4.6",
158158
"depth": 0,
159159
"source": "registry",
160160
"dependencies": {
@@ -169,15 +169,15 @@
169169
"depth": 0,
170170
"source": "registry",
171171
"dependencies": {
172+
"com.unity.modules.vr": "1.0.0",
173+
"com.unity.modules.xr": "1.0.0",
174+
"com.unity.addressables": "1.17.15",
172175
"com.unity.xr.management": "4.0.5",
173-
"com.unity.external.test-protocol": "1.0.0-preview",
174176
"com.unity.nuget.newtonsoft-json": "2.0.0",
175177
"com.unity.xr.legacyinputhelpers": "2.1.8",
176-
"com.unity.modules.xr": "1.0.0",
177-
"com.unity.modules.vr": "1.0.0",
178-
"com.unity.addressables": "1.17.15",
179-
"com.unity.modules.imageconversion": "1.0.0",
180-
"com.unity.testtools.codecoverage": "1.2.0"
178+
"com.unity.external.test-protocol": "1.0.0-preview",
179+
"com.unity.testtools.codecoverage": "1.2.0",
180+
"com.unity.modules.imageconversion": "1.0.0"
181181
},
182182
"url": "https://packages.unity.com"
183183
},
@@ -205,9 +205,9 @@
205205
"depth": 0,
206206
"source": "registry",
207207
"dependencies": {
208+
"com.unity.modules.audio": "1.0.0",
208209
"com.unity.modules.director": "1.0.0",
209210
"com.unity.modules.animation": "1.0.0",
210-
"com.unity.modules.audio": "1.0.0",
211211
"com.unity.modules.particlesystem": "1.0.0"
212212
},
213213
"url": "https://packages.unity.com"
@@ -236,11 +236,11 @@
236236
"depth": 1,
237237
"source": "registry",
238238
"dependencies": {
239-
"com.unity.modules.subsystems": "1.0.0",
240239
"com.unity.modules.vr": "1.0.0",
241240
"com.unity.modules.xr": "1.0.0",
242-
"com.unity.xr.legacyinputhelpers": "2.1.7",
243-
"com.unity.subsystemregistration": "1.0.6"
241+
"com.unity.modules.subsystems": "1.0.0",
242+
"com.unity.subsystemregistration": "1.0.6",
243+
"com.unity.xr.legacyinputhelpers": "2.1.7"
244244
},
245245
"url": "https://packages.unity.com"
246246
},

0 commit comments

Comments
 (0)