Merge pull request #10276 from pshipton/rmcheck

Remove OpenJ9 restriction on jps, jstack, etc. tests
eclipse-openj9 · Jul 29, 2020 · e1f9f3e · e1f9f3e
2 parents c4c6adf + 145fb93
commit e1f9f3e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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();