diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java index 12e5ae8f3c..a4b400e84c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java @@ -66,7 +66,7 @@ public void testitMNG3714() List cliOptions = new ArrayList(); cliOptions.add( "--toolchains toolchains.xml" ); verifier.setCliOptions( cliOptions ); - verifier.executeGoal( "validate" ); + verifier.executeGoal( "initialize" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); @@ -78,6 +78,11 @@ public void testitMNG3714() tool = tool.substring( 0, tool.length() - 4 ); } assertEquals( new File( javaHome, "bin/javac" ).getAbsolutePath(), tool ); + + verifier.assertFilePresent( "target/tool.properties" ); + Properties toolProps = verifier.loadProperties( "target/tool.properties" ); + String path = toolProps.getProperty( "tool.javac", "" ); + assertEquals( results.getProperty( "tool.1", "" ), path ); } } diff --git a/its/core-it-suite/src/test/resources/mng-3714/pom.xml b/its/core-it-suite/src/test/resources/mng-3714/pom.xml index 7b5b9fdbfc..ddf13ded10 100644 --- a/its/core-it-suite/src/test/resources/mng-3714/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3714/pom.xml @@ -1,10 +1,34 @@ + + + + 4.0.0 - Maven Integration Test :: MNG-3714 + org.apache.maven.its.mng3714 - maven-it-mng3714 - Test --toolchains CLI option + test 1.0-SNAPSHOT + + Maven Integration Test :: MNG-3714 + Test --toolchains CLI option + @@ -13,9 +37,29 @@ 2.1-SNAPSHOT + select-toolchain + validate toolchain + + target/toolchains.properties + jdk + javac + 0 + + + + find-tool + initialize + + find-tool + + + target/tool.properties + jdk + javac +