You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2015/06/24 00:07:17 UTC
svn commit: r1687142 - in
/maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter:
collection/ resolve/transform/
Author: rfscholte
Date: Tue Jun 23 22:07:16 2015
New Revision: 1687142
URL: http://svn.apache.org/r1687142
Log:
Add tests to verify that transformed filters are processed correctly
Modified:
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestFilterArtifacts.java
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformerTest.java
maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformerTest.java
Modified: maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestFilterArtifacts.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestFilterArtifacts.java?rev=1687142&r1=1687141&r2=1687142&view=diff
==============================================================================
--- maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestFilterArtifacts.java (original)
+++ maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestFilterArtifacts.java Tue Jun 23 22:07:16 2015
@@ -58,7 +58,7 @@ public class TestFilterArtifacts
FileUtils.deleteDirectory( outputFolder );
ArtifactStubFactory fact = new ArtifactStubFactory( outputFolder, false );
- @SuppressWarnings( "unchecked" )
+
Set<Artifact> artifacts = fact.getReleaseAndSnapshotArtifacts();
FilterArtifacts fa = new FilterArtifacts();
@@ -120,7 +120,7 @@ public class TestFilterArtifacts
File outputFolder = new File( "target/filters/" );
FileUtils.deleteDirectory( outputFolder );
ArtifactStubFactory fact = new ArtifactStubFactory( outputFolder, false );
- @SuppressWarnings( "unchecked" )
+
Set<Artifact> artifacts = fact.getClassifiedArtifacts();
FilterArtifacts fa = new FilterArtifacts();
fa.addFilter( new ClassifierFilter( "", "four" ) );
Modified: maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformerTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformerTest.java?rev=1687142&r1=1687141&r2=1687142&view=diff
==============================================================================
--- maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformerTest.java (original)
+++ maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformerTest.java Tue Jun 23 22:07:16 2015
@@ -19,6 +19,8 @@ package org.apache.maven.shared.artifact
* under the License.
*/
+import static org.junit.Assert.*;
+
import java.util.Arrays;
import java.util.Collections;
@@ -29,6 +31,10 @@ import org.apache.maven.shared.artifact.
import org.apache.maven.shared.artifact.filter.resolve.PatternInclusionsFilter;
import org.apache.maven.shared.artifact.filter.resolve.ScopeFilter;
import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.graph.DefaultDependencyNode;
+import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.graph.DependencyNode;
import org.eclipse.aether.util.filter.AndDependencyFilter;
import org.eclipse.aether.util.filter.ExclusionsDependencyFilter;
import org.eclipse.aether.util.filter.OrDependencyFilter;
@@ -39,24 +45,36 @@ import org.junit.Test;
public class EclipseAetherFilterTransformerTest
{
-
private EclipseAetherFilterTransformer transformer = new EclipseAetherFilterTransformer();
@Test
public void testTransformAndFilter()
{
- AndFilter filter = new AndFilter( Arrays.<TransformableFilter>asList( ScopeFilter.including( "compile" ),
- ScopeFilter.including( "test" ) ) );
+ AndFilter filter = new AndFilter(
+ Arrays.<TransformableFilter>asList( ScopeFilter.including( "compile" ),
+ new ExclusionsFilter( Collections.singletonList( "x:a" ) ) ) );
AndDependencyFilter dependencyFilter = (AndDependencyFilter) filter.transform( transformer );
+
+ assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "compile" ), null ) );
+
+ assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "compile" ), null ) );
+
+ assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "test" ), null ) );
+
+ assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "test" ), null ) );
}
@Test
public void testTransformExclusionsFilter()
{
- ExclusionsFilter filter = new ExclusionsFilter( Collections.singletonList( "runtime" ) );
+ ExclusionsFilter filter = new ExclusionsFilter( Collections.singletonList( "x:a" ) );
ExclusionsDependencyFilter dependencyFilter = (ExclusionsDependencyFilter) filter.transform( transformer );
+
+ assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "compile" ), null ) );
+
+ assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "compile" ), null ) );
}
@Test
@@ -67,6 +85,11 @@ public class EclipseAetherFilterTransfor
OrDependencyFilter dependencyFilter = (OrDependencyFilter) filter.transform( transformer );
+ assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "compile" ), null ) );
+
+ assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "test" ), null ) );
+
+ assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), null ) );
}
@Test
@@ -75,26 +98,45 @@ public class EclipseAetherFilterTransfor
ScopeFilter filter = ScopeFilter.including( Collections.singletonList( "runtime" ) );
ScopeDependencyFilter dependencyFilter = (ScopeDependencyFilter) filter.transform( transformer );
+
+ assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), null ) );
+
+ assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "compile" ), null ) );
+
+ assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "test" ), null ) );
}
@Test
public void testTransformPatternExclusionsFilter()
{
PatternExclusionsFilter filter =
- new PatternExclusionsFilter( Collections.singletonList( "org.apache.maven:*" ) );
+ new PatternExclusionsFilter( Collections.singletonList( "x:*" ) );
PatternExclusionsDependencyFilter dependencyFilter =
(PatternExclusionsDependencyFilter) filter.transform( transformer );
+
+ assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), null ) );
+
+ assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "runtime" ), null ) );
}
@Test
public void testTransformPatternInclusionsFilter()
{
PatternInclusionsFilter filter =
- new PatternInclusionsFilter( Collections.singletonList( "org.apache.maven:*" ) );
+ new PatternInclusionsFilter( Collections.singletonList( "g:*" ) );
PatternInclusionsDependencyFilter dependencyFilter =
(PatternInclusionsDependencyFilter) filter.transform( transformer );
+
+ assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), null ) );
+
+ assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "runtime" ), null ) );
+ }
+
+ private DependencyNode newDependencyNode( String string, String scope )
+ {
+ return new DefaultDependencyNode( new Dependency( new DefaultArtifact( string ), scope ) );
}
}
Modified: maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformerTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformerTest.java?rev=1687142&r1=1687141&r2=1687142&view=diff
==============================================================================
--- maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformerTest.java (original)
+++ maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformerTest.java Tue Jun 23 22:07:16 2015
@@ -19,6 +19,9 @@ package org.apache.maven.shared.artifact
* under the License.
*/
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.Arrays;
import java.util.Collections;
@@ -29,12 +32,16 @@ import org.apache.maven.shared.artifact.
import org.apache.maven.shared.artifact.filter.resolve.PatternInclusionsFilter;
import org.apache.maven.shared.artifact.filter.resolve.ScopeFilter;
import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
+import org.sonatype.aether.graph.Dependency;
+import org.sonatype.aether.graph.DependencyNode;
+import org.sonatype.aether.util.artifact.DefaultArtifact;
import org.sonatype.aether.util.filter.AndDependencyFilter;
import org.sonatype.aether.util.filter.ExclusionsDependencyFilter;
import org.sonatype.aether.util.filter.OrDependencyFilter;
import org.sonatype.aether.util.filter.PatternExclusionsDependencyFilter;
import org.sonatype.aether.util.filter.PatternInclusionsDependencyFilter;
import org.sonatype.aether.util.filter.ScopeDependencyFilter;
+import org.sonatype.aether.util.graph.DefaultDependencyNode;
import org.junit.Test;
public class SonatypeAetherFilterTransformerTest
@@ -45,18 +52,31 @@ public class SonatypeAetherFilterTransfo
@Test
public void testTransformAndFilter()
{
- AndFilter filter = new AndFilter( Arrays.<TransformableFilter>asList( ScopeFilter.including( "compile" ),
- ScopeFilter.including( "test" ) ) );
+ AndFilter filter = new AndFilter(
+ Arrays.<TransformableFilter>asList( ScopeFilter.including( "compile" ),
+ new ExclusionsFilter( Collections.singletonList( "x:a" ) ) ) );
AndDependencyFilter dependencyFilter = (AndDependencyFilter) filter.transform( transformer );
+
+ assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "compile" ), null ) );
+
+ assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "compile" ), null ) );
+
+ assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "test" ), null ) );
+
+ assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "test" ), null ) );
}
@Test
public void testTransformExclusionsFilter()
{
- ExclusionsFilter filter = new ExclusionsFilter( Collections.singletonList( "runtime" ) );
+ ExclusionsFilter filter = new ExclusionsFilter( Collections.singletonList( "x:a" ) );
ExclusionsDependencyFilter dependencyFilter = (ExclusionsDependencyFilter) filter.transform( transformer );
+
+ assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "compile" ), null ) );
+
+ assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "compile" ), null ) );
}
@Test
@@ -67,6 +87,11 @@ public class SonatypeAetherFilterTransfo
OrDependencyFilter dependencyFilter = (OrDependencyFilter) filter.transform( transformer );
+ assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "compile" ), null ) );
+
+ assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "test" ), null ) );
+
+ assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), null ) );
}
@Test
@@ -75,26 +100,45 @@ public class SonatypeAetherFilterTransfo
ScopeFilter filter = ScopeFilter.including( Collections.singletonList( "runtime" ) );
ScopeDependencyFilter dependencyFilter = (ScopeDependencyFilter) filter.transform( transformer );
+
+ assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), null ) );
+
+ assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "compile" ), null ) );
+
+ assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "test" ), null ) );
}
@Test
public void testTransformPatternExclusionsFilter()
{
PatternExclusionsFilter filter =
- new PatternExclusionsFilter( Collections.singletonList( "org.apache.maven:*" ) );
+ new PatternExclusionsFilter( Collections.singletonList( "x:*" ) );
PatternExclusionsDependencyFilter dependencyFilter =
(PatternExclusionsDependencyFilter) filter.transform( transformer );
+
+ assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), null ) );
+
+ assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "runtime" ), null ) );
}
@Test
public void testTransformPatternInclusionsFilter()
{
PatternInclusionsFilter filter =
- new PatternInclusionsFilter( Collections.singletonList( "org.apache.maven:*" ) );
+ new PatternInclusionsFilter( Collections.singletonList( "g:*" ) );
PatternInclusionsDependencyFilter dependencyFilter =
(PatternInclusionsDependencyFilter) filter.transform( transformer );
+
+ assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), null ) );
+
+ assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "runtime" ), null ) );
+ }
+
+ private DependencyNode newDependencyNode( String string, String scope )
+ {
+ return new DefaultDependencyNode( new Dependency( new DefaultArtifact( string ), scope ) );
}
}