o Added more test cases of the plexus manifest class

Author: krosenvold

src/test/java/org/codehaus/plexus/archiver/jar/ManifestTest.java

@@ -17,13 +17,12 @@
  *
  */
 
-import org.codehaus.plexus.PlexusTestCase;
-
 import java.io.FileReader;
 import java.io.IOException;
-import java.util.Enumeration;
-import java.io.StringWriter;
 import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Enumeration;
+import org.codehaus.plexus.PlexusTestCase;
 
 /**
  * @author Emmanuel Venisse
@@ -134,24 +133,33 @@ public void testAttributeLongLineWrite()
         attr.setValue( longLineOfChars );
         attr.write( new PrintWriter( writer ) );
         writer.flush();
-        assertEquals( "should be multiline", 
+        assertEquals( "should be multiline",
                       "test: 123456789 123456789 123456789 123456789 123456789 123456789 1234" + Manifest.EOL +
                        " 56789 123456789 123456789 123456789 " + Manifest.EOL,
                       writer.toString() );
     }
-    
+
+
+    public void testDualClassPath()
+        throws ManifestException, IOException
+    {
+        Manifest manifest = getManifest( "src/test/resources/manifests/manifestWithDualClassPath.mf" );
+        final Manifest.Attribute attribute = manifest.getMainSection().getAttribute( "Class-Path" );
+        assertEquals( "../config/ classes12.jar baz", attribute.getValue() );
+    }
+
     public void testAttributeMultiLineValue()
         throws Exception
     {
-        checkMultiLineAttribute( 
+        checkMultiLineAttribute(
              "123456789" + Manifest.EOL + "123456789",
              "123456789" + Manifest.EOL + " 123456789" + Manifest.EOL );
     }
 
     public void testAttributeDifferentLineEndings()
         throws Exception
     {
-        checkMultiLineAttribute( 
+        checkMultiLineAttribute(
             "\tA\rB\n\t C\r\n \tD\n\r",
             "\tA" + Manifest.EOL +
                 " B" + Manifest.EOL +
@@ -174,7 +182,7 @@ public void checkMultiLineAttribute( String in, String expected )
         // so in case of failure you can see what went wrong.
         System.err.println( "String: " + dumpString( writer.toString() ) );
 
-        assertEquals( "should be indented multiline", 
+        assertEquals( "should be indented multiline",
                       "test: " + expected, writer.toString() );
     }
 

src/test/resources/manifests/manifestMerge1.mf

@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+From: Jack
+Bar: 001
+
+Name: Fudz
+Bar: 002
+
+Name: Redz
+Baz: 002

src/test/resources/manifests/manifestMerge2.mf

@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+From: Jack
+Bar: 001
+
+Name: Fudz
+Bar: 003

src/test/resources/manifests/manifestWithClassPath.mf

@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Class-Path: ../config/
+  classes12.jar
+  bc4jct.jar
+  bc4jdomorcl.jar
+  bc4jmt.jar
+  commons-beanutils-bean-collections.jar
+  commons-beanutils-core.jar
+  commons-beanutils.jar
+  commons-codec-1.3.jar
+  commons-collections-3.1.jar
+  commons-configuration-1.2.jar
+  commons-digester.jar
+  commons-lang-2.0.jar
+  commons-logging.jar
+  htbclnt.jar
+  areallylongjarfilethatisnotentirelyrealbutstillaverylongname.jar
+  j2ee/home/oc4jclient.jar
+From: Jack

src/test/resources/manifests/manifestWithDualClassPath.mf

@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Class-Path: ../config/
+  classes12.jar
+From: Jack
+Ape: Fud
+Class-Path: baz