You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/05/19 06:00:54 UTC
[maven-integration-testing] branch maven-verifier-1.8.0 created (now 826ece176)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch maven-verifier-1.8.0
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
at 826ece176 Upgrade maven-verifier to 1.8.0
This branch includes the following new commits:
new 826ece176 Upgrade maven-verifier to 1.8.0
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-integration-testing] 01/01: Upgrade maven-verifier to 1.8.0
Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch maven-verifier-1.8.0
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 826ece1762fa7a6ac84f6b313b53c0d828e9504d
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Thu May 19 07:18:07 2022 +0200
Upgrade maven-verifier to 1.8.0
- upgrade maven-verifier
- remove code implemented in maven-verifier
- replace deprecated methods
---
.../maven/it/MavenIT0008SimplePluginTest.java | 4 +-
.../maven/it/MavenIT0009GoalConfigurationTest.java | 6 +-
...MavenIT0010DependencyClosureResolutionTest.java | 6 +-
.../maven/it/MavenIT0012PomInterpolationTest.java | 4 +-
.../it/MavenIT0018DependencyManagementTest.java | 2 +-
...MavenIT0019PluginVersionMngtBySuperPomTest.java | 2 +-
.../apache/maven/it/MavenIT0021PomProfileTest.java | 4 +-
.../maven/it/MavenIT0023SettingsProfileTest.java | 2 +-
.../it/MavenIT0024MultipleGoalExecutionsTest.java | 2 +-
...venIT0025MultipleExecutionLevelConfigsTest.java | 4 +-
.../MavenIT0030DepPomDepMngtInheritanceTest.java | 2 +-
.../apache/maven/it/MavenIT0036ReleasePomTest.java | 4 +-
.../it/MavenIT0037AlternatePomFileSameDirTest.java | 4 +-
...avenIT0038AlternatePomFileDifferentDirTest.java | 4 +-
.../it/MavenIT0039ReleasePomInReactorTest.java | 8 +-
...avenIT0040PackagingFromPluginExtensionTest.java | 2 +-
...nIT0041ArtifactTypeFromPluginExtensionTest.java | 4 +-
.../maven/it/MavenIT0051ReleaseProfileTest.java | 4 +-
.../maven/it/MavenIT0052ReleaseProfileTest.java | 6 +-
.../it/MavenIT0056MultipleGoalExecutionsTest.java | 4 +-
.../it/MavenIT0064MojoConfigViaSettersTest.java | 4 +-
...enIT0071PluginConfigWithDottedPropertyTest.java | 2 +-
.../maven/it/MavenIT0108SnapshotUpdateTest.java | 6 +-
.../maven/it/MavenIT0130CleanLifecycleTest.java | 2 +-
.../maven/it/MavenIT0131SiteLifecycleTest.java | 4 +-
.../maven/it/MavenIT0132PomLifecycleTest.java | 6 +-
.../maven/it/MavenIT0133JarLifecycleTest.java | 16 ++--
.../maven/it/MavenIT0134WarLifecycleTest.java | 16 ++--
.../maven/it/MavenIT0135EjbLifecycleTest.java | 16 ++--
.../maven/it/MavenIT0136RarLifecycleTest.java | 16 ++--
.../maven/it/MavenIT0137EarLifecycleTest.java | 10 +--
.../maven/it/MavenIT0138PluginLifecycleTest.java | 22 ++---
...MavenIT0145ReactorWithIncludesExcludesTest.java | 18 ++---
.../it/MavenIT0146InstallerSnapshotNaming.java | 4 +-
.../MavenITmng0095ReactorFailureBehaviorTest.java | 24 +++---
...82NonReactorExecWhenProjectIndependentTest.java | 4 +-
...venITmng0294MergeGlobalAndUserSettingsTest.java | 2 +-
.../MavenITmng0377PluginLookupFromPrefixTest.java | 2 +-
.../MavenITmng0449PluginVersionResolutionTest.java | 18 ++---
.../maven/it/MavenITmng0469ReportConfigTest.java | 6 +-
.../it/MavenITmng0471CustomLifecycleTest.java | 4 +-
.../it/MavenITmng0479OverrideCentralRepoTest.java | 26 +++---
...ITmng0496IgnoreUnknownPluginParametersTest.java | 2 +-
.../it/MavenITmng0507ArtifactRelocationTest.java | 8 +-
...avenITmng0522InheritedPluginMgmtConfigTest.java | 4 +-
.../MavenITmng0553SettingsAuthzEncryptionTest.java | 8 +-
.../MavenITmng0557UserSettingsCliOptionTest.java | 2 +-
.../it/MavenITmng0666IgnoreLegacyPomTest.java | 2 +-
.../it/MavenITmng0731LegacyRepoLayoutTest.java | 4 +-
.../MavenITmng0761MissingSnapshotDistRepoTest.java | 2 +-
.../maven/it/MavenITmng0768OfflineModeTest.java | 4 +-
...MavenITmng0781PluginConfigVsExecConfigTest.java | 4 +-
.../it/MavenITmng0786ProfileAwareReactorTest.java | 4 +-
.../it/MavenITmng0823MojoContextPassingTest.java | 2 +-
...enITmng0870ReactorAwarePluginDiscoveryTest.java | 2 +-
...venITmng0985NonExecutedPluginMngtGoalsTest.java | 2 +-
...venITmng1021EqualAttachmentBuildNumberTest.java | 34 ++++----
.../it/MavenITmng1052PluginMngtConfigTest.java | 4 +-
.../MavenITmng1073AggregatorForksReactorTest.java | 12 +--
.../MavenITmng1088ReactorPluginResolutionTest.java | 2 +-
.../it/MavenITmng1144MultipleDefaultGoalsTest.java | 4 +-
.../it/MavenITmng1349ChecksumFormatsTest.java | 24 +++---
.../it/MavenITmng1908LegacySnapshotUpdateTest.java | 2 +-
...2098VersionRangeSatisfiedFromWrongRepoTest.java | 2 +-
.../it/MavenITmng2135PluginBuildInReactorTest.java | 2 +-
.../MavenITmng2136ActiveByDefaultProfileTest.java | 2 +-
...venITmng2234ActiveProfilesFromSettingsTest.java | 2 +-
...avenITmng2363BasedirAwareFileActivatorTest.java | 24 +++---
.../maven/it/MavenITmng2387InactiveProxyTest.java | 2 +-
.../it/MavenITmng2432PluginPrefixOrderTest.java | 4 +-
...9PluginDependenciesComeFromPluginReposTest.java | 2 +-
.../it/MavenITmng2576MakeLikeReactorTest.java | 92 ++++++++++-----------
...mng2668UsePluginDependenciesForSortingTest.java | 4 +-
.../MavenITmng2695OfflinePluginSnapshotsTest.java | 8 +-
...Tmng2738ProfileIdCollidesWithCliOptionTest.java | 2 +-
.../it/MavenITmng2744checksumVerificationTest.java | 8 +-
...ustomArtifactHandlerAndCustomLifecycleTest.java | 2 +-
.../maven/it/MavenITmng2865MirrorWildcardTest.java | 2 +-
...004ReactorFailureBehaviorMultithreadedTest.java | 40 ++++-----
.../it/MavenITmng3052DepRepoAggregationTest.java | 4 +-
...avenITmng3099SettingsProfilesWithNoPomTest.java | 4 +-
...avenITmng3106ProfileMultipleActivatorsTest.java | 4 +-
.../MavenITmng3217InterPluginDependencyTest.java | 4 +-
...venITmng3268MultipleHyphenPCommandLineTest.java | 8 +-
.../it/MavenITmng3284UsingCachedPluginsTest.java | 8 +-
.../it/MavenITmng3314OfflineSnapshotsTest.java | 4 +-
...avenITmng3394POMPluginVersionDominanceTest.java | 4 +-
.../maven/it/MavenITmng3461MirrorMatchingTest.java | 10 +--
.../MavenITmng3485OverrideWagonExtensionTest.java | 2 +-
.../it/MavenITmng3545ProfileDeactivationTest.java | 48 +++++------
...MavenITmng3599useHttpProxyForWebDAVMk2Test.java | 4 +-
.../MavenITmng3599useHttpProxyForWebDAVTest.java | 4 +-
.../MavenITmng3600DeploymentModeDefaultsTest.java | 6 +-
...avenITmng3679PluginExecIdInterpolationTest.java | 2 +-
.../it/MavenITmng3714ToolchainsCliOptionTest.java | 4 +-
.../MavenITmng3766ToolchainsFromExtensionTest.java | 2 +-
...avenITmng3808ReportInheritenceOrderingTest.java | 2 +-
...Tmng3885UniqueVersionFromParentProfileTest.java | 12 +--
.../it/MavenITmng3892ReleaseDeploymentTest.java | 28 +++----
...nITmng3927PluginDefaultExecutionConfigTest.java | 4 +-
.../MavenITmng3938MergePluginExecutionsTest.java | 2 +-
.../it/MavenITmng3940EnvVarInterpolationTest.java | 2 +-
.../it/MavenITmng3944BasedirInterpolationTest.java | 2 +-
...nITmng3947PluginDefaultExecutionConfigTest.java | 4 +-
...ng3948ParentResolutionFromProfileReposTest.java | 4 +-
.../maven/it/MavenITmng3951AbsolutePathsTest.java | 2 +-
...ITmng3970DepResolutionFromProfileReposTest.java | 6 +-
.../maven/it/MavenITmng3974MirrorOrderingTest.java | 4 +-
...ng3983PluginResolutionFromProfileReposTest.java | 6 +-
...ITmng4016PrefixedPropertyInterpolationTest.java | 2 +-
...ng4036ParentResolutionFromSettingsRepoTest.java | 4 +-
.../it/MavenITmng4068AuthenticatedMirrorTest.java | 4 +-
...avenITmng4086ExplicitPluginMetaversionTest.java | 8 +-
.../MavenITmng4087PercentEncodedFileUrlTest.java | 4 +-
...ITmng4203TransitiveDependencyExclusionTest.java | 4 +-
...avenITmng4214MirroredParentSearchReposTest.java | 2 +-
...nITmng4262MakeLikeReactorDottedPath370Test.java | 8 +-
...avenITmng4262MakeLikeReactorDottedPathTest.java | 8 +-
...Tmng4269BadReactorResolutionFromOutDirTest.java | 2 +-
.../MavenITmng4279WagonProviderFailoverTest.java | 2 +-
.../it/MavenITmng4281PreferLocalSnapshotTest.java | 4 +-
.../MavenITmng4291MojoRequiresOnlineModeTest.java | 2 +-
...nITmng4314DirectInvocationOfAggregatorTest.java | 6 +-
...7PluginVersionResolutionFromMultiReposTest.java | 2 +-
...ng4319PluginExecutionGoalInterpolationTest.java | 2 +-
.../MavenITmng4321CliUsesPluginMgmtConfigTest.java | 2 +-
...venITmng4343MissingReleaseUpdatePolicyTest.java | 12 +--
...ITmng4348NoUnnecessaryRepositoryAccessTest.java | 2 +-
...4357LifecycleMappingDiscoveryInReactorTest.java | 8 +-
...venITmng4367LayoutAwareMirrorSelectionTest.java | 6 +-
.../MavenITmng4396AntBased20xMojoSupportTest.java | 2 +-
...enITmng4401RepositoryOrderForParentPomTest.java | 4 +-
.../it/MavenITmng4412OfflineModeInPluginTest.java | 2 +-
...avenITmng4413MirroringOfDependencyRepoTest.java | 2 +-
...g4422PluginExecutionPhaseInterpolationTest.java | 2 +-
...avenITmng4433ForceParentSnapshotUpdateTest.java | 8 +-
...g4453PluginVersionFromLifecycleMappingTest.java | 2 +-
...ng4464PlatformIndependentFileSeparatorTest.java | 2 +-
...65PluginPrefixFromLocalCacheOfDownRepoTest.java | 4 +-
...MavenITmng4489MirroringOfExtensionRepoTest.java | 4 +-
...avenITmng4554PluginPrefixMappingUpdateTest.java | 6 +-
.../MavenITmng4561MirroringOfPluginRepoTest.java | 6 +-
...mng4565MultiConditionProfileActivationTest.java | 4 +-
...fixResolutionFromVersionlessPluginMngtTest.java | 2 +-
...Tmng4654ArtifactHandlerForMainArtifactTest.java | 4 +-
.../it/MavenITmng4660OutdatedPackagedArtifact.java | 6 +-
...76ForkedReactorPluginVersionResolutionTest.java | 4 +-
.../MavenITmng4786AntBased21xMojoSupportTest.java | 2 +-
...ITmng4788InstallationToCustomLocalRepoTest.java | 4 +-
.../it/MavenITmng4840MavenPrerequisiteTest.java | 4 +-
...mng4842ParentResolutionOfDependencyPomTest.java | 4 +-
...ng4890MakeLikeReactorConsidersVersionsTest.java | 12 +--
...g4895PluginDepWithNonRelocatedMavenApiTest.java | 2 +-
...4925ContainerLookupRealmDuringMojoExecTest.java | 2 +-
.../MavenITmng4960MakeLikeReactorResumeTest.java | 12 +--
...ingBasedCompLookupFromChildPluginRealmTest.java | 2 +-
.../MavenITmng5230MakeReactorWithExcludesTest.java | 94 +++++++++++-----------
...mng5389LifecycleParticipantAfterSessionEnd.java | 2 +-
...Tmng5418FileProjectPropertiesActivatorTest.java | 8 +-
.../it/MavenITmng5530MojoExecutionScopeTest.java | 12 +--
...MavenITmng5639ImportScopePomResolutionTest.java | 2 +-
...mng5640LifecycleParticipantAfterSessionEnd.java | 24 +++---
...Tmng5663NestedImportScopePomResolutionTest.java | 2 +-
.../maven/it/MavenITmng5716ToolchainsTypeTest.java | 2 +-
...avenITmng5742BuildExtensionClassloaderTest.java | 2 +-
...mng5753CustomMojoExecutionConfiguratorTest.java | 2 +-
.../MavenITmng5774ConfigurationProcessorsTest.java | 2 +-
...uginExecutionConfigurationInterferenceTest.java | 6 +-
...MavenITmng6511OptionalProjectSelectionTest.java | 10 +--
...MavenITmng7112ProjectsWithNonRecursiveTest.java | 20 ++---
.../MavenITmng7390SelectModuleOutsideCwdTest.java | 30 +++----
.../maven/it/AbstractMavenIntegrationTestCase.java | 55 ++-----------
pom.xml | 2 +-
173 files changed, 636 insertions(+), 677 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java
index 683a7840b..545176979 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java
index 2da398f75..ae9d3bfe7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java
index 8b4541dee..f6b0eac5a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java
@@ -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" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java
index 156319f61..b5939e124 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java
index e06225a4a..b24d96cf7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMngtBySuperPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMngtBySuperPomTest.java
index 6df551f9a..f6c9fa264 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMngtBySuperPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMngtBySuperPomTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java
index de2fe3f33..c105e7089 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java
index ef119162d..af707ce87 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java
@@ -51,7 +51,7 @@ public class MavenIT0023SettingsProfileTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/test.txt" );
+ verifier.verifyFilePresent( "target/test.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java
index d142dd1b6..268c75750 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java
index 5448da196..cd72970fd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMngtInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMngtInheritanceTest.java
index 6231bef25..cdc82dfe8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMngtInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMngtInheritanceTest.java
@@ -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();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java
index 6f4959e9c..d42101298 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java
index 0f516dbb7..8c5dbd1ae 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java
index fa9a2c8de..c7e9f9c66 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java
index 47c0c7db6..3485eb039 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java
index 4ab1310b0..c27febe36 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
index e50a2911a..1081527ed 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java
index ad66d1357..329b154da 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java
index 21bc78304..2e8d62154 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java
index 93c38a5f6..85bd8c27b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java
index 45ff68e7b..e0cb9f25d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java
index 5bc09e48f..96686f2a5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java
@@ -55,7 +55,7 @@ public class MavenIT0071PluginConfigWithDottedPropertyTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/foo2" );
+ verifier.verifyFilePresent( "target/foo2" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
index d4ce3f012..791ee77d9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
@@ -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 );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java
index fe3891341..91b1ef840 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java
index b0afb616a..477f2ba41 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
index e3b612bd9..3dd03e7da 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java
index 78605a327..c3926c0cb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java
index b7d20f15a..43e7807ee 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java
index 5b289025b..39107bafd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java
index 8ab4003e5..3bfec0802 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java
index e2e0deb87..d6aa6021d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java
index 7bdeb6153..54606e70d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java
index a2df246a6..d72a1a333 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
index ea21ec9b0..84c1783c5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
index 76ed057bf..eabf14e61 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
index 9f27dbe3c..0f5007016 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
index a45d171cc..e6850b438 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
@@ -71,7 +71,7 @@ public class MavenITmng0294MergeGlobalAndUserSettingsTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/test.txt" );
+ verifier.verifyFilePresent( "target/test.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
index acd9841b3..392f18459 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
@@ -60,7 +60,7 @@ public class MavenITmng0377PluginLookupFromPrefixTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/file.txt" );
+ verifier.verifyFilePresent( "target/file.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
index 0e99e8792..e83c2b1ec 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
index f7d1281d3..c793f9700 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
@@ -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
{
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
index f5b5089e3..00756ec63 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
index 82751a842..83116a77e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
index 77ab6cdfb..12ece5c76 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
index fb15c4b57..2ca98c299 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
@@ -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" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java
index 9c8c97ea9..d95cde1af 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
index 0fda37a1e..ca0fe450e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
@@ -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" );
}
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java
index 6e21daef4..71029c404 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java
@@ -56,7 +56,7 @@ public class MavenITmng0557UserSettingsCliOptionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/test.txt" );
+ verifier.verifyFilePresent( "target/test.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
index 368b878c5..fe1b5a3da 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
@@ -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" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java
index 5278687a0..e67e11d93 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
index e6cbd9397..e02c1997d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
index 6b384a4d3..7d7485e4f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java
index 8e189e20f..855c9dd1d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
index 1cec51123..45a71e805 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java
index 66a7beb8d..12dcd3905 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java
index 8d890f86d..c464adf57 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java
@@ -60,7 +60,7 @@ public class MavenITmng0870ReactorAwarePluginDiscoveryTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "project/target/touch.txt" );
+ verifier.verifyFilePresent( "project/target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMngtGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMngtGoalsTest.java
index ce097dfee..3fc1069cc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMngtGoalsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMngtGoalsTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
index ae366905f..66345396b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
@@ -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 )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java
index 253e10bed..57e50f13d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
index d9e6af522..765894794 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java
index 496ffe211..30a236b34 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java
@@ -62,7 +62,7 @@ public class MavenITmng1088ReactorPluginResolutionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "client/target/touch.txt" );
+ verifier.verifyFilePresent( "client/target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java
index a9891a20f..d59419ce8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java
index c42fa5c9a..7ef9e3af3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java
index 939327ba1..3d8194732 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java
index f4d25e6af..79c5a32a8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
index 89522eb37..90dd3e859 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
@@ -56,7 +56,7 @@ public class MavenITmng2135PluginBuildInReactorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "project/target/touch.txt" );
+ verifier.verifyFilePresent( "project/target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
index c8e471654..85535a16a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
@@ -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" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java
index 34c640152..67bb0bfdf 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java
@@ -56,7 +56,7 @@ public class MavenITmng2234ActiveProfilesFromSettingsTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java
index 712a5a2b7..8d9df6d40 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
index 94c8fadc1..82d884ab8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java
index 30853c452..093f2cb60 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java
index 6d0bc30d4..798861254 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java
@@ -59,7 +59,7 @@ public class MavenITmng2539PluginDependenciesComeFromPluginReposTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/log.txt" );
+ verifier.verifyFilePresent( "target/log.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java
index 3d7516b02..1ff534dc4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
index 735c2926a..707c6e79e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java
index 1fcecadc1..29b6f442d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java
index cd633db6d..96ec04d84 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java
@@ -56,7 +56,7 @@ public class MavenITmng2738ProfileIdCollidesWithCliOptionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java
index c9b0b9633..d6dd1f837 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
index 754b0feb5..009a4e3a5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java
index e409ab7de..4245ddbdd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
index 184df8aaf..9f5a18dd8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
@@ -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
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
index c52e154f9..55638dfdf 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java
index e52fbab40..812aa2ee0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java
index cd7591156..ead9ff2a0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java
index 63dc5ed9d..10e9f5df2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
index 03a085cbd..b2e2a34b3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
index f1cce24c5..317c1cc15 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java
index 5fac4474b..d2443880e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java
index 1ee257d59..a1a898813 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
index ac2933322..92781c2ef 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
index f65aafd8f..a74754ceb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
@@ -47,7 +47,7 @@ public class MavenITmng3485OverrideWagonExtensionTest
verifier.executeGoal( "deploy" );
- verifier.assertFilePresent( "target/wagon.properties" );
+ verifier.verifyFilePresent( "target/wagon.properties" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java
index 69527fed3..0630fd657 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java
@@ -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();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
index 28173358d..4eb378331 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
@@ -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 );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
index e40be872c..4124fc6dd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
@@ -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 );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
index 088a83392..c8dffd7a4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
@@ -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" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java
index 36ddf6625..1cb4787db 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java
@@ -51,7 +51,7 @@ public class MavenITmng3679PluginExecIdInterpolationTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/check.txt" );
+ verifier.verifyFilePresent( "target/check.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
index c391bb899..185fa58e6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
@@ -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 );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java
index e300ef242..3ce9d1986 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java
@@ -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", "" ) );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.java
index f12ccd648..bc7d3929e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.java
@@ -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" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java
index 7c14b99cb..47f8ecb67 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java
index a11145b7b..aaa055690 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java
@@ -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" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java
index 01f641af3..581e0623f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java
@@ -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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java
index 0f67e4b5f..27c0abb2f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java
@@ -84,7 +84,7 @@ public class MavenITmng3938MergePluginExecutionsTest
lines = verifier.loadLines( "target/non-default.log", "UTF-8" );
assertEquals( Arrays.asList( new String[] { "child" } ), lines );
- verifier.assertFileNotPresent( "target/parent.log" );
+ verifier.verifyFileNotPresent( "target/parent.log" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java
index 7c36284f5..218e70a0b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java
@@ -74,7 +74,7 @@ public class MavenITmng3940EnvVarInterpolationTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/PASSED.properties" );
+ verifier.verifyFilePresent( "target/PASSED.properties" );
Properties props = verifier.loadProperties( "target/PASSED.properties" );
assertEquals( "PASSED", props.getProperty( "project.properties.envTest" ) );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java
index f48399d0b..9830925dd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java
@@ -58,7 +58,7 @@ public class MavenITmng3944BasedirInterpolationTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/basedir.properties" );
+ verifier.verifyFilePresent( "target/basedir.properties" );
Properties props = verifier.loadProperties( "target/basedir.properties" );
assertCanonicalFileEquals( testDir, new File( props.getProperty( "project.properties.prop0" ) ) );
assertCanonicalFileEquals( testDir, new File( props.getProperty( "project.properties.prop1" ) ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java
index 00c5aed9b..3b1c7577f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java
@@ -56,8 +56,8 @@ public class MavenITmng3947PluginDefaultExecutionConfigTest
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" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
index b8fc38f82..e668419a2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
@@ -59,7 +59,7 @@ public class MavenITmng3948ParentResolutionFromProfileReposTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng3948", "parent", "0.1", "pom" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng3948", "parent", "0.1", "pom" );
}
/**
@@ -82,7 +82,7 @@ public class MavenITmng3948ParentResolutionFromProfileReposTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng3948", "parent", "0.2", "pom" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng3948", "parent", "0.2", "pom" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java
index 9aacce1db..01bec8949 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java
@@ -69,7 +69,7 @@ public class MavenITmng3951AbsolutePathsTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/path.properties" );
+ verifier.verifyFilePresent( "target/path.properties" );
Properties props = verifier.loadProperties( "target/path.properties" );
assertCanonicalFileEquals( new File( testDir, "tmp" ).getAbsoluteFile(), new File( props.getProperty( "fileParams.0" ) ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
index 08aadc427..486378ff0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
@@ -59,7 +59,7 @@ public class MavenITmng3970DepResolutionFromProfileReposTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng3970", "a", "0.1", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng3970", "a", "0.1", "jar" );
}
/**
@@ -82,7 +82,7 @@ public class MavenITmng3970DepResolutionFromProfileReposTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng3970", "a", "0.1", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng3970", "a", "0.1", "jar" );
}
/**
@@ -105,7 +105,7 @@ public class MavenITmng3970DepResolutionFromProfileReposTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng3970", "a", "0.1", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng3970", "a", "0.1", "jar" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
index 6c99d2b29..e4acdd452 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
@@ -59,8 +59,8 @@ public class MavenITmng3974MirrorOrderingTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng3974", "a", "0.1", "jar" );
- verifier.assertArtifactPresent( "org.apache.maven.its.mng3974", "b", "0.1", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng3974", "a", "0.1", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng3974", "b", "0.1", "jar" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java
index 50e1dbd10..23b4e5f33 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java
@@ -60,7 +60,7 @@ public class MavenITmng3983PluginResolutionFromProfileReposTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng3983", "p", "0.1", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng3983", "p", "0.1", "jar" );
}
/**
@@ -86,7 +86,7 @@ public class MavenITmng3983PluginResolutionFromProfileReposTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng3983", "p", "0.1", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng3983", "p", "0.1", "jar" );
}
/**
@@ -111,7 +111,7 @@ public class MavenITmng3983PluginResolutionFromProfileReposTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng3983", "p", "0.1", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng3983", "p", "0.1", "jar" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java
index a5750843e..47c88c766 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java
@@ -57,7 +57,7 @@ public class MavenITmng4016PrefixedPropertyInterpolationTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/model.properties" );
+ verifier.verifyFilePresent( "target/model.properties" );
Properties props = verifier.loadProperties( "target/model.properties" );
assertEquals( "PASSED-1", props.getProperty( "project.properties.projectProperty" ) );
assertEquals( "PASSED-2", props.getProperty( "project.properties.pomProperty" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java
index 2abef368c..f4d3ff5ac 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java
@@ -57,7 +57,7 @@ public class MavenITmng4036ParentResolutionFromSettingsRepoTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4036", "parent", "0.2", "pom" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4036", "parent", "0.2", "pom" );
}
/**
@@ -83,7 +83,7 @@ public class MavenITmng4036ParentResolutionFromSettingsRepoTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4036", "parent", "0.1", "pom" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4036", "parent", "0.1", "pom" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java
index 7683c89c0..90b1021ad 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java
@@ -136,8 +136,8 @@ public class MavenITmng4068AuthenticatedMirrorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4068", "a", "0.1", "jar" );
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4068", "b", "0.1-SNAPSHOT", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4068", "a", "0.1", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4068", "b", "0.1-SNAPSHOT", "jar" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java
index dc3c86bf4..ebd1779bd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java
@@ -61,8 +61,8 @@ public class MavenITmng4086ExplicitPluginMetaversionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFileNotPresent( "target/touch-latest.txt" );
- verifier.assertFilePresent( "target/touch-release.txt" );
+ verifier.verifyFileNotPresent( "target/touch-latest.txt" );
+ verifier.verifyFilePresent( "target/touch-release.txt" );
}
/**
@@ -88,8 +88,8 @@ public class MavenITmng4086ExplicitPluginMetaversionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFileNotPresent( "target/touch-release.txt" );
- verifier.assertFilePresent( "target/touch-latest.txt" );
+ verifier.verifyFileNotPresent( "target/touch-release.txt" );
+ verifier.verifyFilePresent( "target/touch-latest.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
index 1910e3d89..91402fe47 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
@@ -56,8 +56,8 @@ public class MavenITmng4087PercentEncodedFileUrlTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFileNotPresent( "target/%72%65%70%6F" );
- verifier.assertFilePresent( "target/repo" );
+ verifier.verifyFileNotPresent( "target/%72%65%70%6F" );
+ verifier.verifyFilePresent( "target/repo" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java
index e8629e691..42a456465 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java
@@ -70,8 +70,8 @@ public class MavenITmng4203TransitiveDependencyExclusionTest
assertEquals( expected, artifacts );
- verifier.assertArtifactNotPresent( "org.apache.maven.its.mng4203", "a", "0.1", "pom" );
- verifier.assertArtifactNotPresent( "org.apache.maven.its.mng4203", "a", "0.1", "jar" );
+ verifier.verifyArtifactNotPresent( "org.apache.maven.its.mng4203", "a", "0.1", "pom" );
+ verifier.verifyArtifactNotPresent( "org.apache.maven.its.mng4203", "a", "0.1", "jar" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java
index 6dccc4832..67758aacc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java
@@ -60,7 +60,7 @@ public class MavenITmng4214MirroredParentSearchReposTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4214", "parent", "0.1", "pom" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4214", "parent", "0.1", "pom" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java
index a4016b92e..6e64cefec 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java
@@ -64,8 +64,8 @@ public class MavenITmng4262MakeLikeReactorDottedPath370Test
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.txt" );
- verifier.assertFilePresent( "../sub-a/target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "../sub-a/target/touch.txt" );
}
/**
@@ -88,8 +88,8 @@ public class MavenITmng4262MakeLikeReactorDottedPath370Test
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFileNotPresent( "target/touch.txt" );
- verifier.assertFilePresent( "../sub-a/target/touch.txt" );
+ verifier.verifyFileNotPresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "../sub-a/target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java
index 0b2430e10..7a7aa6023 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java
@@ -64,8 +64,8 @@ public class MavenITmng4262MakeLikeReactorDottedPathTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.txt" );
- verifier.assertFileNotPresent( "../sub-a/target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
+ verifier.verifyFileNotPresent( "../sub-a/target/touch.txt" );
}
/**
@@ -88,8 +88,8 @@ public class MavenITmng4262MakeLikeReactorDottedPathTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFileNotPresent( "target/touch.txt" );
- verifier.assertFilePresent( "../sub-a/target/touch.txt" );
+ verifier.verifyFileNotPresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "../sub-a/target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java
index d26745197..4d40ec9d8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java
@@ -64,7 +64,7 @@ public class MavenITmng4269BadReactorResolutionFromOutDirTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java
index 3305a4be9..b31f3f19b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java
@@ -58,7 +58,7 @@ public class MavenITmng4279WagonProviderFailoverTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/wagon.properties" );
+ verifier.verifyFilePresent( "target/wagon.properties" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java
index a4b6f58ec..04fc93e4c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java
@@ -57,8 +57,8 @@ public class MavenITmng4281PreferLocalSnapshotTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4281", "dependency", "0.1-SNAPSHOT", "jar" );
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4281", "dependency", "0.1-SNAPSHOT", "pom" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4281", "dependency", "0.1-SNAPSHOT", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4281", "dependency", "0.1-SNAPSHOT", "pom" );
verifier = newVerifier( new File( testDir, "project" ).getAbsolutePath() );
verifier.setAutoclean( false );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java
index 9dacd0d47..19a093981 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java
@@ -89,7 +89,7 @@ public class MavenITmng4291MojoRequiresOnlineModeTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFileNotPresent( "target/touch.txt" );
+ verifier.verifyFileNotPresent( "target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java
index aca8afd48..989c04122 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java
@@ -59,9 +59,9 @@ public class MavenITmng4314DirectInvocationOfAggregatorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.txt" );
- verifier.assertFileNotPresent( "consumer/target/touch.txt" );
- verifier.assertFileNotPresent( "dependency/target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
+ verifier.verifyFileNotPresent( "consumer/target/touch.txt" );
+ verifier.verifyFileNotPresent( "dependency/target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java
index 42abe8f82..e6c107737 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java
@@ -59,7 +59,7 @@ public class MavenITmng4317PluginVersionResolutionFromMultiReposTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java
index 58cb6e61e..6e38c171a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java
@@ -54,7 +54,7 @@ public class MavenITmng4319PluginExecutionGoalInterpolationTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java
index 7e0c7fdd4..c3a4047c3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java
@@ -56,7 +56,7 @@ public class MavenITmng4321CliUsesPluginMgmtConfigTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/passed.log" );
+ verifier.verifyFilePresent( "target/passed.log" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
index f2c16ced6..c25bef9f5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
@@ -185,8 +185,8 @@ public class MavenITmng4343MissingReleaseUpdatePolicyTest
assertTrue( requestedUris.toString(), requestedUris.contains( "/dep/0.1/dep-0.1.jar" ) );
assertTrue( requestedUris.toString(), requestedUris.contains( "/dep/0.1/dep-0.1.pom" ) );
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4343", "dep", "0.1", "jar" );
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4343", "dep", "0.1", "pom" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4343", "dep", "0.1", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4343", "dep", "0.1", "pom" );
verifier.resetStreams();
}
@@ -247,8 +247,8 @@ public class MavenITmng4343MissingReleaseUpdatePolicyTest
//noinspection unchecked
assertThat( requestedUris, CoreMatchers.<String>hasItems() );
- verifier.assertArtifactNotPresent( "org.apache.maven.its.mng4343", "dep", "0.1", "jar" );
- verifier.assertArtifactNotPresent( "org.apache.maven.its.mng4343", "dep", "0.1", "pom" );
+ verifier.verifyArtifactNotPresent( "org.apache.maven.its.mng4343", "dep", "0.1", "jar" );
+ verifier.verifyArtifactNotPresent( "org.apache.maven.its.mng4343", "dep", "0.1", "pom" );
verifier.setLogFileName( "log-never-3.txt" );
verifier.addCliOption( "-U" );
@@ -257,8 +257,8 @@ public class MavenITmng4343MissingReleaseUpdatePolicyTest
assertThat( requestedUris, hasItem( "/dep/0.1/dep-0.1.jar" ) );
assertThat( requestedUris, hasItem( "/dep/0.1/dep-0.1.pom" ) );
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4343", "dep", "0.1", "jar" );
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4343", "dep", "0.1", "pom" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4343", "dep", "0.1", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4343", "dep", "0.1", "pom" );
requestedUris.clear();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java
index 912cbeade..5df7689b9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java
@@ -114,7 +114,7 @@ public class MavenITmng4348NoUnnecessaryRepositoryAccessTest
server.join();
}
- verifier.assertFilePresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
assertEquals( new ArrayList<String>(), requestedUris );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java
index 46d0f8ccb..52e55b2f8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java
@@ -63,11 +63,11 @@ public class MavenITmng4357LifecycleMappingDiscoveryInReactorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "mod-a/target/old.txt" );
- verifier.assertFileNotPresent( "mod-a/target/new.txt" );
+ verifier.verifyFilePresent( "mod-a/target/old.txt" );
+ verifier.verifyFileNotPresent( "mod-a/target/new.txt" );
- verifier.assertFileNotPresent( "mod-b/target/old.txt" );
- verifier.assertFilePresent( "mod-b/target/new.txt" );
+ verifier.verifyFileNotPresent( "mod-b/target/old.txt" );
+ verifier.verifyFilePresent( "mod-b/target/new.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java
index 963ae6b8e..338fbaf4e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java
@@ -66,7 +66,7 @@ public class MavenITmng4367LayoutAwareMirrorSelectionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4367", "dep", "0.1", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4367", "dep", "0.1", "jar" );
}
/**
@@ -96,7 +96,7 @@ public class MavenITmng4367LayoutAwareMirrorSelectionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4367", "dep", "0.1", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4367", "dep", "0.1", "jar" );
}
/**
@@ -126,7 +126,7 @@ public class MavenITmng4367LayoutAwareMirrorSelectionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4367", "dep", "0.1", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4367", "dep", "0.1", "jar" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java
index 56f97935a..9e43cf2e4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java
@@ -55,7 +55,7 @@ public class MavenITmng4396AntBased20xMojoSupportTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/ant.txt" );
+ verifier.verifyFilePresent( "target/ant.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java
index 6eea92809..eeb45bd21 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java
@@ -59,8 +59,8 @@ public class MavenITmng4401RepositoryOrderForParentPomTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/passed.txt" );
- verifier.assertFileNotPresent( "target/failed.txt" );
+ verifier.verifyFilePresent( "target/passed.txt" );
+ verifier.verifyFileNotPresent( "target/failed.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java
index 98452574f..07bdee3c3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java
@@ -99,7 +99,7 @@ public class MavenITmng4412OfflineModeInPluginTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactNotPresent( "org.apache.maven.its.mng4412", "dep", "0.1", "pom" );
+ verifier.verifyArtifactNotPresent( "org.apache.maven.its.mng4412", "dep", "0.1", "pom" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java
index d1f92048e..75a7a2463 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java
@@ -115,7 +115,7 @@ public class MavenITmng4413MirroringOfDependencyRepoTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4413", "a", "0.1", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4413", "a", "0.1", "jar" );
}
finally
{
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java
index 036c7887f..01c5e2cf3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java
@@ -54,7 +54,7 @@ public class MavenITmng4422PluginExecutionPhaseInterpolationTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java
index c574cbf96..97ff5bcd7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java
@@ -63,8 +63,8 @@ public class MavenITmng4433ForceParentSnapshotUpdateTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.assertFilePresent( "target/old.txt" );
- verifier.assertFileNotPresent( "target/new.txt" );
+ verifier.verifyFilePresent( "target/old.txt" );
+ verifier.verifyFileNotPresent( "target/new.txt" );
filterProps.setProperty( "@repo@", "repo-2" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
@@ -76,8 +76,8 @@ public class MavenITmng4433ForceParentSnapshotUpdateTest
verifier.resetStreams();
- verifier.assertFileNotPresent( "target/old.txt" );
- verifier.assertFilePresent( "target/new.txt" );
+ verifier.verifyFileNotPresent( "target/old.txt" );
+ verifier.verifyFilePresent( "target/new.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java
index afaa2e3b8..49bf08110 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java
@@ -55,7 +55,7 @@ public class MavenITmng4453PluginVersionFromLifecycleMappingTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/resources-resources.txt" );
+ verifier.verifyFilePresent( "target/resources-resources.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java
index fab65b00b..aa8f23c23 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java
@@ -57,7 +57,7 @@ public class MavenITmng4464PlatformIndependentFileSeparatorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "../sub/target/path.properties" );
+ verifier.verifyFilePresent( "../sub/target/path.properties" );
Properties props = verifier.loadProperties( "../sub/target/path.properties" );
assertPath( props, "project.build.resources.0.directory", "src/main/res" );
assertPath( props, "project.build.testResources.0.directory", "src/test/res" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java
index 6b6533daf..ac327c92e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java
@@ -63,7 +63,7 @@ public class MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.properties" );
+ verifier.verifyFilePresent( "target/touch.properties" );
// phase 2: re-try with the remote repo being inaccessible (due to bad URL)
@@ -79,7 +79,7 @@ public class MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.properties" );
+ verifier.verifyFilePresent( "target/touch.properties" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java
index 01aff2457..10adac2c7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java
@@ -115,8 +115,8 @@ public class MavenITmng4489MirroringOfExtensionRepoTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4489", "ext-dep", "0.1", "jar" );
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4489", "ext-dep", "0.1", "pom" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4489", "ext-dep", "0.1", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4489", "ext-dep", "0.1", "pom" );
}
finally
{
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
index 9ad1514ee..77009702a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
@@ -119,7 +119,7 @@ public class MavenITmng4554PluginPrefixMappingUpdateTest
verifier.executeGoal( "a:touch" );
verifier.verifyErrorFreeLog();
- verifier.assertFilePresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
assertTrue( requestedUris.toString(), requestedUris.contains( metadataUri ) );
requestedUris.clear();
@@ -206,7 +206,7 @@ public class MavenITmng4554PluginPrefixMappingUpdateTest
verifier.executeGoal( "a:touch" );
verifier.verifyErrorFreeLog();
- verifier.assertFilePresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
assertTrue( requestedUris.toString(), requestedUris.contains( metadataUri ) );
requestedUris.clear();
@@ -296,7 +296,7 @@ public class MavenITmng4554PluginPrefixMappingUpdateTest
verifier.executeGoal( "a:touch" );
verifier.verifyErrorFreeLog();
- verifier.assertFilePresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
assertTrue( requestedUris.toString(), requestedUris.contains( metadataUri ) );
requestedUris.clear();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java
index 59d19feee..0bad16479 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java
@@ -115,9 +115,9 @@ public class MavenITmng4561MirroringOfPluginRepoTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4561", "plugin-dep", "0.1", "jar" );
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4561", "plugin-dep", "0.1", "pom" );
- verifier.assertFilePresent( "target/touch.txt" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4561", "plugin-dep", "0.1", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4561", "plugin-dep", "0.1", "pom" );
+ verifier.verifyFilePresent( "target/touch.txt" );
}
finally
{
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java
index 2bd731f87..4b7c46cc0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java
@@ -62,8 +62,8 @@ public class MavenITmng4565MultiConditionProfileActivationTest
// should not be activated. Only the profile1/touch.txt file should be generated.
//
verifier.verifyErrorFreeLog();
- verifier.assertFilePresent( "target/profile1/touch.txt" );
- verifier.assertFileNotPresent( "target/profile2/touch.txt" );
+ verifier.verifyFilePresent( "target/profile1/touch.txt" );
+ verifier.verifyFileNotPresent( "target/profile2/touch.txt" );
verifier.resetStreams();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest.java
index d37223edc..cdc268fcb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest.java
@@ -59,7 +59,7 @@ public class MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
index ef51bb85f..9af887b9c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
@@ -59,8 +59,8 @@ public class MavenITmng4654ArtifactHandlerForMainArtifactTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFileNotPresent( "target/repo/org/apache/maven/its/mng4654/test/1.0/test-1.0.mng4654" );
- verifier.assertFilePresent( "target/repo/org/apache/maven/its/mng4654/test/1.0/test-1.0.jar" );
+ verifier.verifyFileNotPresent( "target/repo/org/apache/maven/its/mng4654/test/1.0/test-1.0.mng4654" );
+ verifier.verifyFilePresent( "target/repo/org/apache/maven/its/mng4654/test/1.0/test-1.0.jar" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java
index 5b4ed4162..7f76bf38d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java
@@ -68,7 +68,7 @@ public class MavenITmng4660OutdatedPackagedArtifact extends AbstractMavenIntegra
Path module1Jar = testDir.toPath().resolve( "module-a/target/module-a-1.0.jar" ).toAbsolutePath();
verifier1.verifyErrorFreeLog();
- verifier1.assertFilePresent( module1Jar.toString() );
+ verifier1.verifyFilePresent( module1Jar.toString() );
verifier1.resetStreams();
if ( System.getProperty( "java.version", "" ).startsWith( "1." ) )
@@ -93,14 +93,14 @@ public class MavenITmng4660OutdatedPackagedArtifact extends AbstractMavenIntegra
Path module1PropertiesFile = testDir.toPath().resolve( "module-a/target/classes/example.properties" )
.toAbsolutePath();
- verifier2.assertFilePresent( module1PropertiesFile.toString() );
+ verifier2.verifyFilePresent( module1PropertiesFile.toString() );
assertThat( Files.getLastModifiedTime( module1PropertiesFile ),
greaterThan ( Files.getLastModifiedTime( module1Jar ) ) );
Path module1Class = testDir.toPath().resolve( "module-a/target/classes/org/apache/maven/it/Example.class" )
.toAbsolutePath();
verifier2.verifyErrorFreeLog();
- verifier2.assertFilePresent( module1Class.toString() );
+ verifier2.verifyFilePresent( module1Class.toString() );
verifier2.resetStreams();
// 3. Resume project build from module B, that depends on module A we just touched. Its packaged artifact
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java
index 7004f1907..200f97c3b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java
@@ -58,7 +58,7 @@ public class MavenITmng4776ForkedReactorPluginVersionResolutionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "sub/target/log.txt" );
+ verifier.verifyFilePresent( "sub/target/log.txt" );
}
/**
@@ -82,7 +82,7 @@ public class MavenITmng4776ForkedReactorPluginVersionResolutionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "sub/target/log.txt" );
+ verifier.verifyFilePresent( "sub/target/log.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java
index ca2b45625..b6ee917b1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java
@@ -57,7 +57,7 @@ public class MavenITmng4786AntBased21xMojoSupportTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/ant.txt" );
+ verifier.verifyFilePresent( "target/ant.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java
index 86ff80bcf..c8150697c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java
@@ -54,8 +54,8 @@ public class MavenITmng4788InstallationToCustomLocalRepoTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/local-repo/test-0.1-SNAPSHOT.jar" );
- verifier.assertFileNotPresent( "target/local-repo/org/apache/maven/its/mng4788/test/0.1-SNAPSHOT/test-0.1-SNAPSHOT.jar" );
+ verifier.verifyFilePresent( "target/local-repo/test-0.1-SNAPSHOT.jar" );
+ verifier.verifyFileNotPresent( "target/local-repo/org/apache/maven/its/mng4788/test/0.1-SNAPSHOT/test-0.1-SNAPSHOT.jar" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java
index e145e1a37..42eb33aaf 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java
@@ -92,8 +92,8 @@ public class MavenITmng4840MavenPrerequisiteTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch-1.txt" );
- verifier.assertFileNotPresent( "target/touch-2.txt" );
+ verifier.verifyFilePresent( "target/touch-1.txt" );
+ verifier.verifyFileNotPresent( "target/touch-2.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java
index 84f09e922..9def563fe 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java
@@ -64,7 +64,7 @@ public class MavenITmng4842ParentResolutionOfDependencyPomTest
List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
assertTrue( compile.toString(), compile.contains( "dep-0.1.jar" ) );
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4842", "parent", "0.1", "pom" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4842", "parent", "0.1", "pom" );
}
/**
@@ -90,7 +90,7 @@ public class MavenITmng4842ParentResolutionOfDependencyPomTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng4842", "parent", "0.1", "pom" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng4842", "parent", "0.1", "pom" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java
index e834f1a4d..0b5f08f02 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java
@@ -61,9 +61,9 @@ public class MavenITmng4890MakeLikeReactorConsidersVersionsTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "mod-b/target/touch.txt" );
- verifier.assertFileNotPresent( "mod-a/target/touch.txt" );
- verifier.assertFileNotPresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "mod-b/target/touch.txt" );
+ verifier.verifyFileNotPresent( "mod-a/target/touch.txt" );
+ verifier.verifyFileNotPresent( "target/touch.txt" );
}
/**
@@ -90,9 +90,9 @@ public class MavenITmng4890MakeLikeReactorConsidersVersionsTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "mod-a/target/touch.txt" );
- verifier.assertFileNotPresent( "mod-b/target/touch.txt" );
- verifier.assertFileNotPresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "mod-a/target/touch.txt" );
+ verifier.verifyFileNotPresent( "mod-b/target/touch.txt" );
+ verifier.verifyFileNotPresent( "target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java
index 36a07cfba..33367aefb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java
@@ -59,7 +59,7 @@ public class MavenITmng4895PluginDepWithNonRelocatedMavenApiTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/classpath.txt" );
+ verifier.verifyFilePresent( "target/classpath.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java
index 98b079bdf..99b3e97e4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java
@@ -59,7 +59,7 @@ public class MavenITmng4925ContainerLookupRealmDuringMojoExecTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java
index a03feafeb..553090ed2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java
@@ -63,9 +63,9 @@ public class MavenITmng4960MakeLikeReactorResumeTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "mod-a/target/touch.txt" );
- verifier.assertFilePresent( "mod-b/target/touch.txt" );
- verifier.assertFileNotPresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "mod-a/target/touch.txt" );
+ verifier.verifyFilePresent( "mod-b/target/touch.txt" );
+ verifier.verifyFileNotPresent( "target/touch.txt" );
}
/**
@@ -94,9 +94,9 @@ public class MavenITmng4960MakeLikeReactorResumeTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFileNotPresent( "mod-a/target/touch.txt" );
- verifier.assertFilePresent( "mod-b/target/touch.txt" );
- verifier.assertFileNotPresent( "target/touch.txt" );
+ verifier.verifyFileNotPresent( "mod-a/target/touch.txt" );
+ verifier.verifyFilePresent( "mod-b/target/touch.txt" );
+ verifier.verifyFileNotPresent( "target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java
index f2ac10a39..0400f9b36 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java
@@ -58,7 +58,7 @@ public class MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java
index c406cb225..f9cda776c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java
@@ -67,11 +67,11 @@ public class MavenITmng5230MakeReactorWithExcludesTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.txt" );
- verifier.assertFilePresent( "mod-a/target/touch.txt" );
- verifier.assertFileNotPresent( "mod-b/target/touch.txt" );
- verifier.assertFilePresent( "mod-c/target/touch.txt" );
- verifier.assertFilePresent( "mod-d/target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "mod-a/target/touch.txt" );
+ verifier.verifyFileNotPresent( "mod-b/target/touch.txt" );
+ verifier.verifyFilePresent( "mod-c/target/touch.txt" );
+ verifier.verifyFilePresent( "mod-d/target/touch.txt" );
}
/**
@@ -95,11 +95,11 @@ public class MavenITmng5230MakeReactorWithExcludesTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.txt" );
- verifier.assertFileNotPresent( "mod-a/target/touch.txt" );
- verifier.assertFilePresent( "mod-b/target/touch.txt" );
- verifier.assertFileNotPresent( "mod-c/target/touch.txt" );
- verifier.assertFileNotPresent( "mod-d/target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
+ verifier.verifyFileNotPresent( "mod-a/target/touch.txt" );
+ verifier.verifyFilePresent( "mod-b/target/touch.txt" );
+ verifier.verifyFileNotPresent( "mod-c/target/touch.txt" );
+ verifier.verifyFileNotPresent( "mod-d/target/touch.txt" );
}
/**
@@ -123,11 +123,11 @@ public class MavenITmng5230MakeReactorWithExcludesTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFileNotPresent( "target/touch.txt" );
- verifier.assertFileNotPresent( "mod-a/target/touch.txt" );
- verifier.assertFilePresent( "mod-b/target/touch.txt" );
- verifier.assertFileNotPresent( "mod-c/target/touch.txt" );
- verifier.assertFileNotPresent( "mod-d/target/touch.txt" );
+ verifier.verifyFileNotPresent( "target/touch.txt" );
+ verifier.verifyFileNotPresent( "mod-a/target/touch.txt" );
+ verifier.verifyFilePresent( "mod-b/target/touch.txt" );
+ verifier.verifyFileNotPresent( "mod-c/target/touch.txt" );
+ verifier.verifyFileNotPresent( "mod-d/target/touch.txt" );
}
/**
@@ -152,11 +152,11 @@ public class MavenITmng5230MakeReactorWithExcludesTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.txt" );
- verifier.assertFileNotPresent( "mod-a/target/touch.txt" );
- verifier.assertFilePresent( "mod-b/target/touch.txt" );
- verifier.assertFilePresent( "mod-c/target/touch.txt" );
- verifier.assertFileNotPresent( "mod-d/target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
+ verifier.verifyFileNotPresent( "mod-a/target/touch.txt" );
+ verifier.verifyFilePresent( "mod-b/target/touch.txt" );
+ verifier.verifyFilePresent( "mod-c/target/touch.txt" );
+ verifier.verifyFileNotPresent( "mod-d/target/touch.txt" );
}
/**
@@ -172,7 +172,7 @@ public class MavenITmng5230MakeReactorWithExcludesTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
clean( verifier );
- verifier.assertFileNotPresent( "mod-d/pom.xml" );
+ verifier.verifyFileNotPresent( "mod-d/pom.xml" );
verifier.addCliOption( "-pl" );
verifier.addCliOption( "!mod-d" );
verifier.setLogFileName( "log-basedir-exclamation.txt" );
@@ -180,11 +180,11 @@ public class MavenITmng5230MakeReactorWithExcludesTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.txt" );
- verifier.assertFilePresent( "mod-a/target/touch.txt" );
- verifier.assertFilePresent( "mod-b/target/touch.txt" );
- verifier.assertFilePresent( "mod-c/target/touch.txt" );
- verifier.assertFileNotPresent( "mod-d/target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "mod-a/target/touch.txt" );
+ verifier.verifyFilePresent( "mod-b/target/touch.txt" );
+ verifier.verifyFilePresent( "mod-c/target/touch.txt" );
+ verifier.verifyFileNotPresent( "mod-d/target/touch.txt" );
}
/**
@@ -200,7 +200,7 @@ public class MavenITmng5230MakeReactorWithExcludesTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
clean( verifier );
- verifier.assertFileNotPresent( "mod-d/pom.xml" );
+ verifier.verifyFileNotPresent( "mod-d/pom.xml" );
verifier.addCliOption( "-pl" );
verifier.addCliOption( "-mod-d" );
verifier.setLogFileName( "log-basedir-minus.txt" );
@@ -208,11 +208,11 @@ public class MavenITmng5230MakeReactorWithExcludesTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.txt" );
- verifier.assertFilePresent( "mod-a/target/touch.txt" );
- verifier.assertFilePresent( "mod-b/target/touch.txt" );
- verifier.assertFilePresent( "mod-c/target/touch.txt" );
- verifier.assertFileNotPresent( "mod-d/target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "mod-a/target/touch.txt" );
+ verifier.verifyFilePresent( "mod-b/target/touch.txt" );
+ verifier.verifyFilePresent( "mod-c/target/touch.txt" );
+ verifier.verifyFileNotPresent( "mod-d/target/touch.txt" );
}
@@ -236,11 +236,11 @@ public class MavenITmng5230MakeReactorWithExcludesTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.txt" );
- verifier.assertFilePresent( "mod-a/target/touch.txt" );
- verifier.assertFileNotPresent( "mod-b/target/touch.txt" );
- verifier.assertFilePresent( "mod-c/target/touch.txt" );
- verifier.assertFilePresent( "mod-d/target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "mod-a/target/touch.txt" );
+ verifier.verifyFileNotPresent( "mod-b/target/touch.txt" );
+ verifier.verifyFilePresent( "mod-c/target/touch.txt" );
+ verifier.verifyFilePresent( "mod-d/target/touch.txt" );
}
/**
@@ -263,11 +263,11 @@ public class MavenITmng5230MakeReactorWithExcludesTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touch.txt" );
- verifier.assertFilePresent( "mod-a/target/touch.txt" );
- verifier.assertFileNotPresent( "mod-b/target/touch.txt" );
- verifier.assertFilePresent( "mod-c/target/touch.txt" );
- verifier.assertFilePresent( "mod-d/target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "mod-a/target/touch.txt" );
+ verifier.verifyFileNotPresent( "mod-b/target/touch.txt" );
+ verifier.verifyFilePresent( "mod-c/target/touch.txt" );
+ verifier.verifyFilePresent( "mod-d/target/touch.txt" );
}
/**
@@ -292,10 +292,10 @@ public class MavenITmng5230MakeReactorWithExcludesTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFileNotPresent( "target/touch.txt" );
- verifier.assertFileNotPresent( "mod-a/target/touch.txt" );
- verifier.assertFilePresent( "mod-b/target/touch.txt" );
- verifier.assertFileNotPresent( "mod-c/target/touch.txt" );
- verifier.assertFilePresent( "mod-d/target/touch.txt" );
+ verifier.verifyFileNotPresent( "target/touch.txt" );
+ verifier.verifyFileNotPresent( "mod-a/target/touch.txt" );
+ verifier.verifyFilePresent( "mod-b/target/touch.txt" );
+ verifier.verifyFileNotPresent( "mod-c/target/touch.txt" );
+ verifier.verifyFilePresent( "mod-d/target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java
index e0a5ea4e7..5c32609e2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java
@@ -53,6 +53,6 @@ public class MavenITmng5389LifecycleParticipantAfterSessionEnd
verifier.resetStreams();
verifier.verifyErrorFreeLog();
- verifier.assertFilePresent( "target/afterSessionEnd.txt" );
+ verifier.verifyFilePresent( "target/afterSessionEnd.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java
index c54b839bc..cc965caa0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java
@@ -54,10 +54,10 @@ public class MavenITmng5418FileProjectPropertiesActivatorTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/path1.txt" );
- verifier.assertFilePresent( "target/file1.txt" );
- verifier.assertFilePresent( "target/missing1.txt" );
- verifier.assertFileNotPresent( "target/missing2.txt" );
+ verifier.verifyFilePresent( "target/path1.txt" );
+ verifier.verifyFilePresent( "target/file1.txt" );
+ verifier.verifyFilePresent( "target/missing1.txt" );
+ verifier.verifyFileNotPresent( "target/missing2.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
index b779b689f..93e1cf9ab 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
@@ -52,9 +52,9 @@ public class MavenITmng5530MojoExecutionScopeTest
verifier.resetStreams();
verifier.verifyErrorFreeLog();
- // verifier.assertFilePresent( "target/execution-failure.txt" );
- verifier.assertFilePresent( "target/execution-success.txt" );
- verifier.assertFilePresent( "target/execution-before.txt" );
+ // verifier.verifyFilePresent( "target/execution-failure.txt" );
+ verifier.verifyFilePresent( "target/execution-success.txt" );
+ verifier.verifyFilePresent( "target/execution-before.txt" );
}
public void test_copyfiles_multithreaded()
@@ -79,9 +79,9 @@ public class MavenITmng5530MojoExecutionScopeTest
verifier.resetStreams();
verifier.verifyErrorFreeLog();
- // verifier.assertFilePresent( "target/execution-failure.txt" );
- verifier.assertFilePresent( "target/execution-success.txt" );
- verifier.assertFilePresent( "target/execution-before.txt" );
+ // verifier.verifyFilePresent( "target/execution-failure.txt" );
+ verifier.verifyFilePresent( "target/execution-success.txt" );
+ verifier.verifyFilePresent( "target/execution-before.txt" );
}
public void testExtension()
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java
index 67be6c9b4..2734040e7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java
@@ -52,7 +52,7 @@ public class MavenITmng5639ImportScopePomResolutionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng5639", "b", "0.1", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng5639", "b", "0.1", "jar" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java
index 5336d1b49..5a9498482 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java
@@ -70,10 +70,10 @@ public class MavenITmng5640LifecycleParticipantAfterSessionEnd
verifier.resetStreams();
verifier.verifyTextInLog("testApp(org.apache.maven.its.mng5640.FailingTest)");
- verifier.assertFilePresent( "target/afterProjectsRead.txt" );
+ verifier.verifyFilePresent( "target/afterProjectsRead.txt" );
// See https://issues.apache.org/jira/browse/MNG-5641
- // verifier.assertFilePresent( "target/afterSessionStart.txt" );
- verifier.assertFilePresent( "target/afterSessionEnd.txt" );
+ // verifier.verifyFilePresent( "target/afterSessionStart.txt" );
+ verifier.verifyFilePresent( "target/afterSessionEnd.txt" );
}
/**
@@ -110,10 +110,10 @@ public class MavenITmng5640LifecycleParticipantAfterSessionEnd
}
verifier.resetStreams();
- verifier.assertFilePresent( "target/afterProjectsRead.txt" );
+ verifier.verifyFilePresent( "target/afterProjectsRead.txt" );
// See https://issues.apache.org/jira/browse/MNG-5641
- // verifier.assertFilePresent( "target/afterSessionStart.txt" );
- verifier.assertFilePresent( "target/afterSessionEnd.txt" );
+ // verifier.verifyFilePresent( "target/afterSessionStart.txt" );
+ verifier.verifyFilePresent( "target/afterSessionEnd.txt" );
}
/**
@@ -157,10 +157,10 @@ public class MavenITmng5640LifecycleParticipantAfterSessionEnd
}
verifier.resetStreams();
- verifier.assertFilePresent( "target/afterProjectsRead.txt" );
+ verifier.verifyFilePresent( "target/afterProjectsRead.txt" );
// See https://issues.apache.org/jira/browse/MNG-5641
- // verifier.assertFilePresent( "target/afterSessionStart.txt" );
- verifier.assertFilePresent( "target/afterSessionEnd.txt" );
+ // verifier.verifyFilePresent( "target/afterSessionStart.txt" );
+ verifier.verifyFilePresent( "target/afterSessionEnd.txt" );
}
/**
@@ -204,9 +204,9 @@ public class MavenITmng5640LifecycleParticipantAfterSessionEnd
}
verifier.resetStreams();
- verifier.assertFilePresent( "target/afterProjectsRead.txt" );
+ verifier.verifyFilePresent( "target/afterProjectsRead.txt" );
// See https://issues.apache.org/jira/browse/MNG-5641
- // verifier.assertFilePresent( "target/afterSessionStart.txt" );
- verifier.assertFilePresent( "target/afterSessionEnd.txt" );
+ // verifier.verifyFilePresent( "target/afterSessionStart.txt" );
+ verifier.verifyFilePresent( "target/afterSessionEnd.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java
index aa1a565b6..3faef8c75 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java
@@ -58,7 +58,7 @@ public class MavenITmng5663NestedImportScopePomResolutionTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertArtifactPresent( "org.apache.maven.its.mng5663", "c", "0.1", "jar" );
+ verifier.verifyArtifactPresent( "org.apache.maven.its.mng5663", "c", "0.1", "jar" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java
index 0c92ab07b..16896f26d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java
@@ -65,7 +65,7 @@ public class MavenITmng5716ToolchainsTypeTest
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/toolchains.properties" );
+ verifier.verifyFilePresent( "target/toolchains.properties" );
Properties results = verifier.loadProperties( "target/toolchains.properties" );
assertNull( "javac tool should not be found for requested 'fake' toolchain", results.getProperty( "tool.1" ) );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java
index 38ad5be47..3b3c901cf 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java
@@ -53,7 +53,7 @@ public class MavenITmng5742BuildExtensionClassloaderTest
verifier.executeGoal( "validate" );
verifier.resetStreams();
verifier.verifyErrorFreeLog();
- verifier.assertFilePresent( "target/execution-success.txt" );
+ verifier.verifyFilePresent( "target/execution-success.txt" );
String actual = FileUtils.fileRead( new File( projectDir, "target/execution-success.txt" ) );
assertEquals( "executed", actual );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java
index 35d22c0c8..b0f38422d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java
@@ -57,7 +57,7 @@ public class MavenITmng5753CustomMojoExecutionConfiguratorTest
verifier.resetStreams();
verifier.verifyErrorFreeLog();
- verifier.assertFilePresent( configurationFile.getCanonicalPath() );
+ verifier.verifyFilePresent( configurationFile.getCanonicalPath() );
//
// The <name/> element in the original configuration is "ORIGINAL". We want to assert that our
// custom MojoExecutionConfigurator made the transformation of the element from "ORIGINAL" to "TRANSFORMED"
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java
index 6019591bb..9e44a4b8c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java
@@ -31,7 +31,7 @@ public class MavenITmng5774ConfigurationProcessorsTest
// Making sure our configuration processor executes
verifier.verifyTextInLog( "[INFO] ConfigurationProcessorOne.process()" );
// We have a property value injected by our configuration processor. Make sure it's correct
- verifier.assertFilePresent( "target/classes/result.properties" );
+ verifier.verifyFilePresent( "target/classes/result.properties" );
Properties result = verifier.loadProperties( "target/classes/result.properties" );
assertEquals( "yes", result.getProperty( "configurationProcessorContributedValue" ) );
verifier.resetStreams();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java
index e9ca4ce09..5d2638366 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java
@@ -66,15 +66,15 @@ public class MavenITmng6127PluginExecutionConfigurationInterferenceTest
verifier.resetStreams();
verifier.verifyErrorFreeLog();
- verifier.assertFilePresent( modAconfigurationFile.getCanonicalPath() );
+ verifier.verifyFilePresent( modAconfigurationFile.getCanonicalPath() );
String modAactual = FileUtils.fileRead( modAconfigurationFile );
assertEquals( "name=mod-a, secondName=second from components.xml", modAactual );
- verifier.assertFilePresent( modBconfigurationFile.getCanonicalPath() );
+ verifier.verifyFilePresent( modBconfigurationFile.getCanonicalPath() );
String modBactual = FileUtils.fileRead( modBconfigurationFile );
assertEquals( "name=mod-b, secondName=second from components.xml", modBactual );
- verifier.assertFilePresent( modCconfigurationFile.getCanonicalPath() );
+ verifier.verifyFilePresent( modCconfigurationFile.getCanonicalPath() );
String modCactual = FileUtils.fileRead( modCconfigurationFile );
assertEquals( "secondName=second from components.xml", modCactual );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java
index 61395894f..8690e885a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java
@@ -51,7 +51,7 @@ public class MavenITmng6511OptionalProjectSelectionTest extends AbstractMavenInt
verifier.addCliOption( "-pl ?existing-module" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.assertFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
+ verifier.verifyFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
}
public void testSelectExistingOptionalProfileByArtifactId() throws VerificationException
@@ -63,7 +63,7 @@ public class MavenITmng6511OptionalProjectSelectionTest extends AbstractMavenInt
verifier.addCliOption( "-pl ?:existing-module" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.assertFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
+ verifier.verifyFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
}
public void testSelectNonExistingOptionalProfile() throws VerificationException
@@ -75,7 +75,7 @@ public class MavenITmng6511OptionalProjectSelectionTest extends AbstractMavenInt
verifier.addCliOption( "-pl ?non-existing-module" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.assertFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
+ verifier.verifyFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
}
public void testDeselectExistingOptionalProfile() throws VerificationException
@@ -87,7 +87,7 @@ public class MavenITmng6511OptionalProjectSelectionTest extends AbstractMavenInt
verifier.addCliOption( "-pl !?existing-module" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.assertFileNotPresent( "existing-module/target/touch.txt" ); // existing-module should not have been built.
+ verifier.verifyFileNotPresent( "existing-module/target/touch.txt" ); // existing-module should not have been built.
}
public void testDeselectNonExistingOptionalProfile() throws VerificationException
@@ -99,6 +99,6 @@ public class MavenITmng6511OptionalProjectSelectionTest extends AbstractMavenInt
verifier.addCliOption( "-pl !?non-existing-module" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.assertFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
+ verifier.verifyFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java
index da9d9d448..87519c865 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java
@@ -48,11 +48,11 @@ public class MavenITmng7112ProjectsWithNonRecursiveTest
verifier.setLogFileName( "selected-non-recursive.txt" );
verifier.executeGoal( "validate" );
- verifier.assertFileNotPresent( "target/touch.txt" );
- verifier.assertFilePresent( "aggregator-a/target/touch.txt" );
- verifier.assertFileNotPresent( "aggregator-a/module-a/target/touch.txt" );
- verifier.assertFilePresent( "aggregator-b/target/touch.txt" );
- verifier.assertFileNotPresent( "aggregator-b/module-b/target/touch.txt" );
+ verifier.verifyFileNotPresent( "target/touch.txt" );
+ verifier.verifyFilePresent( "aggregator-a/target/touch.txt" );
+ verifier.verifyFileNotPresent( "aggregator-a/module-a/target/touch.txt" );
+ verifier.verifyFilePresent( "aggregator-b/target/touch.txt" );
+ verifier.verifyFileNotPresent( "aggregator-b/module-b/target/touch.txt" );
}
public void testAggregatesCanBeDeselectedNonRecursively()
@@ -69,10 +69,10 @@ public class MavenITmng7112ProjectsWithNonRecursiveTest
verifier.setLogFileName( "excluded-non-recursive.txt" );
verifier.executeGoal( "validate" );
- verifier.assertFilePresent( "target/touch.txt" );
- verifier.assertFileNotPresent( "aggregator-a/target/touch.txt" );
- verifier.assertFilePresent( "aggregator-a/module-a/target/touch.txt" );
- verifier.assertFileNotPresent( "aggregator-b/target/touch.txt" );
- verifier.assertFilePresent( "aggregator-b/module-b/target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
+ verifier.verifyFileNotPresent( "aggregator-a/target/touch.txt" );
+ verifier.verifyFilePresent( "aggregator-a/module-a/target/touch.txt" );
+ verifier.verifyFileNotPresent( "aggregator-b/target/touch.txt" );
+ verifier.verifyFilePresent( "aggregator-b/module-b/target/touch.txt" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java
index ffba5d970..2769281a8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java
@@ -59,9 +59,9 @@ public class MavenITmng7390SelectModuleOutsideCwdTest extends AbstractMavenInteg
verifier.addCliOption( ":module-b" );
verifier.setLogFileName( "log-module-by-coordinate.txt" );
verifier.executeGoal( "validate" );
- verifier.assertFileNotPresent( "target/touch.txt" );
- verifier.assertFileNotPresent( "../target/touch.txt" );
- verifier.assertFilePresent( "../module-b/target/touch.txt" );
+ verifier.verifyFileNotPresent( "target/touch.txt" );
+ verifier.verifyFileNotPresent( "../target/touch.txt" );
+ verifier.verifyFilePresent( "../module-b/target/touch.txt" );
}
public void testSelectMultipleModulesByCoordinate() throws Exception
@@ -72,9 +72,9 @@ public class MavenITmng7390SelectModuleOutsideCwdTest extends AbstractMavenInteg
verifier.addCliOption( ":module-b,:module-a" );
verifier.setLogFileName( "log-modules-by-coordinate.txt" );
verifier.executeGoal( "validate" );
- verifier.assertFilePresent( "target/touch.txt" );
- verifier.assertFileNotPresent( "../target/touch.txt" );
- verifier.assertFilePresent( "../module-b/target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
+ verifier.verifyFileNotPresent( "../target/touch.txt" );
+ verifier.verifyFilePresent( "../module-b/target/touch.txt" );
}
public void testSelectModuleByRelativePath() throws Exception
@@ -85,9 +85,9 @@ public class MavenITmng7390SelectModuleOutsideCwdTest extends AbstractMavenInteg
verifier.addCliOption( "../module-b" );
verifier.setLogFileName( "log-module-by-relative-path.txt" );
verifier.executeGoal( "validate" );
- verifier.assertFileNotPresent( "target/touch.txt" );
- verifier.assertFileNotPresent( "../target/touch.txt" );
- verifier.assertFilePresent( "../module-b/target/touch.txt" );
+ verifier.verifyFileNotPresent( "target/touch.txt" );
+ verifier.verifyFileNotPresent( "../target/touch.txt" );
+ verifier.verifyFilePresent( "../module-b/target/touch.txt" );
}
public void testSelectModulesByRelativePath() throws Exception
@@ -98,9 +98,9 @@ public class MavenITmng7390SelectModuleOutsideCwdTest extends AbstractMavenInteg
verifier.addCliOption( "../module-b,." );
verifier.setLogFileName( "log-modules-by-relative-path.txt" );
verifier.executeGoal( "validate" );
- verifier.assertFilePresent( "target/touch.txt" );
- verifier.assertFileNotPresent( "../target/touch.txt" );
- verifier.assertFilePresent( "../module-b/target/touch.txt" );
+ verifier.verifyFilePresent( "target/touch.txt" );
+ verifier.verifyFileNotPresent( "../target/touch.txt" );
+ verifier.verifyFilePresent( "../module-b/target/touch.txt" );
}
/**
@@ -123,9 +123,9 @@ public class MavenITmng7390SelectModuleOutsideCwdTest extends AbstractMavenInteg
}
catch ( VerificationException e )
{
- verifier.assertFileNotPresent( "target/touch.txt" );
- verifier.assertFileNotPresent( "../target/touch.txt" );
- verifier.assertFileNotPresent( "../module-b/target/touch.txt" );
+ verifier.verifyFileNotPresent( "target/touch.txt" );
+ verifier.verifyFileNotPresent( "../target/touch.txt" );
+ verifier.verifyFileNotPresent( "../module-b/target/touch.txt" );
}
}
}
diff --git a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
index 672a14ac4..7586377d3 100644
--- a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
+++ b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
@@ -19,27 +19,22 @@ package org.apache.maven.it;
* under the License.
*/
-import junit.framework.TestCase;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.shared.utils.io.FileUtils;
-
import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import junit.framework.TestCase;
+import org.apache.maven.artifact.versioning.ArtifactVersion;
+import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.shared.utils.io.FileUtils;
+
/**
* @author Jason van Zyl
* @author Kenney Westerhof
@@ -592,12 +587,6 @@ public abstract class AbstractMavenIntegrationTestCase
}
}
- if ( matchesVersionRange( "(3.2.5,)" ) )
- {
- String multiModuleProjectDirectory = findMultiModuleProjectDirectory( basedir );
- verifier.getSystemProperties().put( "maven.multiModuleProjectDirectory", multiModuleProjectDirectory );
- }
-
try
{
// Java7 TLS protocol
@@ -630,36 +619,6 @@ public abstract class AbstractMavenIntegrationTestCase
return verifier;
}
- private boolean hasDotMvnSubDirectory( Path path )
- {
- final Path probablySubDirectory = path.resolve( ".mvn" );
- return Files.exists( probablySubDirectory ) && Files.isDirectory( probablySubDirectory );
- }
-
- private String findMultiModuleProjectDirectory( String basedir )
- {
- Path path = Paths.get( basedir );
- Path result = path;
-
- Collection<Path> fileSystemRoots = new ArrayList<>();
- for ( Path root : path.getFileSystem().getRootDirectories() )
- {
- fileSystemRoots.add( root );
- }
-
- while ( !fileSystemRoots.contains( path ) )
- {
- if ( hasDotMvnSubDirectory( path ) )
- {
- result = path;
- break;
- }
- path = path.getParent();
- }
-
- return result.toString();
- }
-
public static void assertCanonicalFileEquals( String message, File expected, File actual )
throws IOException
{
diff --git a/pom.xml b/pom.xml
index cbfea5232..da95bc914 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-verifier</artifactId>
- <version>1.7.2</version>
+ <version>1.8.0</version>
</dependency>
</dependencies>
</dependencyManagement>