Fix failing tests

2 files changed, 5 insertions, 11 deletions

diff --git a/src/test/java/bjc/funcdata/TestMapCreation.java b/src/test/java/bjc/funcdata/TestMapCreation.java
index 20dbe35..eeea591 100644
--- a/src/test/java/bjc/funcdata/TestMapCreation.java
+++ b/src/test/java/bjc/funcdata/TestMapCreation.java
@@ -33,6 +33,6 @@ public class TestMapCreation {
 		MapEx<String, String> map = MapEx.of("a", "A", "b", "B");
 		
 		assertTrue("Constructed map contains key 'a'", map.containsKey("a"));
-		assertEquals("Constructed map has key 'a' mapped to value 'A'", "A", map.get("a"));
+		assertEquals("Constructed map has key 'a' mapped to value 'A'", "A", map.get("a").get());
 	}
 }
diff --git a/src/test/java/bjc/funcdata/TestMapOperations.java b/src/test/java/bjc/funcdata/TestMapOperations.java
index d982b5e..7523d02 100644
--- a/src/test/java/bjc/funcdata/TestMapOperations.java
+++ b/src/test/java/bjc/funcdata/TestMapOperations.java
@@ -27,7 +27,7 @@ public class TestMapOperations {
 	
 	@Test
 	public void getYieldsExpectedValue() {
-		assertEquals("Constructed map has key 'a' mapped to value 'A'", "A", map.get("a"));
+		assertEquals("Constructed map has key 'a' mapped to value 'A'", "A", map.get("a").get());
 	}
 	
 	@Test
@@ -35,14 +35,8 @@ public class TestMapOperations {
 		assertFalse("Constructed map doesn't contain key 'c'", map.containsKey("c"));
 	}
 	
-	@Test(expected = IllegalArgumentException.class)
 	public void getOfNonexistentKeyThrows() {
-		map.get("c");
-	}
-	
-	@Test
-	public void getOrDefaultOfExistingKeyYieldsExistingValue() {
-		assertEquals("Constructed map getOrDefault for an existing key yields the existing value", "A", map.get("a"));
+		assertFalse("Getting a non-existant key yields an absent optional", map.get("c").isPresent());
 	}
 	
 	@Test
@@ -50,7 +44,7 @@ public class TestMapOperations {
 		map.put("c", "C");
 		
 		assertEquals("Constructed map now has 3 items", 3, map.size());
-		assertEquals("Constructed map now has 'c' mapped to 'C'", "C", map.get("c"));
+		assertEquals("Constructed map now has 'c' mapped to 'C'", "C", map.get("c").get());
 	}
 	
 	@Test
@@ -58,7 +52,7 @@ public class TestMapOperations {
 		String val = map.put("a", "D");
 		
 		assertEquals("Constructed map still contains 2 items", 2, map.size());
-		assertEquals("Constructed map now has 'a' mapped to 'D'", "D", map.get("a"));
+		assertEquals("Constructed map now has 'a' mapped to 'D'", "D", map.get("a").get());
 		assertEquals("put method returned old value of 'A'", "A", val);
 	}