Let unimplemented evaluator functions throw UOE

As requested in #23.

Author: ctrueden

src/main/java/org/scijava/parsington/eval/AbstractStandardEvaluator.java

@@ -117,8 +117,7 @@ public Object function(final Object a, final Object b) {
 
 	@Override
 	public Object dot(final Object a, final Object b) {
-		// NB: Unimplemented.
-		return null;
+		throw new UnsupportedOperationException();
 	}
 
 	// -- groups --
@@ -143,14 +142,12 @@ public Object braces(final Object... args) {
 
 	@Override
 	public Object transpose(final Object a) {
-		// NB: Unimplemented.
-		return null;
+		throw new UnsupportedOperationException();
 	}
 
 	@Override
 	public Object dotTranspose(final Object a) {
-		// NB: Unimplemented.
-		return null;
+		throw new UnsupportedOperationException();
 	}
 
 	@Override
@@ -167,8 +164,7 @@ public Object pow(final Object a, final Object b) {
 
 	@Override
 	public Object dotPow(final Object a, final Object b) {
-		// NB: Unimplemented.
-		return null;
+		throw new UnsupportedOperationException();
 	}
 
 	// -- unary --
@@ -289,26 +285,22 @@ public BigDecimal mod(final BigDecimal av, final BigDecimal bv) {
 
 	@Override
 	public Object rightDiv(final Object a, final Object b) {
-		// NB: Unimplemented.
-		return null;
+		throw new UnsupportedOperationException();
 	}
 
 	@Override
 	public Object dotMul(Object a, Object b) {
-		// NB: Unimplemented.
-		return null;
+		throw new UnsupportedOperationException();
 	}
 
 	@Override
 	public Object dotDiv(final Object a, final Object b) {
-		// NB: Unimplemented.
-		return null;
+		throw new UnsupportedOperationException();
 	}
 
 	@Override
 	public Object dotRightDiv(final Object a, final Object b) {
-		// NB: Unimplemented.
-		return null;
+		throw new UnsupportedOperationException();
 	}
 
 	// -- additive --
@@ -471,8 +463,7 @@ public <T> boolean greaterThanOrEqual(final Comparable<T> av, final T bv) {
 
 	@Override
 	public Object instanceOf(final Object av, final Object bv) {
-		// NB: Unimplemented.
-		return null;
+		throw new UnsupportedOperationException();
 	}
 
 	// -- equality --
@@ -539,14 +530,12 @@ public Object logicalOr(final Object a, final Object b) {
 
 	@Override
 	public Object question(final Object a, final Object b) {
-		// NB: Unimplemented.
-		return null;
+		throw new UnsupportedOperationException();
 	}
 
 	@Override
 	public Object colon(Object a, Object b) {
-		// NB: Unimplemented.
-		return null;
+		throw new UnsupportedOperationException();
 	}
 
 	// -- Helper methods - type matching --

src/test/java/org/scijava/parsington/eval/AbstractStandardEvaluatorTest.java

@@ -117,7 +117,7 @@ public void testFunction() {
 	/** Tests {@link StandardEvaluator#dot(Object, Object)}. */
 	@Test
 	public void testDot() {
-		assertNull(e.dot(o(0), o(1)));
+		assertThrows(UnsupportedOperationException.class, () -> e.dot(o(0), o(1)));
 	}
 
 	// -- groups --
@@ -160,13 +160,13 @@ public void testBraces() {
 	/** Tests {@link StandardEvaluator#transpose(Object)}. */
 	@Test
 	public void testTranspose() {
-		assertNull(e.transpose(o(0)));
+		assertThrows(UnsupportedOperationException.class, () -> e.transpose(o(0)));
 	}
 
 	/** Tests {@link StandardEvaluator#dotTranspose(Object)}. */
 	@Test
 	public void testDotTranspose() {
-		assertNull(e.dotTranspose(o(0)));
+		assertThrows(UnsupportedOperationException.class, () -> e.dotTranspose(o(0)));
 	}
 
 	/** Tests {@link StandardEvaluator#pow(Object, Object)}. */
@@ -180,7 +180,7 @@ public void testPow() {
 	/** Tests {@link StandardEvaluator#dotPow(Object, Object)}. */
 	@Test
 	public void testDotPow() {
-		assertNull(e.dotPow(o(0), o(0)));
+		assertThrows(UnsupportedOperationException.class, () -> e.dotPow(o(0), o(0)));
 	}
 
 	// -- postfix --
@@ -319,19 +319,19 @@ public void testMod() {
 	/** Tests {@link StandardEvaluator#rightDiv(Object, Object)}. */
 	@Test
 	public void testRightDiv() {
-		assertNull(e.rightDiv(o(0), o(0)));
+		assertThrows(UnsupportedOperationException.class, () -> e.rightDiv(o(0), o(0)));
 	}
 
 	/** Tests {@link StandardEvaluator#dotDiv(Object, Object)}. */
 	@Test
 	public void testDotDiv() {
-		assertNull(e.dotDiv(o(0), o(0)));
+		assertThrows(UnsupportedOperationException.class, () -> e.dotDiv(o(0), o(0)));
 	}
 
 	/** Tests {@link StandardEvaluator#dotRightDiv(Object, Object)}. */
 	@Test
 	public void testDotRightDiv() {
-		assertNull(e.dotRightDiv(o(0), o(0)));
+		assertThrows(UnsupportedOperationException.class, () -> e.dotRightDiv(o(0), o(0)));
 	}
 
 	// -- additive --
@@ -533,7 +533,7 @@ public void testGreaterThanOrEqual() {
 	/** Tests {@link StandardEvaluator#instanceOf(Object, Object)}. */
 	@Test
 	public void testInstanceOf() {
-		assertNull(e.instanceOf(o(0), o(0)));
+		assertThrows(UnsupportedOperationException.class, () -> e.instanceOf(o(0), o(0)));
 	}
 
 	// -- equality --
@@ -653,13 +653,13 @@ public void testLogicalOr() {
 	/** Tests {@link StandardEvaluator#question(Object, Object)}. */
 	@Test
 	public void testQuestion() {
-		assertNull(e.question(o(0), o(0)));
+		assertThrows(UnsupportedOperationException.class, () -> e.question(o(0), o(0)));
 	}
 
 	/** Tests {@link StandardEvaluator#colon(Object, Object)}. */
 	@Test
 	public void testColon() {
-		assertNull(e.colon(o(0), o(0)));
+		assertThrows(UnsupportedOperationException.class, () -> e.colon(o(0), o(0)));
 	}
 
 	// -- assignment --

src/test/java/org/scijava/parsington/eval/DefaultStackEvaluatorTest.java

@@ -31,8 +31,7 @@
 package org.scijava.parsington.eval;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.List;
 
@@ -68,13 +67,8 @@ public void testNonShortCircuitingOr() {
 
 	@Test
 	public void testUnimplementedTernary() {
-		try {
-			e.evaluate("2 < 3 ? 'yes' : 'no'");
-			fail("Evaluation of ternary expression erroneously succeeded");
-		}
-		catch (final IllegalArgumentException exc) {
-			assertTrue(exc.getMessage().equals("Unsupported binary operator: :"));
-		}
+		assertThrows(UnsupportedOperationException.class,
+			() -> e.evaluate("2 < 3 ? 'yes' : 'no'"));
 	}
 
 }