Changeset 4804

Timestamp:

12/14/08 12:03:56 (4 years ago)

Author:

manningr

Message:

Proxy changes.

Files:

• trunk/sql12/test/external/net/sourceforge/squirrel_sql/client/update/UpdateUtilExternalTest.java (modified) (5 diffs)

trunk/sql12/test/external/net/sourceforge/squirrel_sql/client/update/UpdateUtilExternalTest.java

@@ -32 +32 @@
 import net.sourceforge.squirrel_sql.fw.util.FileWrapperFactory;
 import net.sourceforge.squirrel_sql.fw.util.FileWrapperFactoryImpl;
+import net.sourceforge.squirrel_sql.fw.util.IProxySettings;
+import net.sourceforge.squirrel_sql.fw.util.ProxySettings;
 
 import org.junit.After;
@@ -44 +46 @@
     UpdateXmlSerializer serializer = null;
     FileWrapperFactory fileWrapperFactory = new FileWrapperFactoryImpl(); 
+    IProxySettings proxySettings = new ProxySettings();
     
     @Before
@@ -63 +66 @@
         int port = 80;
         //UpdateUtil util = new UpdateUtilImpl();
-        utilUnderTest.downloadHttpUpdateFile(host, port, file, "/tmp", -1, -1);
+        utilUnderTest.downloadHttpUpdateFile(host, port, file, "/tmp", -1, -1, proxySettings);
         verifyFileExistsAndDeleteIt("firebird_object_tree.jpg", false);
     }
@@ -70 +73 @@
     public void downloadHttpFile() throws Exception {
         String host = "squirrel-sql.sourceforge.net";
-        String file = "release.xml";
+        String file = UpdateUtil.RELEASE_XML_FILENAME;
         //String path = "/release/snapshot/";
         int port = 80;
-        utilUnderTest.downloadHttpUpdateFile(host, port, file, "/tmp", -1, -1);
-        verifyFileExistsAndDeleteIt("release.xml", false);
+        utilUnderTest.downloadHttpUpdateFile(host, port, file, "/tmp", -1, -1, proxySettings);
+        verifyFileExistsAndDeleteIt(file, false);
     }
 
@@ -95 +98 @@
         String host = "http://squirrel-sql.sourceforge.net";
         String path = "/release/snapshot/";
-        String file = "release.xml";
+        String file = UpdateUtil.RELEASE_XML_FILENAME;
         
-        ChannelXmlBean bean = utilUnderTest.downloadCurrentRelease(host, 80, path, file);
+        ChannelXmlBean bean = utilUnderTest.downloadCurrentRelease(host, 80, path, file, proxySettings);
         assertNotNull(bean);
         serializer.write(bean, "/tmp/test.xml");