Merge pull request #39 from nowsprinting/unity6

Upgrade to Unity 6

Author: nowsprinting

.editorconfig

@@ -267,13 +267,6 @@ resharper_switch_statement_handles_some_known_enum_values_with_default_highlight
 # BannedApiAnalyzers
 dotnet_diagnostic.RS0030.severity = error
 
-# Suppress C#8.0+ syntax sugar (for under Unity 2020.2 compatibility)
-# See: https://www.jetbrains.com/help/resharper/Reference__Code_Inspections_CSHARP.html
-resharper_convert_to_using_declaration_highlighting = none
-resharper_convert_to_null_coalescing_compound_assignment_highlighting = none
-resharper_merge_into_logical_pattern_highlighting = none
-resharper_use_negated_pattern_in_is_expression_highlighting = none
-
 # Test codes for Unity Test Framework
 [**/Tests/**/*.cs]
 

.github/workflows/test-integration.yml

@@ -40,10 +40,6 @@ jobs:
       fail-fast: false
       matrix:
         unityVersion: # Available versions see: https://game.ci/docs/docker/versions
-          - 2019.4.40f1
-          - 2020.3.49f1
-          - 2021.3.45f1
-          - 2022.3.62f1
           - 6000.0.43f1
           - 6000.0.44f1 # pin test-framework v1.5.1
           - 6000.0.59f2 # pin test-framework v1.6.0

.github/workflows/test.yml

@@ -41,10 +41,6 @@ jobs:
       fail-fast: false
       matrix:
         unityVersion: # Available versions see: https://game.ci/docs/docker/versions
-          - 2019.4.40f1
-          - 2020.3.49f1
-          - 2021.3.45f1
-          - 2022.3.62f1
           - 6000.0.43f1
           - 6000.0.44f1 # pin test-framework v1.5.1
           - 6000.0.59f2 # pin test-framework v1.6.0

.idea/.idea.UnityTestExamples/.idea/copilot.data.migration.ask2agent.xml

@@ -4,10 +4,10 @@
     "references": [
         "UnityEngine.TestRunner",
         "UnityEditor.TestRunner",
-      "NUnit.Analyzers_Unity",
-      "APIExamples.Tests",
-      "UniTask",
-      "TestHelper"
+        "APIExamples.Tests",
+        "UniTask",
+      "TestHelper",
+      "NUnit.Analyzers_Unity"
     ],
     "includePlatforms": [
         "Editor"
@@ -22,6 +22,17 @@
     "defineConstraints": [
         "UNITY_INCLUDE_TESTS"
     ],
-    "versionDefines": [],
+    "versionDefines": [
+        {
+            "name": "com.unity.test-framework",
+            "expression": "1.5",
+            "define": "ENABLE_UTF_1_5"
+        },
+        {
+            "name": "com.unity.test-framework",
+            "expression": "1.6",
+            "define": "ENABLE_UTF_1_6"
+        }
+    ],
     "noEngineReferences": false
 }

Assets/APIExamples/Tests/Editor/APIExamples.Editor.Tests.asmdef

@@ -0,0 +1,73 @@
+// Copyright (c) 2021-2025 Koji Hasegawa.
+// This software is released under the MIT License.
+
+#if ENABLE_UTF_1_5
+using System.Collections;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
+using APIExamples.NUnit;
+using NUnit.Framework;
+using UnityEngine.TestTools;
+using Is = APIExamples.NUnit.Is;
+
+namespace APIExamples.Editor.UnityTestFramework
+{
+    /// <summary>
+    /// <see cref="UnityOneTimeSetupAttributeExample"/>の使用例
+    /// </summary>
+    /// <remarks>
+    /// Required: Unity Test Framework v1.5 or later
+    /// </remarks>
+    /// <seealso cref="AsyncSetupAttributeExample"/>
+    /// <seealso cref="UnitySetUpAttributeExample"/>
+    [TestFixture]
+    [SuppressMessage("ReSharper", "AccessToStaticMemberViaDerivedType")]
+    public class UnityOneTimeSetupAttributeExample
+    {
+        private int _oneTimeSetupCount;
+        private int _setupCount;
+
+        /// <summary>
+        /// テストクラス内の最初のテストの実行前に一度だけ実行されます
+        /// </summary>
+        [UnityOneTimeSetUp]
+        public IEnumerator OneTimeSetUp()
+        {
+            yield return null;
+            _oneTimeSetupCount++;
+        }
+
+        /// <summary>
+        /// 各テストメソッドの前に実行されます
+        /// </summary>
+        [SetUp]
+        public void SetUp()
+        {
+            _setupCount++;
+        }
+
+        [Test, Order(0)]
+        public void TestMethod()
+        {
+            Assert.That(_oneTimeSetupCount, Is.EqualTo(1), "OneTimeSetUpはTestFixtureごとに一度だけ実行される");
+            Assert.That(_setupCount, Is.EqualTo(1), "最初のテストなのでSetUpは1回実行されている");
+        }
+
+        [Test, Order(1)]
+        public async Task TestMethodAsync()
+        {
+            await Task.Yield();
+            Assert.That(_oneTimeSetupCount, Is.EqualTo(1), "OneTimeSetUpはTestFixtureごとに一度だけ実行される");
+            Assert.That(_setupCount, Is.EqualTo(2), "2番目のテストなのでSetUpは2回実行されている");
+        }
+
+        [UnityTest, Order(2)]
+        public IEnumerator UnityTestMethod()
+        {
+            yield return null;
+            Assert.That(_oneTimeSetupCount, Is.EqualTo(1), "OneTimeSetUpはTestFixtureごとに一度だけ実行される");
+            Assert.That(_setupCount, Is.EqualTo(3), "3番目のテストなのでSetUpは3回実行されている");
+        }
+    }
+}
+#endif

