Skip to content

Commit 2e14e40

Browse files
committed
set the correct phpunit setting, excpetion tests
1 parent 5e05038 commit 2e14e40

File tree

6 files changed

+42
-9
lines changed

6 files changed

+42
-9
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
sudo: false
2-
31
language: php
2+
43
php:
54
- hhvm
65
- 7

composer.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,16 @@
1212
"sebastian/diff": "^1.4"
1313
},
1414
"require-dev": {
15-
"phpunit/phpunit": "5.4.*"
15+
"phpunit/phpunit": "^5.5"
1616
},
1717
"autoload": {
1818
"psr-4": {
1919
"Sokil\\Diff\\": "src/"
2020
}
21+
},
22+
"autoload-dev": {
23+
"psr-4": {
24+
"Sokil\\Diff\\": "tests/"
25+
}
2126
}
2227
}

src/Change.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ public function getNewValue()
3939
{
4040
return $this->newValue;
4141
}
42-
}
42+
}

src/Renderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,4 +130,4 @@ public function render(Change $change)
130130
// build diff
131131
return implode(PHP_EOL, $diff);
132132
}
133-
}
133+
}

tests/RendererTest.php

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
namespace Sokil\Diff;
44

5-
class RendererTest extends \PHPUnit_Framework_TestCase
5+
use PHPUnit\Framework\TestCase;
6+
7+
class RendererTest extends TestCase
68
{
79
public function renderChangeDataProvider()
810
{
@@ -117,4 +119,26 @@ public function testRender_ChangeValueHasStringType(
117119
$this->assertEquals($expectedDiff, $actualDiff);
118120
}
119121

120-
}
122+
/**
123+
* @expectedException \InvalidArgumentException
124+
* @expectedExceptionMessage Invalid format specified
125+
*/
126+
public function testSetFormatWithInvalidType()
127+
{
128+
$diffRenderer = new Renderer([]);
129+
130+
$diffRenderer->setFormat('not_array_type');
131+
}
132+
133+
/**
134+
* @expectedException \InvalidArgumentException
135+
* @expectedExceptionMessage Invalid format specified
136+
*/
137+
public function testSetFormatWithInvalidDefinedFormats()
138+
{
139+
$diffRenderer = new Renderer([]);
140+
141+
$diffRenderer->setFormat(1000);
142+
}
143+
144+
}

tests/phpunit.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
<phpunit colors="true" bootstrap="../vendor/autoload.php">
33
<testsuites>
44
<testsuite name="AllTests">
5-
<directory>.</directory>
5+
<directory>./</directory>
66
</testsuite>
77
</testsuites>
8-
</phpunit>
8+
<filter>
9+
<whitelist processUncoveredFilesFromWhitelist="true">
10+
<directory suffix=".php">../src</directory>
11+
</whitelist>
12+
</filter>
13+
</phpunit>

0 commit comments

Comments
 (0)