🚿 move and exclude test containers

Author: codemasher

phpunit.xml.dist

@@ -7,11 +7,8 @@
 >
 	<testsuites>
 		<testsuite name="php-settings-container test suite">
-			<directory>./tests/</directory>
-			<exclude>./tests/ExceptionTestContainer.php</exclude>
-			<exclude>./tests/PropertyHooksContainer.php</exclude>
-			<exclude>./tests/TestContainer.php</exclude>
-			<exclude>./tests/TestOptionsTrait.php</exclude>
+			<directory>tests</directory>
+			<exclude>tests/Subjects</exclude>
 		</testsuite>
 	</testsuites>
 	<source>

tests/ContainerTest.php

@@ -11,6 +11,7 @@
 
 namespace chillerlan\SettingsTest;
 
+use chillerlan\SettingsTest\Subjects\{ExceptionTestContainer, TestContainer};
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use InvalidArgumentException, JsonException, RuntimeException, TypeError;
@@ -140,14 +141,14 @@ public function serializable():void{
 		]);
 
 		// serialize will return the object in its current state including private properties
-		$expected = 'O:37:"chillerlan\SettingsTest\TestContainer":7:{s:5:"test3";s:4:"what";s:5:"test1";s:2:"no";'.
+		$expected = 'O:46:"chillerlan\SettingsTest\Subjects\TestContainer":7:{s:5:"test3";s:4:"what";s:5:"test1";s:2:"no";'.
 		            's:5:"test2";b:1;s:13:"testConstruct";s:7:"success";s:5:"test4";N;s:5:"test5";s:0:"";s:5:"test6";N;}';
 
 		$serialized = serialize($container);
 
 		$this::assertSame($expected, $serialized);
 
-		/** @var \chillerlan\SettingsTest\TestContainer $container */
+		/** @var \chillerlan\SettingsTest\Subjects\TestContainer $container */
 		$container = unserialize($serialized); // object should remain in the same state
 
 		$this::assertSame($expected, $container->serialize());

tests/PropertyHooksTest.php

@@ -11,6 +11,7 @@
 
 namespace chillerlan\SettingsTest;
 
+use chillerlan\SettingsTest\Subjects\PropertyHooksContainer;
 use PHPUnit\Framework\Attributes\{RequiresPhp, Test};
 use PHPUnit\Framework\TestCase;
 use function serialize, unserialize;
@@ -45,14 +46,15 @@ public function serializable():void{
 		]);
 
 		// the object state should be retained, bypassing existing property hooks and magic get/set
-		$expected = 'O:46:"chillerlan\SettingsTest\PropertyHooksContainer":4:{s:5:"test1";s:3:"foo";s:5:"test2";s:3:"bar";'.
-		            's:5:"test3";s:32:"3858f62230ac3c915f300c664312c63f";s:5:"test4";s:32:"3858f62230ac3c915f300c664312c63f";}';
+		$expected = 'O:55:"chillerlan\SettingsTest\Subjects\PropertyHooksContainer":4:{s:5:"test1";'.
+		            's:3:"foo";s:5:"test2";s:3:"bar";s:5:"test3";s:32:"3858f62230ac3c915f300c664312c63f";'.
+		            's:5:"test4";s:32:"3858f62230ac3c915f300c664312c63f";}';
 
 		$serialized = serialize($container);
 
 		$this::assertSame($expected, $serialized);
 
-		/** @var \chillerlan\SettingsTest\PropertyHooksContainer $container */
+		/** @var \chillerlan\SettingsTest\Subjects\PropertyHooksContainer $container */
 		$container = unserialize($serialized); // object should remain in the same state
 
 		$this::assertSame($expected, $container->serialize());

tests/ExceptionTestContainer.php renamed to tests/Subjects/ExceptionTestContainer.php

@@ -9,7 +9,7 @@
  */
 declare(strict_types=1);
 
-namespace chillerlan\SettingsTest;
+namespace chillerlan\SettingsTest\Subjects;
 
 use chillerlan\Settings\Attributes\ThrowOnInvalidProperty;
 use chillerlan\Settings\SettingsContainerAbstract;

tests/PropertyHooksContainer.php renamed to tests/Subjects/PropertyHooksContainer.php

@@ -9,7 +9,7 @@
  */
 declare(strict_types=1);
 
-namespace chillerlan\SettingsTest;
+namespace chillerlan\SettingsTest\Subjects;
 
 use chillerlan\Settings\SettingsContainerAbstract;
 use function md5;

tests/TestContainer.php renamed to tests/Subjects/TestContainer.php

@@ -9,7 +9,7 @@
  */
 declare(strict_types=1);
 
-namespace chillerlan\SettingsTest;
+namespace chillerlan\SettingsTest\Subjects;
 
 use chillerlan\Settings\SettingsContainerAbstract;
 

tests/TestOptionsTrait.php renamed to tests/Subjects/TestOptionsTrait.php

@@ -9,7 +9,7 @@
  */
 declare(strict_types=1);
 
-namespace chillerlan\SettingsTest;
+namespace chillerlan\SettingsTest\Subjects;
 
 use function sha1;