[jboss-svn-commits] JBL Code SVN: r34657 - labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-executor/src/test/java/org/drools/job/executor/timer.

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

Author: diegoll
Date: 2010-08-12 02:31:11 -0400 (Thu, 12 Aug 2010)
New Revision: 34657

Modified:
   labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-executor/src/test/java/org/drools/job/executor/timer/TimerExecutorServiceTest.java
Log:
[JBRULES-2616] refactoring session runtime configuration call

Modified: labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-executor/src/test/java/org/drools/job/executor/timer/TimerExecutorServiceTest.java
===================================================================
--- labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-executor/src/test/java/org/drools/job/executor/timer/TimerExecutorServiceTest.java	2010-08-12 06:30:02 UTC (rev 34656)
+++ labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-executor/src/test/java/org/drools/job/executor/timer/TimerExecutorServiceTest.java	2010-08-12 06:31:11 UTC (rev 34657)
@@ -68,10 +68,8 @@
 
         //start process
         AbstractApplicationContext sessionContext = new ClassPathXmlApplicationContext(sessionContextLocation);
-	    final StatefulKnowledgeSession ksession = createSession(environmentBeanName, knowledgeBaseBeanName, knowledgeStoreServiceBeanName, sessionContext);
+	    final StatefulKnowledgeSession ksession = createSession(environmentBeanName, knowledgeBaseBeanName, knowledgeStoreServiceBeanName, sessionConfiguratorBeanName, sessionContext);
 	    int sessionId = ksession.getId();
-        KnowledgeSessionRuntimeConfigurator sessionConfigurator = (KnowledgeSessionRuntimeConfigurator) sessionContext.getBean(sessionConfiguratorBeanName);
-	    sessionConfigurator.configure(ksession);
 	    
         PlatformTransactionManager txManager = (PlatformTransactionManager) sessionContext.getBean("transactionManager");
         TransactionTemplate txTemplate = new TransactionTemplate(txManager);
@@ -137,10 +135,8 @@
 
         //start process
         AbstractApplicationContext sessionContext = new ClassPathXmlApplicationContext(sessionContextLocation);
-        StatefulKnowledgeSession ksession = createSession(environmentBeanName, knowledgeBaseBeanName, knowledgeStoreServiceBeanName, sessionContext);
+        StatefulKnowledgeSession ksession = createSession(environmentBeanName, knowledgeBaseBeanName, knowledgeStoreServiceBeanName, sessionConfiguratorBeanName, sessionContext);
         int sessionId = ksession.getId();
-        KnowledgeSessionRuntimeConfigurator sessionConfigurator = (KnowledgeSessionRuntimeConfigurator) sessionContext.getBean(sessionConfiguratorBeanName);
-        sessionConfigurator.configure(ksession);
         
         long processId = ksession.startProcess("timerProcess").getId();
         ksession.dispose();
@@ -163,7 +159,7 @@
         scheduler.triggerTimerJob();
         Thread.sleep(1000);
 
-        ksession = loadSession(sessionId, environmentBeanName, knowledgeBaseBeanName, knowledgeStoreServiceBeanName, sessionContext);  
+        ksession = loadSession(sessionId, environmentBeanName, knowledgeBaseBeanName, knowledgeStoreServiceBeanName, sessionConfiguratorBeanName, sessionContext);
         ProcessInstance processInstance = ksession.getProcessInstance(processId);
         Assert.assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
         ksession.dispose();
@@ -174,7 +170,7 @@
         scheduler.triggerTimerJob();
         Thread.sleep(4000);
         
-        ksession = loadSession(sessionId, environmentBeanName, knowledgeBaseBeanName, knowledgeStoreServiceBeanName, sessionContext);  
+        ksession = loadSession(sessionId, environmentBeanName, knowledgeBaseBeanName, knowledgeStoreServiceBeanName, sessionConfiguratorBeanName, sessionContext);
         processInstance = ksession.getProcessInstance(processId);
         Assert.assertNull(processInstance); // this mean the process was completed elsewhere
         
@@ -212,19 +208,23 @@
         return context;
     }
 
-    private StatefulKnowledgeSession createSession(String envName, String kbaseName, String kstoreName, ApplicationContext sessionContext) {
+    private StatefulKnowledgeSession createSession(String envName, String kbaseName, String kstoreName, String sessionConfiguratorBeanName, ApplicationContext sessionContext) {
         Environment env = (Environment) sessionContext.getBean(envName);
 	    KnowledgeStoreService kstore = (KnowledgeStoreService) sessionContext.getBean(kstoreName);
 	    KnowledgeBase kbase = (KnowledgeBase) sessionContext.getBean(kbaseName);
 	    StatefulKnowledgeSession ksession = kstore.newStatefulKnowledgeSession(kbase, null, env);
+        KnowledgeSessionRuntimeConfigurator sessionConfigurator = (KnowledgeSessionRuntimeConfigurator) sessionContext.getBean(sessionConfiguratorBeanName);
+        sessionConfigurator.configure(ksession);
         return ksession;
     }
     
-    private StatefulKnowledgeSession loadSession(int sessionId, String envName, String kbaseName, String kstoreName, ApplicationContext sessionContext) {
+    private StatefulKnowledgeSession loadSession(int sessionId, String envName, String kbaseName, String kstoreName, String sessionConfiguratorBeanName, ApplicationContext sessionContext) {
         Environment env = (Environment) sessionContext.getBean(envName);
         KnowledgeStoreService kstore = (KnowledgeStoreService) sessionContext.getBean(kstoreName);
         KnowledgeBase kbase = (KnowledgeBase) sessionContext.getBean(kbaseName);
         StatefulKnowledgeSession ksession = kstore.loadStatefulKnowledgeSession(sessionId, kbase, null, env);
+        KnowledgeSessionRuntimeConfigurator sessionConfigurator = (KnowledgeSessionRuntimeConfigurator) sessionContext.getBean(sessionConfiguratorBeanName);
+        sessionConfigurator.configure(ksession);
         return ksession;
     }