Skip to content

Commit

Permalink
8096: EventTemplateTest fails for JDKs with custom jfr profiles
Browse files Browse the repository at this point in the history
Reviewed-by: aptmac
  • Loading branch information
RealCLanger committed Jun 22, 2023
1 parent 3d7614c commit 5ace151
Showing 1 changed file with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
*
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* The contents of this file are subject to the terms of either the Universal Permissive License
Expand All @@ -10,17 +10,17 @@
*
* Redistribution and use in source and binary forms, with or without modification, are permitted
* provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, this list of conditions
* and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list of
* conditions and the following disclaimer in the documentation and/or other materials provided with
* the distribution.
*
*
* 3. Neither the name of the copyright holder nor the names of its contributors may be used to
* endorse or promote products derived from this software without specific prior written permission.
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
Expand All @@ -32,17 +32,16 @@
*/
package org.openjdk.jmc.rjmx.services.jfr.test;

import static org.junit.Assert.assertNotNull;

import java.util.Collection;
import java.util.List;

import org.junit.Assert;
import org.junit.Test;

import org.openjdk.jmc.flightrecorder.configuration.events.IEventTypeID;
import org.openjdk.jmc.rjmx.services.jfr.IFlightRecorderService;

import static org.junit.Assert.assertNotNull;

@SuppressWarnings("nls")
public class EventTemplateTest extends JfrTestCase {
@Test
Expand All @@ -59,7 +58,8 @@ public void testCheckAllEventsInServerTemplates() throws Exception {
assumeHotSpot7u12OrLater(getConnectionHandle());

IFlightRecorderService service = getFlightRecorderService();
List<String> templates = service.getServerTemplates();
List<String> templates = service.getServerTemplates().stream().filter(t -> t.contains("provider=\"Oracle\""))
.toList();

Collection<? extends IEventTypeID> allEventTypes = service.getEventTypeInfoMapByID().keySet();
for (IEventTypeID eventTypeId : allEventTypes) {
Expand Down

0 comments on commit 5ace151

Please sign in to comment.