Merge branch '4.0'

Tests/Framework/Constraint/CountTest.php

@@ -43,46 +43,21 @@
  * @since      File available since Release 3.7.30
  */
 
-require_once __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'TestIterator.php';
-
-class TestIterator2 implements Iterator {
-
-    protected $data;
-
-    public function __construct(array $array)
-    {
-        $this->data = $array;
-    }
-
-    public function current()
-    {
-        return current($this->data);
-    }
-
-    public function next()
-    {
-        next($this->data);
-    }
-
-    public function key()
-    {
-        return key($this->data);
-    }
-
-    public function valid()
-    {
-        return key($this->data) !== null;
-    }
-
-    public function rewind()
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <[email protected]>
+ * @author     Jeroen Versteeg <[email protected]>
+ * @copyright  2001-2014 Sebastian Bergmann <[email protected]>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.7.30
+ */
+class CountTest extends PHPUnit_Framework_TestCase
+{
+    public function testCount()
     {
-        reset($this->data);
-    }
-}
-
-class CountTest extends PHPUnit_Framework_TestCase {
-
-    public function test_Count() {
         $countConstraint = new PHPUnit_Framework_Constraint_Count(3);
         $this->assertTrue($countConstraint->evaluate(array(1,2,3), '', true));
 
@@ -94,7 +69,7 @@ public function test_Count() {
         $this->assertTrue($countConstraint->evaluate($it, '', true));
     }
 
-    public function test_CountDoesNotChangeIteratorKey ()
+    public function testCountDoesNotChangeIteratorKey()
     {
         $countConstraint = new PHPUnit_Framework_Constraint_Count(2);
 

Tests/_files/TestIterator2.php

@@ -0,0 +1,35 @@
+<?php
+class TestIterator2 implements Iterator {
+
+    protected $data;
+
+    public function __construct(array $array)
+    {
+        $this->data = $array;
+    }
+
+    public function current()
+    {
+        return current($this->data);
+    }
+
+    public function next()
+    {
+        next($this->data);
+    }
+
+    public function key()
+    {
+        return key($this->data);
+    }
+
+    public function valid()
+    {
+        return key($this->data) !== null;
+    }
+
+    public function rewind()
+    {
+        reset($this->data);
+    }
+}

tests/autoload.php

@@ -142,6 +142,7 @@ function($class) {
                 'testclass' => '/Framework/ComparatorTest.php',
                 'testclasscomparator' => '/Framework/ComparatorTest.php',
                 'testiterator' => '/_files/TestIterator.php',
+                'testiterator2' => '/_files/TestIterator2.php',
                 'throwexceptiontestcase' => '/_files/ThrowExceptionTestCase.php',
                 'thrownoexceptiontestcase' => '/_files/ThrowNoExceptionTestCase.php',
                 'twotest' => '/Regression/783/TwoTest.php',