am 910363bd: Merge change Ib5dc3f1f into eclair
Merge commit '910363bd8d50c2a5558a71e47377928265c1219e' into eclair-plus-aosp
* commit '910363bd8d50c2a5558a71e47377928265c1219e':
Fixing a lame test that was relying on hashmap iteration order.
diff --git a/luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java b/luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java
index 8303db3..7a67bf8 100644
--- a/luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java
+++ b/luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java
@@ -34,6 +34,8 @@
import java.util.Collection;
import java.util.Map;
import java.util.Set;
+import java.util.Arrays;
+import java.util.HashSet;
import java.util.jar.Attributes;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -151,8 +153,7 @@
args = {}
)
public void test_getManifest() throws Exception {
-
- String [] expected = {"plus.bmp", "swt.dll"};
+
//URL u = new URL("jar:"
// + BASE.toString()+"/lf.jar!/swt.dll");
@@ -161,15 +162,9 @@
juc = (JarURLConnection) u.openConnection();
Manifest manifest = juc.getManifest();
Map<String, Attributes> attr = manifest.getEntries();
- assertEquals(expected.length, attr.size());
- Set<String> keys = attr.keySet();
- String [] result = new String[expected.length];
- keys.toArray(result);
+ assertEquals(new HashSet<String>(Arrays.asList("plus.bmp", "swt.dll")),
+ attr.keySet());
- for(int i = 0; i < result.length; i++) {
- assertEquals(expected[i], result[i]);
- }
-
//URL invURL = new URL("jar:"
// + BASE.toString()+"/InvalidJar.jar!/Test.class");