Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove JMXMP from TestGroup

Browse Source 
Due to the changes in a7425c81c0, we no
longer need to execute tests using the JMXMP protocol in PERFORMANCE
builds.

This commit removes the JMXMP constant from the TestGroup enum and
updates affected tests, thereby effectively including such tests in
the standard build from now on.

See gh-22757
This commit is contained in:
Sam Brannen
2019-04-08 17:02:19 +02:00
parent fd8fa301a6
commit bd414df944
8 changed files with 16 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-core/src/test/java/org/springframework/tests/AssumeTests.java
View File

@@ -58,22 +58,22 @@ public class AssumeTests {
@Test
public void assumeGroupWithNoActiveTestGroups() {
setTestGroups("");
Assume.group(JMXMP);
Assume.group(LONG_RUNNING);
fail("assumption should have failed");
}
@Test
public void assumeGroupWithNoMatchingActiveTestGroup() {
setTestGroups(PERFORMANCE, CI);
Assume.group(JMXMP);
Assume.group(LONG_RUNNING);
fail("assumption should have failed");
}
@Test
public void assumeGroupWithMatchingActiveTestGroup() {
setTestGroups(JMXMP);
setTestGroups(LONG_RUNNING);
try {
Assume.group(JMXMP);
Assume.group(LONG_RUNNING);
}
catch (AssumptionViolatedException ex) {
fail("assumption should NOT have failed");
@@ -99,7 +99,7 @@ public class AssumeTests {
setTestGroups(testGroups);
try {
Assume.group(JMXMP);
Assume.group(LONG_RUNNING);
fail("assumption should have failed");
}
catch (IllegalStateException ex) {
@@ -109,7 +109,7 @@ public class AssumeTests {
assertThat(ex.getCause(), instanceOf(IllegalArgumentException.class));
assertThat(ex.getCause().getMessage(),
equalTo("Unable to find test group 'bogus' when parsing testGroups value: '" + testGroups
+ "'. Available groups include: [LONG_RUNNING,PERFORMANCE,JMXMP,CI]"));
+ "'. Available groups include: [LONG_RUNNING,PERFORMANCE,CI]"));
}
}

8
spring-core/src/test/java/org/springframework/tests/TestGroup.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -50,12 +50,6 @@ public enum TestGroup {
*/
PERFORMANCE,
/**
* Tests requiring the presence of jmxremote_optional.jar in jre/lib/ext in order to
* avoid "Unsupported protocol: jmxmp" errors.
*/
JMXMP,
/**
* Tests that should only be run on the continuous integration server.
*/

6
spring-core/src/test/java/org/springframework/tests/TestGroupTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -71,7 +71,7 @@ public class TestGroupTests {
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Unable to find test group 'missing' when parsing " +
"testGroups value: 'performance, missing'. Available groups include: " +
"[LONG_RUNNING,PERFORMANCE,JMXMP,CI]");
"[LONG_RUNNING,PERFORMANCE,CI]");
TestGroup.parse("performance, missing");
}
@@ -92,7 +92,7 @@ public class TestGroupTests {
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Unable to find test group 'missing' when parsing " +
"testGroups value: 'all-missing'. Available groups include: " +
"[LONG_RUNNING,PERFORMANCE,JMXMP,CI]");
"[LONG_RUNNING,PERFORMANCE,CI]");
TestGroup.parse("all-missing");
}