[jboss-svn-commits] JBL Code SVN: r7311 - in labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services: registry routing/cbr

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

Author: kurt.stam at jboss.com
Date: 2006-11-01 21:30:11 -0500 (Wed, 01 Nov 2006)
New Revision: 7311

Modified:
   labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/JAXRRegistryUnitTest.java
   labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java
   labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRoutingUnitTest.java
   labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/routing/cbr/JBossRulesRouterUnitTest.java
Log:
Read log4j.xml in the tests

Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/JAXRRegistryUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/JAXRRegistryUnitTest.java	2006-11-02 01:49:01 UTC (rev 7310)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/JAXRRegistryUnitTest.java	2006-11-02 02:30:11 UTC (rev 7311)
@@ -212,7 +212,7 @@
 	@BeforeClass
 	public static void runBeforeAllTests() throws Exception {
 		try {
-			DOMConfigurator.configure(TestUtil.getPrefix() + "/etc/test/resources/log4j.xml");
+			DOMConfigurator.configure(TestUtil.getPrefix() + "etc/test/resources/log4j.xml");
 			TestUtil.setESBPropertiesFileToUse();
 			//Set the juddi properties file in System so juddi will pick it up later and use the test values.
 			String juddiPropertiesFile = "/org/jboss/soa/esb/services/registry/juddi-unittest.properties";

Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java	2006-11-02 01:49:01 UTC (rev 7310)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java	2006-11-02 02:30:11 UTC (rev 7311)
@@ -36,6 +36,7 @@
 
 import org.apache.log4j.Logger;
 import org.apache.log4j.Priority;
+import org.apache.log4j.xml.DOMConfigurator;
 import org.jboss.soa.esb.addressing.EPR;
 import org.jboss.soa.esb.common.tests.HsqldbUtil;
 import org.jboss.soa.esb.common.tests.TestUtil;
@@ -151,6 +152,7 @@
 	@BeforeClass
 	public static void runBeforeAllTests() throws Exception {
 		try {
+			DOMConfigurator.configure(TestUtil.getPrefix() + "etc/test/resources/log4j.xml");
 			TestUtil.setESBPropertiesFileToUse();
 			//Set the juddi properties file in System so juddi will pick it up later and use the test values.
 			String juddiPropertiesFile = "/org/jboss/soa/esb/services/registry/juddi-unittest.properties";

Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRoutingUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRoutingUnitTest.java	2006-11-02 01:49:01 UTC (rev 7310)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRoutingUnitTest.java	2006-11-02 02:30:11 UTC (rev 7311)
@@ -28,6 +28,7 @@
 
 import junit.framework.JUnit4TestAdapter;
 
+import org.apache.log4j.xml.DOMConfigurator;
 import org.jboss.soa.esb.common.tests.TestUtil;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.message.format.MessageFactory;
@@ -93,6 +94,7 @@
 	public static void runBeforeAllTests() throws Exception 
 	{
 		try {
+			DOMConfigurator.configure(TestUtil.getPrefix() + "etc/test/resources/log4j.xml");
 			TestUtil.setESBPropertiesFileToUse();
 		} catch (Exception e) {
 			e.printStackTrace();

Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/routing/cbr/JBossRulesRouterUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/routing/cbr/JBossRulesRouterUnitTest.java	2006-11-02 01:49:01 UTC (rev 7310)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/routing/cbr/JBossRulesRouterUnitTest.java	2006-11-02 02:30:11 UTC (rev 7311)
@@ -27,9 +27,12 @@
 
 import junit.framework.JUnit4TestAdapter;
 
+import org.apache.log4j.xml.DOMConfigurator;
+import org.jboss.soa.esb.common.tests.TestUtil;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.message.format.MessageFactory;
 import org.jboss.soa.esb.message.format.MessageType;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
@@ -77,6 +80,12 @@
 		assertEquals(destinationServices.iterator().next(),"test_category:JBOSS_XMLDestination");
 	}
 	
+	@BeforeClass
+	public static void runBeforeAllTests() throws Exception 
+	{
+		DOMConfigurator.configure(TestUtil.getPrefix() + "etc/test/resources/log4j.xml");
+	}
+	
 	public static junit.framework.Test suite() {
 		return new JUnit4TestAdapter(JBossRulesRouterUnitTest.class);
 	}