Skip to content

Commit a2f8f8a

Browse files
Gerd Aschemanngnodet
andcommitted
[#12288] Address review: fix spotless format + register IT in TestSuiteOrdering
Two CI/review items flagged by gnodet on #428: * Spotless formatting violations in MavenITgh12288SettingsProfileAetherPropertiesTest (line wrapping) and the fixture pom.xml (description block). * Missing TestSuiteOrdering.addTestSuite(...) registration so the ordering enforcer recognizes the new IT. Co-Authored-By: Guillaume Nodet <gnodet@gmail.com>
1 parent db62c8c commit a2f8f8a

3 files changed

Lines changed: 7 additions & 8 deletions

File tree

core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12288SettingsProfileAetherPropertiesTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ public void testActiveProfilesList() throws Exception {
7777

7878
@Test
7979
public void testActiveByDefaultDeactivatedViaCli() throws Exception {
80-
File testDir = ResourceExtractor.simpleExtractResources(
81-
getClass(), "/gh-12288-settings-profile-aether-properties");
80+
File testDir =
81+
ResourceExtractor.simpleExtractResources(getClass(), "/gh-12288-settings-profile-aether-properties");
8282

8383
Verifier verifier = newVerifier(testDir.getAbsolutePath());
8484
verifier.setAutoclean(false);
@@ -111,8 +111,8 @@ public void testActiveByDefaultDeactivatedViaCli() throws Exception {
111111
}
112112

113113
private void runAndAssertCustomPrefix(String settingsFile) throws Exception {
114-
File testDir = ResourceExtractor.simpleExtractResources(
115-
getClass(), "/gh-12288-settings-profile-aether-properties");
114+
File testDir =
115+
ResourceExtractor.simpleExtractResources(getClass(), "/gh-12288-settings-profile-aether-properties");
116116

117117
Verifier verifier = newVerifier(testDir.getAbsolutePath());
118118
verifier.setAutoclean(false);

core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ public TestSuiteOrdering() {
121121
* a fail fast technique as well.
122122
*/
123123

124+
suite.addTestSuite(MavenITgh12288SettingsProfileAetherPropertiesTest.class);
124125
suite.addTestSuite(MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.class);
125126
suite.addTestSuite(MavenITgh10937QuotedPipesInMavenOptsTest.class);
126127
suite.addTestSuite(MavenITmng8106OverlappingDirectoryRolesTest.class);

core-it-suite/src/test/resources/gh-12288-settings-profile-aether-properties/pom.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ under the License.
2626
<packaging>pom</packaging>
2727

2828
<name>Maven Integration Test :: Settings Profile Aether Properties</name>
29-
<description>
30-
Minimal project for proving that aether.enhancedLocalRepository.*
29+
<description>Minimal project for proving that aether.enhancedLocalRepository.*
3130
properties set in an active-by-default settings.xml profile are honored
32-
by the resolver at local repository manager initialization.
33-
</description>
31+
by the resolver at local repository manager initialization.</description>
3432
</project>

0 commit comments

Comments
 (0)