SF.net SVN: xmlunit: [151] trunk/xmlunit

[<bo...@us...>]

Revision: 151
          http://xmlunit.svn.sourceforge.net/xmlunit/?rev=151&view=rev
Author:   bodewig
Date:     2007-03-22 21:37:22 -0700 (Thu, 22 Mar 2007)

Log Message:
-----------
fix issue 1683752

Modified Paths:
--------------
    trunk/xmlunit/src/java/org/custommonkey/xmlunit/Diff.java
    trunk/xmlunit/tests/java/org/custommonkey/xmlunit/test_DetailedDiff.java

Modified: trunk/xmlunit/src/java/org/custommonkey/xmlunit/Diff.java
===================================================================
--- trunk/xmlunit/src/java/org/custommonkey/xmlunit/Diff.java	2007-03-22 17:11:11 UTC (rev 150)
+++ trunk/xmlunit/src/java/org/custommonkey/xmlunit/Diff.java	2007-03-23 04:37:22 UTC (rev 151)
@@ -154,11 +154,7 @@
         this.controlDoc = getManipulatedDocument(controlDoc);
         this.testDoc = getManipulatedDocument(testDoc);
         this.elementQualifierDelegate = elementQualifier;
-        if (comparator == null) {
-            this.differenceEngine = new DifferenceEngine(this);
-        } else {
-            this.differenceEngine = comparator;
-        }
+        this.differenceEngine = comparator;
         this.messages = new StringBuffer();
     }
 
@@ -247,7 +243,8 @@
         if (compared) {
             return;
         }
-        differenceEngine.compare(controlDoc, testDoc, this, elementQualifierDelegate);
+        getDifferenceEngine().compare(controlDoc, testDoc, this,
+                                      elementQualifierDelegate);
         compared = true;
     }
 
@@ -401,4 +398,13 @@
         this.elementQualifierDelegate = delegate;
     }
 
+    /**
+     * Lazily initializes the difference engine if it hasn't been set
+     * via a constructor.
+     */
+    private DifferenceEngine getDifferenceEngine() {
+        return differenceEngine == null
+            ? new DifferenceEngine(this) : differenceEngine;
+    }
+
 }

Modified: trunk/xmlunit/tests/java/org/custommonkey/xmlunit/test_DetailedDiff.java
===================================================================
--- trunk/xmlunit/tests/java/org/custommonkey/xmlunit/test_DetailedDiff.java	2007-03-22 17:11:11 UTC (rev 150)
+++ trunk/xmlunit/tests/java/org/custommonkey/xmlunit/test_DetailedDiff.java	2007-03-23 04:37:22 UTC (rev 151)
@@ -179,7 +179,7 @@
         assertEquals(3, l.size());
     }
 
-    public void XtestSeeAllDifferencesEvenIfDiffSaysHaltComparison() throws Exception {
+    public void testSeeAllDifferencesEvenIfDiffSaysHaltComparison() throws Exception {
         String control = "<a><b/><c/></a>";
         String test = "<a><c/></a>";
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.