Merge "Fix the PackageTest to not rely on a Class.getPackage() side effect."

2 files changed, 9 insertions, 1 deletions

diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt
index 0b3d5e2..7915a10 100644
--- a/expectations/knownfailures.txt
+++ b/expectations/knownfailures.txt
@@ -3,6 +3,11 @@
  */
 [
 {
+  description: "Package.getPackages(), ClassLoader.getPackages() both omit results",
+  name: "libcore.java.lang.PackageTest#testGetPackages",
+  bug: 5171136
+},
+{
   description: "Deserialization shouldn't set transient fields",
   name: "libcore.java.io.SerializationTest#testSerializeFieldMadeTransient",
   bug: 4471249
diff --git a/luni/src/test/java/libcore/java/lang/PackageTest.java b/luni/src/test/java/libcore/java/lang/PackageTest.java
index 9234952..6e274a0 100644
--- a/luni/src/test/java/libcore/java/lang/PackageTest.java
+++ b/luni/src/test/java/libcore/java/lang/PackageTest.java
@@ -21,6 +21,9 @@ import java.util.List;
 import junit.framework.TestCase;
 
 public final class PackageTest extends TestCase {
+    /** assign packages immediately so that Class.getPackage() calls cannot side-effect it */
+    private static final List<Package> packages = Arrays.asList(Package.getPackages());
+
     public void test_getAnnotations() throws Exception {
         // Package annotations aren't supported, but pre-ICS we crashed.
         assertEquals(0, getClass().getPackage().getAnnotations().length);
@@ -33,8 +36,8 @@ public final class PackageTest extends TestCase {
         assertEquals(getClass().getPackage(), libcoreJavaLang);
     }
 
+    // http://b/5171136
     public void testGetPackages() {
-        List<Package> packages = Arrays.asList(Package.getPackages());
         assertTrue(packages.contains(getClass().getPackage()));
     }
 }