Skip to content

Simplify several assertions in MapUtilsTest. #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kinow merged 1 commit into from
Apr 18, 2020
Merged

Simplify several assertions in MapUtilsTest. #150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 39 additions & 39 deletions src/test/java/org/apache/commons/collections4/MapUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ public void testInvertMap() {
final Set<String> outKeySet = new HashSet<>(out.keySet());
final Set<String> outValSet = new HashSet<>(out.values());

assertTrue( inKeySet.equals( outValSet ));
assertTrue( inValSet.equals( outKeySet ));
assertEquals(inKeySet, outValSet);
assertEquals(inValSet, outKeySet);

assertEquals( "1", out.get("A"));
assertEquals( "2", out.get("B"));
Expand Down Expand Up @@ -178,11 +178,11 @@ public void testPutAll_Map_array() {
{"GREEN", "#00FF00"},
{"BLUE", "#0000FF"}
});
assertEquals(true, test.containsKey("RED"));
assertTrue(test.containsKey("RED"));
assertEquals("#FF0000", test.get("RED"));
assertEquals(true, test.containsKey("GREEN"));
assertTrue(test.containsKey("GREEN"));
assertEquals("#00FF00", test.get("GREEN"));
assertEquals(true, test.containsKey("BLUE"));
assertTrue(test.containsKey("BLUE"));
assertEquals("#0000FF", test.get("BLUE"));
assertEquals(3, test.size());

Expand Down Expand Up @@ -219,11 +219,11 @@ public void testPutAll_Map_array() {
"GREEN", "#00FF00",
"BLUE", "#0000FF"
});
assertEquals(true, test.containsKey("RED"));
assertTrue(test.containsKey("RED"));
assertEquals("#FF0000", test.get("RED"));
assertEquals(true, test.containsKey("GREEN"));
assertTrue(test.containsKey("GREEN"));
assertEquals("#00FF00", test.get("GREEN"));
assertEquals(true, test.containsKey("BLUE"));
assertTrue(test.containsKey("BLUE"));
assertEquals("#0000FF", test.get("BLUE"));
assertEquals(3, test.size());

Expand All @@ -233,11 +233,11 @@ public void testPutAll_Map_array() {
"BLUE", "#0000FF",
"PURPLE" // ignored
});
assertEquals(true, test.containsKey("RED"));
assertTrue(test.containsKey("RED"));
assertEquals("#FF0000", test.get("RED"));
assertEquals(true, test.containsKey("GREEN"));
assertTrue(test.containsKey("GREEN"));
assertEquals("#00FF00", test.get("GREEN"));
assertEquals(true, test.containsKey("BLUE"));
assertTrue(test.containsKey("BLUE"));
assertEquals("#0000FF", test.get("BLUE"));
assertEquals(3, test.size());

Expand All @@ -250,11 +250,11 @@ public void testPutAll_Map_array() {
new DefaultMapEntry<>("GREEN", "#00FF00"),
new DefaultMapEntry<>("BLUE", "#0000FF")
});
assertEquals(true, test.containsKey("RED"));
assertTrue(test.containsKey("RED"));
assertEquals("#FF0000", test.get("RED"));
assertEquals(true, test.containsKey("GREEN"));
assertTrue(test.containsKey("GREEN"));
assertEquals("#00FF00", test.get("GREEN"));
assertEquals(true, test.containsKey("BLUE"));
assertTrue(test.containsKey("BLUE"));
assertEquals("#0000FF", test.get("BLUE"));
assertEquals(3, test.size());

Expand All @@ -264,11 +264,11 @@ public void testPutAll_Map_array() {
new DefaultKeyValue<>("GREEN", "#00FF00"),
new DefaultKeyValue<>("BLUE", "#0000FF")
});
assertEquals(true, test.containsKey("RED"));
assertTrue(test.containsKey("RED"));
assertEquals("#FF0000", test.get("RED"));
assertEquals(true, test.containsKey("GREEN"));
assertTrue(test.containsKey("GREEN"));
assertEquals("#00FF00", test.get("GREEN"));
assertEquals(true, test.containsKey("BLUE"));
assertTrue(test.containsKey("BLUE"));
assertEquals("#0000FF", test.get("BLUE"));
assertEquals(3, test.size());
}
Expand Down Expand Up @@ -301,7 +301,7 @@ public Object[][] getContents() {

final Map<String, Object> out = MapUtils.toMap(b);

assertTrue( in.equals(out));
assertEquals(in, out);
}

