Skip to main content
summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorslewis2009-04-07 00:54:11 +0000
committerslewis2009-04-07 00:54:11 +0000
commit23abeb2ab8dd37911f0cf4db523aa0e56b600058 (patch)
tree0d7cb76d2558cb67fabea61ece782541b1dd5e15 /tests
parent9993fdc5d4b49ea87a9e60c8f37f5ac99f656156 (diff)
downloadorg.eclipse.ecf-23abeb2ab8dd37911f0cf4db523aa0e56b600058.tar.gz
org.eclipse.ecf-23abeb2ab8dd37911f0cf4db523aa0e56b600058.tar.xz
org.eclipse.ecf-23abeb2ab8dd37911f0cf4db523aa0e56b600058.zip
Removed references to RepositoryTransport class from P2.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/bundles/org.eclipse.ecf.tests.filetransfer/META-INF/MANIFEST.MF1
-rwxr-xr-xtests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URLRetrieveTest.java35
2 files changed, 12 insertions, 24 deletions
diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.filetransfer/META-INF/MANIFEST.MF
index 551300c46..69f97e858 100755
--- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/META-INF/MANIFEST.MF
@@ -19,7 +19,6 @@ Import-Package: org.eclipse.core.net.proxy,
org.eclipse.core.runtime.jobs,
org.eclipse.equinox.concurrent.future;version="1.0.0",
org.eclipse.osgi.util,
- org.eclipse.equinox.internal.p2.repository,
org.osgi.framework;version="1.4.0",
org.osgi.service.url;version="1.0.0",
org.osgi.util.tracker;version="1.3.2"
diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URLRetrieveTest.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URLRetrieveTest.java
index 10c14b331..1ad1c7515 100755
--- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URLRetrieveTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URLRetrieveTest.java
@@ -26,12 +26,13 @@ import org.apache.commons.httpclient.server.SimpleHttpServerConnection;
import org.apache.commons.httpclient.server.SimpleRequest;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.ecf.filetransfer.IFileTransferListener;
+import org.eclipse.ecf.filetransfer.SendFileTransferException;
import org.eclipse.ecf.filetransfer.events.IFileTransferConnectStartEvent;
import org.eclipse.ecf.filetransfer.events.IIncomingFileTransferReceiveDataEvent;
import org.eclipse.ecf.filetransfer.events.IIncomingFileTransferReceiveStartEvent;
import org.eclipse.ecf.filetransfer.identity.IFileID;
import org.eclipse.ecf.internal.tests.filetransfer.httpserver.SimpleServer;
-import org.eclipse.equinox.internal.p2.repository.RepositoryTransport;
+//import org.eclipse.equinox.internal.p2.repository.RepositoryTransport;
public class URLRetrieveTest extends AbstractRetrieveTestCase {
@@ -251,32 +252,20 @@ public class URLRetrieveTest extends AbstractRetrieveTestCase {
public static final String HTTP_RETRIEVE_GZFILE_MIRROR = "http://mirrors.xmission.com/eclipse/eclipse/updates/3.4//plugins/javax.servlet.jsp_2.0.0.v200806031607.jar.pack.gz";
public void testReceiveGzipWithGZFile() throws Exception {
- File f = File.createTempFile("foo", "something.pack.gz");
- FileOutputStream fos = new FileOutputStream(f);
- System.out.println(f);
- RepositoryTransport.getInstance().download(
- new URI(HTTP_RETRIEVE_GZFILE), fos, new NullProgressMonitor());
- fos.close();
- if (f != null) {
- System.out.println(f.length());
- assertTrue("4.0", f.length() < 50000);
+ tmpFile = File.createTempFile("foo", "something.pack.gz");
+ testReceive(HTTP_RETRIEVE_GZFILE);
+ if (tmpFile != null) {
+ System.out.println(tmpFile.length());
+ assertTrue("4.0", tmpFile.length() < 50000);
}
}
public void testReceiveGzipWithGZFileFromMirror() throws Exception {
- File f = File.createTempFile("foo2", "something.pack.gz");
- FileOutputStream fos = new FileOutputStream(f);
- System.out.println(f);
- RepositoryTransport
- .getInstance()
- .download(
- new URI(
- "http://mirrors.xmission.com/eclipse/eclipse/updates/3.4//plugins/javax.servlet.jsp_2.0.0.v200806031607.jar.pack.gz"),
- fos, new NullProgressMonitor());
- fos.close();
- if (f != null) {
- System.out.println(f.length());
- assertTrue("4.0", f.length() < 50000);
+ tmpFile = File.createTempFile("foo", "something.pack.gz");
+ testReceive(HTTP_RETRIEVE_GZFILE_MIRROR);
+ if (tmpFile != null) {
+ System.out.println(tmpFile.length());
+ assertTrue("4.0", tmpFile.length() < 50000);
}
}

Back to the top