Merge pull request SquareSquash#5 from square/edenman/java-token-in-backtraces

JakeWharton · JakeWharton · commit 15bbf52af592 · 2012-09-13T21:48:56.000Z
Add a _JAVA_ token to our backtraces so squash can try to deobfuscate
diff --git a/src/main/java/com/squareup/squash/SquashBacktrace.java b/src/main/java/com/squareup/squash/SquashBacktrace.java
@@ -11,7 +11,10 @@
 /** Creates the Squash stacktrace format for serialization by gson. */
 public final class SquashBacktrace {
 
+  // TODO get the actual thread identifier if we can.
   public static final String THREAD_0 = "Thread 0";
+  // This lets Squash know that the stacktrace is java-style and can contain obfuscated classes.
+  public static final String JAVA_PREFIX = "_JAVA_";
 
   private SquashBacktrace() {
     // Should not be instantiated: this is a utility class.
@@ -34,6 +37,7 @@ private static List<List<Object>> getStacktraceArray(Throwable error) {
     List<List<Object>> stackElems = new ArrayList<List<Object>>();
     for (StackTraceElement element : error.getStackTrace()) {
       List<Object> elementList = new ArrayList<Object>();
+      elementList.add(JAVA_PREFIX);
       elementList.add(element.getFileName());
       elementList.add(element.getLineNumber());
       elementList.add(element.getMethodName());
diff --git a/src/test/java/com/squareup/squash/SquashEntryTest.java b/src/test/java/com/squareup/squash/SquashEntryTest.java
@@ -64,10 +64,11 @@ private void assertBacktracesMatch(StackTraceElement[] myLittleStackTrace,
     for (int i = 0, stackElementsSize = stackElements.size(); i < stackElementsSize; i++) {
       List<Object> stackElement = stackElements.get(i);
       StackTraceElement expected = myLittleStackTrace[i];
-      assertThat(stackElement.get(0)).isEqualTo(expected.getFileName());
-      assertThat(((Double) stackElement.get(1)).intValue()).isEqualTo(expected.getLineNumber());
-      assertThat(stackElement.get(2)).isEqualTo(expected.getMethodName());
-      assertThat(stackElement.get(3)).isEqualTo(expected.getClassName());
+      assertThat(stackElement.get(0)).isEqualTo(SquashBacktrace.JAVA_PREFIX);
+      assertThat(stackElement.get(1)).isEqualTo(expected.getFileName());
+      assertThat(((Double) stackElement.get(2)).intValue()).isEqualTo(expected.getLineNumber());
+      assertThat(stackElement.get(3)).isEqualTo(expected.getMethodName());
+      assertThat(stackElement.get(4)).isEqualTo(expected.getClassName());
     }
   }
 
