Test enhancement

Author: peter279k

.travis.yml

@@ -1,13 +1,17 @@
 language: php
 
 php:
-  # The adhocore/cron-expr should run fine with php 5.4+, but phpunit 5.7 requires php 5.6+
-  # - 5.4
-  # - 5.5
+  - 5.4
+  - 5.5
   - 5.6
   - 7.0
   - 7.1
   - 7.2
+  - nightly
+
+matrix:
+  allow_failures:
+    - php: nightly
 
 install:
   - composer install --prefer-dist

composer.json

@@ -23,8 +23,9 @@
         }
     },
     "require": {
+        "php": ">=5.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.0"
+        "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5"
     }
 }

tests/ExpressionTest.php

@@ -3,47 +3,65 @@
 namespace Ahc\Cron\Test;
 
 use Ahc\Cron\Expression;
+use PHPUnit\Framework\TestCase;
 
-class ExpressionTest extends \PHPUnit_Framework_TestCase
+class ExpressionTest extends TestCase
 {
     /**
      * @dataProvider scheduleProvider
      */
     public function test_isDue($expr, $time, $foo, $expected, $throwsAt = false)
     {
-        if ($throwsAt) {
-            $this->setExpectedException(
-                \UnexpectedValueException::class,
-                "Invalid offset value at segment #$throwsAt"
-            );
-        }
-
         $actual = Expression::isDue($expr, $time);
 
         $this->assertSame($expected, $actual, 'The expression ' . $expr . ' has failed');
     }
 
+    /**
+     * @dataProvider invalidScheduleProvider
+     * @expectedException \UnexpectedValueException
+     */
+    public function test_isDue_on_invalid_expression($expr, $time, $foo, $expected, $throwsAt = false)
+    {
+        Expression::isDue($expr, $time);
+    }
+
     public function test_isCronDue()
     {
         $expr = new Expression;
 
-        $this->assertTrue(is_bool($expr->isCronDue('*/1 * * * *', time())));
+        $this->assertInternalType('boolean', $expr->isCronDue('*/1 * * * *', time()));
     }
 
+    /**
+     * @expectedException \UnexpectedValueException
+     */
     public function test_isDue_throws_if_expr_invalid()
     {
-        $this->setExpectedException(\UnexpectedValueException::class);
-
         Expression::isDue('@invalid');
     }
 
+    /**
+     * @expectedException \UnexpectedValueException
+     */
     public function test_isDue_throws_if_modifier_invalid()
     {
-        $this->setExpectedException(\UnexpectedValueException::class);
-
         Expression::isDue('* * 2L * *');
     }
 
+    /**
+     * Data provider for cron schedule.
+     *
+     * @return array
+     */
+    public function invalidScheduleProvider()
+    {
+        return [
+            ['* * * * 4W', strtotime('2011-07-01 00:00:00'), '2011-07-27 00:00:00', false, 4], // seg 4
+            ['* * * 1L *', strtotime('2011-07-01 00:00:00'), '2011-07-27 00:00:00', false, 3], // seg 3
+        ];
+    }
+
     /**
      * The test cases are taken from awesome mtdowling/cron-expression package. Thank you.
      *
@@ -124,8 +142,6 @@ public function scheduleProvider()
             ['* * * * 5#2', strtotime('2011-07-01 00:00:00'), '2011-07-08 00:00:00', false],
             ['* * * * 5#1', strtotime('2011-07-01 00:00:00'), '2011-07-01 00:00:00', true],
             ['* * * * 3#4', strtotime('2011-07-01 00:00:00'), '2011-07-27 00:00:00', false],
-            ['* * * * 4W', strtotime('2011-07-01 00:00:00'), '2011-07-27 00:00:00', false, 4], // seg 4
-            ['* * * 1L *', strtotime('2011-07-01 00:00:00'), '2011-07-27 00:00:00', false, 3], // seg 3
         ];
     }
 }