diff --git a/approvaltests-tests/src/test/java/org/approvaltests/Circular.java b/approvaltests-tests/src/test/java/org/approvaltests/Circular.java index b5636e4a..4c79b316 100644 --- a/approvaltests-tests/src/test/java/org/approvaltests/Circular.java +++ b/approvaltests-tests/src/test/java/org/approvaltests/Circular.java @@ -1,18 +1,19 @@ package org.approvaltests; -public class Circular { - Circular parent; - String label; - - public Circular(Circular parent, String label) { - this.parent = parent; - this.label = label; - } - - public static Circular getIndirectCircularReference() { - Circular level1 = new Circular(null, "middle"); - Circular level2 = new Circular(level1, "child"); - level1.parent = level2; - return level1; - } +public class Circular +{ + Circular parent; + String label; + public Circular(Circular parent, String label) + { + this.parent = parent; + this.label = label; + } + public static Circular getIndirectCircularReference() + { + Circular level1 = new Circular(null, "middle"); + Circular level2 = new Circular(level1, "child"); + level1.parent = level2; + return level1; + } } diff --git a/approvaltests-tests/src/test/java/org/approvaltests/JsonFormattingTest.java b/approvaltests-tests/src/test/java/org/approvaltests/JsonFormattingTest.java index 45466a60..74d2e9ee 100644 --- a/approvaltests-tests/src/test/java/org/approvaltests/JsonFormattingTest.java +++ b/approvaltests-tests/src/test/java/org/approvaltests/JsonFormattingTest.java @@ -14,7 +14,6 @@ public void testGsonCircular() JsonApprovals.verifyAsJson(Circular.getIndirectCircularReference()); }); } - @Test public void testBasicFormatting() { diff --git a/approvaltests-tests/src/test/java/org/approvaltests/JsonXstreamApprovalTest.java b/approvaltests-tests/src/test/java/org/approvaltests/JsonXstreamApprovalTest.java index d164077c..faa184c2 100644 --- a/approvaltests-tests/src/test/java/org/approvaltests/JsonXstreamApprovalTest.java +++ b/approvaltests-tests/src/test/java/org/approvaltests/JsonXstreamApprovalTest.java @@ -17,5 +17,4 @@ public void testBasicFormatting() c.parent = c; JsonXstreamApprovals.verifyAsJson(c); } - } diff --git a/approvaltests-util/src/main/java/com/spun/util/JsonUtils.java b/approvaltests-util/src/main/java/com/spun/util/JsonUtils.java index 20068fc3..9c506770 100644 --- a/approvaltests-util/src/main/java/com/spun/util/JsonUtils.java +++ b/approvaltests-util/src/main/java/com/spun/util/JsonUtils.java @@ -41,13 +41,18 @@ public static String asJsonWithBuilder(Object o, Function1 gsonBuilder } public static String asJson(Object o, Function1 gsonBuilder) { - try { + try + { GsonBuilder builder = new GsonBuilder().setPrettyPrinting(); builder = addHandlingForDateObjects(builder); Gson gson = gsonBuilder.call(builder).create(); return gson.toJson(o); - } catch (StackOverflowError e) { - throw new RuntimeException("Circular reference found.\nGson does not handle circular references.\nConsider:\n 1. Using XStream (JsonXstreamApprovals)\n 2. Remove the circular reference.", e); + } + catch (StackOverflowError e) + { + throw new RuntimeException( + "Circular reference found.\nGson does not handle circular references.\nConsider:\n 1. Using XStream (JsonXstreamApprovals)\n 2. Remove the circular reference.", + e); } } private static GsonBuilder addHandlingForDateObjects(GsonBuilder builder) diff --git a/approvaltests/src/main/java/org/approvaltests/JsonApprovals.java b/approvaltests/src/main/java/org/approvaltests/JsonApprovals.java index 4b58b279..a8a1e950 100644 --- a/approvaltests/src/main/java/org/approvaltests/JsonApprovals.java +++ b/approvaltests/src/main/java/org/approvaltests/JsonApprovals.java @@ -29,7 +29,7 @@ public static void verifyAsJson(Object o, Function1 gs } public static void verifyAsJson(Object o, Function1 gsonBuilder, Options options) { - Approvals.verify(JsonUtils.asJson(o, gsonBuilder), options.forFile().withExtension(".json")); + Approvals.verify(JsonUtils.asJson(o, gsonBuilder), options.forFile().withExtension(".json")); } // begin-snippet: verify_as_json public static void verifyAsJson(Object o, Options options) diff --git a/approvaltests/src/main/java/org/approvaltests/JsonXstreamApprovals.java b/approvaltests/src/main/java/org/approvaltests/JsonXstreamApprovals.java index ec4788e0..9f0ec629 100644 --- a/approvaltests/src/main/java/org/approvaltests/JsonXstreamApprovals.java +++ b/approvaltests/src/main/java/org/approvaltests/JsonXstreamApprovals.java @@ -21,7 +21,7 @@ public static void verifyAsJson(Object o, Options options) } public static String asJson(Object o) { - XStream xstream = new XStream(new JsonHierarchicalStreamDriver()); + XStream xstream = new XStream(new JsonHierarchicalStreamDriver()); return xstream.toXML(o); } }