[jboss-svn-commits] JBL Code SVN: r8255 - in labs/jbossesb/trunk/product: . core/rosetta/tests core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests core/rosetta/tests/src/org/jboss/soa/esb/common/tests
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Dec 12 10:40:47 EST 2006
Author: kevin.conner at jboss.com
Date: 2006-12-12 10:40:42 -0500 (Tue, 12 Dec 2006)
New Revision: 8255
Modified:
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/core/rosetta/tests/build.xml
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerUnitTest.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java
Log:
Updated FTP tests to allow for configuration
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2006-12-12 15:03:00 UTC (rev 8254)
+++ labs/jbossesb/trunk/product/build.xml 2006-12-12 15:40:42 UTC (rev 8255)
@@ -74,6 +74,7 @@
fork="true" failonerror="true">
<sysproperty key="ant.home" value="${ant.home}"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
+ <sysproperty key="org.jboss.esb.properties" value="${org.jboss.esb.properties}"/>
<arg value="-cp"/>
<arg value="${junit.jar}"/>
<arg value="-f"/>
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/build.xml 2006-12-12 15:03:00 UTC (rev 8254)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/build.xml 2006-12-12 15:40:42 UTC (rev 8255)
@@ -17,6 +17,9 @@
<!-- Load deployment properties File -->
<property file="${org.jboss.esb.deployment.properties}"/>
+ <property name="org.jboss.esb.test.ftp.hostname" value="ftp.ncl.ac.uk"/>
+ <property name="org.jboss.esb.test.ftp.user" value="anonymous"/>
+ <property name="org.jboss.esb.test.ftp.dir" value="/pub/DNS"/>
<condition property="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.jboss.home}/client">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
@@ -113,6 +116,9 @@
<sysproperty key="org.jboss.esb.test.db.url" value="${org.jboss.esb.test.db.url}"/>
<sysproperty key="org.jboss.esb.test.db.user" value="${org.jboss.esb.test.db.user}"/>
<sysproperty key="org.jboss.esb.test.db.password" value="${org.jboss.esb.test.db.password}"/>
+ <sysproperty key="org.jboss.esb.test.ftp.hostname" value="${org.jboss.esb.test.ftp.hostname}"/>
+ <sysproperty key="org.jboss.esb.test.ftp.user" value="${org.jboss.esb.test.ftp.user}"/>
+ <sysproperty key="org.jboss.esb.test.ftp.dir" value="${org.jboss.esb.test.ftp.dir}"/>
<sysproperty key="log4j.configuration" value="log4j.xml"/>
</junit>
<junitreport>
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerUnitTest.java 2006-12-12 15:03:00 UTC (rev 8254)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerUnitTest.java 2006-12-12 15:40:42 UTC (rev 8255)
@@ -27,14 +27,11 @@
import junit.framework.Assert;
import junit.framework.JUnit4TestAdapter;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
import org.jboss.internal.soa.esb.couriers.helpers.FileHandlerFactory;
import org.jboss.internal.soa.esb.couriers.helpers.FtpFileHandler;
import org.jboss.soa.esb.addressing.eprs.FTPEpr;
+import org.jboss.soa.esb.common.tests.BaseTest;
import org.jboss.soa.esb.couriers.CourierException;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -43,21 +40,8 @@
* @since Version 4.0
*
*/
-public class FtpFileHandlerUnitTest
+public class FtpFileHandlerUnitTest extends BaseTest
{
- private static Logger _logger = Logger.getLogger(FtpFileHandlerUnitTest.class);
-
- @BeforeClass
- public static void setUp() throws Exception
- {
- _logger.setLevel(Level.DEBUG);
- }
-
- @AfterClass
- public static void tearDown() throws Exception
- {
- }
-
public static junit.framework.Test suite()
{
return new JUnit4TestAdapter(FtpFileHandlerUnitTest.class);
@@ -119,7 +103,7 @@
Assert.fail();
}
- ftpEpr = new FTPEpr("ftp://anonymous@ftp.ncl.ac.uk:9090");
+ ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + ":9090");
try
{
@@ -139,7 +123,7 @@
Assert.fail();
}
- ftpEpr = new FTPEpr("ftp://anonymous@ftp.ncl.ac.uk");
+ ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname());
try
{
@@ -163,9 +147,7 @@
@Test
public void testValidConnect () throws Exception
{
- @SuppressWarnings("unused")
- File theFile = new File("test1234567890.txt");
- FTPEpr ftpEpr = new FTPEpr("ftp://anonymous@ftp.ncl.ac.uk/pub");
+ FTPEpr ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());
try
{
@@ -186,7 +168,7 @@
public void testDeleteBadFile () throws Exception
{
File theFile = new File("test1234567890.txt");
- FTPEpr ftpEpr = new FTPEpr("ftp://anonymous@ftp.ncl.ac.uk/pub");
+ FTPEpr ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());
try
{
@@ -209,7 +191,7 @@
@Test
public void testGetFileList () throws Exception
{
- FTPEpr ftpEpr = new FTPEpr("ftp://anonymous@ftp.ncl.ac.uk/pub");
+ FTPEpr ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());
try
{
@@ -230,7 +212,7 @@
@Test
public void testGetFile () throws Exception
{
- FTPEpr ftpEpr = new FTPEpr("ftp://anonymous@ftp.ncl.ac.uk/pub/DNS");
+ FTPEpr ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());
try
{
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java 2006-12-12 15:03:00 UTC (rev 8254)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java 2006-12-12 15:40:42 UTC (rev 8255)
@@ -58,6 +58,15 @@
/** The Database password used for unit tests */
public static String DB_PASSWORD = "org.jboss.esb.test.db.password";
+
+ /** The FTP hostname used for unit tests **/
+ public static String FTP_HOSTNAME = "org.jboss.esb.test.ftp.hostname" ;
+
+ /** The FTP user used for unit tests **/
+ public static String FTP_USER = "org.jboss.esb.test.ftp.user" ;
+
+ /** The FTP directory used for unit tests **/
+ public static String FTP_DIR = "org.jboss.esb.test.ftp.dir" ;
/** The Logger. */
protected Logger log = Logger.getLogger(getClass());
@@ -102,6 +111,12 @@
.getProperty(DB_USERNAME, "sa");
String dbPassword = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CONNECTION_MODULE)
.getProperty(DB_PASSWORD, "");
+ String ftpHostname = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CONNECTION_MODULE)
+ .getProperty(FTP_HOSTNAME, "ftp.ncl.ac.uk");
+ String ftpUser = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CONNECTION_MODULE)
+ .getProperty(FTP_USER, "anonymous");
+ String ftpDir = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CONNECTION_MODULE)
+ .getProperty(FTP_DIR, "/pub/DNS");
// Setting the paremeters in the HashMap
HashMap<String, String> systemParameters = new HashMap<String, String>();
@@ -109,12 +124,19 @@
systemParameters.put(DB_URL, dbUrl);
systemParameters.put(DB_USERNAME, dbUsername);
systemParameters.put(DB_PASSWORD, dbPassword);
+ systemParameters.put(FTP_HOSTNAME, ftpHostname);
+ systemParameters.put(FTP_USER, ftpUser);
+ systemParameters.put(FTP_DIR, ftpDir);
log.log(Priority.INFO, "DB parameters:");
log.log(Priority.INFO, "Driver=" + dbDriver);
log.log(Priority.INFO, "url=" + dbUrl);
log.log(Priority.INFO, "username=" + dbUsername);
log.log(Priority.INFO, "password=" + dbPassword);
+ log.log(Priority.INFO, "FTP parameters:");
+ log.log(Priority.INFO, "Hostname=" + ftpHostname);
+ log.log(Priority.INFO, "User=" + ftpUser);
+ log.log(Priority.INFO, "Dir=" + ftpDir);
return systemParameters;
}
@@ -138,7 +160,23 @@
{
return SYSTEM_PARAMETERS.get(DB_DRIVER);
}
+
+ protected String getFtpHostname()
+ {
+ return SYSTEM_PARAMETERS.get(FTP_HOSTNAME) ;
+ }
+
+ protected String getFtpUser()
+ {
+ return SYSTEM_PARAMETERS.get(FTP_USER) ;
+ }
+
+ protected String getFtpDir()
+ {
+ return SYSTEM_PARAMETERS.get(FTP_DIR) ;
+ }
+
public Connection getDbConnection() throws SQLException
{
registerJdbcDriver();
More information about the jboss-svn-commits
mailing list