Format & clean up source code

1 files changed, 21 insertions, 36 deletions

diff --git a/src/test/java/sevenUnits/utils/ConditionalExistenceCollectionsTest.java b/src/test/java/sevenUnits/utils/ConditionalExistenceCollectionsTest.java
index ea96574..f203fad 100644
--- a/src/test/java/sevenUnits/utils/ConditionalExistenceCollectionsTest.java
+++ b/src/test/java/sevenUnits/utils/ConditionalExistenceCollectionsTest.java
@@ -23,7 +23,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -38,7 +37,7 @@ import sevenUnits.utils.ConditionalExistenceCollections.ConditionalExistenceIter
  * normal operations on conditional existence collections and ensures that
  * elements that do not pass the existence condition are not included in the
  * results.
- * 
+ *
  * @author Adrien Hopkins
  * @since 2019-10-16
  * @since v0.3.0
@@ -47,22 +46,22 @@ class ConditionalExistenceCollectionsTest {
 
 	/**
 	 * The returned iterator ignores elements that don't start with "a".
-	 * 
+	 *
 	 * @return test iterator
 	 * @since 2019-10-17
 	 * @since v0.3.0
 	 */
 	ConditionalExistenceIterator<String> getTestIterator() {
 		final List<String> items = Arrays.asList("aa", "ab", "ba");
-		final Iterator<String> it = items.iterator();
-		final ConditionalExistenceIterator<String> cit = (ConditionalExistenceIterator<String>) ConditionalExistenceCollections
+		final var it = items.iterator();
+		final var cit = (ConditionalExistenceIterator<String>) ConditionalExistenceCollections
 				.conditionalExistenceIterator(it, s -> s.startsWith("a"));
 		return cit;
 	}
 
 	/**
 	 * The returned map ignores mappings where the value is zero.
-	 * 
+	 *
 	 * @return map to be used for test data
 	 * @since 2019-10-16
 	 * @since v0.3.0
@@ -79,59 +78,49 @@ class ConditionalExistenceCollectionsTest {
 		return conditionalMap;
 	}
 
-	/**
-	 * Test method for the ConditionalExistenceMap's containsKey method.
-	 */
+	/** Test method for the ConditionalExistenceMap's containsKey method. */
 	@Test
 	void testContainsKeyObject() {
-		final Map<String, Integer> map = this.getTestMap();
+		final var map = this.getTestMap();
 		assertTrue(map.containsKey("one"));
 		assertTrue(map.containsKey("ten"));
 		assertFalse(map.containsKey("five"));
 		assertFalse(map.containsKey("zero"));
 	}
 
-	/**
-	 * Test method for the ConditionalExistenceMap's containsValue method.
-	 */
+	/** Test method for the ConditionalExistenceMap's containsValue method. */
 	@Test
 	void testContainsValueObject() {
-		final Map<String, Integer> map = this.getTestMap();
+		final var map = this.getTestMap();
 		assertTrue(map.containsValue(1));
 		assertTrue(map.containsValue(10));
 		assertFalse(map.containsValue(5));
 		assertFalse(map.containsValue(0));
 	}
 
-	/**
-	 * Test method for the ConditionalExistenceMap's entrySet method.
-	 */
+	/** Test method for the ConditionalExistenceMap's entrySet method. */
 	@Test
 	void testEntrySet() {
-		final Map<String, Integer> map = this.getTestMap();
+		final var map = this.getTestMap();
 		for (final Entry<String, Integer> e : map.entrySet()) {
 			assertTrue(e.getValue() != 0);
 		}
 	}
 
-	/**
-	 * Test method for the ConditionalExistenceMap's get method.
-	 */
+	/** Test method for the ConditionalExistenceMap's get method. */
 	@Test
 	void testGetObject() {
-		final Map<String, Integer> map = this.getTestMap();
+		final var map = this.getTestMap();
 		assertEquals(1, map.get("one"));
 		assertEquals(10, map.get("ten"));
 		assertEquals(null, map.get("five"));
 		assertEquals(null, map.get("zero"));
 	}
 
-	/**
-	 * Test method for the ConditionalExistenceCollection's iterator.
-	 */
+	/** Test method for the ConditionalExistenceCollection's iterator. */
 	@Test
 	void testIterator() {
-		final ConditionalExistenceIterator<String> testIterator = this
+		final var testIterator = this
 				.getTestIterator();
 
 		assertTrue(testIterator.hasNext);
@@ -150,22 +139,18 @@ class ConditionalExistenceCollectionsTest {
 		assertThrows(NoSuchElementException.class, testIterator::next);
 	}
 
-	/**
-	 * Test method for the ConditionalExistenceMap's keySet operation.
-	 */
+	/** Test method for the ConditionalExistenceMap's keySet operation. */
 	@Test
 	void testKeySet() {
-		final Map<String, Integer> map = this.getTestMap();
-		assertFalse(map.keySet().contains("zero"));
+		final var map = this.getTestMap();
+		assertFalse(map.containsKey("zero"));
 	}
 
-	/**
-	 * Test method for the ConditionalExistenceMap's values operation.
-	 */
+	/** Test method for the ConditionalExistenceMap's values operation. */
 	@Test
 	void testValues() {
-		final Map<String, Integer> map = this.getTestMap();
-		assertFalse(map.values().contains(0));
+		final var map = this.getTestMap();
+		assertFalse(map.containsValue(0));
 	}
 
 }