[jboss-svn-commits] JBL Code SVN: r6240 - labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Sep 15 11:43:20 EDT 2006


Author: tfennelly
Date: 2006-09-15 11:43:09 -0400 (Fri, 15 Sep 2006)
New Revision: 6240

Modified:
   labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig1.xml
   labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig2.xml
   labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig3.xml
   labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig4.xml
   labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig5.xml
   labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig6.xml
   labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/DirectoryPollerConfig1.xml
   labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/JmsQueueListenerConfig.xml
   labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/JmsQueueListenerTest.java
   labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/ListenerManagerTest.java
   labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/SQLTablePollerConfig1.xml
   labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/SQLTablePollerTest.java
Log:
cleaning up the SQLTable poller stuff.

Modified: labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig1.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig1.xml	2006-09-15 15:41:52 UTC (rev 6239)
+++ labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig1.xml	2006-09-15 15:43:09 UTC (rev 6240)
@@ -10,25 +10,32 @@
 >
    <PollDirectoryExample
    	listenerClass="org.jboss.soa.esb.listeners.DirectoryPoller"
-   	actionClass="org.jboss.soa.esb.actions.FileCopier"
+   	actions="FileCopy1, FileCopy2"
    	pollLatencySecs="2"
 	maxThreads="2"
 	inputDirURI="@qa.build@/inputDir"
 	inputSuffix=".inp"
-	workSuffix=".COPYING"
-	errorSuffix=".COPYERR"
+	workSuffix=".WORKING"
+	errorSuffix=".PROCERR"
 	postDirURI="@qa.build@/inputDoneDir"
 	postSuffix=".DONE"
 	postDelete="n"
    > 
-	<CopyTo 
-		copyToDirURI="@qa.build@/copiedTo" 
-		copyToSuffix=".outFromFirst"
-	/>
-	<CopyTo 
-		copyToDirURI="@qa.build@/copiedTo" 
-		copyToSuffix=".outFromSecond"
-	/>
    </PollDirectoryExample>
+   
+	<Actions>
+		<Action name="FileCopy1" processor="FileCopier">
+			<property name="copyToDirURI" value="@qa.build@/copiedTo"/>
+			<property name="copyToSuffix" value=".outFromFirst"/>
+		</Action>
+		<Action name="FileCopy2" processor="FileCopier">
+			<property name="copyToDirURI" value="@qa.build@/copiedTo"/>
+			<property name="copyToSuffix" value=".outFromSecond"/>
+		</Action>
 
+		<ProcessorAliases>
+			<Alias name="FileCopier" class="org.jboss.soa.esb.actions.FileCopier" />
+		</ProcessorAliases>
+	</Actions>
+
 </FileCopierExample>

Modified: labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig2.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig2.xml	2006-09-15 15:41:52 UTC (rev 6239)
+++ labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig2.xml	2006-09-15 15:43:09 UTC (rev 6240)
@@ -10,25 +10,32 @@
 >
    <PollDirectoryExample
    	listenerClass="org.jboss.soa.esb.listeners.DirectoryPoller"
-   	actionClass="org.jboss.soa.esb.actions.FileCopier"
+   	actions="FileCopy1, FileCopy2"
    	pollLatencySecs="2"
 	maxThreads="2"
 	inputDirURI="@qa.build@/inputDir"
 	inputSuffix=".inp"
-	workSuffix=".COPYING"
-	errorSuffix=".COPYERR"
+	workSuffix=".WORKING"
+	errorSuffix=".PROCERR"
 	postDirURI="@qa.build@/inputDoneDir"
 	postSuffix=".DONE"
 	postDelete="n"
    > 
-	<CopyTo 
-		copyToDirURI="@qa.build@/copiedTo" 
-		copyToSuffix=".outFromFirst"
-	/>
-	<CopyTo 
-		copyToDirURI="@qa.build@/copiedTo" 
-		copyToSuffix=".outFromSecond"
-	/>
    </PollDirectoryExample>
+   
+	<Actions>
+		<Action name="FileCopy1" processor="FileCopier">
+			<property name="copyToDirURI" value="@qa.build@/copiedTo"/>
+			<property name="copyToSuffix" value=".outFromFirst"/>
+		</Action>
+		<Action name="FileCopy2" processor="FileCopier">
+			<property name="copyToDirURI" value="@qa.build@/copiedTo"/>
+			<property name="copyToSuffix" value=".outFromSecond"/>
+		</Action>
 
+		<ProcessorAliases>
+			<Alias name="FileCopier" class="org.jboss.soa.esb.actions.FileCopier" />
+		</ProcessorAliases>
+	</Actions>
+
 </FileCopierExample>

