Index: src/test/java/org/xwiki/rendering/scaffolding/TestEventsRenderer.java
===================================================================
--- src/test/java/org/xwiki/rendering/scaffolding/TestEventsRenderer.java (revision 11896)
+++ src/test/java/org/xwiki/rendering/scaffolding/TestEventsRenderer.java (working copy)
@@ -67,11 +67,20 @@
println("beginItalic");
break;
case STRIKEDOUT:
- println("beginStrikedOut");
+ println("beginStrike");
break;
case UNDERLINED:
println("beginUnderline");
break;
+ case SUP:
+ println("beginSup");
+ break;
+ case SUB:
+ println("beginSub");
+ break;
+ case MONO:
+ println("beginMono");
+ break;
}
}
@@ -91,11 +100,20 @@
println("endItalic");
break;
case STRIKEDOUT:
- println("endStrikedOut");
+ println("endStrike");
break;
case UNDERLINED:
println("endUnderline");
break;
+ case SUP:
+ println("endSup");
+ break;
+ case SUB:
+ println("endSub");
+ break;
+ case MONO:
+ println("endMono");
+ break;
}
}
Index: src/test/java/org/xwiki/rendering/RenderingTests.java
===================================================================
--- src/test/java/org/xwiki/rendering/RenderingTests.java (revision 11896)
+++ src/test/java/org/xwiki/rendering/RenderingTests.java (working copy)
@@ -110,7 +110,16 @@
suite.addTestsFromResource("macros/toc/macrotoc1", true);
suite.addTestsFromResource("macros/toc/macrotoc2", true);
suite.addTestsFromResource("macros/toc/macrotoc3", true);
-
+
+ suite.addTestsFromResource("underline/underline1", false);
+ suite.addTestsFromResource("underline/underline2", false);
+ suite.addTestsFromResource("strike/strike1", false);
+ suite.addTestsFromResource("strike/strike2", false);
+ suite.addTestsFromResource("strike/strike3", false);
+ suite.addTestsFromResource("sup/sup1", false);
+ suite.addTestsFromResource("sub/sub1", false);
+ suite.addTestsFromResource("mono/mono1", false);
+
return suite;
}
}
Index: src/test/resources/underline/underline1.test
===================================================================
--- src/test/resources/underline/underline1.test (revision 0)
+++ src/test/resources/underline/underline1.test (revision 0)
@@ -0,0 +1,32 @@
+.#-----------------------------------------------------
+.input|xwiki/2.0
+.#-----------------------------------------------------
+This is __ underline __
+.#-----------------------------------------------------
+.expect|event
+.#-----------------------------------------------------
+beginDocument
+beginParagraph
+onWord: [This]
+onSpace
+onWord: [is]
+onSpace
+beginUnderline
+onSpace
+onWord: [underline]
+onSpace
+endUnderline
+endParagraph
+endDocument
+.#-----------------------------------------------------
+.expect|xhtml
+.#-----------------------------------------------------
+This is underline
+.#-----------------------------------------------------
+.expect|xwiki
+.#-----------------------------------------------------
+This is __ underline __
+.#-----------------------------------------------------
+.input|xhtml/1.0
+.#-----------------------------------------------------
+This is underline
\ No newline at end of file
Index: src/test/resources/underline/underline2.test
===================================================================
--- src/test/resources/underline/underline2.test (revision 0)
+++ src/test/resources/underline/underline2.test (revision 0)
@@ -0,0 +1,32 @@
+.#-----------------------------------------------------
+.input|xwiki/2.0
+.#-----------------------------------------------------
+This is __ underline __
+.#-----------------------------------------------------
+.expect|event
+.#-----------------------------------------------------
+beginDocument
+beginParagraph
+onWord: [This]
+onSpace
+onWord: [is]
+onSpace
+beginUnderline
+onSpace
+onWord: [underline]
+onSpace
+endUnderline
+endParagraph
+endDocument
+.#-----------------------------------------------------
+.expect|xhtml
+.#-----------------------------------------------------
+This is underline
+.#-----------------------------------------------------
+.expect|xwiki
+.#-----------------------------------------------------
+This is __ underline __
+.#-----------------------------------------------------
+.input|xhtml/1.0
+.#-----------------------------------------------------
+This is underline
\ No newline at end of file
Index: src/test/resources/sub/sub1.test
===================================================================
--- src/test/resources/sub/sub1.test (revision 0)
+++ src/test/resources/sub/sub1.test (revision 0)
@@ -0,0 +1,32 @@
+.#-----------------------------------------------------
+.input|xwiki/2.0
+.#-----------------------------------------------------
+This is ,, sub ,,
+.#-----------------------------------------------------
+.expect|event
+.#-----------------------------------------------------
+beginDocument
+beginParagraph
+onWord: [This]
+onSpace
+onWord: [is]
+onSpace
+beginSub
+onSpace
+onWord: [sub]
+onSpace
+endSub
+endParagraph
+endDocument
+.#-----------------------------------------------------
+.expect|xhtml
+.#-----------------------------------------------------
+This is sub
+.#-----------------------------------------------------
+.expect|xwiki
+.#-----------------------------------------------------
+This is ,, sub ,,
+.#-----------------------------------------------------
+.input|xhtml/1.0
+.#-----------------------------------------------------
+This is sub
\ No newline at end of file
Index: src/test/resources/strike/strike1.test
===================================================================
--- src/test/resources/strike/strike1.test (revision 0)
+++ src/test/resources/strike/strike1.test (revision 0)
@@ -0,0 +1,32 @@
+.#-----------------------------------------------------
+.input|xwiki/2.0
+.#-----------------------------------------------------
+This is -- strike --
+.#-----------------------------------------------------
+.expect|event
+.#-----------------------------------------------------
+beginDocument
+beginParagraph
+onWord: [This]
+onSpace
+onWord: [is]
+onSpace
+beginStrike
+onSpace
+onWord: [strike]
+onSpace
+endStrike
+endParagraph
+endDocument
+.#-----------------------------------------------------
+.expect|xhtml
+.#-----------------------------------------------------
+This is strike
+.#-----------------------------------------------------
+.expect|xwiki
+.#-----------------------------------------------------
+This is -- strike --
+.#-----------------------------------------------------
+.input|xhtml/1.0
+.#-----------------------------------------------------
+This is strike
\ No newline at end of file
Index: src/test/resources/strike/strike2.test
===================================================================
--- src/test/resources/strike/strike2.test (revision 0)
+++ src/test/resources/strike/strike2.test (revision 0)
@@ -0,0 +1,32 @@
+.#-----------------------------------------------------
+.input|xwiki/2.0
+.#-----------------------------------------------------
+This is -- strike --
+.#-----------------------------------------------------
+.expect|event
+.#-----------------------------------------------------
+beginDocument
+beginParagraph
+onWord: [This]
+onSpace
+onWord: [is]
+onSpace
+beginStrike
+onSpace
+onWord: [strike]
+onSpace
+endStrike
+endParagraph
+endDocument
+.#-----------------------------------------------------
+.expect|xhtml
+.#-----------------------------------------------------
+This is strike
+.#-----------------------------------------------------
+.expect|xwiki
+.#-----------------------------------------------------
+This is -- strike --
+.#-----------------------------------------------------
+.input|xhtml/1.0
+.#-----------------------------------------------------
+This is strike
\ No newline at end of file
Index: src/test/resources/strike/strike3.test
===================================================================
--- src/test/resources/strike/strike3.test (revision 0)
+++ src/test/resources/strike/strike3.test (revision 0)
@@ -0,0 +1,32 @@
+.#-----------------------------------------------------
+.input|xwiki/2.0
+.#-----------------------------------------------------
+This is -- strike --
+.#-----------------------------------------------------
+.expect|event
+.#-----------------------------------------------------
+beginDocument
+beginParagraph
+onWord: [This]
+onSpace
+onWord: [is]
+onSpace
+beginStrike
+onSpace
+onWord: [strike]
+onSpace
+endStrike
+endParagraph
+endDocument
+.#-----------------------------------------------------
+.expect|xhtml
+.#-----------------------------------------------------
+This is strike
+.#-----------------------------------------------------
+.expect|xwiki
+.#-----------------------------------------------------
+This is -- strike --
+.#-----------------------------------------------------
+.input|xhtml/1.0
+.#-----------------------------------------------------
+This is strike
\ No newline at end of file
Index: src/test/resources/sup/sup1.test
===================================================================
--- src/test/resources/sup/sup1.test (revision 0)
+++ src/test/resources/sup/sup1.test (revision 0)
@@ -0,0 +1,32 @@
+.#-----------------------------------------------------
+.input|xwiki/2.0
+.#-----------------------------------------------------
+This is ^^ sup ^^
+.#-----------------------------------------------------
+.expect|event
+.#-----------------------------------------------------
+beginDocument
+beginParagraph
+onWord: [This]
+onSpace
+onWord: [is]
+onSpace
+beginSup
+onSpace
+onWord: [sup]
+onSpace
+endSup
+endParagraph
+endDocument
+.#-----------------------------------------------------
+.expect|xhtml
+.#-----------------------------------------------------
+This is sup
+.#-----------------------------------------------------
+.expect|xwiki
+.#-----------------------------------------------------
+This is ^^ sup ^^
+.#-----------------------------------------------------
+.input|xhtml/1.0
+.#-----------------------------------------------------
+This is sup
\ No newline at end of file
Index: src/test/resources/mono/mono1.test
===================================================================
--- src/test/resources/mono/mono1.test (revision 0)
+++ src/test/resources/mono/mono1.test (revision 0)
@@ -0,0 +1,32 @@
+.#-----------------------------------------------------
+.input|xwiki/2.0
+.#-----------------------------------------------------
+This is ## mono ##
+.#-----------------------------------------------------
+.expect|event
+.#-----------------------------------------------------
+beginDocument
+beginParagraph
+onWord: [This]
+onSpace
+onWord: [is]
+onSpace
+beginMono
+onSpace
+onWord: [mono]
+onSpace
+endMono
+endParagraph
+endDocument
+.#-----------------------------------------------------
+.expect|xhtml
+.#-----------------------------------------------------
+This is mono
+.#-----------------------------------------------------
+.expect|xwiki
+.#-----------------------------------------------------
+This is ## mono ##
+.#-----------------------------------------------------
+.input|xhtml/1.0
+.#-----------------------------------------------------
+This is mono
\ No newline at end of file