Fix custom comparator in scenario tables. Fixes unclebob#399.

FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestCustomComparators/content.txt

@@ -0,0 +1,8 @@
+You can define a custom comparator in the plugins.properties file. This
+
+| scenario | test in scenario |
+| check | echo | test | glob:t*t |
+
+| script | echo fixture |
+| check | echo | test | glob:t*t |
+| test in scenario |

FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestCustomComparators/properties.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<properties>
+	<Edit>true</Edit>
+	<Files>true</Files>
+	<Properties>true</Properties>
+	<RecentChanges>true</RecentChanges>
+	<Refactor>true</Refactor>
+	<Search>true</Search>
+	<Test>true</Test>
+	<Versions>true</Versions>
+	<WhereUsed>true</WhereUsed>
+</properties>

plugins.properties

@@ -44,3 +44,8 @@ RecentChanges=fitnesse.wiki.fs.GitFileVersionsController
 # Define custom test systems. Test systems are created through a factory.
 #TestSystems=example:fitnesse.testsystems.example.EchoTestSystemFactory
 
+##
+# Custom comparators
+#
+# Match test output in ways not foreseen.
+CustomComparators=glob:fitnesse.testsystems.slim.GlobComparator

src/fitnesse/testsystems/slim/tables/ScenarioTable.java

@@ -177,7 +177,9 @@ public String substitute(String content) throws SyntaxError {
   }
 
   protected ScriptTable createChild(ScenarioTestContext testContext, Table newTable) {
-    return new ScriptTable(newTable, id, testContext);
+    ScriptTable scriptTable = new ScriptTable(newTable, id, testContext);
+    scriptTable.setCustomComparatorRegistry(customComparatorRegistry);
+    return scriptTable;
   }
 
   public List<SlimAssertion> call(String[] args, ScriptTable parentTable, int row) throws SyntaxError {

src/fitnesse/testsystems/slim/tables/ScriptTable.java

@@ -163,11 +163,13 @@ private List<SlimAssertion> assertionsFromScenario(int row) throws SyntaxError {
     ScenarioTable scenario = getTestContext().getScenario(Disgracer.disgraceClassName(actionName));
     List<SlimAssertion> assertions = new ArrayList<SlimAssertion>();
     if (scenario != null) {
+      scenario.setCustomComparatorRegistry(customComparatorRegistry);
       String[] args = getArgumentsStartingAt(1, lastCol, row, assertions);
       assertions.addAll(scenario.call(args, this, row));
     } else if (lastCol == 0) {
       String firstNameCell = table.getCellContents(0, row);
       for (ScenarioTable s : getScenariosWithMostArgumentsFirst()) {
+        s.setCustomComparatorRegistry(customComparatorRegistry);
         String[] args = s.matchParameters(firstNameCell);
         if (args != null) {
           assertions.addAll(s.call(args, this, row));

src/fitnesse/testsystems/slim/tables/SlimTable.java

@@ -40,7 +40,7 @@ public abstract class SlimTable {
 
   protected final Table table;
   protected String id;
-  private CustomComparatorRegistry customComparatorRegistry;
+  protected CustomComparatorRegistry customComparatorRegistry;
 
   public SlimTable(Table table, String id, SlimTestContext testContext) {
     this.id = id;
@@ -109,8 +109,7 @@ protected SlimAssertion constructFixture(String fixtureName) {
   protected String getFixtureName() {
     String tableHeader = table.getCellContents(0, 0);
     String fixtureName = getFixtureName(tableHeader);
-    String disgracedFixtureName = Disgracer.disgraceClassName(fixtureName);
-    return disgracedFixtureName;
+    return Disgracer.disgraceClassName(fixtureName);
   }
 
   protected String getFixtureName(String tableHeader) {