[jboss-svn-commits] JBL Code SVN: r35289 - in labs/jbossrules/soa_branches/BRMS-5.0.x: drools-compiler/src/test/java/org/drools/integrationtests and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Sep 24 16:24:10 EDT 2010


Author: tirelli
Date: 2010-09-24 16:24:09 -0400 (Fri, 24 Sep 2010)
New Revision: 35289

Added:
   labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/droolsClient.keystore
   labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/droolsServer.keystore
Modified:
   labs/jbossrules/soa_branches/BRMS-5.0.x/drools-ant/src/test/java/org/drools/contrib/DroolsAntTaskTest.java
   labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java
   labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java
   labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java
   labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java
   labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/LargeRuleBaseSerializationTest.java
   labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java
   labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MultithreadTest.java
   labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/OutOfMemoryTest.java
   labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java
   labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java
   labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGeneratorTest.java
   labs/jbossrules/soa_branches/BRMS-5.0.x/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
Log:
JBRULES-2702: fixing tests

Modified: labs/jbossrules/soa_branches/BRMS-5.0.x/drools-ant/src/test/java/org/drools/contrib/DroolsAntTaskTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.x/drools-ant/src/test/java/org/drools/contrib/DroolsAntTaskTest.java	2010-09-24 20:16:51 UTC (rev 35288)
+++ labs/jbossrules/soa_branches/BRMS-5.0.x/drools-ant/src/test/java/org/drools/contrib/DroolsAntTaskTest.java	2010-09-24 20:24:09 UTC (rev 35289)
@@ -26,7 +26,7 @@
 import org.drools.RuleBase;
 import org.drools.definition.KnowledgePackage;
 import org.drools.rule.Package;
