Tests: Use newer Lunr.Halo

move-backend · Dec 3, 2024 · 0c1e7fc · 0c1e7fc
1 parent 46aa5e7
commit 0c1e7fc
Show file tree

Hide file tree

Showing 15 changed files with 105 additions and 175 deletions.
diff --git a/ApnsPHP/Message/Tests/CustomMessageGetPayloadDictionaryTest.php b/ApnsPHP/Message/Tests/CustomMessageGetPayloadDictionaryTest.php
@@ -60,7 +60,7 @@ public function testGetPayloadDictionaryReturnsCompletePayloadWithoutLocKey(): v
             'name' => 'value'
         ];
 
-        $result = $this->get_accessible_reflection_method('getPayloadDictionary')->invoke($this->class);
+        $result = $this->get_reflection_method('getPayloadDictionary')->invoke($this->class);
 
         $this->assertEquals($payload, $result);
     }
@@ -109,7 +109,7 @@ public function testGetPayloadDictionaryReturnsCompletePayloadWithoutBody(): voi
             'name' => 'value'
         ];
 
-        $result = $this->get_accessible_reflection_method('getPayloadDictionary')->invoke($this->class);
+        $result = $this->get_reflection_method('getPayloadDictionary')->invoke($this->class);
 
         $this->assertEquals($payload, $result);
     }
@@ -123,7 +123,7 @@ public function testGetPayloadDictionaryReturnsEmptyPayload(): void
     {
         $payload = [ 'aps' => [ 'alert' => [] ] ];
 
-        $result = $this->get_accessible_reflection_method('getPayloadDictionary')->invoke($this->class);
+        $result = $this->get_reflection_method('getPayloadDictionary')->invoke($this->class);
 
         $this->assertEquals($payload, $result);
     }