Modified: labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig3.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig3.xml	2006-09-15 15:41:52 UTC (rev 6239)
+++ labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig3.xml	2006-09-15 15:43:09 UTC (rev 6240)
@@ -10,25 +10,32 @@
 >
    <PollDirectoryExample
    	listenerClass="org.jboss.soa.esb.listeners.DirectoryPoller"
-   	actionClass="org.jboss.soa.esb.actions.FileCopier"
+   	actions="FileCopy1, FileCopy2"
    	pollLatencySecs="2"
 	maxThreads="2"
 	inputDirURI="@qa.build@/inputDir"
 	inputSuffix=".inp"
-	workSuffix=".COPYING"
-	errorSuffix=".COPYERR"
+	workSuffix=".WORKING"
+	errorSuffix=".PROCERR"
 	postDirURI="@qa.build@/inputDoneDir"
 	postSuffix=".DONE"
 	postDelete="n"
    > 
-	<CopyTo 
-		copyToDirURI="@qa.build@/copiedTo" 
-		copyToSuffix=".outFromFirst"
-	/>
-	<CopyTo 
-		copyToDirURI="@qa.build@/copiedTo" 
-		copyToSuffix=".outFromSecond"
-	/>
    </PollDirectoryExample>
+   
+	<Actions>
+		<Action name="FileCopy1" processor="FileCopier">
+			<property name="copyToDirURI" value="@qa.build@/copiedTo"/>
+			<property name="copyToSuffix" value=".outFromFirst"/>
+		</Action>
+		<Action name="FileCopy2" processor="FileCopier">
+			<property name="copyToDirURI" value="@qa.build@/copiedTo"/>
+			<property name="copyToSuffix" value=".outFromSecond"/>
+		</Action>
 
+		<ProcessorAliases>
+			<Alias name="FileCopier" class="org.jboss.soa.esb.actions.FileCopier" />
+		</ProcessorAliases>
+	</Actions>
+
 </FileCopierExample>

Modified: labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig4.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig4.xml	2006-09-15 15:41:52 UTC (rev 6239)
+++ labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig4.xml	2006-09-15 15:43:09 UTC (rev 6240)
@@ -10,25 +10,32 @@
 >
    <PollDirectoryExample
    	listenerClass="org.jboss.soa.esb.listeners.DirectoryPoller"
-   	actionClass="org.jboss.soa.esb.actions.FileCopier"
+   	actions="FileCopy1, FileCopy2"
    	pollLatencySecs="2"
 	maxThreads="2"
 	inputDirURI="@qa.build@/inputDir"
 	inputSuffix=".inp"
-	workSuffix=".COPYING"
-	errorSuffix=".COPYERR"
+	workSuffix=".WORKING"
+	errorSuffix=".PROCERR"
 	postDirURI="@qa.build@/inputDoneDir"
 	postSuffix=".DONE"
 	postDelete="n"
    > 
-	<CopyTo 
-		copyToDirURI="@qa.build@/copiedTo" 
-		copyToSuffix=".outFromFirst"
-	/>
-	<CopyTo 
-		copyToDirURI="@qa.build@/copiedTo" 
-		copyToSuffix=".outFromSecond"
-	/>
    </PollDirectoryExample>
+   
+	<Actions>
+		<Action name="FileCopy1" processor="FileCopier">
+			<property name="copyToDirURI" value="@qa.build@/copiedTo"/>
+			<property name="copyToSuffix" value=".outFromFirst"/>
+		</Action>
+		<Action name="FileCopy2" processor="FileCopier">
+			<property name="copyToDirURI" value="@qa.build@/copiedTo"/>
+			<property name="copyToSuffix" value=".outFromSecond"/>
+		</Action>
 
+		<ProcessorAliases>
+			<Alias name="FileCopier" class="org.jboss.soa.esb.actions.FileCopier" />
+		</ProcessorAliases>
+	</Actions>
+
 </FileCopierExample>

Modified: labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig5.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig5.xml	2006-09-15 15:41:52 UTC (rev 6239)
+++ labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig5.xml	2006-09-15 15:43:09 UTC (rev 6240)
@@ -10,25 +10,32 @@
 >
    <PollDirectoryExample
    	listenerClass="org.jboss.soa.esb.listeners.DirectoryPoller"
-   	actionClass="org.jboss.soa.esb.actions.FileCopier"
+   	actions="FileCopy1, FileCopy2"
    	pollLatencySecs="2"
 	maxThreads="2"
 	inputDirURI="@qa.build@/inputDir"
 	inputSuffix=".inp"
