[jboss-svn-commits] JBL Code SVN: r14237 - labs/jbossesb/trunk/product/samples/quickstarts/tests/src/org/jboss/soa/esb/quickstart/test.

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

Author: ldimaggi at redhat.com
Date: 2007-08-14 23:10:12 -0400 (Tue, 14 Aug 2007)
New Revision: 14237

Modified:
   labs/jbossesb/trunk/product/samples/quickstarts/tests/src/org/jboss/soa/esb/quickstart/test/HelloWorldActionTest.java
   labs/jbossesb/trunk/product/samples/quickstarts/tests/src/org/jboss/soa/esb/quickstart/test/HelloWorldTest.java
Log:
Corrected reference to event file - cut and paste error



Modified: labs/jbossesb/trunk/product/samples/quickstarts/tests/src/org/jboss/soa/esb/quickstart/test/HelloWorldActionTest.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/tests/src/org/jboss/soa/esb/quickstart/test/HelloWorldActionTest.java	2007-08-15 03:07:16 UTC (rev 14236)
+++ labs/jbossesb/trunk/product/samples/quickstarts/tests/src/org/jboss/soa/esb/quickstart/test/HelloWorldActionTest.java	2007-08-15 03:10:12 UTC (rev 14237)
@@ -72,10 +72,8 @@
 		Hashtable theTable = Helpers.getMessageString(LOG_FILE);
 		String theMessage = (String) theTable.get("Message1");
 		assertEquals("The strings should match", theMessage, JMS_MESSAGE);
-		// assertEquals("The strings should match", "non-matchinf message",
-		// JMS_MESSAGE);
-		File target = new File(Helpers.getTempDir(LOG_FILE));
-		//target.delete();
+		File target = new File(LOG_FILE);
+		target.delete();
 	}
 
 	public void sendMessage() throws Exception {

Modified: labs/jbossesb/trunk/product/samples/quickstarts/tests/src/org/jboss/soa/esb/quickstart/test/HelloWorldTest.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/tests/src/org/jboss/soa/esb/quickstart/test/HelloWorldTest.java	2007-08-15 03:07:16 UTC (rev 14236)
+++ labs/jbossesb/trunk/product/samples/quickstarts/tests/src/org/jboss/soa/esb/quickstart/test/HelloWorldTest.java	2007-08-15 03:10:12 UTC (rev 14237)
@@ -39,10 +39,14 @@
 
 public class HelloWorldTest extends JBossTestCase {
 	private static final String JMS_MESSAGE = "HelloWorldTest message";
-    private static final String FILE_NAME = "HelloWorldTest.log";
-    private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME) + FILE_NAME;
-    private static final int EXPECTED_RECORD_COUNT = 1;
-    
+
+	private static final String FILE_NAME = "HelloWorldTest.log";
+
+	private static final String LOG_FILE = Helpers.getTempDir(FILE_NAME)
+			+ FILE_NAME;
+
+	private static final int EXPECTED_RECORD_COUNT = 1;
+
 	public HelloWorldTest(String name) {
 		super(name);
 	}
@@ -53,31 +57,34 @@
 		/* Verify that the message file is created */
 		boolean fileExists = Helpers.checkForFile(LOG_FILE);
 		if (!fileExists) {
-			fail ("Event file " + LOG_FILE + " not created - test marked as failing");
-		}        
-        
-        /* Verify that the message file is complete */
-        boolean fileComplete = Helpers.checkFileContent(LOG_FILE, EXPECTED_RECORD_COUNT);
-        if (!fileComplete) {
-        		Hashtable temp = Helpers.getMessageString(LOG_FILE);
-        		File target = new File(LOG_FILE);
-        		target.delete();
-                fail ("Event file " + LOG_FILE + " not complete - expected " + EXPECTED_RECORD_COUNT 
-                		+ " records - found " + temp.size() + ", test marked as failing");
-        }
-        
+			fail("Event file " + LOG_FILE
+					+ " not created - test marked as failing");
+		}
+
+		/* Verify that the message file is complete */
+		boolean fileComplete = Helpers.checkFileContent(LOG_FILE,
+				EXPECTED_RECORD_COUNT);
+		if (!fileComplete) {
+			Hashtable temp = Helpers.getMessageString(LOG_FILE);
+			File target = new File(LOG_FILE);
+			target.delete();
+			fail("Event file " + LOG_FILE + " not complete - expected "
+					+ EXPECTED_RECORD_COUNT + " records - found " + temp.size()
+					+ ", test marked as failing");
+		}
+
 		Hashtable theTable = Helpers.getMessageString(LOG_FILE);
 		String theMessage = (String) theTable.get("Message1");
 		assertEquals("The strings should match", theMessage, JMS_MESSAGE);
-		//assertEquals("The strings should match", "non-matchinf message", JMS_MESSAGE);
-	        File target = new File(Helpers.getTempDir(LOG_FILE));
-        	target.delete();
+		File target = new File(LOG_FILE);
+		target.delete();
 	}
 
 	public void sendMessage() throws Exception {
 		SendJMSMessage sm = new SendJMSMessage();
 		sm.setupConnection();
-		sm.sendAMessage(JMS_MESSAGE + Helpers.START_TAG + FILE_NAME + Helpers.END_TAG);
+		sm.sendAMessage(JMS_MESSAGE + Helpers.START_TAG + FILE_NAME
+				+ Helpers.END_TAG);
 		sm.stop();
 	}