test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java

@@ -22,11 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 package jdk.jfr.event.metadata;
 
-import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;

@@ -38,12 +37,12 @@
 import java.util.stream.Stream;
 
 import jdk.jfr.EventType;
 import jdk.jfr.Experimental;
 import jdk.jfr.FlightRecorder;
-import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.Utils;
+import jdk.test.lib.jfr.EventNames;
 
 /**
  * @test Check for JFR events not covered by tests
  * @key jfr
  * @requires vm.hasJFR

@@ -53,18 +52,10 @@
 public class TestLookForUntestedEvents {
     private static final Path jfrTestRoot = Paths.get(Utils.TEST_SRC).getParent().getParent();
     private static final String MSG_SEPARATOR = "==========================";
     private static Set<String> jfrEventTypes = new HashSet<>();
 
-    private static final Set<String> knownEventsMissingFromEventNames = new HashSet<>(
-        Arrays.asList(
-            // The Z* events below should be marked as experimental; see: JDK-8213966
-            "ZStatisticsSampler", "ZStatisticsCounter",
-            "ZPageAllocation", "ZThreadPhase"
-        )
-    );
-
     private static final Set<String> hardToTestEvents = new HashSet<>(
         Arrays.asList(
             "DataLoss", "IntFlag", "ReservedStackActivation",
             "DoubleFlag", "UnsignedLongFlagChanged", "IntFlagChanged",
             "UnsignedIntFlag", "UnsignedIntFlagChanged", "DoubleFlagChanged")

@@ -145,13 +136,10 @@
                 eventName = eventName.replace(EventNames.PREFIX, "");
                 eventsFromEventNamesClass.add(eventName);
             }
         }
 
-        // Account for the events that are known to be missing from the EventNames.java
-        eventsFromEventNamesClass.addAll(knownEventsMissingFromEventNames);
-
         if (!jfrEventTypes.equals(eventsFromEventNamesClass)) {
             String exceptionMsg = "Events declared in jdk.test.lib.jfr.EventNames differ " +
                          "from events returned by FlightRecorder.getEventTypes()";
             print(MSG_SEPARATOR);
             print(exceptionMsg);