Fix CDI test issues

modules/activiti-engine/src/main/java/org/activiti/engine/EngineServices.java

@@ -12,6 +12,7 @@
  */
 package org.activiti.engine;
 
+
 /**
  * Interface implemented by all classes that expose the Activiti services.
  * 
@@ -33,4 +34,5 @@ public interface EngineServices {
   
   ManagementService getManagementService();
   
+  ProcessEngineConfiguration getProcessEngineConfiguration();
 }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cfg/ProcessEngineConfigurationImpl.java

@@ -1429,6 +1429,10 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
     return this;
   }
   
+  public ProcessEngineConfiguration getProcessEngineConfiguration() {
+    return this;
+  }
+  
   public Map<Class< ? >, SessionFactory> getSessionFactories() {
     return sessionFactories;
   }

modules/activiti-engine/src/main/java/org/activiti/engine/test/ActivitiRule.java

@@ -23,10 +23,10 @@ import org.activiti.engine.HistoryService;
 import org.activiti.engine.IdentityService;
 import org.activiti.engine.ManagementService;
 import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.ProcessEngineConfiguration;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
-import org.activiti.engine.impl.ProcessEngineImpl;
 import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
 import org.activiti.engine.impl.test.TestHelper;
 import org.activiti.engine.test.mock.ActivitiMockSupport;
@@ -88,7 +88,7 @@ public class ActivitiRule implements TestRule {
 	protected String configurationResource = "activiti.cfg.xml";
 	protected String deploymentId = null;
 
-    protected ProcessEngineConfigurationImpl processEngineConfiguration;
+  protected ProcessEngineConfiguration processEngineConfiguration;
 	protected ProcessEngine processEngine;
 	protected RepositoryService repositoryService;
 	protected RuntimeService runtimeService;
@@ -108,7 +108,7 @@ public class ActivitiRule implements TestRule {
 	}
 
 	public ActivitiRule(ProcessEngine processEngine) {
-		setProcessEngine(processEngine);
+	  setProcessEngine(processEngine);
 	}
 
 	/**
@@ -203,8 +203,11 @@ public class ActivitiRule implements TestRule {
 	protected void starting(Description description) {
 		if (processEngine == null) {
 			initializeProcessEngine();
-            initializeServices();
-        }
+    }
+		
+		if (processEngineConfiguration == null) {
+		  initializeServices();
+		}
 
 		if (mockSupport == null) {
 			initializeMockSupport();
@@ -235,7 +238,7 @@ public class ActivitiRule implements TestRule {
 	}
 
 	protected void initializeServices() {
-        processEngineConfiguration = ((ProcessEngineImpl) processEngine).getProcessEngineConfiguration();
+    processEngineConfiguration = processEngine.getProcessEngineConfiguration();
 		repositoryService = processEngine.getRepositoryService();
 		runtimeService = processEngine.getRuntimeService();
 		taskService = processEngine.getTaskService();
@@ -348,9 +351,9 @@ public class ActivitiRule implements TestRule {
 		this.managementService = managementService;
 	}
 
-    public void setProcessEngineConfiguration(ProcessEngineConfigurationImpl processEngineConfiguration) {
-        this.processEngineConfiguration = processEngineConfiguration;
-    }
+  public void setProcessEngineConfiguration(ProcessEngineConfigurationImpl processEngineConfiguration) {
+    this.processEngineConfiguration = processEngineConfiguration;
+  }
 
   public ActivitiMockSupport getMockSupport() {
 		return mockSupport;

modules/activiti-spring/src/test/java/org/activiti/spring/test/junit4/SpringJunit4Test.java

@@ -64,8 +64,8 @@ public class SpringJunit4Test {
     Task task = taskService.createTaskQuery().singleResult();
     assertEquals("My Task", task.getName());
 	
-	// ACT-1186: ActivitiRule services not initialized when using SpringJUnit4ClassRunner together with @ContextConfiguration
-	assertNotNull(activitiSpringRule.getRuntimeService());
+    // ACT-1186: ActivitiRule services not initialized when using SpringJUnit4ClassRunner together with @ContextConfiguration
+    assertNotNull(activitiSpringRule.getRuntimeService());
   
     taskService.complete(task.getId());
     assertEquals(0, runtimeService.createProcessInstanceQuery().count());