Fix stackTrace navigation to find test method name

Author: Andre Bonna

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.github.json-snapshot</groupId>
     <artifactId>json-snapshot</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5</version>
     <packaging>jar</packaging>
 
     <name>json-snapshot</name>
@@ -66,6 +66,11 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.7</version>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -81,16 +86,6 @@
             <artifactId>slf4j-api</artifactId>
             <version>1.7.25</version>
         </dependency>
-
-
-        <!-- Test -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
     <build>

src/main/java/io/github/jsonSnapshot/SnapshotMatcher.java

@@ -3,6 +3,8 @@
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.util.Arrays;
+import org.junit.BeforeClass;
+import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.verification.VerificationMode;
 import org.slf4j.Logger;
@@ -100,10 +102,27 @@ private static StackTraceElement findStackElement() throws ClassNotFoundExceptio
 
         int i = 1; // Start after stackTrace
         while (i < stackTraceElements.length &&
-                SnapshotMatcher.class.equals(Class.forName(stackTraceElements[i].getClassName()))) {
+                SnapshotMatcher.class.equals(Class.forName(stackTraceElements[i].getClassName()))) { //TODO
             i++;
         }
 
+        for (int j = i; j < stackTraceElements.length; j++) {
+
+            try {
+                Class clazz = Class.forName(stackTraceElements[j].getClassName());
+                Method method = clazz.getMethod(stackTraceElements[j].getMethodName());
+
+                // Navigate into stack until Test class/method level
+                if (method.isAnnotationPresent(Test.class) || method.isAnnotationPresent(BeforeClass.class)) {
+                    i = j;
+                    break;
+                }
+            }
+            catch(NoSuchMethodException ignored) {
+
+            }
+        }
+
         return stackTraceElements[i];
     }
 

src/test/java/io/github/jsonSnapshot/SnapshotIntegrationTest.java

@@ -47,6 +47,15 @@ public void shouldMatchSnapshotFour() {
         expect(FakeObject.builder().id("anyId4").value(4).name("any\n\n\nName4").build()).toMatchSnapshot();
     }
 
+    @Test
+    public void shouldMatchSnapshotInsidePrivateMethod() {
+        matchInsidePrivate();
+    }
+
+    private void matchInsidePrivate() {
+        expect(FakeObject.builder().id("anyPrivate").value(5).name("anyPrivate").build()).toMatchSnapshot();
+    }
+
     @Test
     public void shouldThrowSnapshotMatchException() {
         expectedException.expect(SnapshotMatchException.class);

src/test/java/io/github/jsonSnapshot/SnapshotIntegrationTest.snap

@@ -40,4 +40,14 @@ io.github.jsonSnapshot.SnapshotIntegrationTest.shouldMatchSnapshotTwo=[
     "value": 2,
     "name": "anyName2"
   }
+]
+
+
+
+io.github.jsonSnapshot.SnapshotIntegrationTest.shouldMatchSnapshotInsidePrivateMethod=[
+  {
+    "id": "anyPrivate",
+    "value": 5,
+    "name": "anyPrivate"
+  }
 ]