[jboss-svn-commits] JBL Code SVN: r32333 - in labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src: test/java/org/jboss/labs/sbs/plugin/bm and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: lkrzyzanek
Date: 2010-04-01 04:31:25 -0400 (Thu, 01 Apr 2010)
New Revision: 32333

Added:
   labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/resources/user1/pretest.meta
   labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/resources/user1/pretest.txt
Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java
   labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java
Log:
Added handling PRE tags

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java	2010-04-01 07:57:18 UTC (rev 32332)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java	2010-04-01 08:31:25 UTC (rev 32333)
@@ -308,13 +308,26 @@
     BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(data), encoding));
     String line;
     StringBuffer description = new StringBuffer();
+    boolean isInPre = false;
     while ((line = br.readLine()) != null) {
       if (!hasLoadedTitle) {
         bean.setTitle(line);
         hasLoadedTitle = true;
       } else {
-        description.append(line);
+        if (line.contains("</pre>")) {
+          isInPre = false;
+        }
+        if (isInPre) {
+          description.append("<p>");
+          description.append(line);
+          description.append("</p>");
+        } else {
+          description.append(line);
+        }
         description.append(LINE_SEPARATOR);
+        if (line.contains("<pre>")) {
+          isInPre = true;
+        }
       }
     }
     bean.setBody(description.toString());

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java	2010-04-01 07:57:18 UTC (rev 32332)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java	2010-04-01 08:31:25 UTC (rev 32333)
@@ -59,6 +59,15 @@
         + "user1/entry1-nonexisting.meta"), "UTF-8");
     assertEquals(null, bean.getAuthor());
     assertEquals(null, bean.getCreated());
+
+    OldBlogEntryBean pretest = manager.loadOldBlogPost(new File(repoPath + "user1/pretest.txt"), new File(repoPath
+        + "user1/pretest.meta"), "UTF-8");
+    final String emptyLine = "<p></p>" + DbOldBlogsManager.LINE_SEPARATOR;
+    assertEquals("<p>data</p>" + DbOldBlogsManager.LINE_SEPARATOR + "<pre>" + DbOldBlogsManager.LINE_SEPARATOR
+        + "<p>  import java.lang.*;</p>" + DbOldBlogsManager.LINE_SEPARATOR + emptyLine
+        + "<p>  public class Test {</p>" + DbOldBlogsManager.LINE_SEPARATOR + emptyLine
+        + "<p>    private String test;</p>" + DbOldBlogsManager.LINE_SEPARATOR + emptyLine + "<p>  }</p>"
+        + DbOldBlogsManager.LINE_SEPARATOR + "</pre>" + DbOldBlogsManager.LINE_SEPARATOR, pretest.getBody());
   }
 
   @Test

Added: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/resources/user1/pretest.meta
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/resources/user1/pretest.meta	                        (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/resources/user1/pretest.meta	2010-04-01 08:31:25 UTC (rev 32333)
@@ -0,0 +1,3 @@
+#Tue Oct 05 14:11:58 EDT 2004
+blog-entry-author=admin
+blog-entry-metadata-timestamp=1269610718469

Added: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/resources/user1/pretest.txt
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/resources/user1/pretest.txt	                        (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/resources/user1/pretest.txt	2010-04-01 08:31:25 UTC (rev 32333)
@@ -0,0 +1,11 @@
+PRE test
+<p>data</p>
+<pre>
+  import java.lang.*;
+
+  public class Test {
+
+    private String test;
+
+  }
+</pre>
\ No newline at end of file


Property changes on: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/resources/user1/pretest.txt
___________________________________________________________________
Name: svn:mime-type
   + text/plain