Migrate to new testing library

composer.json

@@ -24,7 +24,7 @@
     "php" : ">=7.0.0"
   },
   "require-dev": {
-    "xp-framework/unittest": "^11.0"
+    "xp-framework/test": "dev-main"
   },
   "scripts": {
     "serve": "xp -supervise web -s de.thekid.cas.App"

src/test/php/de/thekid/cas/unittest/EncryptionTest.php

@@ -2,7 +2,7 @@
 
 use de\thekid\cas\Encryption;
 use lang\FormatException;
-use unittest\{Assert, Test, Expect, Values};
+use test\{Assert, Before, Expect, Test, Values};
 use util\{Random, Secret};
 
 class EncryptionTest {

src/test/php/de/thekid/cas/unittest/HandlerTest.php

@@ -1,6 +1,6 @@
 <?php namespace de\thekid\cas\unittest;
 
-use unittest\Assert;
+use test\{Assert, Before};
 use web\io\{TestInput, TestOutput};
 use web\session\ForTesting;
 use web\{Request, Response};

src/test/php/de/thekid/cas/unittest/LoginTest.php

@@ -1,13 +1,13 @@
 <?php namespace de\thekid\cas\unittest;
 
-use com\google\authenticator\{TimeBased, SecretBytes};
-use de\thekid\cas\flow\{DisplaySuccess, EnterCredentials, Flow, RedirectToService, UseService, QueryMFACode};
+use com\google\authenticator\{SecretBytes, TimeBased};
+use de\thekid\cas\flow\{DisplaySuccess, EnterCredentials, Flow, QueryMFACode, RedirectToService, UseService};
 use de\thekid\cas\impl\Login;
 use de\thekid\cas\services\Services;
 use de\thekid\cas\tickets\Tickets;
 use de\thekid\cas\users\{NoSuchUser, PasswordMismatch};
-use de\thekid\cas\{Signed, Encryption};
-use unittest\{Assert, Test};
+use de\thekid\cas\{Encryption, Signed};
+use test\{Assert, Before, Test, Values};
 use util\Random;
 
 class LoginTest extends HandlerTest {

src/test/php/de/thekid/cas/unittest/LogoutTest.php

@@ -1,7 +1,7 @@
 <?php namespace de\thekid\cas\unittest;
 
 use de\thekid\cas\impl\Logout;
-use unittest\{Assert, Test};
+use test\{Assert, Test};
 
 class LogoutTest extends HandlerTest {
   private $templates;

src/test/php/de/thekid/cas/unittest/SignedTest.php

@@ -1,7 +1,7 @@
 <?php namespace de\thekid\cas\unittest;
 
 use de\thekid\cas\Signed;
-use unittest\{Assert, Test, Values};
+use test\{Assert, Test, Values};
 use util\Secret;
 
 class SignedTest {

src/test/php/de/thekid/cas/unittest/TemplateEngineTest.php

@@ -3,7 +3,7 @@
 use com\github\mustache\{InMemory, TemplateNotFoundException};
 use de\thekid\cas\TemplateEngine;
 use io\Path;
-use unittest\{Assert, Test};
+use test\{Assert, Expect, Test};
 use web\Response;
 use web\io\{Buffered, TestOutput};
 

src/test/php/de/thekid/cas/unittest/TestingTemplates.php

@@ -1,7 +1,7 @@
 <?php namespace de\thekid\cas\unittest;
 
 use de\thekid\cas\Templating;
-use unittest\Assert;
+use test\Assert;
 
 class TestingTemplates implements Templating {
   private $rendered= [];

src/test/php/de/thekid/cas/unittest/TestingTickets.php

@@ -1,7 +1,7 @@
 <?php namespace de\thekid\cas\unittest;
 
 use de\thekid\cas\tickets\Tickets;
-use unittest\Assert;
+use test\Assert;
 
 class TestingTickets extends Tickets {
   private $backing= [];

src/test/php/de/thekid/cas/unittest/ValidateTest.php

@@ -2,7 +2,7 @@
 
 use de\thekid\cas\Signed;
 use de\thekid\cas\impl\Validate;
-use unittest\{Assert, Test};
+use test\{Assert, Before, Test};
 use web\io\{TestInput, TestOutput};
 use web\{Request, Response};