Skip to content

Commit 943290b

Browse files
simensensimensen
authored
Merge pull request #8 from mallardduck/fix-phpunit
Restructure tests and add PHPUnit to package dependencies
2 parents 381da0f + 64306db commit 943290b

11 files changed

Lines changed: 50 additions & 19 deletions

‎composer.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,19 @@
1919
"php": ">=5.3"
2020
},
2121
"require-dev": {
22-
"twig/twig": "1.*"
22+
"twig/twig": "1.*",
23+
"phpunit/phpunit": "^7.4"
2324
},
2425
"autoload": {
2526
"psr-0": {
2627
"Dflydev\\ApacheMimeTypes": "src"
2728
}
2829
},
30+
"autoload-dev": {
31+
"psr-4": {
32+
"Dflydev\\ApacheMimeTypes\\Test\\": "tests"
33+
}
34+
},
2935
"extra": {
3036
"branch-alias": {
3137
"dev-master": "1.0-dev"

‎phpunit.xml.dist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<phpunit colors="true" bootstrap="vendor/autoload.php">
33
<testsuites>
44
<testsuite name="Apache MIME Types Test Suite">
5-
<directory>./tests/Dflydev/ApacheMimeTypes</directory>
5+
<directory suffix="Test.php">./tests</directory>
66
</testsuite>
77
</testsuites>
88

tests/Dflydev/ApacheMimeTypes/AbstractRepositoryTest.php renamed to tests/AbstractRepositoryTestCase.php

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Dflydev\ApacheMimeTypes;
12+
namespace Dflydev\ApacheMimeTypes\Test;
1313

1414
/**
1515
* Flat Repository Test
1616
*
1717
* @author Beau Simensen <beau@dflydev.com>
1818
*/
19-
abstract class AbstractRepositoryTest extends \PHPUnit_Framework_TestCase
19+
abstract class AbstractRepositoryTestCase extends \PHPUnit\Framework\TestCase
2020
{
2121
abstract protected function createDefaultRepository();
2222
abstract protected function createRepository();
@@ -26,6 +26,7 @@ public function testDefaultCss()
2626
$repository = $this->createDefaultRepository();
2727

2828
if (null === $repository) {
29+
$this->assertTrue(true);
2930
return;
3031
}
3132

@@ -41,6 +42,7 @@ public function testDefaultHtml()
4142
$repository = $this->createDefaultRepository();
4243

4344
if (null === $repository) {
45+
$this->assertTrue(true);
4446
return;
4547
}
4648

@@ -58,6 +60,7 @@ public function testDefaultMissing()
5860
$repository = $this->createDefaultRepository();
5961

6062
if (null === $repository) {
63+
$this->assertTrue(true);
6164
return;
6265
}
6366

@@ -71,6 +74,7 @@ public function testDefaultDumpTypeToExtensions()
7174
$repository = $this->createDefaultRepository();
7275

7376
if (null === $repository) {
77+
$this->assertTrue(true);
7478
return;
7579
}
7680

@@ -84,6 +88,7 @@ public function testDefaultDumpExtensionToType()
8488
$repository = $this->createDefaultRepository();
8589

8690
if (null === $repository) {
91+
$this->assertTrue(true);
8792
return;
8893
}
8994

@@ -97,6 +102,7 @@ public function testMissing()
97102
$repository = $this->createRepository();
98103

99104
if (null === $repository) {
105+
$this->assertTrue(true);
100106
return;
101107
}
102108

@@ -110,6 +116,7 @@ public function testFabricated()
110116
$repository = $this->createRepository();
111117

112118
if (null === $repository) {
119+
$this->assertTrue(true);
113120
return;
114121
}
115122

@@ -124,6 +131,7 @@ public function testDumpTypeToExtensions()
124131
$repository = $this->createRepository();
125132

126133
if (null === $repository) {
134+
$this->assertTrue(true);
127135
return;
128136
}
129137

@@ -139,6 +147,7 @@ public function testDumpExtensionToType()
139147
$repository = $this->createRepository();
140148

141149
if (null === $repository) {
150+
$this->assertTrue(true);
142151
return;
143152
}
144153

tests/Dflydev/ApacheMimeTypes/ArrayRepositoryTest.php renamed to tests/ArrayRepositoryTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Dflydev\ApacheMimeTypes;
12+
namespace Dflydev\ApacheMimeTypes\Test;
13+
14+
use Dflydev\ApacheMimeTypes\ArrayRepository;
1315

1416
/**
1517
* Array Repository Test
1618
*
1719
* @author Beau Simensen <beau@dflydev.com>
1820
*/
19-
class ArrayRepositoryTest extends AbstractRepositoryTest
21+
class ArrayRepositoryTest extends AbstractRepositoryTestCase
2022
{
2123
protected function createDefaultRepository()
2224
{

tests/Dflydev/ApacheMimeTypes/CompositeRepositoryTest.php renamed to tests/CompositeRepositoryTest.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,20 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Dflydev\ApacheMimeTypes;
12+
namespace Dflydev\ApacheMimeTypes\Test;
13+
14+
use Dflydev\ApacheMimeTypes\PhpRepository;
15+
use Dflydev\ApacheMimeTypes\JsonRepository;
16+
use Dflydev\ApacheMimeTypes\FlatRepository;
17+
use Dflydev\ApacheMimeTypes\ArrayRepository;
18+
use Dflydev\ApacheMimeTypes\CompositeRepository;
1319

1420
/**
1521
* Composite Repository Test
1622
*
1723
* @author Beau Simensen <beau@dflydev.com>
1824
*/
19-
class CompositeRepositoryTest extends AbstractRepositoryTest
25+
class CompositeRepositoryTest extends AbstractRepositoryTestCase
2026
{
2127
protected function createDefaultRepository()
2228
{

tests/Dflydev/ApacheMimeTypes/FlatRepositoryTest.php renamed to tests/FlatRepositoryTest.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Dflydev\ApacheMimeTypes;
12+
namespace Dflydev\ApacheMimeTypes\Test;
13+
14+
use Dflydev\ApacheMimeTypes\FlatRepository;
1315

1416
/**
1517
* Flat Repository Test
1618
*
1719
* @author Beau Simensen <beau@dflydev.com>
1820
*/
19-
class FlatRepositoryTest extends AbstractRepositoryTest
21+
class FlatRepositoryTest extends AbstractRepositoryTestCase
2022
{
2123
protected function createDefaultRepository()
2224
{
@@ -25,6 +27,6 @@ protected function createDefaultRepository()
2527

2628
protected function createRepository()
2729
{
28-
return new FlatRepository(__DIR__.'/Fixtures/mime.types');
30+
return new FlatRepository(__DIR__.'/fixtures/mime.types');
2931
}
3032
}

tests/Dflydev/ApacheMimeTypes/JsonRepositoryTest.php renamed to tests/JsonRepositoryTest.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Dflydev\ApacheMimeTypes;
12+
namespace Dflydev\ApacheMimeTypes\Test;
13+
14+
use Dflydev\ApacheMimeTypes\JsonRepository;
1315

1416
/**
1517
* JSON Repository Test
1618
*
1719
* @author Beau Simensen <beau@dflydev.com>
1820
*/
19-
class JsonRepositoryTest extends AbstractRepositoryTest
21+
class JsonRepositoryTest extends AbstractRepositoryTestCase
2022
{
2123
protected function createDefaultRepository()
2224
{
@@ -25,6 +27,6 @@ protected function createDefaultRepository()
2527

2628
protected function createRepository()
2729
{
28-
return new JsonRepository(__DIR__.'/Fixtures/mime.types.json');
30+
return new JsonRepository(__DIR__.'/fixtures/mime.types.json');
2931
}
3032
}

tests/Dflydev/ApacheMimeTypes/ParserTest.php renamed to tests/ParserTest.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,22 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Dflydev\ApacheMimeTypes;
12+
namespace Dflydev\ApacheMimeTypes\Test;
13+
14+
use Dflydev\ApacheMimeTypes\Parser;
1315

1416
/**
1517
* Parser Test
1618
*
1719
* @author Beau Simensen <beau@dflydev.com>
1820
*/
19-
class ParserTest extends \PHPUnit_Framework_TestCase
21+
class ParserTest extends \PHPUnit\Framework\TestCase
2022
{
2123
public function setUp()
2224
{
2325
$parser = new Parser;
2426

25-
$this->map = $parser->parse(__DIR__.'/../../../src/Dflydev/ApacheMimeTypes/Resources/mime.types');
27+
$this->map = $parser->parse(__DIR__.'/../src/Dflydev/ApacheMimeTypes/Resources/mime.types');
2628
}
2729

2830
public function testCss()

tests/Dflydev/ApacheMimeTypes/PhpRepositoryTest.php renamed to tests/PhpRepositoryTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Dflydev\ApacheMimeTypes;
12+
namespace Dflydev\ApacheMimeTypes\Test;
13+
14+
use Dflydev\ApacheMimeTypes\PhpRepository;
1315

1416
/**
1517
* JSON Repository Test
1618
*
1719
* @author Beau Simensen <beau@dflydev.com>
1820
*/
19-
class PhpRepositoryTest extends AbstractRepositoryTest
21+
class PhpRepositoryTest extends AbstractRepositoryTestCase
2022
{
2123
protected function createDefaultRepository()
2224
{

tests/Dflydev/ApacheMimeTypes/Fixtures/mime.types renamed to tests/fixtures/mime.types

File renamed without changes.

0 commit comments

Comments
 (0)