[jboss-svn-commits] JBL Code SVN: r33945 - in labs/jbossrules/trunk/drools-guvnor/src: main/webapp/WEB-INF and 2 other directories.

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

Author: kurt.stam at jboss.com
Date: 2010-07-16 10:55:35 -0400 (Fri, 16 Jul 2010)
New Revision: 33945

Added:
   labs/jbossrules/trunk/drools-guvnor/src/test/resources/selectors-test.properties
Removed:
   labs/jbossrules/trunk/drools-guvnor/src/test/resources/selectors.properties
Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/webapp/
   labs/jbossrules/trunk/drools-guvnor/src/main/webapp/WEB-INF/
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/SelectorManagerTest.java
Log:
By default, the SelectorManager reads the selectors.properties file. We have 2 versions of this file, one in main and one in test. Our test assumes it picks the one in test. In java 5 this work, in java 6 it picks the one in main. This commit explicitly tells the test to read the selectors-test.properties file, so now this test passes using java 6.


Property changes on: labs/jbossrules/trunk/drools-guvnor/src/main/webapp
___________________________________________________________________
Name: svn:ignore
   + META-INF



Property changes on: labs/jbossrules/trunk/drools-guvnor/src/main/webapp/WEB-INF
___________________________________________________________________
Name: svn:ignore
   + lib


Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/SelectorManagerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/SelectorManagerTest.java	2010-07-16 14:52:08 UTC (rev 33944)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/SelectorManagerTest.java	2010-07-16 14:55:35 UTC (rev 33945)
@@ -5,7 +5,7 @@
 public class SelectorManagerTest extends TestCase {
 
     public void testSelectorMangerConfig() {
-        SelectorManager sm = SelectorManager.getInstance();
+    	SelectorManager sm = new SelectorManager("/selectors-test.properties");
         assertNotNull(sm);
         assertNotNull(sm.selectors);
 
@@ -45,7 +45,7 @@
     }
 
     public void testGetBuiltInSelector() {
-        SelectorManager sm = SelectorManager.getInstance();
+    	SelectorManager sm = new SelectorManager("/selectors-test.properties");
         assertNotNull(sm);
         assertNotNull(sm.selectors);
 
@@ -53,7 +53,7 @@
     }
     
     public void testGetCustomSelectors() {
-        SelectorManager sm = SelectorManager.getInstance();
+    	SelectorManager sm = new SelectorManager("/selectors-test.properties");
         assertNotNull(sm);
         assertNotNull(sm.selectors);
 

Copied: labs/jbossrules/trunk/drools-guvnor/src/test/resources/selectors-test.properties (from rev 33943, labs/jbossrules/trunk/drools-guvnor/src/test/resources/selectors.properties)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/resources/selectors-test.properties	                        (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/resources/selectors-test.properties	2010-07-16 14:55:35 UTC (rev 33945)
@@ -0,0 +1,3 @@
+selector1=org.drools.guvnor.server.selector.TestSelector
+selector2=/TestSelector.drl
+selector3=XXX
\ No newline at end of file

Deleted: labs/jbossrules/trunk/drools-guvnor/src/test/resources/selectors.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/resources/selectors.properties	2010-07-16 14:52:08 UTC (rev 33944)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/resources/selectors.properties	2010-07-16 14:55:35 UTC (rev 33945)
@@ -1,3 +0,0 @@
-selector1=org.drools.guvnor.server.selector.TestSelector
-selector2=/TestSelector.drl
-selector3=XXX
\ No newline at end of file