Improve Skipping HHVM test

10 files changed, 44 insertions, 24 deletions

diff --git a/test/AbstractTestCase.php b/test/AbstractTestCase.php
new file mode 100644
index 0000000..a8280b7
--- /dev/null
+++ b/test/AbstractTestCase.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace League\Csv\Test;
+
+use PHPUnit_Framework_TestCase;
+
+/**
+ * @group controls
+ */
+class AbstractTestCase extends PHPUnit_Framework_TestCase
+{
+    protected function checkRequirements()
+    {
+        parent::checkRequirements();
+        $annotations = $this->getAnnotations();
+        foreach ($annotations as $type => $bag) {
+            if (!array_key_exists('skipIfHHVM', $bag)) {
+                continue;
+            }
+            if (defined('HHVM_VERSION')) {
+                $this->markTestSkipped('This test does not run on HHVM');
+            }
+        }
+    }
+}
diff --git a/test/ControlsTest.php b/test/ControlsTest.php
index 42e6edc..4eebed7 100644
--- a/test/ControlsTest.php
+++ b/test/ControlsTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace League\Csv\test;
+namespace League\Csv\Test;
 
 use League\Csv\Reader;
 use League\Csv\Writer;
-use PHPUnit_Framework_TestCase;
 use SplFileObject;
 use SplTempFileObject;
 
@@ -13,7 +12,7 @@ date_default_timezone_set('UTC');
 /**
  * @group controls
  */
