This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch MNG-7035-maven5 in repository https://gitbox.apache.org/repos/asf/maven.git
commit d8692416ffa2029581b6f771a75704f5a6ee2495 Author: Guillaume Nodet <[email protected]> AuthorDate: Fri Jan 8 14:06:23 2021 +0100 Use @Ignore for disabled tests --- .../resolver/DefaultArtifactCollectorTest.java | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java index 0cad366..80de492 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java @@ -101,8 +101,9 @@ public class DefaultArtifactCollectorTest super.tearDown(); } - // works, but we don't fail on cycles presently - public void disabledtestCircularDependencyNotIncludingCurrentProject() + @Test + @Ignore("works, but we don't fail on cycles presently") + public void testCircularDependencyNotIncludingCurrentProject() throws ArtifactResolutionException, InvalidVersionSpecificationException { ArtifactSpec a = createArtifactSpec( "a", "1.0" ); @@ -113,8 +114,9 @@ public class DefaultArtifactCollectorTest () -> collect( a ) ); } - // works, but we don't fail on cycles presently - public void disabledtestCircularDependencyIncludingCurrentProject() + @Test + @Ignore("works, but we don't fail on cycles presently") + public void testCircularDependencyIncludingCurrentProject() throws ArtifactResolutionException, InvalidVersionSpecificationException { ArtifactSpec a = createArtifactSpec( "a", "1.0" ); @@ -164,7 +166,9 @@ public class DefaultArtifactCollectorTest assertEquals( "Check version", "1.0", getArtifact( "c", res.getArtifacts() ).getVersion() ); } - public void disabledtestResolveCorrectDependenciesWhenDifferentDependenciesOnNewest() + @Test + @Ignore + public void testResolveCorrectDependenciesWhenDifferentDependenciesOnNewest() throws ArtifactResolutionException, InvalidVersionSpecificationException { // TODO use newest conflict resolver @@ -183,7 +187,9 @@ public class DefaultArtifactCollectorTest assertEquals( "Check version", "2.0", getArtifact( "c", res.getArtifacts() ).getVersion() ); } - public void disabledtestResolveCorrectDependenciesWhenDifferentDependenciesOnNewestVersionReplaced() + @Test + @Ignore + public void testResolveCorrectDependenciesWhenDifferentDependenciesOnNewestVersionReplaced() throws ArtifactResolutionException, InvalidVersionSpecificationException { // TODO use newest conflict resolver @@ -671,7 +677,9 @@ public class DefaultArtifactCollectorTest assertEquals( "Check version", "1.0", artifact.getVersion() ); } - public void disabledtestOptionalNotTransitiveButVersionIsInfluential() + @Test + @Ignore + public void testOptionalNotTransitiveButVersionIsInfluential() throws ArtifactResolutionException, InvalidVersionSpecificationException { ArtifactSpec a = createArtifactSpec( "a", "1.0" );
