Merge pull request #2 from sikofitt/v0.0.x

V0.0.x
This commit is contained in:
Eric 2021-01-20 14:46:11 -08:00 committed by GitHub
commit db95499a7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 31 deletions

View File

@ -3,9 +3,10 @@
"description": "Generates dummy mac addresses", "description": "Generates dummy mac addresses",
"type": "library", "type": "library",
"require": { "require": {
"php": "^7.2", "php": ">=7.3",
"ext-json": "*",
"ext-sodium": "*", "ext-sodium": "*",
"ext-json": "*" "phpunit/phpunit": "^9.5"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
@ -14,7 +15,6 @@
}, },
"require-dev": { "require-dev": {
"symfony/console": "^4.1", "symfony/console": "^4.1",
"phpunit/phpunit": "^7.4",
"friendsofphp/php-cs-fixer": "^2.13", "friendsofphp/php-cs-fixer": "^2.13",
"squizlabs/php_codesniffer": "^3.3" "squizlabs/php_codesniffer": "^3.3"
}, },

View File

@ -1,24 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html --> <!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.4/phpunit.xsd" <coverage>
backupGlobals="false" <include>
colors="true" <directory>./src/</directory>
bootstrap="vendor/autoload.php" </include>
> </coverage>
<php> <php>
<ini name="error_reporting" value="-1"/> <ini name="error_reporting" value="-1"/>
</php> </php>
<testsuites> <testsuites>
<testsuite name="Project Test Suite"> <testsuite name="Project Test Suite">
<directory>tests/</directory> <directory>tests/</directory>
</testsuite> </testsuite>
</testsuites> </testsuites>
<filter>
<whitelist>
<directory>./src/</directory>
</whitelist>
</filter>
</phpunit> </phpunit>

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());
} }

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(), ':'));
} }