init

test/org/apache/el/lang/TestELArithmetic.java

@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.el.lang;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import javax.el.ELProcessor;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestELArithmetic {
+    private static final String a = "1.1";
+    private static final BigInteger b =
+        new BigInteger("1000000000000000000000");
+
+    @Test
+    public void testAdd01() throws Exception {
+        Assert.assertEquals("1000000000000000000001.1",
+                String.valueOf(ELArithmetic.add(a, b)));
+    }
+
+    @Test
+    public void testAdd02() {
+        ELProcessor processor = new ELProcessor();
+        Object result = processor.eval("null + null");
+        Assert.assertEquals(Long.valueOf(0), result);
+    }
+
+    @Test
+    public void testSubtract01() throws Exception {
+        Assert.assertEquals("-999999999999999999998.9",
+                String.valueOf(ELArithmetic.subtract(a, b)));
+    }
+
+    @Test
+    public void testSubtract02() {
+        ELProcessor processor = new ELProcessor();
+        Object result = processor.eval("null - null");
+        Assert.assertEquals(Long.valueOf(0), result);
+    }
+
+    @Test
+    public void testMultiply01() throws Exception {
+        Assert.assertEquals("1100000000000000000000.0",
+                String.valueOf(ELArithmetic.multiply(a, b)));
+    }
+
+    @Test
+    public void testMultiply02() {
+        ELProcessor processor = new ELProcessor();
+        Object result = processor.eval("null * null");
+        Assert.assertEquals(Long.valueOf(0), result);
+    }
+
+    @Test
+    public void testDivide01() throws Exception {
+        Assert.assertEquals("0.0",
+                String.valueOf(ELArithmetic.divide(a, b)));
+    }
+
+    @Test
+    public void testDivide02() {
+        ELProcessor processor = new ELProcessor();
+        Object result = processor.eval("null / null");
+        Assert.assertEquals(Long.valueOf(0), result);
+    }
+
+    @Test
+    public void testMod01() throws Exception {
+        Assert.assertEquals("1.1",
+                String.valueOf(ELArithmetic.mod(a, b)));
+    }
+
+    @Test
+    public void testMod02() {
+        ELProcessor processor = new ELProcessor();
+        Object result = processor.eval("null % null");
+        Assert.assertEquals(Long.valueOf(0), result);
+    }
+
+    @Test
+    public void testUnaryMinus01() {
+        ELProcessor processor = new ELProcessor();
+        Object result = processor.eval("-null");
+        Assert.assertEquals(Long.valueOf(0), result);
+    }
+
+    @Test
+    public void testBug47371bigDecimal() throws Exception {
+        Assert.assertEquals(BigDecimal.valueOf(1),
+                ELArithmetic.add("", BigDecimal.valueOf(1)));
+    }
+
+    @Test
+    public void testBug47371double() throws Exception {
+        Assert.assertEquals(Double.valueOf(7), ELArithmetic.add("", Double.valueOf(7)));
+    }
+
+    @Test
+    public void testBug47371doubleString() throws Exception {
+        Assert.assertEquals(Double.valueOf(2), ELArithmetic.add("", "2."));
+    }
+
+    @Test
+    public void testBug47371bigInteger() throws Exception {
+        Assert.assertEquals(BigInteger.valueOf(0),
+                ELArithmetic.multiply("", BigInteger.valueOf(1)));
+    }
+
+    @Test
+    public void testBug47371long() throws Exception {
+        Assert.assertEquals(Long.valueOf(1), ELArithmetic.add("", Integer.valueOf(1)));
+    }
+
+    @Test
+    public void testBug47371long2() throws Exception {
+        Assert.assertEquals(Long.valueOf(-3), ELArithmetic.subtract("1", "4"));
+    }
+
+    @Test
+    public void testBug47371doubleString2() throws Exception {
+        Assert.assertEquals(Double.valueOf(2), ELArithmetic.add("1.", "1"));
+    }
+}

