From 2758633f32a1bc1e71df5bfb4c9d5b6831fac0d6 Mon Sep 17 00:00:00 2001 From: Owen Stephens Date: Wed, 21 Feb 2018 23:10:38 +0000 Subject: [PATCH] Update toDate and toNumber tests to handle null and empty strings correctly --- .../expr/functions/strings/ToFromConversionTests.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ToFromConversionTests.java b/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ToFromConversionTests.java index fbc6d9a9e..5db608229 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ToFromConversionTests.java +++ b/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ToFromConversionTests.java @@ -98,10 +98,9 @@ public class ToFromConversionTests extends RefineTest { @Test public void testToNumber() { -// Assert.assertTrue(invoke("toNumber") instanceof EvalError); - Assert.assertNull(invoke("toNumber")); -// Assert.assertTrue(invoke("toNumber", (Object) null) instanceof EvalError); - Assert.assertNull(invoke("toNumber", (Object) null)); + Assert.assertTrue(invoke("toNumber") instanceof EvalError); + Assert.assertTrue(invoke("toNumber", (Object) null) instanceof EvalError); + Assert.assertTrue(invoke("toNumber", "") instanceof EvalError); Assert.assertTrue(invoke("toNumber", "string") instanceof EvalError); Assert.assertEquals(invoke("toNumber", "0.0"), 0.0); Assert.assertEquals(invoke("toNumber", "123"), Long.valueOf(123)); @@ -128,9 +127,9 @@ public class ToFromConversionTests extends RefineTest { @Test public void testToDate() throws CalendarParserException { -// Assert.assertTrue(invoke("toDate") instanceof EvalError); - Assert.assertNull(invoke("toDate")); + Assert.assertTrue(invoke("toDate") instanceof EvalError); Assert.assertTrue(invoke("toDate", (Object) null) instanceof EvalError); + Assert.assertTrue(invoke("toDate", "") instanceof EvalError); Assert.assertTrue(invoke("toDate", 1.0) instanceof EvalError); Assert.assertTrue(invoke("toDate", "2012-03-01","xxx") instanceof EvalError); // bad format string Assert.assertTrue(invoke("toDate", "2012-03-01") instanceof GregorianCalendar);