chore: Further test cleanup.

Johannestegner · Johannestegner · commit 86e55f5d2dd4 · 2022-10-11T14:05:48.000+02:00
Signed-off-by: Johannes Tegnér &lt;johannes@jitesoft.com&gt;
diff --git a/tests/ExceptionTestCase.php b/tests/ExceptionTestCase.php
@@ -31,21 +31,21 @@ static function(ReflectionParameter $parm) {
             $message = array_values($message);
 
             /** @var $message ReflectionParameter[] */
-            $this->assertNotEmpty($message);
+            self::assertNotEmpty($message);
 
             $message = $message[0]->getDefaultValue();
             $count   = substr_count($message, '%s');
             $args    = array_fill(0, $count, '');
 
-            $this->assertEquals(sprintf($message, ...$args), $ex->getMessage());
+            self::assertEquals(sprintf($message, ...$args), $ex->getMessage());
         }
     }
 
     final public function testGetNoneDefaultMessage(): void {
         try {
             $this->throwMessageException("Test");
         } catch (JitesoftException $ex) {
-            $this->assertEquals("Test", $ex->getMessage());
+            self::assertEquals("Test", $ex->getMessage());
         }
     }
 
@@ -78,7 +78,7 @@ final public function testHasProperties(): void {
         try {
             $this->throwDefaultException();
         } catch (JitesoftException $ex) {
-            $this->assertHasProperties($ex->toArray(), static::getTestProperties());
+            self::assertHasProperties($ex->toArray(), static::getTestProperties());
         }
     }
 
diff --git a/tests/IO/FileExceptionTest.php b/tests/IO/FileExceptionTest.php
@@ -32,8 +32,8 @@ public function testGetFileName() {
         try {
             $this->throwMessageException("Test");
         } catch (FileException $ex) {
-            $this->assertEquals("a.txt", $ex->getFileName());
-            $this->assertEquals("a.txt", $ex->fileName);
+            self::assertEquals("a.txt", $ex->getFileName());
+            self::assertEquals("a.txt", $ex->fileName);
         }
     }
 
diff --git a/tests/JitesoftExceptionTest.php b/tests/JitesoftExceptionTest.php
@@ -134,7 +134,7 @@ public function testInnerExceptionIsSpException(): void {
             ], $ex->toArray());
 
             /** @noinspection PhpUnhandledExceptionInspection */
-            $this->assertEquals(json_encode($ex, JSON_THROW_ON_ERROR), json_encode($ex->toArray(), JSON_THROW_ON_ERROR));
+            self::assertEquals(json_encode($ex, JSON_THROW_ON_ERROR), json_encode($ex->toArray(), JSON_THROW_ON_ERROR));
         }
     }
 
diff --git a/tests/Json/InvalidJsonValueExceptionTest.php b/tests/Json/InvalidJsonValueExceptionTest.php
@@ -30,8 +30,8 @@ public function testGetPropertyName() {
         try {
             $this->throwMessageException("Test");
         } catch (InvalidJsonValueException $ex) {
-            $this->assertEquals("test", $ex->getPropertyName());
-            $this->assertEquals("test", $ex->propertyName);
+            self::assertEquals("test", $ex->getPropertyName());
+            self::assertEquals("test", $ex->propertyName);
         }
     }
 
diff --git a/tests/Json/JsonExceptionTest.php b/tests/Json/JsonExceptionTest.php
@@ -31,26 +31,26 @@ public function testGetJson() {
         try {
             $this->throwMessageException("Test");
         } catch(JsonException $ex) {
-            $this->assertEquals("invalid", $ex->getJson());
-            $this->assertEquals("invalid", $ex->json);
+            self::assertEquals("invalid", $ex->getJson());
+            self::assertEquals("invalid", $ex->json);
         }
     }
 
     public function testGetFileName() {
         try {
             $this->throwMessageException("Test");
         } catch (JsonException $ex) {
-            $this->assertEquals("a.json", $ex->getFileName());
-            $this->assertEquals("a.json", $ex->fileName);
+            self::assertEquals("a.json", $ex->getFileName());
+            self::assertEquals("a.json", $ex->fileName);
         }
     }
 
     public function testGetPath() {
         try {
             $this->throwMessageException("Test");
         } catch (JsonException $ex) {
-            $this->assertEquals("/a/b/c", $ex->getPath());
-            $this->assertEquals("/a/b/c", $ex->path);
+            self::assertEquals("/a/b/c", $ex->getPath());
+            self::assertEquals("/a/b/c", $ex->path);
         }
     }
 }