test/org/apache/el/lang/TestELSupport.java

@@ -0,0 +1,283 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.el.lang;
+
+import java.beans.PropertyEditorManager;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import javax.el.ELException;
+import javax.el.ELManager;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestELSupport {
+    @Test
+    public void testEquals() {
+        Assert.assertTrue(ELSupport.equals(null, "01", Long.valueOf(1)));
+    }
+
+    @Test
+    public void testBigDecimal() {
+        testIsSame(new BigDecimal(
+                "0.123456789012345678901234567890123456789012345678901234567890123456789"));
+    }
+
+    @Test
+    public void testBigInteger() {
+        testIsSame(new BigInteger(
+                "1234567890123456789012345678901234567890123456789012345678901234567890"));
+    }
+
+    @Test
+    public void testLong() {
+        testIsSame(Long.valueOf(0x0102030405060708L));
+    }
+
+    @Test
+    public void testInteger() {
+        testIsSame(Integer.valueOf(0x01020304));
+    }
+
+    @Test
+    public void testShort() {
+        testIsSame(Short.valueOf((short) 0x0102));
+    }
+
+    @Test
+    public void testByte() {
+        testIsSame(Byte.valueOf((byte) 0xEF));
+    }
+
+    @Test
+    public void testDouble() {
+        testIsSame(Double.valueOf(0.123456789012345678901234));
+    }
+
+    @Test
+    public void testFloat() {
+        testIsSame(Float.valueOf(0.123456F));
+    }
+
+    @Test
+    public void testCoerceIntegerToNumber() {
+        Integer input = Integer.valueOf(4390241);
+        Object output = ELSupport.coerceToType(null, input, Number.class);
+        Assert.assertEquals(input, output);
+    }
+
+    @Test
+    public void testCoerceNullToNumber() {
+        Object output = ELSupport.coerceToType(null, null, Number.class);
+        Assert.assertNull(output);
+    }
+
+    @Test
+    public void testCoerceEnumAToEnumA() {
+        Object output = null;
+        try {
+            output = ELSupport.coerceToEnum(null, TestEnumA.VALA1, TestEnumA.class);
+        } finally {
+            Assert.assertEquals(TestEnumA.VALA1, output);
+        }
+    }
+
+    @Test
+    public void testCoerceEnumAToEnumB() {
+        Object output = null;
+        try {
+            output = ELSupport.coerceToEnum(null, TestEnumA.VALA1, TestEnumB.class);
+        } catch (ELException ele) {
+            // Ignore
+        }
+        Assert.assertNull(output);
+    }
+
+    @Test
+    public void testCoerceEnumAToEnumC() {
+        Object output = null;
+        try {
+            output = ELSupport.coerceToEnum(null, TestEnumA.VALA1, TestEnumC.class);
+        } catch (ELException ele) {
+            // Ignore
+        }
+        Assert.assertNull(output);
+    }
+
+    @Test
+    public void testCoerceToType01() {
+        Object result = ELManager.getExpressionFactory().coerceToType(
+                null, Integer.class);
+        Assert.assertNull("Result: " + result, result);
+    }
+
+    @Test
+    public void testCoerceToType02() {
+        Object result = ELManager.getExpressionFactory().coerceToType(
+                null, int.class);
+        Assert.assertEquals(Integer.valueOf(0), result);
+    }
+
+    @Test
+    public void testCoerceToType03() {
+        Object result = ELManager.getExpressionFactory().coerceToType(
+                null, boolean.class);
+        Assert.assertEquals(Boolean.valueOf(null), result);
+    }
+
+    @Test
+    public void testCoerceToType04() {
+        Object result = ELManager.getExpressionFactory().coerceToType(
+                null, String.class);
+        Assert.assertEquals("", result);
+    }
+
+    @Test
+    public void testCoerceToType05() {
+        Object result = ELManager.getExpressionFactory().coerceToType(
+                null, Character.class);
+        Assert.assertNull("Result: " + result, result);
+    }
+
+    @Test
+    public void testCoerceToType06() {
+        Object result = ELManager.getExpressionFactory().coerceToType(
+                "", Character.class);
+        Assert.assertEquals(Character.valueOf((char) 0), result);
+    }
+
+    @Test
+    public void testCoerceToType07() {
+        Object result = ELManager.getExpressionFactory().coerceToType(
+                null, char.class);
+        Assert.assertEquals(Character.valueOf((char) 0), result);
+    }
+
+    @Test
+    public void testCoerceToType08() {
+        Object result = ELManager.getExpressionFactory().coerceToType(
+                "", char.class);
+        Assert.assertEquals(Character.valueOf((char) 0), result);
+    }
+
+    @Test
+    public void testCoerceToType09() {
+        Object result = ELManager.getExpressionFactory().coerceToType(
+                null, Boolean.class);
+        Assert.assertNull("Result: " + result, result);
+    }
+
+    @Test
+    public void testCoerceToType10() {
+        Object result = ELManager.getExpressionFactory().coerceToType(
+                "", Boolean.class);
+        Assert.assertEquals(Boolean.FALSE, result);
+    }
+
+    @Test
+    public void testCoerceToType11() {
+        Object result = ELManager.getExpressionFactory().coerceToType(
+                null, boolean.class);
+        Assert.assertEquals(Boolean.FALSE, result);
+    }
+
+    @Test
+    public void testCoerceToType12() {
+        Object result = ELManager.getExpressionFactory().coerceToType(
+                "", boolean.class);
+        Assert.assertEquals(Boolean.FALSE, result);
+    }
+
+    @Test
+    public void testCoerceToType13() {
+        Object result = ELManager.getExpressionFactory().coerceToType(
+                "", TesterType.class);
+        Assert.assertNull(result);
+    }
+
+    @Test
+    public void testCoerceToType14() {
+        PropertyEditorManager.registerEditor(TesterType.class, TesterTypeEditorNoError.class);
+        Object result = ELManager.getExpressionFactory().coerceToType(
+                "Foo", TesterType.class);
+        Assert.assertTrue(result instanceof TesterType);
+        Assert.assertEquals("Foo", ((TesterType) result).getValue());
+    }
+
+    @Test(expected=ELException.class)
+    public void testCoerceToType15() {
+        PropertyEditorManager.registerEditor(TesterType.class, TesterTypeEditorError.class);
+        Object result = ELManager.getExpressionFactory().coerceToType(
+                "Foo", TesterType.class);
+        Assert.assertTrue(result instanceof TesterType);
+        Assert.assertEquals("Foo", ((TesterType) result).getValue());
+    }
+
+    @Test
+    public void testCoerceToType16() {
+        PropertyEditorManager.registerEditor(TesterType.class, TesterTypeEditorError.class);
+        Object result = ELManager.getExpressionFactory().coerceToType(
+                "", TesterType.class);
+        Assert.assertNull(result);
+    }
+
+    @Test
+    public void testCoerceToNumber01() {
+        Object result = ELSupport.coerceToNumber(
+                null, (Object) null, Integer.class);
+        Assert.assertNull("Result: " + result, result);
+    }
+
+    @Test
+    public void testCoerceToNumber02() {
+        Object result = ELSupport.coerceToNumber(
+                null, (Object) null, int.class);
+        Assert.assertEquals(Integer.valueOf(0), result);
+    }
+
+    @Test
+    public void testCoerceToBoolean01() {
+        Object result = ELSupport.coerceToBoolean(null, null, true);
+        Assert.assertEquals(Boolean.FALSE, result);
+    }
+
+    @Test
+    public void testCoerceToBoolean02() {
+        Object result = ELSupport.coerceToBoolean(null, null, false);
+        Assert.assertNull("Result: " + result, result);
+    }
+
+    private static void testIsSame(Object value) {
+        Assert.assertEquals(value, ELSupport.coerceToNumber(null, value, value.getClass()));
+    }
+
+    private static enum TestEnumA {
+        VALA1,
+        VALA2
+    }
+    private static enum TestEnumB {
+        VALB1,
+        VALB2
+    }
+    private static enum TestEnumC {
+        VALA1,
+        VALA2,
+        VALB1,
+        VALB2
+    }
+}

