Merge pull request #17 from xp-forge/refactor/migrate-testing

Migrate to new testing library

Author: thekid

.github/workflows/ci.yml

@@ -56,4 +56,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 src/test/php

composer.json

@@ -13,7 +13,7 @@
     "php": ">=7.0.0"
   },
   "require-dev" : {
-    "xp-framework/unittest": "^11.0 | ^10.0"
+    "xp-framework/test": "^1.0"
   },
   "bin": ["bin/xp.xp-forge.lambda"],
   "autoload" : {

src/test/php/com/amazon/aws/lambda/unittest/ContextTest.class.php

@@ -1,7 +1,7 @@
 <?php namespace com\amazon\aws\lambda\unittest;
 
 use com\amazon\aws\lambda\Context;
-use unittest\{Assert, Test, Values};
+use test\{Assert, Test, Values};
 
 class ContextTest {
   private $headers= [
@@ -40,15 +40,15 @@ private function environment() {
     yield ['AWS_REGION', 'region'];
   }
 
-  #[Test, Values('headers')]
+  #[Test, Values(from: 'headers')]
   public function headers_mapped_to_fields($header, $field) {
     Assert::equals(
       $this->headers[$header][0] ?? null,
       (new Context($this->headers, $this->environment))->{$field}
     );
   }
 
-  #[Test, Values('environment')]
+  #[Test, Values(from: 'environment')]
   public function environment_mapped_to_fields($variable, $field) {
     Assert::equals(
       $this->environment[$variable] ?? null,

src/test/php/com/amazon/aws/lambda/unittest/EnvironmentTest.class.php

@@ -1,11 +1,11 @@
 <?php namespace com\amazon\aws\lambda\unittest;
 
 use com\amazon\aws\lambda\Environment;
-use io\streams\{StringWriter, MemoryOutputStream};
-use io\{Path, File, Files};
+use io\streams\{MemoryOutputStream, StringWriter};
+use io\{File, Files, Path};
 use lang\ElementNotFoundException;
 use lang\Environment as System;
-use unittest\{Assert, Test};
+use test\{Assert, Expect, Test};
 use util\Properties;
 
 class EnvironmentTest {
@@ -72,8 +72,8 @@ public function properties() {
     }
   }
 
-  #[Test, Expect(class: ElementNotFoundException::class, withMessage: '/Cannot find properties "test"/')]
+  #[Test, Expect(class: ElementNotFoundException::class, message: '/Cannot find properties "test"/')]
   public function non_existant_properties() {
     (new Environment('.'))->properties('test');
   }
-}
+}

src/test/php/com/amazon/aws/lambda/unittest/ExceptionTest.class.php

@@ -1,7 +1,7 @@
 <?php namespace com\amazon\aws\lambda\unittest;
 
 use lang\{IllegalArgumentException, IllegalStateException};
-use unittest\{Assert, Test};
+use test\{Assert, Test};
 use xp\lambda\AwsRunner;
 
 class ExceptionTest {

src/test/php/com/amazon/aws/lambda/unittest/HandlerTest.class.php

@@ -1,8 +1,8 @@
 <?php namespace com\amazon\aws\lambda\unittest;
 
-use com\amazon\aws\lambda\{Handler, Environment, Lambda, Context};
+use com\amazon\aws\lambda\{Context, Environment, Handler, Lambda};
 use lang\IllegalArgumentException;
-use unittest\{Assert, Expect, Test};
+use test\{Assert, Expect, Test};
 
 class HandlerTest {
   private $headers= [

src/test/php/com/amazon/aws/lambda/unittest/SourcesTest.class.php

@@ -1,8 +1,8 @@
 <?php namespace com\amazon\aws\lambda\unittest;
 
-use io\{Folder, File, Path};
+use io\{File, Folder, Path};
 use lang\Environment;
-use unittest\{Assert, After, Test, Values};
+use test\{After, Assert, Test, Values};
 use xp\lambda\Sources;
 
 class SourcesTest {