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

Upgrade maven-verifier to 1.8.0 

- upgrade maven-verifier
- remove code implemented in maven-verifier
- replace deprecated methods
This commit is contained in:
Slawomir Jaranowski 2022-05-19 07:18:07 +02:00
parent c2d9fff607
commit c6079bb5a6
173 changed files with 638 additions and 679 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java
View File

@ -49,8 +49,8 @@ public class MavenIT0008SimplePluginTest
verifier.deleteDirectory( "target" );
verifier.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-touch", "1.0", "maven-plugin" );
verifier.executeGoal( "process-sources" );
verifier.assertFilePresent( "target/touch.txt" );
verifier.assertFilePresent( "target/test-basedir-alignment/touch.txt" );
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFilePresent( "target/test-basedir-alignment/touch.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

6
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java
View File

@ -49,9 +49,9 @@ public class MavenIT0009GoalConfigurationTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.assertFilePresent( supportSpaceInXml ? "target/ pluginItem " : "target/pluginItem");
verifier.assertFilePresent( "target/goalItem" );
verifier.assertFileNotPresent( "target/bad-item" );
verifier.verifyFilePresent( supportSpaceInXml ? "target/ pluginItem " : "target/pluginItem");
verifier.verifyFilePresent( "target/goalItem" );
verifier.verifyFileNotPresent( "target/bad-item" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

6
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java
View File

@ -55,9 +55,9 @@ public class MavenIT0010DependencyClosureResolutionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.it0010", "a", "0.1", "jar" );
verifier.assertArtifactPresent( "org.apache.maven.its.it0010", "b", "0.2", "jar" );
verifier.assertArtifactPresent( "org.apache.maven.its.it0010", "parent", "1.0", "pom" );
verifier.verifyArtifactPresent( "org.apache.maven.its.it0010", "a", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.it0010", "b", "0.2", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.it0010", "parent", "1.0", "pom" );
List<String> artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.it0010:a:jar:0.1" ) );

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java
View File

@ -45,8 +45,8 @@ public class MavenIT0012PomInterpolationTest
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "child-project/target" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.assertFilePresent( "target/touch-3.8.1.txt" );
verifier.assertFilePresent( "child-project/target/child-touch-3.0.3.txt" );
verifier.verifyFilePresent( "target/touch-3.8.1.txt" );
verifier.verifyFilePresent( "child-project/target/child-touch-3.0.3.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

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

@ -49,7 +49,7 @@ public class MavenIT0018DependencyManagementTest
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
verifier.assertArtifactPresent( "org.apache.maven.its.it0018", "managed-dep", "1.0.3", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.it0018", "managed-dep", "1.0.3", "jar" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

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

@ -44,7 +44,7 @@ public class MavenIT0019PluginVersionMngtBySuperPomTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "process-resources" );
verifier.assertFilePresent( "target/classes/test.txt" );
verifier.verifyFilePresent( "target/classes/test.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java
View File

@ -54,8 +54,8 @@ public class MavenIT0021PomProfileTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.it0021", "a", "0.1", "jar" );
verifier.assertArtifactPresent( "org.apache.maven.its.it0021", "b", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.it0021", "a", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.it0021", "b", "0.1", "jar" );
}
}

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

@ -51,7 +51,7 @@ public class MavenIT0023SettingsProfileTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/test.txt" );
verifier.verifyFilePresent( "target/test.txt" );
}
}

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

@ -55,7 +55,7 @@ public class MavenIT0024MultipleGoalExecutionsTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/plugin-exec-configuration.txt" );
verifier.verifyFilePresent( "target/plugin-exec-configuration.txt" );
}
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java
View File

@ -54,8 +54,8 @@ public class MavenIT0025MultipleExecutionLevelConfigsTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/test.txt" );
verifier.assertFilePresent( "target/test2.txt" );
verifier.verifyFilePresent( "target/test.txt" );
verifier.verifyFilePresent( "target/test2.txt" );
}
}

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

@ -47,7 +47,7 @@ public class MavenIT0030DepPomDepMngtInheritanceTest
verifier.deleteArtifact( "org.apache.maven.it", "maven-it-it0030-child-project1", "1.0-SNAPSHOT", "jar" );
verifier.deleteArtifact( "org.apache.maven.it", "maven-it-it0030-child-project2", "1.0-SNAPSHOT", "jar" );
verifier.executeGoal( "install" );
verifier.assertFilePresent( "child-hierarchy/project2/target/classes/org/apache/maven/it0001/Person.class" );
verifier.verifyFilePresent( "child-hierarchy/project2/target/classes/org/apache/maven/it0001/Person.class" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java
View File

@ -54,8 +54,8 @@ public class MavenIT0036ReleasePomTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/passed.log" );
verifier.assertFileNotPresent( "target/failed.log" );
verifier.verifyFilePresent( "target/passed.log" );
verifier.verifyFileNotPresent( "target/failed.log" );
}
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java
View File

@ -56,8 +56,8 @@ public class MavenIT0037AlternatePomFileSameDirTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/passed.log" );
verifier.assertFileNotPresent( "target/failed.log" );
verifier.verifyFilePresent( "target/passed.log" );
verifier.verifyFileNotPresent( "target/failed.log" );
}
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java
View File

@ -56,8 +56,8 @@ public class MavenIT0038AlternatePomFileDifferentDirTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "project/target/passed.log" );
verifier.assertFileNotPresent( "target/failed.log" );
verifier.verifyFilePresent( "project/target/passed.log" );
verifier.verifyFileNotPresent( "target/failed.log" );
}
}

8
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java
View File

@ -58,10 +58,10 @@ public class MavenIT0039ReleasePomInReactorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "project/target/passed.log" );
verifier.assertFileNotPresent( "project/target/failed.log" );
verifier.assertFilePresent( "project2/target/passed.log" );
verifier.assertFileNotPresent( "project2/target/failed.log" );
verifier.verifyFilePresent( "project/target/passed.log" );
verifier.verifyFileNotPresent( "project/target/failed.log" );
verifier.verifyFilePresent( "project2/target/passed.log" );
verifier.verifyFileNotPresent( "project2/target/failed.log" );
}
}

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

@ -55,7 +55,7 @@ public class MavenIT0040PackagingFromPluginExtensionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/maven-it-it0040-1.0-it.jar" );
verifier.verifyFilePresent( "target/maven-it-it0040-1.0-it.jar" );
}
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
View File

@ -56,8 +56,8 @@ public class MavenIT0041ArtifactTypeFromPluginExtensionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.2", "coreit-artifact" );
verifier.assertArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.2", "pom" );
verifier.verifyArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.2", "coreit-artifact" );
verifier.verifyArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.2", "pom" );
}
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java
View File

@ -50,8 +50,8 @@ public class MavenIT0051ReleaseProfileTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/source-jar.txt" );
verifier.assertFilePresent( "target/javadoc-jar.txt" );
verifier.verifyFilePresent( "target/source-jar.txt" );
verifier.verifyFilePresent( "target/javadoc-jar.txt" );
}
}

6
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java
View File

@ -49,9 +49,9 @@ public class MavenIT0052ReleaseProfileTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/jar-jar.txt" );
verifier.assertFileNotPresent( "target/source-jar.txt" );
verifier.assertFileNotPresent( "target/javadoc-jar.txt" );
verifier.verifyFilePresent( "target/jar-jar.txt" );
verifier.verifyFileNotPresent( "target/source-jar.txt" );
verifier.verifyFileNotPresent( "target/javadoc-jar.txt" );
}
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java
View File

@ -49,8 +49,8 @@ public class MavenIT0056MultipleGoalExecutionsTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/first-exec.txt" );
verifier.assertFilePresent( "target/second-exec.txt" );
verifier.verifyFilePresent( "target/first-exec.txt" );
verifier.verifyFilePresent( "target/second-exec.txt" );
}
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java
View File

@ -49,7 +49,7 @@ public class MavenIT0064MojoConfigViaSettersTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/fooValue" );
verifier.assertFilePresent( "target/barValue.baz" );
verifier.verifyFilePresent( "target/fooValue" );
verifier.verifyFilePresent( "target/barValue.baz" );
}
}

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

@ -55,7 +55,7 @@ public class MavenIT0071PluginConfigWithDottedPropertyTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/foo2" );
verifier.verifyFilePresent( "target/foo2" );
}
}

6
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
View File

@ -70,7 +70,7 @@ public class MavenIT0108SnapshotUpdateTest
artifact.getParentFile().mkdirs();
FileUtils.fileWrite( artifact.getAbsolutePath(), "originalArtifact" );
verifier.assertArtifactNotPresent( "org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar" );
verifier.verifyArtifactNotPresent( "org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar" );
}
public void testSnapshotUpdated()
@ -211,9 +211,9 @@ public class MavenIT0108SnapshotUpdateTest
}
private void assertArtifactContents( String s )
throws IOException
throws IOException, VerificationException
{
verifier.assertArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar" );
verifier.assertArtifactContents( "org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar", s );
}

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

