Fixing tests.

(cherry picked from commit 54e1baf)
Evolveum · Sep 22, 2016 · 0507110 · 0507110
1 parent 90cc890
commit 0507110
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/infra/schema/src/main/resources/xml/ns/public/task/jdbc-ping-3.xsd b/infra/schema/src/main/resources/xml/ns/public/task/jdbc-ping-3.xsd
@@ -60,7 +60,7 @@
     <xsd:element name="testQuery" type="xsd:string">
         <xsd:annotation>
             <xsd:documentation>
-                SQL query to be executed during the test. Default is 'SELECT 1=1'.
+                SQL query to be executed during the test. Default is 'SELECT 1'.
             </xsd:documentation>
             <xsd:appinfo>
                 <a:displayName>Test SQL query</a:displayName>

diff --git a/...mpl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/JdbcPingTaskHandler.java b/...mpl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/JdbcPingTaskHandler.java
@@ -47,7 +47,7 @@ public class JdbcPingTaskHandler implements TaskHandler {
 	@Autowired
 	private TaskManager taskManager;
 
-	@Autowired
+	@Autowired(required = false)							// during some tests the repo is not available
 	private SqlRepositoryFactory sqlRepositoryFactory;
 
 	@PostConstruct
@@ -91,13 +91,13 @@ public TaskRunResult run(Task task) {
 
 		int tests = get(task, SchemaConstants.JDBC_PING_TESTS_QNAME, 0);
 		int interval = get(task, SchemaConstants.JDBC_PING_INTERVAL_QNAME, 10);
-		String testQuery = get(task, SchemaConstants.JDBC_PING_TEST_QUERY_QNAME, "select 1=1");
+		String testQuery = get(task, SchemaConstants.JDBC_PING_TEST_QUERY_QNAME, "select 1");
 
-		SqlRepositoryConfiguration config = sqlRepositoryFactory.getSqlConfiguration();
-		String jdbcDriver = get(task, SchemaConstants.JDBC_PING_DRIVER_CLASS_NAME_QNAME, config.getDriverClassName());
-		String jdbcUrl = get(task, SchemaConstants.JDBC_PING_JDBC_URL_QNAME, config.getJdbcUrl());
-		String jdbcUsername = get(task, SchemaConstants.JDBC_PING_JDBC_USERNAME_QNAME, config.getJdbcUsername());
-		String jdbcPassword = get(task, SchemaConstants.JDBC_PING_JDBC_PASSWORD_QNAME, config.getJdbcPassword());
+		SqlRepositoryConfiguration config = sqlRepositoryFactory != null ? sqlRepositoryFactory.getSqlConfiguration() : null;
+		String jdbcDriver = get(task, SchemaConstants.JDBC_PING_DRIVER_CLASS_NAME_QNAME, config != null ? config.getDriverClassName() : "");
+		String jdbcUrl = get(task, SchemaConstants.JDBC_PING_JDBC_URL_QNAME, config != null ? config.getJdbcUrl() : "");
+		String jdbcUsername = get(task, SchemaConstants.JDBC_PING_JDBC_USERNAME_QNAME, config != null ? config.getJdbcUsername() : "");
+		String jdbcPassword = get(task, SchemaConstants.JDBC_PING_JDBC_PASSWORD_QNAME, config != null ? config.getJdbcPassword() : "");
 		boolean logOnInfoLevel = get(task, SchemaConstants.JDBC_PING_LOG_ON_INFO_LEVEL_QNAME, true);
 
         LOGGER.info("JdbcPingTaskHandler run starting; with progress = {}", progress);