fix B2Json tests

Author: fishercoder1534

src/test/b2SdkExamples/B2JsonTest.java

@@ -4,9 +4,7 @@
 import com.backblaze.b2.json.B2JsonException;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import org.json.JSONArray;
 import org.json.JSONException;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 
@@ -162,7 +160,7 @@ private static class TestResponse {
         public final LocalDate localDate;
 
         @B2Json.required
-        public final Map<Integer, Map<String, BigDecimal>> revenueMap;
+        public final Map<String, Map<String, BigDecimal>> revenueMap;
 
         @B2Json.required
         public final Map<String, Long> simpleMap;
@@ -183,7 +181,7 @@ private static class TestResponse {
                 "categories"
         )
         public TestResponse(String str, String message, String reason, boolean succeeded, int status, LocalDateTime localDateTime, LocalDate localDate,
-                            Map<Integer, Map<String, BigDecimal>> revenueMap,
+                            Map<String, Map<String, BigDecimal>> revenueMap,
                             Map<String, Long> simpleMap,
                             Set<String> categories) {
             this.str = str;
@@ -199,44 +197,44 @@ public TestResponse(String str, String message, String reason, boolean succeeded
         }
     }
 
-//    @Test
-//    public void testResponseUsingB2Json() throws B2JsonException, JSONException {
-//        Map<String, Map<String, BigDecimal>> revenueMap = new TreeMap<>();
-//        Map<String, Long> simpleMap = new TreeMap<>();
-//        TestResponse obj = new TestResponse("str",
-//                "message",
-//                "reason",
-//                true,
-//                200,
-//                LocalDateTime.of(2023, 03, 31, 12, 21),
-//                LocalDate.of(2023, 03, 31),
-//                revenueMap,
-//                simpleMap,
-//                Set.of("test"));
-//        System.out.println("obj is: " + obj);
-//        String expected = "{\n" +
-//                "  \"categories\": [\n" +
-//                "    \"test\"\n" +
-//                "  ],\n" +
-//                "  \"localDate\": \"20230331\",\n" +
-//                "  \"localDateTime\": \"d20230331_m122100\",\n" +
-//                "  \"message\": \"message\",\n" +
-//                "  \"reason\": \"reason\",\n" +
-//                "  \"revenueMap\": {},\n" +
-//                "  \"simpleMap\": {},\n" +
-//                "  \"status\": 200,\n" +
-//                "  \"str\": \"str\",\n" +
-//                "  \"succeeded\": true\n" +
-//                "}";
-//        System.out.println("b2Json.toJson(obj): " + b2Json.toJson(obj));
-//        JSONAssert.assertEquals(expected, b2Json.toJson(obj), true);
-//    }
+    @Test
+    public void testResponseUsingB2Json() throws B2JsonException, JSONException {
+        Map<String, Map<String, BigDecimal>> revenueMap = new TreeMap<>();
+        Map<String, Long> simpleMap = new TreeMap<>();
+        TestResponse obj = new TestResponse("str",
+                "message",
+                "reason",
+                true,
+                200,
+                LocalDateTime.of(2023, 03, 31, 12, 21),
+                LocalDate.of(2023, 03, 31),
+                revenueMap,
+                simpleMap,
+                Set.of("test1", "test2"));
+        System.out.println("obj is: " + obj);
+        String expected = "{\n" +
+                "  \"categories\": [\n" +
+                "    \"test1\",\n" +
+                "    \"test2\"\n" +
+                "  ],\n" +
+                "  \"localDate\": \"20230331\",\n" +
+                "  \"localDateTime\": \"d20230331_m122100\",\n" +
+                "  \"message\": \"message\",\n" +
+                "  \"reason\": \"reason\",\n" +
+                "  \"revenueMap\": {},\n" +
+                "  \"simpleMap\": {},\n" +
+                "  \"status\": 200,\n" +
+                "  \"str\": \"str\",\n" +
+                "  \"succeeded\": true\n" +
+                "}";
+        System.out.println("b2Json.toJson(obj): " + b2Json.toJson(obj));
+        JSONAssert.assertEquals(expected, b2Json.toJson(obj), true);
+    }
 
     @Test
-    @Ignore
     public void testResponseUsingGson() throws JSONException {
-        Map<Integer, Map<String, BigDecimal>> revenueMap = new TreeMap<>();
-        revenueMap.put(123, new HashMap<>());
+        Map<String, Map<String, BigDecimal>> revenueMap = new TreeMap<>();
+        revenueMap.put("123", new HashMap<>());
         Map<String, Long> simpleMap = new TreeMap<>();
         TestResponse obj = new TestResponse("str",
                 "message",
@@ -248,7 +246,6 @@ public void testResponseUsingGson() throws JSONException {
                 revenueMap,
                 simpleMap,
                 Set.of("test"));
-        System.out.println("obj is: " + obj);
         String expected = "{\n" +
                 "  \"str\": \"str\",\n" +
                 "  \"message\": \"message\",\n" +
@@ -273,13 +270,14 @@ public void testResponseUsingGson() throws JSONException {
                 "    \"month\": 3,\n" +
                 "    \"day\": 31\n" +
                 "  },\n" +
-                "  \"revenueMap\": {},\n" +
+                "  \"revenueMap\": {\n" +
+                "    \"123\": {}\n" +
+                "  },\n" +
                 "  \"simpleMap\": {},\n" +
                 "  \"categories\": [\n" +
                 "    \"test\"\n" +
                 "  ]\n" +
                 "}";
-        System.out.println("b2Json.toJson(obj): " + gson.toJson(obj));
         JSONAssert.assertEquals(expected, gson.toJson(obj), true);
     }