[jboss-svn-commits] JBL Code SVN: r8442 - labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners

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

Author: mark.little at jboss.com
Date: 2006-12-20 10:56:57 -0500 (Wed, 20 Dec 2006)
New Revision: 8442

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/ListenerManagerFileUnitTest.java
Log:
Fix.

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	2006-12-20 15:47:40 UTC (rev 8441)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFTPIntegrationTest.java	2006-12-20 15:56:57 UTC (rev 8442)
@@ -43,13 +43,13 @@
 
 	public ListenerManagerFTPIntegrationTest ()
 	{
-		setConfig("listenerFTP.xml");
+		_file = "listenerFTP.xml";
 	}
 	
-	protected void oneTest (String fileName) throws Exception
+	protected void oneTest () throws Exception
 	{
 		// Write wome messages to EPR obtained from configuration file
-		String configFile = getClass().getResource(fileName).getFile();
+		String configFile = getClass().getResource(_file).getFile();
 		ConfigTree tree = ConfigTree.fromInputStream(new FileInputStream(
 				configFile));
 		String url = null;
@@ -75,7 +75,7 @@
 		else
 			Assert.fail();
 		
-		String THE_TEXT = "___Config=" + fileName + "___ Message Content ___";
+		String THE_TEXT = "___Config=" + _file + "___ Message Content ___";
 
 		int howMany = 10; // how many messages do you want to send before the
 							// listener comes up

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java	2006-12-20 15:47:40 UTC (rev 8441)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java	2006-12-20 15:56:57 UTC (rev 8442)
@@ -41,7 +41,7 @@
 {
 	public ListenerManagerFileUnitTest ()
 	{
-		setConfig("listenerFile.xml");
+		_file = "listenerFile.xml";
 	}
 
 	public void testListener ()
@@ -51,7 +51,7 @@
 		
 		try
 		{
-			oneTest(_file);
+			oneTest();
 		}
 		catch (Exception ex)
 		{
@@ -80,15 +80,10 @@
 		_returnFile.delete();
 	}
 	
-	protected final void setConfig (String config)
-	{
-		_file = config;
-	}
-	
-	protected void oneTest (String fileName) throws Exception
+	protected void oneTest () throws Exception
 	{	
 		// Write wome messages to EPR obtained from configuration file
-		String configFile = getClass().getResource(fileName).getFile();
+		String configFile = getClass().getResource(_file).getFile();
 		ConfigTree tree = ConfigTree.fromInputStream(new FileInputStream(
 				configFile));
 		final File tmpDir = new File(System.getProperty("java.io.tmpdir")) ;
@@ -110,7 +105,7 @@
 		else
 			fail();
 		
-		String THE_TEXT = "___Config=" + fileName + "___ Message Content ___";
+		String THE_TEXT = "___Config=" + _file + "___ Message Content ___";
 
 		int howMany = 10; // how many messages do you want to send before the
 							// listener comes up