Update of
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/tests/org/mmbase/applications/wordfilter
In directory
james.mmbase.org:/tmp/cvs-serv461/cmsc/richtext/src/tests/org/mmbase/applications/wordfilter
Modified Files:
Tag: b1_4
WordHtmlCleanerTest.java
Log Message:
CMSC-421 Wordfilter whitespaces
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/richtext/src/tests/org/mmbase/applications/wordfilter
See also: http://www.mmbase.org/jira/browse/CMSC-421
Index: WordHtmlCleanerTest.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/tests/org/mmbase/applications/wordfilter/WordHtmlCleanerTest.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- WordHtmlCleanerTest.java 14 Jan 2008 22:42:21 -0000 1.7
+++ WordHtmlCleanerTest.java 5 May 2008 15:33:47 -0000 1.7.2.1
@@ -10,10 +10,9 @@
public class WordHtmlCleanerTest extends TestCase {
/**
- * Test for jira issue NIJ-385. Bold tags with only spaces in it where
- * reduced to a self closing tag, which will render al following text bold
in
- * IE.<br/> E.g. The following html <code><b> </b></code>
- * would be cleaned as <code><b/></code>.
+ * Test for NIJ-385. Bold tags with only spaces in it where reduced to a
self closing tag, which will
+ * render al following text bold in IE.<br/>
+ * E.g. The following html <code><b> </b></code> would be
cleaned as <code><b/></code>.
*/
public void testEmptyTagsCleaner() {
String html = "<b> </b><i> </i><u> </u> <B> </B> <U> </U> <I> </I> ";
@@ -23,82 +22,84 @@
assertFalse("Cleaned html still has some empty tags left!" +
cleanedHtml, p.matcher(cleanedHtml).find());
}
-
/**
- * Tests for jira issue CMSC-421, test a bunch of cleanups for the
- * whitespace.
+ * Tests for CMSC-421, test a bunch of cleanups for the whitespace.
*/
public void testRemoveWhiteSpace() {
doTestFilter("<p>test</p><p>test</p>", "test<br/><br/>test");
- }
-
-
- public void testRemoveWhiteSpace2() {
doTestFilter("test<br/><br/><br/><br/>test",
"test<br/><br/><br/><br/>test");
- }
-
-
- public void testRemoveWhiteSpace3() {
doTestFilter("<p>test</p><p>x</p><p>test</p>",
"test<br/><br/>x<br/><br/>test");
- }
-
-
- public void testRemoveWhiteSpace4() {
- doTestFilter("<p>test</p><p></p><p>test</p>",
"test<br/><br/><br/><br/>test");
- }
-
-
- public void testRemoveWhiteSpace5() {
+ doTestFilter("<p>test</p><p></p><p>test</p>", "test<br/><br/>test");
doTestFilter("<p>test</p><p><p>test</p>", "test<br/><br/>test");
- }
-
-
- public void testRemoveWhiteSpace6() {
doTestFilter("<p>test</p><p>test", "test<br/><br/>test");
+ doTestFilter("<p>test</p><p>test </p>", "test<br/><br/>test");
+ doTestFilter(
+ " <p><font face=\"Times New Roman\" size=\"3\">Heading</font></p>"
+
+ " <p> </p>" +
+ " <p><font face=\"Times New Roman\" size=\"3\">Paragraph
one</font></p>" +
+ " <p> </p>" +
+ " <p><font face=\"Times New Roman\" size=\"3\">Paragraph
two</font></p>" +
+ " <p> </p>" +
+ " <p> </p>" +
+ " <p> </p>",
+ "Heading<br/><br/>Paragraph one<br/><br/>Paragraph two");
+ doTestFilter(
+ " <p><font face=\"Times New Roman\" size=\"3\">Heading</font></p>"
+
+ " <p> </p>" +
+ " <p><font face=\"Times New Roman\" size=\"3\">Paragraph
one</font></p>" +
+ " <p> </p>" +
+ " <p><font face=\"Times New Roman\" size=\"3\">Paragraph
two</font></p>" +
+ " <p> </p>" +
+ " <p> </p>",
+ "Heading<br/><br/><br/><br/>Paragraph
one<br/><br/><br/><br/>Paragraph two");
}
/**
- * CMSC-417: FWP, fixed the problem with the 'ugly' lists sometimes pasted
- * from word, these lists are created by adding spaces and tabs before and
- * behind the dots of the lists.
+ * CMSC-417: FWP, fixed the problem with the 'ugly' lists sometimes pasted
from word,
+ * these lists are created by adding spaces and tabs before and behind the
dots of the lists.
*/
public void testFixLists() {
- String input = "<p style=\"margin-left: 53.4pt; text-indent: -18pt;\"
class=\"MsoNormal\"><!--[if !supportLists]--><span style=\"font-family:
Wingdings;\">?<span style=\"font-family: "Times New Roman";
font-style: normal; font-variant: normal; font-weight: normal; font-size: 7pt;
line-height: normal; font-size-adjust: none; font-stretch:
normal;\"> \n\r"
- +
"</span></span><!--[endif]--><span> </span><span>
</span>Een</p>"
- + "<p style=\"margin-left: 53.4pt; text-indent: -18pt;\"
class=\"MsoNormal\"><!--[if !supportLists]--><span style=\"font-family:
Wingdings;\">?<span style=\"font-family: "Times New Roman";
font-style: normal; font-variant: normal; font-weight: normal; font-size: 7pt;
line-height: normal; font-size-adjust: none; font-stretch:
normal;\"> "
- +
"</span></span><!--[endif]--><span> </span><span>
</span>Twee</p>";
+ String input = "<p style=\"margin-left: 53.4pt; text-indent: -18pt;\"
class=\"MsoNormal\"><!--[if !supportLists]--><span style=\"font-family:
Wingdings;\">?<span style=\"font-family: "Times New Roman";
font-style: normal; font-variant: normal; font-weight: normal; font-size: 7pt;
line-height: normal; font-size-adjust: none; font-stretch:
normal;\"> \n\r"+
+
"</span></span><!--[endif]--><span> </span><span>
</span>Een</p>"+
+ "<p style=\"margin-left: 53.4pt; text-indent: -18pt;\"
class=\"MsoNormal\"><!--[if !supportLists]--><span style=\"font-family:
Wingdings;\">?<span style=\"font-family: "Times New Roman";
font-style: normal; font-variant: normal; font-weight: normal; font-size: 7pt;
line-height: normal; font-size-adjust: none; font-stretch:
normal;\"> "+
+
"</span></span><!--[endif]--><span> </span><span>
</span>Twee</p>";
doTestFilter(input, "<ul><li>Een</li><li>Twee</li></ul>");
- }
-
-
- public void testFixLists2() {
- String input = "<p style=\"margin-left: 89.4pt; text-indent: -18pt;\"
class=\"MsoNormal\"><!--[if !supportLists]--><span style=\"font-family:
Symbol;\">?<span style=\"font-family: "Times New Roman"; font-style:
normal; font-variant: normal; font-weight: normal; font-size: 7pt; line-height:
normal; font-size-adjust: none; font-stretch:
normal;\"> "
- + "</span></span><!--[endif]-->Een</p>"
- + "<p style=\"margin-left: 89.4pt; text-indent: -18pt;\"
class=\"MsoNormal\"><!--[if !supportLists]--><span style=\"font-family:
Symbol;\">?<span style=\"font-family: "Times New Roman"; font-style:
normal; font-variant: normal; font-weight: normal; font-size: 7pt; line-height:
normal; font-size-adjust: none; font-stretch:
normal;\"> "
- + "</span></span><!--[endif]-->Twee</p>";
- doTestFilter(input, "<ul><li>Een</li><li>Twee</li></ul>");
- }
+ String input2 = "<p style=\"margin-left: 89.4pt; text-indent: -18pt;\"
class=\"MsoNormal\"><!--[if !supportLists]--><span style=\"font-family:
Symbol;\">?<span style=\"font-family: "Times New Roman"; font-style:
normal; font-variant: normal; font-weight: normal; font-size: 7pt; line-height:
normal; font-size-adjust: none; font-stretch:
normal;\"> "+
+ "</span></span><!--[endif]-->Een</p>"+
+ "<p style=\"margin-left: 89.4pt; text-indent: -18pt;\"
class=\"MsoNormal\"><!--[if !supportLists]--><span style=\"font-family:
Symbol;\">?<span style=\"font-family: "Times New Roman"; font-style:
normal; font-variant: normal; font-weight: normal; font-size: 7pt; line-height:
normal; font-size-adjust: none; font-stretch:
normal;\"> "+
+ "</span></span><!--[endif]-->Twee</p>";
+ doTestFilter(input2, "<ul><li>Een</li><li>Twee</li></ul>");
- public void testFixLists3() {
- String input = "<ol><li>Een</li><li>Twee</li></ol>";
- doTestFilter(input, "<ol><li>Een</li><li>Twee</li></ol>");
+ String input3 = "<ol><li>Een</li><li>Twee</li></ol>";
+ doTestFilter(input3, "<ol><li>Een</li><li>Twee</li></ol>");
}
-
/**
* CMSC-416: FP: Problems with linebreaks in hidden if blocks
*/
public void testLinebreaksInHtmlIfComments() {
doTestFilter("te<!--[if !supportLineBreaknewLine]-->x<!--[endif]-->st",
"test");
+ doTestFilter("te<!--[if
!supportLineBreaknewLine]-->\r\n<!--[endif]-->st", "test");
}
-
- public void testLinebreaksInHtmlIfComments2() {
- doTestFilter("te<!--[if
!supportLineBreaknewLine]-->\r\n<!--[endif]-->st", "test");
+ /**
+ * As specified in NIJ-780, only a single <br/> should be the result of a
replaced <p></p>
+ */
+ public void testReplaceParagraphSingleBr() {
+ doTestFilter("<p>This is paragraph</p><p>paragraph 2</p>", "This is
paragraph<br/><br/>paragraph 2");
}
+ /**
+ * As specified in NIJ-780, h1 till h7 should be replaced by a
<strong>...</strong><br/>
+ */
+ public void testReplaceHeaderEnd() {
+ for(int count = 1; count <= 7; count++) {
+ doTestFilter("<h"+count+">Header</h"+count+">",
"<strong>Header</strong>");
+ doTestFilter("<h"+count+">Header</h"+count+"><p>paragraph 2</p>",
"<strong>Header</strong><br/>paragraph 2");
+ }
+ }
private void doTestFilter(String input, String expected) {
String cleanedHtml = WordHtmlCleaner.cleanHtml(input, true);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
