Bug 321819 - [transport] Repository transport API is tightly coupled with the implementationv20110104v20110102

3 files changed, 12 insertions, 12 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/FileInfoReaderTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/FileInfoReaderTest.java
index cbaeb7f90..c755b5d54 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/FileInfoReaderTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/FileInfoReaderTest.java
@@ -15,7 +15,7 @@ import java.net.ConnectException;
 import java.net.URI;
 import org.eclipse.core.runtime.*;
 import org.eclipse.equinox.internal.p2.repository.AuthenticationFailedException;
-import org.eclipse.equinox.internal.p2.repository.RepositoryTransport;
+import org.eclipse.equinox.internal.p2.transport.ecf.RepositoryTransport;
 import org.eclipse.equinox.p2.tests.testserver.helper.AbstractTestServerClientCase;
 
 /**
@@ -24,7 +24,7 @@ import org.eclipse.equinox.p2.tests.testserver.helper.AbstractTestServerClientCa
 public class FileInfoReaderTest extends AbstractTestServerClientCase {
 
 	public void testUnknownHost() throws Exception {
-		RepositoryTransport transport = RepositoryTransport.getInstance();
+		RepositoryTransport transport = new RepositoryTransport();
 		URI toDownload = new URI("http://bogus.nowhere/nothing.xml");
 		IStatus status = null;
 		try {
@@ -37,7 +37,7 @@ public class FileInfoReaderTest extends AbstractTestServerClientCase {
 	}
 
 	public void testBadPort() throws Exception {
-		RepositoryTransport transport = RepositoryTransport.getInstance();
+		RepositoryTransport transport = new RepositoryTransport();
 		URI toDownload = new URI("http://localhost:1/nothing.xml");
 		IStatus status = null;
 		try {
@@ -53,7 +53,7 @@ public class FileInfoReaderTest extends AbstractTestServerClientCase {
 
 	public void testRedirect() throws Exception {
 		this.setAladdinLoginService();
-		RepositoryTransport transport = RepositoryTransport.getInstance();
+		RepositoryTransport transport = new RepositoryTransport();
 		// apache http client accepts 100 redirects
 		URI toDownload = new URI(getBaseURL() + "/redirect/101/public/index.html");
 		boolean caught = false;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/FileReaderTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/FileReaderTest.java
index b0d20809a..d0fa83611 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/FileReaderTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/FileReaderTest.java
@@ -14,7 +14,7 @@ package org.eclipse.equinox.p2.tests.repository;
 import java.io.*;
 import java.net.*;
 import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.internal.p2.repository.RepositoryTransport;
+import org.eclipse.equinox.internal.p2.transport.ecf.RepositoryTransport;
 import org.eclipse.equinox.p2.tests.testserver.helper.AbstractTestServerClientCase;
 
 /**
@@ -23,7 +23,7 @@ import org.eclipse.equinox.p2.tests.testserver.helper.AbstractTestServerClientCa
 public class FileReaderTest extends AbstractTestServerClientCase {
 
 	public void testUnknownHost() throws URISyntaxException {
-		RepositoryTransport transport = RepositoryTransport.getInstance();
+		RepositoryTransport transport = new RepositoryTransport();
 		URI toDownload = new URI("http://bogus.nowhere/nothing.xml");
 		OutputStream target = new ByteArrayOutputStream();
 		IStatus status = transport.download(toDownload, target, new NullProgressMonitor());
@@ -33,7 +33,7 @@ public class FileReaderTest extends AbstractTestServerClientCase {
 	}
 
 	public void testBadPort() throws URISyntaxException {
-		RepositoryTransport transport = RepositoryTransport.getInstance();
+		RepositoryTransport transport = new RepositoryTransport();
 		URI toDownload = new URI("http://localhost:1/nothing.xml");
 		OutputStream target = new ByteArrayOutputStream();
 		IStatus status = transport.download(toDownload, target, new NullProgressMonitor());
@@ -47,7 +47,7 @@ public class FileReaderTest extends AbstractTestServerClientCase {
 	 * Tests a successful read.
 	 */
 	public void testReadStream() throws URISyntaxException, CoreException, IOException {
-		RepositoryTransport transport = RepositoryTransport.getInstance();
+		RepositoryTransport transport = new RepositoryTransport();
 		URI toDownload = new URI("http://localhost:8080/public/index.html");
 		final NullProgressMonitor monitor = new NullProgressMonitor();
 		InputStream stream = transport.stream(toDownload, monitor);
@@ -59,7 +59,7 @@ public class FileReaderTest extends AbstractTestServerClientCase {
 	 * Tests a successful read.
 	 */
 	public void testRead() throws URISyntaxException, CoreException, IOException {
-		RepositoryTransport transport = RepositoryTransport.getInstance();
+		RepositoryTransport transport = new RepositoryTransport();
 		URI toDownload = new URI("http://localhost:8080/public/index.html");
 		OutputStream target = new ByteArrayOutputStream();
 		final NullProgressMonitor monitor = new NullProgressMonitor();
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/TimeoutTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/TimeoutTest.java
index c58334633..033303f1b 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/TimeoutTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/TimeoutTest.java
@@ -12,7 +12,7 @@ import java.io.ByteArrayOutputStream;
 import java.net.URI;
 import java.security.cert.Certificate;
 import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.internal.p2.repository.RepositoryTransport;
+import org.eclipse.equinox.internal.p2.transport.ecf.RepositoryTransport;
 import org.eclipse.equinox.p2.core.ProvisionException;
 import org.eclipse.equinox.p2.core.UIServices;
 import org.eclipse.equinox.p2.tests.metadata.repository.AllServerTests;
@@ -48,7 +48,7 @@ public class TimeoutTest extends AbstractTestServerClientCase {
 	public void doTimeout(int type) throws Exception {
 		System.out.print("Note that test takes at least 120 seconds before timing out\n");
 		AllServerTests.setServiceUI(new AladdinNotSavedService());
-		RepositoryTransport transport = RepositoryTransport.getInstance();
+		RepositoryTransport transport = new RepositoryTransport();
 		URI toDownload = new URI(getBaseURL() + "/timeout/whatever.txt");
 		long startTime = System.currentTimeMillis();
 		boolean caught = false;
@@ -136,7 +136,7 @@ public class TimeoutTest extends AbstractTestServerClientCase {
 		System.out.print("Note that test takes at least 10 seconds before timing out (and >120 if it fails)\n");
 
 		AllServerTests.setServiceUI(new AladdinNotSavedService());
-		RepositoryTransport transport = RepositoryTransport.getInstance();
+		RepositoryTransport transport = new RepositoryTransport();
 		URI toDownload = new URI(getBaseURL() + "/timeout/whatever.txt");
 
 		IProgressMonitor monitor = new NullProgressMonitor();