Changeset 4940 for branches/Release01x00/WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm

Timestamp:

09/15/09 21:30:53 (3 years ago)

Author:

MichaelTempest

Message:

Item1980: Fix the sticky-inside-verbatim case by noting that there is no need to encode the characters for $TT0, $TT1 and TT2 - they should all be removed by the end of the conversion.

Added an explicit check to ensure that there are no more of $TT0, $TT1 and $TT2 after conversion to HTML completes, and throw an exception if it there is. That gives users a chance to save their work.

File:

• branches/Release01x00/WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm (modified) (2 diffs)

branches/Release01x00/WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm

@@ -1652 +1652 @@
     },
     {
-        exec => $ROUNDTRIP | $CANNOTWYSIWYG, # SMELL: Fix this case
+        exec => $HTML2TML | $ROUNDTRIP,
         name => 'stickyInsideVerbatimItem1980',
         tml  => <<'GLUED',
@@ -2158 +2158 @@
 
     my $txer = new Foswiki::Plugins::WysiwygPlugin::TML2HTML();
-    my $html = $txer->convert(
-        $tml,
-        $this->TML_HTMLconverterOptions()
-    );
+    # This conversion can throw an exception. 
+    # This might be expected if $args->{exec} also has $CANNOTWYSIWYG set
+    my $html = eval {
+        $txer->convert(
+            $tml,
+            $this->TML_HTMLconverterOptions()
+        );
+    };
+    $html = $@ if $@;
 
     $txer = new Foswiki::Plugins::WysiwygPlugin::HTML2TML();