Make tests work with matrix.yaml.io

icecream17 · Oct 3, 2021 · 1c12840 · 1c12840
1 parent 7a5c87e
commit 1c12840
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 21 deletions.
diff --git a/coffeescript/lib/test-receiver.coffee b/coffeescript/lib/test-receiver.coffee
@@ -41,7 +41,6 @@ global.TestReceiver = class TestReceiver extends Receiver
           .replace(/\t/g, '\\t')
           .replace(/\n/g, '\\n')
           .replace(/\r/g, '\\r')
-          .replace(/\x20$/g, '<SPC>')
         event.push "#{style}#{value}"
       event.join(' ') + "\n"
     list.join ''

diff --git a/coffeescript/test/testml-bridge.coffee b/coffeescript/test/testml-bridge.coffee
@@ -24,11 +24,11 @@ class TestMLBridge extends TestML.Bridge
     else
       parser.receiver.output()
 
-  unescape: (yaml)->
-    yaml.replace(/<SPC>/g, ' ')
+  unescape: (text)->
+    text.replace(/<SPC>/g, ' ')
       .replace(/<TAB>/g, "\t")
 
-  fix1: (events)->
-    return events
+  fix_test_output: (text)->
+    return text
       .replace(/^\+MAP\ \{\}/gm, '+MAP')
       .replace(/^\+SEQ\ \[\]/gm, '+SEQ')
diff --git a/javascript/lib/test-receiver.js b/javascript/lib/test-receiver.js
diff --git a/javascript/test/testml-bridge.js b/javascript/test/testml-bridge.js
diff --git a/perl/lib/TestReceiver.pm b/perl/lib/TestReceiver.pm
@@ -45,7 +45,6 @@ sub output {
       $value =~ s/\t/\\t/g;
       $value =~ s/\n/\\n/g;
       $value =~ s/\r/\\r/g;
-      $value =~ s/\x20\z/<SPC>/;
       push @event, "$style$value";
     }
     join(' ', @event) . "\n";

diff --git a/perl/test/TestMLBridge.pm b/perl/test/TestMLBridge.pm
@@ -26,17 +26,17 @@ sub parse {
 }
 
 sub unescape {
-  my ($self, $yaml) = @_;
-  $yaml =~ s/<SPC>/ /g;
-  $yaml =~ s/<TAB>/\t/g;
-  return $yaml;
+  my ($self, $text) = @_;
+  $text =~ s/<SPC>/ /g;
+  $text =~ s/<TAB>/\t/g;
+  return $text;
 }
 
-sub fix1 {
-  my ($self, $events) = @_;
-  $events =~ s/^\+MAP\ \{\}/+MAP/gm;
-  $events =~ s/^\+SEQ\ \[\]/+SEQ/gm;
-  return $events;
+sub fix_test_output {
+  my ($self, $text) = @_;
+  $text =~ s/^\+MAP\ \{\}/+MAP/gm;
+  $text =~ s/^\+SEQ\ \[\]/+SEQ/gm;
+  return $text;
 }
 
 1;
diff --git a/test/parse-suite.tml b/test/parse-suite.tml
@@ -2,7 +2,7 @@
 
 
 "({*Name}) {*Label} -- '{*in-yaml}'":
-  *in-yaml.unescape.parse.fix1 == *test-event
+  *in-yaml.unescape.parse.fix-test-output == *test-event.unescape
 
 
 %Import 229Q    # Spec Example 2.4. Sequence of Mappings