Assets/APIExamples/Tests/Editor/UnityTestFramework/UnityOneTimeSetupAttributeExample.cs

@@ -0,0 +1,76 @@
+// Copyright (c) 2021-2025 Koji Hasegawa.
+// This software is released under the MIT License.
+
+#if ENABLE_UTF_1_5
+using System.Collections;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
+using APIExamples.NUnit;
+using NUnit.Framework;
+using UnityEngine;
+using UnityEngine.TestTools;
+using Is = APIExamples.NUnit.Is;
+
+namespace APIExamples.Editor.UnityTestFramework
+{
+    /// <summary>
+    /// <see cref="UnityOneTimeTearDownAttributeExample"/>の使用例
+    /// </summary>
+    /// <remarks>
+    /// Required: Unity Test Framework v1.5 or later
+    /// </remarks>
+    /// <seealso cref="AsyncTearDownAttributeExample"/>
+    /// <seealso cref="UnityTearDownAttributeExample"/>
+    [TestFixture]
+    [SuppressMessage("ReSharper", "AccessToStaticMemberViaDerivedType")]
+    public class UnityOneTimeTearDownAttributeExample
+    {
+        private int _oneTimeTeardownCount;
+        private int _teardownCount;
+
+        /// <summary>
+        /// クラス内の最後のテストの実行後に一度だけ実行されます
+        /// </summary>
+        [UnityOneTimeTearDown]
+        public IEnumerator OneTimeTearDown()
+        {
+            yield return null;
+            Debug.Log($"UnityOneTimeTearDown");
+            _oneTimeTeardownCount++;
+
+            Assert.That(_oneTimeTeardownCount, Is.EqualTo(1), "OneTimeTearDownはTestFixtureごとに一度だけ実行される");
+            Assert.That(_teardownCount, Is.EqualTo(3), "3つのテストがあるのでTearDownは3回実行されている");
+        }
+
+        /// <summary>
+        /// 各テストメソッドの後に実行されます
+        /// </summary>
+        [TearDown]
+        public void TearDown()
+        {
+            Debug.Log($"TearDown");
+            _teardownCount++;
+        }
+
+        [Test]
+        public void TestMethod()
+        {
+            Debug.Log($"TestMethod");
+        }
+
+        [Test]
+        public async Task TestMethodAsync()
+        {
+            await Task.Yield();
+            Debug.Log($"TestMethodAsync");
+        }
+
+        [UnityTest]
+        public IEnumerator UnityTestMethod()
+        {
+            yield return null;
+            Debug.Log($"UnityTestMethod");
+        }
+    }
+}
+#endif

Assets/APIExamples/Tests/Editor/UnityTestFramework/UnityOneTimeSetupAttributeExample.cs.meta

@@ -5,8 +5,9 @@
         "UnityEngine.TestRunner",
         "UnityEditor.TestRunner",
         "APIExamples",
-      "UniTask",
-      "TestHelper"
+        "UniTask",
+      "TestHelper",
+      "NUnit.Analyzers_Unity"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
@@ -19,6 +20,17 @@
     "defineConstraints": [
         "UNITY_INCLUDE_TESTS"
     ],
-    "versionDefines": [],
+    "versionDefines": [
+        {
+            "name": "com.unity.test-framework",
+            "expression": "1.5",
+            "define": "ENABLE_UTF_1_5"
+        },
+        {
+            "name": "com.unity.test-framework",
+            "expression": "1.6",
+            "define": "ENABLE_UTF_1_6"
+        }
+    ],
     "noEngineReferences": false
 }