JavaScriptTest: consolidate result assertion logic

ctrueden · ctrueden · commit 95473cd094f0 · 2015-06-11T15:52:25.000-05:00
In all cases where a numerical return value comes back, let's not
overtest for int vs. double, since it differs between implementations.
diff --git a/src/test/java/org/scijava/plugins/scripting/javascript/JavaScriptTest.java b/src/test/java/org/scijava/plugins/scripting/javascript/JavaScriptTest.java
@@ -67,10 +67,7 @@ public void testBasic() throws InterruptedException, ExecutionException,
 		final Context context = new Context(ScriptService.class);
 		final ScriptService scriptService = context.getService(ScriptService.class);
 		final String script = "$x = 1 + 2;";
-		// NB: Some JVMs return Integer, others Double. Let's be careful here.
-		final ScriptModule m = scriptService.run("add.js", script, true).get();
-		final Number result = (Number) m.getReturnValue();
-		assertEquals(3.0, result.doubleValue(), 0.0);
+		assertResult(3.0, scriptService.run("add.js", script, true).get());
 	}
 
 	@Test
@@ -122,10 +119,16 @@ public void testLoad() throws IOException, InterruptedException, ExecutionExcept
 		final Context context = new Context(ScriptService.class);
 		final ScriptService scriptService = context.getService(ScriptService.class);
 		final String script = "load('" + tmp.getPath() + "'); three();";
+		assertResult(4.0, scriptService.run("three.js", script, false).get());
+		assertTrue(tmp.delete());
+	}
+
+	// -- Helper methods --
+
+	private void assertResult(final double expected, final ScriptModule m) {
 		// NB: Some JVMs return Integer, others Double. Let's be careful here.
-		final ScriptModule m = scriptService.run("three.js", script, false).get();
 		final Number result = (Number) m.getReturnValue();
-		assertEquals(4.0, result.doubleValue(), 0.0);
-		assertTrue(tmp.delete());
+		assertEquals(expected, result.doubleValue(), 0.0);
 	}
+
 }
