Skip to content

Commit b871beb

Browse files
committed
Update test files with more consistent usage of $this
1 parent b6ad0d3 commit b871beb

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

skeleton/tests/controller/main_test.php.twig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class main_test extends \phpbb_test_case
5555
->getMock();
5656
5757
// Set the expected output of the controller_helper->render() method
58-
$controller_helper->expects(self::once())
58+
$controller_helper->expects($this->once())
5959
->method('render')
6060
->willReturnCallback(function ($template_file, $page_title = '', $status_code = 200, $display_online_list = false) {
6161
return new \Symfony\Component\HttpFoundation\Response($template_file, $status_code);
@@ -70,8 +70,8 @@ class main_test extends \phpbb_test_case
7070
);
7171
7272
$response = $controller->handle('test');
73-
self::assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
74-
self::assertEquals($status_code, $response->getStatusCode());
75-
self::assertEquals($page_content, $response->getContent());
73+
$this->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
74+
$this->assertEquals($status_code, $response->getStatusCode());
75+
$this->assertEquals($page_content, $response->getContent());
7676
}
7777
}

skeleton/tests/dbal/simple_test.php.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class simple_test extends \phpbb_database_test_case
5555
$db_tools = $factory->get($this->db);
5656
}
5757
58-
self::assertTrue($db_tools->sql_column_exists(USERS_TABLE, 'user_{{ EXTENSION.extension_name|lower }}'), 'Asserting that column "user_{{ EXTENSION.extension_name|lower }}" exists');
59-
self::assertFalse($db_tools->sql_column_exists(USERS_TABLE, 'user_{{ EXTENSION.extension_name|lower }}_void'), 'Asserting that column "user_{{ EXTENSION.extension_name|lower }}_void" does not exist');
58+
$this->assertTrue($db_tools->sql_column_exists(USERS_TABLE, 'user_{{ EXTENSION.extension_name|lower }}'), 'Asserting that column "user_{{ EXTENSION.extension_name|lower }}" exists');
59+
$this->assertFalse($db_tools->sql_column_exists(USERS_TABLE, 'user_{{ EXTENSION.extension_name|lower }}_void'), 'Asserting that column "user_{{ EXTENSION.extension_name|lower }}_void" does not exist');
6060
}
6161
}

skeleton/tests/functional/view_test.php.twig

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ class view_test extends \phpbb_functional_test_case
3030
public function test_view_foo()
3131
{
3232
$crawler = self::request('GET', 'app.php/demo/foo');
33-
self::assertStringContainsString('foo', $crawler->filter('h2')->text());
33+
$this->assertStringContainsString('foo', $crawler->filter('h2')->text());
3434
3535
$this->add_lang_ext('{{ EXTENSION.vendor_name }}/{{ EXTENSION.extension_name }}', 'common');
36-
self::assertStringContainsString($this->lang('{{ EXTENSION.extension_name|upper }}_HELLO', 'foo'), $crawler->filter('h2')->text());
37-
self::assertStringNotContainsString($this->lang('{{ EXTENSION.extension_name|upper }}_GOODBYE', 'foo'), $crawler->filter('h2')->text());
36+
$this->assertStringContainsString($this->lang('{{ EXTENSION.extension_name|upper }}_HELLO', 'foo'), $crawler->filter('h2')->text());
37+
$this->assertStringNotContainsString($this->lang('{{ EXTENSION.extension_name|upper }}_GOODBYE', 'foo'), $crawler->filter('h2')->text());
3838
3939
$this->assertNotContainsLang('ACP_{{ EXTENSION.extension_name|upper }}_GOODBYE', $crawler->filter('h2')->text());
4040
}
@@ -46,7 +46,7 @@ class view_test extends \phpbb_functional_test_case
4646
public function test_view_bar()
4747
{
4848
$crawler = self::request('GET', 'app.php/demo/bar');
49-
self::assertStringNotContainsString('foo', $crawler->filter('h2')->text());
50-
self::assertStringContainsString('bar', $crawler->filter('h2')->text());
49+
$this->assertStringNotContainsString('foo', $crawler->filter('h2')->text());
50+
$this->assertStringContainsString('bar', $crawler->filter('h2')->text());
5151
}
5252
}

0 commit comments

Comments
 (0)