Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix test failures with colors #182

Merged
merged 1 commit into from
Aug 17, 2022
Merged

Fix test failures with colors #182

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions org.eclipse.m2e.tests/src/org/eclipse/m2e/tests/launch/MavenLaunchDelegateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,18 +127,20 @@ public void testGlobalSettingsProgramArguments() throws Exception {
ILaunchConfiguration configuration = getLaunchConfiguration("projects/444262_settings");
try {
performDummyLaunch(configuration);
assertArrayEquals(new String[] {"-B"}, runner.getConfiguration().getProgramArguments());
assertArrayEquals(new String[] {"-B", "-Dstyle.color=always"},
runner.getConfiguration().getProgramArguments());

// relative preference path to global settings is relative to eclipse home
mavenConfig.setGlobalSettingsFile("settings_empty.xml");
performDummyLaunch(configuration);
assertArrayEquals(new String[] {"-B", "-gs", new File("settings_empty.xml").getAbsolutePath()},
assertArrayEquals(
new String[] {"-B", "-Dstyle.color=always", "-gs", new File("settings_empty.xml").getAbsolutePath()},
runner.getConfiguration().getProgramArguments());

// specifying -gs within goals overrides global settings from configuration
configuration.getAttributes().put(MavenLaunchConstants.ATTR_GOALS, "clean -gs other_settings.xml");
performDummyLaunch(configuration);
assertArrayEquals(new String[] {"-B", "clean", "-gs", "other_settings.xml"},
assertArrayEquals(new String[] {"-B", "-Dstyle.color=always", "clean", "-gs", "other_settings.xml"},
runner.getConfiguration().getProgramArguments());

} finally {
Expand All @@ -153,12 +155,13 @@ public void testUserSettingsProgramArguments() throws Exception {
try {
mavenConfig.setUserSettingsFile(new File("settings_empty.xml").getAbsolutePath());
performDummyLaunch(configuration);
assertArrayEquals(new String[] {"-B", "-s", mavenConfig.getUserSettingsFile()},
assertArrayEquals(new String[] {"-B", "-Dstyle.color=always", "-s", mavenConfig.getUserSettingsFile()},
runner.getConfiguration().getProgramArguments());

configuration.getAttributes().put(MavenLaunchConstants.ATTR_USER_SETTINGS, "settings.xml");
performDummyLaunch(configuration);
assertArrayEquals(new String[] {"-B", "-s", "settings.xml"}, runner.getConfiguration().getProgramArguments());
assertArrayEquals(new String[] {"-B", "-Dstyle.color=always", "-s", "settings.xml"},
runner.getConfiguration().getProgramArguments());
} finally {
mavenConfig.setUserSettingsFile(null);
}
Expand Down