Skip to content

Commit

Permalink
stleary#861 replace assertTrue with assertEquals
Browse files Browse the repository at this point in the history
  • Loading branch information
@Simulant87
Simulant87 committed Feb 22, 2024
1 parent 77c899d commit 46142d9
Showing 1 changed file with 26 additions and 26 deletions.
52 changes: 26 additions & 26 deletions src/test/java/org/json/junit/CookieListTest.java
View file
Expand Up @@ -81,8 +81,8 @@ public void simpleCookieList() {
JSONObject jsonObject = CookieList.toJSONObject(cookieStr);
// validate JSON content
Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
assertTrue("Expected 1 top level item", ((Map<?,?>)(JsonPath.read(doc, "$"))).size() == 1);
assertTrue("expected 31d4d96e407aad42", "31d4d96e407aad42".equals(jsonObject.query("/SID")));
assertEquals("Expected 1 top level item", 1, ((Map<?, ?>) (JsonPath.read(doc, "$"))).size());
assertEquals("expected 31d4d96e407aad42 for key SID", "31d4d96e407aad42", jsonObject.query("/SID"));
}

/**
Expand All @@ -94,8 +94,8 @@ public void simpleCookieListWithDelimiter() {
JSONObject jsonObject = CookieList.toJSONObject(cookieStr);
// validate JSON content
Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
assertTrue("Expected 1 top level item", ((Map<?,?>)(JsonPath.read(doc, "$"))).size() == 1);
assertTrue("expected 31d4d96e407aad42", "31d4d96e407aad42".equals(jsonObject.query("/SID")));
assertEquals("Expected 1 top level item", 1, ((Map<?, ?>) (JsonPath.read(doc, "$"))).size());
assertEquals("expected 31d4d96e407aad42 for key SID", "31d4d96e407aad42", jsonObject.query("/SID"));
}

/**
Expand All @@ -114,13 +114,13 @@ public void multiPartCookieList() {
JSONObject jsonObject = CookieList.toJSONObject(cookieStr);
// validate JSON content
Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
assertTrue("Expected 6 top level items", ((Map<?,?>)(JsonPath.read(doc, "$"))).size() == 6);
assertTrue("expected myCookieValue1", "myCookieValue1".equals(jsonObject.query("/name1")));
assertTrue("expected myCookieValue2", "myCookieValue2".equals(jsonObject.query("/name2")));
assertTrue("expected myCookieValue3", "myCookieValue3".equals(jsonObject.query("/name3")));
assertTrue("expected myCookieValue4", "myCookieValue4".equals(jsonObject.query("/name4")));
assertTrue("expected myCookieValue5", "myCookieValue5".equals(jsonObject.query("/name5")));
assertTrue("expected myCookieValue6", "myCookieValue6".equals(jsonObject.query("/name6")));
assertEquals("Expected 6 top level items", 6, ((Map<?, ?>) (JsonPath.read(doc, "$"))).size());
assertEquals("expected myCookieValue1 for key name1", "myCookieValue1", jsonObject.query("/name1"));
assertEquals("expected myCookieValue2 for key name2", "myCookieValue2", jsonObject.query("/name2"));
assertEquals("expected myCookieValue3 for key name3", "myCookieValue3", jsonObject.query("/name3"));
assertEquals("expected myCookieValue4 for key name4", "myCookieValue4", jsonObject.query("/name4"));
assertEquals("expected myCookieValue5 for key name5", "myCookieValue5", jsonObject.query("/name5"));
assertEquals("expected myCookieValue6 for key name6", "myCookieValue6", jsonObject.query("/name6"));
}

/**
Expand All @@ -131,7 +131,7 @@ public void convertCookieListWithNullValueToString() {
JSONObject jsonObject = new JSONObject();
jsonObject.put("key", JSONObject.NULL);
String cookieToStr = CookieList.toString(jsonObject);
assertTrue("toString() should be empty", "".equals(cookieToStr));
assertEquals("toString() should be empty", "", cookieToStr);
}

/**
Expand All @@ -154,13 +154,13 @@ public void convertCookieListToString() {

// validate JSON content
Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
assertTrue("Expected 6 top level items", ((Map<?,?>)(JsonPath.read(doc, "$"))).size() == 6);
assertTrue("expected myCookieValue1", "myCookieValue1".equals(jsonObject.query("/name1")));
assertTrue("expected myCookieValue2", "myCookieValue2".equals(jsonObject.query("/name2")));
assertTrue("expected myCookieValue3", "myCookieValue3".equals(jsonObject.query("/name3")));
assertTrue("expected myCookieValue4", "myCookieValue4".equals(jsonObject.query("/name4")));
assertTrue("expected myCookieValue5", "myCookieValue5".equals(jsonObject.query("/name5")));
assertTrue("expected myCookieValue6", "myCookieValue6".equals(jsonObject.query("/name6")));
assertEquals("Expected 6 top level items", 6, ((Map<?, ?>) (JsonPath.read(doc, "$"))).size());
assertEquals("expected myCookieValue1 for key name1", "myCookieValue1", jsonObject.query("/name1"));
assertEquals("expected myCookieValue2 for key name2", "myCookieValue2", jsonObject.query("/name2"));
assertEquals("expected myCookieValue3 for key name3", "myCookieValue3", jsonObject.query("/name3"));
assertEquals("expected myCookieValue4 for key name4", "myCookieValue4", jsonObject.query("/name4"));
assertEquals("expected myCookieValue5 for key name5", "myCookieValue5", jsonObject.query("/name5"));
assertEquals("expected myCookieValue6 for key name6", "myCookieValue6", jsonObject.query("/name6"));
}

/**
Expand All @@ -179,12 +179,12 @@ public void convertEncodedCookieListToString() {
JSONObject jsonObject = CookieList.toJSONObject(cookieStr);
// validate JSON content
Object doc = Configuration.defaultConfiguration().jsonProvider().parse(jsonObject.toString());
assertTrue("Expected 6 top level items", ((Map<?,?>)(JsonPath.read(doc, "$"))).size() == 6);
assertTrue("expected myCookieValue1", "myCookieValue1".equals(jsonObject.query("/name1")));
assertTrue("expected my Cookie Value 2", "my Cookie Value 2".equals(jsonObject.query("/name2")));
assertTrue("expected my+Cookie&Value;3=", "my+Cookie&Value;3=".equals(jsonObject.query("/name3")));
assertTrue("expected my%CookieValue4", "my%CookieValue4".equals(jsonObject.query("/name4")));
assertTrue("expected my%CookieValue5", "myCookieValue5".equals(jsonObject.query("/name5")));
assertTrue("expected myCookieValue6", "myCookieValue6".equals(jsonObject.query("/name6")));
assertEquals("Expected 6 top level items", 6, ((Map<?, ?>) (JsonPath.read(doc, "$"))).size());
assertEquals("expected myCookieValue1 for key name1", "myCookieValue1", jsonObject.query("/name1"));
assertEquals("expected my Cookie Value 2 for key name2", "my Cookie Value 2", jsonObject.query("/name2"));
assertEquals("expected my+Cookie&Value;3= for key name3", "my+Cookie&Value;3=", jsonObject.query("/name3"));
assertEquals("expected my%CookieValue4 for key name4", "my%CookieValue4", jsonObject.query("/name4"));
assertEquals("expected my%CookieValue5 for key name5", "myCookieValue5", jsonObject.query("/name5"));
assertEquals("expected myCookieValue6 for key name6", "myCookieValue6", jsonObject.query("/name6"));
}
}

0 comments on commit 46142d9

Please sign in to comment.