[Archive-access-cvs] SF.net SVN: archive-access:[2775] branches/wayback-1_4_2/wayback-core/src/ test/java/org/archive/wayback/util/url/UrlOperationsTest.java

[<bra...@us...>]

Revision: 2775
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2775&view=rev
Author:   bradtofel
Date:     2009-07-18 00:24:51 +0000 (Sat, 18 Jul 2009)

Log Message:
-----------
TWEAK: added some tests for resolving URLs and extracting schemes from URLs

Modified Paths:
--------------
    branches/wayback-1_4_2/wayback-core/src/test/java/org/archive/wayback/util/url/UrlOperationsTest.java

Modified: branches/wayback-1_4_2/wayback-core/src/test/java/org/archive/wayback/util/url/UrlOperationsTest.java
===================================================================
--- branches/wayback-1_4_2/wayback-core/src/test/java/org/archive/wayback/util/url/UrlOperationsTest.java	2009-07-18 00:24:00 UTC (rev 2774)
+++ branches/wayback-1_4_2/wayback-core/src/test/java/org/archive/wayback/util/url/UrlOperationsTest.java	2009-07-18 00:24:51 UTC (rev 2775)
@@ -62,7 +62,33 @@
 		assertEquals("foo.com",UrlOperations.urlToHost("http://foo.com/path:/"));
 		assertEquals("foo.com",UrlOperations.urlToHost("https://foo.com/path:/"));
 		assertEquals("foo.com",UrlOperations.urlToHost("ftp://foo.com/path:/"));
+	}
+
+	public void testResolveUrl() {
+		for(String scheme : UrlOperations.ALL_SCHEMES) {
+
+			assertEquals(scheme + "a.org/1/2",
+				UrlOperations.resolveUrl(scheme + "a.org/3/","/1/2"));
+
+			assertEquals(scheme + "b.org/1/2",
+				UrlOperations.resolveUrl(scheme + "a.org/3/",
+						scheme + "b.org/1/2"));
+
+			assertEquals(scheme + "a.org/3/1/2",
+				UrlOperations.resolveUrl(scheme + "a.org/3/","1/2"));
+
+			assertEquals(scheme + "a.org/1/2",
+				UrlOperations.resolveUrl(scheme + "a.org/3","1/2"));
 		
+		}
 		
 	}
+	public void testUrlToScheme() {
+		assertEquals("http://",UrlOperations.urlToScheme("http://a.com/"));
+		assertEquals("https://",UrlOperations.urlToScheme("https://a.com/"));
+		assertEquals("ftp://",UrlOperations.urlToScheme("ftp://a.com/"));
+		assertEquals("rtsp://",UrlOperations.urlToScheme("rtsp://a.com/"));
+		assertEquals("mms://",UrlOperations.urlToScheme("mms://a.com/"));
+		assertNull(UrlOperations.urlToScheme("blah://a.com/"));
+	}	
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.