Merge pull request SquareSquash#4 from square/edenman/fix-nested-backtrace-format

JakeWharton · JakeWharton · commit 3274699a9185 · 2012-09-13T20:19:27.000Z
Fix backtrace format for nested exceptions
diff --git a/src/main/java/com/squareup/squash/SquashBacktrace.java b/src/main/java/com/squareup/squash/SquashBacktrace.java
@@ -77,7 +77,7 @@ public static void populateNestedExceptions(List<NestedException> nestedExceptio
     }
     final Throwable cause = error.getCause();
     NestedException doc = new NestedException(cause.getClass().getName(), cause.getMessage(),
-        getStacktraceArray(cause), getIvars(cause));
+        getBacktraces(cause), getIvars(cause));
     nestedExceptions.add(doc);
     // Exceptions all the way down!
     populateNestedExceptions(nestedExceptions, cause);
diff --git a/src/test/java/com/squareup/squash/SquashEntryTest.java b/src/test/java/com/squareup/squash/SquashEntryTest.java
@@ -119,7 +119,7 @@ private void assertBacktracesMatch(StackTraceElement[] myLittleStackTrace,
     final SquashEntry logEntry = factory.create(logMessage, exception);
     SquashEntry deserialized = serializeAndDeserialize(logEntry);
     assertThat(deserialized.backtraces).isNotEmpty();
-    final List<Object> backtrace = deserialized.backtraces.get(0);
+    List<Object> backtrace = deserialized.backtraces.get(0);
     assertThat(backtrace.get(0)).isEqualTo(SquashBacktrace.THREAD_0);
     assertThat(backtrace.get(1)).isEqualTo(true);
     List<List<Object>> stackElements = (List<List<Object>>) backtrace.get(2);
@@ -134,13 +134,19 @@ private void assertBacktracesMatch(StackTraceElement[] myLittleStackTrace,
     assertThat(nested1.class_name).isEqualTo(nestedException.getClass().getName());
     assertThat(nested1.ivars).isEmpty();
     assertThat(nested1.message).isEqualTo(nestedExceptionMessage);
-    assertBacktracesMatch(nestedStackTrace, nested1.backtraces);
+    backtrace = nested1.backtraces.get(0);
+    assertThat(backtrace.get(0)).isEqualTo(SquashBacktrace.THREAD_0);
+    assertThat(backtrace.get(1)).isEqualTo(true);
+    assertBacktracesMatch(nestedStackTrace, (List<List<Object>>) backtrace.get(2));
 
     final SquashBacktrace.NestedException nested2 = nestedExceptions.get(1);
     assertThat(nested2.class_name).isEqualTo(doublyNestedException.getClass().getName());
     assertThat(nested2.ivars).isEmpty();
     assertThat(nested2.message).isEqualTo(doublyNestedExceptionMessage);
-    assertBacktracesMatch(doublyNestedStackTrace, nested2.backtraces);
+    backtrace = nested1.backtraces.get(0);
+    assertThat(backtrace.get(0)).isEqualTo(SquashBacktrace.THREAD_0);
+    assertThat(backtrace.get(1)).isEqualTo(true);
+    assertBacktracesMatch(nestedStackTrace, (List<List<Object>>) backtrace.get(2));
   }
 
   private class EntryFactory {

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public static void populateNestedExceptions(List<NestedException> nestedExceptio`
`77`	`77`	`}`
`78`	`78`	`final Throwable cause = error.getCause();`
`79`	`79`	`NestedException doc = new NestedException(cause.getClass().getName(), cause.getMessage(),`
`80`		`- getStacktraceArray(cause), getIvars(cause));`
	`80`	`+ getBacktraces(cause), getIvars(cause));`
`81`	`81`	`nestedExceptions.add(doc);`
`82`	`82`	`// Exceptions all the way down!`
`83`	`83`	`populateNestedExceptions(nestedExceptions, cause);`