Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ jobs:
- 6000.0.43f1 # Latest version that does not pin the test framework package.
- 6000.0.44f1 # pin test-framework v1.5.1
- 6000.0.59f2 # pin test-framework v1.6.0
- 6000.3.12f1
- &latest_unity_version 6000.4.1f1
- 6000.0.78f1
- 6000.3.18f1
- &latest_unity_version 6000.5.1f1 # pin test-framework v1.7.0
testMode:
- All # run tests in editor
include:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,19 @@ public async Task Unity6000_1_0f1から6000_2_5f1まで_TestFrameworkはv1_5_1
}

[Test]
[UnityVersion(newerThanOrEqual: "6000.2.6f1")]
public async Task Unity6000_2_6f1以降_TestFrameworkはv1_6_0固定()
[UnityVersion(newerThanOrEqual: "6000.2.6f1", olderThan: "6000.5.0f1")]
public async Task Unity6000_2_6f1から6000_5_0f1まで_TestFrameworkはv1_6_0固定()
{
var actual = await GetTestFrameworkPackageVersionAsync();
Assert.That(actual, Is.EqualTo("1.6.0"));
}

[Test]
[UnityVersion(newerThanOrEqual: "6000.5.0f1")]
public async Task Unity6000_5_0f1以降_TestFrameworkはv1_7_0固定()
{
var actual = await GetTestFrameworkPackageVersionAsync();
Assert.That(actual, Is.EqualTo("1.7.0"));
}
}
}
5 changes: 5 additions & 0 deletions Assets/APIExamples/Tests/Runtime/APIExamples.Tests.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
"name": "com.unity.test-framework",
"expression": "1.6",
"define": "ENABLE_UTF_1_6"
},
{
"name": "com.unity.test-framework",
"expression": "1.7",
"define": "ENABLE_UTF_1_7"
}
],
"noEngineReferences": false
Expand Down
4 changes: 4 additions & 0 deletions Assets/APIExamples/Tests/Runtime/NUnit/ConstraintExample.cs
Original file line number Diff line number Diff line change
Expand Up @@ -900,6 +900,9 @@ public void PropertyConstraint_プロパティの値が正しい()
[TestFixture]
public class シリアル化
{
#if !ENABLE_UTF_1_7
// com.unity.ext.nunit 2.1.0(Unity 6.5, test-framework v1.7.0)から BinarySerializableConstraint が削除されたため除外。
// これは BinaryFormatter が .NET で非推奨になったための措置で、ext.nunit が NUnit 4ベースになったわけではない。
[Serializable]
private class BinarySerializableSample
{
Expand All @@ -917,6 +920,7 @@ public void BinarySerializableConstraint_バイナリシリアル化が可能で
// Expected: binary serializable
// But was: <APIExamples.NUnit.ConstraintExample+シリアル化+BinarySerializableSample>
}
#endif

// ReSharper disable once MemberCanBePrivate.Global
public class XmlSerializableSample
Expand Down
8 changes: 4 additions & 4 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"dependencies": {
"com.cysharp.unitask": "2.5.10",
"com.nowsprinting.create-script-folders-with-tests": "1.3.0",
"com.cysharp.unitask": "2.5.11",
"com.nowsprinting.create-script-folders-with-tests": "1.4.0",
"com.nowsprinting.local-package-sample": "file:../LocalPackages/com.nowsprinting.local-package-sample",
"com.nowsprinting.test-helper": "1.3.2",
"com.nowsprinting.test-helper": "1.5.0",
"com.nowsprinting.test-helper.input": "1.0.1",
"com.nowsprinting.test-helper.random": "1.1.0",
"com.nowsprinting.test-helper.ui": "1.1.3",
"com.nowsprinting.test-helper.ui": "1.3.0",
"com.unity.ai.navigation": "2.0.6",
"com.unity.collab-proxy": "2.7.1",
"com.unity.ide.rider": "3.0.34",
Expand Down
10 changes: 5 additions & 5 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"dependencies": {
"com.cysharp.unitask": {
"version": "2.5.10",
"version": "2.5.11",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://package.openupm.com"
},
"com.nowsprinting.create-script-folders-with-tests": {
"version": "1.3.0",
"version": "1.4.0",
"depth": 0,
"source": "registry",
"dependencies": {},
Expand All @@ -27,7 +27,7 @@
"dependencies": {}
},
"com.nowsprinting.test-helper": {
"version": "1.3.2",
"version": "1.5.0",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -50,12 +50,12 @@
"url": "https://package.openupm.com"
},
"com.nowsprinting.test-helper.ui": {
"version": "1.1.3",
"version": "1.3.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.cysharp.unitask": "2.3.3",
"com.nowsprinting.test-helper": "1.3.1",
"com.nowsprinting.test-helper": "1.3.2",
"com.nowsprinting.test-helper.random": "1.1.0",
"com.unity.ugui": "1.0.0"
},
Expand Down
Loading