From 82725241a1c9ebbfbc638a0e8e115004275c82fb Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 4 Feb 2015 16:13:17 +0000 Subject: [PATCH] Fixing tests git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/vre-management/smart-executor@111667 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../persistence/JDBCPersistenceConnector.java | 2 +- .../executor/ExecutorImplTest.java | 2 +- .../JDBCPersistenceConnectorTest.java | 19 ++++++++---------- .../pluginmanager/PluginThreadTest.java | 20 +++++++++---------- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/gcube/vremanagement/executor/persistence/JDBCPersistenceConnector.java b/src/main/java/org/gcube/vremanagement/executor/persistence/JDBCPersistenceConnector.java index f873b22..232f013 100644 --- a/src/main/java/org/gcube/vremanagement/executor/persistence/JDBCPersistenceConnector.java +++ b/src/main/java/org/gcube/vremanagement/executor/persistence/JDBCPersistenceConnector.java @@ -61,7 +61,7 @@ public class JDBCPersistenceConnector extends PersistenceConnector { Path currentAbsolutePath = Paths.get(".").toAbsolutePath().normalize(); logger.debug(String.format("Current Absolute Path : %s",currentAbsolutePath)); String effectiveJDBCURL = String.format("%s%s/%s", jdbcURL, currentAbsolutePath.toString(), dbName); - connection = DriverManager.getConnection(effectiveJDBCURL,username, password); + connection = DriverManager.getConnection(effectiveJDBCURL, username, password); } catch (SQLException e) { logger.error(String.format("Unable to connect to JDBC URL : %s", jdbcURL)); } diff --git a/src/test/java/org/gcube/vremanagement/executor/ExecutorImplTest.java b/src/test/java/org/gcube/vremanagement/executor/ExecutorImplTest.java index 4b9db6a..bf9a444 100644 --- a/src/test/java/org/gcube/vremanagement/executor/ExecutorImplTest.java +++ b/src/test/java/org/gcube/vremanagement/executor/ExecutorImplTest.java @@ -25,7 +25,7 @@ public class ExecutorImplTest { try { ExecutorImpl.init(); } catch(Exception e) { - // OK + // :( } } diff --git a/src/test/java/org/gcube/vremanagement/executor/persistence/JDBCPersistenceConnectorTest.java b/src/test/java/org/gcube/vremanagement/executor/persistence/JDBCPersistenceConnectorTest.java index b82d991..096b2ef 100644 --- a/src/test/java/org/gcube/vremanagement/executor/persistence/JDBCPersistenceConnectorTest.java +++ b/src/test/java/org/gcube/vremanagement/executor/persistence/JDBCPersistenceConnectorTest.java @@ -18,21 +18,18 @@ import org.junit.Test; */ public class JDBCPersistenceConnectorTest { - private JDBCPersistenceConnector jdbcPersistenceConnector; - - public JDBCPersistenceConnectorTest() throws Exception{ - jdbcPersistenceConnector = new JDBCPersistenceConnector(); - - } - @Test - public void getConnectionTest() { - Assert.assertNotNull(jdbcPersistenceConnector.getConnection());; + public void getConnectionTest() throws Exception { + JDBCPersistenceConnector jdbcPersistenceConnector = new JDBCPersistenceConnector(); + Assert.assertNotNull(jdbcPersistenceConnector.getConnection()); + jdbcPersistenceConnector.close(); + } @Test public void getPluginInstanceStateTest() throws Exception { UUID uuid = UUID.randomUUID(); + JDBCPersistenceConnector jdbcPersistenceConnector = new JDBCPersistenceConnector(); JDBCPersistence jdbcPersistence = new JDBCPersistence(jdbcPersistenceConnector, HelloWorldPluginDeclaration.name, uuid); PluginState[] states = PluginState.values(); @@ -42,8 +39,8 @@ public class JDBCPersistenceConnectorTest { PluginState ps = jdbcPersistenceConnector.getPluginInstanceState(uuid); Assert.assertEquals(states[i], ps); } + + jdbcPersistenceConnector.close(); } - - } diff --git a/src/test/java/org/gcube/vremanagement/executor/pluginmanager/PluginThreadTest.java b/src/test/java/org/gcube/vremanagement/executor/pluginmanager/PluginThreadTest.java index c4ce78d..0038218 100644 --- a/src/test/java/org/gcube/vremanagement/executor/pluginmanager/PluginThreadTest.java +++ b/src/test/java/org/gcube/vremanagement/executor/pluginmanager/PluginThreadTest.java @@ -24,19 +24,13 @@ public class PluginThreadTest { * Logger */ private static Logger logger = LoggerFactory.getLogger(PluginThreadTest.class); - - private HelloWorldPluginDeclaration hwpd; - private JDBCPersistenceConnector jdbcPersistenceConnector; - - public PluginThreadTest() throws Exception{ - this.hwpd = new HelloWorldPluginDeclaration(); - this.jdbcPersistenceConnector = new JDBCPersistenceConnector(); - } - + @Test public void launchNullInputsTest() throws Exception { logger.debug("Testing Null inputs"); UUID uuid = UUID.randomUUID(); + HelloWorldPluginDeclaration hwpd = new HelloWorldPluginDeclaration(); + JDBCPersistenceConnector jdbcPersistenceConnector = new JDBCPersistenceConnector(); JDBCPersistence jdbcPersistence = new JDBCPersistence(jdbcPersistenceConnector, hwpd.getName(), uuid); HelloWorldPlugin helloWorldPlugin = new HelloWorldPlugin(hwpd, jdbcPersistence); try { @@ -44,7 +38,7 @@ public class PluginThreadTest { } catch(Exception e){ Assert.assertEquals(NullPointerException.class, e.getClass()); } - + jdbcPersistenceConnector.close(); } @Test @@ -52,12 +46,15 @@ public class PluginThreadTest { logger.debug("Testing Empty inputs"); Map inputs = new HashMap(); UUID uuid = UUID.randomUUID(); + HelloWorldPluginDeclaration hwpd = new HelloWorldPluginDeclaration(); + JDBCPersistenceConnector jdbcPersistenceConnector = new JDBCPersistenceConnector(); JDBCPersistence jdbcPersistence = new JDBCPersistence(jdbcPersistenceConnector, hwpd.getName(), uuid); HelloWorldPlugin helloWorldPlugin = new HelloWorldPlugin(hwpd, jdbcPersistence); PluginThread pt = new PluginThread(helloWorldPlugin, inputs, uuid); pt.start(); Thread.sleep(1000); Assert.assertEquals(PluginState.FAILED, jdbcPersistence.getState()); + jdbcPersistenceConnector.close(); } @Test @@ -67,6 +64,8 @@ public class PluginThreadTest { inputs.put("Test", "Test"); UUID uuid = UUID.randomUUID(); + HelloWorldPluginDeclaration hwpd = new HelloWorldPluginDeclaration(); + JDBCPersistenceConnector jdbcPersistenceConnector = new JDBCPersistenceConnector(); JDBCPersistence jdbcPersistence = new JDBCPersistence(jdbcPersistenceConnector, hwpd.getName(), uuid); HelloWorldPlugin helloWorldPlugin = new HelloWorldPlugin(hwpd, jdbcPersistence); PluginThread pt = new PluginThread(helloWorldPlugin, inputs, uuid); @@ -83,6 +82,7 @@ public class PluginThreadTest { Thread.sleep(6000); Assert.assertEquals(PluginState.DONE, jdbcPersistence.getState()); + jdbcPersistenceConnector.close(); } }