You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/12/22 00:11:22 UTC

svn commit: r728549 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java

Author: bentmann
Date: Sun Dec 21 15:11:22 2008
New Revision: 728549

URL: http://svn.apache.org/viewvc?rev=728549&view=rev
Log:
o Fixed test to access existing drive
o Fixed argument order for assert*()

Modified:
    maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java?rev=728549&r1=728548&r2=728549&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java Sun Dec 21 15:11:22 2008
@@ -84,7 +84,7 @@
         String actual = IdeUtils.toRelativeAndFixSeparator( basedir, fileToAdd, false );
         String expected = "D:/ide/workspace/maven/maven-eclipse-plugin/target/main-output";
 
-        assertEquals( actual, expected );
+        assertEquals( expected, actual );
     }
 
     /**
@@ -96,7 +96,8 @@
     public void testToRelativeAndFixSeparator_WhereOnDifferentDrivesAndFileToAddRelative()
         throws Exception
     {
-        if (!Os.isFamily( Os.FAMILY_WINDOWS ) ) {
+        if ( !Os.isFamily( Os.FAMILY_WINDOWS ) )
+        {
             return;
         }
 
@@ -106,7 +107,7 @@
         String actual = IdeUtils.toRelativeAndFixSeparator( basedir, fileToAdd, false );
         String expected = "target/main-output";
 
-        assertEquals( actual, expected );
+        assertEquals( expected, actual );
     }
 
     /**
@@ -123,17 +124,18 @@
     public void testToRelativeAndFixSeparator_MECLIPSE_261()
         throws Exception
     {
-        if (!Os.isFamily( Os.FAMILY_WINDOWS ) ) {
+        if ( !Os.isFamily( Os.FAMILY_WINDOWS ) )
+        {
             return;
         }
 
-        File basedir = new File( "Z:" );
+        File basedir = new File( new File( "" ).getAbsolutePath().substring( 0, 3 ) );
         File fileToAdd = new File( "target/main-output" );
 
         String actual = IdeUtils.toRelativeAndFixSeparator( basedir, fileToAdd, false );
         String expected = "target/main-output";
 
-        assertEquals( actual, expected );
+        assertEquals( expected, actual );
     }
 
 }