Merge pull request #26 from U-QASAR/scholze

Improvement
U-QASAR · Jun 2, 2016 · ca49e95 · ca49e95
2 parents 98b5161 + ee0ff8a
commit ca49e95
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/test/java/eu/uqasar/model/formula/FormulaTest.java b/src/test/java/eu/uqasar/model/formula/FormulaTest.java
@@ -35,13 +35,18 @@ public class FormulaTest {
 	@Test
 	public void testEvalFormulaStr() {
 
-		logger.info("Test eval formula String");
-
+		logger.info("Test eval formula String");
+
+		Double result;
 		Double expected = 15.0;
 		String evalStr = "5*3";
 		Object resObject = Formula.evalFormulaStr(evalStr);
-		Assert.assertNotNull(resObject);
-		Double result = (Double) resObject;
+		Assert.assertNotNull(resObject);
+		if (resObject instanceof Integer) {
+			result = ((Integer) resObject).doubleValue();
+		} else {
+			result = (Double) resObject;
+		}
 		Assert.assertEquals(expected, result);
 	}