-	workSuffix=".COPYING"
-	errorSuffix=".COPYERR"
+	workSuffix=".WORKING"
+	errorSuffix=".PROCERR"
 	postDirURI="@qa.build@/inputDoneDir"
 	postSuffix=".DONE"
 	postDelete="n"
    > 
-	<CopyTo 
-		copyToDirURI="@qa.build@/copiedTo" 
-		copyToSuffix=".outFromFirst"
-	/>
-	<CopyTo 
-		copyToDirURI="@qa.build@/copiedTo" 
-		copyToSuffix=".outFromSecond"
-	/>
    </PollDirectoryExample>
+   
+	<Actions>
+		<Action name="FileCopy1" processor="FileCopier">
+			<property name="copyToDirURI" value="@qa.build@/copiedTo"/>
+			<property name="copyToSuffix" value=".outFromFirst"/>
+		</Action>
+		<Action name="FileCopy2" processor="FileCopier">
+			<property name="copyToDirURI" value="@qa.build@/copiedTo"/>
+			<property name="copyToSuffix" value=".outFromSecond"/>
+		</Action>
 
+		<ProcessorAliases>
+			<Alias name="FileCopier" class="org.jboss.soa.esb.actions.FileCopier" />
+		</ProcessorAliases>
+	</Actions>
+
 </FileCopierExample>

Modified: labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig6.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig6.xml	2006-09-15 15:41:52 UTC (rev 6239)
+++ labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/BadConfig6.xml	2006-09-15 15:43:09 UTC (rev 6240)
@@ -10,25 +10,32 @@
 >
    <PollDirectoryExample
    	listenerClass="org.jboss.soa.esb.listeners.DirectoryPoller"
-   	actionClass="org.jboss.soa.esb.actions.FileCopier"
+   	actions="FileCopy1, FileCopy2"
    	pollLatencySecs="2"
 	maxThreads="2"
 	inputDirURI="@qa.build@/inputDir"
 	inputSuffix=".inp"
-	workSuffix=".COPYING"
-	errorSuffix=".COPYERR"
+	workSuffix=".WORKING"
+	errorSuffix=".PROCERR"
 	postDirURI="@qa.build@/inputDoneDir"
 	postSuffix=".DONE"
 	postDelete="n"
    > 
-	<CopyTo 
-		copyToDirURI="@qa.build@/copiedTo" 
-		copyToSuffix=".outFromFirst"
-	/>
-	<CopyTo 
-		copyToDirURI="@qa.build@/copiedTo" 
-		copyToSuffix=".outFromSecond"
-	/>
    </PollDirectoryExample>
+   
+	<Actions>
+		<Action name="FileCopy1" processor="FileCopier">
+			<property name="copyToDirURI" value="@qa.build@/copiedTo"/>
+			<property name="copyToSuffix" value=".outFromFirst"/>
+		</Action>
+		<Action name="FileCopy2" processor="FileCopier">
+			<property name="copyToDirURI" value="@qa.build@/copiedTo"/>
+			<property name="copyToSuffix" value=".outFromSecond"/>
+		</Action>
 
+		<ProcessorAliases>
+			<Alias name="FileCopier" class="org.jboss.soa.esb.actions.FileCopier" />
+		</ProcessorAliases>
+	</Actions>
+
 </FileCopierExample>

Modified: labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/DirectoryPollerConfig1.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/DirectoryPollerConfig1.xml	2006-09-15 15:41:52 UTC (rev 6239)
+++ labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/DirectoryPollerConfig1.xml	2006-09-15 15:43:09 UTC (rev 6240)
@@ -8,25 +8,32 @@
 >
    <PollDirectoryExample
    	listenerClass="org.jboss.soa.esb.listeners.DirectoryPoller"
-   	actionClass="org.jboss.soa.esb.actions.FileCopier"
+   	actions="FileCopy1, FileCopy2"
    	pollLatencySecs="2"
 	maxThreads="2"
 	inputDirURI="@qa.build@/inputDir"
 	inputSuffix=".inp"
-	workSuffix=".COPYING"
-	errorSuffix=".COPYERR"
+	workSuffix=".WORKING"
+	errorSuffix=".PROCERR"
 	postDirURI="@qa.build@/inputDoneDir"
 	postSuffix=".DONE"
 	postDelete="n"
    > 
-	<CopyTo 
-		copyToDirURI="@qa.build@/copiedTo" 
-		copyToSuffix=".outFromFirst"
-	/>
-	<CopyTo 
-		copyToDirURI="@qa.build@/copiedTo" 
-		copyToSuffix=".outFromSecond"
-	/>
    </PollDirectoryExample>