@ -51,7 +51,7 @@ public class MavenIT0130CleanLifecycleTest
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "clean" );
verifier.assertFilePresent( "target/clean-clean.txt" );
verifier.verifyFilePresent( "target/clean-clean.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java
View File

@ -51,8 +51,8 @@ public class MavenIT0131SiteLifecycleTest
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "site-deploy" );
verifier.assertFilePresent( "target/site-site.txt" );
verifier.assertFilePresent( "target/site-deploy.txt" );
verifier.verifyFilePresent( "target/site-site.txt" );
verifier.verifyFilePresent( "target/site-deploy.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

6
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
View File

@ -53,10 +53,10 @@ public class MavenIT0132PomLifecycleTest
verifier.executeGoal( "deploy" );
if ( matchesVersionRange( "(2.0.1,3.0-alpha-1)" ) )
{
verifier.assertFilePresent( "target/site-attach-descriptor.txt" );
verifier.verifyFilePresent( "target/site-attach-descriptor.txt" );
}
verifier.assertFilePresent( "target/install-install.txt" );
verifier.assertFilePresent( "target/deploy-deploy.txt" );
verifier.verifyFilePresent( "target/install-install.txt" );
verifier.verifyFilePresent( "target/deploy-deploy.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

16
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java
View File

@ -51,14 +51,14 @@ public class MavenIT0133JarLifecycleTest
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
verifier.assertFilePresent( "target/resources-resources.txt" );
verifier.assertFilePresent( "target/compiler-compile.txt" );
verifier.assertFilePresent( "target/resources-test-resources.txt" );
verifier.assertFilePresent( "target/compiler-test-compile.txt" );
verifier.assertFilePresent( "target/surefire-test.txt" );
verifier.assertFilePresent( "target/jar-jar.txt" );
verifier.assertFilePresent( "target/install-install.txt" );
verifier.assertFilePresent( "target/deploy-deploy.txt" );
verifier.verifyFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/compiler-compile.txt" );
verifier.verifyFilePresent( "target/resources-test-resources.txt" );
verifier.verifyFilePresent( "target/compiler-test-compile.txt" );
verifier.verifyFilePresent( "target/surefire-test.txt" );
verifier.verifyFilePresent( "target/jar-jar.txt" );
verifier.verifyFilePresent( "target/install-install.txt" );
verifier.verifyFilePresent( "target/deploy-deploy.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

16
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java
View File

@ -51,14 +51,14 @@ public class MavenIT0134WarLifecycleTest
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
verifier.assertFilePresent( "target/resources-resources.txt" );
verifier.assertFilePresent( "target/compiler-compile.txt" );
verifier.assertFilePresent( "target/resources-test-resources.txt" );
verifier.assertFilePresent( "target/compiler-test-compile.txt" );
verifier.assertFilePresent( "target/surefire-test.txt" );
verifier.assertFilePresent( "target/war-war.txt" );
verifier.assertFilePresent( "target/install-install.txt" );
verifier.assertFilePresent( "target/deploy-deploy.txt" );
verifier.verifyFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/compiler-compile.txt" );
verifier.verifyFilePresent( "target/resources-test-resources.txt" );
verifier.verifyFilePresent( "target/compiler-test-compile.txt" );
verifier.verifyFilePresent( "target/surefire-test.txt" );
verifier.verifyFilePresent( "target/war-war.txt" );
verifier.verifyFilePresent( "target/install-install.txt" );
verifier.verifyFilePresent( "target/deploy-deploy.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

16
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java
View File

@ -51,14 +51,14 @@ public class MavenIT0135EjbLifecycleTest
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
verifier.assertFilePresent( "target/resources-resources.txt" );
verifier.assertFilePresent( "target/compiler-compile.txt" );
verifier.assertFilePresent( "target/resources-test-resources.txt" );
verifier.assertFilePresent( "target/compiler-test-compile.txt" );
verifier.assertFilePresent( "target/surefire-test.txt" );
verifier.assertFilePresent( "target/ejb-ejb.txt" );
verifier.assertFilePresent( "target/install-install.txt" );
verifier.assertFilePresent( "target/deploy-deploy.txt" );
verifier.verifyFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/compiler-compile.txt" );
verifier.verifyFilePresent( "target/resources-test-resources.txt" );
verifier.verifyFilePresent( "target/compiler-test-compile.txt" );
verifier.verifyFilePresent( "target/surefire-test.txt" );
verifier.verifyFilePresent( "target/ejb-ejb.txt" );
verifier.verifyFilePresent( "target/install-install.txt" );
verifier.verifyFilePresent( "target/deploy-deploy.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

16
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java
View File

@ -51,14 +51,14 @@ public class MavenIT0136RarLifecycleTest
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
verifier.assertFilePresent( "target/resources-resources.txt" );
verifier.assertFilePresent( "target/compiler-compile.txt" );
verifier.assertFilePresent( "target/resources-test-resources.txt" );
verifier.assertFilePresent( "target/compiler-test-compile.txt" );
verifier.assertFilePresent( "target/surefire-test.txt" );
verifier.assertFilePresent( "target/rar-rar.txt" );
verifier.assertFilePresent( "target/install-install.txt" );
verifier.assertFilePresent( "target/deploy-deploy.txt" );
verifier.verifyFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/compiler-compile.txt" );
verifier.verifyFilePresent( "target/resources-test-resources.txt" );
verifier.verifyFilePresent( "target/compiler-test-compile.txt" );
verifier.verifyFilePresent( "target/surefire-test.txt" );
verifier.verifyFilePresent( "target/rar-rar.txt" );
verifier.verifyFilePresent( "target/install-install.txt" );
verifier.verifyFilePresent( "target/deploy-deploy.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

10
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java
View File

@ -51,11 +51,11 @@ public class MavenIT0137EarLifecycleTest
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
verifier.assertFilePresent( "target/ear-generate-application-xml.txt" );
verifier.assertFilePresent( "target/resources-resources.txt" );
verifier.assertFilePresent( "target/ear-ear.txt" );
verifier.assertFilePresent( "target/install-install.txt" );
verifier.assertFilePresent( "target/deploy-deploy.txt" );
verifier.verifyFilePresent( "target/ear-generate-application-xml.txt" );
verifier.verifyFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/ear-ear.txt" );
verifier.verifyFilePresent( "target/install-install.txt" );
verifier.verifyFilePresent( "target/deploy-deploy.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

22
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java
View File

@ -51,20 +51,20 @@ public class MavenIT0138PluginLifecycleTest
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "deploy" );
verifier.assertFilePresent( "target/plugin-descriptor.txt" );
verifier.assertFilePresent( "target/resources-resources.txt" );
verifier.assertFilePresent( "target/compiler-compile.txt" );
verifier.assertFilePresent( "target/resources-test-resources.txt" );
verifier.assertFilePresent( "target/compiler-test-compile.txt" );
verifier.assertFilePresent( "target/surefire-test.txt" );
verifier.assertFilePresent( "target/jar-jar.txt" );
verifier.assertFilePresent( "target/plugin-add-plugin-artifact-metadata.txt" );
verifier.assertFilePresent( "target/install-install.txt" );
verifier.verifyFilePresent( "target/plugin-descriptor.txt" );
verifier.verifyFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/compiler-compile.txt" );
verifier.verifyFilePresent( "target/resources-test-resources.txt" );
verifier.verifyFilePresent( "target/compiler-test-compile.txt" );
verifier.verifyFilePresent( "target/surefire-test.txt" );
verifier.verifyFilePresent( "target/jar-jar.txt" );
verifier.verifyFilePresent( "target/plugin-add-plugin-artifact-metadata.txt" );
verifier.verifyFilePresent( "target/install-install.txt" );
if ( matchesVersionRange( "(,2.2.0)" ) )
{
verifier.assertFilePresent( "target/plugin-update-registry.txt" );
verifier.verifyFilePresent( "target/plugin-update-registry.txt" );
}
verifier.assertFilePresent( "target/deploy-deploy.txt" );
verifier.verifyFilePresent( "target/deploy-deploy.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

18
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java
View File

@ -58,9 +58,9 @@ public class MavenIT0145ReactorWithIncludesExcludesTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFileNotPresent( "target/touch.txt" );
verifier.assertFilePresent( "mod-a/target/touch-a.txt" );
verifier.assertFilePresent( "mod-b/target/touch-b.txt" );
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFilePresent( "mod-a/target/touch-a.txt" );
verifier.verifyFilePresent( "mod-b/target/touch-b.txt" );
}
/**
@ -85,9 +85,9 @@ public class MavenIT0145ReactorWithIncludesExcludesTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFileNotPresent( "target/touch.txt" );
verifier.assertFilePresent( "mod-a/target/touch-a.txt" );
verifier.assertFileNotPresent( "mod-b/target/touch-b.txt" );
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFilePresent( "mod-a/target/touch-a.txt" );
verifier.verifyFileNotPresent( "mod-b/target/touch-b.txt" );
}
/**
@ -112,9 +112,9 @@ public class MavenIT0145ReactorWithIncludesExcludesTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/touch.txt" );
verifier.assertFileNotPresent( "mod-a/target/touch-a.txt" );
verifier.assertFilePresent( "mod-b/target/touch-b.txt" );
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "mod-a/target/touch-a.txt" );
verifier.verifyFilePresent( "mod-b/target/touch-b.txt" );
}
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
View File

@ -104,7 +104,7 @@ public class MavenIT0146InstallerSnapshotNaming
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/appassembler/repo/dep-0.1-20110726.105319-1.jar" );
verifier.verifyFilePresent( "target/appassembler/repo/dep-0.1-20110726.105319-1.jar" );
}
@ -143,6 +143,6 @@ public class MavenIT0146InstallerSnapshotNaming
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/appassembler/repo/dep-0.1-SNAPSHOT.jar" );
verifier.verifyFilePresent( "target/appassembler/repo/dep-0.1-SNAPSHOT.jar" );
}
}

24
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
View File

@ -67,10 +67,10 @@ public class MavenITmng0095ReactorFailureBehaviorTest
}
verifier.resetStreams();
verifier.assertFilePresent( "target/touch.txt" );
verifier.assertFileNotPresent( "subproject1/target/touch.txt" );
verifier.assertFileNotPresent( "subproject2/target/touch.txt" );
verifier.assertFileNotPresent( "subproject3/target/touch.txt" );
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
verifier.verifyFileNotPresent( "subproject2/target/touch.txt" );
verifier.verifyFileNotPresent( "subproject3/target/touch.txt" );
}
/**
@ -95,10 +95,10 @@ public class MavenITmng0095ReactorFailureBehaviorTest
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.resetStreams();
verifier.assertFilePresent( "target/touch.txt" );
verifier.assertFileNotPresent( "subproject1/target/touch.txt" );
verifier.assertFilePresent( "subproject2/target/touch.txt" );
verifier.assertFilePresent( "subproject3/target/touch.txt" );
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
verifier.verifyFilePresent( "subproject2/target/touch.txt" );
verifier.verifyFilePresent( "subproject3/target/touch.txt" );
}
/**
@ -132,10 +132,10 @@ public class MavenITmng0095ReactorFailureBehaviorTest
}
verifier.resetStreams();
verifier.assertFilePresent( "target/touch.txt" );
verifier.assertFileNotPresent( "subproject1/target/touch.txt" );
verifier.assertFilePresent( "subproject2/target/touch.txt" );
verifier.assertFileNotPresent( "subproject3/target/touch.txt" );
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
verifier.verifyFilePresent( "subproject2/target/touch.txt" );
verifier.verifyFileNotPresent( "subproject3/target/touch.txt" );
}
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
View File

@ -52,8 +52,8 @@ public class MavenITmng0282NonReactorExecWhenProjectIndependentTest
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "subproject/target" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-no-project:light-touch" );
verifier.assertFilePresent( "target/touch.txt" );
verifier.assertFileNotPresent( "subproject/target/touch.txt" );
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject/target/touch.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

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

@ -71,7 +71,7 @@ public class MavenITmng0294MergeGlobalAndUserSettingsTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/test.txt" );
verifier.verifyFilePresent( "target/test.txt" );
}
}

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

@ -60,7 +60,7 @@ public class MavenITmng0377PluginLookupFromPrefixTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/file.txt" );
verifier.verifyFilePresent( "target/file.txt" );
}
}

18
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
View File

@ -71,15 +71,15 @@ public class MavenITmng0449PluginVersionResolutionTest
// Maven 3.x prefers RELEASE over LATEST (see MNG-4206)
if ( matchesVersionRange( "(,3.0-alpha-3)" ) )
{
verifier.assertFileNotPresent( "target/touch-release.txt" );
verifier.assertFilePresent( "target/touch-snapshot.txt" );
verifier.verifyFileNotPresent( "target/touch-release.txt" );
verifier.verifyFilePresent( "target/touch-snapshot.txt" );
}
else
{
verifier.assertFilePresent( "target/touch-release.txt" );
verifier.assertFileNotPresent( "target/touch-snapshot.txt" );
verifier.verifyFilePresent( "target/touch-release.txt" );
verifier.verifyFileNotPresent( "target/touch-snapshot.txt" );
}
verifier.assertFilePresent( "target/package.txt" );
verifier.verifyFilePresent( "target/package.txt" );
}
/**
@ -115,13 +115,13 @@ public class MavenITmng0449PluginVersionResolutionTest
// Maven 3.x prefers RELEASE over LATEST (see MNG-4206)
if ( matchesVersionRange( "(,3.0-alpha-3)" ) )
{
verifier.assertFileNotPresent( "target/touch-release.txt" );
verifier.assertFilePresent( "target/touch-snapshot.txt" );
verifier.verifyFileNotPresent( "target/touch-release.txt" );
verifier.verifyFilePresent( "target/touch-snapshot.txt" );
}
else
{
verifier.assertFilePresent( "target/touch-release.txt" );
verifier.assertFileNotPresent( "target/touch-snapshot.txt" );
verifier.verifyFilePresent( "target/touch-release.txt" );
verifier.verifyFileNotPresent( "target/touch-snapshot.txt" );
}
}

6
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
View File

@ -78,8 +78,8 @@ public class MavenITmng0469ReportConfigTest
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-configuration:2.1-SNAPSHOT:config" );
verifier.assertFilePresent( "target/build.txt" );
verifier.assertFileNotPresent( "target/reporting.txt" );
verifier.verifyFilePresent( "target/build.txt" );
verifier.verifyFileNotPresent( "target/reporting.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
@ -100,7 +100,7 @@ public class MavenITmng0469ReportConfigTest
if ( matchesVersionRange( "(,3.0-alpha-1)" ) )
{
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-site:2.1-SNAPSHOT:generate" );
verifier.assertFilePresent( "target/site/info.properties" );
verifier.verifyFilePresent( "target/site/info.properties" );
}
else
{

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
View File

@ -58,8 +58,8 @@ public class MavenITmng0471CustomLifecycleTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/forked/touch.txt" );
verifier.assertFilePresent( "target/forked2/touch.txt" );
verifier.verifyFilePresent( "target/forked/touch.txt" );
verifier.verifyFilePresent( "target/forked2/touch.txt" );
}
}

26
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
View File

@ -71,7 +71,7 @@ public class MavenITmng0479OverrideCentralRepoTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/expression.properties" );
verifier.verifyFilePresent( "target/expression.properties" );
Properties props = verifier.loadProperties( "target/expression.properties" );
int count = Integer.parseInt( props.getProperty( "project.repositories", "0" ) );
@ -135,13 +135,13 @@ public class MavenITmng0479OverrideCentralRepoTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/touch.txt" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng0479", "parent", "0.1-SNAPSHOT", "pom" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng0479", "a", "0.1-SNAPSHOT", "jar" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng0479", "a", "0.1-SNAPSHOT", "pom" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng0479", "a-parent", "0.1-SNAPSHOT", "pom" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng0479", "b", "0.1-SNAPSHOT", "jar" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng0479", "b", "0.1-SNAPSHOT", "pom" );
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng0479", "parent", "0.1-SNAPSHOT", "pom" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng0479", "a", "0.1-SNAPSHOT", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng0479", "a", "0.1-SNAPSHOT", "pom" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng0479", "a-parent", "0.1-SNAPSHOT", "pom" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng0479", "b", "0.1-SNAPSHOT", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng0479", "b", "0.1-SNAPSHOT", "pom" );
verifier = newVerifier( new File( testDir, "test-2" ).getAbsolutePath() );
verifier.setAutoclean( false );
@ -161,7 +161,7 @@ public class MavenITmng0479OverrideCentralRepoTest
}
verifier.resetStreams();
verifier.assertArtifactNotPresent( "org.apache.maven.its.mng0479", "parent", "0.1", "pom" );
verifier.verifyArtifactNotPresent( "org.apache.maven.its.mng0479", "parent", "0.1", "pom" );
verifier = newVerifier( new File( testDir, "test-3" ).getAbsolutePath() );
verifier.setAutoclean( false );
@ -181,8 +181,8 @@ public class MavenITmng0479OverrideCentralRepoTest
}
verifier.resetStreams();
verifier.assertArtifactNotPresent( "org.apache.maven.its.mng0479", "a", "0.1", "jar" );
verifier.assertArtifactNotPresent( "org.apache.maven.its.mng0479", "a", "0.1", "pom" );
verifier.verifyArtifactNotPresent( "org.apache.maven.its.mng0479", "a", "0.1", "jar" );
verifier.verifyArtifactNotPresent( "org.apache.maven.its.mng0479", "a", "0.1", "pom" );
verifier = newVerifier( new File( testDir, "test-4" ).getAbsolutePath() );
verifier.setAutoclean( false );
@ -202,8 +202,8 @@ public class MavenITmng0479OverrideCentralRepoTest
}
verifier.resetStreams();
verifier.assertArtifactNotPresent( "org.apache.maven.its.mng0479", "b", "0.1", "jar" );
verifier.assertArtifactNotPresent( "org.apache.maven.its.mng0479", "b", "0.1", "pom" );
verifier.verifyArtifactNotPresent( "org.apache.maven.its.mng0479", "b", "0.1", "jar" );
verifier.verifyArtifactNotPresent( "org.apache.maven.its.mng0479", "b", "0.1", "pom" );
}
}

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

@ -52,7 +52,7 @@ public class MavenITmng0496IgnoreUnknownPluginParametersTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-log-file:2.1-SNAPSHOT:reset" );
verifier.assertFilePresent( "target/file.txt" );
verifier.verifyFilePresent( "target/file.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

8
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
View File

@ -59,10 +59,10 @@ public class MavenITmng0507ArtifactRelocationTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.1", "jar" );
verifier.assertArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.1", "pom" );
verifier.assertArtifactPresent( "org.apache.maven", "maven-core-it-support-old-location", "1.1", "pom" );
verifier.assertArtifactNotPresent( "org.apache.maven", "maven-core-it-support-old-location", "1.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.1", "pom" );
verifier.verifyArtifactPresent( "org.apache.maven", "maven-core-it-support-old-location", "1.1", "pom" );
verifier.verifyArtifactNotPresent( "org.apache.maven", "maven-core-it-support-old-location", "1.1", "jar" );
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven:maven-core-it-support:jar:1.1" ) );

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java
View File

@ -54,8 +54,8 @@ public class MavenITmng0522InheritedPluginMgmtConfigTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/plugin-mngt-config-1.txt" );
verifier.assertFilePresent( "target/plugin-mngt-config-2.txt" );
verifier.verifyFilePresent( "target/plugin-mngt-config-1.txt" );
verifier.verifyFilePresent( "target/plugin-mngt-config-2.txt" );
}
}

8
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
View File

@ -130,7 +130,7 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng0553" );
verifier.assertArtifactNotPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
verifier.verifyArtifactNotPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
setUserHome( verifier, new File( testDir, "userhome" ) );
verifier.addCliOption( "--settings" );
@ -139,7 +139,7 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
}
/**
@ -162,7 +162,7 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng0553" );
verifier.assertArtifactNotPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
verifier.verifyArtifactNotPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
// NOTE: The tilde ~ in the file name is essential part of the test
verifier.filterFile( "security-template.xml", "settings~security.xml", "UTF-8", filterProps );
@ -177,7 +177,7 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
}
/**

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

@ -56,7 +56,7 @@ public class MavenITmng0557UserSettingsCliOptionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/test.txt" );
verifier.verifyFilePresent( "target/test.txt" );
}
}

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

@ -60,7 +60,7 @@ public class MavenITmng0666IgnoreLegacyPomTest
// don't verify error free log
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.it0059", "test", "3.8.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.it0059", "test", "3.8.1", "jar" );
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.it0059:test:jar:3.8.1" ) );

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java
View File

@ -55,8 +55,8 @@ public class MavenITmng0731LegacyRepoLayoutTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.assertFilePresent( "target/test-repo/org.apache.maven.its.it0061/jars/maven-it-it0061-1.0.jar" );
verifier.assertFilePresent( "target/test-repo/org.apache.maven.its.it0061/poms/maven-it-it0061-1.0.pom" );
verifier.verifyFilePresent( "target/test-repo/org.apache.maven.its.it0061/jars/maven-it-it0061-1.0.jar" );
verifier.verifyFilePresent( "target/test-repo/org.apache.maven.its.it0061/poms/maven-it-it0061-1.0.pom" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

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

@ -57,7 +57,7 @@ public class MavenITmng0761MissingSnapshotDistRepoTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/repo/org/apache/maven/its/mng0761/test/1.0-SNAPSHOT/test-1.0-*.jar" );
verifier.verifyFilePresent( "target/repo/org/apache/maven/its/mng0761/test/1.0-SNAPSHOT/test-1.0-*.jar" );
}
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
View File

@ -125,7 +125,7 @@ public class MavenITmng0768OfflineModeTest
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
verifier.assertFilePresent( "target/compile.txt" );
verifier.verifyFilePresent( "target/compile.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
@ -142,7 +142,7 @@ public class MavenITmng0768OfflineModeTest
verifier.addCliOption( "settings.xml" );
verifier.setLogFileName( "log2.txt" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
verifier.assertFilePresent( "target/compile.txt" );
verifier.verifyFilePresent( "target/compile.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java
View File

@ -55,8 +55,8 @@ public class MavenITmng0781PluginConfigVsExecConfigTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/exec-level.txt" );
verifier.assertFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/exec-level.txt" );
verifier.verifyFilePresent( "target/resources-resources.txt" );
}
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
View File

@ -55,8 +55,8 @@ public class MavenITmng0786ProfileAwareReactorTest
verifier.setSystemProperty( "expression.outputFile", "target/expression.properties" );
verifier.setSystemProperty( "activate", "anything" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
verifier.assertFilePresent( "sub1/target/expression.properties" );
verifier.assertFilePresent( "sub2/target/expression.properties" );
verifier.verifyFilePresent( "sub1/target/expression.properties" );
verifier.verifyFilePresent( "sub2/target/expression.properties" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

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

@ -55,7 +55,7 @@ public class MavenITmng0823MojoContextPassingTest
List<String> goals = Arrays.asList( new String[]{"org.apache.maven.its.plugins:maven-it-plugin-context-passing:throw",
"org.apache.maven.its.plugins:maven-it-plugin-context-passing:catch"} );
verifier.executeGoals( goals );
verifier.assertFilePresent( "target/thrown-value" );
verifier.verifyFilePresent( "target/thrown-value" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

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

@ -60,7 +60,7 @@ public class MavenITmng0870ReactorAwarePluginDiscoveryTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "project/target/touch.txt" );
verifier.verifyFilePresent( "project/target/touch.txt" );
}
}

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

@ -52,7 +52,7 @@ public class MavenITmng0985NonExecutedPluginMngtGoalsTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
verifier.assertFileNotPresent( "target/unexpected.txt" );
verifier.verifyFileNotPresent( "target/unexpected.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

34
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
View File

@ -55,28 +55,28 @@ public class MavenITmng1021EqualAttachmentBuildNumberTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng1021", "test", "1-SNAPSHOT", "pom" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng1021", "test", "1-SNAPSHOT", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1021", "test", "1-SNAPSHOT", "pom" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1021", "test", "1-SNAPSHOT", "jar" );
String dir = "repo/org/apache/maven/its/mng1021/test/";
String snapshot = getSnapshotVersion( new File( testDir, dir + "1-SNAPSHOT" ) );
assertTrue( snapshot, snapshot.endsWith( "-1" ) );
verifier.assertFilePresent( dir + "maven-metadata.xml" );
verifier.assertFilePresent( dir + "maven-metadata.xml.md5" );
verifier.assertFilePresent( dir + "maven-metadata.xml.sha1" );
verifier.assertFilePresent( dir + "1-SNAPSHOT/maven-metadata.xml" );
verifier.assertFilePresent( dir + "1-SNAPSHOT/maven-metadata.xml.md5" );
verifier.assertFilePresent( dir + "1-SNAPSHOT/maven-metadata.xml.sha1" );
verifier.assertFilePresent( dir + "1-SNAPSHOT/test-" + snapshot + ".pom" );
verifier.assertFilePresent( dir + "1-SNAPSHOT/test-" + snapshot + ".pom.md5" );
verifier.assertFilePresent( dir + "1-SNAPSHOT/test-" + snapshot + ".pom.sha1" );
verifier.assertFilePresent( dir + "1-SNAPSHOT/test-" + snapshot + ".jar" );
verifier.assertFilePresent( dir + "1-SNAPSHOT/test-" + snapshot + ".jar.md5" );
verifier.assertFilePresent( dir + "1-SNAPSHOT/test-" + snapshot + ".jar.sha1" );
verifier.assertFilePresent( dir + "1-SNAPSHOT/test-" + snapshot + "-it.jar" );
verifier.assertFilePresent( dir + "1-SNAPSHOT/test-" + snapshot + "-it.jar.md5" );
verifier.assertFilePresent( dir + "1-SNAPSHOT/test-" + snapshot + "-it.jar.sha1" );
verifier.verifyFilePresent( dir + "maven-metadata.xml" );
verifier.verifyFilePresent( dir + "maven-metadata.xml.md5" );
verifier.verifyFilePresent( dir + "maven-metadata.xml.sha1" );
verifier.verifyFilePresent( dir + "1-SNAPSHOT/maven-metadata.xml" );
verifier.verifyFilePresent( dir + "1-SNAPSHOT/maven-metadata.xml.md5" );
verifier.verifyFilePresent( dir + "1-SNAPSHOT/maven-metadata.xml.sha1" );
verifier.verifyFilePresent( dir + "1-SNAPSHOT/test-" + snapshot + ".pom" );
verifier.verifyFilePresent( dir + "1-SNAPSHOT/test-" + snapshot + ".pom.md5" );
verifier.verifyFilePresent( dir + "1-SNAPSHOT/test-" + snapshot + ".pom.sha1" );
verifier.verifyFilePresent( dir + "1-SNAPSHOT/test-" + snapshot + ".jar" );
verifier.verifyFilePresent( dir + "1-SNAPSHOT/test-" + snapshot + ".jar.md5" );
verifier.verifyFilePresent( dir + "1-SNAPSHOT/test-" + snapshot + ".jar.sha1" );
verifier.verifyFilePresent( dir + "1-SNAPSHOT/test-" + snapshot + "-it.jar" );
verifier.verifyFilePresent( dir + "1-SNAPSHOT/test-" + snapshot + "-it.jar.md5" );
verifier.verifyFilePresent( dir + "1-SNAPSHOT/test-" + snapshot + "-it.jar.sha1" );
}
private String getSnapshotVersion( File artifactDir )

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java
View File

@ -52,8 +52,8 @@ public class MavenITmng1052PluginMngtConfigTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "process-resources" );
verifier.assertFilePresent( "target/plugin-management.txt" );
verifier.assertFileNotPresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/plugin-management.txt" );
verifier.verifyFileNotPresent( "target/resources-resources.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

12
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
View File

@ -60,9 +60,9 @@ public class MavenITmng1073AggregatorForksReactorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/forked/touch.txt" );
verifier.assertFilePresent( "sub-1/target/forked/touch.txt" );
verifier.assertFilePresent( "sub-2/target/forked/touch.txt" );
verifier.verifyFilePresent( "target/forked/touch.txt" );
verifier.verifyFilePresent( "sub-1/target/forked/touch.txt" );
verifier.verifyFilePresent( "sub-2/target/forked/touch.txt" );
}
/**
@ -85,9 +85,9 @@ public class MavenITmng1073AggregatorForksReactorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/touch.txt" );
verifier.assertFilePresent( "sub-1/target/touch.txt" );
verifier.assertFilePresent( "sub-2/target/touch.txt" );
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFilePresent( "sub-1/target/touch.txt" );
verifier.verifyFilePresent( "sub-2/target/touch.txt" );
}
}

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

@ -62,7 +62,7 @@ public class MavenITmng1088ReactorPluginResolutionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "client/target/touch.txt" );
verifier.verifyFilePresent( "client/target/touch.txt" );
}
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java
View File

@ -55,8 +55,8 @@ public class MavenITmng1144MultipleDefaultGoalsTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/clean-clean.txt" );
verifier.assertFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/clean-clean.txt" );
verifier.verifyFilePresent( "target/resources-resources.txt" );
}
}

24
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java
View File

@ -58,23 +58,23 @@ public class MavenITmng1349ChecksumFormatsTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng1349", "md5-a", "0.1", "jar" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng1349", "md5-a", "0.1", "pom" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1349", "md5-a", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1349", "md5-a", "0.1", "pom" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng1349", "md5-b", "0.1", "jar" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng1349", "md5-b", "0.1", "pom" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1349", "md5-b", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1349", "md5-b", "0.1", "pom" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng1349", "md5-c", "0.1", "jar" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng1349", "md5-c", "0.1", "pom" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1349", "md5-c", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1349", "md5-c", "0.1", "pom" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng1349", "sha1-a", "0.1", "jar" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng1349", "sha1-a", "0.1", "pom" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1349", "sha1-a", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1349", "sha1-a", "0.1", "pom" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng1349", "sha1-b", "0.1", "jar" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng1349", "sha1-b", "0.1", "pom" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1349", "sha1-b", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1349", "sha1-b", "0.1", "pom" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng1349", "sha1-c", "0.1", "jar" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng1349", "sha1-c", "0.1", "pom" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1349", "sha1-c", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1349", "sha1-c", "0.1", "pom" );
}
}

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

@ -59,7 +59,7 @@ public class MavenITmng1908LegacySnapshotUpdateTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng1908", "artifact", "1.0-SNAPSHOT", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1908", "artifact", "1.0-SNAPSHOT", "jar" );
}
}

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

@ -60,7 +60,7 @@ public class MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng2098", "dep", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2098", "dep", "0.1", "jar" );
}
}

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

@ -56,7 +56,7 @@ public class MavenITmng2135PluginBuildInReactorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "project/target/touch.txt" );
verifier.verifyFilePresent( "project/target/touch.txt" );
}
}

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

@ -60,7 +60,7 @@ public class MavenITmng2136ActiveByDefaultProfileTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/expression.properties" );
verifier.verifyFilePresent( "target/expression.properties" );
Properties props = verifier.loadProperties( "target/expression.properties" );
assertNull( props.getProperty( "project.properties.it0102.testOutput" ) );
assertEquals( "Success", props.getProperty( "project.properties.testOutput" ) );

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

@ -56,7 +56,7 @@ public class MavenITmng2234ActiveProfilesFromSettingsTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/touch.txt" );
verifier.verifyFilePresent( "target/touch.txt" );
}
}

24
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java
View File

@ -57,20 +57,20 @@ public class MavenITmng2363BasedirAwareFileActivatorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/parent1.txt" );
verifier.assertFilePresent( "target/parent2.txt" );
verifier.assertFileNotPresent( "target/file1.txt" );
verifier.assertFileNotPresent( "target/file2.txt" );
verifier.verifyFilePresent( "target/parent1.txt" );
verifier.verifyFilePresent( "target/parent2.txt" );
verifier.verifyFileNotPresent( "target/file1.txt" );
verifier.verifyFileNotPresent( "target/file2.txt" );
verifier.assertFileNotPresent( "sub-a/target/parent1.txt" );
verifier.assertFileNotPresent( "sub-a/target/parent2.txt" );
verifier.assertFilePresent( "sub-a/target/file1.txt" );
verifier.assertFileNotPresent( "sub-a/target/file2.txt" );
verifier.verifyFileNotPresent( "sub-a/target/parent1.txt" );
verifier.verifyFileNotPresent( "sub-a/target/parent2.txt" );
verifier.verifyFilePresent( "sub-a/target/file1.txt" );
verifier.verifyFileNotPresent( "sub-a/target/file2.txt" );
verifier.assertFileNotPresent( "sub-b/target/parent1.txt" );
verifier.assertFileNotPresent( "sub-b/target/parent2.txt" );
verifier.assertFileNotPresent( "sub-b/target/file1.txt" );
verifier.assertFilePresent( "sub-b/target/file2.txt" );
verifier.verifyFileNotPresent( "sub-b/target/parent1.txt" );
verifier.verifyFileNotPresent( "sub-b/target/parent2.txt" );
verifier.verifyFileNotPresent( "sub-b/target/file1.txt" );
verifier.verifyFilePresent( "sub-b/target/file2.txt" );
}
}

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

@ -134,6 +134,6 @@ public class MavenITmng2387InactiveProxyTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng2387", "a", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2387", "a", "0.1", "jar" );
}
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java
View File

@ -61,8 +61,8 @@ public class MavenITmng2432PluginPrefixOrderTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFileNotPresent( "target/touch-settings.txt" );
verifier.assertFilePresent( "target/touch-pom.txt" );
verifier.verifyFileNotPresent( "target/touch-settings.txt" );
verifier.verifyFilePresent( "target/touch-pom.txt" );
}
}

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

@ -59,7 +59,7 @@ public class MavenITmng2539PluginDependenciesComeFromPluginReposTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/log.txt" );
verifier.verifyFilePresent( "target/log.txt" );
}
}

92
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java
View File

@ -67,11 +67,11 @@ public class MavenITmng2576MakeLikeReactorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFileNotPresent( "target/touch.txt" );
verifier.assertFileNotPresent( "sub-a/target/touch.txt" );
verifier.assertFilePresent( "sub-b/target/touch.txt" );
verifier.assertFileNotPresent( "sub-c/target/touch.txt" );
verifier.assertFileNotPresent( "sub-d/target/touch.txt" );
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "sub-a/target/touch.txt" );
verifier.verifyFilePresent( "sub-b/target/touch.txt" );
verifier.verifyFileNotPresent( "sub-c/target/touch.txt" );
verifier.verifyFileNotPresent( "sub-d/target/touch.txt" );
}
/**
@ -95,11 +95,11 @@ public class MavenITmng2576MakeLikeReactorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/touch.txt" );
verifier.assertFilePresent( "sub-a/target/touch.txt" );
verifier.assertFilePresent( "sub-b/target/touch.txt" );
verifier.assertFileNotPresent( "sub-c/target/touch.txt" );
verifier.assertFileNotPresent( "sub-d/target/touch.txt" );
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFilePresent( "sub-a/target/touch.txt" );
verifier.verifyFilePresent( "sub-b/target/touch.txt" );
verifier.verifyFileNotPresent( "sub-c/target/touch.txt" );
verifier.verifyFileNotPresent( "sub-d/target/touch.txt" );
}
/**
@ -123,11 +123,11 @@ public class MavenITmng2576MakeLikeReactorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFileNotPresent( "target/touch.txt" );
verifier.assertFileNotPresent( "sub-a/target/touch.txt" );
verifier.assertFilePresent( "sub-b/target/touch.txt" );
verifier.assertFilePresent( "sub-c/target/touch.txt" );
verifier.assertFileNotPresent( "sub-d/target/touch.txt" );
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "sub-a/target/touch.txt" );
verifier.verifyFilePresent( "sub-b/target/touch.txt" );
verifier.verifyFilePresent( "sub-c/target/touch.txt" );
verifier.verifyFileNotPresent( "sub-d/target/touch.txt" );
}
/**
@ -152,11 +152,11 @@ public class MavenITmng2576MakeLikeReactorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/touch.txt" );
verifier.assertFilePresent( "sub-a/target/touch.txt" );
verifier.assertFilePresent( "sub-b/target/touch.txt" );
verifier.assertFilePresent( "sub-c/target/touch.txt" );
verifier.assertFileNotPresent( "sub-d/target/touch.txt" );
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFilePresent( "sub-a/target/touch.txt" );
verifier.verifyFilePresent( "sub-b/target/touch.txt" );
verifier.verifyFilePresent( "sub-c/target/touch.txt" );
verifier.verifyFileNotPresent( "sub-d/target/touch.txt" );
}
/**
@ -172,7 +172,7 @@ public class MavenITmng2576MakeLikeReactorTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
clean( verifier );
verifier.assertFileNotPresent( "sub-d/pom.xml" );
verifier.verifyFileNotPresent( "sub-d/pom.xml" );
verifier.addCliOption( "-pl" );
verifier.addCliOption( "sub-d" );
verifier.setLogFileName( "log-basedir.txt" );
@ -180,11 +180,11 @@ public class MavenITmng2576MakeLikeReactorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFileNotPresent( "target/touch.txt" );
verifier.assertFileNotPresent( "sub-a/target/touch.txt" );
verifier.assertFileNotPresent( "sub-b/target/touch.txt" );
verifier.assertFileNotPresent( "sub-c/target/touch.txt" );
verifier.assertFilePresent( "sub-d/target/touch.txt" );
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "sub-a/target/touch.txt" );
verifier.verifyFileNotPresent( "sub-b/target/touch.txt" );
verifier.verifyFileNotPresent( "sub-c/target/touch.txt" );
verifier.verifyFilePresent( "sub-d/target/touch.txt" );
}
/**
@ -203,7 +203,7 @@ public class MavenITmng2576MakeLikeReactorTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
clean( verifier );
verifier.assertFileNotPresent( "sub-d/pom.xml" );
verifier.verifyFileNotPresent( "sub-d/pom.xml" );
verifier.addCliOption( "-pl" );
verifier.addCliOption( "+sub-d" );
verifier.setLogFileName( "log-basedir-plus.txt" );
@ -211,11 +211,11 @@ public class MavenITmng2576MakeLikeReactorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFileNotPresent( "target/touch.txt" );
verifier.assertFileNotPresent( "sub-a/target/touch.txt" );
verifier.assertFileNotPresent( "sub-b/target/touch.txt" );
verifier.assertFileNotPresent( "sub-c/target/touch.txt" );
verifier.assertFilePresent( "sub-d/target/touch.txt" );
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "sub-a/target/touch.txt" );
verifier.verifyFileNotPresent( "sub-b/target/touch.txt" );
verifier.verifyFileNotPresent( "sub-c/target/touch.txt" );
verifier.verifyFilePresent( "sub-d/target/touch.txt" );
}
/**
* Verify that the project list can also specify project ids.
@ -237,11 +237,11 @@ public class MavenITmng2576MakeLikeReactorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFileNotPresent( "target/touch.txt" );
verifier.assertFileNotPresent( "sub-a/target/touch.txt" );
verifier.assertFilePresent( "sub-b/target/touch.txt" );
verifier.assertFileNotPresent( "sub-c/target/touch.txt" );
verifier.assertFileNotPresent( "sub-d/target/touch.txt" );
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "sub-a/target/touch.txt" );
verifier.verifyFilePresent( "sub-b/target/touch.txt" );
verifier.verifyFileNotPresent( "sub-c/target/touch.txt" );
verifier.verifyFileNotPresent( "sub-d/target/touch.txt" );
}
/**
@ -267,11 +267,11 @@ public class MavenITmng2576MakeLikeReactorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFileNotPresent( "target/touch.txt" );
verifier.assertFileNotPresent( "sub-a/target/touch.txt" );
verifier.assertFilePresent( "sub-b/target/touch.txt" );
verifier.assertFileNotPresent( "sub-c/target/touch.txt" );
verifier.assertFileNotPresent( "sub-d/target/touch.txt" );
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "sub-a/target/touch.txt" );
verifier.verifyFilePresent( "sub-b/target/touch.txt" );
verifier.verifyFileNotPresent( "sub-c/target/touch.txt" );
verifier.verifyFileNotPresent( "sub-d/target/touch.txt" );
}
/**
@ -294,10 +294,10 @@ public class MavenITmng2576MakeLikeReactorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFileNotPresent( "target/touch.txt" );
verifier.assertFileNotPresent( "sub-a/target/touch.txt" );
verifier.assertFilePresent( "sub-b/target/touch.txt" );
verifier.assertFilePresent( "sub-c/target/touch.txt" );
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "sub-a/target/touch.txt" );
verifier.verifyFilePresent( "sub-b/target/touch.txt" );
verifier.verifyFilePresent( "sub-c/target/touch.txt" );
}
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
View File

@ -49,8 +49,8 @@ public class MavenITmng2668UsePluginDependenciesForSortingTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng2668", "project", "1.0-SNAPSHOT", "jar" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng2668", "tools", "1.0-SNAPSHOT", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2668", "project", "1.0-SNAPSHOT", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2668", "tools", "1.0-SNAPSHOT", "jar" );
}
}

8
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java
View File

@ -61,8 +61,8 @@ public class MavenITmng2695OfflinePluginSnapshotsTest
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.assertFilePresent( "target/a.txt" );
verifier.assertFilePresent( "target/b.txt" );
verifier.verifyFilePresent( "target/a.txt" );
verifier.verifyFilePresent( "target/b.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
@ -77,8 +77,8 @@ public class MavenITmng2695OfflinePluginSnapshotsTest
verifier.addCliOption( "settings.xml" );
verifier.addCliOption( "--offline" );
verifier.executeGoal( "validate" );
verifier.assertFilePresent( "target/a.txt" );
verifier.assertFilePresent( "target/b.txt" );
verifier.verifyFilePresent( "target/a.txt" );
verifier.verifyFilePresent( "target/b.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

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

@ -56,7 +56,7 @@ public class MavenITmng2738ProfileIdCollidesWithCliOptionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/touch.txt" );
verifier.verifyFilePresent( "target/touch.txt" );
}
}

8
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java
View File

@ -58,10 +58,10 @@ public class MavenITmng2744checksumVerificationTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng2744", "a", "1", "jar" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng2744", "a", "1", "pom" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng2744", "b", "1", "jar" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng2744", "b", "1", "pom" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2744", "a", "1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2744", "a", "1", "pom" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2744", "b", "1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2744", "b", "1", "pom" );
}
}

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

@ -54,7 +54,7 @@ public class MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/test-1.0-it.jar" );
verifier.verifyFilePresent( "target/test-1.0-it.jar" );
}
}

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

@ -99,7 +99,7 @@ public class MavenITmng2865MirrorWildcardTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng2865", "a", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2865", "a", "0.1", "jar" );
}
}

40
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
View File

@ -69,10 +69,10 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
}
verifier.resetStreams();
verifier.assertFilePresent( "target/touch.txt" );
verifier.assertFileNotPresent( "subproject1/target/touch.txt" );
verifier.assertFileNotPresent( "subproject2/target/touch.txt" );
verifier.assertFileNotPresent( "subproject3/target/touch.txt" );
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
verifier.verifyFileNotPresent( "subproject2/target/touch.txt" );
verifier.verifyFileNotPresent( "subproject3/target/touch.txt" );
}
/**
@ -98,10 +98,10 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.resetStreams();
verifier.assertFilePresent( "target/touch.txt" );
verifier.assertFileNotPresent( "subproject1/target/touch.txt" );
verifier.assertFilePresent( "subproject2/target/touch.txt" );
verifier.assertFilePresent( "subproject3/target/touch.txt" );
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
verifier.verifyFilePresent( "subproject2/target/touch.txt" );
verifier.verifyFilePresent( "subproject3/target/touch.txt" );
}
/**
@ -136,10 +136,10 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
}
verifier.resetStreams();
verifier.assertFilePresent( "target/touch.txt" );
verifier.assertFileNotPresent( "subproject1/target/touch.txt" );
verifier.assertFilePresent( "subproject2/target/touch.txt" );
verifier.assertFileNotPresent( "subproject3/target/touch.txt" );
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
verifier.verifyFilePresent( "subproject2/target/touch.txt" );
verifier.verifyFileNotPresent( "subproject3/target/touch.txt" );
}
/**
@ -165,10 +165,10 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.resetStreams();
verifier.assertFilePresent( "target/touch.txt" );
verifier.assertFileNotPresent( "subproject1/target/touch.txt" );
verifier.assertFilePresent( "subproject2/target/touch.txt" );
verifier.assertFilePresent( "subproject3/target/touch.txt" );
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
verifier.verifyFilePresent( "subproject2/target/touch.txt" );
verifier.verifyFilePresent( "subproject3/target/touch.txt" );
}
/**
@ -203,10 +203,10 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
}
verifier.resetStreams();
verifier.assertFilePresent( "target/touch.txt" );
verifier.assertFileNotPresent( "subproject1/target/touch.txt" );
verifier.assertFilePresent( "subproject2/target/touch.txt" );
verifier.assertFileNotPresent( "subproject3/target/touch.txt" );
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
verifier.verifyFilePresent( "subproject2/target/touch.txt" );
verifier.verifyFileNotPresent( "subproject3/target/touch.txt" );
}
// DGF not testing fail fast with multiple real threads since that's a "best effort" attempt to halt the build

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
View File

@ -66,8 +66,8 @@ public class MavenITmng3052DepRepoAggregationTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng3052", "direct", "0.1-SNAPSHOT", "jar" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng3052", "trans", "0.1-SNAPSHOT", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3052", "direct", "0.1-SNAPSHOT", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3052", "trans", "0.1-SNAPSHOT", "jar" );
}
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java
View File

@ -60,8 +60,8 @@ public class MavenITmng3099SettingsProfilesWithNoPomTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/PASSED.txt" );
verifier.assertFileNotPresent( "target/touch.txt" );
verifier.verifyFilePresent( "target/PASSED.txt" );
verifier.verifyFileNotPresent( "target/touch.txt" );
}
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java
View File

@ -58,8 +58,8 @@ public class MavenITmng3106ProfileMultipleActivatorsTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.assertFilePresent( "target/profile1/touch.txt" );
verifier.assertFilePresent( "target/profile2/touch.txt" );
verifier.verifyFilePresent( "target/profile1/touch.txt" );
verifier.verifyFilePresent( "target/profile2/touch.txt" );
verifier.resetStreams();
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java
View File

@ -61,8 +61,8 @@ public class MavenITmng3217InterPluginDependencyTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "sub-1/target/touch-1.txt" );
verifier.assertFilePresent( "sub-2/target/touch-2.txt" );
verifier.verifyFilePresent( "sub-1/target/touch-1.txt" );
verifier.verifyFilePresent( "sub-2/target/touch-2.txt" );
}
}

8
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
View File

@ -52,10 +52,10 @@ public class MavenITmng3268MultipleHyphenPCommandLineTest
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
verifier.assertFilePresent( "target/profile1/touch.txt" );
verifier.assertFilePresent( "target/profile2/touch.txt" );
verifier.assertFilePresent( "target/profile3/touch.txt" );
verifier.assertFilePresent( "target/profile4/touch.txt" );
verifier.verifyFilePresent( "target/profile1/touch.txt" );
verifier.verifyFilePresent( "target/profile2/touch.txt" );
verifier.verifyFilePresent( "target/profile3/touch.txt" );
verifier.verifyFilePresent( "target/profile4/touch.txt" );
verifier.resetStreams();
}

8
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
View File

@ -76,10 +76,10 @@ public class MavenITmng3284UsingCachedPluginsTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "mod-a/target/version-0.1.txt" );
verifier.assertFileNotPresent( "mod-a/target/version-0.2.txt" );
verifier.assertFilePresent( "mod-b/target/version-0.2.txt" );
verifier.assertFileNotPresent( "mod-b/target/version-0.1.txt" );
verifier.verifyFilePresent( "mod-a/target/version-0.1.txt" );
verifier.verifyFileNotPresent( "mod-a/target/version-0.2.txt" );
verifier.verifyFilePresent( "mod-b/target/version-0.2.txt" );
verifier.verifyFileNotPresent( "mod-b/target/version-0.1.txt" );
}
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java
View File

@ -59,7 +59,7 @@ public class MavenITmng3314OfflineSnapshotsTest
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.assertFilePresent( "target/compile.txt" );
verifier.verifyFilePresent( "target/compile.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
@ -72,7 +72,7 @@ public class MavenITmng3314OfflineSnapshotsTest
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.assertFilePresent( "target/compile.txt" );
verifier.verifyFilePresent( "target/compile.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java
View File

@ -55,7 +55,7 @@ public class MavenITmng3394POMPluginVersionDominanceTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/resources-resources.txt" );
}
public void testitMNG3394b()
@ -72,7 +72,7 @@ public class MavenITmng3394POMPluginVersionDominanceTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/clean-clean.txt" );
verifier.verifyFilePresent( "target/clean-clean.txt" );
}
}

10
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
View File

@ -69,7 +69,7 @@ public class MavenITmng3461MirrorMatchingTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng3461", "a", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3461", "a", "0.1", "jar" );
}
/**
@ -149,9 +149,9 @@ public class MavenITmng3461MirrorMatchingTest
server.join();
}
verifier.assertArtifactPresent( "org.apache.maven.its.mng3461", "a", "0.1", "jar" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng3461", "b", "0.1", "jar" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng3461", "c", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3461", "a", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3461", "b", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3461", "c", "0.1", "jar" );
}
/**
@ -176,6 +176,6 @@ public class MavenITmng3461MirrorMatchingTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng3461", "a", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3461", "a", "0.1", "jar" );
}
}

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

@ -47,7 +47,7 @@ public class MavenITmng3485OverrideWagonExtensionTest
verifier.executeGoal( "deploy" );
verifier.assertFilePresent( "target/wagon.properties" );
verifier.verifyFilePresent( "target/wagon.properties" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

48
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java
View File

@ -56,11 +56,11 @@ public class MavenITmng3545ProfileDeactivationTest
verifier.verifyErrorFreeLog();
// profile 1 and 2 are active by default
verifier.assertFilePresent( "target/profile1/touch.txt" );
verifier.assertFilePresent( "target/profile2/touch.txt" );
verifier.assertFileNotPresent( "target/profile3/touch.txt" );
verifier.assertFileNotPresent( "target/profile4/touch.txt" );
verifier.assertFileNotPresent( "target/profile5/touch.txt" );
verifier.verifyFilePresent( "target/profile1/touch.txt" );
verifier.verifyFilePresent( "target/profile2/touch.txt" );
verifier.verifyFileNotPresent( "target/profile3/touch.txt" );
verifier.verifyFileNotPresent( "target/profile4/touch.txt" );
verifier.verifyFileNotPresent( "target/profile5/touch.txt" );
verifier.resetStreams();
}
@ -86,8 +86,8 @@ public class MavenITmng3545ProfileDeactivationTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.assertFileNotPresent( "target/profile1/touch.txt" );
verifier.assertFileNotPresent( "target/profile2/touch.txt" );
verifier.verifyFileNotPresent( "target/profile1/touch.txt" );
verifier.verifyFileNotPresent( "target/profile2/touch.txt" );
verifier.resetStreams();
}
@ -108,8 +108,8 @@ public class MavenITmng3545ProfileDeactivationTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.assertFileNotPresent( "target/profile1/touch.txt" );
verifier.assertFileNotPresent( "target/profile2/touch.txt" );
verifier.verifyFileNotPresent( "target/profile1/touch.txt" );
verifier.verifyFileNotPresent( "target/profile2/touch.txt" );
verifier.resetStreams();
}
@ -136,11 +136,11 @@ public class MavenITmng3545ProfileDeactivationTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.assertFilePresent( "target/profile1/touch.txt" );
verifier.assertFilePresent( "target/profile2/touch.txt" );
verifier.assertFileNotPresent( "target/profile3/touch.txt" );
verifier.assertFileNotPresent( "target/profile4/touch.txt" );
verifier.assertFileNotPresent( "target/profile5/touch.txt" );
verifier.verifyFilePresent( "target/profile1/touch.txt" );
verifier.verifyFilePresent( "target/profile2/touch.txt" );
verifier.verifyFileNotPresent( "target/profile3/touch.txt" );
verifier.verifyFileNotPresent( "target/profile4/touch.txt" );
verifier.verifyFileNotPresent( "target/profile5/touch.txt" );
verifier.resetStreams();
}
@ -167,11 +167,11 @@ public class MavenITmng3545ProfileDeactivationTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.assertFilePresent( "target/profile1/touch.txt" );
verifier.assertFilePresent( "target/profile2/touch.txt" );
verifier.assertFileNotPresent( "target/profile3/touch.txt" );
verifier.assertFileNotPresent( "target/profile4/touch.txt" );
verifier.assertFileNotPresent( "target/profile5/touch.txt" );
verifier.verifyFilePresent( "target/profile1/touch.txt" );
verifier.verifyFilePresent( "target/profile2/touch.txt" );
verifier.verifyFileNotPresent( "target/profile3/touch.txt" );
verifier.verifyFileNotPresent( "target/profile4/touch.txt" );
verifier.verifyFileNotPresent( "target/profile5/touch.txt" );
verifier.resetStreams();
}
@ -197,11 +197,11 @@ public class MavenITmng3545ProfileDeactivationTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.assertFileNotPresent( "target/profile1/touch.txt" );
verifier.assertFileNotPresent( "target/profile2/touch.txt" );
verifier.assertFileNotPresent( "target/profile3/touch.txt" );
verifier.assertFilePresent( "target/profile4/touch.txt" );
verifier.assertFileNotPresent( "target/profile5/touch.txt" );
verifier.verifyFileNotPresent( "target/profile1/touch.txt" );
verifier.verifyFileNotPresent( "target/profile2/touch.txt" );
verifier.verifyFileNotPresent( "target/profile3/touch.txt" );
verifier.verifyFilePresent( "target/profile4/touch.txt" );
verifier.verifyFileNotPresent( "target/profile5/touch.txt" );
verifier.resetStreams();
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
View File

@ -183,7 +183,7 @@ public class MavenITmng3599useHttpProxyForWebDAVMk2Test
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
verifier.assertArtifactContents( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar",
CONTENT );
}
@ -227,7 +227,7 @@ public class MavenITmng3599useHttpProxyForWebDAVMk2Test
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
verifier.assertArtifactContents( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar",
CONTENT );
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
View File

@ -170,7 +170,7 @@ public class MavenITmng3599useHttpProxyForWebDAVTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
verifier.assertArtifactContents( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar",
CONTENT );
}
@ -216,7 +216,7 @@ public class MavenITmng3599useHttpProxyForWebDAVTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
verifier.assertArtifactContents( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar",
CONTENT );
}

6
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
View File

@ -51,7 +51,7 @@ public class MavenITmng3600DeploymentModeDefaultsTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "wagon.properties" );
verifier.verifyFilePresent( "wagon.properties" );
Properties props = verifier.loadProperties( "wagon.properties" );
assertNull( props.get( "directory.mode" ) );
assertNull( props.get( "file.mode" ) );
@ -72,7 +72,7 @@ public class MavenITmng3600DeploymentModeDefaultsTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "wagon.properties" );
verifier.verifyFilePresent( "wagon.properties" );
Properties props = verifier.loadProperties( "wagon.properties" );
assertNull( props.get( "directory.mode" ) );
assertNull( props.get( "file.mode" ) );
@ -93,7 +93,7 @@ public class MavenITmng3600DeploymentModeDefaultsTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "wagon.properties" );
verifier.verifyFilePresent( "wagon.properties" );
Properties props = verifier.loadProperties( "wagon.properties" );
assertEquals( "700", props.get( "directory.mode" ) );
assertEquals( "600", props.get( "file.mode" ) );

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

@ -51,7 +51,7 @@ public class MavenITmng3679PluginExecIdInterpolationTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/check.txt" );
verifier.verifyFilePresent( "target/check.txt" );
}
}

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
View File

@ -67,7 +67,7 @@ public class MavenITmng3714ToolchainsCliOptionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/toolchains.properties" );
verifier.verifyFilePresent( "target/toolchains.properties" );
Properties results = verifier.loadProperties( "target/toolchains.properties" );
String tool = results.getProperty( "tool.1", "" );
if ( tool.endsWith( ".exe" ) )
@ -76,7 +76,7 @@ public class MavenITmng3714ToolchainsCliOptionTest
}
assertEquals( new File( javaHome, "bin/javac" ).getAbsolutePath(), tool );
verifier.assertFilePresent( "target/tool.properties" );
verifier.verifyFilePresent( "target/tool.properties" );
Properties toolProps = verifier.loadProperties( "target/tool.properties" );
String path = toolProps.getProperty( "tool.javac", "" );
assertEquals( results.getProperty( "tool.1", "" ), path );

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

@ -57,7 +57,7 @@ public class MavenITmng3766ToolchainsFromExtensionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/tool.properties" );
verifier.verifyFilePresent( "target/tool.properties" );
Properties toolProps = verifier.loadProperties( "target/tool.properties" );
assertEquals( "toolname", toolProps.getProperty( "tool.toolname", "" ) );
}

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

@ -57,7 +57,7 @@ public class MavenITmng3808ReportInheritenceOrderingTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "target/model.properties" );
verifier.verifyFilePresent( "target/model.properties" );
Properties props = verifier.loadProperties( "target/model.properties" );
assertEquals( "maven-it-plugin-log-file", props.getProperty( "project.reporting.plugins.0.artifactId" ) );
assertEquals( "maven-it-plugin-expression", props.getProperty( "project.reporting.plugins.1.artifactId" ) );

12
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java
View File

@ -60,7 +60,7 @@ public class MavenITmng3885UniqueVersionFromParentProfileTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "repo-f/org/apache/maven/its/mng3885/sub/0.2-SNAPSHOT/sub-0.2-SNAPSHOT.jar" );
verifier.verifyFilePresent( "repo-f/org/apache/maven/its/mng3885/sub/0.2-SNAPSHOT/sub-0.2-SNAPSHOT.jar" );
}
/**
@ -84,7 +84,7 @@ public class MavenITmng3885UniqueVersionFromParentProfileTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFilePresent( "repo-f/org/apache/maven/its/mng3885/sub/0.2-SNAPSHOT/sub-0.2-SNAPSHOT.jar" );
verifier.verifyFilePresent( "repo-f/org/apache/maven/its/mng3885/sub/0.2-SNAPSHOT/sub-0.2-SNAPSHOT.jar" );
}
/**
@ -108,8 +108,8 @@ public class MavenITmng3885UniqueVersionFromParentProfileTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFileNotPresent( "repo-t/org/apache/maven/its/mng3885/sub/0.2-SNAPSHOT/sub-0.2-SNAPSHOT.jar" );
verifier.assertFilePresent( "repo-t/org/apache/maven/its/mng3885/sub/0.2-SNAPSHOT/sub-0.2-*-1.jar" );
verifier.verifyFileNotPresent( "repo-t/org/apache/maven/its/mng3885/sub/0.2-SNAPSHOT/sub-0.2-SNAPSHOT.jar" );
verifier.verifyFilePresent( "repo-t/org/apache/maven/its/mng3885/sub/0.2-SNAPSHOT/sub-0.2-*-1.jar" );
}
/**
@ -133,8 +133,8 @@ public class MavenITmng3885UniqueVersionFromParentProfileTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFileNotPresent( "repo-t/org/apache/maven/its/mng3885/sub/0.2-SNAPSHOT/sub-0.2-SNAPSHOT.jar" );
verifier.assertFilePresent( "repo-t/org/apache/maven/its/mng3885/sub/0.2-SNAPSHOT/sub-0.2-*-1.jar" );
verifier.verifyFileNotPresent( "repo-t/org/apache/maven/its/mng3885/sub/0.2-SNAPSHOT/sub-0.2-SNAPSHOT.jar" );
verifier.verifyFilePresent( "repo-t/org/apache/maven/its/mng3885/sub/0.2-SNAPSHOT/sub-0.2-*-1.jar" );
}
}

28
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java
View File

@ -59,22 +59,22 @@ public class MavenITmng3892ReleaseDeploymentTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertArtifactPresent( "org.apache.maven.its.mng3892", "test", "1.0", "pom" );
verifier.assertArtifactPresent( "org.apache.maven.its.mng3892", "test", "1.0", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3892", "test", "1.0", "pom" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3892", "test", "1.0", "jar" );
String groupDir = "repo/org/apache/maven/its/mng3892/test/";
verifier.assertFilePresent( groupDir + "maven-metadata.xml" );
verifier.assertFilePresent( groupDir + "maven-metadata.xml.md5" );
verifier.assertFilePresent( groupDir + "maven-metadata.xml.sha1" );
verifier.assertFilePresent( groupDir + "1.0/test-1.0.pom" );
verifier.assertFilePresent( groupDir + "1.0/test-1.0.pom.md5" );
verifier.assertFilePresent( groupDir + "1.0/test-1.0.pom.sha1" );
verifier.assertFilePresent( groupDir + "1.0/test-1.0.jar" );
verifier.assertFilePresent( groupDir + "1.0/test-1.0.jar.md5" );
verifier.assertFilePresent( groupDir + "1.0/test-1.0.jar.sha1" );
verifier.assertFilePresent( groupDir + "1.0/test-1.0-it.jar" );
verifier.assertFilePresent( groupDir + "1.0/test-1.0-it.jar.md5" );
verifier.assertFilePresent( groupDir + "1.0/test-1.0-it.jar.sha1" );
verifier.verifyFilePresent( groupDir + "maven-metadata.xml" );
verifier.verifyFilePresent( groupDir + "maven-metadata.xml.md5" );
verifier.verifyFilePresent( groupDir + "maven-metadata.xml.sha1" );
verifier.verifyFilePresent( groupDir + "1.0/test-1.0.pom" );
verifier.verifyFilePresent( groupDir + "1.0/test-1.0.pom.md5" );
verifier.verifyFilePresent( groupDir + "1.0/test-1.0.pom.sha1" );
verifier.verifyFilePresent( groupDir + "1.0/test-1.0.jar" );
verifier.verifyFilePresent( groupDir + "1.0/test-1.0.jar.md5" );
verifier.verifyFilePresent( groupDir + "1.0/test-1.0.jar.sha1" );
verifier.verifyFilePresent( groupDir + "1.0/test-1.0-it.jar" );
verifier.verifyFilePresent( groupDir + "1.0/test-1.0-it.jar.md5" );
verifier.verifyFilePresent( groupDir + "1.0/test-1.0-it.jar.sha1" );
verify( testDir, groupDir + "1.0/test-1.0.jar.md5", "dd89c30cc71c3cd8a729622243c76770" );
verify( testDir, groupDir + "1.0/test-1.0.jar.sha1", "0b0717ff89d3cbadc3564270bf8930163753bf71" );

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java
View File

@ -56,8 +56,8 @@ public class MavenITmng3927PluginDefaultExecutionConfigTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
verifier.assertFileNotPresent( "target/failed.txt" );
verifier.assertFilePresent( "target/resources-resources.txt" );
verifier.verifyFileNotPresent( "target/failed.txt" );
verifier.verifyFilePresent( "target/resources-resources.txt" );
}
}

Some files were not shown because too many files have changed in this diff Show More