You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by fg...@apache.org on 2006/12/16 16:26:44 UTC
svn commit: r487810 - in /maven/sandbox/maven-plugin-testing-tools: ./
pom.xml
src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java
Author: fgiust
Date: Sat Dec 16 07:26:44 2006
New Revision: 487810
URL: http://svn.apache.org/viewvc?view=rev&rev=487810
Log:
fix a failing test on windows (path separator), move to a released version of maven-invoker
Modified:
maven/sandbox/maven-plugin-testing-tools/ (props changed)
maven/sandbox/maven-plugin-testing-tools/pom.xml
maven/sandbox/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java
Propchange: maven/sandbox/maven-plugin-testing-tools/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 16 07:26:44 2006
@@ -0,0 +1 @@
+target
Modified: maven/sandbox/maven-plugin-testing-tools/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/maven-plugin-testing-tools/pom.xml?view=diff&rev=487810&r1=487809&r2=487810
==============================================================================
--- maven/sandbox/maven-plugin-testing-tools/pom.xml (original)
+++ maven/sandbox/maven-plugin-testing-tools/pom.xml Sat Dec 16 07:26:44 2006
@@ -1,13 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
<version>4-SNAPSHOT</version>
</parent>
-
<artifactId>maven-plugin-testing-tools</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Maven Plugin Testing Tools</name>
@@ -41,7 +39,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-invoker</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0.5</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
Modified: maven/sandbox/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java?view=diff&rev=487810&r1=487809&r2=487810
==============================================================================
--- maven/sandbox/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java (original)
+++ maven/sandbox/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java Sat Dec 16 07:26:44 2006
@@ -6,6 +6,7 @@
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
import org.apache.maven.shared.test.plugin.ProjectTool.PomInfo;
import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.util.Collection;
@@ -30,14 +31,16 @@
public void testPackageProjectArtifact_ShouldPopulateArtifactFileWithJarLocation() throws Exception
{
ProjectTool tool = (ProjectTool) lookup( ProjectTool.ROLE, "default" );
-
+
File pomFile = new File( "pom.xml" );
-
+
MavenProject project = tool.packageProjectArtifact( pomFile, "test", true );
-
- String path = "target/maven-plugin-testing-tools-test.jar";
- assertEquals( path, project.getArtifact().getFile().getPath() );
+ String expectedPath = "target/maven-plugin-testing-tools-test.jar";
+ // be nice with windows
+ String actualPath = StringUtils.replace( project.getArtifact().getFile().getPath(), "\\", "/" );
+
+ assertEquals( expectedPath, actualPath );
}
public void testPackageProjectArtifact_ShouldPopulateWithCorrectArtifactAndMetadata() throws Exception