+   
+	<Actions>
+		<Action name="FileCopy1" processor="FileCopier">
+			<property name="copyToDirURI" value="@qa.build@/copiedTo"/>
+			<property name="copyToSuffix" value=".outFromFirst"/>
+		</Action>
+		<Action name="FileCopy2" processor="FileCopier">
+			<property name="copyToDirURI" value="@qa.build@/copiedTo"/>
+			<property name="copyToSuffix" value=".outFromSecond"/>
+		</Action>
 
+		<ProcessorAliases>
+			<Alias name="FileCopier" class="org.jboss.soa.esb.actions.FileCopier" />
+		</ProcessorAliases>
+	</Actions>
+
 </FileCopierExample>

Modified: labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/JmsQueueListenerConfig.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/JmsQueueListenerConfig.xml	2006-09-15 15:41:52 UTC (rev 6239)
+++ labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/JmsQueueListenerConfig.xml	2006-09-15 15:43:09 UTC (rev 6240)
@@ -11,7 +11,7 @@
 
    <QueueExample
    	listenerClass="org.jboss.soa.esb.listeners.JmsQueueListener"
-   	actionClass="org.jboss.soa.esb.actions.FileCopier"
+   	actions="CaptureMessage"
 	maxThreads="1"
 	queueConnFactoryClass="ConnectionFactory"
 	listenJndiType="jboss"
@@ -36,4 +36,12 @@
 	</NotificationList>
    </QueueExample>
 
+	<Actions>
+		<Action name="CaptureMessage" processor="MessageBox" />
+
+		<ProcessorAliases>
+			<Alias name="MessageBox" class="org.jboss.soa.esb.listeners.MessageBox" />
+		</ProcessorAliases>
+	</Actions>
+
 </JmsListenerExample>