diff --git a/tests/Logic/InvalidArgumentExceptionTest.php b/tests/Logic/InvalidArgumentExceptionTest.php
@@ -31,26 +31,26 @@ public function testGetArgumentName(): void {
         try {
             $this->throwMessageException("Test");
         } catch(InvalidArgumentException $ex) {
-            $this->assertEquals('$message', $ex->getArgumentName());
-            $this->assertEquals('$message', $ex->argumentName);
+            self::assertEquals('$message', $ex->getArgumentName());
+            self::assertEquals('$message', $ex->argumentName);
         }
     }
 
     public function testGetMethodName(): void {
         try {
             $this->throwMessageException("Test");
         } catch(InvalidArgumentException $ex) {
-            $this->assertEquals('throwMessageException', $ex->getMethodName());
-            $this->assertEquals('throwMessageException', $ex->methodName);
+            self::assertEquals('throwMessageException', $ex->getMethodName());
+            self::assertEquals('throwMessageException', $ex->methodName);
         }
     }
 
     public function testGetClassName(): void {
         try {
             $this->throwMessageException("Test");
         } catch(InvalidArgumentException $ex) {
-            $this->assertEquals('InvalidArgumentExceptionTest', $ex->getClassName());
-            $this->assertEquals('InvalidArgumentExceptionTest', $ex->className);
+            self::assertEquals('InvalidArgumentExceptionTest', $ex->getClassName());
+            self::assertEquals('InvalidArgumentExceptionTest', $ex->className);
         }
     }
 
diff --git a/tests/Logic/InvalidKeyExceptionTest.php b/tests/Logic/InvalidKeyExceptionTest.php
@@ -34,7 +34,7 @@ public function testGetKey(): void {
         try {
             $this->throwMessageException('abc');
         } catch (InvalidKeyException $ex) {
-            $this->assertEquals('testKey', $ex->getKeyName());
+            self::assertEquals('testKey', $ex->getKeyName());
         }
     }
 
diff --git a/tests/Logic/OutOfBoundsExceptionTest.php b/tests/Logic/OutOfBoundsExceptionTest.php
@@ -37,17 +37,17 @@ public function testGetIndex(): void {
         try {
             $this->throwMessageException('abc');
         } catch (OutOfBoundsException $ex) {
-            $this->assertEquals(10, $ex->index);
-            $this->assertEquals(10, $ex->getIndex());
+            self::assertEquals(10, $ex->index);
+            self::assertEquals(10, $ex->getIndex());
         }
     }
 
     public function testGetSize(): void {
         try {
             $this->throwMessageException('abc');
         } catch (OutOfBoundsException $ex) {
-            $this->assertEquals(9, $ex->size);
-            $this->assertEquals(9, $ex->getSize());
+            self::assertEquals(9, $ex->size);
+            self::assertEquals(9, $ex->getSize());
         }
     }
 
diff --git a/tests/Security/CertificateExceptionTest.php b/tests/Security/CertificateExceptionTest.php
@@ -29,8 +29,8 @@ public function testGetCertificateName() {
         try {
             $this->throwMessageException("Test");
         } catch (CertificateException $ex) {
-            $this->assertEquals("test.cert", $ex->getCertificateName());
-            $this->assertEquals("test.cert", $ex->certificateName);
+            self::assertEquals("test.cert", $ex->getCertificateName());
+            self::assertEquals("test.cert", $ex->certificateName);
         }
     }
 
