Fix for UTFG3

.editorconfig

@@ -275,7 +275,7 @@ resharper_merge_into_logical_pattern_highlighting = none
 resharper_use_negated_pattern_in_is_expression_highlighting = none
 
 # Test codes for Unity Test Framework
-[Tests/**/*.cs]
+[**/Tests/**/*.cs]
 
 # Access to a static member of a type via a derived type (e.g., NUnit.Framework.Is)
 resharper_access_to_static_member_via_derived_type_highlighting = none

.github/workflows/test-integration.yml

@@ -22,7 +22,7 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.runner }}
   cancel-in-progress: true
 
-permissions: {}
+permissions: { }
 
 defaults:
   run:
@@ -41,15 +41,17 @@ jobs:
       matrix:
         unityVersion: # Available versions see: https://game.ci/docs/docker/versions
           - 2019.4.40f1
-          - 2020.3.48f1
+          - 2020.3.49f1
           - 2021.3.45f1
-          - 2022.3.59f1
-          - 2023.2.20f1
-          - 6000.0.41f1
+          - 2022.3.62f1
+          - 6000.0.43f1
+          - 6000.0.44f1 # pin test-framework v1.5.1
+          - 6000.0.59f2 # pin test-framework v1.6.0
+          - 6000.3.1f1
         testMode:
           - All                                 # run tests in editor
         include:
-          - unityVersion: 6000.0.41f1
+          - unityVersion: 6000.3.1f1
             testMode: Standalone  # run tests on player
 
     steps:

.github/workflows/test.yml

@@ -22,7 +22,7 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-permissions: {}
+permissions: { }
 
 defaults:
   run:
@@ -42,17 +42,21 @@ jobs:
       matrix:
         unityVersion: # Available versions see: https://game.ci/docs/docker/versions
           - 2019.4.40f1
-          - 2020.3.48f1
+          - 2020.3.49f1
           - 2021.3.45f1
-          - 2022.3.59f1
-          - 2023.2.20f1
-          - 6000.0.41f1
+          - 2022.3.62f1
+          - 6000.0.43f1
+          - 6000.0.44f1 # pin test-framework v1.5.1
+          - 6000.0.59f2 # pin test-framework v1.6.0
+          - 6000.2.5f1  # pin test-framework v1.5.1
+          - 6000.2.6f1  # pin test-framework v1.6.0
+          - 6000.3.1f1
         testMode:
           - All                                 # run tests in editor
         include:
-          - unityVersion: 6000.0.41f1
+          - unityVersion: 6000.3.1f1
             octocov: true
-          - unityVersion: 6000.0.41f1
+          - unityVersion: 6000.3.1f1
             testMode: Standalone  # run tests on player
 
     steps:

Assets/APIExamples/Scripts/Editor/AssemblyInfo.cs

@@ -0,0 +1,6 @@
+// Copyright (c) 2021-2025 Koji Hasegawa.
+// This software is released under the MIT License.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("APIExample.Editor.Tests")]

Assets/APIExamples/Scripts/Editor/UnityTestFramework/CallbacksExample.cs → Assets/APIExamples/Scripts/Editor/UnityTestFramework/ICallbacksExample.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Koji Hasegawa.
+// Copyright (c) 2021-2025 Koji Hasegawa.
 // This software is released under the MIT License.
 
 using UnityEditor;
