From 3c40c220495bf48e3677119636a638cc8ef7753f Mon Sep 17 00:00:00 2001
From: Wojciech Figat <wojtek@figat.pl>
Date: Wed, 11 Jan 2023 11:06:10 +0100
Subject: [PATCH] Tweaks to tests

---
 .github/workflows/tests.yml                               | 8 ++++----
 Source/Engine/Tests/TestString.cpp                        | 6 +++---
 .../{CircularBufferTests.cs => TestCircularBuffer.cs}     | 2 +-
 .../FlaxEngine.Tests/{TextControl.cs => TestControl.cs}   | 2 +-
 .../{HistoryStackTests.cs => TestHistoryStack.cs}         | 2 +-
 .../Tools/FlaxEngine.Tests/{UndoTests.cs => TestUndo.cs}  | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename Source/Tools/FlaxEngine.Tests/{CircularBufferTests.cs => TestCircularBuffer.cs} (99%)
 rename Source/Tools/FlaxEngine.Tests/{TextControl.cs => TestControl.cs} (99%)
 rename Source/Tools/FlaxEngine.Tests/{HistoryStackTests.cs => TestHistoryStack.cs} (99%)
 rename Source/Tools/FlaxEngine.Tests/{UndoTests.cs => TestUndo.cs} (99%)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 56ab6492c..6f9a6f412 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -38,8 +38,8 @@ jobs:
     - name: Test
       run: |
         Binaries/Editor/Linux/Development/FlaxTests
-        dotnet Source/Platforms/DotNet/NUnit/nunit3-netcore-console.dll Binaries/Tools/FlaxEngine.Tests.dll
-        dotnet Source/Platforms/DotNet/NUnit/nunit3-netcore-console.dll Binaries/Tools/Flax.Build.Tests.dll
+        dotnet Source/Platforms/DotNet/NUnit/nunit3-console.exe Binaries/Tests/FlaxEngine.Tests.dll
+        dotnet Source/Platforms/DotNet/NUnit/nunit3-console.exe Binaries/Tests/Flax.Build.Tests.dll
     - name: Test UseLargeWorlds
       run: |
         ./Development/Scripts/Linux/CallBuildTool.sh -build -log -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget -UseLargeWorlds=true
@@ -74,5 +74,5 @@ jobs:
     - name: Test
       run: |
         .\Binaries\Editor\Win64\Development\FlaxTests.exe
-        dotnet Source\Platforms\DotNet\NUnit\nunit3-netcore-console.dll Binaries\Tools\FlaxEngine.Tests.dll
-        dotnet Source\Platforms\DotNet\NUnit\nunit3-netcore-console.dll Binaries\Tools\Flax.Build.Tests.dll
+        .\Source\Platforms\DotNet\NUnit\nunit3-console.exe Binaries\Tests\FlaxEngine.Tests.dll
+        .\Source\Platforms\DotNet\NUnit\nunit3-console.exe Binaries\Tests\Flax.Build.Tests.dll
diff --git a/Source/Engine/Tests/TestString.cpp b/Source/Engine/Tests/TestString.cpp
index 265f20b42..bf3ad8647 100644
--- a/Source/Engine/Tests/TestString.cpp
+++ b/Source/Engine/Tests/TestString.cpp
@@ -4,7 +4,7 @@
 #include "Engine/Core/Types/StringView.h"
 #include <ThirdParty/catch2/catch.hpp>
 
-TEST_CASE("String Replace works")
+TEST_CASE("String Replace")
 {
     SECTION("Char, case sensitive")
     {
@@ -79,7 +79,7 @@ TEST_CASE("String Replace works")
     }
 }
 
-TEST_CASE("String Starts/EndsWith works")
+TEST_CASE("String Starts/EndsWith")
 {
     SECTION("StartsWith, case sensitive")
     {
@@ -222,7 +222,7 @@ TEST_CASE("String Starts/EndsWith works")
     }
 }
 
-TEST_CASE("String Compare works")
+TEST_CASE("String Compare")
 {
     SECTION("String")
     {
diff --git a/Source/Tools/FlaxEngine.Tests/CircularBufferTests.cs b/Source/Tools/FlaxEngine.Tests/TestCircularBuffer.cs
similarity index 99%
rename from Source/Tools/FlaxEngine.Tests/CircularBufferTests.cs
rename to Source/Tools/FlaxEngine.Tests/TestCircularBuffer.cs
index 4f0deda1d..b7ed7d626 100644
--- a/Source/Tools/FlaxEngine.Tests/CircularBufferTests.cs
+++ b/Source/Tools/FlaxEngine.Tests/TestCircularBuffer.cs
@@ -9,7 +9,7 @@ using Assert = FlaxEngine.Assertions.Assert;
 namespace FlaxEngine.Tests
 {
     [TestFixture]
-    public class CircularBufferTests
+    public class TestsCircularBuffer
     {
         [Test]
         public void CircularBufferTestFrontOverwrite()
diff --git a/Source/Tools/FlaxEngine.Tests/TextControl.cs b/Source/Tools/FlaxEngine.Tests/TestControl.cs
similarity index 99%
rename from Source/Tools/FlaxEngine.Tests/TextControl.cs
rename to Source/Tools/FlaxEngine.Tests/TestControl.cs
index 144ddd76c..b76787b0a 100644
--- a/Source/Tools/FlaxEngine.Tests/TextControl.cs
+++ b/Source/Tools/FlaxEngine.Tests/TestControl.cs
@@ -7,7 +7,7 @@ using Assert = FlaxEngine.Assertions.Assert;
 namespace FlaxEngine.Tests
 {
     [TestFixture]
-    public class TextControl
+    public class TestControl
     {
         public class SimpleControl : Control
         {
diff --git a/Source/Tools/FlaxEngine.Tests/HistoryStackTests.cs b/Source/Tools/FlaxEngine.Tests/TestHistoryStack.cs
similarity index 99%
rename from Source/Tools/FlaxEngine.Tests/HistoryStackTests.cs
rename to Source/Tools/FlaxEngine.Tests/TestHistoryStack.cs
index 8f2b35d66..a285f8b8c 100644
--- a/Source/Tools/FlaxEngine.Tests/HistoryStackTests.cs
+++ b/Source/Tools/FlaxEngine.Tests/TestHistoryStack.cs
@@ -8,7 +8,7 @@ using Assert = FlaxEngine.Assertions.Assert;
 namespace FlaxEditor.Tests
 {
     [TestFixture]
-    public class HistoryStackTests
+    public class TestHistoryStack
     {
         public class HistoryTestObject : IHistoryAction
         {
diff --git a/Source/Tools/FlaxEngine.Tests/UndoTests.cs b/Source/Tools/FlaxEngine.Tests/TestUndo.cs
similarity index 99%
rename from Source/Tools/FlaxEngine.Tests/UndoTests.cs
rename to Source/Tools/FlaxEngine.Tests/TestUndo.cs
index 7e7239f26..87cec99f0 100644
--- a/Source/Tools/FlaxEngine.Tests/UndoTests.cs
+++ b/Source/Tools/FlaxEngine.Tests/TestUndo.cs
@@ -7,7 +7,7 @@ using Assert = FlaxEngine.Assertions.Assert;
 namespace FlaxEditor.Tests
 {
     [TestFixture]
-    public class UndoTests
+    public class TestUndo
     {
         [Serializable]
         public class UndoObject