Change tests namespace

ICanBoogie · Aug 7, 2024 · 358f74f · 358f74f
1 parent 0c485d0
commit 358f74f
Show file tree

Hide file tree

Showing 55 changed files with 219 additions and 106 deletions.
diff --git a/composer.json b/composer.json
@@ -50,7 +50,7 @@
 	},
 	"autoload-dev": {
 		"psr-4": {
-			"ICanBoogie\\CLDR\\": "tests"
+			"Test\\ICanBoogie\\CLDR\\": "tests"
 		}
 	}
 }
diff --git a/lib/Calendar.php b/lib/Calendar.php
@@ -179,7 +179,7 @@ public function format_datetime(
 		DateTimeInterface|int|string $datetime,
 		string|DateTimeFormatLength $pattern_or_length_or_skeleton
 	): string {
-        return $this->datetime_formatter->format($datetime, $pattern_or_length_or_skeleton);
+        return $this->get_datetime_formatter()->format($datetime, $pattern_or_length_or_skeleton);
     }
 
     /**
@@ -189,7 +189,7 @@ public function format_date(
 		DateTimeInterface|int|string $datetime,
 		string|DateTimeFormatLength $pattern_or_length_or_skeleton
 	): string {
-        return $this->date_formatter->format($datetime, $pattern_or_length_or_skeleton);
+        return $this->get_date_formatter()->format($datetime, $pattern_or_length_or_skeleton);
     }
 
     /**
@@ -199,7 +199,7 @@ public function format_time(
 		DateTimeInterface|int|string $datetime,
 		string|DateTimeFormatLength $pattern_or_length_or_skeleton
 	): string {
-        return $this->time_formatter->format($datetime, $pattern_or_length_or_skeleton);
+        return $this->get_time_formatter()->format($datetime, $pattern_or_length_or_skeleton);
     }
 
 	/**

diff --git a/tests/Cache/CacheCollectionTest.php b/tests/Cache/CacheCollectionTest.php
@@ -9,10 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace ICanBoogie\CLDR\Cache;
+namespace Test\ICanBoogie\CLDR\Cache;
 
 use ICanBoogie\CLDR\Cache;
-use const ICanBoogie\CLDR\CACHE_DIR;
+use ICanBoogie\CLDR\Cache\CacheCollection;
+use ICanBoogie\CLDR\Cache\FileCache;
+use ICanBoogie\CLDR\Cache\RuntimeCache;
+
+use const Test\ICanBoogie\CLDR\CACHE_DIR;
 
 class CacheCollectionTest extends TestCase
 {

diff --git a/tests/Cache/FileCacheTest.php b/tests/Cache/FileCacheTest.php
@@ -9,10 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace ICanBoogie\CLDR\Cache;
+namespace Test\ICanBoogie\CLDR\Cache;
 
 use ICanBoogie\CLDR\Cache;
-use const ICanBoogie\CLDR\CACHE_DIR;
+use ICanBoogie\CLDR\Cache\FileCache;
+
+use const Test\ICanBoogie\CLDR\CACHE_DIR;
 
 class FileCacheTest extends TestCase
 {

diff --git a/tests/Cache/RedisCacheTest.php b/tests/Cache/RedisCacheTest.php
@@ -9,9 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ICanBoogie\CLDR\Cache;
+namespace Test\ICanBoogie\CLDR\Cache;
 
 use ICanBoogie\CLDR\Cache;
+use ICanBoogie\CLDR\Cache\RedisCache;
 use Redis;
 
 class RedisCacheTest extends TestCase

diff --git a/tests/Cache/RunTimeCacheTest.php b/tests/Cache/RunTimeCacheTest.php
@@ -9,9 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ICanBoogie\CLDR\Cache;
+namespace Test\ICanBoogie\CLDR\Cache;
 
 use ICanBoogie\CLDR\Cache;
+use ICanBoogie\CLDR\Cache\RuntimeCache;
 
 class RunTimeCacheTest extends TestCase
 {

diff --git a/tests/Cache/TestCase.php b/tests/Cache/TestCase.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ICanBoogie\CLDR\Cache;
+namespace Test\ICanBoogie\CLDR\Cache;
 
 use ICanBoogie\CLDR\Cache;
 use function uniqid;

diff --git a/tests/CalendarCollectionTest.php b/tests/CalendarCollectionTest.php
@@ -9,9 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace ICanBoogie\CLDR;
+namespace Test\ICanBoogie\CLDR;
 
 use BadMethodCallException;
+use ICanBoogie\CLDR\Calendar;
+use ICanBoogie\CLDR\CalendarCollection;
 use ICanBoogie\OffsetNotWritable;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;

diff --git a/tests/CalendarTest.php b/tests/CalendarTest.php
@@ -9,27 +9,33 @@
  * file that was distributed with this source code.
  */
 
