! F Added reorder field option to JsonApprovals.verifyJson

Author: ScottBob

approvaltests-tests/src/test/java/org/approvaltests/DocumentHelpersTest.listAllVerifyFunctions.approved.md

@@ -50,8 +50,9 @@
  * CombinationApprovals. [verifyBestCoveringPairs ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/combinations/CombinationApprovals.java#L290-L293) (Function7,Object[],Object[],Object[],Object[],Object[],Object[],Object[])  
  * CombinationApprovals. [verifyBestCoveringPairs ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/combinations/CombinationApprovals.java#L308-L311) (Function8,Object[],Object[],Object[],Object[],Object[],Object[],Object[],Object[])  
  * CombinationApprovals. [verifyBestCoveringPairs ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/combinations/CombinationApprovals.java#L326-L329) (Function9,Object[],Object[],Object[],Object[],Object[],Object[],Object[],Object[],Object[])  
- * JsonApprovals. [verifyAsJson ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/JsonApprovals.java#L26-L29) (Object)  
- * JsonApprovals. [verifyAsJson ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/JsonApprovals.java#L30-L33) (Object,Function1)  
+ * JsonApprovals. [verifyAsJson ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/JsonApprovals.java#L35-L38) (Object)  
+ * JsonApprovals. [verifyAsJson ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/JsonApprovals.java#L39-L42) (Object,Function1)  
  * JsonApprovals. [verifyJson ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/JsonApprovals.java#L18-L21) (String)  
+ * JsonApprovals. [verifyJson ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/JsonApprovals.java#L26-L29) (String,boolean)  
  * JsonJacksonApprovals. [verifyAsJson ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/JsonJacksonApprovals.java#L10-L13) (Object)  
  * VelocityApprovals. [verify ](https://github.com/approvals/ApprovalTests.Java/blob/master/approvaltests/src/main/java/org/approvaltests/velocity/VelocityApprovals.java#L16-L19) (ContextAware)  

approvaltests-tests/src/test/java/org/approvaltests/JsonFormattingTest.java

@@ -64,15 +64,8 @@ public void testJsonFieldOrdering()
     Approvals.settings().allowMultipleVerifyCallsForThisMethod();
     String json1 = "{\"infos\":{\"address\":\"my address\",\"phone\":\"my phone\"},\"insurance\":{\"forks\":[14,53,123],\"prices\":[5,8,\"3%\"]}}";
     String json2 = "{\"insurance\":{\"forks\":[14,53,123],\"prices\":[5,8,\"3%\"]},\"infos\":{\"phone\":\"my phone\",\"address\":\"my address\"}}";
-//    JsonApprovals.verifyJson(json1);
-//    JsonApprovals.verifyJson(json2);
-//
-//    JsonApprovals.verifyOrderedJson(json1);
-//    JsonApprovals.verifyOrderedJson(json2);
-//
-//    JsonApprovals.verifyJson(json1, true);
-//    JsonApprovals.verifyJson(json2, true);
-
+    JsonApprovals.verifyJson(json1, true);
+    JsonApprovals.verifyJson(json2, true);
     JsonApprovals.verifyJson(JsonUtils.reorderFields(json1));
     JsonApprovals.verifyJson(JsonUtils.reorderFields(json2));
   }

approvaltests-util/src/main/java/com/spun/util/JsonUtils.java

@@ -65,34 +65,35 @@ private static GsonBuilder addHandlingForDateObjects(GsonBuilder builder)
     builder = builder.registerTypeAdapter(LocalDateTime.class, new LocalDateTimeAdapter());
     return builder;
   }
-
-  public static String reorderFields(String json) {
+  public static String reorderFields(String json)
+  {
     JsonObject sortedJsonObject = sortJsonObject(json);
     return asJson(sortedJsonObject);
   }
-
-  public static JsonObject sortJsonObject(String json) {
+  public static JsonObject sortJsonObject(String json)
+  {
     JsonObject jsonObject = JsonParser.parseString(json).getAsJsonObject();
     return sortJsonObjectFields(jsonObject);
   }
-
-  public static JsonObject sortJsonObjectFields(JsonObject jsonObject) {
+  public static JsonObject sortJsonObjectFields(JsonObject jsonObject)
+  {
     JsonObject sortedJsonObject = new JsonObject();
     Map<String, JsonElement> sortedFirstLevelFields = jsonObject.entrySet().stream()
-            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> b, TreeMap::new));
-
-    for (Map.Entry<String, JsonElement> entry : sortedFirstLevelFields.entrySet()) {
+        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> b, TreeMap::new));
+    for (Map.Entry<String, JsonElement> entry : sortedFirstLevelFields.entrySet())
+    {
       JsonElement element = entry.getValue();
-      if (element.isJsonObject()) {
+      if (element.isJsonObject())
+      {
         sortedJsonObject.add(entry.getKey(), sortJsonObjectFields(element.getAsJsonObject()));
-      } else {
+      }
+      else
+      {
         sortedJsonObject.add(entry.getKey(), element);
       }
     }
-
     return sortedJsonObject;
   }
-
   public static class InstantAdapter extends TypeAdapter<Instant>
   {
     @Override

approvaltests/src/main/java/org/approvaltests/JsonApprovals.java

@@ -17,7 +17,16 @@ public static void verifyJson(String json)
   }
   public static void verifyJson(String json, Options options)
   {
-    Approvals.verify(JsonUtils.prettyPrint(json), options.forFile().withExtension(".json"));
+    verifyJson(json, false, options);
+  }
+  public static void verifyJson(String json, boolean reorderJson)
+  {
+    verifyJson(json, reorderJson, new Options());
+  }
+  public static void verifyJson(String json, boolean reorderJson, Options options)
+  {
+    String formattedJson = reorderJson ? JsonUtils.reorderFields(json) : JsonUtils.prettyPrint(json);
+    Approvals.verify(formattedJson, options.forFile().withExtension(".json"));
   }
   public static void verifyAsJson(Object o)
   {