Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 15:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4846 Fixes unit tests for JDK8

Browse Source
This commit is contained in:
Yasser Zamani
2017-11-04 10:22:25 +03:30
parent 92502510df
commit fb0a6120db
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java
+11 -16
View File
@@ -162,34 +162,29 @@ public class JSONResultTest extends StrutsTestCase {
JSONWriter writer = new DefaultJSONWriter();
jsonUtil.setWriter(writer);
result.setJsonUtil(jsonUtil);
ProxyFactory factory = new ProxyFactory(new TestAction2());
factory.addAdvice(new MethodInterceptor() {
@Override
public Object invoke(MethodInvocation invocation) throws Throwable {
// fail on any traverse except TestAction2.getName()
if (!TestAction2.class.getMethod("getName").equals(invocation.getMethod())) {
throw new Throwable(invocation.getMethod() + " should not traversed!");
}
return invocation.proceed();
}
});
Object proxiedAction = factory.getProxy();
Object proxiedAction = new ProxyFactory(new TestAction2()).getProxy();
stack.push(proxiedAction);
this.invocation.setAction(proxiedAction);
try {
result.execute(this.invocation);
fail("An exception expected via proxy info traverse because writer.excludeProxyProperties is false!");
} catch (Exception ignored) {
}
writer.setExcludeProxyProperties(true);
result.execute(this.invocation);
String out = response.getContentAsString();
String normalizedActual = TestUtils.normalize(out, true);
String normalizedExpected = "{\"name\":\"name\"}";
assertNotSame(normalizedExpected, normalizedActual);
response.setCommitted(false);
response.reset();
writer.setExcludeProxyProperties(true);
result.execute(this.invocation);
out = response.getContentAsString();
normalizedActual = TestUtils.normalize(out, true);
assertEquals(normalizedExpected, normalizedActual);
}