[jboss-svn-commits] JBL Code SVN: r8350 - in labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss: internal/soa/esb/couriers/tests soa/esb/common/tests

[jboss-svn-commits at lists.jboss.org]

Author: mark.little at jboss.com
Date: 2006-12-15 11:17:39 -0500 (Fri, 15 Dec 2006)
New Revision: 8350

Modified:
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/CourierIntegrationTest.java
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerIntegrationTest.java
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java
Log:
Added password configuration for FTP test.

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/CourierIntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/CourierIntegrationTest.java	2006-12-15 15:45:35 UTC (rev 8349)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/CourierIntegrationTest.java	2006-12-15 16:17:39 UTC (rev 8350)
@@ -66,7 +66,10 @@
 	@Test
 	public void testFTPDeliver () throws Exception
 	{
-		deliver("ftp://"+getFtpUser()+"@"+getFtpHostname()+"/"+getFtpDir());
+		if (getFtpPwd() != "")
+			deliver("ftp://"+getFtpUser()+":"+getFtpPwd()+"@"+getFtpHostname()+"/"+getFtpDir());
+		else
+			deliver("ftp://"+getFtpUser()+"@"+getFtpHostname()+"/"+getFtpDir());
 	}
 	
 	@Test
@@ -78,7 +81,10 @@
 	@Test
 	public void pickupFTP () throws Exception
 	{
-		pickup("ftp://"+getFtpUser()+"@"+getFtpHostname()+"/"+getFtpDir());
+		if (getFtpPwd() != "")
+			pickup("ftp://"+getFtpUser()+":"+getFtpPwd()+"@"+getFtpHostname()+"/"+getFtpDir());
+		else
+			pickup("ftp://"+getFtpUser()+"@"+getFtpHostname()+"/"+getFtpDir());
 	}
 	
 	private final FileEpr getEpr(String sUrl) throws Exception

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerIntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerIntegrationTest.java	2006-12-15 15:45:35 UTC (rev 8349)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerIntegrationTest.java	2006-12-15 16:17:39 UTC (rev 8350)
@@ -152,7 +152,12 @@
 	@Test
 	public void testValidConnect () throws Exception
 	{
-		FTPEpr ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());
+		FTPEpr ftpEpr = null;
+		
+		if (getFtpPwd() != "")
+			ftpEpr = new FTPEpr("ftp://" + getFtpUser() + ":" + getFtpPwd()+ "@" + getFtpHostname() + getFtpDir());
+		else
+			ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());
 
 		try
 		{
@@ -196,8 +201,13 @@
 	@Test
 	public void testGetFileList () throws Exception
 	{
-		FTPEpr ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());
-
+		FTPEpr ftpEpr = null;
+		
+		if (getFtpPwd() != "")
+			ftpEpr = new FTPEpr("ftp://" + getFtpUser() + ":" + getFtpPwd()+ "@" + getFtpHostname() + getFtpDir());
+		else
+			ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());
+			
 		try
 		{
 			FtpFileHandler handler = (FtpFileHandler) FileHandlerFactory.getInstance().getFileHandler(ftpEpr);
@@ -217,7 +227,12 @@
 	@Test
 	public void testGetFile () throws Exception
 	{
-		FTPEpr ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());
+		FTPEpr ftpEpr = null;
+		
+		if (getFtpPwd() != "")
+			ftpEpr = new FTPEpr("ftp://" + getFtpUser() + ":" + getFtpPwd()+ "@" + getFtpHostname() + getFtpDir());
+		else
+			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-15 15:45:35 UTC (rev 8349)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java	2006-12-15 16:17:39 UTC (rev 8350)
@@ -67,6 +67,9 @@
 	
 	/** The FTP directory used for unit tests **/
 	public static String FTP_DIR = "org.jboss.esb.test.ftp.dir" ;
+	
+	/** The FTP password for unit tests **/
+	public static String FTP_PWD = "org.jboss.esb.test.ftp.pwd";
 
 	/** The Logger. */
 	protected Logger log = Logger.getLogger(getClass());
@@ -117,7 +120,9 @@
 		.getProperty(FTP_USER, "anonymous");
 		String ftpDir = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CONNECTION_MODULE)
 		.getProperty(FTP_DIR, "/pub/DNS");
-
+		String ftpPwd = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CONNECTION_MODULE)
+		.getProperty(FTP_PWD, "");
+		
 		// Setting the paremeters in the HashMap
 		HashMap<String, String> systemParameters = new HashMap<String, String>();
 		systemParameters.put(DB_DRIVER, dbDriver);
@@ -127,6 +132,7 @@
 		systemParameters.put(FTP_HOSTNAME, ftpHostname);
 		systemParameters.put(FTP_USER, ftpUser);
 		systemParameters.put(FTP_DIR, ftpDir);
+		systemParameters.put(FTP_PWD, ftpPwd);
 
 		log.log(Priority.INFO, "DB parameters:");
 		log.log(Priority.INFO, "Driver=" + dbDriver);
@@ -137,6 +143,7 @@
 		log.log(Priority.INFO, "Hostname=" + ftpHostname);
 		log.log(Priority.INFO, "User=" + ftpUser);
 		log.log(Priority.INFO, "Dir=" + ftpDir);
+		log.log(Priority.INFO, "Password="+ftpPwd);
 
 		return systemParameters;
 	}
@@ -175,8 +182,12 @@
 	{
 		return SYSTEM_PARAMETERS.get(FTP_DIR) ;
 	}
+	
+	protected String getFtpPwd ()
+	{
+		return SYSTEM_PARAMETERS.get(FTP_PWD);
+	}
 
-
 	public Connection getDbConnection() throws SQLException
 	{
 		registerJdbcDriver();