Permalink
Browse files

- Merge [5028:5031] and [5039:5040].

  • Loading branch information...
1 parent 8c37fcb commit 7f00534555039c38504894ab9b243e4d135d921d @sebastianbergmann committed Jul 30, 2009
@@ -203,7 +203,7 @@ public static function suite($className)
// Test method with @dataProvider.
if (is_array($data) || $data instanceof Iterator) {
- $dataSuite = new PHPUnit_Framework_TestSuite(
+ $dataSuite = new PHPUnit_Framework_TestSuite_DataProvider(
$className . '::' . $name
);
@@ -240,7 +240,7 @@ public static function suite($className)
// Test method with @dataProvider.
if (is_array($data) || $data instanceof Iterator) {
- $dataSuite = new PHPUnit_Framework_TestSuite(
+ $dataSuite = new PHPUnit_Framework_TestSuite_DataProvider(
$className . '::' . $name
);
@@ -66,6 +66,7 @@
require 'PHPUnit/Framework/SkippedTestSuiteError.php';
require 'PHPUnit/Framework/TestCase.php';
require 'PHPUnit/Framework/TestSuite.php';
+require 'PHPUnit/Framework/TestSuite/DataProvider.php';
require 'PHPUnit/Framework/Warning.php';
require 'PHPUnit/Framework/Constraint.php';
require 'PHPUnit/Framework/ComparisonFailure.php';
@@ -512,7 +512,7 @@ public static function createTest(ReflectionClass $theClass, $name, array $class
$groups = PHPUnit_Util_Test::getGroups($className, $name);
if (is_array($data) || $data instanceof Iterator) {
- $test = new PHPUnit_Framework_TestSuite(
+ $test = new PHPUnit_Framework_TestSuite_DataProvider(
$className . '::' . $name
);
@@ -655,15 +655,7 @@ public function run(PHPUnit_Framework_TestResult $result = NULL, $filter = FALSE
$test->run(
$result, $filter, $groups, $excludeGroups, $processIsolation
);
- }
- }
-
- foreach ($tests as $test) {
- if ($result->shouldStop()) {
- break;
- }
-
- if (!$test instanceof PHPUnit_Framework_TestSuite) {
+ } else {
$runTest = TRUE;
if ($filter !== FALSE ) {
@@ -0,0 +1,67 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2002-2009, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * * Neither the name of Sebastian Bergmann nor the names of his
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category Testing
+ * @package PHPUnit
+ * @author Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @copyright 2002-2009 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @version SVN: $Id$
+ * @link http://www.phpunit.de/
+ * @since File available since Release 3.4.0
+ */
+
+require_once 'PHPUnit/Framework.php';
+require_once 'PHPUnit/Util/Filter.php';
+
+PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
+
+/**
+ *
+ *
+ * @category Testing
+ * @package PHPUnit
+ * @author Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @copyright 2002-2009 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @version Release: @package_version@
+ * @link http://www.phpunit.de/
+ * @since Class available since Release 3.4.0
+ */
+class PHPUnit_Framework_TestSuite_DataProvider extends PHPUnit_Framework_TestSuite
+{
+}
+?>
Oops, something went wrong.

0 comments on commit 7f00534

Please sign in to comment.