JPush: Update to latest Lunr.Halo

src/Lunr/Vortex/JPush/Tests/JPushBatchResponseBasePushErrorTest.php

@@ -19,7 +19,7 @@
  *
  * @covers \Lunr\Vortex\JPush\JPushBatchResponse
  */
-class JPushBatchResponseBasePushErrorTest extends JPushBatchResponseTest
+class JPushBatchResponseBasePushErrorTest extends JPushBatchResponseTestCase
 {
 
     /**

src/Lunr/Vortex/JPush/Tests/JPushBatchResponseBasePushSuccessTest.php

@@ -19,7 +19,7 @@
  *
  * @covers \Lunr\Vortex\JPush\JPushBatchResponse
  */
-class JPushBatchResponseBasePushSuccessTest extends JPushBatchResponseTest
+class JPushBatchResponseBasePushSuccessTest extends JPushBatchResponseTestCase
 {
 
     /**

src/Lunr/Vortex/JPush/Tests/JPushBatchResponseGetMessageIdTest.php

@@ -16,7 +16,7 @@
  *
  * @covers \Lunr\Vortex\JPush\JPushBatchResponse
  */
-class JPushBatchResponseGetMessageIdTest extends JPushBatchResponseTest
+class JPushBatchResponseGetMessageIdTest extends JPushBatchResponseTestCase
 {
 
     /**

src/Lunr/Vortex/JPush/Tests/JPushBatchResponseGetStatusTest.php

@@ -18,7 +18,7 @@
  *
  * @covers \Lunr\Vortex\JPush\JPushBatchResponse
  */
-class JPushBatchResponseGetStatusTest extends JPushBatchResponseTest
+class JPushBatchResponseGetStatusTest extends JPushBatchResponseTestCase
 {
 
     /**
@@ -82,8 +82,8 @@ public function endpointDataProvider(): array
      */
     public function testGetStatus($statuses, $status): void
     {
-        $this->set_reflection_property_value('statuses', $statuses);
-        $this->set_reflection_property_value('message_id', 1453658564165);
+        $this->setReflectionPropertyValue('statuses', $statuses);
+        $this->setReflectionPropertyValue('message_id', 1453658564165);
 
         $result = $this->class->get_status('endpoint_param');
 

src/Lunr/Vortex/JPush/Tests/JPushBatchResponseTest.php → src/Lunr/Vortex/JPush/Tests/JPushBatchResponseTestCase.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file contains the JPushBatchResponseTest class.
+ * This file contains the JPushBatchResponseTestCase class.
  *
  * SPDX-FileCopyrightText: Copyright 2020 M2mobi B.V., Amsterdam, The Netherlands
  * SPDX-FileCopyrightText: Copyright 2022 Move Agency Group B.V., Zwolle, The Netherlands
@@ -10,7 +10,7 @@
 
 namespace Lunr\Vortex\JPush\Tests;
 
-use Lunr\Halo\LunrBaseTest;
+use Lunr\Halo\LunrBaseTestCase;
 use Lunr\Vortex\JPush\JPushBatchResponse;
 use PHPUnit\Framework\MockObject\MockObject;
 use WpOrg\Requests\Response;
@@ -22,7 +22,7 @@
  *
  * @covers \Lunr\Vortex\JPush\JPushBatchResponse
  */
-abstract class JPushBatchResponseTest extends LunrBaseTest
+abstract class JPushBatchResponseTestCase extends LunrBaseTestCase
 {
 
     /**

src/Lunr/Vortex/JPush/Tests/JPushDispatcherBaseTest.php

@@ -17,7 +17,7 @@
  *
  * @covers \Lunr\Vortex\JPush\JPushDispatcher
  */
-class JPushDispatcherBaseTest extends JPushDispatcherTest
+class JPushDispatcherBaseTest extends JPushDispatcherTestCase
 {
 
     use PsrLoggerTestTrait;
@@ -45,7 +45,7 @@ public function testAuthTokenIsEmptyString(): void
      */
     public function testGetNewResponseObjectForFailedRequest(): void
     {
-        $method = $this->get_accessible_reflection_method('get_new_response_object_for_failed_request');
+        $method = $this->getReflectionMethod('get_new_response_object_for_failed_request');
 
         $result = $method->invoke($this->class);
 
@@ -72,7 +72,7 @@ public function testGetResponseReturnsJPushResponseObject(): void
      */
     public function testGetBatchResponseReturnsJPushBatchResponseObject(): void
     {
-        $method = $this->get_accessible_reflection_method('get_batch_response');
+        $method = $this->getReflectionMethod('get_batch_response');
         $result = $method->invokeArgs($this->class, [ $this->response, [ 'endpoint' ], '[]' ]);
 
         $this->assertInstanceOf('Lunr\Vortex\JPush\JPushBatchResponse', $result);

src/Lunr/Vortex/JPush/Tests/JPushDispatcherPushTest.php

@@ -22,7 +22,7 @@
  *
  * @covers \Lunr\Vortex\JPush\JPushDispatcher
  */
-class JPushDispatcherPushTest extends JPushDispatcherTest
+class JPushDispatcherPushTest extends JPushDispatcherTestCase
 {
 
     /**
@@ -90,7 +90,7 @@ public function testPushBatchReturnsJPushBatchResponseObject(): void
                    ->method('post')
                    ->will($this->returnValue($response));
 
-        $method = $this->get_accessible_reflection_method('push_batch');
+        $method = $this->getReflectionMethod('push_batch');
         $result = $method->invokeArgs($this->class, [ $this->payload, &$endpoints ]);
 
         $this->assertInstanceOf('Lunr\Vortex\JPush\JPushBatchResponse', $result);
@@ -124,7 +124,7 @@ public function testPushResetsProperties(): void
                       ->method('get_payload')
                       ->willReturn([ 'collapse_key' => 'abcde-12345' ]);
 
-        $this->set_reflection_property_value('auth_token', 'auth_token');
+        $this->setReflectionPropertyValue('auth_token', 'auth_token');
 
         $response = $this->getMockBuilder('WpOrg\Requests\Response')->getMock();
 
@@ -144,7 +144,7 @@ public function testPushResetsProperties(): void
      */
     public function testPushWithFailedRequest(): void
     {
-        $this->mock_function('curl_errno', function () { return 10; });
+        $this->mockFunction('curl_errno', function () { return 10; });
 
         $endpoints = [ 'endpoint' ];
         $url       = 'https://api.jpush.cn/v3/push';
@@ -172,7 +172,7 @@ public function testPushWithFailedRequest(): void
 
         $this->assertInstanceOf('Lunr\Vortex\JPush\JPushResponse', $result);
 
-        $this->unmock_function('curl_errno');
+        $this->unmockFunction('curl_errno');
     }
 
     /**
@@ -182,7 +182,7 @@ public function testPushWithFailedRequest(): void
      */
     public function testPushWithTimeoutRequest()
     {
-        $this->mock_function('curl_errno', function () { return 28; });
+        $this->mockFunction('curl_errno', function () { return 28; });
 
         $endpoints = [ 'endpoint' ];
         $url       = 'https://api.jpush.cn/v3/push';
@@ -212,7 +212,7 @@ public function testPushWithTimeoutRequest()
 
         $this->assertSame($result->get_status('endpoint'), PushNotificationStatus::TemporaryError);
 
-        $this->unmock_function('curl_errno');
+        $this->unmockFunction('curl_errno');
     }
 
     /**
@@ -299,7 +299,7 @@ public function testPushRequestWithSingleEndpoint(): void
                       ->method('get_payload')
                       ->willReturn($payload);
 
-        $this->set_reflection_property_value('auth_token', 'auth_token');
+        $this->setReflectionPropertyValue('auth_token', 'auth_token');
 
         $response = $this->getMockBuilder('WpOrg\Requests\Response')->getMock();
 
@@ -328,7 +328,7 @@ public function testPushRequestWithMultibyteCharacters(): void
                       ->method('get_payload')
                       ->willReturn($payload);
 
-        $this->set_reflection_property_value('auth_token', 'auth_token');
+        $this->setReflectionPropertyValue('auth_token', 'auth_token');
 
         $response = $this->getMockBuilder('WpOrg\Requests\Response')->getMock();
 
@@ -356,7 +356,7 @@ public function testPushRequestWithMultipleEndpointsOneBatch(): void
                       ->method('get_payload')
                       ->willReturn($payload);
 
-        $this->set_reflection_property_value('auth_token', 'auth_token');
+        $this->setReflectionPropertyValue('auth_token', 'auth_token');
 
         $response = $this->getMockBuilder('WpOrg\Requests\Response')->getMock();
 
@@ -382,7 +382,7 @@ public function testPushRequestWithMultipleEndpointsMultipleBatches(): void
     {
         $endpoints = [ 'endpoint1', 'endpoint2', 'endpoint3', 'endpoint4', 'endpoint5' ];
 
-        $this->set_reflection_property_value('auth_token', 'auth_token');
+        $this->setReflectionPropertyValue('auth_token', 'auth_token');
 
         $response = $this->getMockBuilder('WpOrg\Requests\Response')->getMock();
 

src/Lunr/Vortex/JPush/Tests/JPushDispatcherSetTest.php

@@ -15,7 +15,7 @@
  *
  * @covers \Lunr\Vortex\JPush\JPushDispatcher
  */
-class JPushDispatcherSetTest extends JPushDispatcherTest
+class JPushDispatcherSetTest extends JPushDispatcherTestCase
 {
 
     /**

src/Lunr/Vortex/JPush/Tests/JPushDispatcherTest.php → src/Lunr/Vortex/JPush/Tests/JPushDispatcherTestCase.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file contains the JPushDispatcherTest class.
+ * This file contains the JPushDispatcherTestCase class.
  *
  * SPDX-FileCopyrightText: Copyright 2020 M2mobi B.V., Amsterdam, The Netherlands
  * SPDX-FileCopyrightText: Copyright 2022 Move Agency Group B.V., Zwolle, The Netherlands
@@ -10,7 +10,7 @@
 
 namespace Lunr\Vortex\JPush\Tests;
 
-use Lunr\Halo\LunrBaseTest;
+use Lunr\Halo\LunrBaseTestCase;
 use Lunr\Vortex\JPush\JPushDispatcher;
 use Lunr\Vortex\JPush\JPushPayload;
 use Psr\Log\LoggerInterface;
@@ -23,7 +23,7 @@
  *
  * @covers \Lunr\Vortex\JPush\JPushDispatcher
  */
-abstract class JPushDispatcherTest extends LunrBaseTest
+abstract class JPushDispatcherTestCase extends LunrBaseTestCase
 {
     /**
      * Mock instance of the Requests\Session class.

src/Lunr/Vortex/JPush/Tests/JPushMessagePayloadBaseTest.php

@@ -15,7 +15,7 @@
  *
  * @covers \Lunr\Vortex\JPush\JPushMessagePayload
  */
-class JPushMessagePayloadBaseTest extends JPushMessagePayloadTest
+class JPushMessagePayloadBaseTest extends JPushMessagePayloadTestCase
 {
 
     /**

src/Lunr/Vortex/JPush/Tests/JPushMessagePayloadGetTest.php

@@ -15,7 +15,7 @@
  *
  * @covers \Lunr\Vortex\JPush\JPushMessagePayload
  */
-class JPushMessagePayloadGetTest extends JPushMessagePayloadTest
+class JPushMessagePayloadGetTest extends JPushMessagePayloadTestCase
 {
 
     /**
@@ -51,7 +51,7 @@ public function testGetPayloadMessage(): void
             'time_to_live'     => 10,
         ];
 
-        $this->set_reflection_property_value('elements', $elements);
+        $this->setReflectionPropertyValue('elements', $elements);
 
         $this->assertEquals($expected, $this->class->get_payload());
     }

src/Lunr/Vortex/JPush/Tests/JPushMessagePayloadTest.php → src/Lunr/Vortex/JPush/Tests/JPushMessagePayloadTestCase.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file contains the JPushMessagePayloadTest class.
+ * This file contains the JPushMessagePayloadTestCase class.
  *
  * SPDX-FileCopyrightText: Copyright 2020 M2mobi B.V., Amsterdam, The Netherlands
  * SPDX-FileCopyrightText: Copyright 2022 Move Agency Group B.V., Zwolle, The Netherlands
@@ -10,7 +10,7 @@
 
 namespace Lunr\Vortex\JPush\Tests;
 
-use Lunr\Halo\LunrBaseTest;
+use Lunr\Halo\LunrBaseTestCase;
 use Lunr\Vortex\JPush\JPushMessagePayload;
 
 /**
@@ -19,7 +19,7 @@
  *
  * @covers Lunr\Vortex\JPush\JPushMessagePayload
  */
-abstract class JPushMessagePayloadTest extends LunrBaseTest
+abstract class JPushMessagePayloadTestCase extends LunrBaseTestCase
 {
 
     /**

src/Lunr/Vortex/JPush/Tests/JPushNotification3rdPayloadBaseTest.php

@@ -14,7 +14,7 @@
  *
  * @covers \Lunr\Vortex\JPush\JPushNotification3rdPayload
  */
-class JPushNotification3rdPayloadBaseTest extends JPushNotification3rdPayloadTest
+class JPushNotification3rdPayloadBaseTest extends JPushNotification3rdPayloadTestCase
 {
 
     /**

src/Lunr/Vortex/JPush/Tests/JPushNotification3rdPayloadGetTest.php

@@ -14,7 +14,7 @@
  *
  * @covers \Lunr\Vortex\JPush\JPushNotification3rdPayload
  */
-class JPushNotification3rdPayloadGetTest extends JPushNotification3rdPayloadTest
+class JPushNotification3rdPayloadGetTest extends JPushNotification3rdPayloadTestCase
 {
 
     /**
@@ -53,7 +53,7 @@ public function testGetPayloadMessage(): void
             'time_to_live'     => 10,
         ];
 
-        $this->set_reflection_property_value('elements', $elements);
+        $this->setReflectionPropertyValue('elements', $elements);
 
         $this->assertEquals($expected, $this->class->get_payload());
     }

src/Lunr/Vortex/JPush/Tests/JPushNotification3rdPayloadSetTest.php

@@ -14,7 +14,7 @@
  *
  * @covers \Lunr\Vortex\JPush\JPushNotification3rdPayload
  */
-class JPushNotification3rdPayloadSetTest extends JPushNotification3rdPayloadTest
+class JPushNotification3rdPayloadSetTest extends JPushNotification3rdPayloadTestCase
 {
 
     /**
@@ -26,7 +26,7 @@ public function testSetSound(): void
     {
         $this->class->set_sound('sound');
 
-        $value = $this->get_reflection_property_value('elements');
+        $value = $this->getReflectionPropertyValue('elements');
 
         $this->assertArrayHasKey('sound', $value['notification_3rd']);
         $this->assertEquals('sound', $value['notification_3rd']['sound']);

src/Lunr/Vortex/JPush/Tests/JPushNotification3rdPayloadTest.php → src/Lunr/Vortex/JPush/Tests/JPushNotification3rdPayloadTestCase.php

@@ -1,15 +1,15 @@
 <?php
 
 /**
- * This file contains the JPushNotification3rdPayloadTest class.
+ * This file contains the JPushNotification3rdPayloadTestCase class.
  *
  * SPDX-FileCopyrightText: Copyright 2022 Move Agency Group B.V., Zwolle, The Netherlands
  * SPDX-License-Identifier: MIT
  */
 
 namespace Lunr\Vortex\JPush\Tests;
 
-use Lunr\Halo\LunrBaseTest;
+use Lunr\Halo\LunrBaseTestCase;
 use Lunr\Vortex\JPush\JPushNotification3rdPayload;
 
 /**
@@ -18,7 +18,7 @@
  *
  * @covers Lunr\Vortex\JPush\JPushNotification3rdPayload
  */
-abstract class JPushNotification3rdPayloadTest extends LunrBaseTest
+abstract class JPushNotification3rdPayloadTestCase extends LunrBaseTestCase
 {
 
     /**

src/Lunr/Vortex/JPush/Tests/JPushNotificationPayloadBaseTest.php

@@ -15,7 +15,7 @@
  *
  * @covers \Lunr\Vortex\JPush\JPushNotificationPayload
  */
-class JPushNotificationPayloadBaseTest extends JPushNotificationPayloadTest
+class JPushNotificationPayloadBaseTest extends JPushNotificationPayloadTestCase
 {
 
     /**

src/Lunr/Vortex/JPush/Tests/JPushNotificationPayloadGetTest.php

@@ -15,7 +15,7 @@
  *
  * @covers \Lunr\Vortex\JPush\JPushNotificationPayload
  */
-class JPushNotificationPayloadGetTest extends JPushNotificationPayloadTest
+class JPushNotificationPayloadGetTest extends JPushNotificationPayloadTestCase
 {
 
     /**
@@ -56,7 +56,7 @@ public function testGetPayloadNotification(): void
             'time_to_live'     => 10,
         ];
 
-        $this->set_reflection_property_value('elements', $elements);
+        $this->setReflectionPropertyValue('elements', $elements);
 
         $this->assertEquals($expected, $this->class->get_payload());
     }