Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MSHARED-410 updated to Verifier 1.6 

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
This commit is contained in:
Igor Fedorenko 2015-02-26 10:44:37 -05:00
parent b772ffd490
commit bbfaf89229
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java
View File

@ -75,7 +75,7 @@ public class MavenITmng2276ProfileActivationBySettingsPropertyTest
verifier.deleteDirectory( "target" ); verifier.deleteDirectory( "target" );
verifier.addCliOption( "--settings" ); verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" ); verifier.addCliOption( "settings.xml" );
verifier.setSystemProperty( "settingsProperty", "cli" ); verifier.addCliOption( "-DsettingsProperty=cli" );
verifier.setLogFileName( "log-2.txt" ); verifier.setLogFileName( "log-2.txt" );
verifier.executeGoal( "validate" ); verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog(); verifier.verifyErrorFreeLog();

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java
View File

@ -54,7 +54,7 @@ public class MavenITmng3951AbsolutePathsTest
* Cut off anything before the first file separator from the local repo path. This is harmless on a Unix-like * Cut off anything before the first file separator from the local repo path. This is harmless on a Unix-like
* filesystem but will make the path drive-relative on Windows so we can check how Maven handles it. * filesystem but will make the path drive-relative on Windows so we can check how Maven handles it.
*/ */
String repoDir = new File( verifier.localRepo ).getAbsolutePath(); String repoDir = new File( verifier.getLocalRepository() ).getAbsolutePath();
if ( getRoot( new File( repoDir ) ).equals( getRoot( testDir ) ) ) if ( getRoot( new File( repoDir ) ).equals( getRoot( testDir ) ) )
{ {
// NOTE: We can only test the local repo if it resides on the same drive as the test // NOTE: We can only test the local repo if it resides on the same drive as the test

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
View File

@ -62,7 +62,7 @@ public class MavenITmng3955EffectiveSettingsTest
Properties props = verifier.loadProperties( "target/settings.properties" ); Properties props = verifier.loadProperties( "target/settings.properties" );
assertEquals( "true", props.getProperty( "settings.offline" ) ); assertEquals( "true", props.getProperty( "settings.offline" ) );
assertEquals( "false", props.getProperty( "settings.interactiveMode" ) ); assertEquals( "false", props.getProperty( "settings.interactiveMode" ) );
assertEquals( new File( verifier.localRepo ).getAbsoluteFile(), assertEquals( new File( verifier.getLocalRepository() ).getAbsoluteFile(),
new File( props.getProperty( "settings.localRepository" ) ).getAbsoluteFile() ); new File( props.getProperty( "settings.localRepository" ) ).getAbsoluteFile() );
} }

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java
View File

@ -58,7 +58,8 @@ public class MavenITmng4305LocalRepoBasedirTest
Properties props = verifier.loadProperties( "target/basedir.properties" ); Properties props = verifier.loadProperties( "target/basedir.properties" );
// NOTE: This deliberately compares the paths on the String level, not via File.equals() // NOTE: This deliberately compares the paths on the String level, not via File.equals()
assertEquals( new File( verifier.localRepo ).getAbsolutePath(), props.getProperty( "localRepository.basedir" ) ); assertEquals( new File( verifier.getLocalRepository() ).getAbsolutePath(),
props.getProperty( "localRepository.basedir" ) );
} }
} }

2
its/pom.xml
View File

@ -74,7 +74,7 @@ under the License.
<dependency> <dependency>
<groupId>org.apache.maven.shared</groupId> <groupId>org.apache.maven.shared</groupId>
<artifactId>maven-verifier</artifactId> <artifactId>maven-verifier</artifactId>
<version>1.5</version> <version>1.6-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>