Merge branch 'master' of https://github.com/json-snapshot/json-snapshot.github.io

Author: Andre Bonna

README.md

@@ -50,6 +50,7 @@ import java.util.List;
 
 import static io.github.jsonSnapshot.SnapshotMatcher.*;
 import static io.github.jsonSnapshot.SnapshotUtils.*;
+import io.github.jsonSnapshot.SnapshotCaptor;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ExampleTest {
@@ -78,11 +79,35 @@ public class ExampleTest {
         fakeObject.fakeMethod("test1", 1L, Arrays.asList("listTest1"));
         fakeObject.fakeMethod("test2", 2L, Arrays.asList("listTest1", "listTest2"));
 
-        expect(extractArgs(fakeObject, "fakeMethod", String.class, Long.class, List.class))
+        expect(extractArgs(fakeObject, "fakeMethod", new SnapshotCaptor(String.class), new SnapshotCaptor(Long.class), new SnapshotCaptor(List.class)))
                 .toMatchSnapshot();
     }
 
+    @Test // Snapshot arguments passed to mocked object support ignore of fields
+    public void shouldExtractArgsFromFakeMethodWithComplexObject() {
+        FakeObject fake = new FakeObject();
+        fake.setId("idMock");
+        fake.setName("nameMock");
+
+        //With Ignore
+        fakeObject.fakeMethodWithComplexObject(fake);
+        Object fakeMethodWithComplexObjectWithIgnore = extractArgs(
+                fakeObject, "fakeMethodWithComplexObject", 
+                new SnapshotCaptor(Object.class, FakeObject.class, "name"));
+
+        Mockito.reset(fakeObject);
+
+        // Without Ignore of fields
+        fakeObject.fakeMethodWithComplexObject(fake);
+        Object fakeMethodWithComplexObjectWithoutIgnore = extractArgs(
+                fakeObject, "fakeMethodWithComplexObject", 
+                new SnapshotCaptor(Object.class, FakeObject.class));
+
+        expect(fakeMethodWithComplexObjectWithIgnore, fakeMethodWithComplexObjectWithoutIgnore).toMatchSnapshot();
+    }
+    
     class FakeObject {
+        
         private String id;
 
         private Integer value;
@@ -92,6 +117,18 @@ public class ExampleTest {
         void fakeMethod(String fakeName, Long fakeNumber, List<String> fakeList) {
 
         }
+        
+        void fakeMethodWithComplexObject(Object fakeObj) {
+        
+        }
+        
+        void setId(String id) {
+            this.id = id;
+        }
+        
+        void setName(String name) {
+            this.name = name;
+        }
     }
 }
 ```
@@ -124,6 +161,29 @@ com.example.ExampleTest.shouldExtractArgsFromMethod=[
     ]
   }
 ]
+
+
+com.example.ExampleTest.shouldExtractArgsFromFakeMethodWithComplexObject=[
+  {
+    "FakeObject.fakeMethodWithComplexObject": [
+      {
+        "arg0": {
+          "id": "idMock"
+        }
+      }
+    ]
+  },
+  {
+    "FakeObject.fakeMethodWithComplexObject": [
+      {
+        "arg0": {
+          "id": "idMock",
+          "name": "nameMock"
+        }
+      }
+    ]
+  }
+]
 ```
 
 Whenever it runs again, the `expect` method argument will be automatically validated with the `.snap` file. That is why you should commit every `.snap` file created.

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

@@ -1,11 +1,12 @@
 package io.github.jsonSnapshot;
 
-import lombok.Builder;
-import lombok.Setter;
+import lombok.*;
 
 import java.util.List;
 
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class FakeObject {
 
     private String id;
@@ -17,9 +18,15 @@ public class FakeObject {
     @Setter
     private FakeObject fakeObject;
 
-
     public void fakeMethod(String fakeName, Long fakeNumber, List<String> fakeList) {
 
     }
 
+    public void fakeMethodWithComplexObject(Object fakeObj) {
+
+    }
+
+    public void fakeMethodWithComplexFakeObject(FakeObject fakeObj) {
+
+    }
 }

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

@@ -5,15 +5,14 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 
-import static io.github.jsonSnapshot.SnapshotMatcher.expect;
-import static io.github.jsonSnapshot.SnapshotMatcher.start;
-import static io.github.jsonSnapshot.SnapshotMatcher.validateSnapshots;
+import static io.github.jsonSnapshot.SnapshotMatcher.*;
+import static io.github.jsonSnapshot.SnapshotUtils.extractArgs;
 
 @RunWith(MockitoJUnitRunner.class)
 public class SnapshotUtilsTest {
@@ -33,15 +32,47 @@ public static void afterAll() {
 
 
     @Test
-    public void shouldExtractArgsFromMethod() {
+    public void shouldExtractArgsFromFakeMethod() {
 
         fakeObject.fakeMethod("test1", 1L, Arrays.asList("listTest1"));
         fakeObject.fakeMethod("test2", 2L, Arrays.asList("listTest1", "listTest2"));
 
-        HashMap<?, ?> fakeMethodArgs = SnapshotUtils.extractArgs(fakeObject, "fakeMethod", String.class, Long.class, List.class);
-        expect(fakeMethodArgs)
-                .toMatchSnapshot();
+        Object fakeMethod = extractArgs(fakeObject, "fakeMethod", new SnapshotCaptor(String.class), new SnapshotCaptor(Long.class), new SnapshotCaptor(List.class));
+        expect(fakeMethod).toMatchSnapshot();
+    }
+
+    @Test
+    public void shouldExtractArgsFromFakeMethodWithComplexObject() {
+        FakeObject fake = new FakeObject.FakeObjectBuilder().id("idMock").name("nameMock").build();
+
+        //With Ignore
+        fakeObject.fakeMethodWithComplexFakeObject(fake);
+        Object fakeMethodWithComplexObjectWithIgnore = extractArgs(fakeObject, "fakeMethodWithComplexFakeObject", new SnapshotCaptor(FakeObject.class, "name"));
 
+        Mockito.reset(fakeObject);
+
+        // Without Ignore
+        fakeObject.fakeMethodWithComplexFakeObject(fake);
+        Object fakeMethodWithComplexObjectWithoutIgnore = extractArgs(fakeObject, "fakeMethodWithComplexFakeObject", new SnapshotCaptor(FakeObject.class));
+
+        expect(fakeMethodWithComplexObjectWithIgnore, fakeMethodWithComplexObjectWithoutIgnore).toMatchSnapshot();
     }
 
+    @Test
+    public void shouldExtractArgsFromFakeMethodWithComplexFakeObject() {
+
+        FakeObject fake = new FakeObject.FakeObjectBuilder().id("idMock").name("nameMock").build();
+
+        //With Ignore
+        fakeObject.fakeMethodWithComplexObject(fake);
+        Object fakeMethodWithComplexObjectWithIgnore = extractArgs(fakeObject, "fakeMethodWithComplexObject", new SnapshotCaptor(Object.class, FakeObject.class, "name"));
+
+        Mockito.reset(fakeObject);
+
+        // Without Ignore
+        fakeObject.fakeMethodWithComplexObject(fake);
+        Object fakeMethodWithComplexObjectWithoutIgnore = extractArgs(fakeObject, "fakeMethodWithComplexObject", new SnapshotCaptor(Object.class, FakeObject.class));
+
+        expect(fakeMethodWithComplexObjectWithIgnore, fakeMethodWithComplexObjectWithoutIgnore).toMatchSnapshot();
+    }
 }

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

@@ -1,4 +1,50 @@
-io.github.jsonSnapshot.SnapshotUtilsTest.shouldExtractArgsFromMethod=[
+io.github.jsonSnapshot.SnapshotUtilsTest.shouldExtractArgsFromFakeMethodWithComplexFakeObject=[
+  {
+    "FakeObject.fakeMethodWithComplexObject": [
+      {
+        "arg0": {
+          "id": "idMock"
+        }
+      }
+    ]
+  },
+  {
+    "FakeObject.fakeMethodWithComplexObject": [
+      {
+        "arg0": {
+          "id": "idMock",
+          "name": "nameMock"
+        }
+      }
+    ]
+  }
+]
+
+
+io.github.jsonSnapshot.SnapshotUtilsTest.shouldExtractArgsFromFakeMethodWithComplexObject=[
+  {
+    "FakeObject.fakeMethodWithComplexFakeObject": [
+      {
+        "arg0": {
+          "id": "idMock"
+        }
+      }
+    ]
+  },
+  {
+    "FakeObject.fakeMethodWithComplexFakeObject": [
+      {
+        "arg0": {
+          "id": "idMock",
+          "name": "nameMock"
+        }
+      }
+    ]
+  }
+]
+
+
+io.github.jsonSnapshot.SnapshotUtilsTest.shouldExtractArgsFromFakeMethod=[
   {
     "FakeObject.fakeMethod": [
       {