Update toDate and toNumber tests to handle null and empty strings correctly

This commit is contained in:
Owen Stephens 2018-02-21 23:10:38 +00:00
parent e0d87c3d94
commit 2758633f32

View File

@ -98,10 +98,9 @@ public class ToFromConversionTests extends RefineTest {
@Test @Test
public void testToNumber() { public void testToNumber() {
// Assert.assertTrue(invoke("toNumber") instanceof EvalError); Assert.assertTrue(invoke("toNumber") instanceof EvalError);
Assert.assertNull(invoke("toNumber")); Assert.assertTrue(invoke("toNumber", (Object) null) instanceof EvalError);
// Assert.assertTrue(invoke("toNumber", (Object) null) instanceof EvalError); Assert.assertTrue(invoke("toNumber", "") instanceof EvalError);
Assert.assertNull(invoke("toNumber", (Object) null));
Assert.assertTrue(invoke("toNumber", "string") instanceof EvalError); Assert.assertTrue(invoke("toNumber", "string") instanceof EvalError);
Assert.assertEquals(invoke("toNumber", "0.0"), 0.0); Assert.assertEquals(invoke("toNumber", "0.0"), 0.0);
Assert.assertEquals(invoke("toNumber", "123"), Long.valueOf(123)); Assert.assertEquals(invoke("toNumber", "123"), Long.valueOf(123));
@ -128,9 +127,9 @@ public class ToFromConversionTests extends RefineTest {
@Test @Test
public void testToDate() throws CalendarParserException { public void testToDate() throws CalendarParserException {
// Assert.assertTrue(invoke("toDate") instanceof EvalError); Assert.assertTrue(invoke("toDate") instanceof EvalError);
Assert.assertNull(invoke("toDate"));
Assert.assertTrue(invoke("toDate", (Object) null) 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", 1.0) instanceof EvalError);
Assert.assertTrue(invoke("toDate", "2012-03-01","xxx") instanceof EvalError); // bad format string Assert.assertTrue(invoke("toDate", "2012-03-01","xxx") instanceof EvalError); // bad format string
Assert.assertTrue(invoke("toDate", "2012-03-01") instanceof GregorianCalendar); Assert.assertTrue(invoke("toDate", "2012-03-01") instanceof GregorianCalendar);