Modified: labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/JmsQueueListenerTest.java
===================================================================
--- labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/JmsQueueListenerTest.java	2006-09-15 15:41:52 UTC (rev 6239)
+++ labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/JmsQueueListenerTest.java	2006-09-15 15:43:09 UTC (rev 6240)
@@ -49,14 +49,21 @@
     public void test() throws InterruptedException {
         // There should have been no exceptions...
         listenersMgr.assertNotInException();
+
+        MessageBox.messages.clear();
+        
         // Send a request via jms
-        JMSClientUtil.sendMessageToQueue("hello is anyone there?", JMSClientUtil.QUEUE.A, new KeyValuePair[] {new KeyValuePair("gpMsgSelector", "zambia")});
+        JMSClientUtil.sendMessageToQueue("hello is anyone there?", JMSClientUtil.QUEUE.A, new KeyValuePair[] {new KeyValuePair("listener", "zambia")});
 
-        //
-        //
-        //Check if the file was written, or if there is any acknowledgement from the listener
-        //
-        //
+        // Check did the messagebox recevive the message from the JMSListener...
+        MessageBox.assertMessageCount(1, 10000);
+        
+        // Make sure the notifications appear in the "notifyDir" dir...
+        FileUtils.assertFileExists(new File(notifyDir, "JmsQueueListenerExample.notifOK"), 10000);
+        FileUtils.assertCanDelete(new File(notifyDir, "JmsQueueListenerExample.notifOK"), 10000);     
+        
+        // There should have been no exceptions...
+        listenersMgr.assertNotInException();
 
         // Send a Shutdown message to the command queue...
         JMSClientUtil.sendMessageToQueue("shutdown", JMSClientUtil.QUEUE.A, new KeyValuePair[] {new KeyValuePair("gpMsgSelector", "zambia")});

Modified: labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/ListenerManagerTest.java
===================================================================
--- labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/ListenerManagerTest.java	2006-09-15 15:41:52 UTC (rev 6239)
+++ labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/ListenerManagerTest.java	2006-09-15 15:43:09 UTC (rev 6240)
@@ -24,6 +24,7 @@
 import javax.naming.CommunicationException;
 import javax.naming.NameNotFoundException;
 
+import org.jboss.soa.esb.command.CommandQueueException;
 import org.jboss.soa.esb.util.ClassUtils;
 import org.jboss.soa.esb.util.ListenerUtils;
 
@@ -58,11 +59,11 @@
 				fail("[Param '" + paramName + "' test] No exception being thrown for bad param config!! Expected Exception: " + expectedException.getName());
 			}
 		} catch(AssertionFailedError e) {
-			throw e;
-		} catch(Throwable e) {
+			throw e;            
+		} catch(CommandQueueException e) {
 			if(expectedException == null) {
 				fail("[Param '" + paramName + "' test] Unexpected Exception: " + e.getClass().getName() + ": " + e.getMessage());
-			} else if(!expectedException.isInstance(e)) {
+			} else if(!expectedException.isInstance(e) && !expectedException.isInstance(e.getCause())) {
 				fail("[Param '" + paramName + "' test] Expected Exception: " + expectedException.getName() + ".  Got " + e.getClass().getName() + ": " + e.getMessage());
 			}
 			// Is the expected Exception!!

Modified: labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/SQLTablePollerConfig1.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/SQLTablePollerConfig1.xml	2006-09-15 15:41:52 UTC (rev 6239)
+++ labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/SQLTablePollerConfig1.xml	2006-09-15 15:43:09 UTC (rev 6240)
@@ -9,7 +9,7 @@
 
    <PollSqlTableExample
 	   	listenerClass="org.jboss.soa.esb.listeners.SqlTablePoller"
-	   	actionClass="org.jboss.soa.esb.actions.DummySqlRowAction"
+	   	actions="CaptureMessage, ProcessMessageFromSQL"
 	   	pollLatencySecs="2"
 		maxThreads="2"
     	connection-url="@db.url@"
@@ -38,6 +38,23 @@
 			/>
 		</target> 
 	</NotificationList>
+	
+	<Actions>
+		<Action name="CaptureMessage" processor="MessageBox" />
+		<Action name="ProcessMessageFromSQL" processor="SQLProcessor">
+			<!-- This duplication of the DB connection details will exist until we make the actions channel/listener agnostic. -->
+			<property name="connection-url" value="@db.url@" />
+			<property name="driver-class" value="@db.driver@" />
+			<property name="user-name" value="@db.user@" />
+			<property name="password" value="@db.password@" />
+		</Action>
+
+		<ProcessorAliases>
+			<Alias name="MessageBox" class="org.jboss.soa.esb.listeners.MessageBox" />
+			<Alias name="SQLProcessor" class="org.jboss.soa.esb.actions.DummySqlRowAction" />
+		</ProcessorAliases>
+	</Actions>
+	
    </PollSqlTableExample>
    
 </LoanBrokerExample>

Modified: labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/SQLTablePollerTest.java
===================================================================
--- labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/SQLTablePollerTest.java	2006-09-15 15:41:52 UTC (rev 6239)
+++ labs/jbossesb/workspace/tfennelly/qa/junit/src/org/jboss/soa/esb/listeners/SQLTablePollerTest.java	2006-09-15 15:43:09 UTC (rev 6240)
@@ -24,7 +24,9 @@
 import java.io.File;
 import java.sql.SQLException;
 
+import org.jboss.soa.esb.actions.DummySqlRowAction;
 import org.jboss.soa.esb.helpers.KeyValuePair;
+import org.jboss.soa.esb.listeners.SqlTablePoller.SQLPollResult;
 import org.jboss.soa.esb.util.ClassUtils;
 import org.jboss.soa.esb.util.DbUtils;
 import org.jboss.soa.esb.util.FileUtils;
@@ -54,6 +56,9 @@
 	}
 
 	public void test() throws InterruptedException, SQLException {
+        MessageBox.messages.clear();
+        DummySqlRowAction.params.clear();
+        
 		// Insert the row into the table and wait for the status to go to "P" (Pending) to "D" (Done)...
 		int insertCount = DbUtils.executeUpdate("insert into test_poll_table values ('pepe','ref1','An arbitrary message', '1111111111','2222222222','P')");
 
@@ -62,9 +67,18 @@
 		// FIXME: This assertion is broken - prob something wrong with the listener config - it's status isn't changing to "D" (Done)  
 		DbUtils.assertNonEmptyResultSet("select * from test_poll_table where src='pepe' and ref='ref1' and status='D'", 10000);
 
+        // Check did the messagebox recevive the message from the JMSListener...
+        MessageBox.assertMessageCount(1, 10000);
+        assertEquals(1, DummySqlRowAction.params.size());
+        SQLPollResult pollResult = DummySqlRowAction.params.get(0);
+        
+        // Check the rowset values...
+        assertEquals("ref1", pollResult.get("ref"));
+        assertEquals("An arbitrary message", pollResult.get("msg"));
+        assertEquals("2222222222", pollResult.get("val2"));
+        
 		// Make sure the notifications appear in the "notifyDir" dir...
 		FileUtils.assertFileExists(new File(notifyDir, "GpListenerExample.notifOK"), 10000);
-		// Make sure there's no open file handles on the files created/copied by the ESB...
 		FileUtils.assertCanDelete(new File(notifyDir, "GpListenerExample.notifOK"), 10000);		
 		
 		// There should have been no exceptions...




More information about the jboss-svn-commits mailing list