Fix remainder of unit test warnings in PHP 8.0

This commit is contained in:
Kijin Sung 2021-01-29 00:36:24 +09:00
parent e368cb2f2a
commit 334b1cc277
8 changed files with 30 additions and 19 deletions

View file

@ -1,2 +1,2 @@
<?php
// Here you can initialize variables that will be available to your tests
// Here you can initialize variables that will be available to your tests

View file

@ -46,7 +46,9 @@ class ContextTest extends \Codeception\TestCase\Test
$data->var2 = 'val2';
$this->assertEquals(Context::gets('var1','var2'), $data);
$data->var3 = 'val3';
$this->assertEquals(Context::getAll(), $data);
$this->assertEquals('val1', Context::getAll()->var1);
$this->assertEquals('val2', Context::getAll()->var2);
$this->assertEquals('val3', Context::getAll()->var3);
}
public function testAddGetBodyClass()

View file

@ -5,8 +5,6 @@ class ValidatorTest extends \Codeception\TestCase\Test
public function _before()
{
$ob_level = ob_get_level();
Context::init();
while (ob_get_level() > $ob_level)
{
ob_end_clean();

View file

@ -9,6 +9,7 @@ class DateTimeTest extends \Codeception\TestCase\Test
// Add some dummy data to system configuration. Asia/Seoul offset is 32400.
Rhymix\Framework\Config::set('locale.default_timezone', 'Asia/Seoul');
Rhymix\Framework\Config::set('locale.internal_timezone', 10800);
Context::set('_default_timezone', $GLOBALS['_time_zone'] = 'Asia/Seoul');
// Set PHP time zone to the internal time zone.
$this->old_timezone = @date_default_timezone_get();
@ -17,6 +18,11 @@ class DateTimeTest extends \Codeception\TestCase\Test
public function _after()
{
// Restore the default and internal timezone.
Rhymix\Framework\Config::set('locale.default_timezone', 'Asia/Seoul');
Rhymix\Framework\Config::set('locale.internal_timezone', 10800);
Context::set('_default_timezone', $GLOBALS['_time_zone'] = 'Asia/Seoul');
// Restore the old timezone.
date_default_timezone_set($this->old_timezone);
}

View file

@ -2,6 +2,11 @@
class SMSTest extends \Codeception\TestCase\Test
{
public function _before()
{
Context::init();
}
public function testGetSetDefaultDriver()
{
$driver = Rhymix\Framework\SMS::getDefaultDriver();
@ -188,7 +193,7 @@ class SMSTest extends \Codeception\TestCase\Test
$sms->send();
$messages = $driver->getSentMessages();
$this->assertEquals('01099998888', count($messages) ? $messages[0]->from : '');
$this->assertEquals('01099998888', $messages[0]->from);
config('sms.default_force', false);
@ -329,7 +334,7 @@ class SMSTest extends \Codeception\TestCase\Test
$messages = $driver->getSentMessages();
$this->assertEquals(2, count($messages));
$this->assertEquals($message[0]->to, $message[1]->to);
$this->assertEquals($messages[0]->to, $messages[1]->to);
$this->assertEquals('MMS', $messages[0]->type);
$this->assertEquals('MMS', $messages[1]->type);
$this->assertEquals('MMS 내용입니다.', $messages[0]->content);
@ -394,8 +399,8 @@ class SMSTest extends \Codeception\TestCase\Test
$this->assertEquals(\RX_BASEDIR . 'tests/_data/images/rhymix.png', $messages[0]->image);
$this->assertEquals(\RX_BASEDIR . 'tests/_output/rhymix-copy-1.png', $messages[1]->image);
$this->assertEquals(\RX_BASEDIR . 'tests/_output/rhymix-copy-2.png', $messages[2]->image);
$this->assertNull($messages[3]->image);
$this->assertNull($messages[4]->image);
$this->assertNull($messages[3]->image ?? null);
$this->assertNull($messages[4]->image ?? null);
// Test MMS with no text content.
$driver->resetSentMessages();