[jboss-cvs] JBossAS SVN: r57654 - projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test

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

Author: scott.stark at jboss.org
Date: 2006-10-13 01:46:20 -0400 (Fri, 13 Oct 2006)
New Revision: 57654

Modified:
   projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/URLResolutionUnitTestCase.java
Log:
Test resolution of a relative path with a leading .. against URLs.

Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/URLResolutionUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/URLResolutionUnitTestCase.java	2006-10-13 05:27:16 UTC (rev 57653)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/URLResolutionUnitTestCase.java	2006-10-13 05:46:20 UTC (rev 57654)
@@ -46,7 +46,25 @@
       URL expected = new URL("file:/peer");
       assertEquals(expected, rootPeer);
    }
+   /**
+    * Test resolution of a relative path with a leading .. against
+    * a NON directory URL.
+    * @throws Exception
+    */
+   public void testNonDirDotDotRelativeURLs()
+      throws Exception
+   {
+      URL root = new URL("file:/root/sub1");
+      URL rootPeer = new URL(root, "../peer");
+      URL expected = new URL("file:/peer");
+      assertEquals(expected, rootPeer);
 
+      root = new URL("file:/root/sub1/subsub1");
+      rootPeer = new URL(root, "../peer");
+      expected = new URL("file:/root/peer");
+      assertEquals(expected, rootPeer);
+   }
+
    /**
     * Test resolution when the URL against which relative paths are resolved
     * is a directory (ends in '/').
@@ -60,4 +78,24 @@
       URL expected = new URL("file:/root/peer");
       assertEquals(expected, rootPeer);
    }
+
+   /**
+    * Test resolution of a relative path with a leading .. against
+    * a directory URL.
+    * @throws Exception
+    */
+   public void testDirDotDotRelativeURLs()
+      throws Exception
+   {
+      URL root = new URL("file:/root/sub1/");
+      URL rootPeer = new URL(root, "../peer");
+      URL expected = new URL("file:/root/peer");
+      assertEquals(expected, rootPeer);
+
+      root = new URL("file:/root/sub1/subsub1/");
+      rootPeer = new URL(root, "../peer");
+      expected = new URL("file:/root/sub1/peer");
+      assertEquals(expected, rootPeer);
+   }
+
 }