This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a33bbfa2fcd580b9bae18c85e75f477fa6fe1c9a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 22 19:44:22 2023 +0000
Clean-up. Reformatting. No functional change.
---
test/javax/el/TestArrayELResolver.java | 118 +++++-------
test/javax/el/TestBeanELResolver.java | 202 +++++++++------------
.../el/TestBeanELResolverVarargsInvocation.java | 16 +-
test/javax/el/TestBeanNameELResolver.java | 117 +++++-------
test/javax/el/TestCompositeELResolver.java | 3 +-
test/javax/el/TestELContext.java | 24 +--
test/javax/el/TestELProcessor.java | 15 +-
test/javax/el/TestELResolver.java | 32 +---
test/javax/el/TestEvaluationListener.java | 6 +-
test/javax/el/TestImportHandler.java | 17 +-
.../el/TestImportHandlerStandardPackages.java | 19 +-
test/javax/el/TestListELResolver.java | 112 +++++-------
test/javax/el/TestMapELResolver.java | 117 +++++-------
test/javax/el/TestResourceBundleELResolver.java | 117 +++++-------
test/javax/el/TestStaticFieldELResolver.java | 182 ++++++++-----------
test/javax/el/TesterBean.java | 2 +-
test/javax/el/TesterBeanNameResolver.java | 5 +-
test/javax/el/TesterEvaluationListener.java | 3 +-
test/javax/el/TesterImportHandlerPerformance.java | 14 +-
19 files changed, 450 insertions(+), 671 deletions(-)
diff --git a/test/javax/el/TestArrayELResolver.java
b/test/javax/el/TestArrayELResolver.java
index cea9b97b16..41acd0e9b5 100644
--- a/test/javax/el/TestArrayELResolver.java
+++ b/test/javax/el/TestArrayELResolver.java
@@ -35,8 +35,7 @@ public class TestArrayELResolver {
*/
@Test
public void testGetType02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_TYPE,
- true);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_TYPE,
true);
}
/**
@@ -45,8 +44,7 @@ public class TestArrayELResolver {
@Test
public void testGetType03() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
Class<?> result = resolver.getType(context, base, Integer.valueOf(0));
@@ -61,8 +59,7 @@ public class TestArrayELResolver {
@Test(expected = PropertyNotFoundException.class)
public void testGetType04() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
resolver.getType(context, base, Integer.valueOf(1));
@@ -74,8 +71,7 @@ public class TestArrayELResolver {
@Test
public void testGetType05() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
Class<?> result = resolver.getType(context, base, "index");
@@ -98,8 +94,7 @@ public class TestArrayELResolver {
*/
@Test
public void testGetValue02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_VALUE,
- true);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_VALUE,
true);
}
/**
@@ -108,8 +103,7 @@ public class TestArrayELResolver {
@Test
public void testGetValue03() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
Object result = resolver.getValue(context, base, Integer.valueOf(0));
@@ -124,8 +118,7 @@ public class TestArrayELResolver {
@Test(expected = IllegalArgumentException.class)
public void testGetValue04() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
resolver.getValue(context, base, "key");
@@ -137,8 +130,7 @@ public class TestArrayELResolver {
@Test
public void testGetValue05() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
Object result = resolver.getValue(context, base, Integer.valueOf(1));
@@ -166,8 +158,7 @@ public class TestArrayELResolver {
*/
@Test
public void testSetValue02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.SET_VALUE,
- false);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.SET_VALUE,
false);
}
/**
@@ -176,8 +167,7 @@ public class TestArrayELResolver {
@Test(expected = PropertyNotWritableException.class)
public void testSetValue03() {
ArrayELResolver resolver = new ArrayELResolver(true);
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
resolver.setValue(context, new String[] {}, new Object(), new
Object());
}
@@ -188,20 +178,17 @@ public class TestArrayELResolver {
@Test
public void testSetValue04() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
resolver.setValue(context, base, Integer.valueOf(0), "new-element");
- Assert.assertEquals("new-element",
- resolver.getValue(context, base, Integer.valueOf(0)));
+ Assert.assertEquals("new-element", resolver.getValue(context, base,
Integer.valueOf(0)));
Assert.assertTrue(context.isPropertyResolved());
resolver.setValue(context, base, Integer.valueOf(0), null);
- Assert.assertEquals(null,
- resolver.getValue(context, base, Integer.valueOf(0)));
+ Assert.assertEquals(null, resolver.getValue(context, base,
Integer.valueOf(0)));
Assert.assertTrue(context.isPropertyResolved());
}
@@ -211,8 +198,7 @@ public class TestArrayELResolver {
@Test(expected = IllegalArgumentException.class)
public void testSetValue05() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
resolver.setValue(context, base, "key", "new-element");
@@ -224,36 +210,31 @@ public class TestArrayELResolver {
@Test(expected = PropertyNotFoundException.class)
public void testSetValue06() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
resolver.setValue(context, base, Integer.valueOf(1), "new-element");
}
/**
- * Tests that an exception will be thrown if the value is not from the
- * corresponding type.
+ * Tests that an exception will be thrown if the value is not from the
corresponding type.
*/
@Test(expected = ClassCastException.class)
public void testSetValue07() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
resolver.setValue(context, base, Integer.valueOf(0),
Integer.valueOf(1));
}
/**
- * Tests setting arrays of primitives.
- * https://bz.apache.org/bugzilla/show_bug.cgi?id=55691
+ * Tests setting arrays of primitives.
https://bz.apache.org/bugzilla/show_bug.cgi?id=55691
*/
@Test
public void testSetValue08() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
int[] base = new int[] { 1, 2, 3 };
resolver.setValue(context, base, Integer.valueOf(1),
Integer.valueOf(4));
@@ -276,11 +257,9 @@ public class TestArrayELResolver {
@Test
public void testIsReadOnly02() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- boolean result = resolver.isReadOnly(context, new Object(),
- new Object());
+ boolean result = resolver.isReadOnly(context, new Object(), new
Object());
Assert.assertFalse(result);
Assert.assertFalse(context.isPropertyResolved());
@@ -294,14 +273,13 @@ public class TestArrayELResolver {
}
/**
- * Tests that if the ArrayELResolver is constructed with readOnly the
method
- * will return always true, otherwise false.
+ * Tests that if the ArrayELResolver is constructed with readOnly the
method will return always true, otherwise
+ * false.
*/
@Test
public void testIsReadOnly03() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
boolean result = resolver.isReadOnly(context, base,
Integer.valueOf(0));
@@ -323,8 +301,7 @@ public class TestArrayELResolver {
@Test(expected = PropertyNotFoundException.class)
public void testIsReadOnly04() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
resolver.isReadOnly(context, base, Integer.valueOf(1));
@@ -336,8 +313,7 @@ public class TestArrayELResolver {
@Test
public void testIsReadOnly05() {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
String[] base = new String[] { "element" };
boolean result = resolver.isReadOnly(context, base, "key");
@@ -353,30 +329,28 @@ public class TestArrayELResolver {
Assert.assertTrue(context.isPropertyResolved());
}
- private void doNegativeTest(Object base, Object trigger,
- MethodUnderTest method, boolean checkResult) {
+ private void doNegativeTest(Object base, Object trigger, MethodUnderTest
method, boolean checkResult) {
ArrayELResolver resolver = new ArrayELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = null;
switch (method) {
- case GET_VALUE: {
- result = resolver.getValue(context, base, trigger);
- break;
- }
- case SET_VALUE: {
- resolver.setValue(context, base, trigger, new Object());
- break;
- }
- case GET_TYPE: {
- result = resolver.getType(context, base, trigger);
- break;
- }
- default: {
- // Should never happen
- Assert.fail("Missing case for method");
- }
+ case GET_VALUE: {
+ result = resolver.getValue(context, base, trigger);
+ break;
+ }
+ case SET_VALUE: {
+ resolver.setValue(context, base, trigger, new Object());
+ break;
+ }
+ case GET_TYPE: {
+ result = resolver.getType(context, base, trigger);
+ break;
+ }
+ default: {
+ // Should never happen
+ Assert.fail("Missing case for method");
+ }
}
if (checkResult) {
@@ -386,7 +360,9 @@ public class TestArrayELResolver {
}
private enum MethodUnderTest {
- GET_VALUE, SET_VALUE, GET_TYPE
+ GET_VALUE,
+ SET_VALUE,
+ GET_TYPE
}
}
diff --git a/test/javax/el/TestBeanELResolver.java
b/test/javax/el/TestBeanELResolver.java
index aabd5459bd..8b0cb728c1 100644
--- a/test/javax/el/TestBeanELResolver.java
+++ b/test/javax/el/TestBeanELResolver.java
@@ -47,13 +47,11 @@ public class TestBeanELResolver {
Bean bean = new Bean();
- ValueExpression varBean =
- factory.createValueExpression(bean, Bean.class);
+ ValueExpression varBean = factory.createValueExpression(bean,
Bean.class);
context.getVariableMapper().setVariable("bean", varBean);
- ValueExpression ve = factory.createValueExpression(
- context, "${bean.valueA}", String.class);
+ ValueExpression ve = factory.createValueExpression(context,
"${bean.valueA}", String.class);
Exception e = null;
try {
ve.getValue(context);
@@ -64,8 +62,7 @@ public class TestBeanELResolver {
String type = Bean.class.getName();
@SuppressWarnings("null") // Not possible due to test above
String msg = e.getMessage();
- Assert.assertTrue("No reference to type [" + type +
- "] where property cannot be found in [" + msg + "]",
+ Assert.assertTrue("No reference to type [" + type + "] where property
cannot be found in [" + msg + "]",
msg.contains(type));
}
@@ -112,8 +109,7 @@ public class TestBeanELResolver {
}
/**
- * Tests that an exception will be thrown when a coercion cannot be
- * performed.
+ * Tests that an exception will be thrown when a coercion cannot be
performed.
*/
@Test(expected = PropertyNotFoundException.class)
public void testGetType05() {
@@ -166,8 +162,7 @@ public class TestBeanELResolver {
}
/**
- * Tests that an exception will be thrown when a coercion cannot be
- * performed.
+ * Tests that an exception will be thrown when a coercion cannot be
performed.
*/
@Test(expected = PropertyNotFoundException.class)
public void testGetValue05() {
@@ -243,8 +238,7 @@ public class TestBeanELResolver {
}
/**
- * Tests that an exception will be thrown when a coercion cannot be
- * performed.
+ * Tests that an exception will be thrown when a coercion cannot be
performed.
*/
@Test(expected = PropertyNotFoundException.class)
public void testSetValue05() {
@@ -266,8 +260,7 @@ public class TestBeanELResolver {
}
/**
- * Tests that an exception will be thrown when the property does not have
- * setter method.
+ * Tests that an exception will be thrown when the property does not have
setter method.
*/
@Test(expected = PropertyNotWritableException.class)
public void testSetValue07() {
@@ -306,8 +299,7 @@ public class TestBeanELResolver {
}
/**
- * Tests that if the BeanELResolver is constructed with readOnly the method
- * will return always true.
+ * Tests that if the BeanELResolver is constructed with readOnly the
method will return always true.
*/
@Test
public void testIsReadOnly03() {
@@ -350,8 +342,7 @@ public class TestBeanELResolver {
}
/**
- * Tests that true will be returned when the property does not have setter
- * method.
+ * Tests that true will be returned when the property does not have setter
method.
*/
@Test
public void testIsReadOnly06() {
@@ -365,8 +356,7 @@ public class TestBeanELResolver {
}
/**
- * Tests that a valid FeatureDescriptors are not returned if base is not
- * Map.
+ * Tests that a valid FeatureDescriptors are not returned if base is not
Map.
*/
@Test
public void testGetFeatureDescriptors01() {
@@ -390,10 +380,8 @@ public class TestBeanELResolver {
while (result.hasNext()) {
PropertyDescriptor featureDescriptor = (PropertyDescriptor)
result.next();
- Assert.assertEquals(featureDescriptor.getPropertyType(),
- featureDescriptor.getValue(ELResolver.TYPE));
- Assert.assertEquals(Boolean.TRUE,
-
featureDescriptor.getValue(ELResolver.RESOLVABLE_AT_DESIGN_TIME));
+ Assert.assertEquals(featureDescriptor.getPropertyType(),
featureDescriptor.getValue(ELResolver.TYPE));
+ Assert.assertEquals(Boolean.TRUE,
featureDescriptor.getValue(ELResolver.RESOLVABLE_AT_DESIGN_TIME));
}
}
@@ -422,8 +410,8 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
METHOD01_NAME,
- new Class<?>[] {}, new Object[] {});
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
METHOD01_NAME, new Class<?>[] {},
+ new Object[] {});
Assert.assertEquals(BEAN_NAME, result);
Assert.assertTrue(context.isPropertyResolved());
@@ -445,8 +433,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- resolver.invoke(context, new TesterBean(BEAN_NAME), METHOD02_NAME, new
Class<?>[] {},
- new Object[] {});
+ resolver.invoke(context, new TesterBean(BEAN_NAME), METHOD02_NAME, new
Class<?>[] {}, new Object[] {});
}
/**
@@ -457,8 +444,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- resolver.invoke(context, new TesterBean(BEAN_NAME), METHOD03_NAME, new
Class<?>[] {},
- new Object[] {});
+ resolver.invoke(context, new TesterBean(BEAN_NAME), METHOD03_NAME, new
Class<?>[] {}, new Object[] {});
}
@Test
@@ -466,8 +452,8 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- new Class<?>[] {}, new String[] {});
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs", new Class<?>[] {},
+ new String[] {});
Assert.assertEquals(BEAN_NAME, result);
}
@@ -477,8 +463,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- null, null);
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs", null, null);
Assert.assertEquals(BEAN_NAME, result);
}
@@ -488,8 +473,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- null, new String[] {});
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs", null, new String[] {});
Assert.assertEquals(BEAN_NAME, result);
}
@@ -499,8 +483,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- new Class<?>[] {}, null);
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs", new Class<?>[] {}, null);
Assert.assertEquals(BEAN_NAME, result);
}
@@ -510,8 +493,8 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- new Class<?>[] { null }, new String[] { null });
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs", new Class<?>[] { null },
+ new String[] { null });
Assert.assertEquals(BEAN_NAME, result);
}
@@ -521,8 +504,8 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- null, new String[] { null });
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs", null,
+ new String[] { null });
Assert.assertEquals(BEAN_NAME, result);
}
@@ -532,8 +515,8 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- new Class<?>[] { null }, null);
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs", new Class<?>[] { null },
+ null);
Assert.assertEquals(BEAN_NAME, result);
}
@@ -615,7 +598,7 @@ public class TestBeanELResolver {
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargsCoerce15() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
@@ -632,25 +615,23 @@ public class TestBeanELResolver {
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- new Class<?>[] { String.class, String.class, String.class },
- new Object[] { "10", "11", "12" });
+ new Class<?>[] { String.class, String.class, String.class },
new Object[] { "10", "11", "12" });
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargsCoerce17() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- new Class<?>[] { String.class, String.class },
- new Object[] { "10", "11", "12" });
+ new Class<?>[] { String.class, String.class }, new Object[] {
"10", "11", "12" });
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargsCoerce18() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
@@ -674,19 +655,18 @@ public class TestBeanELResolver {
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargsCoerce20() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- new Class<?>[] { String.class, String.class, String.class },
- new Object[] { "true", "10", "11", "12" });
+ new Class<?>[] { String.class, String.class, String.class },
new Object[] { "true", "10", "11", "12" });
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargsCoerce21() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
@@ -705,20 +685,18 @@ public class TestBeanELResolver {
context.addELResolver(new StringToLongNeverFailResolver());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- new Class<?>[] { String.class, String.class, String.class },
- new Object[] { "AA", "BB", "CC" });
+ new Class<?>[] { String.class, String.class, String.class },
new Object[] { "AA", "BB", "CC" });
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargsCoerce23() {
BeanELResolver resolver = new BeanELResolver();
StandardELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- new Class<?>[] { String.class, String.class, String.class },
- new Object[] { "AA", "BB", "CC" });
+ new Class<?>[] { String.class, String.class, String.class },
new Object[] { "AA", "BB", "CC" });
Assert.assertEquals(BEAN_NAME, result);
}
@@ -728,8 +706,8 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- new Class<?>[] {}, new Object[] {});
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs", new Class<?>[] {},
+ new Object[] {});
Assert.assertEquals(BEAN_NAME, result);
}
@@ -739,8 +717,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- null, null);
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs", null, null);
Assert.assertEquals(BEAN_NAME, result);
}
@@ -750,8 +727,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- null, new Object[] {});
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs", null, new Object[] {});
Assert.assertEquals(BEAN_NAME, result);
}
@@ -761,8 +737,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- new Class<?>[] {}, null);
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs", new Class<?>[] {}, null);
Assert.assertEquals(BEAN_NAME, result);
}
@@ -772,8 +747,8 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- new Class<?>[] { null }, new Object[] { null });
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs", new Class<?>[] { null },
+ new Object[] { null });
Assert.assertEquals(BEAN_NAME, result);
}
@@ -783,8 +758,8 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- null, new Object[] { null });
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs", null,
+ new Object[] { null });
Assert.assertEquals(BEAN_NAME, result);
}
@@ -794,8 +769,8 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- new Class<?>[] { null }, null);
+ Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs", new Class<?>[] { null },
+ null);
Assert.assertEquals(BEAN_NAME, result);
}
@@ -861,13 +836,14 @@ public class TestBeanELResolver {
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
- new Class<?>[] { Integer.class, Integer.class }, new Object[]
{ Integer.valueOf(10), Integer.valueOf(11) });
+ new Class<?>[] { Integer.class, Integer.class },
+ new Object[] { Integer.valueOf(10), Integer.valueOf(11) });
Assert.assertEquals(BEAN_NAME, result);
}
// Note: The coercion rules are that a null of any type can be coerced to a
- // null of *any* other type so this works.
+ // null of *any* other type so this works.
@Test
public void testInvokeVarargs14() {
BeanELResolver resolver = new BeanELResolver();
@@ -879,7 +855,7 @@ public class TestBeanELResolver {
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargs15() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
@@ -897,31 +873,31 @@ public class TestBeanELResolver {
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
new Class<?>[] { Integer.class, Integer.class, Integer.class },
- new Object[] { Integer.valueOf(10), Integer.valueOf(11),
Integer.valueOf(12) });
+ new Object[] { Integer.valueOf(10), Integer.valueOf(11),
Integer.valueOf(12) });
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargs17() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
new Class<?>[] { Integer.class, Integer.class },
- new Object[] { Integer.valueOf(10), Integer.valueOf(11),
Integer.valueOf(12) });
+ new Object[] { Integer.valueOf(10), Integer.valueOf(11),
Integer.valueOf(12) });
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargs18() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
new Class<?>[] { Integer.class, Integer.class, Integer.class,
Integer.class },
- new Object[] { Integer.valueOf(10), Integer.valueOf(11),
Integer.valueOf(12) });
+ new Object[] { Integer.valueOf(10), Integer.valueOf(11),
Integer.valueOf(12) });
Assert.assertEquals(BEAN_NAME, result);
}
@@ -933,31 +909,31 @@ public class TestBeanELResolver {
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
new Class<?>[] { Boolean.class, Integer.class, Integer.class,
Integer.class },
- new Object[] { Boolean.TRUE, Integer.valueOf(10),
Integer.valueOf(11), Integer.valueOf(12) });
+ new Object[] { Boolean.TRUE, Integer.valueOf(10),
Integer.valueOf(11), Integer.valueOf(12) });
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargs20() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
new Class<?>[] { Boolean.class, Integer.class, Integer.class },
- new Object[] { Boolean.TRUE, Integer.valueOf(10),
Integer.valueOf(11), Integer.valueOf(12) });
+ new Object[] { Boolean.TRUE, Integer.valueOf(10),
Integer.valueOf(11), Integer.valueOf(12) });
Assert.assertEquals(BEAN_NAME, result);
}
- @Test(expected=MethodNotFoundException.class)
+ @Test(expected = MethodNotFoundException.class)
public void testInvokeVarargs21() {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.invoke(context, new TesterBean(BEAN_NAME),
"getNameVarargs",
new Class<?>[] { Boolean.class, Integer.class, Integer.class,
Integer.class, Integer.class },
- new Object[] { Boolean.TRUE, Integer.valueOf(10),
Integer.valueOf(11), Integer.valueOf(12) });
+ new Object[] { Boolean.TRUE, Integer.valueOf(10),
Integer.valueOf(11), Integer.valueOf(12) });
Assert.assertEquals(BEAN_NAME, result);
}
@@ -970,33 +946,32 @@ public class TestBeanELResolver {
}
}
- private void doNegativeTest(Object base, Object trigger, MethodUnderTest
method,
- boolean checkResult) {
+ private void doNegativeTest(Object base, Object trigger, MethodUnderTest
method, boolean checkResult) {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = null;
switch (method) {
- case GET_VALUE: {
- result = resolver.getValue(context, base, trigger);
- break;
- }
- case SET_VALUE: {
- resolver.setValue(context, base, trigger, new Object());
- break;
- }
- case GET_TYPE: {
- result = resolver.getType(context, base, trigger);
- break;
- }
- case INVOKE: {
- result = resolver.invoke(context, base, trigger, new Class<?>[0],
new Object[0]);
- break;
- }
- default: {
- // Should never happen
- Assert.fail("Missing case for method");
- }
+ case GET_VALUE: {
+ result = resolver.getValue(context, base, trigger);
+ break;
+ }
+ case SET_VALUE: {
+ resolver.setValue(context, base, trigger, new Object());
+ break;
+ }
+ case GET_TYPE: {
+ result = resolver.getType(context, base, trigger);
+ break;
+ }
+ case INVOKE: {
+ result = resolver.invoke(context, base, trigger, new
Class<?>[0], new Object[0]);
+ break;
+ }
+ default: {
+ // Should never happen
+ Assert.fail("Missing case for method");
+ }
}
if (checkResult) {
@@ -1006,13 +981,16 @@ public class TestBeanELResolver {
}
private enum MethodUnderTest {
- GET_VALUE, SET_VALUE, GET_TYPE, INVOKE
+ GET_VALUE,
+ SET_VALUE,
+ GET_TYPE,
+ INVOKE
}
/*
- * Custom resolver that will always convert a string to an integer. If the
- * provided string is not a valid integer, zero will be returned.
+ * Custom resolver that will always convert a string to an integer. If the
provided string is not a valid integer,
+ * zero will be returned.
*/
private static class StringToLongNeverFailResolver extends ELResolver {
diff --git a/test/javax/el/TestBeanELResolverVarargsInvocation.java
b/test/javax/el/TestBeanELResolverVarargsInvocation.java
index 7c1dec32aa..b81bcb1478 100644
--- a/test/javax/el/TestBeanELResolverVarargsInvocation.java
+++ b/test/javax/el/TestBeanELResolverVarargsInvocation.java
@@ -58,8 +58,7 @@ public class TestBeanELResolverVarargsInvocation {
private Map<String, ValueExpression> vars = new HashMap<>();
@Override
- public ValueExpression setVariable(String arg0,
- ValueExpression arg1) {
+ public ValueExpression setVariable(String arg0,
ValueExpression arg1) {
if (arg1 == null) {
return vars.remove(arg0);
} else {
@@ -102,21 +101,18 @@ public class TestBeanELResolverVarargsInvocation {
*/
@Test
public void testJoinDelimited() {
- Assert.assertEquals(foo.joinDelimited("-", "foo", "bar", "baz"),
- beanELResolver.invoke(elContext, foo, "joinDelimited", null,
- new Object[] { "-", "foo", "bar", "baz" }));
+ Assert.assertEquals(foo.joinDelimited("-", "foo", "bar", "baz"),
beanELResolver.invoke(elContext, foo,
+ "joinDelimited", null, new Object[] { "-", "foo", "bar", "baz"
}));
}
/**
- * Tests varargs that constitute a method's only parameters, as well as
- * bogus results due to improper matching of ANY vararg method, and
- * depending on the order in which reflected methods are encountered.
+ * Tests varargs that constitute a method's only parameters, as well as
bogus results due to improper matching of
+ * ANY vararg method, and depending on the order in which reflected
methods are encountered.
*/
@Test
public void testJoin() {
Assert.assertEquals(foo.join("foo", "bar", "baz"),
- beanELResolver.invoke(elContext, foo, "join", null,
- new Object[] { "foo", "bar", "baz" }));
+ beanELResolver.invoke(elContext, foo, "join", null, new
Object[] { "foo", "bar", "baz" }));
}
}
\ No newline at end of file
diff --git a/test/javax/el/TestBeanNameELResolver.java
b/test/javax/el/TestBeanNameELResolver.java
index f5ea30f331..666ae1caa9 100644
--- a/test/javax/el/TestBeanNameELResolver.java
+++ b/test/javax/el/TestBeanNameELResolver.java
@@ -29,8 +29,7 @@ public class TestBeanNameELResolver {
private static final TesterBean BEAN99 = new TesterBean(BEAN99_NAME);
/**
- * Creates the resolver that is used for the test. All the tests use a
- * resolver with the same configuration.
+ * Creates the resolver that is used for the test. All the tests use a
resolver with the same configuration.
*/
private BeanNameELResolver createBeanNameELResolver() {
return createBeanNameELResolver(true);
@@ -43,8 +42,7 @@ public class TestBeanNameELResolver {
beanNameResolver.setBeanValue(BEAN02_NAME, BEAN02);
beanNameResolver.setAllowCreate(allowCreate);
- BeanNameELResolver beanNameELResolver =
- new BeanNameELResolver(beanNameResolver);
+ BeanNameELResolver beanNameELResolver = new
BeanNameELResolver(beanNameResolver);
return beanNameELResolver;
}
@@ -52,7 +50,7 @@ public class TestBeanNameELResolver {
/**
* Tests that a null context results in an NPE as per EL Javadoc.
*/
- @Test(expected=NullPointerException.class)
+ @Test(expected = NullPointerException.class)
public void testGetValue01() {
BeanNameELResolver resolver = createBeanNameELResolver();
resolver.getValue(null, new Object(), new Object());
@@ -66,8 +64,7 @@ public class TestBeanNameELResolver {
public void testGetValue02() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.getValue(context, null, BEAN01_NAME);
@@ -83,8 +80,7 @@ public class TestBeanNameELResolver {
public void testGetValue03() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.getValue(context, new Object(), BEAN01_NAME);
@@ -94,15 +90,14 @@ public class TestBeanNameELResolver {
/**
- * Tests that a valid bean is not resolved if property is not a String even
- * if it can be coerced to a valid bean name.
+ * Tests that a valid bean is not resolved if property is not a String
even if it can be coerced to a valid bean
+ * name.
*/
@Test
public void testGetValue04() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object property = new Object() {
@Override
@@ -125,8 +120,7 @@ public class TestBeanNameELResolver {
public void testGetValue05() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.getValue(context, null, BEAN99_NAME);
@@ -140,8 +134,7 @@ public class TestBeanNameELResolver {
*/
@Test
public void testGetValue06() {
- doThrowableTest(TesterBeanNameResolver.EXCEPTION_TRIGGER_NAME,
- MethodUnderTest.GET_VALUE);
+ doThrowableTest(TesterBeanNameResolver.EXCEPTION_TRIGGER_NAME,
MethodUnderTest.GET_VALUE);
}
@@ -150,15 +143,14 @@ public class TestBeanNameELResolver {
*/
@Test
public void testGetValue07() {
- doThrowableTest(TesterBeanNameResolver.THROWABLE_TRIGGER_NAME,
- MethodUnderTest.GET_VALUE);
+ doThrowableTest(TesterBeanNameResolver.THROWABLE_TRIGGER_NAME,
MethodUnderTest.GET_VALUE);
}
/**
* Tests that a null context results in an NPE as per EL Javadoc.
*/
- @Test(expected=NullPointerException.class)
+ @Test(expected = NullPointerException.class)
public void testSetValue01() {
BeanNameELResolver resolver = createBeanNameELResolver();
resolver.setValue(null, new Object(), new Object(), new Object());
@@ -204,20 +196,18 @@ public class TestBeanNameELResolver {
/**
* Test replacing a read-only bean with create enabled.
*/
- @Test(expected=PropertyNotWritableException.class)
+ @Test(expected = PropertyNotWritableException.class)
public void testSetValue06() {
- doSetValueCreateReplaceTest(true,
- TesterBeanNameResolver.READ_ONLY_NAME);
+ doSetValueCreateReplaceTest(true,
TesterBeanNameResolver.READ_ONLY_NAME);
}
/**
* Test replacing a read-only bean with create disable.
*/
- @Test(expected=PropertyNotWritableException.class)
+ @Test(expected = PropertyNotWritableException.class)
public void testSetValue07() {
- doSetValueCreateReplaceTest(false,
- TesterBeanNameResolver.READ_ONLY_NAME);
+ doSetValueCreateReplaceTest(false,
TesterBeanNameResolver.READ_ONLY_NAME);
}
@@ -226,8 +216,7 @@ public class TestBeanNameELResolver {
*/
@Test
public void testSetValue08() {
- doThrowableTest(TesterBeanNameResolver.EXCEPTION_TRIGGER_NAME,
- MethodUnderTest.SET_VALUE);
+ doThrowableTest(TesterBeanNameResolver.EXCEPTION_TRIGGER_NAME,
MethodUnderTest.SET_VALUE);
}
@@ -236,15 +225,14 @@ public class TestBeanNameELResolver {
*/
@Test
public void testSetValue09() {
- doThrowableTest(TesterBeanNameResolver.THROWABLE_TRIGGER_NAME,
- MethodUnderTest.SET_VALUE);
+ doThrowableTest(TesterBeanNameResolver.THROWABLE_TRIGGER_NAME,
MethodUnderTest.SET_VALUE);
}
/**
* Tests that a null context results in an NPE as per EL Javadoc.
*/
- @Test(expected=NullPointerException.class)
+ @Test(expected = NullPointerException.class)
public void testGetType01() {
BeanNameELResolver resolver = createBeanNameELResolver();
resolver.getType(null, new Object(), new Object());
@@ -258,8 +246,7 @@ public class TestBeanNameELResolver {
public void testGetType02() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Class<?> result = resolver.getType(context, null, BEAN01_NAME);
@@ -275,8 +262,7 @@ public class TestBeanNameELResolver {
public void testGetType03() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Class<?> result = resolver.getType(context, new Object(), BEAN01_NAME);
@@ -286,15 +272,14 @@ public class TestBeanNameELResolver {
/**
- * Tests that a valid bean is not resolved if property is not a String even
- * if it can be coerced to a valid bean name.
+ * Tests that a valid bean is not resolved if property is not a String
even if it can be coerced to a valid bean
+ * name.
*/
@Test
public void testGetType04() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object property = new Object() {
@Override
@@ -317,8 +302,7 @@ public class TestBeanNameELResolver {
public void testGetType05() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Class<?> result = resolver.getType(context, null, BEAN99_NAME);
@@ -332,8 +316,7 @@ public class TestBeanNameELResolver {
*/
@Test
public void testGetType06() {
- doThrowableTest(TesterBeanNameResolver.EXCEPTION_TRIGGER_NAME,
- MethodUnderTest.GET_TYPE);
+ doThrowableTest(TesterBeanNameResolver.EXCEPTION_TRIGGER_NAME,
MethodUnderTest.GET_TYPE);
}
@@ -342,15 +325,14 @@ public class TestBeanNameELResolver {
*/
@Test
public void testGetType07() {
- doThrowableTest(TesterBeanNameResolver.THROWABLE_TRIGGER_NAME,
- MethodUnderTest.GET_TYPE);
+ doThrowableTest(TesterBeanNameResolver.THROWABLE_TRIGGER_NAME,
MethodUnderTest.GET_TYPE);
}
/**
* Tests that a null context results in an NPE as per EL Javadoc.
*/
- @Test(expected=NullPointerException.class)
+ @Test(expected = NullPointerException.class)
public void testIsReadOnly01() {
BeanNameELResolver resolver = createBeanNameELResolver();
resolver.isReadOnly(null, new Object(), new Object());
@@ -364,8 +346,7 @@ public class TestBeanNameELResolver {
public void testIsReadOnly02() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
boolean result = resolver.isReadOnly(context, null, BEAN01_NAME);
@@ -381,11 +362,9 @@ public class TestBeanNameELResolver {
public void testIsReadOnly03() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- boolean result = resolver.isReadOnly(context, null,
- TesterBeanNameResolver.READ_ONLY_NAME);
+ boolean result = resolver.isReadOnly(context, null,
TesterBeanNameResolver.READ_ONLY_NAME);
Assert.assertTrue(result);
Assert.assertTrue(context.isPropertyResolved());
@@ -399,8 +378,7 @@ public class TestBeanNameELResolver {
public void testIsReadOnly04() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
resolver.isReadOnly(context, new Object(), BEAN01_NAME);
@@ -409,15 +387,14 @@ public class TestBeanNameELResolver {
/**
- * Tests that a valid bean is not resolved if property is not a String even
- * if it can be coerced to a valid bean name.
+ * Tests that a valid bean is not resolved if property is not a String
even if it can be coerced to a valid bean
+ * name.
*/
@Test
public void testIsReadOnly05() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object property = new Object() {
@Override
@@ -439,8 +416,7 @@ public class TestBeanNameELResolver {
public void testIsReadOnly06() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
resolver.isReadOnly(context, null, BEAN99_NAME);
@@ -453,8 +429,7 @@ public class TestBeanNameELResolver {
*/
@Test
public void testIsReadOnly07() {
- doThrowableTest(TesterBeanNameResolver.EXCEPTION_TRIGGER_NAME,
- MethodUnderTest.IS_READ_ONLY);
+ doThrowableTest(TesterBeanNameResolver.EXCEPTION_TRIGGER_NAME,
MethodUnderTest.IS_READ_ONLY);
}
@@ -463,8 +438,7 @@ public class TestBeanNameELResolver {
*/
@Test
public void testIsReadOnly08() {
- doThrowableTest(TesterBeanNameResolver.THROWABLE_TRIGGER_NAME,
- MethodUnderTest.IS_READ_ONLY);
+ doThrowableTest(TesterBeanNameResolver.THROWABLE_TRIGGER_NAME,
MethodUnderTest.IS_READ_ONLY);
}
@@ -473,8 +447,7 @@ public class TestBeanNameELResolver {
*/
public void testGetFeatureDescriptors01() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.getFeatureDescriptors(context, null);
@@ -500,8 +473,7 @@ public class TestBeanNameELResolver {
*/
public void testGetCommonPropertyType01() {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = resolver.getCommonPropertyType(context, null);
@@ -524,8 +496,7 @@ public class TestBeanNameELResolver {
private void doThrowableTest(String trigger, MethodUnderTest method) {
BeanNameELResolver resolver = createBeanNameELResolver();
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
ELException elException = null;
try {
@@ -567,11 +538,9 @@ public class TestBeanNameELResolver {
/**
* Tests adding/replacing beans beans
*/
- private void doSetValueCreateReplaceTest(boolean canCreate,
- String beanName) {
+ private void doSetValueCreateReplaceTest(boolean canCreate, String
beanName) {
BeanNameELResolver resolver = createBeanNameELResolver(canCreate);
- ELContext context =
- new StandardELContext(ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
// Get bean one to be sure it has been replaced when testing replace
Object bean = resolver.getValue(context, null, BEAN01_NAME);
diff --git a/test/javax/el/TestCompositeELResolver.java
b/test/javax/el/TestCompositeELResolver.java
index a4485ff589..7ff2d3b559 100644
--- a/test/javax/el/TestCompositeELResolver.java
+++ b/test/javax/el/TestCompositeELResolver.java
@@ -30,8 +30,7 @@ public class TestCompositeELResolver extends TomcatBaseTest {
public void testBug50408() throws Exception {
getTomcatInstanceTestWebapp(true, true);
- int rc = getUrl("http://localhost:"; + getPort() +
- "/test/bug5nnnn/bug50408.jsp", new ByteChunk(), null);
+ int rc = getUrl("http://localhost:"; + getPort() +
"/test/bug5nnnn/bug50408.jsp", new ByteChunk(), null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
}
diff --git a/test/javax/el/TestELContext.java b/test/javax/el/TestELContext.java
index ce9f257c27..825e204cd4 100644
--- a/test/javax/el/TestELContext.java
+++ b/test/javax/el/TestELContext.java
@@ -53,9 +53,8 @@ public class TestELContext {
}
/**
- * Tests that the context object will be added to the map with context
- * objects. The key is used as unique identifier of the context object in
- * the map.
+ * Tests that the context object will be added to the map with context
objects. The key is used as unique identifier
+ * of the context object in the map.
*/
@Test
public void testPutContext03() {
@@ -68,8 +67,7 @@ public class TestELContext {
}
/**
- * Tests that propertyResolved will be set to true and the corresponding
- * listeners will be notified.
+ * Tests that propertyResolved will be set to true and the corresponding
listeners will be notified.
*/
@Test
public void testSetPropertyResolved() {
@@ -135,8 +133,7 @@ public class TestELContext {
}
/**
- * Tests that if there is no ELResolver the standard coercions will be
- * invoked.
+ * Tests that if there is no ELResolver the standard coercions will be
invoked.
*/
@Test
public void testConvertToType02() {
@@ -147,13 +144,12 @@ public class TestELContext {
Object result = elContext.convertToType("test", String.class);
Assert.assertEquals("test", result);
- Assert.assertTrue(originalPropertyResolved == elContext
- .isPropertyResolved());
+ Assert.assertTrue(originalPropertyResolved ==
elContext.isPropertyResolved());
}
/**
- * Tests that if there is ELResolver it will handle the conversion. If this
- * resolver cannot return a result the standard coercions will be invoked.
+ * Tests that if there is ELResolver it will handle the conversion. If
this resolver cannot return a result the
+ * standard coercions will be invoked.
*/
@Test
public void testConvertToType03() {
@@ -164,12 +160,10 @@ public class TestELContext {
Object result = elContext.convertToType("1", String.class);
Assert.assertEquals("ONE", result);
- Assert.assertTrue(originalPropertyResolved == elContext
- .isPropertyResolved());
+ Assert.assertTrue(originalPropertyResolved ==
elContext.isPropertyResolved());
result = elContext.convertToType("test", String.class);
Assert.assertEquals("test", result);
- Assert.assertTrue(originalPropertyResolved == elContext
- .isPropertyResolved());
+ Assert.assertTrue(originalPropertyResolved ==
elContext.isPropertyResolved());
}
}
diff --git a/test/javax/el/TestELProcessor.java
b/test/javax/el/TestELProcessor.java
index 4d3a14611d..b46cbe68ab 100644
--- a/test/javax/el/TestELProcessor.java
+++ b/test/javax/el/TestELProcessor.java
@@ -29,14 +29,14 @@ public class TestELProcessor {
}
- @Test(expected=ELException.class)
+ @Test(expected = ELException.class)
public void testEval01() {
ELProcessor elp = new ELProcessor();
elp.eval("${1+1}");
}
- @Test(expected=ELException.class)
+ @Test(expected = ELException.class)
public void testEval02() {
ELProcessor elp = new ELProcessor();
elp.eval("#{1+1}");
@@ -55,10 +55,8 @@ public class TestELProcessor {
@Test
public void testDefineFunctionMethod01() throws Exception {
ELProcessor elp = new ELProcessor();
- elp.defineFunction("fn", "toBoolean",
- Boolean.class.getMethod("valueOf", String.class));
- Assert.assertEquals(Boolean.valueOf(true),
- elp.eval("fn:toBoolean(true)"));
+ elp.defineFunction("fn", "toBoolean",
Boolean.class.getMethod("valueOf", String.class));
+ Assert.assertEquals(Boolean.valueOf(true),
elp.eval("fn:toBoolean(true)"));
}
@@ -68,8 +66,7 @@ public class TestELProcessor {
// java.lang should be automatically imported so no need for full class
// name
elp.defineFunction("fn", "toBoolean", "Boolean", "valueOf");
- Assert.assertEquals(Boolean.valueOf(true),
- elp.eval("fn:toBoolean(true)"));
+ Assert.assertEquals(Boolean.valueOf(true),
elp.eval("fn:toBoolean(true)"));
}
@@ -196,7 +193,7 @@ public class TestELProcessor {
@Test
public void testPrimitiveArray01() {
ELProcessor elp = new ELProcessor();
- TesterBean bean01= new TesterBean("bean01");
+ TesterBean bean01 = new TesterBean("bean01");
elp.defineBean("bean01", bean01);
elp.defineBean("bean02", new TesterBean("bean02"));
diff --git a/test/javax/el/TestELResolver.java
b/test/javax/el/TestELResolver.java
index 3caaa53eb3..569a1a6746 100644
--- a/test/javax/el/TestELResolver.java
+++ b/test/javax/el/TestELResolver.java
@@ -25,9 +25,7 @@ public class TestELResolver {
public void testConvertToType01() {
ELContext context = new TesterELContext();
- ValueExpression ve =
- ELManager.getExpressionFactory().createValueExpression(
- context, "1", String.class);
+ ValueExpression ve =
ELManager.getExpressionFactory().createValueExpression(context, "1",
String.class);
String result = (String) ve.getValue(context);
@@ -39,9 +37,7 @@ public class TestELResolver {
public void testConvertToType02() {
ELContext context = new TesterELContext(new TesterELResolverOne());
- ValueExpression ve =
- ELManager.getExpressionFactory().createValueExpression(
- context, "1", String.class);
+ ValueExpression ve =
ELManager.getExpressionFactory().createValueExpression(context, "1",
String.class);
String result = (String) ve.getValue(context);
@@ -53,9 +49,7 @@ public class TestELResolver {
public void testConvertToType03() {
ELContext context = new TesterELContext(new TesterELResolverOne());
- ValueExpression ve =
- ELManager.getExpressionFactory().createValueExpression(
- context, "2", String.class);
+ ValueExpression ve =
ELManager.getExpressionFactory().createValueExpression(context, "2",
String.class);
String result = (String) ve.getValue(context);
@@ -68,9 +62,7 @@ public class TestELResolver {
CompositeELResolver resolver = new CompositeELResolver();
ELContext context = new TesterELContext(resolver);
- ValueExpression ve =
- ELManager.getExpressionFactory().createValueExpression(
- context, "2", String.class);
+ ValueExpression ve =
ELManager.getExpressionFactory().createValueExpression(context, "2",
String.class);
String result = (String) ve.getValue(context);
@@ -85,9 +77,7 @@ public class TestELResolver {
resolver.add(new TesterELResolverTwo());
ELContext context = new TesterELContext(resolver);
- ValueExpression ve =
- ELManager.getExpressionFactory().createValueExpression(
- context, "1", String.class);
+ ValueExpression ve =
ELManager.getExpressionFactory().createValueExpression(context, "1",
String.class);
String result = (String) ve.getValue(context);
@@ -102,9 +92,7 @@ public class TestELResolver {
resolver.add(new TesterELResolverTwo());
ELContext context = new TesterELContext(resolver);
- ValueExpression ve =
- ELManager.getExpressionFactory().createValueExpression(
- context, "2", String.class);
+ ValueExpression ve =
ELManager.getExpressionFactory().createValueExpression(context, "2",
String.class);
String result = (String) ve.getValue(context);
@@ -119,9 +107,7 @@ public class TestELResolver {
resolver.add(new TesterELResolverTwo());
ELContext context = new TesterELContext(resolver);
- ValueExpression ve =
- ELManager.getExpressionFactory().createValueExpression(
- context, "3", String.class);
+ ValueExpression ve =
ELManager.getExpressionFactory().createValueExpression(context, "3",
String.class);
String result = (String) ve.getValue(context);
@@ -133,8 +119,8 @@ public class TestELResolver {
public void testDefaultConvertToType() {
ELContext context = new TesterELContext(new StaticFieldELResolver());
- ValueExpression ve =
ELManager.getExpressionFactory().createValueExpression(
- context, "${!Boolean.FALSE}", Boolean.class);
+ ValueExpression ve =
ELManager.getExpressionFactory().createValueExpression(context,
"${!Boolean.FALSE}",
+ Boolean.class);
Boolean result = (Boolean) ve.getValue(context);
diff --git a/test/javax/el/TestEvaluationListener.java
b/test/javax/el/TestEvaluationListener.java
index 13d8356ffe..fe00e6fc02 100644
--- a/test/javax/el/TestEvaluationListener.java
+++ b/test/javax/el/TestEvaluationListener.java
@@ -84,8 +84,7 @@ public class TestEvaluationListener {
ExpressionFactory factory = ELManager.getExpressionFactory();
ELContext context = new TesterELContext();
String expression = "${1 + 1}";
- ValueExpression ve =
- factory.createValueExpression(context, expression, int.class);
+ ValueExpression ve = factory.createValueExpression(context,
expression, int.class);
TesterEvaluationListener listener = new TesterEvaluationListener();
context.addEvaluationListener(listener);
@@ -110,8 +109,7 @@ public class TestEvaluationListener {
ExpressionFactory factory = ELManager.getExpressionFactory();
ELContext context = new TesterELContext(new CompositeELResolver());
String expression = "${foo.bar + 1}";
- ValueExpression ve =
- factory.createValueExpression(context, expression, int.class);
+ ValueExpression ve = factory.createValueExpression(context,
expression, int.class);
TesterEvaluationListener listener = new TesterEvaluationListener();
context.addEvaluationListener(listener);
diff --git a/test/javax/el/TestImportHandler.java
b/test/javax/el/TestImportHandler.java
index 537d80decb..7b1ecd7999 100644
--- a/test/javax/el/TestImportHandler.java
+++ b/test/javax/el/TestImportHandler.java
@@ -64,8 +64,7 @@ public class TestImportHandler {
for (int i = 1; i <= 3; i++) {
try {
Class<?> clazz = handler.resolveClass("ExceptionUtils");
- Assert.fail("Expected ELException but got [" + clazz.getName()
- + "] on iteration " + i);
+ Assert.fail("Expected ELException but got [" + clazz.getName()
+ "] on iteration " + i);
} catch (ELException ex) {
// Expected
}
@@ -74,8 +73,7 @@ public class TestImportHandler {
/**
- * Multiple package imports with a single match.
- * https://bz.apache.org/bugzilla/show_bug.cgi?id=57113
+ * Multiple package imports with a single match.
https://bz.apache.org/bugzilla/show_bug.cgi?id=57113
*/
@Test
public void testResolveClass04() {
@@ -158,8 +156,7 @@ public class TestImportHandler {
for (int i = 1; i <= 3; i++) {
try {
handler.importClass("org.apache.jasper.util.ExceptionUtils");
- Assert.fail("Expected ELException but got none on iteration "
- + i);
+ Assert.fail("Expected ELException but got none on iteration "
+ i);
} catch (ELException ex) {
// Expected
}
@@ -214,7 +211,7 @@ public class TestImportHandler {
/**
* Import an invalid static field - does not exist.
*/
- @Test(expected=ELException.class)
+ @Test(expected = ELException.class)
public void testImportStatic02() {
ImportHandler handler = new ImportHandler();
@@ -248,8 +245,7 @@ public class TestImportHandler {
for (int i = 1; i <= 3; i++) {
try {
handler.importStatic("org.apache.tomcat.util.scan.Constants.Package");
- Assert.fail("Expected ELException but got none on iteration "
- + i);
+ Assert.fail("Expected ELException but got none on iteration "
+ i);
} catch (ELException ex) {
// Expected
}
@@ -258,8 +254,7 @@ public class TestImportHandler {
/**
- * Package imports with conflicts due to non-public classes should not
- * conflict.
+ * Package imports with conflicts due to non-public classes should not
conflict.
*/
@Test
public void testBug57135() {
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java
b/test/javax/el/TestImportHandlerStandardPackages.java
index f314a434f4..c6f98c2f89 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -41,9 +41,9 @@ public class TestImportHandlerStandardPackages {
Object obj = f.get(null);
@SuppressWarnings("unchecked")
- Map<String,Set<String>> standardPackageName = (Map<String,
Set<String>>) obj;
+ Map<String, Set<String>> standardPackageName = (Map<String,
Set<String>>) obj;
- for (Map.Entry<String,Set<String>> entry :
standardPackageName.entrySet()) {
+ for (Map.Entry<String, Set<String>> entry :
standardPackageName.entrySet()) {
checkPackageClassList(entry.getKey(), entry.getValue());
}
}
@@ -63,9 +63,9 @@ public class TestImportHandlerStandardPackages {
return;
}
for (String fileName : getJavaBaseClasses()) {
- if (!fileName.startsWith("java/lang/") || // Class
not in java.lang
- fileName.lastIndexOf('/') != 9 || // Class no
in sub-package
- !fileName.endsWith(".class")) { // Exclude
non-class resources
+ if (!fileName.startsWith("java/lang/") || // Class not in
java.lang
+ fileName.lastIndexOf('/') != 9 || // Class no in
sub-package
+ !fileName.endsWith(".class")) { // Exclude non-class
resources
continue;
}
// Extract class name
@@ -82,8 +82,7 @@ public class TestImportHandlerStandardPackages {
continue;
}
// Skip public inner classes of non-public classes
- if (className.startsWith("FdLibm.") ||
- className.startsWith("LiveStackFrame.") ||
+ if (className.startsWith("FdLibm.") ||
className.startsWith("LiveStackFrame.") ||
className.startsWith("WeakPairMap.")) {
continue;
}
@@ -128,7 +127,7 @@ public class TestImportHandlerStandardPackages {
// Skip classes already known
continue;
}
- File f = new File (dir, file);
+ File f = new File(dir, file);
if (!f.isFile()) {
// Skip directories
continue;
@@ -161,7 +160,7 @@ public class TestImportHandlerStandardPackages {
// Returns Optional containing a ModuleReference
Object optMRef = clazzModuleFinder.getMethod("find",
String.class).invoke(mf, "java.base");
// Extract the ModuleReference
- Object mRef = clazzOptional.getMethod("get").invoke(optMRef);
+ Object mRef = clazzOptional.getMethod("get").invoke(optMRef);
// Returns ModuleReader
Object mr = clazzModuleReference.getMethod("open").invoke(mRef);
// Returns a Stream of class names
@@ -169,7 +168,7 @@ public class TestImportHandlerStandardPackages {
// Convert to an array
Object[] names = (Object[])
clazzStream.getMethod("toArray").invoke(stream);
// Cast
- String [] result = new String[names.length];
+ String[] result = new String[names.length];
for (int i = 0; i < names.length; i++) {
result[i] = (String) names[i];
}
diff --git a/test/javax/el/TestListELResolver.java
b/test/javax/el/TestListELResolver.java
index 60aea8cd3a..d0dc5602f9 100644
--- a/test/javax/el/TestListELResolver.java
+++ b/test/javax/el/TestListELResolver.java
@@ -39,8 +39,7 @@ public class TestListELResolver {
*/
@Test
public void testGetValue02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_VALUE,
- true);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_VALUE,
true);
}
/**
@@ -49,8 +48,7 @@ public class TestListELResolver {
@Test
public void testGetValue03() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -66,8 +64,7 @@ public class TestListELResolver {
@Test(expected = IllegalArgumentException.class)
public void testGetValue04() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -80,8 +77,7 @@ public class TestListELResolver {
@Test
public void testGetValue05() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -110,8 +106,7 @@ public class TestListELResolver {
*/
@Test
public void testGetType02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_TYPE,
- true);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_TYPE,
true);
}
/**
@@ -120,8 +115,7 @@ public class TestListELResolver {
@Test
public void testGetType03() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -137,8 +131,7 @@ public class TestListELResolver {
@Test(expected = PropertyNotFoundException.class)
public void testGetType04() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -159,8 +152,7 @@ public class TestListELResolver {
*/
@Test
public void testSetValue02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.SET_VALUE,
- false);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.SET_VALUE,
false);
}
/**
@@ -169,11 +161,9 @@ public class TestListELResolver {
@Test(expected = PropertyNotWritableException.class)
public void testSetValue03() {
ListELResolver resolver = new ListELResolver(true);
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- resolver.setValue(context, new ArrayList<>(), new Object(),
- new Object());
+ resolver.setValue(context, new ArrayList<>(), new Object(), new
Object());
}
/**
@@ -182,15 +172,13 @@ public class TestListELResolver {
@Test
public void testSetValue04() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("value");
resolver.setValue(context, list, Integer.valueOf(0), "value");
- Assert.assertEquals("value",
- resolver.getValue(context, list, Integer.valueOf(0)));
+ Assert.assertEquals("value", resolver.getValue(context, list,
Integer.valueOf(0)));
Assert.assertTrue(context.isPropertyResolved());
}
@@ -200,8 +188,7 @@ public class TestListELResolver {
@Test(expected = PropertyNotWritableException.class)
public void testSetValue05() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
List<Object> list = Collections.unmodifiableList(new ArrayList<>());
resolver.setValue(context, list, Integer.valueOf(0), "value");
@@ -213,8 +200,7 @@ public class TestListELResolver {
@Test(expected = IllegalArgumentException.class)
public void testSetValue06() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -227,8 +213,7 @@ public class TestListELResolver {
@Test(expected = PropertyNotFoundException.class)
public void testSetValue07() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -250,11 +235,9 @@ public class TestListELResolver {
@Test
public void testIsReadOnly02() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- boolean result = resolver.isReadOnly(context, new Object(),
- new Object());
+ boolean result = resolver.isReadOnly(context, new Object(), new
Object());
Assert.assertFalse(result);
Assert.assertFalse(context.isPropertyResolved());
@@ -268,14 +251,13 @@ public class TestListELResolver {
}
/**
- * Tests that if the ListELResolver is constructed with readOnly the method
- * will return always true, otherwise false.
+ * Tests that if the ListELResolver is constructed with readOnly the
method will return always true, otherwise
+ * false.
*/
@Test
public void testIsReadOnly03() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -298,14 +280,12 @@ public class TestListELResolver {
@Test
public void testIsReadOnly04() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
List<String> unmodifiableList = Collections.unmodifiableList(list);
- boolean result = resolver.isReadOnly(context, unmodifiableList,
- Integer.valueOf(0));
+ boolean result = resolver.isReadOnly(context, unmodifiableList,
Integer.valueOf(0));
Assert.assertTrue(result);
Assert.assertTrue(context.isPropertyResolved());
@@ -317,8 +297,7 @@ public class TestListELResolver {
@Test(expected = PropertyNotFoundException.class)
public void testIsReadOnly05() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -331,8 +310,7 @@ public class TestListELResolver {
@Test
public void testIsReadOnly06() {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
List<String> list = new ArrayList<>();
list.add("key");
@@ -349,30 +327,28 @@ public class TestListELResolver {
Assert.assertTrue(context.isPropertyResolved());
}
- private void doNegativeTest(Object base, Object trigger,
- MethodUnderTest method, boolean checkResult) {
+ private void doNegativeTest(Object base, Object trigger, MethodUnderTest
method, boolean checkResult) {
ListELResolver resolver = new ListELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = null;
switch (method) {
- case GET_VALUE: {
- result = resolver.getValue(context, base, trigger);
- break;
- }
- case SET_VALUE: {
- resolver.setValue(context, base, trigger, new Object());
- break;
- }
- case GET_TYPE: {
- result = resolver.getType(context, base, trigger);
- break;
- }
- default: {
- // Should never happen
- Assert.fail("Missing case for method");
- }
+ case GET_VALUE: {
+ result = resolver.getValue(context, base, trigger);
+ break;
+ }
+ case SET_VALUE: {
+ resolver.setValue(context, base, trigger, new Object());
+ break;
+ }
+ case GET_TYPE: {
+ result = resolver.getType(context, base, trigger);
+ break;
+ }
+ default: {
+ // Should never happen
+ Assert.fail("Missing case for method");
+ }
}
if (checkResult) {
@@ -382,7 +358,9 @@ public class TestListELResolver {
}
private enum MethodUnderTest {
- GET_VALUE, SET_VALUE, GET_TYPE
+ GET_VALUE,
+ SET_VALUE,
+ GET_TYPE
}
}
diff --git a/test/javax/el/TestMapELResolver.java
b/test/javax/el/TestMapELResolver.java
index 1a87b7ff08..feac89820b 100644
--- a/test/javax/el/TestMapELResolver.java
+++ b/test/javax/el/TestMapELResolver.java
@@ -41,8 +41,7 @@ public class TestMapELResolver {
*/
@Test
public void testGetType02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_TYPE,
- true);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_TYPE,
true);
}
/**
@@ -51,11 +50,9 @@ public class TestMapELResolver {
@Test
public void testGetType03() {
MapELResolver mapELResolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Class<?> result = mapELResolver.getType(context, new HashMap<>(),
- "test");
+ Class<?> result = mapELResolver.getType(context, new HashMap<>(),
"test");
Assert.assertEquals(Object.class, result);
Assert.assertTrue(context.isPropertyResolved());
@@ -75,8 +72,7 @@ public class TestMapELResolver {
*/
@Test
public void testGetValue02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_VALUE,
- true);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_VALUE,
true);
}
/**
@@ -85,8 +81,7 @@ public class TestMapELResolver {
@Test
public void testGetValue03() {
MapELResolver mapELResolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Map<String, String> map = new HashMap<>();
map.put("key", "value");
@@ -115,8 +110,7 @@ public class TestMapELResolver {
*/
@Test
public void testSetValue02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.SET_VALUE,
- false);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.SET_VALUE,
false);
}
/**
@@ -125,11 +119,9 @@ public class TestMapELResolver {
@Test(expected = PropertyNotWritableException.class)
public void testSetValue03() {
MapELResolver mapELResolver = new MapELResolver(true);
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- mapELResolver.setValue(context, new HashMap<>(), new Object(),
- new Object());
+ mapELResolver.setValue(context, new HashMap<>(), new Object(), new
Object());
}
/**
@@ -138,14 +130,12 @@ public class TestMapELResolver {
@Test
public void testSetValue04() {
MapELResolver mapELResolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Map<String, String> map = new HashMap<>();
mapELResolver.setValue(context, map, "key", "value");
- Assert.assertEquals("value",
- mapELResolver.getValue(context, map, "key"));
+ Assert.assertEquals("value", mapELResolver.getValue(context, map,
"key"));
Assert.assertTrue(context.isPropertyResolved());
}
@@ -155,8 +145,7 @@ public class TestMapELResolver {
@Test(expected = PropertyNotWritableException.class)
public void testSetValue05() {
MapELResolver mapELResolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Map<Object, Object> map = Collections.unmodifiableMap(new HashMap<>());
mapELResolver.setValue(context, map, "key", "value");
@@ -177,11 +166,9 @@ public class TestMapELResolver {
@Test
public void testIsReadOnly02() {
MapELResolver mapELResolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- boolean result = mapELResolver.isReadOnly(context, new Object(),
- new Object());
+ boolean result = mapELResolver.isReadOnly(context, new Object(), new
Object());
Assert.assertFalse(result);
Assert.assertFalse(context.isPropertyResolved());
@@ -195,25 +182,21 @@ public class TestMapELResolver {
}
/**
- * Tests that if the MapELResolver is constructed with readOnly the method
- * will return always true, otherwise false.
+ * Tests that if the MapELResolver is constructed with readOnly the method
will return always true, otherwise false.
*/
@Test
public void testIsReadOnly03() {
MapELResolver mapELResolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- boolean result = mapELResolver.isReadOnly(context, new HashMap<>(),
- new Object());
+ boolean result = mapELResolver.isReadOnly(context, new HashMap<>(),
new Object());
Assert.assertFalse(result);
Assert.assertTrue(context.isPropertyResolved());
mapELResolver = new MapELResolver(true);
- result = mapELResolver.isReadOnly(context, new HashMap<>(),
- new Object());
+ result = mapELResolver.isReadOnly(context, new HashMap<>(), new
Object());
Assert.assertTrue(result);
Assert.assertTrue(context.isPropertyResolved());
@@ -225,8 +208,7 @@ public class TestMapELResolver {
@Test
public void testIsReadOnly04() {
MapELResolver mapELResolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Map<Object, Object> map = Collections.unmodifiableMap(new HashMap<>());
boolean result = mapELResolver.isReadOnly(context, map, new Object());
@@ -236,17 +218,14 @@ public class TestMapELResolver {
}
/**
- * Tests that a valid FeatureDescriptors are not returned if base is not
- * Map.
+ * Tests that a valid FeatureDescriptors are not returned if base is not
Map.
*/
@Test
public void testGetFeatureDescriptors01() {
MapELResolver mapELResolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Iterator<FeatureDescriptor> result = mapELResolver
- .getFeatureDescriptors(context, new Object());
+ Iterator<FeatureDescriptor> result =
mapELResolver.getFeatureDescriptors(context, new Object());
Assert.assertNull(result);
}
@@ -257,13 +236,11 @@ public class TestMapELResolver {
@Test
public void testGetFeatureDescriptors02() {
MapELResolver mapELResolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Map<String, String> map = new HashMap<>();
map.put("key", "value");
- Iterator<FeatureDescriptor> result = mapELResolver
- .getFeatureDescriptors(context, map);
+ Iterator<FeatureDescriptor> result =
mapELResolver.getFeatureDescriptors(context, map);
while (result.hasNext()) {
FeatureDescriptor featureDescriptor = result.next();
@@ -273,37 +250,33 @@ public class TestMapELResolver {
Assert.assertFalse(featureDescriptor.isExpert());
Assert.assertFalse(featureDescriptor.isHidden());
Assert.assertTrue(featureDescriptor.isPreferred());
- Assert.assertEquals("key".getClass(),
- featureDescriptor.getValue(ELResolver.TYPE));
- Assert.assertEquals(Boolean.TRUE, featureDescriptor
- .getValue(ELResolver.RESOLVABLE_AT_DESIGN_TIME));
+ Assert.assertEquals("key".getClass(),
featureDescriptor.getValue(ELResolver.TYPE));
+ Assert.assertEquals(Boolean.TRUE,
featureDescriptor.getValue(ELResolver.RESOLVABLE_AT_DESIGN_TIME));
}
}
- private void doNegativeTest(Object base, Object trigger,
- MethodUnderTest method, boolean checkResult) {
+ private void doNegativeTest(Object base, Object trigger, MethodUnderTest
method, boolean checkResult) {
MapELResolver resolver = new MapELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = null;
switch (method) {
- case GET_VALUE: {
- result = resolver.getValue(context, base, trigger);
- break;
- }
- case SET_VALUE: {
- resolver.setValue(context, base, trigger, new Object());
- break;
- }
- case GET_TYPE: {
- result = resolver.getType(context, base, trigger);
- break;
- }
- default: {
- // Should never happen
- Assert.fail("Missing case for method");
- }
+ case GET_VALUE: {
+ result = resolver.getValue(context, base, trigger);
+ break;
+ }
+ case SET_VALUE: {
+ resolver.setValue(context, base, trigger, new Object());
+ break;
+ }
+ case GET_TYPE: {
+ result = resolver.getType(context, base, trigger);
+ break;
+ }
+ default: {
+ // Should never happen
+ Assert.fail("Missing case for method");
+ }
}
if (checkResult) {
@@ -313,6 +286,8 @@ public class TestMapELResolver {
}
private enum MethodUnderTest {
- GET_VALUE, SET_VALUE, GET_TYPE
+ GET_VALUE,
+ SET_VALUE,
+ GET_TYPE
}
}
diff --git a/test/javax/el/TestResourceBundleELResolver.java
b/test/javax/el/TestResourceBundleELResolver.java
index fe704cebc5..f1ea5db189 100644
--- a/test/javax/el/TestResourceBundleELResolver.java
+++ b/test/javax/el/TestResourceBundleELResolver.java
@@ -36,15 +36,12 @@ public class TestResourceBundleELResolver {
ResourceBundle rb = new TesterResourceBundle();
- ValueExpression var = factory.createValueExpression(rb,
- ResourceBundle.class);
+ ValueExpression var = factory.createValueExpression(rb,
ResourceBundle.class);
context.getVariableMapper().setVariable("rb", var);
- ValueExpression ve = factory.createValueExpression(context,
- "${rb.keys}", String.class);
+ ValueExpression ve = factory.createValueExpression(context,
"${rb.keys}", String.class);
- MethodExpression me = factory.createMethodExpression(context,
- "${rb.getKeys()}", Enumeration.class, null);
+ MethodExpression me = factory.createMethodExpression(context,
"${rb.getKeys()}", Enumeration.class, null);
// Ensure we are specification compliant
String result1 = (String) ve.getValue(context);
@@ -80,13 +77,11 @@ public class TestResourceBundleELResolver {
}
/**
- * Tests that a valid property is not resolved if base is not
- * ResourceBundle.
+ * Tests that a valid property is not resolved if base is not
ResourceBundle.
*/
@Test
public void testGetValue02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_VALUE,
- true);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_VALUE,
true);
}
/**
@@ -95,8 +90,7 @@ public class TestResourceBundleELResolver {
@Test
public void testGetValue03() {
ResourceBundleELResolver resolver = new ResourceBundleELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
ResourceBundle resourceBundle = new TesterResourceBundle();
Object result = resolver.getValue(context, resourceBundle, "key1");
@@ -125,24 +119,20 @@ public class TestResourceBundleELResolver {
}
/**
- * Tests that a valid property is not resolved if base is not
- * ResourceBundle.
+ * Tests that a valid property is not resolved if base is not
ResourceBundle.
*/
@Test
public void testGetType02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_TYPE,
- true);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.GET_TYPE,
true);
}
/**
- * Tests that null will be returned when base is ResourceBundle. Checks
that
- * the propertyResolved is true.
+ * Tests that null will be returned when base is ResourceBundle. Checks
that the propertyResolved is true.
*/
@Test
public void testGetType03() {
ResourceBundleELResolver resolver = new ResourceBundleELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
ResourceBundle resourceBundle = new TesterResourceBundle();
Class<?> result = resolver.getType(context, resourceBundle, "key1");
@@ -165,8 +155,7 @@ public class TestResourceBundleELResolver {
*/
@Test
public void testSetValue02() {
- doNegativeTest(new Object(), new Object(), MethodUnderTest.SET_VALUE,
- false);
+ doNegativeTest(new Object(), new Object(), MethodUnderTest.SET_VALUE,
false);
}
/**
@@ -175,8 +164,7 @@ public class TestResourceBundleELResolver {
@Test(expected = PropertyNotWritableException.class)
public void testSetValue03() {
ResourceBundleELResolver resolver = new ResourceBundleELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
ResourceBundle resourceBundle = new TesterResourceBundle();
resolver.setValue(context, resourceBundle, new Object(), new Object());
@@ -192,17 +180,14 @@ public class TestResourceBundleELResolver {
}
/**
- * Tests that the propertyResolved is false and readOnly is false if base
is
- * not ResourceBundle.
+ * Tests that the propertyResolved is false and readOnly is false if base
is not ResourceBundle.
*/
@Test
public void testIsReadOnly02() {
ResourceBundleELResolver resolver = new ResourceBundleELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- boolean result = resolver.isReadOnly(context, new Object(),
- new Object());
+ boolean result = resolver.isReadOnly(context, new Object(), new
Object());
Assert.assertFalse(result);
Assert.assertFalse(context.isPropertyResolved());
@@ -214,29 +199,24 @@ public class TestResourceBundleELResolver {
@Test
public void testIsReadOnly03() {
ResourceBundleELResolver resolver = new ResourceBundleELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
ResourceBundle resourceBundle = new TesterResourceBundle();
- boolean result = resolver.isReadOnly(context, resourceBundle,
- new Object());
+ boolean result = resolver.isReadOnly(context, resourceBundle, new
Object());
Assert.assertTrue(result);
Assert.assertTrue(context.isPropertyResolved());
}
/**
- * Tests that a valid FeatureDescriptors are not returned if base is not
- * ResourceBundle.
+ * Tests that a valid FeatureDescriptors are not returned if base is not
ResourceBundle.
*/
@Test
public void testGetFeatureDescriptors01() {
ResourceBundleELResolver resolver = new ResourceBundleELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Iterator<FeatureDescriptor> result = resolver.getFeatureDescriptors(
- context, new Object());
+ Iterator<FeatureDescriptor> result =
resolver.getFeatureDescriptors(context, new Object());
Assert.assertNull(result);
}
@@ -247,13 +227,10 @@ public class TestResourceBundleELResolver {
@Test
public void testGetFeatureDescriptors02() {
ResourceBundleELResolver resolver = new ResourceBundleELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- ResourceBundle resourceBundle = new TesterResourceBundle(
- new Object[][] { { "key", "value" } });
- Iterator<FeatureDescriptor> result = resolver.getFeatureDescriptors(
- context, resourceBundle);
+ ResourceBundle resourceBundle = new TesterResourceBundle(new
Object[][] { { "key", "value" } });
+ Iterator<FeatureDescriptor> result =
resolver.getFeatureDescriptors(context, resourceBundle);
while (result.hasNext()) {
FeatureDescriptor featureDescriptor = result.next();
@@ -263,10 +240,8 @@ public class TestResourceBundleELResolver {
Assert.assertFalse(featureDescriptor.isExpert());
Assert.assertFalse(featureDescriptor.isHidden());
Assert.assertTrue(featureDescriptor.isPreferred());
- Assert.assertEquals(String.class,
- featureDescriptor.getValue(ELResolver.TYPE));
- Assert.assertEquals(Boolean.TRUE, featureDescriptor
- .getValue(ELResolver.RESOLVABLE_AT_DESIGN_TIME));
+ Assert.assertEquals(String.class,
featureDescriptor.getValue(ELResolver.TYPE));
+ Assert.assertEquals(Boolean.TRUE,
featureDescriptor.getValue(ELResolver.RESOLVABLE_AT_DESIGN_TIME));
}
}
@@ -288,30 +263,28 @@ public class TestResourceBundleELResolver {
private Object[][] contents;
}
- private void doNegativeTest(Object base, Object trigger,
- MethodUnderTest method, boolean checkResult) {
+ private void doNegativeTest(Object base, Object trigger, MethodUnderTest
method, boolean checkResult) {
ResourceBundleELResolver resolver = new ResourceBundleELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = null;
switch (method) {
- case GET_VALUE: {
- result = resolver.getValue(context, base, trigger);
- break;
- }
- case SET_VALUE: {
- resolver.setValue(context, base, trigger, new Object());
- break;
- }
- case GET_TYPE: {
- result = resolver.getType(context, base, trigger);
- break;
- }
- default: {
- // Should never happen
- Assert.fail("Missing case for method");
- }
+ case GET_VALUE: {
+ result = resolver.getValue(context, base, trigger);
+ break;
+ }
+ case SET_VALUE: {
+ resolver.setValue(context, base, trigger, new Object());
+ break;
+ }
+ case GET_TYPE: {
+ result = resolver.getType(context, base, trigger);
+ break;
+ }
+ default: {
+ // Should never happen
+ Assert.fail("Missing case for method");
+ }
}
if (checkResult) {
@@ -321,6 +294,8 @@ public class TestResourceBundleELResolver {
}
private enum MethodUnderTest {
- GET_VALUE, SET_VALUE, GET_TYPE
+ GET_VALUE,
+ SET_VALUE,
+ GET_TYPE
}
}
diff --git a/test/javax/el/TestStaticFieldELResolver.java
b/test/javax/el/TestStaticFieldELResolver.java
index 3655865153..2663451bde 100644
--- a/test/javax/el/TestStaticFieldELResolver.java
+++ b/test/javax/el/TestStaticFieldELResolver.java
@@ -47,11 +47,9 @@ public class TestStaticFieldELResolver {
@Test
public void testGetValue02() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.getValue(context, new ELClass(
- TesterClass.class), PROPERTY01_NAME);
+ Object result = resolver.getValue(context, new
ELClass(TesterClass.class), PROPERTY01_NAME);
Assert.assertEquals(PROPERTY01_NAME, result);
Assert.assertTrue(context.isPropertyResolved());
@@ -70,8 +68,7 @@ public class TestStaticFieldELResolver {
*/
@Test
public void testGetValue04() {
- doNegativeTest(new ELClass(TesterClass.class), new Object(),
- MethodUnderTest.GET_VALUE);
+ doNegativeTest(new ELClass(TesterClass.class), new Object(),
MethodUnderTest.GET_VALUE);
}
/**
@@ -112,11 +109,10 @@ public class TestStaticFieldELResolver {
@Test
public void testGetValue09() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.getValue(context, new ELClass(
- MethodUnderTest.class), MethodUnderTest.GET_TYPE.toString());
+ Object result = resolver.getValue(context, new
ELClass(MethodUnderTest.class),
+ MethodUnderTest.GET_TYPE.toString());
Assert.assertEquals(MethodUnderTest.GET_TYPE, result);
Assert.assertTrue(context.isPropertyResolved());
@@ -137,11 +133,9 @@ public class TestStaticFieldELResolver {
@Test(expected = PropertyNotWritableException.class)
public void testSetValue02() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- resolver.setValue(context, new ELClass(TesterClass.class),
- PROPERTY01_NAME, PROPERTY01_VALUE);
+ resolver.setValue(context, new ELClass(TesterClass.class),
PROPERTY01_NAME, PROPERTY01_VALUE);
}
/**
@@ -157,8 +151,7 @@ public class TestStaticFieldELResolver {
*/
@Test
public void testSetValue04() {
- doNegativeTest(new ELClass(TesterClass.class), new Object(),
- MethodUnderTest.SET_VALUE);
+ doNegativeTest(new ELClass(TesterClass.class), new Object(),
MethodUnderTest.SET_VALUE);
}
/**
@@ -171,17 +164,14 @@ public class TestStaticFieldELResolver {
}
/**
- * Tests that the propertyResolved is true when base is ELCLass and the
- * property is String.
+ * Tests that the propertyResolved is true when base is ELCLass and the
property is String.
*/
@Test
public void testIsReadOnly02() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- boolean result = resolver.isReadOnly(context, new ELClass(
- TesterClass.class), PROPERTY01_NAME);
+ boolean result = resolver.isReadOnly(context, new
ELClass(TesterClass.class), PROPERTY01_NAME);
Assert.assertTrue(result);
Assert.assertTrue(context.isPropertyResolved());
@@ -193,11 +183,9 @@ public class TestStaticFieldELResolver {
@Test
public void testIsReadOnly03() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- boolean result = resolver.isReadOnly(context, new Object(),
- PROPERTY01_NAME);
+ boolean result = resolver.isReadOnly(context, new Object(),
PROPERTY01_NAME);
Assert.assertTrue(result);
Assert.assertFalse(context.isPropertyResolved());
@@ -209,11 +197,9 @@ public class TestStaticFieldELResolver {
@Test
public void testIsReadOnly04() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- boolean result = resolver.isReadOnly(context, new ELClass(
- TesterClass.class), new Object());
+ boolean result = resolver.isReadOnly(context, new
ELClass(TesterClass.class), new Object());
Assert.assertTrue(result);
Assert.assertFalse(context.isPropertyResolved());
@@ -234,11 +220,9 @@ public class TestStaticFieldELResolver {
@Test
public void testGetType02() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Class<?> result = resolver.getType(context, new ELClass(
- TesterClass.class), PROPERTY01_NAME);
+ Class<?> result = resolver.getType(context, new
ELClass(TesterClass.class), PROPERTY01_NAME);
Assert.assertEquals(PROPERTY01_NAME.getClass(), result);
Assert.assertTrue(context.isPropertyResolved());
@@ -257,8 +241,7 @@ public class TestStaticFieldELResolver {
*/
@Test
public void testGetType04() {
- doNegativeTest(new ELClass(TesterClass.class), new Object(),
- MethodUnderTest.GET_TYPE);
+ doNegativeTest(new ELClass(TesterClass.class), new Object(),
MethodUnderTest.GET_TYPE);
}
/**
@@ -299,11 +282,10 @@ public class TestStaticFieldELResolver {
@Test
public void testGetType09() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Class<?> result = resolver.getType(context, new ELClass(
- MethodUnderTest.class), MethodUnderTest.GET_TYPE.toString());
+ Class<?> result = resolver.getType(context, new
ELClass(MethodUnderTest.class),
+ MethodUnderTest.GET_TYPE.toString());
Assert.assertEquals(MethodUnderTest.GET_TYPE.getClass(), result);
Assert.assertTrue(context.isPropertyResolved());
@@ -315,8 +297,7 @@ public class TestStaticFieldELResolver {
@Test(expected = NullPointerException.class)
public void testInvoke01() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- resolver.invoke(null, new Object(), new Object(), new Class<?>[] {},
- new Object[] {});
+ resolver.invoke(null, new Object(), new Object(), new Class<?>[] {},
new Object[] {});
}
/**
@@ -325,11 +306,9 @@ public class TestStaticFieldELResolver {
@Test
public void testInvoke02() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context,
- new ELClass(TesterClass.class), METHOD01_NAME, null, null);
+ Object result = resolver.invoke(context, new
ELClass(TesterClass.class), METHOD01_NAME, null, null);
Assert.assertEquals(TesterClass.class, result.getClass());
Assert.assertTrue(context.isPropertyResolved());
@@ -341,12 +320,10 @@ public class TestStaticFieldELResolver {
@Test
public void testInvoke03() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context,
- new ELClass(TesterClass.class), METHOD02_NAME,
- new Class<?>[] {}, new Object[] {});
+ Object result = resolver.invoke(context, new
ELClass(TesterClass.class), METHOD02_NAME, new Class<?>[] {},
+ new Object[] {});
Assert.assertEquals(PROPERTY01_NAME, result);
Assert.assertTrue(context.isPropertyResolved());
@@ -365,8 +342,7 @@ public class TestStaticFieldELResolver {
*/
@Test
public void testInvoke05() {
- doNegativeTest(new ELClass(TesterClass.class), new Object(),
- MethodUnderTest.INVOKE);
+ doNegativeTest(new ELClass(TesterClass.class), new Object(),
MethodUnderTest.INVOKE);
}
/**
@@ -391,75 +367,36 @@ public class TestStaticFieldELResolver {
@Test
public void testInvoke08() {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
- Object result = resolver.invoke(context,
- new ELClass(TesterClass.class), METHOD04_NAME,
- new Class<?>[] {}, new Object[] {});
+ Object result = resolver.invoke(context, new
ELClass(TesterClass.class), METHOD04_NAME, new Class<?>[] {},
+ new Object[] {});
Assert.assertNull(result);
Assert.assertTrue(context.isPropertyResolved());
}
- private void doNegativeTest(Object elClass, Object trigger,
- MethodUnderTest method) {
+ private void doNegativeTest(Object elClass, Object trigger,
MethodUnderTest method) {
StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
Object result = null;
switch (method) {
- case GET_VALUE: {
- result = resolver.getValue(context, elClass, trigger);
- break;
- }
- case SET_VALUE: {
- resolver.setValue(context, elClass, trigger, PROPERTY01_VALUE);
- result = resolver.getValue(context, elClass, trigger);
- break;
- }
- case GET_TYPE: {
- result = resolver.getType(context, elClass, trigger);
- break;
- }
- case INVOKE: {
- result = resolver.invoke(context, elClass, trigger,
- new Class<?>[] { String.class }, new Object[] { "test" });
- break;
- }
- default: {
- // Should never happen
- Assert.fail("Missing case for method");
- }
- }
-
- Assert.assertNull(result);
- Assert.assertFalse(context.isPropertyResolved());
- }
-
- private void doThrowableTest(String trigger, MethodUnderTest method,
- boolean checkCause) {
- StaticFieldELResolver resolver = new StaticFieldELResolver();
- ELContext context = new StandardELContext(
- ELManager.getExpressionFactory());
-
- ELException exception = null;
- try {
- switch (method) {
case GET_VALUE: {
- resolver.getValue(context, new ELClass(TesterClass.class),
- trigger);
+ result = resolver.getValue(context, elClass, trigger);
+ break;
+ }
+ case SET_VALUE: {
+ resolver.setValue(context, elClass, trigger, PROPERTY01_VALUE);
+ result = resolver.getValue(context, elClass, trigger);
break;
}
case GET_TYPE: {
- resolver.getType(context, new ELClass(TesterClass.class),
- trigger);
+ result = resolver.getType(context, elClass, trigger);
break;
}
case INVOKE: {
- resolver.invoke(context, new ELClass(TesterClass.class),
- trigger, new Class<?>[] { String.class },
+ result = resolver.invoke(context, elClass, trigger, new
Class<?>[] { String.class },
new Object[] { "test" });
break;
}
@@ -467,6 +404,36 @@ public class TestStaticFieldELResolver {
// Should never happen
Assert.fail("Missing case for method");
}
+ }
+
+ Assert.assertNull(result);
+ Assert.assertFalse(context.isPropertyResolved());
+ }
+
+ private void doThrowableTest(String trigger, MethodUnderTest method,
boolean checkCause) {
+ StaticFieldELResolver resolver = new StaticFieldELResolver();
+ ELContext context = new
StandardELContext(ELManager.getExpressionFactory());
+
+ ELException exception = null;
+ try {
+ switch (method) {
+ case GET_VALUE: {
+ resolver.getValue(context, new ELClass(TesterClass.class),
trigger);
+ break;
+ }
+ case GET_TYPE: {
+ resolver.getType(context, new ELClass(TesterClass.class),
trigger);
+ break;
+ }
+ case INVOKE: {
+ resolver.invoke(context, new ELClass(TesterClass.class),
trigger, new Class<?>[] { String.class },
+ new Object[] { "test" });
+ break;
+ }
+ default: {
+ // Should never happen
+ Assert.fail("Missing case for method");
+ }
}
} catch (PropertyNotFoundException | MethodNotFoundException e) {
@@ -484,6 +451,9 @@ public class TestStaticFieldELResolver {
}
private enum MethodUnderTest {
- GET_VALUE, SET_VALUE, GET_TYPE, INVOKE
+ GET_VALUE,
+ SET_VALUE,
+ GET_TYPE,
+ INVOKE
}
}
diff --git a/test/javax/el/TesterBean.java b/test/javax/el/TesterBean.java
index 0ee12fa749..cd5e9a3c8b 100644
--- a/test/javax/el/TesterBean.java
+++ b/test/javax/el/TesterBean.java
@@ -52,7 +52,7 @@ public class TesterBean {
}
public int[] getValueB() {
- return new int[] {1,2,3,4,5};
+ return new int[] { 1, 2, 3, 4, 5 };
}
public void setValueC(Integer[] values) {
diff --git a/test/javax/el/TesterBeanNameResolver.java
b/test/javax/el/TesterBeanNameResolver.java
index 8da8638b55..3995b96120 100644
--- a/test/javax/el/TesterBeanNameResolver.java
+++ b/test/javax/el/TesterBeanNameResolver.java
@@ -25,7 +25,7 @@ public class TesterBeanNameResolver extends BeanNameResolver {
public static final String THROWABLE_TRIGGER_NAME = "throwable";
public static final String READ_ONLY_NAME = "readonly";
- private Map<String,Object> beans = new HashMap<>();
+ private Map<String, Object> beans = new HashMap<>();
private boolean allowCreate = true;
@@ -36,8 +36,7 @@ public class TesterBeanNameResolver extends BeanNameResolver {
}
@Override
- public void setBeanValue(String beanName, Object value)
- throws PropertyNotWritableException {
+ public void setBeanValue(String beanName, Object value) throws
PropertyNotWritableException {
checkTriggers(beanName);
if (allowCreate || beans.containsKey(beanName)) {
beans.put(beanName, value);
diff --git a/test/javax/el/TesterEvaluationListener.java
b/test/javax/el/TesterEvaluationListener.java
index 7431beeb5c..a61ad073d1 100644
--- a/test/javax/el/TesterEvaluationListener.java
+++ b/test/javax/el/TesterEvaluationListener.java
@@ -27,8 +27,7 @@ public class TesterEvaluationListener extends
EvaluationListener {
@Override
- public void propertyResolved(ELContext context, Object base,
- Object property) {
+ public void propertyResolved(ELContext context, Object base, Object
property) {
resolvedProperties.add(new Pair(base, property));
}
diff --git a/test/javax/el/TesterImportHandlerPerformance.java
b/test/javax/el/TesterImportHandlerPerformance.java
index e15405abb7..ce05d0b8d0 100644
--- a/test/javax/el/TesterImportHandlerPerformance.java
+++ b/test/javax/el/TesterImportHandlerPerformance.java
@@ -21,15 +21,11 @@ import org.junit.Test;
public class TesterImportHandlerPerformance {
/*
- * This test is looking at the cost of looking up a class when the standard
- * JSP package imports are present:
- * - java.lang
- * - javax.servlet
- * - javax.servlet.http
- * - javax.servlet.jsp
+ * This test is looking at the cost of looking up a class when the
standard JSP package imports are present: -
+ * java.lang - javax.servlet - javax.servlet.http - javax.servlet.jsp
*
- * Before optimisation, this test took ~4.6s on markt's desktop
- * After optimisation, this test took ~0.05s on markt's desktop
+ * Before optimisation, this test took ~4.6s on markt's desktop After
optimisation, this test took ~0.05s on markt's
+ * desktop
*/
@Test
public void testBug62453() throws Exception {
@@ -42,7 +38,7 @@ public class TesterImportHandlerPerformance {
long start = System.nanoTime();
ih.resolveClass("unknown");
long end = System.nanoTime();
- totalTime += (end -start);
+ totalTime += (end - start);
}
System.out.println("Time taken: " + totalTime + "ns");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
