Skip to content

Commit

Permalink
s/testSuiteName/testSuiteFilter/
Browse files Browse the repository at this point in the history
  • Loading branch information
jpic committed Feb 12, 2012
1 parent 9a30713 commit 34bd4fe
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions PHPUnit/Util/Configuration.php
Expand Up @@ -758,7 +758,7 @@ public function getSeleniumBrowserConfiguration()
* @return PHPUnit_Framework_TestSuite
* @since Method available since Release 3.2.1
*/
public function getTestSuiteConfiguration($testSuiteName=null)
public function getTestSuiteConfiguration($testSuiteFilter=null)
{
$testSuiteNodes = $this->xpath->query('testsuites/testsuite');

Expand All @@ -767,15 +767,15 @@ public function getTestSuiteConfiguration($testSuiteName=null)
}

if ($testSuiteNodes->length == 1) {
return $this->getTestSuite($testSuiteNodes->item(0), $testSuiteName);
return $this->getTestSuite($testSuiteNodes->item(0), $testSuiteFilter);
}

if ($testSuiteNodes->length > 1) {
$suite = new PHPUnit_Framework_TestSuite;

foreach ($testSuiteNodes as $testSuiteNode) {
$suite->addTestSuite(
$this->getTestSuite($testSuiteNode, $testSuiteName)
$this->getTestSuite($testSuiteNode, $testSuiteFilter)
);
}

Expand All @@ -788,7 +788,7 @@ public function getTestSuiteConfiguration($testSuiteName=null)
* @return PHPUnit_Framework_TestSuite
* @since Method available since Release 3.4.0
*/
protected function getTestSuite(DOMElement $testSuiteNode, $testSuiteName=null)
protected function getTestSuite(DOMElement $testSuiteNode, $testSuiteFilter=null)
{
if ($testSuiteNode->hasAttribute('name')) {
$suite = new PHPUnit_Framework_TestSuite(
Expand All @@ -807,7 +807,7 @@ protected function getTestSuite(DOMElement $testSuiteNode, $testSuiteName=null)
$fileIteratorFacade = new File_Iterator_Facade;

foreach ($testSuiteNode->getElementsByTagName('directory') as $directoryNode) {
if ($testSuiteName && $directoryNode->parentNode->getAttribute('name') != $testSuiteName) {
if ($testSuiteFilter && $directoryNode->parentNode->getAttribute('name') != $testSuiteFilter) {
continue;
}

Expand Down Expand Up @@ -855,7 +855,7 @@ protected function getTestSuite(DOMElement $testSuiteNode, $testSuiteName=null)
}

foreach ($testSuiteNode->getElementsByTagName('file') as $fileNode) {
if ($testSuiteName && $fileNode->parentNode->getAttribute('name') != $testSuiteName) {
if ($testSuiteFilter && $fileNode->parentNode->getAttribute('name') != $testSuiteFilter) {
continue;
}

Expand Down

0 comments on commit 34bd4fe

Please sign in to comment.