[xwiki-notifications] r4727 - in xwiki-platform/core/trunk/xwiki-core/src: main/java/com/xpn/xwiki/plugin/diff test/java/com/xpn/xwiki/plugin/diff

[Ludovic Dubost]

Author: ludovic
Date: 2007-09-05 14:48:21 +0200 (Wed, 05 Sep 2007)
New Revision: 4727

Modified:
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/diff/DiffPlugin.java
   
xwiki-platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/plugin/diff/DiffTest.java
Log:
XWIKI-1707 Fixed New diff plugin ignores some changes

Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/diff/DiffPlugin.java
===================================================================
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/diff/DiffPlugin.java
        2007-09-05 12:46:40 UTC (rev 4726)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/diff/DiffPlugin.java
        2007-09-05 12:48:21 UTC (rev 4727)
@@ -261,7 +261,6 @@
                         html.append(escape(origline));
                         html.append("</span></div>");
                     }
-                    j1++;
                     addBR = true;
                     cursor++;
                 }

Modified: 
xwiki-platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/plugin/diff/DiffTest.java
===================================================================
--- 
xwiki-platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/plugin/diff/DiffTest.java
  2007-09-05 12:46:40 UTC (rev 4726)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/plugin/diff/DiffTest.java
  2007-09-05 12:48:21 UTC (rev 4727)
@@ -112,7 +112,7 @@
         assertEquals("Revised 2 should be", "Paris", revised2.toString());
     }
 
-    /*
+
     public void testSimpleWordDiffAsHTML() throws XWikiException {
          String text1 = "A";
          String text2 = "A B";
@@ -154,5 +154,12 @@
          String html = this.plugin.getDifferencesAsHTML(text1, text2);
          assertEquals("Diff is incorrect", "<div class=\"diff\"><div 
class=\"diffunmodifiedline\">A B C</div><div class=\"diffmodifiedline\"><span 
class=\"diffremoveword\">D E F</span></div><div class=\"diffunmodifiedline\">G 
H I</div><div class=\"diffmodifiedline\"><span class=\"diffaddword\">D E 
F</span></div><div class=\"diffunmodifiedline\">J K L</div></div>", html);
      }
-     */
+
+    public void testMultiLineDiffAsHTML() throws XWikiException {
+         String text1 = "A\n";
+         String text2 = "AA\nAB\n";
+         String html = this.plugin.getDifferencesAsHTML(text1, text2);
+         assertEquals("Diff is incorrect", "<div class=\"diff\"><div 
class=\"diffmodifiedline\"><span class=\"diffremoveword\">A</span><span 
class=\"diffaddword\">AA</span></div><div class=\"diffmodifiedline\"><span 
class=\"diffaddword\">AB</span></div></div>", html);
+     }
+
 }

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications