The unit test runner now loads the test sniff outside of the standard's ruleset so that exclude rules do not get applied (ref #1169)

Author: gsherwood

CodeSniffer.php

@@ -533,34 +533,51 @@ public function initStandard($standards, array $restrictions=array(), array $exc
         // be detected properly for files created on a Mac with the /r line ending.
         ini_set('auto_detect_line_endings', true);
 
-        $sniffs = array();
-        foreach ($standards as $standard) {
-            $installed = $this->getInstalledStandardPath($standard);
+        if (defined('PHP_CODESNIFFER_IN_TESTS') === true) {
+            // Should be one standard and one sniff being tested at a time.
+            $installed = $this->getInstalledStandardPath($standards[0]);
             if ($installed !== null) {
                 $standard = $installed;
             } else {
-                $standard = self::realpath($standard);
+                $standard = self::realpath($standards[0]);
                 if (is_dir($standard) === true
                     && is_file(self::realpath($standard.DIRECTORY_SEPARATOR.'ruleset.xml')) === true
                 ) {
                     $standard = self::realpath($standard.DIRECTORY_SEPARATOR.'ruleset.xml');
                 }
             }
 
-            if (PHP_CODESNIFFER_VERBOSITY === 1) {
-                $ruleset = simplexml_load_string(file_get_contents($standard));
-                if ($ruleset !== false) {
-                    $standardName = (string) $ruleset['name'];
+            $sniffs = $this->_expandRulesetReference($restrictions[0], dirname($standard));
+        } else {
+            $sniffs = array();
+            foreach ($standards as $standard) {
+                $installed = $this->getInstalledStandardPath($standard);
+                if ($installed !== null) {
+                    $standard = $installed;
+                } else {
+                    $standard = self::realpath($standard);
+                    if (is_dir($standard) === true
+                        && is_file(self::realpath($standard.DIRECTORY_SEPARATOR.'ruleset.xml')) === true
+                    ) {
+                        $standard = self::realpath($standard.DIRECTORY_SEPARATOR.'ruleset.xml');
+                    }
                 }
 
-                echo "Registering sniffs in the $standardName standard... ";
-                if (count($standards) > 1 || PHP_CODESNIFFER_VERBOSITY > 2) {
-                    echo PHP_EOL;
+                if (PHP_CODESNIFFER_VERBOSITY === 1) {
+                    $ruleset = simplexml_load_string(file_get_contents($standard));
+                    if ($ruleset !== false) {
+                        $standardName = (string) $ruleset['name'];
+                    }
+
+                    echo "Registering sniffs in the $standardName standard... ";
+                    if (count($standards) > 1 || PHP_CODESNIFFER_VERBOSITY > 2) {
+                        echo PHP_EOL;
+                    }
                 }
-            }
 
-            $sniffs = array_merge($sniffs, $this->processRuleset($standard));
-        }//end foreach
+                $sniffs = array_merge($sniffs, $this->processRuleset($standard));
+            }//end foreach
+        }//end if
 
         $sniffRestrictions = array();
         foreach ($restrictions as $sniffCode) {

package.xml

@@ -33,6 +33,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Developers of custom standards with custom test runners can now have their standards ignored by the built-in test runner
     -- Set the value of an environment variable called PHPCS_IGNORE_TESTS with a comma separated list of your standard names
     -- Thanks to Juliette Reinders Folmer for the patch
+  - The unit test runner now loads the test sniff outside of the standard's ruleset so that exclude rules do not get applied
+    -- This may have caused problems when testing custom sniffs inside custom standards
+    -- Also makes the unit tests runs a little faster
   - Fixed bug #1135 : PEAR.ControlStructures.MultiLineCondition.CloseBracketNewLine not detected if preceded by multiline function call
   - Fixed bug #1138 : PEAR.ControlStructures.MultiLineCondition.Alignment not detected if closing brace is first token on line
   - Fixed bug #1141 : Sniffs that check EOF newlines don't detect newlines properly when the last token is a doc block