From 734a6539056ef97313b0f93fbc3acab525440565 Mon Sep 17 00:00:00 2001 From: Stefan Meissner Date: Tue, 23 Dec 2014 13:46:42 +0100 Subject: [PATCH 1/2] fix semantic error for checking on double type --- jtwig-core/src/main/java/org/jtwig/util/MathOperations.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jtwig-core/src/main/java/org/jtwig/util/MathOperations.java b/jtwig-core/src/main/java/org/jtwig/util/MathOperations.java index 66791ff5..33e5b20a 100644 --- a/jtwig-core/src/main/java/org/jtwig/util/MathOperations.java +++ b/jtwig-core/src/main/java/org/jtwig/util/MathOperations.java @@ -57,9 +57,9 @@ public static int toInt (Object obj) { public static boolean areDouble(Object... list) { for (Object obj : list) - if (obj instanceof Double) - return true; + if (!(obj instanceof Double)) + return false; - return false; + return true; } } From 546bf28120206442efaf47df7a196e652e774dd0 Mon Sep 17 00:00:00 2001 From: Stefan Meissner Date: Tue, 23 Dec 2014 17:09:51 +0100 Subject: [PATCH 2/2] check for null and add some tests --- .../java/org/jtwig/util/MathOperations.java | 3 ++ .../jtwig/unit/util/MathOperationsTest.java | 28 +++++++++++++++++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/jtwig-core/src/main/java/org/jtwig/util/MathOperations.java b/jtwig-core/src/main/java/org/jtwig/util/MathOperations.java index 33e5b20a..e32f7626 100644 --- a/jtwig-core/src/main/java/org/jtwig/util/MathOperations.java +++ b/jtwig-core/src/main/java/org/jtwig/util/MathOperations.java @@ -56,6 +56,9 @@ public static int toInt (Object obj) { } public static boolean areDouble(Object... list) { + if (list == null || list.length == 0) + return false; + for (Object obj : list) if (!(obj instanceof Double)) return false; diff --git a/jtwig-core/src/test/java/org/jtwig/unit/util/MathOperationsTest.java b/jtwig-core/src/test/java/org/jtwig/unit/util/MathOperationsTest.java index e2c04280..6232a518 100644 --- a/jtwig-core/src/test/java/org/jtwig/unit/util/MathOperationsTest.java +++ b/jtwig-core/src/test/java/org/jtwig/unit/util/MathOperationsTest.java @@ -14,10 +14,15 @@ package org.jtwig.unit.util; -import org.junit.Test; - -import static org.jtwig.util.MathOperations.*; +import static org.jtwig.util.MathOperations.areDouble; +import static org.jtwig.util.MathOperations.intDiv; +import static org.jtwig.util.MathOperations.mod; +import static org.jtwig.util.MathOperations.sum; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; public class MathOperationsTest { @Test @@ -32,4 +37,21 @@ public void modTest() throws Exception { public void intDivDoubleTest() throws Exception { assertEquals(1, intDiv(2.0, 2.0)); } + @Test + public void areDoubleTest() { + assertTrue(areDouble(1.0,2.0)); + } + @Test + public void areDoubleWithStringAndDoubleTest() { + assertFalse(areDouble("1.0",2.0)); + } + @Test + public void areDoubleEmptyParameterListTest() { + assertFalse(areDouble()); + } + @Test + public void areDoubleNullParameterListTest() { + Object[] parameterList = null; + assertFalse(areDouble(parameterList)); + } }