[jboss-svn-commits] JBL Code SVN: r17966 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta: tests/src/org/jboss/soa/esb/actions and 1 other directory.

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

Author: mark.little at jboss.com
Date: 2008-01-18 15:42:45 -0500 (Fri, 18 Jan 2008)
New Revision: 17966

Added:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/OtherAggregatorUnitTest.xml
Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/AggregatorUnitTest.java
Log:
http://jira.jboss.com/jira/browse/JBESB-1440

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java	2008-01-18 19:23:52 UTC (rev 17965)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java	2008-01-18 20:42:45 UTC (rev 17966)
@@ -87,7 +87,18 @@
         String timeoutAttr = config.getAttribute("timeoutInMillies", null);
         
         if (timeoutAttr != null)
-        	timeoutInMillies = Long.valueOf(timeoutInMillies);
+        {
+        	try
+        	{
+        		timeoutInMillies = Long.valueOf(timeoutAttr);
+        	}
+        	catch (NumberFormatException ex)
+        	{
+        		logger.error("Invalid value for timeoutInMillies: "+timeoutAttr);
+        		
+        		throw new ConfigurationException(ex);
+        	}
+        }
         
         logger.debug("Aggregator config:  timeoutInMillies=" + timeoutInMillies);
         splitId = config.getAttribute("splitId");

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/AggregatorUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/AggregatorUnitTest.java	2008-01-18 19:23:52 UTC (rev 17965)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/AggregatorUnitTest.java	2008-01-18 20:42:45 UTC (rev 17966)
@@ -73,7 +73,6 @@
         return new JUnit4TestAdapter(AggregatorUnitTest.class);
     }
     
-    
     @BeforeClass
     public static void before() throws Exception {
         MockCourierFactory.install();
@@ -122,11 +121,26 @@
             }
             
 		} catch (Exception e) {
+			e.printStackTrace();
 			assertTrue(false);
 		}
     }
     
     @Test
+	public void aggregateWithoutTimeout()
+    {
+		try {
+			InputStream in = ClassUtil.getResourceAsStream("OtherAggregatorUnitTest.xml", AggregatorUnitTest.class);
+	        String xml = FileUtil.readStream(in);
+	        ConfigTree[] acts = ConfigTree.fromXml(xml).getChildren("action");
+	        
+            Aggregator aggregator = new Aggregator(acts[0]);
+		} catch (Exception e) {
+			assertTrue(false);
+		}
+    }
+    
+    @Test
     public void aggregateTimeoutTest1()
     {
         try {

Added: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/OtherAggregatorUnitTest.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/OtherAggregatorUnitTest.xml	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/OtherAggregatorUnitTest.xml	2008-01-18 20:42:45 UTC (rev 17966)
@@ -0,0 +1,6 @@
+<testActions>
+	<action class="org.jboss.soa.esb.actions.Aggregator" name="Aggregator"
+		service-category="test" service-name="Aggregator" />
+	<action class="org.jboss.soa.esb.actions.Aggregator" name="Aggregator"
+		service-category="test" service-name="Aggregator"/>
+</testActions>