Fixes for https in httpclient provider. Also added appropriate https test code in filetransfer test cases

3 files changed, 22 insertions, 29 deletions

diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/CancelServiceTest.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/CancelServiceTest.java
index 2d02143c4..115da4b30 100755
--- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/CancelServiceTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/CancelServiceTest.java
@@ -27,17 +27,18 @@ import org.eclipse.ecf.tests.ContainerAbstractTestCase;
 public class CancelServiceTest extends ContainerAbstractTestCase {
 
 	private static final String HTTP_RETRIEVE = "http://www.eclipse.org/ecf/ip_log.html";
-	private static final String HTTPS_RETRIEVE = "https://bugs.eclipse.org/bugs";
-	
+	private static final String HTTPS_RETRIEVE = RetrieveTest.HTTPS_RETRIEVE;
+
 	//private static final String EFS_RETRIEVE = "efs:file://c:/foo.txt";
-	
+
 	File tmpFile = null;
-	
+
 	private IRetrieveFileTransfer transferInstance;
-	
+
 	protected IRetrieveFileTransfer getTransferInstance() {
 		return Activator.getDefault().getRetrieveFileTransferFactory().newInstance();
 	}
+
 	/*
 	 * (non-Javadoc)
 	 * 
@@ -60,10 +61,10 @@ public class CancelServiceTest extends ContainerAbstractTestCase {
 	}
 
 	IIncomingFileTransfer incoming = null;
-	
+
 	protected void testReceiveHttp(String url) throws Exception {
 		assertNotNull(transferInstance);
-		IFileTransferListener listener = new IFileTransferListener() {
+		final IFileTransferListener listener = new IFileTransferListener() {
 			public void handleTransferEvent(IFileTransferEvent event) {
 				if (event instanceof IIncomingFileTransferReceiveStartEvent) {
 					IIncomingFileTransferReceiveStartEvent rse = (IIncomingFileTransferReceiveStartEvent) event;
@@ -78,17 +79,15 @@ public class CancelServiceTest extends ContainerAbstractTestCase {
 					if (incoming != null && incoming.getPercentComplete() > 0.50) {
 						incoming.cancel();
 					}
-					System.out.println("receive data="+event);
+					System.out.println("receive data=" + event);
 				} else if (event instanceof IIncomingFileTransferReceiveDoneEvent) {
-					System.out.println("receive done="+event+", exception="+incoming.getException());
+					System.out.println("receive done=" + event + ", exception=" + incoming.getException());
 					assertTrue(incoming.getException() != null);
 				}
 			}
 		};
 
-		transferInstance.sendRetrieveRequest(FileIDFactory.getDefault()
-				.createFileID(transferInstance.getRetrieveNamespace(),
-						url), listener, null);
+		transferInstance.sendRetrieveRequest(FileIDFactory.getDefault().createFileID(transferInstance.getRetrieveNamespace(), url), listener, null);
 		// Wait for 5 seconds
 		sleep(5000, "Starting 5 second wait", "Ending 5 second wait");
 	}
diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/RetrieveFileTransferServiceTest.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/RetrieveFileTransferServiceTest.java
index 61c65ab77..02ebb2083 100755
--- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/RetrieveFileTransferServiceTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/RetrieveFileTransferServiceTest.java
@@ -28,7 +28,7 @@ import org.eclipse.ecf.tests.ContainerAbstractTestCase;
 public class RetrieveFileTransferServiceTest extends ContainerAbstractTestCase {
 
 	private static final String HTTP_RETRIEVE = "http://www.eclipse.org/ecf/ip_log.html";
-	private static final String HTTPS_RETRIEVE = "https://bugs.eclipse.org/bugs";
+	private static final String HTTPS_RETRIEVE = RetrieveTest.HTTPS_RETRIEVE;
 
 	//private static final String EFS_RETRIEVE = "efs:file://c:/foo.txt";
 
diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/RetrieveTest.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/RetrieveTest.java
index b5445cb6e..716cb71ad 100755
--- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/RetrieveTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/RetrieveTest.java
@@ -30,10 +30,10 @@ import org.eclipse.ecf.tests.ContainerAbstractTestCase;
 public class RetrieveTest extends ContainerAbstractTestCase {
 
 	private static final String HTTP_RETRIEVE = "http://www.eclipse.org/ecf/ip_log.html";
-	private static final String HTTPS_RETRIEVE = "https://bugs.eclipse.org/bugs";
-	
+	protected static final String HTTPS_RETRIEVE = "https://www.verisign.com/";
+
 	File tmpFile = null;
-	
+
 	protected IContainer createClient(int index) throws Exception {
 		return ContainerFactory.getDefault().createContainer();
 	}
@@ -71,10 +71,9 @@ public class RetrieveTest extends ContainerAbstractTestCase {
 	List receiveDoneEvents = new ArrayList();
 
 	protected void testReceiveHttp(String url) throws Exception {
-		IRetrieveFileTransferContainerAdapter retrieveAdapter = (IRetrieveFileTransferContainerAdapter) getClients()[0]
-				.getAdapter(IRetrieveFileTransferContainerAdapter.class);
+		final IRetrieveFileTransferContainerAdapter retrieveAdapter = (IRetrieveFileTransferContainerAdapter) getClients()[0].getAdapter(IRetrieveFileTransferContainerAdapter.class);
 		assertNotNull(retrieveAdapter);
-		IFileTransferListener listener = new IFileTransferListener() {
+		final IFileTransferListener listener = new IFileTransferListener() {
 			public void handleTransferEvent(IFileTransferEvent event) {
 				if (event instanceof IIncomingFileTransferReceiveStartEvent) {
 					IIncomingFileTransferReceiveStartEvent rse = (IIncomingFileTransferReceiveStartEvent) event;
@@ -94,19 +93,14 @@ public class RetrieveTest extends ContainerAbstractTestCase {
 			}
 		};
 
-		retrieveAdapter.sendRetrieveRequest(FileIDFactory.getDefault()
-				.createFileID(retrieveAdapter.getRetrieveNamespace(),
-						url), listener, null);
+		retrieveAdapter.sendRetrieveRequest(FileIDFactory.getDefault().createFileID(retrieveAdapter.getRetrieveNamespace(), url), listener, null);
 		// Wait for 5 seconds
 		sleep(5000, "Starting 5 second wait", "Ending 5 second wait");
 
-		assertHasEvent(receiveStartEvents,
-				IIncomingFileTransferReceiveStartEvent.class);
-		assertHasMoreThanEventCount(receiveDataEvents,
-				IIncomingFileTransferReceiveDataEvent.class, 0);
-		assertHasEvent(receiveDoneEvents,
-				IIncomingFileTransferReceiveDoneEvent.class);
-		
+		assertHasEvent(receiveStartEvents, IIncomingFileTransferReceiveStartEvent.class);
+		assertHasMoreThanEventCount(receiveDataEvents, IIncomingFileTransferReceiveDataEvent.class, 0);
+		assertHasEvent(receiveDoneEvents, IIncomingFileTransferReceiveDoneEvent.class);
+
 		assertTrue(tmpFile.exists());
 		assertTrue(tmpFile.length() > 0);
 	}