Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=307477. Also

added two new test bundles: 
org.eclipse.ecf.tests.filetransfer.httpclient and
org.eclipse.ecf.tests.filetransfer.httpclient4

14 files changed, 279 insertions, 0 deletions

diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/.classpath b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/.classpath
new file mode 100644
index 000000000..2d1a4302f
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/.project b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/.project
new file mode 100644
index 000000000..e66409b35
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.ecf.tests.filetransfer.httpclient</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/.settings/org.eclipse.jdt.core.prefs b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..44217f8c0
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

+org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.5

diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/.settings/org.eclipse.pde.core.prefs b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 000000000..b7e72d019
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1

+pluginProject.extensions=false

+resolve.requirebundle=false

diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..8a6ab8d08
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ECF Httpclient Provider Tests
+Bundle-SymbolicName: org.eclipse.ecf.tests.filetransfer.httpclient
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.junit;bundle-version="4.10.0",
+ org.eclipse.ecf.provider.filetransfer.httpclient;bundle-version="4.0.200",
+ org.apache.commons.httpclient;bundle-version="3.1.0",
+ org.eclipse.ecf.filetransfer;bundle-version="5.0.0",
+ org.eclipse.ecf.provider.filetransfer;bundle-version="3.2.0",
+ org.eclipse.ecf;bundle-version="3.1.300",
+ org.eclipse.equinox.common;bundle-version="3.6.100"
diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/build.properties b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/build.properties
new file mode 100644
index 000000000..41eb6ade2
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/build.properties
@@ -0,0 +1,4 @@
+source.. = src/

+output.. = bin/

+bin.includes = META-INF/,\

+               .

diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/src/org/eclipse/ecf/tests/filetransfer/httpclient/HttpClientGetPortFromURLTest.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/src/org/eclipse/ecf/tests/filetransfer/httpclient/HttpClientGetPortFromURLTest.java
new file mode 100644
index 000000000..ae2edf5c3
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient/src/org/eclipse/ecf/tests/filetransfer/httpclient/HttpClientGetPortFromURLTest.java
@@ -0,0 +1,77 @@
+package org.eclipse.ecf.tests.filetransfer.httpclient;

+

+import org.apache.commons.httpclient.HttpClient;

+import org.eclipse.ecf.provider.filetransfer.httpclient.HttpClientRetrieveFileTransfer;

+

+import junit.framework.TestCase;

+

+public class HttpClientGetPortFromURLTest extends TestCase {

+

+	public static class HttpClientRetrieveTest extends HttpClientRetrieveFileTransfer {

+

+		public HttpClientRetrieveTest(HttpClient client) {

+			super(client);

+		}

+		

+		public static int getPortFromURLTest(String url) {

+			return getPortFromURL(url);

+		}

+	}

+	

+	public void testHttp() {

+		int port;

+		String url = "http://www.test.com";

+		port = HttpClientRetrieveTest.getPortFromURLTest(url);

+		assertEquals(80, port);

+	}

+

+	public void testHttpWithPort() {

+		int port;

+		String url = "http://www.test.com:80/";

+		port = HttpClientRetrieveTest.getPortFromURLTest(url);

+		assertEquals(80, port);

+	}

+

+	public void testHttps() {

+		int port;

+		String url = "https://www.test.com/";

+		port = HttpClientRetrieveTest.getPortFromURLTest(url);

+		assertEquals(443, port);

+	}

+

+	public void testHttpsPortNOK() {

+		int port;

+		String url = "https://www.test.com:440/";

+		port = HttpClientRetrieveTest.getPortFromURLTest(url);

+		assertFalse(443 == port);

+	}

+

+	public void testHttpWithSearchpart() {

+		int port;

+		String url = "https://www.test.com/test?value=yes";

+		port = HttpClientRetrieveTest.getPortFromURLTest(url);

+		assertEquals(443, port);

+	}

+

+	public void testHttpWithCredentialsAndSearchpart() {

+		int port;

+		String url = "https://testuser:testpasswd@www.test.com/test?value=yes";

+		port = HttpClientRetrieveTest.getPortFromURLTest(url);

+		assertEquals(443, port);

+	}

+

+	public void testHttpWithCredentialsPortSearchpart() {

+		int port;

+		String url = "http://testuser:testpasswd@www.test.com:8080/test?value=yes";

+		port = HttpClientRetrieveTest.getPortFromURLTest(url);

+		assertEquals(8080, port);

+	}

+

+	public void testHttpWithCredentialsPortLongPath() {

+		int port;

+		String url = "https://testuser:testpasswd@host.domain.eu:443/pu/fisgui/svn/repository/fisgui/source-internal/trunk/target-platform/fisgui-5.8.1/content.xml";

+		port = HttpClientRetrieveTest.getPortFromURLTest(url);

+		assertEquals(443, port);

+	}

+

+}

diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/.classpath b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/.classpath
new file mode 100644
index 000000000..2d1a4302f
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/.project b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/.project
new file mode 100644
index 000000000..ea8cbecfd
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.ecf.tests.filetransfer.httpclient4</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/.settings/org.eclipse.jdt.core.prefs b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..44217f8c0
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

+org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.5

diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/.settings/org.eclipse.pde.core.prefs b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 000000000..b7e72d019
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1

+pluginProject.extensions=false

+resolve.requirebundle=false

diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..7766a350b
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ECF Httpclient4 Provider Tests
+Bundle-SymbolicName: org.eclipse.ecf.tests.filetransfer.httpclient4
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.equinox.common;bundle-version="3.6.100",
+ org.eclipse.ecf;bundle-version="3.1.300",
+ org.eclipse.ecf.filetransfer;bundle-version="5.0.0",
+ org.eclipse.ecf.provider.filetransfer;bundle-version="3.2.0",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.ecf.provider.filetransfer.httpclient4;bundle-version="1.0.100",
+ org.apache.httpcomponents.httpclient;bundle-version="4.1.2"
+Import-Package: org.apache.commons.httpclient
diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/build.properties b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/build.properties
new file mode 100644
index 000000000..41eb6ade2
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/build.properties
@@ -0,0 +1,4 @@
+source.. = src/

+output.. = bin/

+bin.includes = META-INF/,\

+               .

diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/src/org/eclipse/ecf/tests/filetransfer/httpclient4/HttpClientGetPortFromURLTest.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/src/org/eclipse/ecf/tests/filetransfer/httpclient4/HttpClientGetPortFromURLTest.java
new file mode 100644
index 000000000..03c597c29
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclient4/src/org/eclipse/ecf/tests/filetransfer/httpclient4/HttpClientGetPortFromURLTest.java
@@ -0,0 +1,77 @@
+package org.eclipse.ecf.tests.filetransfer.httpclient4;

+

+import org.apache.http.impl.client.DefaultHttpClient;

+import org.eclipse.ecf.provider.filetransfer.httpclient4.HttpClientRetrieveFileTransfer;

+

+import junit.framework.TestCase;

+

+public class HttpClientGetPortFromURLTest extends TestCase {

+

+	public static class HttpClientRetrieveTest extends HttpClientRetrieveFileTransfer {

+

+		public HttpClientRetrieveTest(DefaultHttpClient httpClient) {

+			super(httpClient);

+		}

+

+		public static int getPortFromURLTest(String url) {

+			return getPortFromURL(url);

+		}

+	}

+	

+	public void testHttp() {

+		int port;

+		String url = "http://www.test.com";

+		port = HttpClientRetrieveTest.getPortFromURLTest(url);

+		assertEquals(80, port);

+	}

+

+	public void testHttpWithPort() {

+		int port;

+		String url = "http://www.test.com:80/";

+		port = HttpClientRetrieveTest.getPortFromURLTest(url);

+		assertEquals(80, port);

+	}

+

+	public void testHttps() {

+		int port;

+		String url = "https://www.test.com/";

+		port = HttpClientRetrieveTest.getPortFromURLTest(url);

+		assertEquals(443, port);

+	}

+

+	public void testHttpsPortNOK() {

+		int port;

+		String url = "https://www.test.com:440/";

+		port = HttpClientRetrieveTest.getPortFromURLTest(url);

+		assertFalse(443 == port);

+	}

+

+	public void testHttpWithSearchpart() {

+		int port;

+		String url = "https://www.test.com/test?value=yes";

+		port = HttpClientRetrieveTest.getPortFromURLTest(url);

+		assertEquals(443, port);

+	}

+

+	public void testHttpWithCredentialsAndSearchpart() {

+		int port;

+		String url = "https://testuser:testpasswd@www.test.com/test?value=yes";

+		port = HttpClientRetrieveTest.getPortFromURLTest(url);

+		assertEquals(443, port);

+	}

+

+	public void testHttpWithCredentialsPortSearchpart() {

+		int port;

+		String url = "http://testuser:testpasswd@www.test.com:8080/test?value=yes";

+		port = HttpClientRetrieveTest.getPortFromURLTest(url);

+		assertEquals(8080, port);

+	}

+

+	public void testHttpWithCredentialsPortLongPath() {

+		int port;

+		String url = "https://testuser:testpasswd@host.domain.eu:443/pu/fisgui/svn/repository/fisgui/source-internal/trunk/target-platform/fisgui-5.8.1/content.xml";

+		port = HttpClientRetrieveTest.getPortFromURLTest(url);

+		assertEquals(443, port);

+	}

+

+}