[xsite-scm] [scm-git][2/5] Insert p tags instead of div for plain test snippets in body.

[joehni]

commit 6466f801efea18aec280bc4dd47f164755882f46
Author:     joehni <joerg.schai...@gmx.de>
AuthorDate: Thu, 9 May 2013 11:10:07 +0200
Commit:     joehni <joerg.schai...@gmx.de>
CommitDate: Thu, 9 May 2013 11:10:07 +0200

    Insert p tags instead of div for plain test snippets in body.

diff --git 
a/xsite-core/src/main/java/org/codehaus/xsite/extractors/sitemesh/rules/TopLevelBlockExtractingRule.java
 
b/xsite-core/src/main/java/org/codehaus/xsite/extractors/sitemesh/rules/TopLevelBlockExtractingRule.java
index 6302e2b..77679e1 100644
--- 
a/xsite-core/src/main/java/org/codehaus/xsite/extractors/sitemesh/rules/TopLevelBlockExtractingRule.java
+++ 
b/xsite-core/src/main/java/org/codehaus/xsite/extractors/sitemesh/rules/TopLevelBlockExtractingRule.java
@@ -25,7 +25,7 @@ import org.apache.commons.lang.StringUtils;
 /**
  * Rule to extract all top level block elements as separate paragraphs. 
Normally a body
  * should contain only such elements. In case of other tags or text, those are 
added as
- * separate div block. 
+ * separate p block. 
  * 
  * @author J&ouml;rg Schaible
  */
@@ -33,6 +33,8 @@ public class TopLevelBlockExtractingRule extends BasicRule {
 
        private final static Tag DIV_OPEN = new CustomTag("div", Tag.OPEN); 
        private final static Tag DIV_CLOSE = new CustomTag("div", Tag.CLOSE); 
+       private final static Tag P_OPEN = new CustomTag("p", Tag.OPEN); 
+       private final static Tag P_CLOSE = new CustomTag("p", Tag.CLOSE); 
        private final PageBuilder page;
 
        public TopLevelBlockExtractingRule(PageBuilder page) {
@@ -105,9 +107,9 @@ public class TopLevelBlockExtractingRule extends BasicRule {
                                        String text = 
StringUtils.stripToNull(currentBuffer.toString());
                                        if (text != null) {
                                                CharArray ca = new 
CharArray(text.length() + 16);
-                                               DIV_OPEN.writeTo(ca);
+                                               P_OPEN.writeTo(ca);
                                                ca.append(text);
-                                               DIV_CLOSE.writeTo(ca);
+                                               P_CLOSE.writeTo(ca);
                                                paragraphs.add(ca);
                                        }
                                        currentBuffer.clear();
diff --git 
a/xsite-core/src/test/java/org/codehaus/xsite/extractors/SiteMeshPageExtractorTest.java
 
b/xsite-core/src/test/java/org/codehaus/xsite/extractors/SiteMeshPageExtractorTest.java
index 67c528c..18d830e 100644
--- 
a/xsite-core/src/test/java/org/codehaus/xsite/extractors/SiteMeshPageExtractorTest.java
+++ 
b/xsite-core/src/test/java/org/codehaus/xsite/extractors/SiteMeshPageExtractorTest.java
@@ -50,7 +50,7 @@ public class SiteMeshPageExtractorTest {
                final Page page2 = pageExtractor.extractPage("Test.html", 
html2);
                assertEquals(1, page1.getLinks().size());
                assertEquals(0, page2.getLinks().size());
-               assertEquals("<div><a href=\"foo.html\">Header</a></div>", 
page1.getBody());
+               assertEquals("<p><a href=\"foo.html\">Header</a></p>", 
page1.getBody());
                assertEquals("<p>Header</p>", page2.getBody());
        }
 
@@ -86,8 +86,8 @@ public class SiteMeshPageExtractorTest {
                final Page page = pageExtractor.extractPage("JUnit.html", html);
                assertEquals("JUnit", page.getTitle());
                final String paragraphs[] = {
-                       "<div>Intro</div>", "<ol><li>Header</li></ol>", 
"<div>In between</div>",
-                       "<p>Next</p>", "<isindex/>", "<div>Outro</div>"};
+                       "<p>Intro</p>", "<ol><li>Header</li></ol>", "<p>In 
between</p>",
+                       "<p>Next</p>", "<isindex/>", "<p>Outro</p>"};
                assertEquals(StringUtils.join(paragraphs), page.getBody());
                String[] paras = page.getParagraphs();
                assertEquals(paragraphs.length, paras.length);