-namespace ICanBoogie\CLDR;
-
+namespace Test\ICanBoogie\CLDR;
+
+use ICanBoogie\CLDR\Calendar;
+use ICanBoogie\CLDR\DateFormatter;
+use ICanBoogie\CLDR\DateTimeFormatLength;
+use ICanBoogie\CLDR\DateTimeFormatter;
+use ICanBoogie\CLDR\Locale;
+use ICanBoogie\CLDR\TimeFormatter;
 use ICanBoogie\PropertyNotDefined;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 final class CalendarTest extends TestCase
 {
-	private static Calendar $calendar;
+	private static Calendar $sut;
 
 	public static function setupBeforeClass(): void
 	{
-		self::$calendar = locale_for('fr')->calendars['gregorian']; // @phpstan-ignore-line
+		self::$sut = locale_for('fr')->calendars['gregorian']; // @phpstan-ignore-line
 	}
 
 	#[DataProvider('provider_test_property_instanceof')]
 	public function test_property_instanceof(string $property, string $expected): void
 	{
-		$instance = self::$calendar->$property;
+		$instance = self::$sut->$property;
 		$this->assertInstanceOf($expected, $instance); // @phpstan-ignore-line
-		$this->assertSame($instance, self::$calendar->$property);
+		$this->assertSame($instance, self::$sut->$property);
 	}
 
 	/**
@@ -50,13 +56,13 @@ public static function provider_test_property_instanceof(): array
 	public function test_get_undefined_property(): void
 	{
 		$this->expectException(PropertyNotDefined::class);
-		self::$calendar->undefined_property; // @phpstan-ignore-line
+		self::$sut->undefined_property; // @phpstan-ignore-line
 	}
 
 	#[DataProvider('provide_test_access')]
 	public function test_access(string $key): void
 	{
-		$this->assertTrue(self::$calendar->offsetExists($key));
+		$this->assertTrue(self::$sut->offsetExists($key));
 	}
 
 	/**
@@ -82,13 +88,13 @@ public static function provide_test_access(): array
 	public function test_date_patterns_shortcuts(string $property, string $path): void
 	{
 		$path_parts = explode('/', $path);
-		$expected = self::$calendar;
+		$expected = self::$sut;
 
 		foreach ($path_parts as $part) {
 			$expected = $expected[$part];
 		}
 
-		$this->assertEquals(self::$calendar->$property, $expected);
+		$this->assertEquals(self::$sut->$property, $expected);
 	}
 
 	/**
@@ -136,25 +142,22 @@ public static function provide_test_date_patterns_shortcuts(): array
 
 	public function testFormatDateTime(): void
 	{
-		$this->assertSame(
-			self::$calendar->format_datetime('2018-11-24 20:12:22 UTC', DateTimeFormatLength::FULL),
-			"samedi 24 novembre 2018 à 20:12:22 UTC"
-		);
+		$actual = self::$sut->format_datetime('2018-11-24 20:12:22 UTC', DateTimeFormatLength::FULL);
+
+		$this->assertSame("samedi 24 novembre 2018 à 20:12:22 UTC", $actual);
 	}
 
 	public function testFormatDate(): void
 	{
-		$this->assertSame(
-			self::$calendar->format_date('2018-11-24 20:12:22 UTC', DateTimeFormatLength::LONG),
-			"24 novembre 2018"
-		);
+		$actual = self::$sut->format_date('2018-11-24 20:12:22 UTC', DateTimeFormatLength::LONG);
+
+		$this->assertSame("24 novembre 2018", $actual);
 	}
 
 	public function testFormatTime(): void
 	{
-		$this->assertSame(
-			self::$calendar->format_time('2018-11-24 20:12:22 UTC', DateTimeFormatLength::LONG),
-			"20:12:22 UTC"
-		);
+		$actual = self::$sut->format_time('2018-11-24 20:12:22 UTC', DateTimeFormatLength::LONG);
+
+		$this->assertSame("20:12:22 UTC", $actual);
 	}
 }
diff --git a/tests/ContextTransformsTest.php b/tests/ContextTransformsTest.php
@@ -9,8 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ICanBoogie\CLDR;
+namespace Test\ICanBoogie\CLDR;
 
+use ICanBoogie\CLDR\ContextTransforms;
 use LogicException;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;

diff --git a/tests/CurrencyCollectionTest.php b/tests/CurrencyCollectionTest.php
@@ -9,8 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace ICanBoogie\CLDR;
+namespace Test\ICanBoogie\CLDR;
 
+use ICanBoogie\CLDR\Currency;
+use ICanBoogie\CLDR\CurrencyCollection;
+use ICanBoogie\CLDR\CurrencyNotDefined;
 use ICanBoogie\OffsetNotWritable;
 use PHPUnit\Framework\TestCase;
 

diff --git a/tests/CurrencyNotDefinedTest.php b/tests/CurrencyNotDefinedTest.php
@@ -9,9 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ICanBoogie\CLDR;
+namespace Test\ICanBoogie\CLDR;
 
 use Exception;
+use ICanBoogie\CLDR\CurrencyNotDefined;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 

diff --git a/tests/CurrencyTest.php b/tests/CurrencyTest.php
@@ -9,8 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ICanBoogie\CLDR;
+namespace Test\ICanBoogie\CLDR;
 
+use ICanBoogie\CLDR\Currency;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 

diff --git a/tests/DateFormatterTest.php b/tests/DateFormatterTest.php
@@ -9,8 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace ICanBoogie\CLDR;
+namespace Test\ICanBoogie\CLDR;
 
+use ICanBoogie\CLDR\DateFormatter;
+use ICanBoogie\CLDR\DateTimeFormatId;
+use ICanBoogie\CLDR\DateTimeFormatLength;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 

diff --git a/tests/DateTimeAccessorTest.php b/tests/DateTimeAccessorTest.php
@@ -9,8 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ICanBoogie\CLDR;
+namespace Test\ICanBoogie\CLDR;
 
+use ICanBoogie\CLDR\DateTimeAccessor;
 use LogicException;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;

diff --git a/tests/DateTimeFormatterTest.php b/tests/DateTimeFormatterTest.php
@@ -9,8 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace ICanBoogie\CLDR;
+namespace Test\ICanBoogie\CLDR;
 
+use ICanBoogie\CLDR\Calendar;
+use ICanBoogie\CLDR\DateTimeFormatId;
+use ICanBoogie\CLDR\DateTimeFormatLength;
+use ICanBoogie\CLDR\DateTimeFormatter;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 

diff --git a/tests/GitHub/UrlResolverTest.php b/tests/GitHub/UrlResolverTest.php
@@ -9,8 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ICanBoogie\CLDR\GitHub;
+namespace Test\ICanBoogie\CLDR\GitHub;
 
+use ICanBoogie\CLDR\GitHub\UrlResolver;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 

diff --git a/tests/ListFormatterTest.php b/tests/ListFormatterTest.php
@@ -9,8 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ICanBoogie\CLDR;
+namespace Test\ICanBoogie\CLDR;
 
+use ICanBoogie\CLDR\ListFormatter;
 use ICanBoogie\CLDR\Locale\ListPattern;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;

diff --git a/tests/LocaleCollectionTest.php b/tests/LocaleCollectionTest.php
@@ -9,9 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace ICanBoogie\CLDR;
+namespace Test\ICanBoogie\CLDR;
 
 use BadMethodCallException;
+use ICanBoogie\CLDR\Locale;
+use ICanBoogie\CLDR\LocaleCollection;
 use ICanBoogie\OffsetNotWritable;
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;

diff --git a/tests/LocaleIdTest.php b/tests/LocaleIdTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace ICanBoogie\CLDR;
+namespace Test\ICanBoogie\CLDR;
 
+use ICanBoogie\CLDR\LocaleId;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;