mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #18687 from nextcloud/td/phpunit8/loggerTest 

Fix the LoggerTests for phpunit
This commit is contained in:
Roeland Jago Douma 2020-01-06 10:20:01 +01:00 committed by GitHub
parent 0e3392665f a673c597ed
commit a7b3ed32ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tests/lib/LoggerTest.php
View File

@ -71,7 +71,7 @@ class LoggerTest extends TestCase implements IWriter {
$this->logs[]= "$level $message"; $this->logs[]= "$level $message";
} }
public function userAndPasswordData() { public function userAndPasswordData(): array {
return [ return [
['mySpecialUsername', 'MySuperSecretPassword'], ['mySpecialUsername', 'MySuperSecretPassword'],
['my-user', '324324()#ä234'], ['my-user', '324324()#ä234'],
@ -87,7 +87,7 @@ class LoggerTest extends TestCase implements IWriter {
/** /**
* @dataProvider userAndPasswordData * @dataProvider userAndPasswordData
*/ */
public function testDetectlogin($user, $password) { public function testDetectlogin(string $user, string $password): void {
$e = new \Exception('test'); $e = new \Exception('test');
$this->registry->expects($this->once()) $this->registry->expects($this->once())
->method('delegateReport') ->method('delegateReport')
@ -100,16 +100,16 @@ class LoggerTest extends TestCase implements IWriter {
if (is_array($logLine)) { if (is_array($logLine)) {
$logLine = json_encode($logLine); $logLine = json_encode($logLine);
} }
$this->assertNotContains($user, $logLine); $this->assertStringNotContainsString($user, $logLine);
$this->assertNotContains($password, $logLine); $this->assertStringNotContainsString($password, $logLine);
$this->assertContains('*** sensitive parameters replaced ***', $logLine); $this->assertStringContainsString('*** sensitive parameters replaced ***', $logLine);
} }
} }
/** /**
* @dataProvider userAndPasswordData * @dataProvider userAndPasswordData
*/ */
public function testDetectcheckPassword($user, $password) { public function testDetectcheckPassword(string $user, string $password): void {
$e = new \Exception('test'); $e = new \Exception('test');
$this->registry->expects($this->once()) $this->registry->expects($this->once())
->method('delegateReport') ->method('delegateReport')
@ -122,16 +122,16 @@ class LoggerTest extends TestCase implements IWriter {
if (is_array($logLine)) { if (is_array($logLine)) {
$logLine = json_encode($logLine); $logLine = json_encode($logLine);
} }
$this->assertNotContains($user, $logLine); $this->assertStringNotContainsString($user, $logLine);
$this->assertNotContains($password, $logLine); $this->assertStringNotContainsString($password, $logLine);
$this->assertContains('*** sensitive parameters replaced ***', $logLine); $this->assertStringContainsString('*** sensitive parameters replaced ***', $logLine);
} }
} }
/** /**
* @dataProvider userAndPasswordData * @dataProvider userAndPasswordData
*/ */
public function testDetectvalidateUserPass($user, $password) { public function testDetectvalidateUserPass(string $user, string $password): void {
$e = new \Exception('test'); $e = new \Exception('test');
$this->registry->expects($this->once()) $this->registry->expects($this->once())
->method('delegateReport') ->method('delegateReport')
@ -144,16 +144,16 @@ class LoggerTest extends TestCase implements IWriter {
if (is_array($logLine)) { if (is_array($logLine)) {
$logLine = json_encode($logLine); $logLine = json_encode($logLine);
} }
$this->assertNotContains($user, $logLine); $this->assertStringNotContainsString($user, $logLine);
$this->assertNotContains($password, $logLine); $this->assertStringNotContainsString($password, $logLine);
$this->assertContains('*** sensitive parameters replaced ***', $logLine); $this->assertStringContainsString('*** sensitive parameters replaced ***', $logLine);
} }
} }
/** /**
* @dataProvider userAndPasswordData * @dataProvider userAndPasswordData
*/ */
public function testDetecttryLogin($user, $password) { public function testDetecttryLogin(string $user, string $password): void {
$e = new \Exception('test'); $e = new \Exception('test');
$this->registry->expects($this->once()) $this->registry->expects($this->once())
->method('delegateReport') ->method('delegateReport')
@ -166,16 +166,16 @@ class LoggerTest extends TestCase implements IWriter {
if (is_array($logLine)) { if (is_array($logLine)) {
$logLine = json_encode($logLine); $logLine = json_encode($logLine);
} }
$this->assertNotContains($user, $logLine); $this->assertStringNotContainsString($user, $logLine);
$this->assertNotContains($password, $logLine); $this->assertStringNotContainsString($password, $logLine);
$this->assertContains('*** sensitive parameters replaced ***', $logLine); $this->assertStringContainsString('*** sensitive parameters replaced ***', $logLine);
} }
} }
/** /**
* @dataProvider userAndPasswordData * @dataProvider userAndPasswordData
*/ */
public function testDetectclosure($user, $password) { public function testDetectclosure(string $user, string $password): void {
$a = function($user, $password) { $a = function($user, $password) {
throw new \Exception('test'); throw new \Exception('test');
}; };
@ -197,9 +197,9 @@ class LoggerTest extends TestCase implements IWriter {
unset($log[1]); // Remove `testDetectclosure(` because we are not testing this here, but the closure on stack trace 0 unset($log[1]); // Remove `testDetectclosure(` because we are not testing this here, but the closure on stack trace 0
$logLine = implode('\n', $log); $logLine = implode('\n', $log);
$this->assertNotContains($user, $logLine); $this->assertStringNotContainsString($user, $logLine);
$this->assertNotContains($password, $logLine); $this->assertStringNotContainsString($password, $logLine);
$this->assertContains('*** sensitive parameters replaced ***', $logLine); $this->assertStringContainsString('*** sensitive parameters replaced ***', $logLine);
} }
} }
} }