Skip to content

Commit

Permalink
a reformat code
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Sep 29, 2022
1 parent 126c8fd commit cc1637d
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 22 deletions.
31 changes: 16 additions & 15 deletions 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;
}
}
Expand Up @@ -14,7 +14,6 @@ public void testGsonCircular()
JsonApprovals.verifyAsJson(Circular.getIndirectCircularReference());
});
}

@Test
public void testBasicFormatting()
{
Expand Down
Expand Up @@ -17,5 +17,4 @@ public void testBasicFormatting()
c.parent = c;
JsonXstreamApprovals.verifyAsJson(c);
}

}
11 changes: 8 additions & 3 deletions approvaltests-util/src/main/java/com/spun/util/JsonUtils.java
Expand Up @@ -41,13 +41,18 @@ public static <T> String asJsonWithBuilder(Object o, Function1<T, T> gsonBuilder
}
public static <T> String asJson(Object o, Function1<GsonBuilder, GsonBuilder> 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)
Expand Down
Expand Up @@ -29,7 +29,7 @@ public static void verifyAsJson(Object o, Function1<GsonBuilder, GsonBuilder> gs
}
public static void verifyAsJson(Object o, Function1<GsonBuilder, GsonBuilder> 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)
Expand Down
Expand Up @@ -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);
}
}

0 comments on commit cc1637d

Please sign in to comment.