Refactoring of test code for naming consistency. Also added browse test cases.

3 files changed, 12 insertions, 20 deletions

diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.scp/src/org/eclipse/ecf/internal/tests/provider/filetransfer/scp/Activator.java b/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.scp/src/org/eclipse/ecf/internal/tests/provider/filetransfer/scp/Activator.java
index 82cdff1c0..55c6e2554 100755
--- a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.scp/src/org/eclipse/ecf/internal/tests/provider/filetransfer/scp/Activator.java
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.scp/src/org/eclipse/ecf/internal/tests/provider/filetransfer/scp/Activator.java
@@ -9,15 +9,16 @@ import org.osgi.framework.BundleContext;
 public class Activator extends Plugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ecf.tests.provider.filetransfer.scp";
+	public static final String PLUGIN_ID = "org.eclipse.ecf.tests.provider.filetransfer.scp"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
-	
+
 	/**
 	 * The constructor
 	 */
 	public Activator() {
+		// nothing
 	}
 
 	/*
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.scp/src/org/eclipse/ecf/tests/provider/filetransfer/scp/SCPOutgoingTest.java b/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.scp/src/org/eclipse/ecf/tests/provider/filetransfer/scp/SCPOutgoingTest.java
index b142fb374..47cc03600 100755
--- a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.scp/src/org/eclipse/ecf/tests/provider/filetransfer/scp/SCPOutgoingTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.scp/src/org/eclipse/ecf/tests/provider/filetransfer/scp/SCPOutgoingTest.java
@@ -13,14 +13,12 @@ package org.eclipse.ecf.tests.provider.filetransfer.scp;
 
 import java.io.File;
 import java.net.URL;
-
 import org.eclipse.ecf.core.ContainerFactory;
 import org.eclipse.ecf.core.IContainer;
 import org.eclipse.ecf.core.security.ConnectContextFactory;
 import org.eclipse.ecf.filetransfer.IFileTransferListener;
 import org.eclipse.ecf.filetransfer.ISendFileTransferContainerAdapter;
 import org.eclipse.ecf.filetransfer.events.IFileTransferEvent;
-import org.eclipse.ecf.filetransfer.events.IIncomingFileTransferReceiveDoneEvent;
 import org.eclipse.ecf.filetransfer.identity.FileIDFactory;
 import org.eclipse.ecf.filetransfer.identity.IFileID;
 import org.eclipse.ecf.tests.ContainerAbstractTestCase;
@@ -30,12 +28,12 @@ import org.eclipse.ecf.tests.ContainerAbstractTestCase;
  */
 public class SCPOutgoingTest extends ContainerAbstractTestCase {
 
-	private static final String TESTSRCFILE = "test.txt";
+	private static final String TESTSRCFILE = "test.txt"; //$NON-NLS-1$
 
 	// URL (example:  scp://slewis@ecf1.osuosl.org/test.txt 
-	private static final String TESTTARGETURL = System.getProperty("url");
+	private static final String TESTTARGETURL = System.getProperty("url"); //$NON-NLS-1$
 
-	String password = System.getProperty("password");
+	String password = System.getProperty("password"); //$NON-NLS-1$
 
 	protected ISendFileTransferContainerAdapter adapter = null;
 	protected IFileTransferListener senderTransferListener = null;
@@ -43,10 +41,7 @@ public class SCPOutgoingTest extends ContainerAbstractTestCase {
 	protected IFileTransferListener getFileTransferListener(final String prefix) {
 		return new IFileTransferListener() {
 			public void handleTransferEvent(IFileTransferEvent event) {
-				System.out.println(prefix + ".handleTransferEvent(" + event + ")");
-				if (event instanceof IIncomingFileTransferReceiveDoneEvent) {
-
-				}
+				System.out.println(prefix + ".handleTransferEvent(" + event + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		};
 	}
@@ -55,7 +50,7 @@ public class SCPOutgoingTest extends ContainerAbstractTestCase {
 		super.setUp();
 		final IContainer container = ContainerFactory.getDefault().createContainer();
 		adapter = (ISendFileTransferContainerAdapter) container.getAdapter(ISendFileTransferContainerAdapter.class);
-		senderTransferListener = getFileTransferListener("localhost");
+		senderTransferListener = getFileTransferListener("localhost"); //$NON-NLS-1$
 	}
 
 	protected void tearDown() throws Exception {
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.scp/src/org/eclipse/ecf/tests/provider/filetransfer/scp/SCPRetrieveTest.java b/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.scp/src/org/eclipse/ecf/tests/provider/filetransfer/scp/SCPRetrieveTest.java
index 0b4a84f26..a511b16fd 100755
--- a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.scp/src/org/eclipse/ecf/tests/provider/filetransfer/scp/SCPRetrieveTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.scp/src/org/eclipse/ecf/tests/provider/filetransfer/scp/SCPRetrieveTest.java
@@ -14,22 +14,18 @@ package org.eclipse.ecf.tests.provider.filetransfer.scp;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.eclipse.ecf.core.ContainerFactory;
 import org.eclipse.ecf.core.IContainer;
 import org.eclipse.ecf.core.security.ConnectContextFactory;
 import org.eclipse.ecf.filetransfer.IFileTransferListener;
 import org.eclipse.ecf.filetransfer.IRetrieveFileTransferContainerAdapter;
-import org.eclipse.ecf.filetransfer.events.IFileTransferEvent;
-import org.eclipse.ecf.filetransfer.events.IIncomingFileTransferReceiveDataEvent;
-import org.eclipse.ecf.filetransfer.events.IIncomingFileTransferReceiveDoneEvent;
-import org.eclipse.ecf.filetransfer.events.IIncomingFileTransferReceiveStartEvent;
+import org.eclipse.ecf.filetransfer.events.*;
 import org.eclipse.ecf.filetransfer.identity.FileIDFactory;
 import org.eclipse.ecf.tests.ContainerAbstractTestCase;
 
 public class SCPRetrieveTest extends ContainerAbstractTestCase {
 
-	private static final String SCP_RETRIEVE = "scp://ecf1.osuosl.org/test.txt";
+	private static final String SCP_RETRIEVE = "scp://ecf1.osuosl.org/test.txt"; //$NON-NLS-1$
 
 	IRetrieveFileTransferContainerAdapter adapter = null;
 
@@ -82,10 +78,10 @@ public class SCPRetrieveTest extends ContainerAbstractTestCase {
 			}
 		};
 
-		adapter.setConnectContextForAuthentication(ConnectContextFactory.createPasswordConnectContext(System.getProperty("password")));
+		adapter.setConnectContextForAuthentication(ConnectContextFactory.createUsernamePasswordConnectContext(System.getProperty("username"), System.getProperty("password"))); //$NON-NLS-1$ //$NON-NLS-2$
 		adapter.sendRetrieveRequest(FileIDFactory.getDefault().createFileID(adapter.getRetrieveNamespace(), SCP_RETRIEVE), listener, null);
 		// Wait for 5 seconds
-		sleep(5000, "Starting 5 second wait", "Ending 5 second wait");
+		sleep(5000, "Starting 5 second wait", "Ending 5 second wait"); //$NON-NLS-1$ //$NON-NLS-2$
 
 		assertHasEvent(receiveStartEvents, IIncomingFileTransferReceiveStartEvent.class);
 		assertHasMoreThanEventCount(receiveDataEvents, IIncomingFileTransferReceiveDataEvent.class, 0);