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

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

Author: kevin.conner at jboss.com
Date: 2008-09-19 11:41:40 -0400 (Fri, 19 Sep 2008)
New Revision: 22928

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ScheduledListenerUnitTest.java
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/schedule/SchedulingUnitTest.java
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/schedule/expected-config-01-listener.xml
Log:
Add service info to tests, use XML comparison: JBESB-2057

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ScheduledListenerUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ScheduledListenerUnitTest.java	2008-09-19 15:05:26 UTC (rev 22927)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ScheduledListenerUnitTest.java	2008-09-19 15:41:40 UTC (rev 22928)
@@ -20,10 +20,12 @@
 package org.jboss.soa.esb.listeners;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
-import java.io.UnsupportedEncodingException;
 import java.io.IOException;
 
+import javax.xml.parsers.ParserConfigurationException;
+
 import junit.framework.JUnit4TestAdapter;
 
 import org.jboss.internal.soa.esb.util.StreamUtils;
@@ -33,6 +35,7 @@
 import org.jboss.soa.esb.schedule.MockScheduledEventMessageComposer;
 import org.jboss.soa.esb.schedule.SchedulingException;
 import org.jboss.soa.esb.testutils.ESBConfigUtil;
+import org.jboss.soa.esb.testutils.StringUtils;
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
@@ -43,12 +46,12 @@
 public class ScheduledListenerUnitTest {
 	
 	@Test
-    public void test() throws IOException, SAXException, ConfigurationException {
+    public void test() throws IOException, SAXException, ConfigurationException, ParserConfigurationException {
 	    ESBConfigUtil configUtil = new ESBConfigUtil(ScheduledListenerUnitTest.class.getResourceAsStream("scheduled-listener-config.xml"));
         String actualListenerConfig = configUtil.getListenerConfig("simple-schedule-listener").toXml();
         String expectedListenerConfig = StreamUtils.readStreamString(getClass().getResourceAsStream("scheduled-listener-config-configtree.xml"), "UTF-8");
 
-        assertEquals(expectedListenerConfig, actualListenerConfig);
+        assertTrue("Service configuration", StringUtils.compareXMLContent(expectedListenerConfig, actualListenerConfig));
     }
     
     @Test

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/schedule/SchedulingUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/schedule/SchedulingUnitTest.java	2008-09-19 15:05:26 UTC (rev 22927)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/schedule/SchedulingUnitTest.java	2008-09-19 15:41:40 UTC (rev 22928)
@@ -21,22 +21,19 @@
 
 import junit.framework.TestCase;
 import org.jboss.soa.esb.testutils.ESBConfigUtil;
+import org.jboss.soa.esb.testutils.StringUtils;
 import org.jboss.soa.esb.parameters.ParamRepositoryException;
 import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.util.ClassUtil;
 import org.jboss.soa.esb.mock.MockAction;
 import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleException;
 import org.jboss.internal.soa.esb.util.StreamUtils;
 import org.xml.sax.SAXException;
-import org.quartz.impl.StdSchedulerFactory;
-import org.quartz.Scheduler;
-import org.quartz.SchedulerException;
 
 import java.io.UnsupportedEncodingException;
-import java.io.InputStream;
 import java.io.IOException;
-import java.util.Properties;
 
+import javax.xml.parsers.ParserConfigurationException;
+
 /**
  * Scheduling unit tests.
  *
@@ -51,11 +48,11 @@
         MockAction.message = null;
     }
 
-    public void test_listener_config() throws IOException, SAXException, ConfigurationException {
+    public void test_listener_config() throws IOException, SAXException, ConfigurationException, ParserConfigurationException {
         ESBConfigUtil configUtil = new ESBConfigUtil(getClass().getResourceAsStream("config-01.xml"));
         String expected = StreamUtils.readStreamString(getClass().getResourceAsStream("expected-config-01-listener.xml"), "UTF-8");
 
-        assertEquals(expected, configUtil.getListenerConfig("simple-schedule-listener").toString());
+        assertTrue("Service Config", StringUtils.compareXMLContent(expected, configUtil.getListenerConfig("simple-schedule-listener").toString()));
     }
 
     public void test_simple_schedule_01() throws UnsupportedEncodingException, ParamRepositoryException, ConfigurationException, ManagedLifecycleException, SAXException, InterruptedException {

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/schedule/expected-config-01-listener.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/schedule/expected-config-01-listener.xml	2008-09-19 15:05:26 UTC (rev 22927)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/schedule/expected-config-01-listener.xml	2008-09-19 15:41:40 UTC (rev 22928)
@@ -1,3 +1,3 @@
-<listener event-processor="org.jboss.soa.esb.schedule.MockScheduledEventMessageComposer" listenerClass="org.jboss.soa.esb.listeners.ScheduleListener" name="simple-schedule-listener" scheduleidref="1-sec-trigger">
+<listener event-processor="org.jboss.soa.esb.schedule.MockScheduledEventMessageComposer" listenerClass="org.jboss.soa.esb.listeners.ScheduleListener" name="simple-schedule-listener" scheduleidref="1-sec-trigger" service-category="ServiceCat" service-description="Test Service" service-name="ServiceName-01">
 <action action="action" class="org.jboss.soa.esb.mock.MockAction"/>
 </listener>
\ No newline at end of file