@@ -8,21 +8,21 @@
 namespace APIExamples.Editor.UnityTestFramework
 {
     /// <summary>
-    /// Test RunnerコールバックAPI使用例
-    /// <see href="https://docs.unity3d.com/Packages/com.unity.test-framework@1.1/manual/reference-ierror-callbacks.html"/>
+    /// Test RunnerコールバックAPI使用例.
+    /// <see href="https://docs.unity3d.com/Packages/com.unity.test-framework@1.6/api/UnityEditor.TestTools.TestRunner.Api.IErrorCallbacks.html"/>
     /// </summary>
     /// <remarks>
     /// `OnError()`を除いて、<see cref="UnityEditor.TestTools.TestRunner.Api.ICallbacks"/>に定義されている
     /// `OnError()`は、<see cref="UnityEditor.TestTools.TestRunner.Api.IErrorCallbacks"/>にのみ定義されている
     /// </remarks>
-    /// <inheritdoc/>
-    public class CallbacksExample : IErrorCallbacks
+    /// <seealso cref="ITestRunCallbackExample"/>
+    public class ICallbacksExample : IErrorCallbacks
     {
         [InitializeOnLoadMethod]
         private static void SetupCallbacks()
         {
             var api = ScriptableObject.CreateInstance<TestRunnerApi>();
-            api.RegisterCallbacks(new CallbacksExample());
+            api.RegisterCallbacks(new ICallbacksExample());
         }
 
         /// <inheritdoc/>

Assets/APIExamples/Scripts/Editor/UnityTestFramework/ITestRunCallbackExample.cs

@@ -0,0 +1,43 @@
+// Copyright (c) 2021-2025 Koji Hasegawa.
+// This software is released under the MIT License.
+
+using APIExamples.Editor.UnityTestFramework;
+using NUnit.Framework.Interfaces;
+using UnityEngine.TestRunner;
+
+[assembly: TestRunCallback(typeof(ITestRunCallbackExample))]
+
+namespace APIExamples.Editor.UnityTestFramework
+{
+    /// <summary>
+    /// Test RunnerコールバックAPI使用例.
+    /// <see href="https://docs.unity3d.com/Packages/[email protected]/api/UnityEngine.TestRunner.ITestRunCallback.html"/>
+    /// </summary>
+    /// <seealso cref="ICallbacksExample"/>
+    public class ITestRunCallbackExample : ITestRunCallback
+    {
+        /// <inheritdoc/>
+        public void RunStarted(ITest testsToRun)
+        {
+            // テスト実行が開始されるときに呼ばれます
+        }
+
+        /// <inheritdoc/>
+        public void RunFinished(ITestResult testResults)
+        {
+            // テスト実行が終了したときに呼ばれます
+        }
+
+        /// <inheritdoc/>
+        public void TestStarted(ITest test)
+        {
+            // 個々の（Test Runnerウィンドウにおける）ツリーノードが開始されるときに呼ばれます
+        }
+
+        /// <inheritdoc/>
+        public void TestFinished(ITestResult result)
+        {
+            // 個々の（Test Runnerウィンドウにおける）ツリーノードが終了したときに呼ばれます
+        }
+    }
+}

Assets/APIExamples/Scripts/Runtime/AssemblyInfo.cs

@@ -0,0 +1,8 @@
+// Copyright (c) 2021-2025 Koji Hasegawa.
+// This software is released under the MIT License.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("APIExample.Editor")]
+[assembly: InternalsVisibleTo("APIExample.Editor.Tests")]
+[assembly: InternalsVisibleTo("APIExample.Tests")]

Assets/APIExamples/Scripts/Runtime/Element.cs

@@ -6,11 +6,8 @@
 namespace APIExamples
 {
     /// <summary>
-    /// 元素的な属性.
+    /// 元素的な属性
     /// </summary>
-    /// <remarks>
-    /// このenumは <c>BasicExample.Entities.Enums.Element</c> とは異なります（仕様を簡略化しました）
-    /// </remarks>
     public enum Element
     {
         None,
@@ -22,7 +19,7 @@ public enum Element
     public static class ElementExtensions
     {
         /// <summary>
-        /// 属性名を返す.
+        /// 属性名を返す
         /// </summary>
         /// <param name="self"></param>
         /// <returns></returns>
@@ -44,7 +41,7 @@ public static string GetName(this Element self)
         }
 
         /// <summary>
-        /// 属性攻撃を受けたときの被ダメージ倍率を返す.
+        /// 属性攻撃を受けたときの被ダメージ倍率を返す
         /// </summary>
         /// <param name="self"></param>
         /// <param name="attack">攻撃側の属性</param>

Assets/APIExamples/Scripts/Runtime/MyMonoBehaviour.cs

@@ -0,0 +1,44 @@
+// Copyright (c) 2021-2025 Koji Hasegawa.
+// This software is released under the MIT License.
+
+using System.Diagnostics.CodeAnalysis;
+using UnityEngine;
+
+namespace APIExamples
+{
+    /// <summary>
+    /// <see cref="APIExamples.UnityTestFramework.MonoBehaviourTestExample"/> のテスト対象.
+    /// 生成されて5フレームで破棄されます
+    /// </summary>
+    [SuppressMessage("ReSharper", "InvalidXmlDocComment")]
+    public class MyMonoBehaviour : MonoBehaviour
+    {
+        protected bool _wasAwake;
+        protected bool _wasStart;
+        protected bool _wasDestroy;
+        private int _frameCount;
+
+        private void Awake()
+        {
+            _wasAwake = true;
+        }
+
+        private void Start()
+        {
+            _wasStart = true;
+        }
+
+        private void Update()
+        {
+            if (++_frameCount > 4)
+            {
+                Destroy(this.gameObject);
+            }
+        }
+
+        private void OnDestroy()
+        {
+            _wasDestroy = true;
+        }
+    }
+}

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

@@ -4,7 +4,10 @@
     "references": [
         "UnityEngine.TestRunner",
         "UnityEditor.TestRunner",
-        "UniTask"
+      "NUnit.Analyzers_Unity",
+      "APIExamples.Tests",
+      "UniTask",
+      "TestHelper"
     ],
     "includePlatforms": [
         "Editor"

Assets/APIExamples/Tests/Editor/AssemblyInfo.cs

@@ -1,6 +1,5 @@
-// Copyright (c) 2021-2022 Koji Hasegawa.
+// Copyright (c) 2021-2025 Koji Hasegawa.
 // This software is released under the MIT License.
 
-using NUnit.Framework;
 
-[assembly: Category("APIExamples")]
+

Assets/APIExamples/Tests/Editor/NUnit/AsyncSetupAttributeExample.cs

@@ -1,46 +1,57 @@
-// Copyright (c) 2021-2023 Koji Hasegawa.
+// Copyright (c) 2021-2025 Koji Hasegawa.
 // This software is released under the MIT License.
 
+using System.Collections;
 using System.Threading.Tasks;
 using NUnit.Framework;
-using UnityEngine;
-
-#pragma warning disable CS1998
+using UnityEngine.TestTools;
 
 namespace APIExamples.Editor.NUnit
 {
     /// <summary>
-    /// 非同期の<see cref="SetUpAttribute"/>の例（Edit Modeテスト）
-    /// <see cref="OneTimeSetUpAttribute"/>はasyncサポートされていない（UTF v1.3時点）
+    /// 非同期の<see cref="SetUpAttribute"/>の使用例（Edit Modeテスト）
+    /// <see cref="OneTimeSetUpAttribute"/>はasyncサポートされていない（UTF v1.6.0時点）
+    /// <p/>
     /// Async SetUp attribute example (in Edit Mode tests)
-    /// Async OneTimeSetUp attribute is not yet supported in UTF v1.3
+    /// Async OneTimeSetUp attribute is not yet supported in UTF v1.6.0
     /// </summary>
     /// <remarks>
     /// Required: Unity Test Framework v1.3 or later
     /// </remarks>
+    /// <seealso cref="APIExamples.Editor.UnityTestFramework.UnitySetUpAttributeExample"/>
     [TestFixture]
     public class AsyncSetupAttributeExample
     {
+        private int _setupCount;
+
         /// <summary>
         /// 各テストメソッドの前に実行されます
         /// </summary>
         [SetUp]
-        public async Task SetUp()
+        public async Task SetUpAsync()
         {
-            await Task.Delay(200);
-            Debug.Log($"SetUp, {Time.time}");
+            await Task.Yield();
+            _setupCount++;
         }
 
-        [Test]
+        [Test, Order(0)]
         public void TestMethod()
         {
-            Debug.Log($"TestMethod, {Time.time}");
+            Assert.That(_setupCount, Is.EqualTo(1), "最初のテストなのでSetUpは1回実行されている");
+        }
+
+        [Test, Order(1)]
+        public async Task TestMethodAsync()
+        {
+            await Task.Yield();
+            Assert.That(_setupCount, Is.EqualTo(2), "2番目のテストなのでSetUpは2回実行されている");
         }
 
-        [Test]
-        public void TestMethod2()
+        [UnityTest, Order(2)]
+        public IEnumerator UnityTestMethod()
         {
-            Debug.Log($"TestMethod2, {Time.time}");
+            yield return null;
+            Assert.That(_setupCount, Is.EqualTo(3), "3番目のテストなのでSetUpは3回実行されている");
         }
     }
 }