Author: rfscholte
Date: Tue Aug 4 19:18:25 2015
New Revision: 1694098
URL: http://svn.apache.org/r1694098
Log:
Rename PatternArtifactFilterTCK to AbstractPatternArtifactFilterTest and let
TCK users extend it to ensure that always all tests are called.
Added:
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/AbstractPatternArtifactFilterTest.java
- copied, changed from r1685428,
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternArtifactFilterTCK.java
Removed:
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternArtifactFilterTCK.java
Modified:
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternExcludesArtifactFilterTest.java
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilterTest.java
Copied:
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/AbstractPatternArtifactFilterTest.java
(from r1685428,
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternArtifactFilterTCK.java)
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/AbstractPatternArtifactFilterTest.java?p2=maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/AbstractPatternArtifactFilterTest.java&p1=maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternArtifactFilterTCK.java&r1=1685428&r2=1694098&rev=1694098&view=diff
==============================================================================
---
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternArtifactFilterTCK.java
(original)
+++
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/AbstractPatternArtifactFilterTest.java
Tue Aug 4 19:18:25 2015
@@ -31,7 +31,7 @@ import org.apache.maven.artifact.resolve
import static org.easymock.EasyMock.*;
-public abstract class PatternArtifactFilterTCK
+public abstract class AbstractPatternArtifactFilterTest
extends TestCase
{
Modified:
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternExcludesArtifactFilterTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternExcludesArtifactFilterTest.java?rev=1694098&r1=1694097&r2=1694098&view=diff
==============================================================================
---
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternExcludesArtifactFilterTest.java
(original)
+++
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternExcludesArtifactFilterTest.java
Tue Aug 4 19:18:25 2015
@@ -21,155 +21,28 @@ package org.apache.maven.shared.artifact
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
public class PatternExcludesArtifactFilterTest
- extends TestCase
+ extends AbstractPatternArtifactFilterTest
{
- private final PatternArtifactFilterTCK tck = new PatternArtifactFilterTCK()
- {
-
- @Override
- protected ArtifactFilter createFilter( final List<String> patterns )
- {
- return new PatternExcludesArtifactFilter( patterns );
- }
-
- @Override
- protected ArtifactFilter createFilter( final List<String> patterns,
final boolean actTransitively )
- {
- return new PatternExcludesArtifactFilter( patterns,
actTransitively );
- }
-
- @Override
- protected boolean isInclusionExpected()
- {
- return false;
- }
-
- };
-
- public void testShouldTriggerBothPatternsWithNonColonWildcards()
- {
- tck.testShouldTriggerBothPatternsWithNonColonWildcards();
- }
-
- public void
testIncludeWhenPatternMatchesDepTrailWithTransitivityUsingNonColonWildcard()
- {
-
tck.testIncludeWhenPatternMatchesDepTrailWithTransitivityUsingNonColonWildcard();
- }
-
- public void testShouldTriggerBothPatternsWithWildcards()
- {
- tck.testShouldTriggerBothPatternsWithWildcards();
- }
-
- public void
testShouldNotIncludeDirectlyMatchedArtifactByDependencyConflictId()
- {
- tck.testShouldIncludeDirectlyMatchedArtifactByDependencyConflictId();
- }
-
- public void
testShouldNotIncludeDirectlyMatchedArtifactByGroupIdArtifactId()
- {
- tck.testShouldIncludeDirectlyMatchedArtifactByGroupIdArtifactId();
- }
-
- public void
testShouldNotIncludeWhenPatternMatchesDependencyTrailAndTransitivityIsEnabled()
- {
-
tck.testShouldIncludeWhenPatternMatchesDependencyTrailAndTransitivityIsEnabled();
- }
-
- public void testShouldIncludeWhenArtifactIdDiffers()
- {
- tck.testShouldNotIncludeWhenArtifactIdDiffers();
- }
-
- public void testShouldIncludeWhenBothIdElementsDiffer()
- {
- tck.testShouldNotIncludeWhenBothIdElementsDiffer();
- }
-
- public void testShouldIncludeWhenGroupIdDiffers()
- {
- tck.testShouldNotIncludeWhenGroupIdDiffers();
- }
-
- public void testShouldIncludeWhenNegativeMatch()
- {
- tck.testShouldNotIncludeWhenNegativeMatch();
- }
-
- public void testShouldNotIncludeWhenWildcardMatchesInsideSequence()
- {
- tck.testShouldIncludeWhenWildcardMatchesInsideSequence();
- }
-
- public void testShouldIncludeWhenWildcardMatchesOutsideSequence()
- {
- tck.testShouldIncludeWhenWildcardMatchesOutsideSequence();
- }
-
- public void
testShouldIncludeTransitiveDependencyWhenWildcardMatchesButDoesntMatchParent()
- {
-
tck.testShouldIncludeTransitiveDependencyWhenWildcardMatchesButDoesntMatchParent();
- }
-
- public void testShouldIncludeWhenWildcardMatchesMiddleOfArtifactId()
- {
- tck.testShouldIncludeWhenWildcardMatchesMiddleOfArtifactId();
- }
-
- public void
testShouldIncludeWhenWildcardCoversPartOfGroupIdAndEverythingElse()
- {
-
tck.testShouldIncludeWhenWildcardCoversPartOfGroupIdAndEverythingElse();
- }
-
- public void testShouldIncludeDirectlyMatchedArtifactByGroupIdArtifactId()
- {
- tck.testShouldIncludeDirectlyMatchedArtifactByGroupIdArtifactId();
- }
-
- public void
testShouldIncludeDirectlyMatchedArtifactByDependencyConflictId()
- {
- tck.testShouldIncludeDirectlyMatchedArtifactByDependencyConflictId();
- }
-
- public void testShouldNotIncludeWhenGroupIdDiffers()
- {
- tck.testShouldNotIncludeWhenGroupIdDiffers();
- }
-
- public void testShouldNotIncludeWhenArtifactIdDiffers()
- {
- tck.testShouldNotIncludeWhenArtifactIdDiffers();
- }
-
- public void testShouldNotIncludeWhenBothIdElementsDiffer()
- {
- tck.testShouldNotIncludeWhenBothIdElementsDiffer();
- }
-
- public void
testShouldIncludeWhenPatternMatchesDependencyTrailAndTransitivityIsEnabled()
+ @Override
+ protected ArtifactFilter createFilter( final List<String> patterns )
{
-
tck.testShouldIncludeWhenPatternMatchesDependencyTrailAndTransitivityIsEnabled();
+ return new PatternExcludesArtifactFilter( patterns );
}
- public void testShouldNotIncludeWhenNegativeMatch()
+ @Override
+ protected ArtifactFilter createFilter( final List<String> patterns, final
boolean actTransitively )
{
- tck.testShouldNotIncludeWhenNegativeMatch();
+ return new PatternExcludesArtifactFilter( patterns, actTransitively );
}
- public void testShouldIncludeWhenWildcardMatchesInsideSequence()
+ @Override
+ protected boolean isInclusionExpected()
{
- tck.testShouldIncludeWhenWildcardMatchesInsideSequence();
+ return false;
}
- // See comment in TCK.
- // public void
testShouldIncludeDirectDependencyWhenInvertedWildcardMatchesButDoesntMatchTransitiveChild()
- // {
- //
tck.testShouldIncludeDirectDependencyWhenInvertedWildcardMatchesButDoesntMatchTransitiveChild();
- // }
}
Modified:
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilterTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilterTest.java?rev=1694098&r1=1694097&r2=1694098&view=diff
==============================================================================
---
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilterTest.java
(original)
+++
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilterTest.java
Tue Aug 4 19:18:25 2015
@@ -21,114 +21,26 @@ package org.apache.maven.shared.artifact
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
public class PatternIncludesArtifactFilterTest
- extends TestCase
+ extends AbstractPatternArtifactFilterTest
{
- private final PatternArtifactFilterTCK tck = new PatternArtifactFilterTCK()
- {
-
- @Override
- protected ArtifactFilter createFilter( final List<String> patterns )
- {
- return new PatternIncludesArtifactFilter( patterns );
- }
-
- @Override
- protected ArtifactFilter createFilter( final List<String> patterns,
final boolean actTransitively )
- {
- return new PatternIncludesArtifactFilter( patterns,
actTransitively );
- }
-
- @Override
- protected boolean isInclusionExpected()
- {
- return true;
- }
-
- };
-
- public void testShouldTriggerBothPatternsWithNonColonWildcards()
- {
- tck.testShouldTriggerBothPatternsWithNonColonWildcards();
- }
-
- public void testShouldTriggerBothPatternsWithWildcards()
- {
- tck.testShouldTriggerBothPatternsWithWildcards();
- }
-
- public void
testShouldIncludeDirectlyMatchedArtifactByDependencyConflictId()
- {
- tck.testShouldIncludeDirectlyMatchedArtifactByDependencyConflictId();
- }
-
- public void testShouldIncludeDirectlyMatchedArtifactByGroupIdArtifactId()
- {
- tck.testShouldIncludeDirectlyMatchedArtifactByGroupIdArtifactId();
- }
-
- public void
testShouldIncludeWhenPatternMatchesDependencyTrailAndTransitivityIsEnabled()
- {
-
tck.testShouldIncludeWhenPatternMatchesDependencyTrailAndTransitivityIsEnabled();
- }
-
- public void
testIncludeWhenPatternMatchesDepTrailWithTransitivityUsingNonColonWildcard()
+ @Override
+ protected ArtifactFilter createFilter( final List<String> patterns )
{
-
tck.testIncludeWhenPatternMatchesDepTrailWithTransitivityUsingNonColonWildcard();
+ return new PatternIncludesArtifactFilter( patterns );
}
- public void testShouldNotIncludeWhenArtifactIdDiffers()
+ @Override
+ protected ArtifactFilter createFilter( final List<String> patterns, final
boolean actTransitively )
{
- tck.testShouldNotIncludeWhenArtifactIdDiffers();
+ return new PatternIncludesArtifactFilter( patterns, actTransitively );
}
- public void testShouldNotIncludeWhenBothIdElementsDiffer()
+ @Override
+ protected boolean isInclusionExpected()
{
- tck.testShouldNotIncludeWhenBothIdElementsDiffer();
+ return true;
}
-
- public void testShouldNotIncludeWhenGroupIdDiffers()
- {
- tck.testShouldNotIncludeWhenGroupIdDiffers();
- }
-
- public void testShouldNotIncludeWhenNegativeMatch()
- {
- tck.testShouldNotIncludeWhenNegativeMatch();
- }
-
- public void testShouldIncludeWhenWildcardMatchesInsideSequence()
- {
- tck.testShouldIncludeWhenWildcardMatchesInsideSequence();
- }
-
- public void testShouldIncludeWhenWildcardMatchesOutsideSequence()
- {
- tck.testShouldIncludeWhenWildcardMatchesOutsideSequence();
- }
-
- public void
testShouldIncludeTransitiveDependencyWhenWildcardMatchesButDoesntMatchParent()
- {
-
tck.testShouldIncludeTransitiveDependencyWhenWildcardMatchesButDoesntMatchParent();
- }
-
- public void testShouldIncludeWhenWildcardMatchesMiddleOfArtifactId()
- {
- tck.testShouldIncludeWhenWildcardMatchesMiddleOfArtifactId();
- }
-
- public void
testShouldIncludeWhenWildcardCoversPartOfGroupIdAndEverythingElse()
- {
-
tck.testShouldIncludeWhenWildcardCoversPartOfGroupIdAndEverythingElse();
- }
-
- // See comment in TCK.
- // public void
testShouldIncludeDirectDependencyWhenInvertedWildcardMatchesButDoesntMatchTransitiveChild()
- // {
- //
tck.testShouldIncludeDirectDependencyWhenInvertedWildcardMatchesButDoesntMatchTransitiveChild();
- // }
}