-class ControlsTest extends PHPUnit_Framework_TestCase
+class ControlsTest extends AbstractTestCase
 {
     private $csv;
 
@@ -193,6 +192,7 @@ class ControlsTest extends PHPUnit_Framework_TestCase
      * @param $flag
      * @param $line_count
      * @dataProvider appliedFlagsProvider
+     * @skipIfHHVM
      */
     public function testAppliedFlags($flag, $line_count)
     {
diff --git a/test/CsvTest.php b/test/CsvTest.php
index b66d96a..b3cd716 100644
--- a/test/CsvTest.php
+++ b/test/CsvTest.php
@@ -1,15 +1,14 @@
 <?php
 
-namespace League\Csv\test;
+namespace League\Csv\Test;
 
 use League\Csv\Reader;
-use PHPUnit_Framework_TestCase;
 use SplTempFileObject;
 
 /**
  * @group csv
  */
-class CsvTest extends PHPUnit_Framework_TestCase
+class CsvTest extends AbstractTestCase
 {
     private $csv;
 
diff --git a/test/FactoryTest.php b/test/FactoryTest.php
index 390ad1a..377b1b9 100644
--- a/test/FactoryTest.php
+++ b/test/FactoryTest.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace League\Csv\test;
+namespace League\Csv\Test;
 
 use League\Csv\Reader;
-use PHPUnit_Framework_TestCase;
 use SplFileInfo;
 use SplFileObject;
 use SplTempFileObject;
@@ -11,7 +10,7 @@ use SplTempFileObject;
 /**
  * @group factory
  */
-class FactoryTest extends PHPUnit_Framework_TestCase
+class FactoryTest extends AbstractTestCase
 {
     public function testCreateFromPathWithFilePath()
     {
diff --git a/test/Plugin/ColumnConsistencyValidatorTest.php b/test/Plugin/ColumnConsistencyValidatorTest.php
index 50510ea..43f023a 100644
--- a/test/Plugin/ColumnConsistencyValidatorTest.php
+++ b/test/Plugin/ColumnConsistencyValidatorTest.php
@@ -3,15 +3,15 @@
 namespace League\Csv\Test\Plugin;
 
 use League\Csv\Plugin\ColumnConsistencyValidator;
+use League\Csv\Test\AbstractTestCase;
 use League\Csv\Writer;
-use PHPUnit_Framework_TestCase;
 use SplFileObject;
 use SplTempFileObject;
 
 /**
  * @group validators
  */
-class ColumnConsistencyValidatorTest extends PHPUnit_Framework_TestCase
+class ColumnConsistencyValidatorTest extends AbstractTestCase
 {
     private $csv;
 
diff --git a/test/Plugin/NullValidatorTest.php b/test/Plugin/NullValidatorTest.php
index e9392ce..6e351ce 100644
--- a/test/Plugin/NullValidatorTest.php
+++ b/test/Plugin/NullValidatorTest.php
@@ -4,15 +4,15 @@ namespace League\Csv\Test\Plugin;
 
 use League\Csv\Exception\InvalidRowException;
 use League\Csv\Plugin\ForbiddenNullValuesValidator;
+use League\Csv\Test\AbstractTestCase;
 use League\Csv\Writer;
-use PHPUnit_Framework_TestCase;
 use SplFileObject;
 use SplTempFileObject;
 
 /**
  * @group validators
  */
-class NullValidatorTest extends PHPUnit_Framework_TestCase
+class NullValidatorTest extends AbstractTestCase
 {
     private $csv;
 
diff --git a/test/Plugin/SkipNullValuesFormatterTest.php b/test/Plugin/SkipNullValuesFormatterTest.php
index 3dfe802..8f203da 100644
--- a/test/Plugin/SkipNullValuesFormatterTest.php
+++ b/test/Plugin/SkipNullValuesFormatterTest.php
@@ -3,16 +3,16 @@
 namespace League\Csv\Test\Plugin;
 
 use League\Csv\Plugin\SkipNullValuesFormatter;
+use League\Csv\Test\AbstractTestCase;
 use League\Csv\Writer;
 use LimitIterator;
-use PHPUnit_Framework_TestCase;
 use SplFileObject;
 use SplTempFileObject;
 
 /**
  * @group formatter
  */
-class SkipNullValuesFormatterTest extends PHPUnit_Framework_TestCase
+class SkipNullValuesFormatterTest extends AbstractTestCase
 {
     private $csv;
 
diff --git a/test/ReaderTest.php b/test/ReaderTest.php
index 1eef2ca..e16610c 100644
--- a/test/ReaderTest.php
+++ b/test/ReaderTest.php
@@ -1,15 +1,14 @@
 <?php
 
-namespace League\Csv\test;
+namespace League\Csv\Test;
 
 use League\Csv\Reader;
-use PHPUnit_Framework_TestCase;
 use SplTempFileObject;
 
 /**
  * @group reader
  */
-class ReaderTest extends PHPUnit_Framework_TestCase
+class ReaderTest extends AbstractTestCase
 {
     private $csv;
 
diff --git a/test/StreamFilterTest.php b/test/StreamFilterTest.php
index ea74eba..7bb8a7b 100644
--- a/test/StreamFilterTest.php
+++ b/test/StreamFilterTest.php
@@ -1,18 +1,17 @@
 <?php
 
-namespace League\Csv\test;
+namespace League\Csv\Test;
 
 use League\Csv\Reader;
 use League\Csv\Writer;
 use lib\FilterReplace;
-use PHPUnit_Framework_TestCase;
 use SplFileObject;
 use SplTempFileObject;
 
 /**
  * @group csv
  */
-class StreamFilterTest extends PHPUnit_Framework_TestCase
+class StreamFilterTest extends AbstractTestCase
 {
     public function testInitStreamFilterWithWriterStream()
     {
diff --git a/test/WriterTest.php b/test/WriterTest.php
index 7c13a51..7ba1ef4 100644
--- a/test/WriterTest.php
+++ b/test/WriterTest.php
@@ -1,17 +1,16 @@
 <?php
 
-namespace League\Csv\test;
+namespace League\Csv\Test;
 
 use ArrayIterator;
 use League\Csv\Writer;
-use PHPUnit_Framework_TestCase;
 use SplFileObject;
 use SplTempFileObject;
 
 /**
  * @group writer
  */
-class WriterTest extends PHPUnit_Framework_TestCase
+class WriterTest extends AbstractTestCase
 {
     private $csv;