Changeset 849 for trunk/docx4j/src/test/java/org/docx4j/diff/ParagraphDifferencerTest.java

Timestamp:

06/25/09 16:11:21 (3 years ago)

Author:

jharrop

Message:

keep up with refactoring

File:

• trunk/docx4j/src/test/java/org/docx4j/diff/ParagraphDifferencerTest.java (modified) (8 diffs)

trunk/docx4j/src/test/java/org/docx4j/diff/ParagraphDifferencerTest.java

@@ -21 +21 @@
 
 import static org.junit.Assert.*;
-import org.docx4j.diff.ParagraphDifferencer;
+import org.docx4j.diff.Differencer;
 
 import javax.xml.bind.JAXBContext;
@@ -50 +50 @@
                                 
                                 // Test setup
-                                P pl = ParagraphDifferencer.loadParagraph(BASE_DIR + testparagraphs[i]);
-                                P pr = ParagraphDifferencer.loadParagraph(BASE_DIR + testparagraphs[j]);
+                                P pl = Differencer.loadParagraph(BASE_DIR + testparagraphs[i]);
+                                P pr = Differencer.loadParagraph(BASE_DIR + testparagraphs[j]);
                                 
                                 // Result format
@@ -57 +57 @@
                 
                                 // Run the diff
-                                ParagraphDifferencer.diff(pl, pr, result, null, null);
+                                Differencer pd = new Differencer();
+                                pd.diff(pl, pr, result, null, null,
+                                                null, null);
                                 
                         }
@@ -84 +86 @@
                                 // Test setup
                                 wordMLPackage.getMainDocumentPart().addParagraphOfText("first:");
-                                P pl = ParagraphDifferencer.loadParagraph(BASE_DIR + testparagraphs[i]);
+                                P pl = Differencer.loadParagraph(BASE_DIR + testparagraphs[i]);
                                 wordMLPackage.getMainDocumentPart().addObject(pl);
                                 
                                 wordMLPackage.getMainDocumentPart().addParagraphOfText("second:");
-                                P pr = ParagraphDifferencer.loadParagraph(BASE_DIR + testparagraphs[j]);
+                                P pr = Differencer.loadParagraph(BASE_DIR + testparagraphs[j]);
                                 wordMLPackage.getMainDocumentPart().addObject(pr);
                                 
@@ -96 +98 @@
                 
                                 // Run the diff
-                                ParagraphDifferencer.diff(pl, pr, result, null, null, true);
+                                Differencer pd = new Differencer();                             
+                                pd.diff(pl, pr, result, null, null, 
+                                                null, null);
                                 
                                 try {
@@ -111 +115 @@
                                         
                                         StreamResult err = new StreamResult(System.out);
-                                        ParagraphDifferencer.diff(pl, pr, err, null, null, true);
+                                        pd.diff(pl, pr, err, null, null, 
+                                                        null, null);
                                         
                                 }
@@ -117 +122 @@
                                 // Compare no pre-processor
                                 result = new javax.xml.bind.util.JAXBResult(jc );
-                                ParagraphDifferencer.diff(pl, pr, result, null, null, false);                           
+                                pd.diff(pl, pr, result, null, null, 
+                                                null, null);                            
                                 try {
                                         P markedUpPsimple = (org.docx4j.wml.P)result.getResult();                               
@@ -130 +136 @@
                                         
                                         StreamResult err = new StreamResult(System.out);
-                                        ParagraphDifferencer.diff(pl, pr, err, null, null, false);
+                                        pd.diff(pl, pr, err, null, null, 
+                                                        null, null);
                                         
                                 }