From 5d9fbf652ceb233ebf6f2ae88b148d6096c79d96 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 26 Aug 2015 16:17:37 +0000 Subject: [PATCH] refs #89: Save Task Evolution on NoSQL global DB https://support.d4science.org/issues/89 Fixing tests git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/vre-management/smart-executor@117714 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../pluginmanager/SmartExecutorSchedulerTest.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/gcube/vremanagement/executor/pluginmanager/SmartExecutorSchedulerTest.java b/src/test/java/org/gcube/vremanagement/executor/pluginmanager/SmartExecutorSchedulerTest.java index 4811dac..f67c7b3 100644 --- a/src/test/java/org/gcube/vremanagement/executor/pluginmanager/SmartExecutorSchedulerTest.java +++ b/src/test/java/org/gcube/vremanagement/executor/pluginmanager/SmartExecutorSchedulerTest.java @@ -18,7 +18,6 @@ import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceConn import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceConnectorTest; import org.gcube.vremanagement.executor.plugin.PluginState; import org.gcube.vremanagement.executor.scheduler.SmartExecutorScheduler; -import org.h2.jdbc.JdbcSQLException; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -147,7 +146,7 @@ public class SmartExecutorSchedulerTest { PluginState pluginStateFromDeprecation = pc.getPluginInstanceState(uuid, 5); Assert.assertEquals(PluginState.STOPPED, pluginStateFromDeprecation); - }catch(JdbcSQLException e){ + }catch(PluginStateNotRetrievedException e){ // OK } @@ -317,7 +316,7 @@ public class SmartExecutorSchedulerTest { } - @Test(expected=JdbcSQLException.class) + @Test(expected=PluginStateNotRetrievedException.class) public void delayedExpMaxtimes() throws Exception { Scheduling scheduling = new Scheduling(20, 3); UUID uuid = scheduleTest(scheduling, new Long(10 * 1000)); @@ -395,7 +394,7 @@ public class SmartExecutorSchedulerTest { try{ PluginState pluginState = pc.getPluginInstanceState(HelloWorldPluginDeclaration.NAME, uuid, 5); Assert.assertEquals(PluginState.STOPPED, pluginState); - }catch(JdbcSQLException e){ + }catch(PluginStateNotRetrievedException e){ // OK } } @@ -432,7 +431,7 @@ public class SmartExecutorSchedulerTest { try{ PluginState pluginState = pc.getPluginInstanceState(HelloWorldPluginDeclaration.NAME, uuid, 5); Assert.assertEquals(PluginState.STOPPED, pluginState); - }catch(JdbcSQLException e){ + }catch(PluginStateNotRetrievedException e){ // OK } @@ -474,7 +473,7 @@ public class SmartExecutorSchedulerTest { try{ PluginState pluginState = pc.getPluginInstanceState(HelloWorldPluginDeclaration.NAME, uuid, 5); Assert.assertEquals(PluginState.DISCARDED, pluginState); - }catch(JdbcSQLException e){ + }catch(PluginStateNotRetrievedException e){ // OK } }