eric
/
generate-mac
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PHPUnit 9.x fix

This commit is contained in:
R. Eric Wheeler 2021-01-20 14:44:22 -08:00
parent 36d206bed8
commit 84cb882115
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/GenerateMacCommandTest.php
View File

@ -49,7 +49,7 @@ class GenerateMacCommandTest extends TestCase
{ {
$this->commandTester->execute([]); $this->commandTester->execute([]);
$display = $this->commandTester->getDisplay(); $display = $this->commandTester->getDisplay();
$this->assertContains('// Generated 1 mac addresses', $display); $this->assertStringContainsString('// Generated 1 mac addresses', $display);
$this->assertSame(0, $this->commandTester->getStatusCode()); $this->assertSame(0, $this->commandTester->getStatusCode());
$this->expectException(\RuntimeException::class); $this->expectException(\RuntimeException::class);
$this->commandTester->execute(['--count' => -1]); $this->commandTester->execute(['--count' => -1]);
@ -65,7 +65,7 @@ class GenerateMacCommandTest extends TestCase
public function testPlain(): void public function testPlain(): void
{ {
$this->commandTester->execute(['--output' => 'plain', '--count' => 1]); $this->commandTester->execute(['--output' => 'plain', '--count' => 1]);
$this->assertRegExp(self::REGEX, $this->commandTester->getDisplay()); $this->assertMatchesRegularExpression(self::REGEX, $this->commandTester->getDisplay());
$this->assertSame(0, $this->commandTester->getStatusCode()); $this->assertSame(0, $this->commandTester->getStatusCode());
} }

8
tests/MacTest.php
View File

@ -36,10 +36,10 @@ class MacTest extends TestCase
$this->assertCount(50, $macAddresses); $this->assertCount(50, $macAddresses);
foreach ($macAddresses as $address) { foreach ($macAddresses as $address) {
$this->assertRegExp(self::REGEX, $address); $this->assertMatchesRegularExpression(self::REGEX, $address);
} }
$this->assertRegExp(self::REGEX, $mac->getMacAddress()); $this->assertMatchesRegularExpression(self::REGEX, $mac->getMacAddress());
$this->assertSame(Mac::SEPARATOR_COLON, $mac->getSeparator()); $this->assertSame(Mac::SEPARATOR_COLON, $mac->getSeparator());
$this->assertTrue($mac->getUnique()); $this->assertTrue($mac->getUnique());
} }
@ -49,10 +49,10 @@ class MacTest extends TestCase
$mac = new Mac(Mac::SEPARATOR_DASH); $mac = new Mac(Mac::SEPARATOR_DASH);
$this->assertSame(Mac::SEPARATOR_DASH, $mac->getSeparator()); $this->assertSame(Mac::SEPARATOR_DASH, $mac->getSeparator());
$this->assertRegExp(self::REGEX, $mac->getMacAddress()); $this->assertMatchesRegularExpression(self::REGEX, $mac->getMacAddress());
$mac->setSeparator(Mac::SEPARATOR_COLON); $mac->setSeparator(Mac::SEPARATOR_COLON);
$this->assertSame(Mac::SEPARATOR_COLON, $mac->getSeparator()); $this->assertSame(Mac::SEPARATOR_COLON, $mac->getSeparator());
$this->assertRegExp(self::REGEX, $mac->getMacAddress()); $this->assertMatchesRegularExpression(self::REGEX, $mac->getMacAddress());
$this->assertNotFalse(strpos($mac->getMacAddress(), ':')); $this->assertNotFalse(strpos($mac->getMacAddress(), ':'));
} }