com/oracle/jfr/gc/TestHeapSummaryEventConcurrentCMS.java

rev 1475 : 8010090: GC ID has the wrong type
Summary: GC ID changed from ulong to uint
Reviewed-by: mattias.tobiasson@oracle.com

*** 50,69 ****
  
              List<FLREvent> cmsEvents = filterGCEventsOnCollector(gcEvents, cmsGCName);
              assertTrue(cmsEvents.size() > 0,
                         "Expected at least one " + gcPath + " event for collector " + cmsGCName);
  
!             List<Long> cmsGCIds = mapGCEventsToGCIds(cmsEvents);
              List<FLREvent> cmsHeapSummaryEvents =
                  filterHeapSummaryEventsOnGCIds(heapSummaryEvents, cmsGCIds);
  
!             HashMap<Long, FLREvent> gcIdToHeapSummaryBefore =
                  mapGCIdToHeapSummary("Before GC", cmsHeapSummaryEvents);
!             HashMap<Long, FLREvent> gcIdToHeapSummaryAfter =
                  mapGCIdToHeapSummary("After GC", cmsHeapSummaryEvents);
  
!             for (Long gcId : cmsGCIds) {
                  assertTrue(gcIdToHeapSummaryBefore.get(gcId) != null,
                             "Expected a " + heapSummaryPath + " event before " +
                             gcPath + " event with id " + gcId);
                  assertTrue(gcIdToHeapSummaryAfter.get(gcId) != null,
                             "Expected a " + heapSummaryPath + " event after " +
--- 50,69 ----
  
              List<FLREvent> cmsEvents = filterGCEventsOnCollector(gcEvents, cmsGCName);
              assertTrue(cmsEvents.size() > 0,
                         "Expected at least one " + gcPath + " event for collector " + cmsGCName);
  
!             List<Integer> cmsGCIds = mapGCEventsToGCIds(cmsEvents);
              List<FLREvent> cmsHeapSummaryEvents =
                  filterHeapSummaryEventsOnGCIds(heapSummaryEvents, cmsGCIds);
  
!             HashMap<Integer, FLREvent> gcIdToHeapSummaryBefore =
                  mapGCIdToHeapSummary("Before GC", cmsHeapSummaryEvents);
!             HashMap<Integer, FLREvent> gcIdToHeapSummaryAfter =
                  mapGCIdToHeapSummary("After GC", cmsHeapSummaryEvents);
  
!             for (Integer gcId : cmsGCIds) {
                  assertTrue(gcIdToHeapSummaryBefore.get(gcId) != null,
                             "Expected a " + heapSummaryPath + " event before " +
                             gcPath + " event with id " + gcId);
                  assertTrue(gcIdToHeapSummaryAfter.get(gcId) != null,
                             "Expected a " + heapSummaryPath + " event after " +
*** 118,149 ****
              }
          }
          return result;
      }
  
!     private static List<Long> mapGCEventsToGCIds(List<FLREvent> events) throws Exception {
!         List<Long> result = new ArrayList<Long>();
          for (FLREvent e : events) {
!             result.add((Long) e.getValue("gcId"));
          }
          return result;
      }
  
!     private static List<FLREvent> filterHeapSummaryEventsOnGCIds(List<FLREvent> events, List<Long> gcIds)
          throws Exception {
          List<FLREvent> result = new ArrayList<FLREvent>();
          for (FLREvent e : events) {
!             Long gcId = (Long) e.getValue("gcId");
              if (gcIds.contains(gcId)) {
                  result.add(e);
              }
          }
          return result;
      }
  
!     private static HashMap<Long, FLREvent> mapGCIdToHeapSummary(String when, List<FLREvent> events) throws Exception {
!         HashMap<Long, FLREvent> map = new HashMap<Long, FLREvent>();
          for (FLREvent e : events) {
              if (getWhen(e).equals(when)) {
                  map.put(getGCId(e), e);
              }
          }
--- 118,149 ----
              }
          }
          return result;
      }
  
!     private static List<Integer> mapGCEventsToGCIds(List<FLREvent> events) throws Exception {
!         List<Integer> result = new ArrayList<Integer>();
          for (FLREvent e : events) {
!             result.add((Integer) e.getValue("gcId"));
          }
          return result;
      }
  
!     private static List<FLREvent> filterHeapSummaryEventsOnGCIds(List<FLREvent> events, List<Integer> gcIds)
          throws Exception {
          List<FLREvent> result = new ArrayList<FLREvent>();
          for (FLREvent e : events) {
!             Integer gcId = (Integer) e.getValue("gcId");
              if (gcIds.contains(gcId)) {
                  result.add(e);
              }
          }
          return result;
      }
  
!     private static HashMap<Integer, FLREvent> mapGCIdToHeapSummary(String when, List<FLREvent> events) throws Exception {
!         HashMap<Integer, FLREvent> map = new HashMap<Integer, FLREvent>();
          for (FLREvent e : events) {
              if (getWhen(e).equals(when)) {
                  map.put(getGCId(e), e);
              }
          }
*** 160,168 ****
          FLRStruct s = (FLRStruct) e.getResolvedValue("name");
          String ret = (String) s.getValue("name");
          return ret;
      }
  
!     private static Long getGCId(FLREvent e) throws Exception {
!         return (Long) e.getValue("gcId");
      }
  }
--- 160,169 ----
          FLRStruct s = (FLRStruct) e.getResolvedValue("name");
          String ret = (String) s.getValue("name");
          return ret;
      }
  
!     private static Integer getGCId(FLREvent e) throws Exception {
!         return (Integer) e.getValue("gcId");
      }
  }
+