@Test
Expand Down Expand Up @@ -745,39 +745,39 @@ public void testEmptyIfNull() {
@Test
public void testIsEmptyWithEmptyMap() {
final Map<Object, Object> map = new HashMap<>();
assertEquals(true, MapUtils.isEmpty(map));
assertTrue(MapUtils.isEmpty(map));
}

@Test
public void testIsEmptyWithNonEmptyMap() {
final Map<String, String> map = new HashMap<>();
map.put("item", "value");
assertEquals(false, MapUtils.isEmpty(map));
assertFalse(MapUtils.isEmpty(map));
}

@Test
public void testIsEmptyWithNull() {
final Map<Object, Object> map = null;
assertEquals(true, MapUtils.isEmpty(map));
assertTrue(MapUtils.isEmpty(map));
}

@Test
public void testIsNotEmptyWithEmptyMap() {
final Map<Object, Object> map = new HashMap<>();
assertEquals(false, MapUtils.isNotEmpty(map));
assertFalse(MapUtils.isNotEmpty(map));
}

@Test
public void testIsNotEmptyWithNonEmptyMap() {
final Map<String, String> map = new HashMap<>();
map.put("item", "value");
assertEquals(true, MapUtils.isNotEmpty(map));
assertTrue(MapUtils.isNotEmpty(map));
}

@Test
public void testIsNotEmptyWithNull() {
final Map<Object, Object> map = null;
assertEquals(false, MapUtils.isNotEmpty(map));
assertFalse(MapUtils.isNotEmpty(map));
}

@Test
Expand All @@ -798,9 +798,9 @@ public void testPopulateMap() {
assertEquals(list.size(), map.size());

for (int i = 0; i < list.size(); i++) {
assertEquals(true, map.containsKey(Integer.valueOf(list.get(i))));
assertEquals(false, map.containsKey(list.get(i)));
assertEquals(true, map.containsValue(list.get(i)));
assertTrue(map.containsKey(Integer.valueOf(list.get(i))));
assertFalse(map.containsKey(list.get(i)));
assertTrue(map.containsValue(list.get(i)));
assertEquals(list.get(i), map.get(Integer.valueOf(list.get(i))));
}

Expand All @@ -810,9 +810,9 @@ public void testPopulateMap() {

assertEquals(list.size(), map.size());
for (int i = 0; i < list.size(); i++) {
assertEquals(true, map.containsKey(Integer.valueOf(list.get(i))));
assertEquals(false, map.containsKey(list.get(i)));
assertEquals(true, map.containsValue(Integer.valueOf(list.get(i))));
assertTrue(map.containsKey(Integer.valueOf(list.get(i))));
assertFalse(map.containsKey(list.get(i)));
assertTrue(map.containsValue(Integer.valueOf(list.get(i))));
assertEquals(Integer.valueOf(list.get(i)), map.get(Integer.valueOf(list.get(i))));
}
}
Expand Down Expand Up @@ -851,8 +851,8 @@ public void testPopulateMultiMap() {
assertEquals(list.size(), map.totalSize());

for (int i = 0; i < list.size(); i++) {
assertEquals(true, map.containsKey(list.get(i).key));
assertEquals(true, map.containsValue(list.get(i)));
assertTrue(map.containsKey(list.get(i).key));
assertTrue(map.containsValue(list.get(i)));
}
}

Expand Down Expand Up @@ -1110,7 +1110,7 @@ public void testgetString() {

assertEquals("str", MapUtils.getString(in, "key", "defualt"));
assertEquals("str", MapUtils.getString(in, "key"));
assertEquals(null, MapUtils.getString(null, "key"));
assertNull(MapUtils.getString(null, "key"));
assertEquals("default", MapUtils.getString(in, "noKey", "default"));
assertEquals("default", MapUtils.getString(in, "noKey", key -> {
if ("noKey".equals(key)) {
Expand All @@ -1130,7 +1130,7 @@ public void testgetObject() {

assertEquals("str", MapUtils.getObject(in, "key", "defualt"));
assertEquals("str", MapUtils.getObject(in, "key"));
assertEquals(null, MapUtils.getObject(null, "key"));
assertNull(MapUtils.getObject(null, "key"));
assertEquals("default", MapUtils.getObject(in, "noKey", "default"));
assertEquals("default", MapUtils.getObject(null, "noKey", "default"));
}
Expand All @@ -1152,7 +1152,7 @@ public void testgetBooleanValue() {
assertTrue(MapUtils.getBooleanValue(in, "noKey", key -> {
return true;
}));
assertTrue(!MapUtils.getBooleanValue(in, "noKey"));
assertFalse(MapUtils.getBooleanValue(in, "noKey"));
assertTrue(MapUtils.getBoolean(in, "key", true));
assertTrue(MapUtils.getBoolean(in, "noKey", true));
assertTrue(MapUtils.getBoolean(in, "noKey", key -> {
Expand All @@ -1167,7 +1167,7 @@ public void testgetBooleanValue() {
assertFalse(MapUtils.getBooleanValue(in, "noKey", key -> {
return null;
}));
assertEquals(null, MapUtils.getBoolean(null, "noKey"));
assertNull(MapUtils.getBoolean(null, "noKey"));
// Values are Numbers
assertFalse(MapUtils.getBoolean(in, "keyNumberFalse"));
assertTrue(MapUtils.getBoolean(in, "keyNumberTrue"));
Expand All @@ -1192,9 +1192,9 @@ public void testgetMap() {
final Map<?, ?> outValue = MapUtils.getMap(in, "key1", (Map<?, ?>) null);

assertEquals("value1", outValue.get("key1"));
assertEquals(null, outValue.get("key2"));
assertEquals(null, MapUtils.getMap(in, "key2", (Map<?, ?>) null));
assertEquals(null, MapUtils.getMap(null, "key2", (Map<?, ?>) null));
assertNull(outValue.get("key2"));
assertNull(MapUtils.getMap(in, "key2", (Map<?, ?>) null));
assertNull(MapUtils.getMap(null, "key2", (Map<?, ?>) null));
}

@Test
Expand Down