Fix failing QA

modules/activiti-engine/src/main/java/org/activiti/engine/compatibility/DefaultActiviti5CompatibilityHandlerFactory.java

@@ -35,7 +35,7 @@ public class DefaultActiviti5CompatibilityHandlerFactory implements Activiti5Com
       Activiti5CompatibilityHandler handler = (Activiti5CompatibilityHandler) Class.forName(compatibilityHandlerClassName).newInstance();
       return handler;
     } catch (Exception e) {
-      logger.info("Activiti 5 compatibility handler implementation not found or error during instantiation. " + "Error : " + e.getMessage() + ". Activiti 5 backwards compatibility disabled.");
+      logger.info("Activiti 5 compatibility handler implementation not found or error during instantiation : " + e.getMessage() + ". Activiti 5 backwards compatibility disabled.");
     }
     return null;
   }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricActivityInstanceEntity.java

@@ -127,7 +127,7 @@ public class HistoricActivityInstanceEntity extends HistoricScopeInstanceEntity
 
   @Override
   public String toString() {
-    return "HistoricActivityInstanceEntity[activityId=" + activityId + ", activityName=" + activityName + "]";
+    return "HistoricActivityInstanceEntity[id=" + id + ", activityId=" + activityId + ", activityName=" + activityName + "]";
   }
 
 }

modules/activiti-engine/src/test/java/org/activiti/standalone/initialization/ProcessEnginesTest.java

-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.activiti.standalone.initialization;
-
-import java.util.List;
-
-import org.activiti.engine.ProcessEngine;
-import org.activiti.engine.ProcessEngineInfo;
-import org.activiti.engine.ProcessEngines;
-import org.activiti.engine.impl.test.PvmTestCase;
-
-/**
- * @author Tom Baeyens
- */
-public class ProcessEnginesTest extends PvmTestCase {
-
-  protected void setUp() throws Exception {
-    super.setUp();
-    ProcessEngines.destroy();
-    ProcessEngines.init();
-  }
-
-  protected void tearDown() throws Exception {
-    ProcessEngines.destroy();
-    super.tearDown();
-  }
-
-  public void testProcessEngineInfo() {
-
-    List<ProcessEngineInfo> processEngineInfos = ProcessEngines.getProcessEngineInfos();
-    assertEquals(1, processEngineInfos.size());
-
-    ProcessEngineInfo processEngineInfo = processEngineInfos.get(0);
-    assertNull(processEngineInfo.getException());
-    assertNotNull(processEngineInfo.getName());
-    assertNotNull(processEngineInfo.getResourceUrl());
-
-    ProcessEngine processEngine = ProcessEngines.getProcessEngine(ProcessEngines.NAME_DEFAULT);
-    assertNotNull(processEngine);
-  }
-
-}

modules/activiti-engine/src/test/java/org/activiti/standalone/validation/DisabledSchemaValidationTest.java

@@ -35,7 +35,10 @@ public class DisabledSchemaValidationTest {
 
   @Before
   public void setup() {
-    this.processEngine = new StandaloneInMemProcessEngineConfiguration().setJdbcUrl("jdbc:h2:mem:activiti-process-validation;DB_CLOSE_DELAY=1000").buildProcessEngine();
+    this.processEngine = new StandaloneInMemProcessEngineConfiguration()
+      .setProcessEngineName(this.getClass().getName())
+      .setJdbcUrl("jdbc:h2:mem:activiti-process-validation;DB_CLOSE_DELAY=1000")
+      .buildProcessEngine();
     this.repositoryService = processEngine.getRepositoryService();
   }