Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public MavenIT0030DepPomDepMgmtInheritanceTest() {
@Test
public void testit0030() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/it0030");
Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.deleteArtifact("org.apache.maven.it", "maven-it-it0030", "1.0-SNAPSHOT", "jar");
verifier.deleteArtifact("org.apache.maven.it", "maven-it-it0030-child-hierarchy", "1.0-SNAPSHOT", "jar");
verifier.deleteArtifact("org.apache.maven.it", "maven-it-it0030-child-project1", "1.0-SNAPSHOT", "jar");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public MavenIT0041ArtifactTypeFromPluginExtensionTest() {
public void testit0041() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/it0041");

Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven", "maven-core-it-support", "1.2");
verifier.addCliArgument("--settings");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void testitBuildConfigDominantDuringBuild() throws Exception {
public void testitBuildConfigIrrelevantForReports() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-0469/test2");

Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.deleteDirectory("target");
verifier.setAutoclean(false);
if (matchesVersionRange("(,3.0-alpha-1)")) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public MavenITmng0507ArtifactRelocationTest() {
public void testitMNG507() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-0507");

Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven", "maven-core-it-support", "1.1");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public MavenITmng2135PluginBuildInReactorTest() {
public void testit() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-2135");

Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteDirectory("plugin/target");
verifier.deleteDirectory("project/target");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void testValidParentVersionRangeWithInclusiveUpperBound() throws Exceptio
File testDir = ResourceExtractor.simpleExtractResources(
getClass(), "/mng-2199-parent-version-range/valid-inclusive-upper-bound");

verifier = newVerifier(testDir.getAbsolutePath(), "remote");
verifier = newVerifier(testDir.getAbsolutePath());
verifier.addCliArgument("-U");
verifier.setAutoclean(false);
verifier.addCliArgument("verify");
Expand All @@ -64,7 +64,7 @@ public void testValidParentVersionRangeWithExclusiveUpperBound() throws Exceptio
File testDir = ResourceExtractor.simpleExtractResources(
getClass(), "/mng-2199-parent-version-range/valid-exclusive-upper-bound");

verifier = newVerifier(testDir.getAbsolutePath(), "remote");
verifier = newVerifier(testDir.getAbsolutePath());
verifier.addCliArgument("-U");
verifier.setAutoclean(false);
verifier.addCliArgument("verify");
Expand All @@ -84,7 +84,7 @@ public void testInvalidParentVersionRangeWithoutUpperBound() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-2199-parent-version-range/invalid");

try {
verifier = newVerifier(testDir.getAbsolutePath(), "remote");
verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.addCliArgument("-U");
verifier.addCliArgument("verify");
Expand All @@ -106,7 +106,7 @@ public void testValidParentVersionRangeInvalidVersionExpression() throws Excepti
ResourceExtractor.simpleExtractResources(getClass(), "/mng-2199-parent-version-range/expression");

try {
verifier = newVerifier(testDir.getAbsolutePath(), "remote");
verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.addCliArgument("-U");
verifier.addCliArgument("verify");
Expand All @@ -126,7 +126,7 @@ public void testValidParentVersionRangeInvalidVersionInheritance() throws Except
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-2199-parent-version-range/inherited");

try {
verifier = newVerifier(testDir.getAbsolutePath(), "remote");
verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.addCliArgument("-U");
verifier.addCliArgument("verify");
Expand Down Expand Up @@ -190,7 +190,7 @@ public void testInvalidLocalParentVersionRangeFallingBackToRemote() throws Excep
File testDir = ResourceExtractor.simpleExtractResources(
getClass(), "/mng-2199-parent-version-range/local-fallback-to-remote/child");

verifier = newVerifier(testDir.getAbsolutePath(), "remote");
verifier = newVerifier(testDir.getAbsolutePath());
verifier.addCliArgument("verify");
verifier.execute();
verifier.verifyErrorFreeLog();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ public void testitMNG3259() throws Exception {

Verifier verifier;

verifier = newVerifier(new File(testDir, "parent").getAbsolutePath(), "remote");
verifier = newVerifier(new File(testDir, "parent").getAbsolutePath());

verifier.addCliArgument("install");
verifier.execute();

verifier.verifyErrorFreeLog();

verifier = newVerifier(testDir.getAbsolutePath(), "remote");
verifier = newVerifier(testDir.getAbsolutePath());

verifier.addCliArgument("install");
verifier.execute();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public void testMultipleProfileParams() throws Exception {

Verifier verifier;

verifier = newVerifier(testDir.getAbsolutePath(), "remote");
verifier = newVerifier(testDir.getAbsolutePath());

verifier.addCliArgument("-Pprofile1,profile2");
verifier.addCliArgument("-Pprofile3");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void testitMNG3372() throws Exception {
File project = new File(testBaseDir, "project");
File settingsFile = new File(testBaseDir, "settings.xml");

Verifier verifier = newVerifier(plugin.getAbsolutePath(), "remote");
Verifier verifier = newVerifier(plugin.getAbsolutePath());

verifier.deleteArtifacts("org.apache.maven.its.mng3372");

Expand All @@ -69,7 +69,7 @@ public void testDependencyTreeInvocation() throws Exception {
// file.
File testBaseDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3372/dependency-tree");

Verifier verifier = newVerifier(testBaseDir.getAbsolutePath(), "remote");
Verifier verifier = newVerifier(testBaseDir.getAbsolutePath());

verifier.addCliArgument("-U");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public void testitMNG3396() throws Exception {
String baseDir = "/mng-3396";
File testDir = ResourceExtractor.simpleExtractResources(getClass(), baseDir + "/dependencies");

Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.deleteArtifact(GROUP_ID, "A", "1.0", "pom");
verifier.deleteArtifact(GROUP_ID, "A", "1.0", "jar");
verifier.deleteArtifact(GROUP_ID, "B", "1.0", "pom");
Expand All @@ -51,7 +51,7 @@ public void testitMNG3396() throws Exception {

testDir = ResourceExtractor.simpleExtractResources(getClass(), baseDir + "/plugin");

verifier = newVerifier(testDir.getAbsolutePath(), "remote");
verifier = newVerifier(testDir.getAbsolutePath());
verifier.deleteArtifact(GROUP_ID, "A", "1.0", "pom");
verifier.deleteArtifact(GROUP_ID, "A", "1.0", "jar");
verifier.deleteArtifact(GROUP_ID, "A", "3.0", "pom");
Expand All @@ -64,7 +64,7 @@ public void testitMNG3396() throws Exception {

testDir = ResourceExtractor.simpleExtractResources(getClass(), baseDir + "/pluginuser");

verifier = newVerifier(testDir.getAbsolutePath(), "remote");
verifier = newVerifier(testDir.getAbsolutePath());
verifier.deleteArtifact(GROUP_ID, "pluginuser", "1.0", "pom");
verifier.deleteArtifact(GROUP_ID, "pluginuser", "1.0", "jar");
verifier.addCliArgument("install");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void testitMNG3441() throws Exception {

Verifier verifier;

verifier = newVerifier(testDir.getAbsolutePath(), "remote");
verifier = newVerifier(testDir.getAbsolutePath());

verifier.addCliArgument("-s");
verifier.addCliArgument("settings.xml");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.eclipse.jetty.server.Server;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

/**
Expand All @@ -49,7 +50,7 @@ public MavenITmng3477DependencyResolutionErrorMessageTest() {
void testit(int port, String[] logExpectPatterns, String projectFile) throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3477");

Verifier verifier = newVerifier(testDir.getAbsolutePath());
Verifier verifier = newVerifier(testDir.getAbsolutePath(), "");

Map<String, String> filterProps = new HashMap<>();
filterProps.put("@port@", Integer.toString(port));
Expand Down Expand Up @@ -95,7 +96,9 @@ void connectionProblemsPlugin() throws Exception {
testit(
54312,
new String[] {
".*The following artifacts could not be resolved: org.apache.maven.its.plugins:maven-it-plugin-not-exists:pom:1.2.3 \\(absent\\): Could not transfer artifact org.apache.maven.its.plugins:maven-it-plugin-not-exists:pom:1.2.3 from/to maven-core-it \\(http://localhost:.*/repo\\): Connection to http://localhost:.*2/repo/ refused.*"
".*The following artifacts could not be resolved: org.apache.maven.its.plugins:maven-it-plugin-not-exists:pom:1.2.3 \\(absent\\): "
+ "Could not transfer artifact org.apache.maven.its.plugins:maven-it-plugin-not-exists:pom:1.2.3 from/to "
+ "maven-core-it \\(http://localhost:.*/repo\\): Connection to http://localhost:.*2/repo/ refused.*"
},
"pom-plugin.xml");
}
Expand All @@ -106,16 +109,16 @@ void notFoundProblems() throws Exception {
try {
server = new Server(0);
server.start();
if (server.isFailed()) {
fail("Couldn't bind the server socket to a free port!");
}
assertFalse(server.isFailed(), "Couldn't bind the server socket to a free port!");

int port = ((NetworkConnector) server.getConnectors()[0]).getLocalPort();
testit(
port,
new String[] {
".*Could not find artifact org.apache.maven.its.mng3477:dep:.*:1.0 in central \\(http://localhost:.*/repo\\).*",
".*Could not find artifact org.apache.maven.its.mng3477:dep:.*:1.0 in maven-core-it \\(http://localhost:.*/repo\\).*"
".*Could not find artifact org.apache.maven.its.mng3477:dep:.*:1.0 "
+ "in central \\(http://localhost:.*/repo\\).*",
".*Could not find artifact org.apache.maven.its.mng3477:dep:.*:1.0 "
+ "in maven-core-it \\(http://localhost:.*/repo\\).*"
},
"pom.xml");

Expand All @@ -133,16 +136,16 @@ void notFoundProblemsPlugin() throws Exception {
try {
server = new Server(0);
server.start();
if (server.isFailed()) {
fail("Couldn't bind the server socket to a free port!");
}
assertFalse(server.isFailed(), "Couldn't bind the server socket to a free port!");

int port = ((NetworkConnector) server.getConnectors()[0]).getLocalPort();
testit(
port,
new String[] {
".*Could not find artifact org.apache.maven.its.plugins:maven-it-plugin-not-exists:jar:1.2.3 in central \\(http://localhost:.*/repo\\).*",
".*Could not find artifact org.apache.maven.its.plugins:maven-it-plugin-not-exists:jar:1.2.3 in maven-core-it \\(http://localhost:.*/repo\\).*"
".*Could not find artifact org.apache.maven.its.plugins:maven-it-plugin-not-exists:jar:1.2.3 "
+ "in central \\(http://localhost:.*/repo\\).*",
".*Could not find artifact org.apache.maven.its.plugins:maven-it-plugin-not-exists:jar:1.2.3 "
+ "in maven-core-it \\(http://localhost:.*/repo\\).*"
},
"pom-plugin.xml");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public void testitMNG3485() throws Exception {

Verifier verifier;

verifier = newVerifier(testDir.getAbsolutePath(), "remote");
verifier = newVerifier(testDir.getAbsolutePath());

verifier.addCliArgument("deploy");
verifier.execute();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void testitMNG3498() throws Exception {
File pluginDir = new File(testDir, "maven-mng3498-plugin");
File projectDir = new File(testDir, "mng-3498-project");

Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
Verifier verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.deleteArtifact("org.apache.maven.its.mng3498", "mavenit-mng3498-plugin", "1", "pom");

verifier.addCliArgument("install");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public MavenITmng3506ArtifactHandlersFromPluginsTest() {
public void testProjectPackagingUsage() throws IOException, VerificationException {
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/" + AID);

Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
Verifier verifier = newVerifier(testDir.getAbsolutePath());

verifier.deleteArtifacts(GID);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public MavenITmng3536AppendedAbsolutePathsTest() {
public void testitMNG3536() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3536");
File pluginDir = new File(testDir, "plugin");
Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
Verifier verifier = newVerifier(pluginDir.getAbsolutePath());

verifier.addCliArgument("install");
verifier.execute();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ public void testmng3652_UnConfiguredHttp() throws Exception {
File pluginDir = new File(testDir, "test-plugin");
File projectDir = new File(testDir, "test-project");

Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
Verifier verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();

verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
verifier = newVerifier(projectDir.getAbsolutePath());

verifier.addCliArgument("-DtestPort=" + port);
verifier.addCliArgument("-X");
Expand Down Expand Up @@ -151,12 +151,12 @@ public void testmng3652_UnConfiguredDAV() throws Exception {
File pluginDir = new File(testDir, "test-plugin");
File projectDir = new File(testDir, "test-project");

Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
Verifier verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();

verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
verifier = newVerifier(projectDir.getAbsolutePath());

// test webdav
verifier.addCliArgument("-DtestPort=" + port);
Expand Down Expand Up @@ -196,12 +196,12 @@ public void testmng3652_ConfigurationInSettingsWithoutUserAgent() throws Excepti
File pluginDir = new File(testDir, "test-plugin");
File projectDir = new File(testDir, "test-project");

Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
Verifier verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();

verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
verifier = newVerifier(projectDir.getAbsolutePath());

// test settings with no config

Expand Down Expand Up @@ -243,12 +243,12 @@ public void testmng3652_UserAgentConfiguredInSettings() throws Exception {
File pluginDir = new File(testDir, "test-plugin");
File projectDir = new File(testDir, "test-project");

Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
Verifier verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();

verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
verifier = newVerifier(projectDir.getAbsolutePath());

// test settings with config

Expand All @@ -275,12 +275,12 @@ public void testmng3652_AdditionnalHttpHeaderConfiguredInSettings() throws Excep
File pluginDir = new File(testDir, "test-plugin");
File projectDir = new File(testDir, "test-project");

Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
Verifier verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();

verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
verifier = newVerifier(projectDir.getAbsolutePath());

// test settings with config

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ public void testitMNG3684() throws Exception {
File pluginDir = new File(testDir, "maven-mng3684-plugin");
File projectDir = new File(testDir, "project");

Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
Verifier verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();

verifier.verifyErrorFreeLog();

verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
verifier = newVerifier(projectDir.getAbsolutePath());
verifier.setLogFileName("log-validate.txt");
verifier.addCliArgument("validate");
verifier.execute();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void testitMNG3693() throws Exception {
File pluginDir = new File(testDir, "maven-mng3693-plugin");
File projectsDir = new File(testDir, "projects");

Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
Verifier verifier = newVerifier(pluginDir.getAbsolutePath());

verifier.addCliArgument("install");
verifier.execute();
Expand Down
Loading