update the tess to support passing a ruleset to test

Author: jazzsequence

tests/run-test.sh

@@ -1,26 +1,36 @@
 #!/bin/bash
 
-TEST_FILE=$1
+RULESET=$1
+TEST_FILE=$2
+
+if [ -z "$RULESET" ]; then
+    echo "Usage: $0 <ruleset> <test_file>"
+    exit 1
+fi
 
 if [ ! -f "$TEST_FILE" ]; then
     echo "Test file not found: $TEST_FILE"
     exit 1
 fi
 
-echo "Running test: $TEST_FILE"
+echo "Running test: $TEST_FILE with ruleset: $RULESET"
 
 # Use --basepath=. to ensure relative paths in the report.
-JSON_REPORT=$(phpcs --standard=Pantheon-WP-Minimum/ruleset.xml --report=json --basepath=. --warning-severity=0 "$TEST_FILE" 2>/dev/null | sed -n '/{/,$p')
+JSON_REPORT=$(phpcs --standard="./$RULESET/ruleset.xml" --report=json --basepath=. "$TEST_FILE" 2>/dev/null | sed -n '/{/,$p')
+
+# Debug
+# echo "JSON Report:"
+# echo "$JSON_REPORT"
 
 # Extract actual and expected errors.
 ACTUAL_OUTPUT=$(echo "$JSON_REPORT" | jq -r '.files."'"$TEST_FILE"'".messages[]?.source' | sort)
-EXPECTED_OUTPUT=$(sed -n 's/.*@expectedError //p' "$TEST_FILE" | sort)
+EXPECTED_OUTPUT=$( (sed -n "s/.*@expectedError\[$RULESET\] //p" "$TEST_FILE"; sed -n "s/.*@expectedWarning\[$RULESET\] //p" "$TEST_FILE") | sort)
 
 echo "--------------------------------------------------"
-echo "EXPECTED ERRORS:"
+echo "EXPECTED ISSUES:"
 echo -e "${EXPECTED_OUTPUT:-<none>}"
 echo "--------------------------------------------------"
-echo "ACTUAL ERRORS:"
+echo "ACTUAL ISSUES:"
 echo -e "${ACTUAL_OUTPUT:-<none>}"
 echo "--------------------------------------------------"
 

tests/test-disallow-multiline-slash-comment.php

@@ -2,8 +2,9 @@
 /**
  * Disallow usage of multiline slash comments.
  *
- * @expectedError Pantheon_WP_Minimum.Commenting.DisallowMultilineSlashComment.Found
- * @expectedWarning Pantheon_WP_Minimum.Commenting.DisallowMultilineSlashComment.LongLine
+ * @expectedWarning[Pantheon-WP-Minimum] Pantheon_WP_Minimum.Commenting.DisallowMultilineSlashComment.Found
+ * @expectedError[Pantheon-WP] Pantheon_WP.Commenting.DisallowMultilineSlashComment.Found
+ * @expectedWarning[Pantheon-WP] Pantheon_WP.Commenting.DisallowMultilineSlashComment.LongLine
  *
  * @package Pantheon-WP-Coding-Standards
  */
@@ -22,8 +23,8 @@
 /*
  * This comment is ideal. It uses the correct syntax and is not too long.
  * What's with the life preserver? Doc, she's beautiful. She's crazy about me.
- * Look at this, look what she wrote me, Doc. That says it all. Doc, you're my 
- * only hope. Oh, uh, hey you, get your damn hands off her. Do you really think 
- * I oughta swear? Well, now we gotta sneak this back into my laboratory, we've 
+ * Look at this, look what she wrote me, Doc. That says it all. Doc, you're my
+ * only hope. Oh, uh, hey you, get your damn hands off her. Do you really think
+ * I oughta swear? Well, now we gotta sneak this back into my laboratory, we've
  * gotta get you home. Jennifer.
  */

tests/test-disallow-rename-function.php

@@ -2,7 +2,8 @@
 /**
  * DisallowRenameFunctionTest.inc
  *
- * @expectedError Pantheon_WP_Minimum.Files.DisallowRenameFunction.RenameFunctionDisallowed
+ * @expectedError[Pantheon-WP-Minimum] Pantheon_WP_Minimum.Files.DisallowRenameFunction.RenameFunctionDisallowed
+ * @expectedError[Pantheon-WP] Pantheon_WP_Minimum.Files.DisallowRenameFunction.RenameFunctionDisallowed
  *
  * @package Pantheon-WP-Coding-Standards
  */