diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 610509f..6869585 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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: diff --git a/Assets/APIExamples/Tests/Editor/UnityTestFramework/UnityTestFrameworkVersionCheck.cs b/Assets/APIExamples/Tests/Editor/UnityTestFramework/UnityTestFrameworkVersionCheck.cs index 5a4c958..aaf4283 100644 --- a/Assets/APIExamples/Tests/Editor/UnityTestFramework/UnityTestFrameworkVersionCheck.cs +++ b/Assets/APIExamples/Tests/Editor/UnityTestFramework/UnityTestFrameworkVersionCheck.cs @@ -61,11 +61,19 @@ private static async UniTask GetTestFrameworkPackageVersionAsync() } [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")); + } } } diff --git a/Assets/APIExamples/Tests/Runtime/APIExamples.Tests.asmdef b/Assets/APIExamples/Tests/Runtime/APIExamples.Tests.asmdef index 3d1d0a4..d65dd80 100644 --- a/Assets/APIExamples/Tests/Runtime/APIExamples.Tests.asmdef +++ b/Assets/APIExamples/Tests/Runtime/APIExamples.Tests.asmdef @@ -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 diff --git a/Assets/APIExamples/Tests/Runtime/NUnit/ConstraintExample.cs b/Assets/APIExamples/Tests/Runtime/NUnit/ConstraintExample.cs index 1516df4..ac3801c 100644 --- a/Assets/APIExamples/Tests/Runtime/NUnit/ConstraintExample.cs +++ b/Assets/APIExamples/Tests/Runtime/NUnit/ConstraintExample.cs @@ -900,6 +900,9 @@ public class 属性とプロパティ [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 { @@ -917,6 +920,7 @@ private class BinarySerializableSample // Expected: binary serializable // But was: } +#endif // ReSharper disable once MemberCanBePrivate.Global public class XmlSerializableSample diff --git a/Packages/manifest.json b/Packages/manifest.json index e9a8033..434ed9b 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -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", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index a7bdafb..644b3de 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -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": {}, @@ -27,7 +27,7 @@ "dependencies": {} }, "com.nowsprinting.test-helper": { - "version": "1.3.2", + "version": "1.5.0", "depth": 0, "source": "registry", "dependencies": { @@ -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" },