test/org/apache/el/lang/TesterBean.java

@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.el.lang;
+
+public class TesterBean {
+
+}

test/org/apache/el/lang/TesterType.java

@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.el.lang;
+
+public class TesterType {
+
+    private final String value;
+
+    public TesterType(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

test/org/apache/el/lang/TesterTypeEditorBase.java

@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.el.lang;
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyEditor;
+
+public abstract class TesterTypeEditorBase implements PropertyEditor {
+
+    protected TesterType type = null;
+
+    @Override
+    public void setValue(Object value) {
+    }
+
+    @Override
+    public Object getValue() {
+        return type;
+    }
+
+    @Override
+    public boolean isPaintable() {
+        return false;
+    }
+
+    @Override
+    public void paintValue(Graphics gfx, Rectangle box) {
+    }
+
+    @Override
+    public String getJavaInitializationString() {
+        return null;
+    }
+
+    @Override
+    public String getAsText() {
+        return null;
+    }
+
+    @Override
+    public String[] getTags() {
+        return null;
+    }
+
+    @Override
+    public Component getCustomEditor() {
+        return null;
+    }
+
+    @Override
+    public boolean supportsCustomEditor() {
+        return false;
+    }
+
+    @Override
+    public void addPropertyChangeListener(PropertyChangeListener listener) {
+    }
+
+    @Override
+    public void removePropertyChangeListener(PropertyChangeListener listener) {
+    }
+}

test/org/apache/el/lang/TesterTypeEditorError.java

@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.el.lang;
+
+public class TesterTypeEditorError extends TesterTypeEditorBase {
+
+    @Override
+    public void setAsText(String text) throws IllegalArgumentException {
+        throw new IllegalArgumentException();
+    }
+}

test/org/apache/el/lang/TesterTypeEditorNoError.java

@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.el.lang;
+
+public class TesterTypeEditorNoError extends TesterTypeEditorBase {
+
+    @Override
+    public void setAsText(String text) throws IllegalArgumentException {
+        type = new TesterType(text);
+    }
+}

test/org/apache/el/lang/TesterVariableMapperImpl.java

@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.el.lang;
+
+import javax.el.ELContext;
+import javax.el.ELManager;
+import javax.el.ExpressionFactory;
+import javax.el.TesterELContext;
+import javax.el.ValueExpression;
+import javax.el.VariableMapper;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TesterVariableMapperImpl {
+
+    @Test
+    public void testSetVariable01() {
+        ExpressionFactory factory = ELManager.getExpressionFactory();
+        ELContext context = new TesterELContext();
+        ValueExpression ve1 =
+                factory.createValueExpression(context, "${1}", int.class);
+        ValueExpression ve2 =
+                factory.createValueExpression(context, "${2}", int.class);
+        ValueExpression ve3 =
+                factory.createValueExpression(context, "${3}", int.class);
+
+        VariableMapper mapper = new VariableMapperImpl();
+
+        mapper.setVariable("var1", ve1);
+        mapper.setVariable("var2", ve2);
+        mapper.setVariable("var3", ve3);
+
+
+        mapper.setVariable("var2", null);
+
+        Assert.assertEquals(ve1, mapper.resolveVariable("var1"));
+        Assert.assertNull(mapper.resolveVariable("var2"));
+        Assert.assertEquals(ve3, mapper.resolveVariable("var3"));
+    }
+}