diff --git a/tests/Security/OAuth2/InvalidGrantExceptionTest.php b/tests/Security/OAuth2/InvalidGrantExceptionTest.php
@@ -28,8 +28,8 @@ public function testGetScope(): void {
         try {
             $this->throwMessageException('Test');
         } catch (InvalidGrantException $ex) {
-            $this->assertEquals('grant_name', $ex->getGrant());
-            $this->assertEquals('grant_name', $ex->grant);
+            self::assertEquals('grant_name', $ex->getGrant());
+            self::assertEquals('grant_name', $ex->grant);
         }
     }
 
diff --git a/tests/Security/OAuth2/InvalidScopeExceptionTest.php b/tests/Security/OAuth2/InvalidScopeExceptionTest.php
@@ -1,11 +1,9 @@
 <?php
-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
   InvalidScopeExceptionTest.php - Part of the php-exceptions project.
 
   © - Jitesoft 2018
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
 namespace Jitesoft\Exceptions\Tests\Security\OAuth2;
 
 use Jitesoft\Exceptions\Security\OAuth2\InvalidScopeException;
@@ -28,8 +26,8 @@ public function testGetScope(): void {
         try {
             $this->throwMessageException('Test');
         } catch (InvalidScopeException $ex) {
-            $this->assertEquals('scope_name', $ex->getScope());
-            $this->assertEquals('scope_name', $ex->scope);
+            self::assertEquals('scope_name', $ex->getScope());
+            self::assertEquals('scope_name', $ex->scope);
         }
     }
 
diff --git a/tests/Xml/XPathExceptionTest.php b/tests/Xml/XPathExceptionTest.php
@@ -29,8 +29,8 @@ public function testGetXpath() {
         try {
             $this->throwMessageException("Test");
         } catch (XPathException $ex) {
-            $this->assertEquals("invalid", $ex->getXPath());
-            $this->assertEquals("invalid", $ex->xPath);
+            self::assertEquals("invalid", $ex->getXPath());
+            self::assertEquals("invalid", $ex->xPath);
         }
     }
 
diff --git a/tests/Xml/XmlExceptionTest.php b/tests/Xml/XmlExceptionTest.php
@@ -31,26 +31,26 @@ public function testGetXml() {
         try {
             $this->throwMessageException("Test");
         } catch (XmlException $ex) {
-            $this->assertEquals("invalid", $ex->xml);
-            $this->assertEquals("invalid", $ex->getXml());
+            self::assertEquals("invalid", $ex->xml);
+            self::assertEquals("invalid", $ex->getXml());
         }
     }
 
     public function testGetFilePath() {
         try {
             $this->throwMessageException("Test");
         } catch (XmlException $ex) {
-            $this->assertEquals("/a/b/c", $ex->path);
-            $this->assertEquals("/a/b/c", $ex->getPath());
+            self::assertEquals("/a/b/c", $ex->path);
+            self::assertEquals("/a/b/c", $ex->getPath());
         }
     }
 
     public function testGetFileName() {
         try {
             $this->throwMessageException("Test");
         } catch (XmlException $ex) {
-            $this->assertEquals("a.xml", $ex->fileName);
-            $this->assertEquals("a.xml", $ex->getFileName());
+            self::assertEquals("a.xml", $ex->fileName);
+            self::assertEquals("a.xml", $ex->getFileName());
         }
     }
 
