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

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

Author: mark.little at jboss.com
Date: 2007-01-12 17:26:20 -0500 (Fri, 12 Jan 2007)
New Revision: 8844

Modified:
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/listenerFile.xml
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/util/tests/EPRManagerUnitTest.java
Log:
http://jira.jboss.com/jira/browse/JBESB-343

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java	2007-01-12 21:40:03 UTC (rev 8843)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java	2007-01-12 22:26:20 UTC (rev 8844)
@@ -58,9 +58,13 @@
 	static String stringFromFile(File file) throws Exception
 	{
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		if (!file.exists()) {
-			System.err.println("File does not exist: " + file.getAbsolutePath());
+		
+		if (!file.exists())
+		{
+			System.err
+					.println("File does not exist: " + file.getAbsolutePath());
 		}
+		
 		FileInputStream inp = new FileInputStream(file);
 		byte[] ba = new byte[1000];
 		int iQ;
@@ -149,17 +153,17 @@
 			assertTrue(false);
 		}
 	}
-	
-	protected final void runAfterAllTests ()
+
+	protected final void runAfterAllTests()
 	{
 		try
 		{
 			Thread.sleep(1000);
 			Statement stmnt = con.createStatement();
-			
+
 			stmnt.execute("SHUTDOWN");
 			stmnt.close();
-			
+
 			con.close();
 		}
 		catch (Exception ex)
@@ -174,13 +178,17 @@
 	protected static Logger _logger = Logger
 			.getLogger(ListenerManagerBaseTest.class);
 
-	static File _returnFile =  new File(TMP_DIR, "ListenerManagerOutput.txt");
+	static File _returnFile = new File(TMP_DIR, "ListenerManagerOutput.txt");
 	static
 	{
-		try {_returnFile = File
-			.createTempFile("ListenerManagerOutput", ".txt", new File(TMP_DIR));
+		try
+		{
+			_returnFile = File.createTempFile("ListenerManagerOutput", ".txt",
+					new File(TMP_DIR));
 		}
-		catch (IOException e) {/*  OK  just leave the default fixed name*/}
+		catch (IOException e)
+		{/* OK just leave the default fixed name */
+		}
 	};
 
 	ListenerManager _manager;
@@ -192,7 +200,7 @@
 	private static String mDbUsername;
 
 	private static String mDbPassword;
-	
+
 	private static Connection con;
 
 	public static class MockMessageAwareAction

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/listenerFile.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/listenerFile.xml	2007-01-12 21:40:03 UTC (rev 8843)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/listenerFile.xml	2007-01-12 22:26:20 UTC (rev 8844)
@@ -9,7 +9,7 @@
 		<EPR
 			URL="file:///tmp"
 			inputSuffix=".testFile"
-			postDelete="false"
+			postDelete="true"
 			postSuffix=".processedOK"
 		/>
 		

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/util/tests/EPRManagerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/util/tests/EPRManagerUnitTest.java	2007-01-12 21:40:03 UTC (rev 8843)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/util/tests/EPRManagerUnitTest.java	2007-01-12 22:26:20 UTC (rev 8844)
@@ -81,6 +81,16 @@
 			
 			fail(ex.toString());
 		}
+		finally
+		{
+			try
+			{
+				manager.removeEPR("MyEmail");
+			}
+			catch (Exception ex)
+			{
+			}
+		}
 	}
 	
 	public void testSpecificInputOutput ()
@@ -109,6 +119,16 @@
 			
 			fail(ex.toString());
 		}
+		finally
+		{
+			try
+			{
+				manager.removeEPR("MyEmail");
+			}
+			catch (Exception ex)
+			{
+			}
+		}
 	}
 
 }