mrdon 2003/11/28 00:48:29
Modified: src/test/org/apache/struts/config
TestActionConfigMatcher.java
Log:
Fixed test to not depend on HashMap order for ForwardConfig's
Revision Changes Path
1.4 +14 -8
jakarta-struts/src/test/org/apache/struts/config/TestActionConfigMatcher.java
Index: TestActionConfigMatcher.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/config/TestActionConfigMatcher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestActionConfigMatcher.java 28 Nov 2003 02:25:47 -0000 1.3
+++ TestActionConfigMatcher.java 28 Nov 2003 08:48:29 -0000 1.4
@@ -183,10 +183,16 @@
assertTrue("Input hasn't been replaced", "input,Bar".equals(m.getInput()));
ForwardConfig[] fConfigs = m.findForwardConfigs();
- ForwardConfig cfg = fConfigs[0];
- assertTrue("ContextRelative isn't correct", cfg.getContextRelative());
- // :FIXME: assertTrue("Name isn't correct", "name".equals(cfg.getName()));
- // :FIXME: assertTrue("Path hasn't been replaced",
"path,Bar".equals(cfg.getPath()));
+ boolean found = false;
+ for (int x=0; x<fConfigs.length; x++) {
+ ForwardConfig cfg = fConfigs[x];
+ if ("name".equals(cfg.getName())) {
+ found = true;
+ assertTrue("ContextRelative isn't correct",
cfg.getContextRelative());
+ assertTrue("Path hasn't been replaced",
"path,Bar".equals(cfg.getPath()));
+ }
+ }
+ assertTrue("The forward config 'name' cannot be found", found);
}
private ActionConfig buildActionConfig(String path) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
