JavaScriptTest: be more lenient with return values

ctrueden · ctrueden · commit a47c49da1284 · 2015-06-11T15:49:38.000-05:00
The Nashorn script engine, as well as the stock Mozilla Rhino
implementation (the one not shipped as part of Java 6), both return
Integer instead of Double when you write "return 4;" and similar.
diff --git a/src/test/java/org/scijava/plugins/scripting/javascript/JavaScriptTest.java b/src/test/java/org/scijava/plugins/scripting/javascript/JavaScriptTest.java
@@ -122,8 +122,10 @@ 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();";
-		final Object result = scriptService.run("three.js", script, false).get().getReturnValue();
-		assertEquals(4.0, (Number) result);
+		// 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());
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -122,8 +122,10 @@ public void testLoad() throws IOException, InterruptedException, ExecutionExcept`
`122`	`122`	`final Context context = new Context(ScriptService.class);`
`123`	`123`	`final ScriptService scriptService = context.getService(ScriptService.class);`
`124`	`124`	`final String script = "load('" + tmp.getPath() + "'); three();";`
`125`		`- final Object result = scriptService.run("three.js", script, false).get().getReturnValue();`
`126`		`- assertEquals(4.0, (Number) result);`
	`125`	`+ // NB: Some JVMs return Integer, others Double. Let's be careful here.`
	`126`	`+ final ScriptModule m = scriptService.run("three.js", script, false).get();`
	`127`	`+ final Number result = (Number) m.getReturnValue();`
	`128`	`+ assertEquals(4.0, result.doubleValue(), 0.0);`
`127`	`129`	`assertTrue(tmp.delete());`
`128`	`130`	`}`
`129`	`131`	`}`