You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2011/09/02 20:24:19 UTC
svn commit: r1164664 -
/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
Author: jdcasey
Date: Fri Sep 2 18:24:18 2011
New Revision: 1164664
URL: http://svn.apache.org/viewvc?rev=1164664&view=rev
Log:
removing obsolete annotation
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java?rev=1164664&r1=1164663&r2=1164664&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java Fri Sep 2 18:24:18 2011
@@ -19,6 +19,13 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -41,13 +48,6 @@ import org.codehaus.plexus.logging.Logge
import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.easymock.MockControl;
-import java.util.Collections;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
public class DefaultDependencyResolverTest
extends PlexusTestCase
{
@@ -110,18 +110,13 @@ public class DefaultDependencyResolverTe
assertTrue( info.isResolutionRequired() );
assertFalse( info.isResolvedTransitively() );
- assertTrue( info.getScopeFilter()
- .isIncludeCompileScope() );
- assertTrue( info.getScopeFilter()
- .isIncludeSystemScope() );
-
- assertTrue( info.getScopeFilter()
- .isIncludeProvidedScope() );
-
- assertFalse( info.getScopeFilter()
- .isIncludeRuntimeScope() );
- assertFalse( info.getScopeFilter()
- .isIncludeTestScope() );
+ assertTrue( info.getScopeFilter().isIncludeCompileScope() );
+ assertTrue( info.getScopeFilter().isIncludeSystemScope() );
+
+ assertTrue( info.getScopeFilter().isIncludeProvidedScope() );
+
+ assertFalse( info.getScopeFilter().isIncludeRuntimeScope() );
+ assertFalse( info.getScopeFilter().isIncludeTestScope() );
}
public void test_getModuleSetResolutionRequirements()
@@ -144,23 +139,18 @@ public class DefaultDependencyResolverTe
final MavenProject module1b =
createMavenProject( "group1.b", "module-1b", "1", new File( module1Dir, "module-1b" ) );
- module1.getModel()
- .addModule( module1a.getArtifactId() );
- module1.getModel()
- .addModule( module1b.getArtifactId() );
+ module1.getModel().addModule( module1a.getArtifactId() );
+ module1.getModel().addModule( module1b.getArtifactId() );
final File module2Dir = new File( rootDir, "module-2" );
final MavenProject module2 = createMavenProject( "main-group", "module-2", "1", module2Dir );
final MavenProject module2a =
createMavenProject( "main-group", "module-2a", "1", new File( module2Dir, "module-2a" ) );
- module2.getModel()
- .addModule( module2a.getArtifactId() );
+ module2.getModel().addModule( module2a.getArtifactId() );
- project.getModel()
- .addModule( module1.getArtifactId() );
- project.getModel()
- .addModule( module2.getArtifactId() );
+ project.getModel().addModule( module1.getArtifactId() );
+ project.getModel().addModule( module2.getArtifactId() );
final List<MavenProject> allProjects = new ArrayList<MavenProject>();
allProjects.add( project );
@@ -236,18 +226,13 @@ public class DefaultDependencyResolverTe
assertTrue( enabledProjects.contains( module2a ) );
// these are the two we directly set above.
- assertTrue( info.getScopeFilter()
- .isIncludeTestScope() );
- assertTrue( info.getScopeFilter()
- .isIncludeCompileScope() );
+ assertTrue( info.getScopeFilter().isIncludeTestScope() );
+ assertTrue( info.getScopeFilter().isIncludeCompileScope() );
// this combination should be implied by the two direct scopes set above.
- assertTrue( info.getScopeFilter()
- .isIncludeRuntimeScope() );
- assertTrue( info.getScopeFilter()
- .isIncludeProvidedScope() );
- assertTrue( info.getScopeFilter()
- .isIncludeSystemScope() );
+ assertTrue( info.getScopeFilter().isIncludeRuntimeScope() );
+ assertTrue( info.getScopeFilter().isIncludeProvidedScope() );
+ assertTrue( info.getScopeFilter().isIncludeSystemScope() );
mm.verifyAll();
}
@@ -279,18 +264,13 @@ public class DefaultDependencyResolverTe
assertTrue( info.isResolutionRequired() );
- assertTrue( info.getScopeFilter()
- .isIncludeCompileScope() );
- assertTrue( info.getScopeFilter()
- .isIncludeSystemScope() );
-
- assertTrue( info.getScopeFilter()
- .isIncludeProvidedScope() );
-
- assertFalse( info.getScopeFilter()
- .isIncludeRuntimeScope() );
- assertFalse( info.getScopeFilter()
- .isIncludeTestScope() );
+ assertTrue( info.getScopeFilter().isIncludeCompileScope() );
+ assertTrue( info.getScopeFilter().isIncludeSystemScope() );
+
+ assertTrue( info.getScopeFilter().isIncludeProvidedScope() );
+
+ assertFalse( info.getScopeFilter().isIncludeRuntimeScope() );
+ assertFalse( info.getScopeFilter().isIncludeTestScope() );
}
public void test_aggregateRemoteArtifactRepositories()
@@ -318,7 +298,6 @@ public class DefaultDependencyResolverTe
final MavenProject project = createMavenProject( "group", "artifact", "1", new File( "base" ) );
project.setRemoteArtifactRepositories( projectRepos );
- @SuppressWarnings( "unchecked" )
final List<ArtifactRepository> aggregated =
new DefaultDependencyResolver( resolver, metadataSource, factory, collector, logger ).aggregateRemoteArtifactRepositories( externalRepos,
Collections.singleton( project ) );