Convert unittests to PHP 8 attributes

Author: thekid

src/test/php/rdbms/unittest/ConfiguredConnectionManagerTest.class.php

@@ -2,6 +2,7 @@
 
 use io\streams\MemoryInputStream;
 use rdbms\ConnectionManager;
+use rdbms\unittest\mock\RegisterMockConnection;
 use util\Properties;
 
 /**
@@ -10,7 +11,7 @@
  * @see   xp://rdbms.ConnectionManager#configure
  * @see   xp://net.xp_framework.unittest.rdbms.ConnectionManagerTest
  */
-#[@action(new \rdbms\unittest\mock\RegisterMockConnection())]
+#[Action(eval: 'new RegisterMockConnection()')]
 class ConfiguredConnectionManagerTest extends ConnectionManagerTest {
 
   /**

src/test/php/rdbms/unittest/ConnectionManagerTest.class.php

@@ -1,7 +1,7 @@
 <?php namespace rdbms\unittest;
 
 use rdbms\{ConnectionManager, ConnectionNotRegisteredException, DBConnection, DriverNotSupportedException};
-use unittest\TestCase;
+use unittest\{Expect, Test, TestCase};
 
 /**
  * ConnectionManager testcase
@@ -25,53 +25,53 @@ public function setUp() {
    */
   protected abstract function instanceWith($dsns);
 
-  #[@test]
+  #[Test]
   public function initallyEmpty() {
     $this->assertEquals([], $this->instanceWith([])->getConnections());
   }
 
-  #[@test]
+  #[Test]
   public function acquireExistingConnectionViaGetByHost() {
     $cm= $this->instanceWith(['mydb' => 'mock://user:pass@host/db?autoconnect=1']);
     $this->assertInstanceOf(DBConnection::class, $cm->getByHost('mydb', 0));
   }
 
-  #[@test, @expect(ConnectionNotRegisteredException::class)]
+  #[Test, Expect(ConnectionNotRegisteredException::class)]
   public function acquireNonExistantConnectionViaGetByHost() {
     $cm= $this->instanceWith(['mydb' => 'mock://user:pass@host/db?autoconnect=1']);
     $cm->getByHost('nonexistant', 0);
   }
 
-  #[@test]
+  #[Test]
   public function acquireExistingConnectionViaGet() {
     $cm= $this->instanceWith(['mydb' => 'mock://user:pass@host/db?autoconnect=1']);
     $this->assertInstanceOf(DBConnection::class, $cm->getByHost('mydb', 0));
   }
 
-  #[@test, @expect(ConnectionNotRegisteredException::class)]
+  #[Test, Expect(ConnectionNotRegisteredException::class)]
   public function acquireNonExistantConnectionWithExistantUserViaGet() {
     $cm= $this->instanceWith(['mydb' => 'mock://user:pass@host/db?autoconnect=1']);
     $cm->get('nonexistant', 'user');
   }
 
-  #[@test, @expect(ConnectionNotRegisteredException::class)]
+  #[Test, Expect(ConnectionNotRegisteredException::class)]
   public function acquireExistantConnectionWithNonExistantUserViaGet() {
     $cm= $this->instanceWith(['mydb' => 'mock://user:pass@host/db?autoconnect=1']);
     $cm->get('mydb', 'nonexistant');
   }
 
-  #[@test]
+  #[Test]
   public function invalidDsnScheme() {
     $this->instanceWith(['mydb' => 'invalid://user:pass@host/db?autoconnect=1']);
   }
 
-  #[@test, @expect(DriverNotSupportedException::class)]
+  #[Test, Expect(DriverNotSupportedException::class)]
   public function acquireInvalidDsnScheme() {
     $cm= $this->instanceWith(['mydb' => 'invalid://user:pass@host/db?autoconnect=1']);
     $cm->getByHost('mydb', 0);
   }
 
-  #[@test]
+  #[Test]
   public function getByUserAndHost() {
     $dsns= [
       'mydb.user'  => 'mock://user:pass@host/db?autoconnect=1',
@@ -81,7 +81,7 @@ public function getByUserAndHost() {
     $this->assertEquals(new \rdbms\DSN($dsns['mydb.user']), $cm->get('mydb', 'user')->dsn);
   }
 
-  #[@test]
+  #[Test]
   public function getFirstByHost() {
     $dsns= [
       'mydb.user'  => 'mock://user:pass@host/db?autoconnect=1',
@@ -91,7 +91,7 @@ public function getFirstByHost() {
     $this->assertEquals(new \rdbms\DSN($dsns['mydb.user']), $cm->getByHost('mydb', 0)->dsn);
   }
 
-  #[@test]
+  #[Test]
   public function getSecondByHost() {
     $dsns= [
       'mydb.user'  => 'mock://user:pass@host/db?autoconnect=1',
@@ -101,7 +101,7 @@ public function getSecondByHost() {
     $this->assertEquals(new \rdbms\DSN($dsns['mydb.admin']), $cm->getByHost('mydb', 1)->dsn);
   }
 
-  #[@test]
+  #[Test]
   public function getAllByHost() {
     $dsns= [
       'mydb.user'  => 'mock://user:pass@host/db?autoconnect=1',

src/test/php/rdbms/unittest/CriteriaTest.class.php

@@ -1,17 +1,18 @@
 <?php namespace rdbms\unittest;
 
 use lang\IllegalArgumentException;
-use rdbms\{Criteria, DriverManager, SQLStateException};
 use rdbms\criterion\Restrictions;
 use rdbms\unittest\dataset\Job;
-use unittest\TestCase;
+use rdbms\unittest\mock\RegisterMockConnection;
+use rdbms\{Criteria, DriverManager, SQLStateException};
+use unittest\{Expect, Test, TestCase};
 
 /**
  * Test criteria class
  *
  * @see      xp://rdbms.Criteria
  */
-#[@action(new \rdbms\unittest\mock\RegisterMockConnection())]
+#[Action(eval: 'new RegisterMockConnection()')]
 class CriteriaTest extends TestCase {
   public $conn= null;
   public $peer= null;
@@ -37,23 +38,23 @@ protected function assertSql($sql, $criteria) {
     $this->assertEquals($sql, trim($criteria->toSQL($this->conn, $this->peer), ' '));
   }
 
-  #[@test]
+  #[Test]
   public function emptyCriteria() {
     $this->assertSql('', new Criteria());
   }
 
-  #[@test]
+  #[Test]
   public function simpleCriteria() {
     $this->assertSql('where job_id = 1', new Criteria(['job_id', 1, EQUAL]));
   }
 
-  #[@test, @expect(IllegalArgumentException::class)]
+  #[Test, Expect(IllegalArgumentException::class)]
   public function nonExistantFieldCausesException() {
     $criteria= new Criteria(['non-existant-field', 1, EQUAL]);
     $criteria->toSQL($this->conn, $this->peer);
   }
 
-  #[@test]
+  #[Test]
   public function complexCriteria() {
     with ($c= new Criteria()); {
       $c->add('job_id', 1, EQUAL);
@@ -68,87 +69,87 @@ public function complexCriteria() {
     );
   }
 
-  #[@test]
+  #[Test]
   public function inCriteria() {
     $c= new Criteria();
     $c->add('job_id', [1, 2], IN);
 
     $this->assertSql('where job_id in (1, 2)', $c);
   }
 
-  #[@test]
+  #[Test]
   public function notInCriteria() {
     $c= new Criteria();
     $c->add('job_id', [1, 2], NOT_IN);
 
     $this->assertSql('where job_id not in (1, 2)', $c);
   }
 
-  #[@test]
+  #[Test]
   public function likeCriteria() {
     $c= new Criteria();
     $c->add('title', '%keyword%', LIKE);
 
     $this->assertSql('where title like "%keyword%"', $c);
   }
 
-  #[@test]
+  #[Test]
   public function equalCriteria() {
     $c= new Criteria();
     $c->add('job_id', 1, EQUAL);
 
     $this->assertSql('where job_id = 1', $c);
   }
 
-  #[@test]
+  #[Test]
   public function notEqualCriteria() {
     $c= new Criteria();
     $c->add('job_id', 1, NOT_EQUAL);
 
     $this->assertSql('where job_id != 1', $c);
   }
 
-  #[@test]
+  #[Test]
   public function lessThanCriteria() {
     $c= new Criteria();
     $c->add('job_id', 100, LESS_THAN);
 
     $this->assertSql('where job_id < 100', $c);
   }
 
-  #[@test]
+  #[Test]
   public function greaterThanCriteria() {
     $c= new Criteria();
     $c->add('job_id', 100, GREATER_THAN);
 
     $this->assertSql('where job_id > 100', $c);
   }
 
-  #[@test]
+  #[Test]
   public function lessEqualCriteria() {
     $c= new Criteria();
     $c->add('job_id', 100, LESS_EQUAL);
 
     $this->assertSql('where job_id <= 100', $c);
   }
 
-  #[@test]
+  #[Test]
   public function greaterEqualCriteria() {
     $c= new Criteria();
     $c->add('job_id', 100, GREATER_EQUAL);
 
     $this->assertSql('where job_id >= 100', $c);
   }
 
-  #[@test]
+  #[Test]
   public function bitAndCriteria() {
     $c= new Criteria();
     $c->add('job_id', 100, BIT_AND);
 
     $this->assertSql('where job_id & 100 != 0', $c);
   }
 
-  #[@test]
+  #[Test]
   public function restrictionsFactory() {
     $job_id= Job::column('job_id');
     $c= new Criteria(Restrictions::anyOf(
@@ -173,30 +174,30 @@ public function restrictionsFactory() {
     );
   }
 
-  #[@test]
+  #[Test]
   public function constructorAcceptsVarArgArrays() {
     $this->assertSql(
       'where job_id = 1 and title = "Hello"', 
       new Criteria(['job_id', 1, EQUAL], ['title', 'Hello', EQUAL])
     );
   }
 
-  #[@test]
+  #[Test]
   public function addReturnsThis() {
     $this->assertInstanceOf(Criteria::class, (new Criteria())->add('job_id', 1, EQUAL));
   }
 
-  #[@test]
+  #[Test]
   public function addOrderByReturnsThis() {
     $this->assertInstanceOf(Criteria::class, (new Criteria())->add('job_id', 1, EQUAL)->addOrderBy('valid_from', DESCENDING));
   }
 
-  #[@test]
+  #[Test]
   public function addGroupByReturnsThis() {
     $this->assertInstanceOf(Criteria::class, (new Criteria())->add('job_id', 1, EQUAL)->addGroupBy('valid_from'));
   }
 
-  #[@test]
+  #[Test]
   public function addOrderByColumn() {
     with ($c= new Criteria()); {
       $c->addOrderBy(Job::column('valid_from'));
@@ -208,7 +209,7 @@ public function addOrderByColumn() {
     );
   }
 
-  #[@test]
+  #[Test]
   public function addOrderByString() {
     with ($c= new Criteria()); {
       $c->addOrderBy("valid_from");
@@ -220,7 +221,7 @@ public function addOrderByString() {
     );
   }
 
-  #[@test]
+  #[Test]
   public function addGroupByColumn() {
     with ($c= new Criteria()); {
       $c->addGroupBy(Job::column('valid_from'));
@@ -232,7 +233,7 @@ public function addGroupByColumn() {
     );
   }
 
-  #[@test]
+  #[Test]
   public function addGroupByString() {
     with ($c= new Criteria()); {
       $c->addGroupBy("valid_from");
@@ -244,22 +245,22 @@ public function addGroupByString() {
     );
   }
 
-  #[@test, @expect(IllegalArgumentException::class)]
+  #[Test, Expect(IllegalArgumentException::class)]
   public function createNonExistantColumn() {
     Job::column('not_existant');
   }
 
-  #[@test, @expect(SQLStateException::class)]
+  #[Test, Expect(SQLStateException::class)]
   public function addGroupByNonExistantColumnString() {
     (new Criteria())->addGroupBy('not_existant')->toSQL($this->conn, $this->peer);
   }
 
-  #[@test]
+  #[Test]
   public function fetchModeChaining() {
     $this->assertInstanceOf(Criteria::class, (new Criteria())->setFetchmode(\rdbms\join\Fetchmode::join('PersonJob')));
   }
 
-  #[@test]
+  #[Test]
   public function testIsJoin() {
     $crit= new Criteria();
     $this->assertFalse($crit->isJoin());
@@ -269,7 +270,7 @@ public function testIsJoin() {
     $this->assertFalse($crit->setFetchmode(\rdbms\join\Fetchmode::select('PersonJob'))->isJoin());
   }
 
-  #[@test]
+  #[Test]
   public function testJoinWithoutCondition() {
     $jp= new \rdbms\join\JoinProcessor(Job::getPeer());
     $jp->setFetchModes(['PersonJob->Department' => 'join']);
@@ -283,7 +284,7 @@ public function testJoinWithoutCondition() {
     $jp->leaveJoinContext();
   }
 
-  #[@test]
+  #[Test]
   public function testJoinWithCondition() {
     $jp= new \rdbms\join\JoinProcessor(Job::getPeer());
     $jp->setFetchModes(['PersonJob->Department' => 'join']);
@@ -299,7 +300,7 @@ public function testJoinWithCondition() {
     $jp->leaveJoinContext();
   }
 
-  #[@test]
+  #[Test]
   public function testJoinWithProjection() {
     $jp= new \rdbms\join\JoinProcessor(Job::getPeer());
     $jp->setFetchModes(['PersonJob->Department' => 'join']);