Refactored TinyHttpdImpl. Changed constructor, reflect this in ServerLauncher. Unit tests moved out of ServerAccessTest into new TinyHttpdImplTest. New unit tests added.

1 files changed, 0 insertions, 65 deletions

diff --git a/tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java b/tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java
index 1b93e3e..9607045 100644
--- a/tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java
+++ b/tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java
@@ -39,7 +39,6 @@ package net.sourceforge.jnlp;
 import java.io.File;
 import java.io.FileInputStream;
 import java.net.URL;
-import java.net.URLDecoder;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -220,70 +219,6 @@ public class ServerAccessTest {
         Assert.assertArrayEquals(b3, bb[2]);
     }
 
-    private static final String[] filePathTestUrls = {
-            "/foo.html",
-            "/foo/",
-            "/foo/bar.jar",
-            "/foo/bar.jar;path_param",
-            "/foo/bar.jar%3Bpath_param",
-            "/foo/bar?query=string&red=hat"
-    };
-
-    @Test
-    public void urlToFilePathTest() throws Exception {
-        for (String url : filePathTestUrls) {
-            String newUrl = TinyHttpdImpl.urlToFilePath(url);
-
-            Assert.assertFalse("File path should not contain query string: " + newUrl, newUrl.contains("?"));
-            Assert.assertTrue("File path should be relative: " + newUrl, newUrl.startsWith("./"));
-            Assert.assertFalse("File path should not contain \"/XslowX\":" + newUrl,
-                    newUrl.toLowerCase().contains("/XslowX".toLowerCase()));
-
-            if (url.endsWith("/")) {
-                Assert.assertTrue(newUrl.endsWith("/index.html"));
-            }
-        }
-    }
-
-    @Test
-    public void urlToFilePathUrlDecodeTest() throws Exception {
-        // This test may fail with strange original URLs, eg those containing the substring "%253B",
-        // which can be decoded into "%3B", then decoded again into ';'.
-
-        for (String url : filePathTestUrls) {
-            String newUrl = TinyHttpdImpl.urlToFilePath(url);
-            Assert.assertEquals(newUrl, URLDecoder.decode(newUrl, "UTF-8"));
-        }
-    }
-    
-    @Test
-    public void stripHttpPathParamTest() {
-    	String[] testBaseUrls = {
-    			"http://foo.com/bar",
-    			"localhost:8080",
-    			"https://bar.co.uk/site;para/baz?u=param1&v=param2"
-    	};
-
-    	String[] testJarNames = {
-    			"jar",
-    			"foo.jar",
-    			"bar;baz.jar",
-    			"nom.jar;",
-    			"rhat.jar.pack.gz;tag"
-    	};
-
-    	for (String url : testBaseUrls) {
-    		for (String jar : testJarNames) {
-    			String newUrl = TinyHttpdImpl.stripHttpPathParams(url),
-    					newJar = TinyHttpdImpl.stripHttpPathParams(jar),
-    					path = newUrl + "/" + newJar;
-    			Assert.assertTrue("Base URL should not have been modified: " + url + " => " + newUrl, newUrl.equals(url));
-    			Assert.assertTrue("JAR name should not be altered other than removing path param: " + jar + " => " + newJar, jar.startsWith(newJar));
-    			Assert.assertTrue("New path should be a substring of old path: " + path + " => " + url + "/" + jar, (url + "/" + jar).startsWith(path));
-    		}
-    	}
-    }
-
     private void printArrays(byte[][] bb) {
         System.out.println("[][] l=" + bb.length);
         for (int i = 0; i < bb.length; i++) {