diff --git a/tests/Xml/XmlSchemaExceptionTest.php b/tests/Xml/XmlSchemaExceptionTest.php
@@ -30,26 +30,26 @@ public function testGetSchema() {
         try {
             $this->throwMessageException("Test");
         } catch (XmlSchemaException $ex) {
-            $this->assertEquals("invalid", $ex->schema);
-            $this->assertEquals("invalid", $ex->getSchema());
+            self::assertEquals("invalid", $ex->schema);
+            self::assertEquals("invalid", $ex->getSchema());
         }
     }
 
     public function testGetSchemaPath() {
         try {
             $this->throwMessageException("Test");
         } catch (XmlSchemaException $ex) {
-            $this->assertEquals("/a/b/c/d", $ex->schemaPath);
-            $this->assertEquals("/a/b/c/d", $ex->getSchemaPath());
+            self::assertEquals("/a/b/c/d", $ex->schemaPath);
+            self::assertEquals("/a/b/c/d", $ex->getSchemaPath());
         }
     }
 
     public function testGetSchemaName() {
         try {
             $this->throwMessageException("Test");
         } catch (XmlSchemaException $ex) {
-            $this->assertEquals("a.xsd", $ex->getSchemaName());
-            $this->assertEquals("a.xsd", $ex->schemaName);
+            self::assertEquals("a.xsd", $ex->getSchemaName());
+            self::assertEquals("a.xsd", $ex->schemaName);
         }}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -31,21 +31,21 @@ static function(ReflectionParameter $parm) {`
`31`	`31`	`$message = array_values($message);`
`32`	`32`
`33`	`33`	`/** @var $message ReflectionParameter[] */`
`34`		`- $this->assertNotEmpty($message);`
	`34`	`+ self::assertNotEmpty($message);`
`35`	`35`
`36`	`36`	`$message = $message[0]->getDefaultValue();`
`37`	`37`	`$count = substr_count($message, '%s');`
`38`	`38`	`$args = array_fill(0, $count, '');`
`39`	`39`
`40`		`- $this->assertEquals(sprintf($message, ...$args), $ex->getMessage());`
	`40`	`+ self::assertEquals(sprintf($message, ...$args), $ex->getMessage());`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`final public function testGetNoneDefaultMessage(): void {`
`45`	`45`	`try {`
`46`	`46`	`$this->throwMessageException("Test");`
`47`	`47`	`} catch (JitesoftException $ex) {`
`48`		`- $this->assertEquals("Test", $ex->getMessage());`
	`48`	`+ self::assertEquals("Test", $ex->getMessage());`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`@@ -78,7 +78,7 @@ final public function testHasProperties(): void {`
`78`	`78`	`try {`
`79`	`79`	`$this->throwDefaultException();`
`80`	`80`	`} catch (JitesoftException $ex) {`
`81`		`- $this->assertHasProperties($ex->toArray(), static::getTestProperties());`
	`81`	`+ self::assertHasProperties($ex->toArray(), static::getTestProperties());`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ public function testGetFileName() {`
`32`	`32`	`try {`
`33`	`33`	`$this->throwMessageException("Test");`
`34`	`34`	`} catch (FileException $ex) {`
`35`		`- $this->assertEquals("a.txt", $ex->getFileName());`
`36`		`- $this->assertEquals("a.txt", $ex->fileName);`
	`35`	`+ self::assertEquals("a.txt", $ex->getFileName());`
	`36`	`+ self::assertEquals("a.txt", $ex->fileName);`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public function testInnerExceptionIsSpException(): void {`
`134`	`134`	`], $ex->toArray());`
`135`	`135`
`136`	`136`	`/** @noinspection PhpUnhandledExceptionInspection */`
`137`		`- $this->assertEquals(json_encode($ex, JSON_THROW_ON_ERROR), json_encode($ex->toArray(), JSON_THROW_ON_ERROR));`
	`137`	`+ self::assertEquals(json_encode($ex, JSON_THROW_ON_ERROR), json_encode($ex->toArray(), JSON_THROW_ON_ERROR));`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ public function testGetPropertyName() {`
`30`	`30`	`try {`
`31`	`31`	`$this->throwMessageException("Test");`
`32`	`32`	`} catch (InvalidJsonValueException $ex) {`
`33`		`- $this->assertEquals("test", $ex->getPropertyName());`
`34`		`- $this->assertEquals("test", $ex->propertyName);`
	`33`	`+ self::assertEquals("test", $ex->getPropertyName());`
	`34`	`+ self::assertEquals("test", $ex->propertyName);`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -31,26 +31,26 @@ public function testGetJson() {`
`31`	`31`	`try {`
`32`	`32`	`$this->throwMessageException("Test");`
`33`	`33`	`} catch(JsonException $ex) {`
`34`		`- $this->assertEquals("invalid", $ex->getJson());`
`35`		`- $this->assertEquals("invalid", $ex->json);`
	`34`	`+ self::assertEquals("invalid", $ex->getJson());`
	`35`	`+ self::assertEquals("invalid", $ex->json);`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public function testGetFileName() {`
`40`	`40`	`try {`
`41`	`41`	`$this->throwMessageException("Test");`
`42`	`42`	`} catch (JsonException $ex) {`
`43`		`- $this->assertEquals("a.json", $ex->getFileName());`
`44`		`- $this->assertEquals("a.json", $ex->fileName);`
	`43`	`+ self::assertEquals("a.json", $ex->getFileName());`
	`44`	`+ self::assertEquals("a.json", $ex->fileName);`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public function testGetPath() {`
`49`	`49`	`try {`
`50`	`50`	`$this->throwMessageException("Test");`
`51`	`51`	`} catch (JsonException $ex) {`
`52`		`- $this->assertEquals("/a/b/c", $ex->getPath());`
`53`		`- $this->assertEquals("/a/b/c", $ex->path);`
	`52`	`+ self::assertEquals("/a/b/c", $ex->getPath());`
	`53`	`+ self::assertEquals("/a/b/c", $ex->path);`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function testGetKey(): void {`
`34`	`34`	`try {`
`35`	`35`	`$this->throwMessageException('abc');`
`36`	`36`	`} catch (InvalidKeyException $ex) {`
`37`		`- $this->assertEquals('testKey', $ex->getKeyName());`
	`37`	`+ self::assertEquals('testKey', $ex->getKeyName());`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -37,17 +37,17 @@ public function testGetIndex(): void {`
`37`	`37`	`try {`
`38`	`38`	`$this->throwMessageException('abc');`
`39`	`39`	`} catch (OutOfBoundsException $ex) {`
`40`		`- $this->assertEquals(10, $ex->index);`
`41`		`- $this->assertEquals(10, $ex->getIndex());`
	`40`	`+ self::assertEquals(10, $ex->index);`
	`41`	`+ self::assertEquals(10, $ex->getIndex());`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`public function testGetSize(): void {`
`46`	`46`	`try {`
`47`	`47`	`$this->throwMessageException('abc');`
`48`	`48`	`} catch (OutOfBoundsException $ex) {`
`49`		`- $this->assertEquals(9, $ex->size);`
`50`		`- $this->assertEquals(9, $ex->getSize());`
	`49`	`+ self::assertEquals(9, $ex->size);`
	`50`	`+ self::assertEquals(9, $ex->getSize());`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ public function testGetCertificateName() {`
`29`	`29`	`try {`
`30`	`30`	`$this->throwMessageException("Test");`
`31`	`31`	`} catch (CertificateException $ex) {`
`32`		`- $this->assertEquals("test.cert", $ex->getCertificateName());`
`33`		`- $this->assertEquals("test.cert", $ex->certificateName);`
	`32`	`+ self::assertEquals("test.cert", $ex->getCertificateName());`
	`33`	`+ self::assertEquals("test.cert", $ex->certificateName);`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ public function testGetScope(): void {`
`28`	`28`	`try {`
`29`	`29`	`$this->throwMessageException('Test');`
`30`	`30`	`} catch (InvalidGrantException $ex) {`
`31`		`- $this->assertEquals('grant_name', $ex->getGrant());`
`32`		`- $this->assertEquals('grant_name', $ex->grant);`
	`31`	`+ self::assertEquals('grant_name', $ex->getGrant());`
	`32`	`+ self::assertEquals('grant_name', $ex->grant);`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`