From 145fb9369c239a17e68fd13a1cca6fb05f8a6dbe Mon Sep 17 00:00:00 2001 From: Peter Shipton Date: Tue, 28 Jul 2020 17:05:45 -0400 Subject: [PATCH] Remove OpenJ9 restriction on jps, jstack, etc. tests [ci skip] Signed-off-by: Peter Shipton --- .../Java8andUp/src/org/openj9/test/attachAPI/TestJcmd.java | 1 - .../Java8andUp/src/org/openj9/test/attachAPI/TestJmap.java | 4 +--- .../Java8andUp/src/org/openj9/test/attachAPI/TestJps.java | 3 +-- .../Java8andUp/src/org/openj9/test/attachAPI/TestJstack.java | 3 +-- .../Java8andUp/src/org/openj9/test/attachAPI/TestJstat.java | 3 +-- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJcmd.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJcmd.java index 77359fb3c1a..2a674ef51ed 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJcmd.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJcmd.java @@ -294,7 +294,6 @@ protected void setUp(Method testMethod) { @BeforeSuite protected void setupSuite() { - assertTrue(PlatformInfo.isOpenJ9(), "This test is valid only on OpenJ9"); userDir = new File(System.getProperty("user.dir")); getJdkUtilityPath(JCMD_COMMAND); commandExpectedOutputs = new HashMap<>(); diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJmap.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJmap.java index b69adecf522..45f8d8a5c8c 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJmap.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJmap.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2019 IBM Corp. and others + * Copyright (c) 2019, 2020 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this @@ -103,8 +103,6 @@ public void testHeapHisto() throws AttachNotSupportedException, IOException { @BeforeSuite protected void setupSuite() { - assertTrue("This test is valid only on OpenJ9", //$NON-NLS-1$ - System.getProperty("java.vm.vendor").contains("OpenJ9")); //$NON-NLS-1$//$NON-NLS-2$ getJdkUtilityPath(JMAP_COMMAND); myId = TargetManager.getVmId(); assertNotNull(myId, "Attach ID missing"); //$NON-NLS-1$ diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJps.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJps.java index f7955e5ea89..5d1e2c42c29 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJps.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJps.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2019 IBM Corp. and others + * Copyright (c) 2019, 2020 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this @@ -132,7 +132,6 @@ protected void setUp(Method testMethod) { */ @BeforeSuite void setupSuite() { - assertTrue("This test is valid only on OpenJ9",PlatformInfo.isOpenJ9()); //$NON-NLS-1$ getJdkUtilityPath(JPS_COMMAND); assertTrue("Attach API failed to launch", TargetManager.waitForAttachApiInitialization()); //$NON-NLS-1$ vmId = TargetManager.getVmId(); diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJstack.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJstack.java index ab13d775373..927303e8a1e 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJstack.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJstack.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2019 IBM Corp. and others + * Copyright (c) 2019, 2020 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this @@ -111,7 +111,6 @@ protected void setUp(Method testMethod) { @BeforeSuite protected void setupSuite() { - assertTrue(PlatformInfo.isOpenJ9(), "This test is valid only on OpenJ9"); //$NON-NLS-1$ getJdkUtilityPath(JSTACK_COMMAND); } diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJstat.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJstat.java index d75686442f2..c967de013aa 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJstat.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJstat.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2019 IBM Corp. and others + * Copyright (c) 2019, 2020 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this @@ -61,7 +61,6 @@ public void testOptionClass() throws IOException { @BeforeSuite protected void setupSuite() { - AssertJUnit.assertTrue("This test is valid only on OpenJ9", PlatformInfo.isOpenJ9()); //$NON-NLS-1$ getJdkUtilityPath(JSTAT_COMMAND); AssertJUnit.assertTrue("Attach API failed to launch", TargetManager.waitForAttachApiInitialization()); //$NON-NLS-1$ vmId = TargetManager.getVmId();