-import org.drools.util.DroolsStreamUtils;
+import org.drools.core.util.DroolsStreamUtils;
 
 /**
  * DroolsAntTask test case

Modified: labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java	2010-09-24 20:16:51 UTC (rev 35288)
+++ labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java	2010-09-24 20:24:09 UTC (rev 35289)
@@ -40,6 +40,11 @@
 import org.drools.rule.builder.dialect.java.JavaDialectConfiguration;
 
 public class AccumulateTest extends TestCase {
+    public void setUp() {
+        // setting it to false as most unit tests in this file assume no signing 
+        System.setProperty( org.drools.core.util.KeyStoreHelper.PROP_SIGN, "false" );
+    }
+
     protected RuleBase getRuleBase() throws Exception {
 
         return RuleBaseFactory.newRuleBase( RuleBase.RETEOO,

Modified: labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java	2010-09-24 20:16:51 UTC (rev 35288)
+++ labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java	2010-09-24 20:24:09 UTC (rev 35289)
@@ -42,6 +42,12 @@
 import org.drools.time.impl.PseudoClockScheduler;
 
 public class CepEspTest extends TestCase {
+
+    public void setUp() {
+        // setting it to false as most unit tests in this file assume no signing
+        System.setProperty( org.drools.core.util.KeyStoreHelper.PROP_SIGN, "false" );
+    }
+
     protected RuleBase getRuleBase() throws Exception {
 
         return RuleBaseFactory.newRuleBase( RuleBase.RETEOO,

Modified: labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java	2010-09-24 20:16:51 UTC (rev 35288)
+++ labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java	2010-09-24 20:24:09 UTC (rev 35289)
@@ -30,6 +30,11 @@
 
 public class DslTest extends TestCase {
    
+    public void setUp() {
+        // setting it to false as most unit tests in this file assume no signing 
+        System.setProperty( org.drools.core.util.KeyStoreHelper.PROP_SIGN, "false" );
+    }
+
     protected RuleBase getRuleBase() throws Exception {
 
         return RuleBaseFactory.newRuleBase( RuleBase.RETEOO,

Modified: labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java	2010-09-24 20:16:51 UTC (rev 35288)
+++ labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java	2010-09-24 20:24:09 UTC (rev 35289)
@@ -61,6 +61,11 @@
                                             config );
     }
 
+    public void setUp() {
+        // setting it to false as most unit tests in this file assume no signing 
+        System.setProperty( org.drools.core.util.KeyStoreHelper.PROP_SIGN, "false" );
+    }
+
     public void testRuleFlowConstraintDialects() throws Exception {
         final PackageBuilder builder = new PackageBuilder();
         builder.addRuleFlow( new InputStreamReader( getClass().getResourceAsStream( "test_ConstraintDialects.rfm" ) ) );

Modified: labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/LargeRuleBaseSerializationTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/LargeRuleBaseSerializationTest.java	2010-09-24 20:16:51 UTC (rev 35288)
+++ labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/LargeRuleBaseSerializationTest.java	2010-09-24 20:24:09 UTC (rev 35289)
@@ -26,6 +26,9 @@
     private static byte[]   compressedBytes;
 
     protected void setUp() throws Exception {
+        // setting it to false as most unit tests in this file assume no signing 
+        System.setProperty( org.drools.core.util.KeyStoreHelper.PROP_SIGN, "false" );
+
         if (ruleBase == null)
             ruleBase    = createRuleBase();
         if (bytes == null) {

Modified: labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java	2010-09-24 20:16:51 UTC (rev 35288)
+++ labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java	2010-09-24 20:24:09 UTC (rev 35289)
@@ -52,6 +52,7 @@
 import org.drools.compiler.PackageBuilder;
 import org.drools.compiler.PackageBuilderConfiguration;
 import org.drools.core.util.KeyStoreHelper;
+import org.drools.core.util.KeyStoreHelper;
 import org.drools.impl.EnvironmentFactory;
 import org.drools.impl.KnowledgeBaseImpl;
 import org.drools.impl.StatefulKnowledgeSessionImpl;
@@ -75,6 +76,11 @@
 
 public class MarshallingTest extends TestCase {
 
+    public void setUp() {
+       // setting it to false as most unit tests in this file assume no signing
+       System.setProperty( KeyStoreHelper.PROP_SIGN, "false" );
+    }
+
     public void testSerializable() throws Exception {
 
         final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_Serializable.drl" ) );

Modified: labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MultithreadTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MultithreadTest.java	2010-09-24 20:16:51 UTC (rev 35288)
+++ labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MultithreadTest.java	2010-09-24 20:24:09 UTC (rev 35289)
@@ -49,7 +49,8 @@
      * @see junit.framework.TestCase#setUp()
      */
     protected void setUp() throws Exception {
-        super.setUp();
+        // setting it to false as most unit tests in this file assume no signing 
+        System.setProperty( org.drools.core.util.KeyStoreHelper.PROP_SIGN, "false" );
     }
 
     /**

Modified: labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/OutOfMemoryTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/OutOfMemoryTest.java	2010-09-24 20:16:51 UTC (rev 35288)
+++ labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/OutOfMemoryTest.java	2010-09-24 20:24:09 UTC (rev 35289)
@@ -34,6 +34,11 @@
 /** Run all the tests with the ReteOO engine implementation */
 public class OutOfMemoryTest extends TestCase {
 
+    public void setUp() {
+        // setting it to false as most unit tests in this file assume no signing 
+        System.setProperty( org.drools.core.util.KeyStoreHelper.PROP_SIGN, "false" );
+    }
+
     protected RuleBase getRuleBase() throws Exception {
 
         return RuleBaseFactory.newRuleBase( RuleBase.RETEOO,

Modified: labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java	2010-09-24 20:16:51 UTC (rev 35288)
+++ labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java	2010-09-24 20:24:09 UTC (rev 35289)
@@ -47,6 +47,11 @@
     final Cheesery cheesery = new Cheesery();
     final GlobalResolver globalResolver = new MapGlobalResolver();
 
+    public void setUp() {
+        // setting it to false as most unit tests in this file assume no signing 
+        System.setProperty( org.drools.core.util.KeyStoreHelper.PROP_SIGN, "false" );
+    }
+
     protected RuleBase getRuleBase() throws Exception {
 
         return RuleBaseFactory.newRuleBase( RuleBase.RETEOO,

Modified: labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java	2010-09-24 20:16:51 UTC (rev 35288)
+++ labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java	2010-09-24 20:24:09 UTC (rev 35289)
@@ -39,6 +39,11 @@
 import org.drools.util.ObjectHashMap;
 
 public class TruthMaintenanceTest extends TestCase {
+    public void setUp() {
+        // setting it to false as most unit tests in this file assume no signing 
+        System.setProperty( org.drools.core.util.KeyStoreHelper.PROP_SIGN, "false" );
+    }
+
     protected RuleBase getRuleBase() throws Exception {
 
         return RuleBaseFactory.newRuleBase( RuleBase.RETEOO,

Copied: labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/droolsClient.keystore (from rev 35271, labs/jbossrules/soa_branches/BRMS-5.1.1/drools-compiler/src/test/java/org/drools/integrationtests/droolsClient.keystore)
===================================================================
(Binary files differ)

Copied: labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/droolsServer.keystore (from rev 35271, labs/jbossrules/soa_branches/BRMS-5.1.1/drools-compiler/src/test/java/org/drools/integrationtests/droolsServer.keystore)
===================================================================
(Binary files differ)

Modified: labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGeneratorTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGeneratorTest.java	2010-09-24 20:16:51 UTC (rev 35288)
+++ labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGeneratorTest.java	2010-09-24 20:24:09 UTC (rev 35289)
@@ -23,6 +23,11 @@
 	
 	private final static String TEST_RULE_FILE = "test_eventGenerator.drl";
 	
+    public void setUp() {
+        // setting it to false as most unit tests in this file assume no signing 
+        System.setProperty( org.drools.core.util.KeyStoreHelper.PROP_SIGN, "false" );
+    }
+
 	protected RuleBase getRuleBase() throws Exception {
 
         return RuleBaseFactory.newRuleBase( RuleBase.RETEOO,

Modified: labs/jbossrules/soa_branches/BRMS-5.0.x/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.x/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java	2010-09-24 20:16:51 UTC (rev 35288)
+++ labs/jbossrules/soa_branches/BRMS-5.0.x/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java	2010-09-24 20:24:09 UTC (rev 35289)
@@ -120,7 +120,7 @@
     Externalizable {
     private static final long              serialVersionUID = 400L;
     
-    public static final String          DEFAULT_SIGN_ON_SERIALIZATION = "false";
+    public static final String          DEFAULT_SIGN_ON_SERIALIZATION = "true";
 
     private ChainedProperties              chainedProperties;
 



More information about the jboss-svn-commits mailing list