You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by mi...@apache.org on 2003/05/30 17:12:34 UTC
cvs commit: maven-new/core/src/test/org/apache/maven/artifact/handlers JarHandlerTest.java
michal 2003/05/30 08:12:34
Modified: core/src/test/org/apache/maven/artifact/handlers
JarHandlerTest.java
Log:
Test fixed
Revision Changes Path
1.2 +35 -28 maven-new/core/src/test/org/apache/maven/artifact/handlers/JarHandlerTest.java
Index: JarHandlerTest.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/test/org/apache/maven/artifact/handlers/JarHandlerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JarHandlerTest.java 30 May 2003 11:26:53 -0000 1.1
+++ JarHandlerTest.java 30 May 2003 15:12:34 -0000 1.2
@@ -56,8 +56,6 @@
* ====================================================================
*/
-
-
import java.io.File;
import org.apache.maven.MavenConstants;
@@ -75,7 +73,7 @@
{
private ProjectBuilder projectBuilder = null;
-
+
private ArtifactFactory artifactFactory = null;
/**
@@ -94,7 +92,7 @@
{
super.setUp();
projectBuilder = (ProjectBuilder) lookup(ProjectBuilder.ROLE);
- ArtifactFactory artifactFactory = ( ArtifactFactory ) lookup( ArtifactFactory.ROLE );
+ artifactFactory = (ArtifactFactory) lookup(ArtifactFactory.ROLE);
}
@@ -109,19 +107,19 @@
Project project = null;
try
{
- project = projectBuilder.build(new File( getTestFile(file) ));
+ project = projectBuilder.build(new File(getTestFile(file)));
}
catch (Exception e)
{
String msg = "Cannot get project sample: " + e.getMessage();
fail(msg);
}
- System.out.println( "project:" + project );
-
+ System.out.println("project:" + project);
+
try
{
- artifactFactory.createArtifacts( project );
- }
+ artifactFactory.createArtifacts(project);
+ }
catch (Exception e)
{
String msg =
@@ -133,27 +131,36 @@
}
+ /**
+ * Tests if artifats were added to GLOBAL classpath
+ *
+ */
public void testProcessing()
{
- Project project = getProject( "src/test-input/project.xml");
- Artifact testA = (Artifact) project.getArtifacts().get(0);
- Artifact testB = (Artifact) project.getArtifacts().get(1);
-
- JarHandler jarHandler = new JarHandler();
-
-
- jarHandler.process( testA, project );
- jarHandler.process( testB, project );
-
- String classpath = project.getClassPath(MavenConstants.GLOBAL_DEPENDENCY_CLASSPATH);
- System.out.println( classpath );
-
- boolean hasEntryForA = classpath.indexOf( testA.getPath() ) != -1 ;
- boolean hasEntryForB = classpath.indexOf( testB.getPath() ) != -1 ;
- assertTrue("Classpath does not contain entry for:" + testA, hasEntryForA );
- assertTrue("Classpath does not contain entry for:" + testA, hasEntryForB );
-
+ Project project = getProject("src/test-input/project.xml");
+
+ Artifact testA = (Artifact) project.getArtifacts().get(0);
+ Artifact testB = (Artifact) project.getArtifacts().get(1);
+
+ JarHandler jarHandler = new JarHandler();
+
+ jarHandler.process(testA, project);
+ jarHandler.process(testB, project);
+
+ String classpath =
+ project.getClassPath(MavenConstants.GLOBAL_DEPENDENCY_CLASSPATH);
+
+ boolean hasEntryForA =
+ classpath.indexOf(testA.getFile().getName()) != -1;
+ boolean hasEntryForB =
+ classpath.indexOf(testB.getFile().getName()) != -1;
+ assertTrue(
+ "Classpath does not contain entry for:" + testA,
+ hasEntryForA);
+ assertTrue(
+ "Classpath does not contain entry for:" + testA,
+ hasEntryForB);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org