Author: kkolinko
Date: Fri Nov 21 11:51:41 2014
New Revision: 1640899
URL: http://svn.apache.org/r1640899
Log:
Backport test fix from Tomcat 8, to enable Apache Gump to run Tomcat 7 tests
with Java 8.
Merged r1581529 from tomcat/tc8.0.x/trunk:
Fix Java 8 compatibility (order of elements is reversed, which does not seem
wrong, it is probably undefined).
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/javax/el/TestResourceBundleELResolver.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1581529
Modified: tomcat/tc7.0.x/trunk/test/javax/el/TestResourceBundleELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/javax/el/TestResourceBundleELResolver.java?rev=1640899&r1=1640898&r2=1640899&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/javax/el/TestResourceBundleELResolver.java
(original)
+++ tomcat/tc7.0.x/trunk/test/javax/el/TestResourceBundleELResolver.java Fri
Nov 21 11:51:41 2014
@@ -57,10 +57,18 @@ public class TestResourceBundleELResolve
Enumeration<String> e = (Enumeration<String>) result2;
Assert.assertTrue(e.hasMoreElements());
- Assert.assertEquals("key2", e.nextElement());
- Assert.assertTrue(e.hasMoreElements());
- Assert.assertEquals("key1", e.nextElement());
- Assert.assertFalse(e.hasMoreElements());
+ String element = e.nextElement();
+ if ("key1".equals(element)) {
+ Assert.assertEquals("key1", element);
+ Assert.assertTrue(e.hasMoreElements());
+ Assert.assertEquals("key2", e.nextElement());
+ Assert.assertFalse(e.hasMoreElements());
+ } else {
+ Assert.assertEquals("key2", element);
+ Assert.assertTrue(e.hasMoreElements());
+ Assert.assertEquals("key1", e.nextElement());
+ Assert.assertFalse(e.hasMoreElements());
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
