Skip to content

Optional elresolver updates #1224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alwin-joseph merged 4 commits into from
Feb 26, 2024
Merged

Optional elresolver updates #1224

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67f61b6
Update existing tests to reflect specification changes for consistency
markt-asf Feb 21, 2024
ebeabce
Simplify code
markt-asf Feb 21, 2024
bfe28b0
Refactor in preparation for adding method invocation tests
markt-asf Feb 21, 2024
56a121b
Add new tests for OptionalELResolver.invoke()
markt-asf Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 99 additions & 23 deletions el/src/main/java/com/sun/ts/tests/el/api/jakarta_el/optionalelresolver/ELClientIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import jakarta.el.CompositeELResolver;
import jakarta.el.ELContext;
import jakarta.el.ELResolver;
import jakarta.el.MethodNotFoundException;
import jakarta.el.OptionalELResolver;
import jakarta.el.PropertyNotWritableException;

Expand Down Expand Up @@ -65,11 +66,7 @@ public void optionalELResolverEmptyNullTest() throws Exception {
StringBuffer buf = new StringBuffer();
Object testObject = Optional.empty();

try {
pass = testOptionalELResolver(buf, testObject, null, null);
} catch (Exception ex) {
throw new Exception(ex);
}
pass = testOptionalELResolverProperty(buf, testObject, null, null);

if (!pass) {
throw new Exception(ELTestUtil.FAIL + buf.toString());
Expand All @@ -90,11 +87,7 @@ public void optionalELResolverEmptyNonNullTest() throws Exception {
StringBuffer buf = new StringBuffer();
Object testObject = Optional.empty();

try {
pass = testOptionalELResolver(buf, testObject, "property", Optional.empty());
} catch (Exception ex) {
throw new Exception(ex);
}
pass = testOptionalELResolverProperty(buf, testObject, "property", null);

if (!pass) {
throw new Exception(ELTestUtil.FAIL + buf.toString());
Expand All @@ -116,11 +109,7 @@ public void optionalELResolverObjectNullTest() throws Exception {
TestBean testBean = new TestBean("data");
Object testObject = Optional.of(testBean);

try {
pass = testOptionalELResolver(buf, testObject, null, testBean);
} catch (Exception ex) {
throw new Exception(ex);
}
pass = testOptionalELResolverProperty(buf, testObject, null, testBean);

if (!pass) {
throw new Exception(ELTestUtil.FAIL + buf.toString());
Expand All @@ -142,24 +131,20 @@ public void optionalELResolverObjectNonNullTest() throws Exception {
TestBean testBean = new TestBean("data");
Object testObject = Optional.of(testBean);

try {
pass = testOptionalELResolver(buf, testObject, "propertyA", "data");
} catch (Exception ex) {
throw new Exception(ex);
}
pass = testOptionalELResolverProperty(buf, testObject, "propertyA", "data");

if (!pass) {
throw new Exception(ELTestUtil.FAIL + buf.toString());
}
logger.log(Logger.Level.TRACE, buf.toString());
}

public static boolean testOptionalELResolver(StringBuffer buf, Object base, Object property, Object expectedValue) {
public static boolean testOptionalELResolverProperty(StringBuffer buf, Object base, Object property, Object expectedValue) {
boolean pass = true;

BareBonesELContext barebonesContext = new BareBonesELContext();

// OptionalELResolver depends on BeanELResolver to resolve properties of an Optional
// OptionalELResolver depends on BeanELResolver to resolve properties of an object wrapped in an Optional
ELResolver resolver = barebonesContext.getELResolver();
BeanELResolver beanResolver = new BeanELResolver();
OptionalELResolver optionalResolver = new OptionalELResolver();
Expand Down Expand Up @@ -204,13 +189,104 @@ public static boolean testOptionalELResolver(StringBuffer buf, Object base, Obje
return pass;
}

public class TestBean {
@Test
public void optionalELResolverEmptyInvoke() throws Exception {
boolean pass = true;
StringBuffer buf = new StringBuffer();
Object testObject = Optional.empty();

pass = testOptionalELResolverInvoke(buf, testObject, "doSomething", null);

if (!pass) {
throw new Exception(ELTestUtil.FAIL + buf.toString());
}
logger.log(Logger.Level.TRACE, buf.toString());
}

@Test
public void optionalELResolverEmptyInvokeInvalid() throws Exception {
boolean pass = true;
StringBuffer buf = new StringBuffer();
Object testObject = Optional.empty();

pass = testOptionalELResolverInvoke(buf, testObject, "unknownMethod", null);

if (!pass) {
throw new Exception(ELTestUtil.FAIL + buf.toString());
}
logger.log(Logger.Level.TRACE, buf.toString());
}

@Test
public void optionalELResolverObjectInvoke() throws Exception {
boolean pass = true;
StringBuffer buf = new StringBuffer();
TestBean testBean = new TestBean("data");
Object testObject = Optional.of(testBean);

pass = testOptionalELResolverInvoke(buf, testObject, "doSomething", TestBean.DATA);

if (!pass) {
throw new Exception(ELTestUtil.FAIL + buf.toString());
}
logger.log(Logger.Level.TRACE, buf.toString());
}

@Test
public void optionalELResolverObjectInvokeInvalid() throws Exception {
boolean pass = true;
StringBuffer buf = new StringBuffer();
TestBean testBean = new TestBean("data");
Object testObject = Optional.of(testBean);

try {
testOptionalELResolverInvoke(buf, testObject, "unknownMethod", null);
pass = false;
buf.append("invoke(): Expected MethodNotFoundException but no exception was thrown");
} catch (MethodNotFoundException mnfe) {
// Expected (so pass is not set to false)
}

if (!pass) {
throw new Exception(ELTestUtil.FAIL + buf.toString());
}
logger.log(Logger.Level.TRACE, buf.toString());
}

public static boolean testOptionalELResolverInvoke(StringBuffer buf, Object base, Object method, Object expectedValue) {
boolean pass = true;

BareBonesELContext barebonesContext = new BareBonesELContext();

// OptionalELResolver depends on BeanELResolver to invoke methods of an object wrapped in an Optional
ELResolver resolver = barebonesContext.getELResolver();
BeanELResolver beanResolver = new BeanELResolver();
OptionalELResolver optionalResolver = new OptionalELResolver();
((CompositeELResolver) resolver).add(optionalResolver);
((CompositeELResolver) resolver).add(beanResolver);
ELContext context = barebonesContext.getELContext();

// invoke()
Object result = resolver.invoke(context, base, method, null, null);
if (expectedValue == null && result != null || expectedValue != null && !expectedValue.equals(result)) {
buf.append("invoke(): Expected [" + expectedValue + "] but got [" + result + "]");
pass = false;
}

return pass;
}

public static class TestBean {
private static final String DATA = "interesting data";
private final String propertyA;
public TestBean(String propertyA) {
this.propertyA = propertyA;
}
public String getPropertyA() {
return propertyA;
}
public String doSomething() {
return DATA;
}
}
}