Skip to content

Commit a39223b

Browse files
committed
Test enhancement
1 parent 9ee48ac commit a39223b

File tree

3 files changed

+42
-14
lines changed

3 files changed

+42
-14
lines changed

.travis.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@ php:
44
- 5.6
55
- 7.0
66
- 7.1
7+
- 7.2
78
- nightly
89
- hhvm
910

1011
sudo: false
1112

1213
matrix:
1314
allow_failures:
14-
- php: 5.3
15-
- php: 5.4
16-
- php: 5.5
1715
- php: nightly
1816
fast_finish: true
1917

@@ -26,11 +24,10 @@ env:
2624
- PREFER_LOWEST=""
2725

2826
before_script:
29-
- composer update --ignore-platform-reqs --prefer-dist $PREFER_LOWEST
30-
- composer --optimize-autoloader --no-interaction
27+
- composer update --prefer-dist $PREFER_LOWEST
3128

3229
script:
33-
- bin/phpunit --configuration . --coverage-clover=build/logs/clover.xml --coverage-html=build/html/coverage
30+
- bin/phpunit --coverage-clover=build/logs/clover.xml --coverage-html=build/html/coverage
3431

3532
after_script:
3633
- if [ $(phpenv version-name) == "5.6" ] && [ "$PREFER_LOWEST" == "--prefer-lowest" ]; then bin/codacycoverage clover build/logs/clover.xml > /dev/null 2>&1; fi

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"paragonie/random_compat": "^2.0"
2020
},
2121
"require-dev": {
22-
"phpunit/phpunit": "^5.7",
22+
"phpunit/phpunit": "^5.7 || ^6.5",
2323
"codacy/coverage": "^1.0.5",
2424
"symfony/var-dumper": "^3.2"
2525
},

tests/GeneratorTest.php

Lines changed: 38 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,14 @@
2727

2828
namespace Clickalicious\Rng;
2929

30+
use PHPUnit\Framework\TestCase;
31+
3032
/**
3133
* Class GeneratorTest
3234
*
3335
* @package Rng
3436
*/
35-
class GeneratorTest extends \PHPUnit_Framework_TestCase
37+
class GeneratorTest extends TestCase
3638
{
3739
/**
3840
* Test: Get instance.
@@ -42,7 +44,7 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
4244
public function testInstance()
4345
{
4446
$this->assertInstanceOf(
45-
'Clickalicious\Rng\Generator',
47+
Generator::class,
4648
new Generator()
4749
);
4850
}
@@ -57,7 +59,7 @@ public function testCreatingInstanceByModeDefault()
5759
$generator = new Generator();
5860

5961
$this->assertInstanceOf(
60-
'Clickalicious\Rng\Generator',
62+
Generator::class,
6163
$generator
6264
);
6365
}
@@ -74,7 +76,7 @@ public function testCreatingInstanceByModePhpDefault()
7476
);
7577

7678
$this->assertInstanceOf(
77-
'Clickalicious\Rng\Generator',
79+
Generator::class,
7880
$generator
7981
);
8082
}
@@ -91,7 +93,7 @@ public function testCreatingInstanceByModePhpMersenneTwister()
9193
);
9294

9395
$this->assertInstanceOf(
94-
'Clickalicious\Rng\Generator',
96+
Generator::class,
9597
$generator
9698
);
9799
}
@@ -108,7 +110,7 @@ public function testCreatingInstanceByModeOpenSsl()
108110
);
109111

110112
$this->assertInstanceOf(
111-
'Clickalicious\Rng\Generator',
113+
Generator::class,
112114
$generator
113115
);
114116
}
@@ -277,6 +279,35 @@ public function testTryToSetInvalidEncryptionMode()
277279
public function testPassingSeedToConstructor()
278280
{
279281
$generator = new Generator(Generator::MODE_OPEN_SSL, time());
280-
$this->assertInstanceOf('Clickalicious\Rng\Generator', $generator);
282+
$this->assertInstanceOf(Generator::class, $generator);
283+
}
284+
285+
/**
286+
* Test: Test should throw the invalid range excpetion.
287+
*
288+
* @author Benjamin Carl <opensource@clickalicious.de>
289+
*/
290+
public function testGenerateOnInvalidRange()
291+
{
292+
$this->expectException(Exception::class);
293+
$this->expectExceptionMessage("Bad range");
294+
$generator = new Generator(Generator::MODE_OPEN_SSL);
295+
$generator->generate(-PHP_INT_MAX, PHP_INT_MAX);
296+
}
297+
298+
/**
299+
* Test: Test should throw the invalid range excpetion.
300+
*
301+
* @author Benjamin Carl <opensource@clickalicious.de>
302+
*/
303+
public function testIsCryptographicStrong()
304+
{
305+
$generator = new Generator(Generator::MODE_OPEN_SSL);
306+
$this->assertNull($generator->isCryptographicStrong());
307+
308+
309+
$generator = new Generator(Generator::MODE_OPEN_SSL);
310+
$generator->generate();
311+
$this->assertTrue($generator->isCryptographicStrong());
281312
}
282313
}

0 commit comments

Comments
 (0)