[jboss-svn-commits] JBoss Common SVN: r4458 - in shrinkwrap/trunk/impl-base/src: test/java/org/jboss/shrinkwrap/impl/base/test and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: ALRubinger
Date: 2010-05-29 19:21:56 -0400 (Sat, 29 May 2010)
New Revision: 4458

Modified:
   shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java
   shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/ArchiveTestBase.java
Log:
[SHRINKWRAP-180] More test cases for Archive.add(Archive,String)

Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java	2010-05-29 23:16:55 UTC (rev 4457)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java	2010-05-29 23:21:56 UTC (rev 4458)
@@ -109,6 +109,17 @@
    // Required Implementations - Archive Delegation --------------------------------------||
    //-------------------------------------------------------------------------------------||
 
+   /**
+    * {@inheritDoc}
+    * @see org.jboss.shrinkwrap.api.Archive#add(org.jboss.shrinkwrap.api.Archive, java.lang.String)
+    */
+   @Override
+   public T add(Archive<?> archive, String path)
+   {
+      this.archive.add(archive, path);
+      return covarientReturn();
+   }
+   
    /* (non-Javadoc)
     * @see org.jboss.shrinkwrap.api.Archive#add(org.jboss.shrinkwrap.api.Archive, org.jboss.shrinkwrap.api.Path)
     */

Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/ArchiveTestBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/ArchiveTestBase.java	2010-05-29 23:16:55 UTC (rev 4457)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/ArchiveTestBase.java	2010-05-29 23:21:56 UTC (rev 4458)
@@ -496,18 +496,29 @@
     * @throws Exception
     */
    @Test
-   public void testAddArchiveToPathRequirePath() throws Exception
+   public void testAddArchiveToPathRequireArchivePath() throws Exception
    {
       Archive<T> archive = getArchive();
       try
       {
-         archive.add(ShrinkWrap.create("test.jar", JavaArchive.class), null);
+         archive.add(ShrinkWrap.create("test.jar", JavaArchive.class), (ArchivePath)null);
          Assert.fail("Should have throw an IllegalArgumentException");
       }
       catch (IllegalArgumentException expectedException)
       {
       }
    }
+   
+   /**
+    * Ensure adding an archive to a path requires a path
+    * @throws Exception
+    */
+   @Test(expected=IllegalArgumentException.class)
+   public void testAddArchiveToPathRequireStringPath() throws Exception
+   {
+      Archive<T> archive = getArchive();
+      archive.add(ShrinkWrap.create("test.jar", JavaArchive.class), (String)null);
+   }
 
    /**
     * Ensure adding an archive to a path requires an archive