[jboss-svn-commits] JBL Code SVN: r8966 - in labs/jbossesb/trunk/product/core: rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests and 1 other directory.

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

Author: kevin.conner at jboss.com
Date: 2007-01-22 11:21:58 -0500 (Mon, 22 Jan 2007)
New Revision: 8966

Modified:
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFTPIntegrationTest.java
   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
Log:
Fix unittest FTP password checks

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFTPIntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFTPIntegrationTest.java	2007-01-22 14:33:47 UTC (rev 8965)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFTPIntegrationTest.java	2007-01-22 16:21:58 UTC (rev 8966)
@@ -54,7 +54,7 @@
 				configFile));
 		String url = null;
 		
-		if ((getFtpPwd() == "") || (getFtpPwd() == null))
+		if (getFtpPwd() == null)
 			url = "ftp://"+getFtpUser()+"@"+getFtpHostname()+":"+getFtpDir();
 		else
 			url = "ftp://"+getFtpUser()+":"+getFtpPwd()+"@"+getFtpHostname()+":"+getFtpDir();

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	2007-01-22 14:33:47 UTC (rev 8965)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/CourierIntegrationTest.java	2007-01-22 16:21:58 UTC (rev 8966)
@@ -57,7 +57,7 @@
 	
 	public void testDeliverFTP () throws Exception
 	{
-		if (getFtpPwd() != "")
+		if (getFtpPwd() != null)
 			deliver("ftp://"+getFtpUser()+":"+getFtpPwd()+"@"+getFtpHostname()+"/"+getFtpDir());
 		else
 			deliver("ftp://"+getFtpUser()+"@"+getFtpHostname()+"/"+getFtpDir());
@@ -77,7 +77,7 @@
 	{
 		testDeliverFTP();
 		
-		if (getFtpPwd() != "")
+		if (getFtpPwd() != null)
 			pickup("ftp://"+getFtpUser()+":"+getFtpPwd()+"@"+getFtpHostname()+"/"+getFtpDir());
 		else
 			pickup("ftp://"+getFtpUser()+"@"+getFtpHostname()+"/"+getFtpDir());

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	2007-01-22 14:33:47 UTC (rev 8965)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerIntegrationTest.java	2007-01-22 16:21:58 UTC (rev 8966)
@@ -154,7 +154,7 @@
 	{
 		FTPEpr ftpEpr = null;
 		
-		if (getFtpPwd() != "")
+		if (getFtpPwd() != null)
 			ftpEpr = new FTPEpr("ftp://" + getFtpUser() + ":" + getFtpPwd()+ "@" + getFtpHostname() + getFtpDir());
 		else
 			ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());
@@ -203,7 +203,7 @@
 	{
 		FTPEpr ftpEpr = null;
 		
-		if (getFtpPwd() != "")
+		if (getFtpPwd() != null)
 			ftpEpr = new FTPEpr("ftp://" + getFtpUser() + ":" + getFtpPwd()+ "@" + getFtpHostname() + getFtpDir());
 		else
 			ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());
@@ -234,7 +234,7 @@
 	{
 		FTPEpr ftpEpr = null;
 		
-		if (getFtpPwd() != "")
+		if (getFtpPwd() != null)
 			ftpEpr = new FTPEpr("ftp://" + getFtpUser() + ":" + getFtpPwd()+ "@" + getFtpHostname() + getFtpDir());
 		else
 			ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());