print better error message

git-svn-id: http://liquibase.jira.com/svn/CORE/trunk@1536 e6edf6fb-f266-4316-afb4-e53d95876a76
liquibase · Jul 11, 2010 · bd2cf42 · bd2cf42
1 parent 96fc7f0
commit bd2cf42
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/liquibase-core/src/main/java/liquibase/diff/DiffResult.java b/liquibase-core/src/main/java/liquibase/diff/DiffResult.java
@@ -377,9 +377,14 @@ private void printColumnComparison(SortedSet<Column> changedColumns,
 		}
 	}
 
-	private void printComparision(String title, DiffComparison comparison,
-			PrintStream out) {
+	private void printComparision(String title, DiffComparison comparison, PrintStream out) {
 		out.print(title + ":");
+
+        if (comparison == null) {
+            out.print("NULL");
+            return;
+        }
+
 		if (comparison.areTheSame()) {
 			out.println(" EQUAL");
 		} else {

diff --git a/liquibase-integration-tests/src/test/java/liquibase/dbtest/AbstractIntegrationTest.java b/liquibase-integration-tests/src/test/java/liquibase/dbtest/AbstractIntegrationTest.java
@@ -27,12 +27,7 @@
 import liquibase.test.DatabaseTestContext;
 import liquibase.logging.LogFactory;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.io.StringWriter;
+import java.io.*;
 import java.net.URL;
 import java.util.*;
 import java.sql.Statement;
@@ -411,7 +406,12 @@ public void testRerunDiffChangeLog() throws Exception {
             DatabaseSnapshot migratedSnapshot = DatabaseSnapshotGeneratorFactory.getInstance().createSnapshot(database, null, null);
 
             DiffResult finalDiffResult = new Diff(originalSnapshot, migratedSnapshot).compare();
-            assertFalse(finalDiffResult.differencesFound());
+            try {
+                assertFalse(finalDiffResult.differencesFound());
+            } catch (AssertionError e) {
+                finalDiffResult.printResult(System.out);
+                throw e;
+            }
 
             //diff to empty and drop all
             Diff emptyDiff = new Diff(emptySnapshot, migratedSnapshot);