8327180: Failed: java/io/ObjectStreamClass/ObjectStreamClassCaching.j…

…ava#G1

Backport-of: 85fc47c81af81a595dc88e61454d8ba2d860f301

test/jdk/java/io/ObjectStreamClass/ObjectStreamClassCaching.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,8 +49,12 @@
  */
 
 /*
- * Disabled for ZGC Generational.
- * TODO: Find correct appropriate solution to the flakiness of this test.
+ * @test id=ZGenerational
+ * @requires vm.gc.ZGenerational
+ * @bug 8277072 8327180
+ * @library /test/lib/
+ * @summary ObjectStreamClass caches keep ClassLoaders alive (ZGC)
+ * @run testng/othervm -Xmx64m -XX:+UseZGC -XX:+ZGenerational ObjectStreamClassCaching
  */
 
 /*
@@ -65,41 +69,13 @@
 /*
  * @test id=Serial
  * @requires vm.gc.Serial
- * @bug 8277072
+ * @bug 8277072 8327180
  * @library /test/lib/
  * @summary ObjectStreamClass caches keep ClassLoaders alive (Serial GC)
  * @run testng/othervm -Xmx64m -XX:+UseSerialGC ObjectStreamClassCaching
  */
 public class ObjectStreamClassCaching {
 
-    /**
-     * Test methods execute in same VM and are ordered by name.
-     * We test effectiveness 1st which is sensitive to previous allocations when ZGC is used.
-     */
-    @Test
-    public void test1CacheEffectiveness() throws Exception {
-        var list = new ArrayList<>();
-        var ref1 = lookupObjectStreamClass(TestClass1.class);
-        var ref2 = newWeakRef();
-        boolean oome = false;
-        try {
-            while (!ref2.refersTo(null)) {
-                list.add(new byte[1024 * 1024 * 1]); // 1 MiB chunks
-                System.out.println("1MiB allocated...");
-                Thread.sleep(5L);
-            }
-        } catch (OutOfMemoryError e) {
-            // release
-            list = null;
-            oome = true;
-        }
-        assertFalse(oome, "WeakReference was not cleared although memory was pressed hard");
-        assertFalse(ref1.refersTo(null),
-                    "Cache lost entry together with WeakReference being cleared although memory was not under pressure");
-        System.gc();
-        Thread.sleep(100L);
-    }
-
     @Test
     public void test2CacheReleaseUnderMemoryPressure() throws Exception {
         var list = new ArrayList<>();