diff --git a/ApnsPHP/Message/Tests/CustomMessageTest.php b/ApnsPHP/Message/Tests/CustomMessageTest.php
@@ -22,13 +22,19 @@
  */
 abstract class CustomMessageTest extends LunrBaseTest
 {
+    /**
+     * Class to test
+     * @var CustomMessage
+     */
+    protected CustomMessage $class;
+
     /**
      * TestCase constructor
      */
     public function setUp(): void
     {
-        $this->reflection = new ReflectionClass('ApnsPHP\Message\CustomMessage');
         $this->class      = new CustomMessage();
+        $this->baseSetUp($this->class);
     }
 
     /**
@@ -37,6 +43,6 @@ public function setUp(): void
     public function tearDown(): void
     {
         unset($this->class);
-        unset($this->reflection);
+        parent::tearDown();
     }
 }
diff --git a/ApnsPHP/Message/Tests/SafariMessageGetPayloadDictionaryTest.php b/ApnsPHP/Message/Tests/SafariMessageGetPayloadDictionaryTest.php
@@ -40,7 +40,7 @@ public function testGetPayloadDictionaryReturnsCompletePayload(): void
             ]
         ];
 
-        $result = $this->get_accessible_reflection_method('getPayloadDictionary')->invoke($this->class);
+        $result = $this->get_reflection_method('getPayloadDictionary')->invoke($this->class);
 
         $this->assertEquals($payload, $result);
     }
@@ -54,7 +54,7 @@ public function testGetPayloadDictionaryReturnsEmptyPayload(): void
     {
         $payload = [ 'aps' => [ 'alert' => [] ] ];
 
-        $result = $this->get_accessible_reflection_method('getPayloadDictionary')->invoke($this->class);
+        $result = $this->get_reflection_method('getPayloadDictionary')->invoke($this->class);
 
         $this->assertEquals($payload, $result);
     }

diff --git a/ApnsPHP/Message/Tests/SafariMessageTest.php b/ApnsPHP/Message/Tests/SafariMessageTest.php
@@ -22,13 +22,19 @@
  */
 abstract class SafariMessageTest extends LunrBaseTest
 {
+    /**
+     * Class to test
+     * @var SafariMessage
+     */
+    protected SafariMessage $class;
+
     /**
      * TestCase constructor
      */
     public function setUp(): void
     {
-        $this->reflection = new ReflectionClass('ApnsPHP\Message\SafariMessage');
         $this->class      = new SafariMessage();
+        $this->baseSetUp($this->class);
     }
 
     /**
@@ -37,6 +43,6 @@ public function setUp(): void
     public function tearDown(): void
     {
         unset($this->class);
-        unset($this->reflection);
+        parent::tearDown();
     }
 }
diff --git a/ApnsPHP/Tests/MessageGetPayloadDictionaryTest.php b/ApnsPHP/Tests/MessageGetPayloadDictionaryTest.php
@@ -52,7 +52,7 @@ public function testGetPayloadDictionaryReturnsCompletePayload(): void
             'name' => 'value'
         ];
 
-        $result = $this->get_accessible_reflection_method('getPayloadDictionary')->invoke($this->class);
+        $result = $this->get_reflection_method('getPayloadDictionary')->invoke($this->class);
 
         $this->assertEquals($payload, $result);
     }
@@ -88,7 +88,7 @@ public function testGetPayloadDictionaryWithoutTitle(): void
             'name' => 'value'
         ];
 
-        $result = $this->get_accessible_reflection_method('getPayloadDictionary')->invoke($this->class);
+        $result = $this->get_reflection_method('getPayloadDictionary')->invoke($this->class);
 
         $this->assertEquals($payload, $result);
     }
@@ -102,7 +102,7 @@ public function testGetPayloadDictionaryReturnsEmptyPayload(): void
     {
         $payload = [ 'aps' => [] ];
 
-        $result = $this->get_accessible_reflection_method('getPayloadDictionary')->invoke($this->class);
+        $result = $this->get_reflection_method('getPayloadDictionary')->invoke($this->class);
 
         $this->assertEquals($payload, $result);
     }

diff --git a/ApnsPHP/Tests/MessageTest.php b/ApnsPHP/Tests/MessageTest.php
@@ -23,13 +23,19 @@
  */
 abstract class MessageTest extends LunrBaseTest
 {
+    /**
+     * Class to test
+     * @var Message
+     */
+    protected Message $class;
+
     /**
      * TestCase constructor
      */
     public function setUp(): void
     {
-        $this->reflection = new ReflectionClass('ApnsPHP\Message');
-        $this->class      = new Message();
+        $this->class = new Message();
+        $this->baseSetUp($this->class);
     }
 
     /**
@@ -38,6 +44,6 @@ public function setUp(): void
     public function tearDown(): void
     {
         unset($this->class);
-        unset($this->reflection);
+        parent::tearDown();
     }
 }
diff --git a/ApnsPHP/Tests/PushAddTest.php b/ApnsPHP/Tests/PushAddTest.php
@@ -39,7 +39,7 @@ public function testAddOneMessage(): void
 
         $this->class->add($this->message);
 
-        $queue = $this->get_accessible_reflection_property('messageQueue')->getValue($this->class);
+        $queue = $this->get_reflection_property('messageQueue')->getValue($this->class);
 
         $this->assertEquals($this->message, $queue[1]['MESSAGE']);
     }
@@ -73,7 +73,7 @@ public function testAddMultipleMessages(): void
 
         $this->class->add($this->message);
 
-        $queue = $this->get_accessible_reflection_property('messageQueue')->getValue($this->class);
+        $queue = $this->get_reflection_property('messageQueue')->getValue($this->class);
 
         $this->assertEquals($messages, $queue);
     }
@@ -95,7 +95,7 @@ public function testAddDoesNothing(): void
 
         $this->class->add($this->message);
 
-        $queue = $this->get_accessible_reflection_property('messageQueue')->getValue($this->class);
+        $queue = $this->get_reflection_property('messageQueue')->getValue($this->class);
 
         $this->assertArrayEmpty($queue);
     }

diff --git a/ApnsPHP/Tests/PushConnectTest.php b/ApnsPHP/Tests/PushConnectTest.php
@@ -30,9 +30,7 @@ public function testConnectSuccess(): void
     {
         $this->set_reflection_property_value('logger', $this->logger);
 
-        $this->mock_function('curl_setopt_array', function () {
-            return true;
-        });
+        $this->mock_function('curl_setopt_array', fn() => true);
 
         $this->logger->expects($this->exactly(3))
                      ->method('info')
@@ -57,9 +55,7 @@ public function testConnectThrowsExceptionOnHttpInitFail(): void
         $this->set_reflection_property_value('connectRetryInterval', 0);
         $this->set_reflection_property_value('logger', $this->logger);
 
-        $this->mock_function('curl_setopt_array', function () {
-            return false;
-        });
+        $this->mock_function('curl_setopt_array', fn() => false);
 
         $message = [
         ];

diff --git a/ApnsPHP/Tests/PushHttpInitTest.php b/ApnsPHP/Tests/PushHttpInitTest.php
@@ -42,7 +42,7 @@ public function testHttpInitSucceedsWithCertificate(): void
                      ->method('info')
                      ->withConsecutive(...$message);
 
-        $method = $this->get_accessible_reflection_method('httpInit');
+        $method = $this->get_reflection_method('httpInit');
         $result = $method->invoke($this->class);
 
         $this->assertTrue($result);
@@ -73,19 +73,9 @@ public function testHttpInitSucceedsWithKey(): void
             new Signature('signature', 'eSignature'),
         );
 
-        $this->mock_method(
-            [ 'Lcobucci\JWT\Signer\Key\InMemory', 'file' ],
-            function () use ($key) {
-                return $key;
-            }
-        );
+        $this->mock_method([ 'Lcobucci\JWT\Signer\Key\InMemory', 'file' ], fn() => $key);
 
-        $this->mock_method(
-            [ 'Lcobucci\JWT\Configuration', 'builder' ],
-            function () use ($builder) {
-                return $builder;
-            }
-        );
+        $this->mock_method([ 'Lcobucci\JWT\Configuration', 'builder' ], fn() => $builder);
 
         $builder->expects($this->once())
                 ->method('issuedBy')
@@ -115,7 +105,7 @@ function () use ($builder) {
                          [ 'Initialized HTTP/2 backend.' ]
                      );
 
-        $method = $this->get_accessible_reflection_method('httpInit');
+        $method = $this->get_reflection_method('httpInit');
         $result = $method->invoke($this->class);
 
         $this->assertTrue($result);
@@ -136,9 +126,7 @@ public function testHttpInitThrowsExceptionOnCurlSetoptFail(): void
         $this->set_reflection_property_value('providerKeyId', 'TheKey');
         $this->set_reflection_property_value('logger', $this->logger);
 
-        $this->mock_function('curl_setopt_array', function () {
-            return false;
-        });
+        $this->mock_function('curl_setopt_array', fn() => false);
 
         $key = $this->getMockBuilder('Lcobucci\JWT\Signer\Key')
                     ->disableOriginalConstructor()
@@ -153,19 +141,9 @@ public function testHttpInitThrowsExceptionOnCurlSetoptFail(): void
             new Signature('signature', 'eSignature'),
         );
 
-        $this->mock_method(
-            [ 'Lcobucci\JWT\Signer\Key\InMemory', 'file' ],
-            function () use ($key) {
-                return $key;
-            }
-        );
+        $this->mock_method([ 'Lcobucci\JWT\Signer\Key\InMemory', 'file' ], fn() => $key);
 
-        $this->mock_method(
-            [ 'Lcobucci\JWT\Configuration', 'builder' ],
-            function () use ($builder) {
-                return $builder;
-            }
-        );
+        $this->mock_method([ 'Lcobucci\JWT\Configuration', 'builder' ], fn() => $builder);
 
         $builder->expects($this->once())
                 ->method('issuedBy')
@@ -197,7 +175,7 @@ function () use ($builder) {
         $this->expectException('ApnsPHP\Exception');
         $this->expectExceptionMessage('Unable to initialize HTTP/2 backend.');
 
-        $method = $this->get_accessible_reflection_method('httpInit');
+        $method = $this->get_reflection_method('httpInit');
 
         # phpstan doesn't detect the potential throw through ReflectionMethod.
         # Verified that by making the method public and calling it directly