From f1e1bb85085222ec23de4189c3df9981e8e5c172 Mon Sep 17 00:00:00 2001
From: Timm Friebe <thekid@thekid.de>
Date: Sun, 10 Mar 2024 11:25:21 +0100
Subject: [PATCH] Migrate to new testing library

See xp-framework/rfc#344
---
 .github/workflows/ci.yml                                    | 2 +-
 ChangeLog.md                                                | 1 +
 composer.json                                               | 2 +-
 src/test/php/util/cmd/unittest/AbstractRunnerTest.class.php | 3 +--
 src/test/php/util/cmd/unittest/CmdRunnerTest.class.php      | 4 ++--
 src/test/php/util/cmd/unittest/CommandsTest.class.php       | 6 +++---
 src/test/php/util/cmd/unittest/ConfigTest.class.php         | 4 ++--
 src/test/php/util/cmd/unittest/ParamStringTest.class.php    | 4 ++--
 src/test/php/util/cmd/unittest/RunnerTest.class.php         | 4 ++--
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 751e7b7..48a5639 100755
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -53,4 +53,4 @@ jobs:
         echo "vendor/autoload.php" > composer.pth
 
     - name: Run test suite
-      run: sh xp-run xp.unittest.TestRunner src/test/php
+      run: sh xp-run xp.test.Runner -r Dots src/test/php
diff --git a/ChangeLog.md b/ChangeLog.md
index c564369..f5adeff 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -3,6 +3,7 @@ Commands ChangeLog
 
 ## ?.?.? / ????-??-??
 
+* Implemented xp-framework/rfc#344: New testing library - @thekid
 * Added PHP 8.2, 8.3 and 8.4 to the test matrix - @thekid
 
 ## 11.0.0 / 2021-10-21
diff --git a/composer.json b/composer.json
index 8a37708..e337238 100755
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
     "php" : ">=7.0.0"
   },
   "require-dev" : {
-    "xp-framework/unittest": "^11.0 | ^10.0"
+    "xp-framework/test": "^1.0"
   },
   "bin": ["bin/xp.xp-framework.command.cmd"],
   "autoload" : {
diff --git a/src/test/php/util/cmd/unittest/AbstractRunnerTest.class.php b/src/test/php/util/cmd/unittest/AbstractRunnerTest.class.php
index 96c9c65..90dc89a 100755
--- a/src/test/php/util/cmd/unittest/AbstractRunnerTest.class.php
+++ b/src/test/php/util/cmd/unittest/AbstractRunnerTest.class.php
@@ -1,8 +1,7 @@
 <?php namespace util\cmd\unittest;
 
 use io\streams\{MemoryInputStream, MemoryOutputStream};
-use unittest\Assert;
-use unittest\{Arg, Args, Test, TestCase};
+use test\{Assert, Before, Test};
 use util\cmd\{Command, Config, ParamString};
 use xp\command\CmdRunner;
 
diff --git a/src/test/php/util/cmd/unittest/CmdRunnerTest.class.php b/src/test/php/util/cmd/unittest/CmdRunnerTest.class.php
index 8cd6188..5ddc861 100755
--- a/src/test/php/util/cmd/unittest/CmdRunnerTest.class.php
+++ b/src/test/php/util/cmd/unittest/CmdRunnerTest.class.php
@@ -1,7 +1,7 @@
 <?php namespace util\cmd\unittest;
 
-use unittest\Assert;
-use unittest\{Test, Values};
+use test\Assert;
+use test\{Test, Values};
 use xp\command\CmdRunner;
 
 class CmdRunnerTest extends AbstractRunnerTest {
diff --git a/src/test/php/util/cmd/unittest/CommandsTest.class.php b/src/test/php/util/cmd/unittest/CommandsTest.class.php
index 302b555..d3ad539 100755
--- a/src/test/php/util/cmd/unittest/CommandsTest.class.php
+++ b/src/test/php/util/cmd/unittest/CommandsTest.class.php
@@ -2,7 +2,7 @@
 
 use lang\reflect\Package;
 use lang\{ClassLoader, ClassNotFoundException, IllegalArgumentException};
-use unittest\{Assert, Before, Expect, Test, Values};
+use test\{Assert, Before, Expect, Test, Values};
 use util\cmd\{Command, Commands};
 
 class CommandsTest {
@@ -62,12 +62,12 @@ public function named_non_existant($name) {
     Commands::named($name);
   }
 
-  #[Test, Expect(['class' => IllegalArgumentException::class, 'withMessage' => '/CommandsTest is not runnable/'])]
+  #[Test, Expect(class: IllegalArgumentException::class, message: '/CommandsTest is not runnable/')]
   public function name_non_runnable() {
     Commands::named(nameof($this));
   }
 
-  #[Test, Expect(['class' => IllegalArgumentException::class, 'withMessage' => '/CommandsTest is not runnable/'])]
+  #[Test, Expect(class: IllegalArgumentException::class, message: '/CommandsTest is not runnable/')]
   public function file_not_runnable() {
     Commands::named(__FILE__);
   }
diff --git a/src/test/php/util/cmd/unittest/ConfigTest.class.php b/src/test/php/util/cmd/unittest/ConfigTest.class.php
index d1e3d21..9adf82c 100755
--- a/src/test/php/util/cmd/unittest/ConfigTest.class.php
+++ b/src/test/php/util/cmd/unittest/ConfigTest.class.php
@@ -1,8 +1,8 @@
 <?php namespace util\cmd\unittest;
 
 use lang\ElementNotFoundException;
-use unittest\Assert;
-use unittest\{Expect, Test};
+use test\Assert;
+use test\{Expect, Test};
 use util\cmd\Config;
 use util\{ClassPathPropertySource, FilesystemPropertySource, PropertyAccess};
 
diff --git a/src/test/php/util/cmd/unittest/ParamStringTest.class.php b/src/test/php/util/cmd/unittest/ParamStringTest.class.php
index be602b2..a8c3e70 100755
--- a/src/test/php/util/cmd/unittest/ParamStringTest.class.php
+++ b/src/test/php/util/cmd/unittest/ParamStringTest.class.php
@@ -1,8 +1,8 @@
 <?php namespace util\cmd\unittest;
 
 use lang\IllegalArgumentException;
-use unittest\Assert;
-use unittest\{Expect, Test};
+use test\Assert;
+use test\{Expect, Test};
 use util\cmd\ParamString;
 
 class ParamStringTest {
diff --git a/src/test/php/util/cmd/unittest/RunnerTest.class.php b/src/test/php/util/cmd/unittest/RunnerTest.class.php
index 660e421..c3e45a8 100755
--- a/src/test/php/util/cmd/unittest/RunnerTest.class.php
+++ b/src/test/php/util/cmd/unittest/RunnerTest.class.php
@@ -1,7 +1,7 @@
 <?php namespace util\cmd\unittest;
 
-use unittest\Assert;
-use unittest\{Arg, Test, Values};
+use test\Assert;
+use test\{Arg, Test, Values};
 use util\cmd\Command;
 use xp\command\Runner;