Author: remm
Date: Tue Mar 25 21:24:11 2014
New Revision: 1581529
URL: http://svn.apache.org/r1581529
Log:
Fix Java 8 compatibility (order of elements is reversed, which does not seem
wrong, it is probably undefined).
Modified:
tomcat/trunk/test/javax/el/TestResourceBundleELResolver.java
Modified: tomcat/trunk/test/javax/el/TestResourceBundleELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/el/TestResourceBundleELResolver.java?rev=1581529&r1=1581528&r2=1581529&view=diff
==============================================================================
--- tomcat/trunk/test/javax/el/TestResourceBundleELResolver.java (original)
+++ tomcat/trunk/test/javax/el/TestResourceBundleELResolver.java Tue Mar 25
21:24:11 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
