Author: olamy
Date: Sun Mar 20 00:09:15 2011
New Revision: 1083346
URL: http://svn.apache.org/viewvc?rev=1083346&view=rev
Log:
more symlink fixes
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java?rev=1083346&r1=1083345&r2=1083346&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
Sun Mar 20 00:09:15 2011
@@ -20,6 +20,7 @@ package org.apache.maven.shared.release.
*/
import org.apache.maven.model.Scm;
+import org.apache.maven.shared.release.phase.AbstractReleaseTestCase;
import org.codehaus.plexus.PlexusTestCase;
import java.io.File;
@@ -55,10 +56,10 @@ public class PropertiesReleaseDescriptor
}
public void testReadFromFileUsingWorkingDirectory()
- throws ReleaseDescriptorStoreException
+ throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- releaseDescriptor.setWorkingDirectory( getTestFile(
"target/test-classes" ).getAbsolutePath() );
+ releaseDescriptor.setWorkingDirectory(
AbstractReleaseTestCase.getPath( getTestFile( "target/test-classes" ) ) );
ReleaseDescriptor config = store.read( releaseDescriptor );
ReleaseDescriptor expected = createExcpectedReleaseConfiguration();
@@ -88,7 +89,7 @@ public class PropertiesReleaseDescriptor
}
public void testMergeFromEmptyFile()
- throws ReleaseDescriptorStoreException
+ throws ReleaseDescriptorStoreException, IOException
{
File file = getTestFile(
"target/test-classes/empty-release.properties" );
@@ -99,7 +100,7 @@ public class PropertiesReleaseDescriptor
}
public void testMergeFromMissingFile()
- throws ReleaseDescriptorStoreException
+ throws ReleaseDescriptorStoreException, IOException
{
File file = getTestFile( "target/test-classes/no-release.properties" );
@@ -126,7 +127,7 @@ public class PropertiesReleaseDescriptor
}
public void testWriteToWorkingDirectory()
- throws ReleaseDescriptorStoreException
+ throws Exception
{
File file = getTestFile( "target/test-classes/new/release.properties"
);
file.delete();
@@ -134,12 +135,12 @@ public class PropertiesReleaseDescriptor
file.getParentFile().mkdirs();
ReleaseDescriptor config = createReleaseConfigurationForWriting();
- config.setWorkingDirectory( file.getParentFile().getAbsolutePath() );
+ config.setWorkingDirectory( AbstractReleaseTestCase.getPath(
file.getParentFile() ) );
store.write( config );
ReleaseDescriptor rereadDescriptor = store.read( file );
- rereadDescriptor.setWorkingDirectory(
file.getParentFile().getAbsolutePath() );
+ rereadDescriptor.setWorkingDirectory( AbstractReleaseTestCase.getPath(
file.getParentFile() ) );
assertEquals( "compare configuration", config, rereadDescriptor );
}
@@ -240,7 +241,7 @@ public class PropertiesReleaseDescriptor
assertTrue( "Check file already exists", file.exists() );
ReleaseDescriptor config = createReleaseConfigurationForWriting();
- config.setWorkingDirectory( file.getParentFile().getAbsolutePath() );
+ config.setWorkingDirectory( AbstractReleaseTestCase.getPath(
file.getParentFile() ) );
store.delete( config );
@@ -256,7 +257,7 @@ public class PropertiesReleaseDescriptor
assertFalse( "Check file already exists", file.exists() );
ReleaseDescriptor config = createReleaseConfigurationForWriting();
- config.setWorkingDirectory( file.getParentFile().getAbsolutePath() );
+ config.setWorkingDirectory( AbstractReleaseTestCase.getPath(
file.getParentFile() ) );
store.delete( config );
@@ -326,13 +327,14 @@ public class PropertiesReleaseDescriptor
}
public ReleaseDescriptor createMergeConfiguration()
+ throws IOException
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
releaseDescriptor.setScmSourceUrl( "scm-url" );
releaseDescriptor.setScmUsername( "username" );
// Not setting other optional SCM settings for brevity
- releaseDescriptor.setWorkingDirectory( getTestFile(
"target/test-working-directory" ).getAbsolutePath() );
+ releaseDescriptor.setWorkingDirectory(
AbstractReleaseTestCase.getPath( getTestFile( "target/test-working-directory" )
) );
// Not setting non-override setting completedPhase
return releaseDescriptor;
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java?rev=1083346&r1=1083345&r2=1083346&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
Sun Mar 20 00:09:15 2011
@@ -21,8 +21,10 @@ package org.apache.maven.shared.release.
import junit.framework.TestCase;
import org.apache.maven.model.Scm;
+import org.apache.maven.shared.release.phase.AbstractReleaseTestCase;
import java.io.File;
+import java.io.IOException;
/**
* ReleaseDescriptor Tester.
@@ -32,7 +34,8 @@ import java.io.File;
public class ReleaseUtilsTest
extends TestCase
{
- public void testMergeConfigurationSourceEmpty()
+ public void testMergeConfigurationSourceEmpty()
+ throws IOException
{
ReleaseDescriptor mergeDescriptor = createReleaseDescriptor();
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
@@ -42,7 +45,8 @@ public class ReleaseUtilsTest
assertEquals( "Check merge", mergedReleaseDescriptor,
mergedMergeDescriptor );
}
- public void testMergeEqualsWithUpdateWorkingCopyTrue()
+ public void testMergeEqualsWithUpdateWorkingCopyTrue()
+ throws IOException
{
ReleaseDescriptor mergeDescriptor = createReleaseDescriptor();
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
@@ -53,7 +57,8 @@ public class ReleaseUtilsTest
assertEquals( "Check merge", mergedReleaseDescriptor,
mergedMergeDescriptor );
}
- public void testMergeConfigurationDestEmpty()
+ public void testMergeConfigurationDestEmpty()
+ throws IOException
{
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
ReleaseDescriptor mergedReleaseDescriptor = ReleaseUtils.merge(
releaseDescriptor, new ReleaseDescriptor() );
@@ -62,12 +67,13 @@ public class ReleaseUtilsTest
assertEquals( "Check merge", expectedDescriptor, releaseDescriptor );
}
- public void testMergeConfiguration()
+ public void testMergeConfiguration()
+ throws IOException
{
File workingDirectory = new File( "." );
ReleaseDescriptor mergeDescriptor =
- createMergeDescriptor( workingDirectory.getAbsolutePath(),
"completed-phase-merge" );
+ createMergeDescriptor( AbstractReleaseTestCase.getPath(
workingDirectory ), "completed-phase-merge" );
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
releaseDescriptor = ReleaseUtils.merge( releaseDescriptor,
mergeDescriptor );
@@ -77,7 +83,8 @@ public class ReleaseUtilsTest
assertEquals( "Check merge", expected, releaseDescriptor );
}
- public void testEquals()
+ public void testEquals()
+ throws IOException
{
ReleaseDescriptor originalReleaseDescriptor =
createReleaseDescriptor();
ReleaseDescriptor releaseDescriptor = copyReleaseDescriptor(
originalReleaseDescriptor );
@@ -99,7 +106,8 @@ public class ReleaseUtilsTest
}
private static void doEqualsAssertions( ReleaseDescriptor
releaseDescriptor,
- ReleaseDescriptor
originalReleaseDescriptor, String other, File otherFile )
+ ReleaseDescriptor
originalReleaseDescriptor, String other, File otherFile )
+ throws IOException
{
ReleaseDescriptor origConfig = originalReleaseDescriptor;
ReleaseDescriptor config = releaseDescriptor;
@@ -167,7 +175,7 @@ public class ReleaseUtilsTest
if ( otherFile != null )
{
- config.setWorkingDirectory( otherFile.getAbsolutePath() );
+ config.setWorkingDirectory( AbstractReleaseTestCase.getPath(
otherFile ) );
assertFalse( "Check original comparison", config.equals(
origConfig ) );
}
@@ -229,7 +237,8 @@ public class ReleaseUtilsTest
assertFalse( "Check original comparison", config.equals( origConfig )
);
}
- public void testHashCode()
+ public void testHashCode()
+ throws IOException
{
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
@@ -271,10 +280,11 @@ public class ReleaseUtilsTest
}
private static ReleaseDescriptor createReleaseDescriptor()
+ throws IOException
{
File workingDirectory = new File( "." );
- return createReleaseDescriptor( workingDirectory.getAbsolutePath() );
+ return createReleaseDescriptor(AbstractReleaseTestCase.getPath(
workingDirectory ) );
}
private static ReleaseDescriptor createReleaseDescriptor( String
workingDirectory )
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java?rev=1083346&r1=1083345&r2=1083346&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
Sun Mar 20 00:09:15 2011
@@ -356,4 +356,10 @@ public abstract class AbstractReleaseTes
}
return "file://" + getTestFile( "src/test/remote-repository"
).getCanonicalPath().replace( '\\', '/' );
}
+
+ public static String getPath( File file )
+ throws IOException
+ {
+ return ReleaseUtil.isSymlink( file ) ? file.getCanonicalPath() :
file.getAbsolutePath();
+ }
}
\ No newline at end of file
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java?rev=1083346&r1=1083345&r2=1083346&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
Sun Mar 20 00:09:15 2011
@@ -73,7 +73,7 @@ public class ScmTagPhaseTest
phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "scm-tag" );
}
- private static String getPath(File file)
+ public static String getPath(File file)
throws IOException
{
return ReleaseUtil.isSymlink( file ) ? file.getCanonicalPath() :
file.getAbsolutePath();
