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

test false for logMissingProperties (WW-4999)

Browse Source
This commit is contained in:
Yasser Zamani
2019-06-02 17:22:28 +04:30
parent 9e01fbd2dd
commit a50af87644
1 changed files with 53 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
+53 -8
View File
@@ -245,9 +245,18 @@ public class OgnlValueStackTest extends XWorkTestCase {
} }
} }
/**
* monitors the resolution of WW-4999
* @since 2.5.21
*/
public void testLogMissingProperties() { public void testLogMissingProperties() {
testLogMissingProperties(true);
testLogMissingProperties(false);
}
private void testLogMissingProperties(boolean logMissingProperties) {
OgnlValueStack vs = createValueStack(); OgnlValueStack vs = createValueStack();
vs.setLogMissingProperties("true"); vs.setLogMissingProperties("" + logMissingProperties);
Dog dog = new Dog(); Dog dog = new Dog();
vs.push(dog); vs.push(dog);
@@ -262,19 +271,27 @@ public class OgnlValueStackTest extends XWorkTestCase {
vs.findValue("missingProp2", false); vs.findValue("missingProp2", false);
vs.findValue("missingProp3", Integer.class, false); vs.findValue("missingProp3", Integer.class, false);
assertEquals(3, testAppender.logEvents.size()); if (logMissingProperties) {
assertEquals("Error setting value [missingProp1Value] with expression [missingProp1]", assertEquals(3, testAppender.logEvents.size());
testAppender.logEvents.get(0).getMessage().getFormattedMessage()); assertEquals("Error setting value [missingProp1Value] with expression [missingProp1]",
assertEquals("Could not find property [missingProp2]!", testAppender.logEvents.get(0).getMessage().getFormattedMessage());
testAppender.logEvents.get(1).getMessage().getFormattedMessage()); assertEquals("Could not find property [missingProp2]!",
assertEquals("Could not find property [missingProp3]!", testAppender.logEvents.get(1).getMessage().getFormattedMessage());
testAppender.logEvents.get(2).getMessage().getFormattedMessage()); assertEquals("Could not find property [missingProp3]!",
testAppender.logEvents.get(2).getMessage().getFormattedMessage());
} else {
assertEquals(0, testAppender.logEvents.size());
}
} finally { } finally {
testAppender.stop(); testAppender.stop();
logger.removeAppender(testAppender); logger.removeAppender(testAppender);
} }
} }
/**
* tests the correctness of distinguishing between user exception and NoSuchMethodException
* @since 2.5.21
*/
public void testNotLogUserExceptionsAsMissingProperties() { public void testNotLogUserExceptionsAsMissingProperties() {
OgnlValueStack vs = createValueStack(); OgnlValueStack vs = createValueStack();
vs.setLogMissingProperties("true"); vs.setLogMissingProperties("true");
@@ -298,6 +315,18 @@ public class OgnlValueStackTest extends XWorkTestCase {
vs.findValue("getBite()", false); vs.findValue("getBite()", false);
vs.findValue("getBite()", void.class, false); vs.findValue("getBite()", void.class, false);
vs.setLogMissingProperties("false");
vs.setValue("exception", "exceptionValue", false);
vs.findValue("exception", false);
vs.findValue("exception", String.class, false);
vs.findValue("getException()", false);
vs.findValue("getException()", String.class, false);
vs.findValue("bite", false);
vs.findValue("bite", void.class, false);
vs.findValue("getBite()", false);
vs.findValue("getBite()", void.class, false);
assertEquals(0, testAppender.logEvents.size()); assertEquals(0, testAppender.logEvents.size());
} finally { } finally {
testAppender.stop(); testAppender.stop();
@@ -966,7 +995,23 @@ public class OgnlValueStackTest extends XWorkTestCase {
assertEquals(12, vs.findValue("age", Integer.class, true)); assertEquals(12, vs.findValue("age", Integer.class, true));
assertEquals(12, vs.findValue("getAge()", true)); assertEquals(12, vs.findValue("getAge()", true));
assertEquals(12, vs.findValue("getAge()", Integer.class, true)); assertEquals(12, vs.findValue("getAge()", Integer.class, true));
}
/**
* Fails on 2.5.20 and earlier - tested on 2.5 (5/5/2016) and failed
* @since 2.5.21
*/
public void testNotSkipUserReturnedNullValues() {
OgnlValueStack vs = createValueStack();
Dog dog = new Dog();
dog.setName("Rover");
vs.push(dog);
Cat cat = new Cat();
vs.push(cat);
// should not skip returned null values from cat.name
assertNull(vs.findValue("name", true)); assertNull(vs.findValue("name", true));
assertNull(vs.findValue("name", String.class, true)); assertNull(vs.findValue("name", String.class, true));
assertNull(vs.findValue("getName()", true)); assertNull(vs.findValue("getName()", true));