Author: brett
Date: Tue Aug 29 21:09:53 2006
New Revision: 438342
URL: http://svn.apache.org/viewvc?rev=438342&view=rev
Log:
[MRELEASE-130] rename to releaseutilstest since that is the only class it tests
(merge function)
Added:
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseUtilsTest.java
(contents, props changed)
- copied, changed from r438341,
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseDescriptorTest.java
Removed:
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseDescriptorTest.java
Copied:
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseUtilsTest.java
(from r438341,
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseDescriptorTest.java)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseUtilsTest.java?p2=maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseUtilsTest.java&p1=maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseDescriptorTest.java&r1=438341&r2=438342&rev=438342&view=diff
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseDescriptorTest.java
(original)
+++
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseUtilsTest.java
Tue Aug 29 21:09:53 2006
@@ -26,7 +26,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
*/
-public class ReleaseDescriptorTest
+public class ReleaseUtilsTest
extends TestCase
{
public void testMergeConfigurationSourceEmpty()
@@ -50,20 +50,6 @@
public void testMergeConfiguration()
{
-/*
- File workingDirectory = new File( "." );
-
- ReleaseDescriptor mergeDescriptor =
- createMergeDescriptor( workingDirectory.getAbsolutePath(),
"completed-phase-merge" );
- ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
- ReleaseDescriptor mergedReleaseDescriptor = ReleaseUtils.merge(
releaseDescriptor, mergeDescriptor );
- ReleaseDescriptor expectedDescriptor =
- createMergeDescriptor( releaseDescriptor.getWorkingDirectory(),
releaseDescriptor.getCompletedPhase() );
- ReleaseDescriptor mergedExpectedDescriptor = ReleaseUtils.merge(
expectedDescriptor, releaseDescriptor );
-
- assertEquals( "Check merge", mergedExpectedDescriptor,
mergedReleaseDescriptor );
-*/
-
File workingDirectory = new File( "." );
ReleaseDescriptor mergeDescriptor =
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseUtilsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseUtilsTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
