Repository: oodt Updated Branches: refs/heads/master 88af1927a -> badf16765
OODT-889 add more tests Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/badf1676 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/badf1676 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/badf1676 Branch: refs/heads/master Commit: badf16765ea0ba29c353413eba1262c0ca5a3b9c Parents: 88af192 Author: Tom Barber <[email protected]> Authored: Fri Oct 30 17:04:44 2015 +0000 Committer: Tom Barber <[email protected]> Committed: Fri Oct 30 17:04:44 2015 +0000 ---------------------------------------------------------------------- .../DataSourceWorkflowRepository.java | 4 +- .../oodt/cas/workflow/engine/SimpleTester.java | 13 +- .../TestPackagedWorkflowRepository.java | 4 +- .../TestWorkflowDataSourceRepository.java | 172 ++++++++++++++++++- 4 files changed, 182 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/badf1676/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepository.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepository.java index bf03d91..23d2c7b 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepository.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepository.java @@ -424,13 +424,13 @@ public class DataSourceWorkflowRepository implements WorkflowRepository { return tasks; } - public List getTasksByWorkflowName(String workflowName) + public List<WorkflowTask> getTasksByWorkflowName(String workflowName) throws RepositoryException { Connection conn = null; Statement statement = null; ResultSet rs = null; - List tasks = null; + List<WorkflowTask> tasks = null; try { conn = dataSource.getConnection(); http://git-wip-us.apache.org/repos/asf/oodt/blob/badf1676/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/SimpleTester.java ---------------------------------------------------------------------- diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/SimpleTester.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/SimpleTester.java index 627f9db..9c84a46 100644 --- a/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/SimpleTester.java +++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/engine/SimpleTester.java @@ -18,6 +18,14 @@ package org.apache.oodt.cas.workflow.engine; //JDK imports + +import org.apache.oodt.cas.metadata.Metadata; +import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration; +import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance; +import org.apache.oodt.cas.workflow.structs.exceptions.WorkflowTaskInstanceException; + +import org.junit.Ignore; + import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -26,10 +34,6 @@ import java.util.logging.Level; import java.util.logging.Logger; //OODT imports -import org.apache.oodt.cas.metadata.Metadata; -import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration; -import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance; -import org.apache.oodt.cas.workflow.structs.exceptions.WorkflowTaskInstanceException; /** * @@ -39,6 +43,7 @@ import org.apache.oodt.cas.workflow.structs.exceptions.WorkflowTaskInstanceExcep * @version $Revision$ * */ +@Ignore public class SimpleTester implements WorkflowTaskInstance { private static final Logger LOG = Logger.getLogger(SimpleTester.class http://git-wip-us.apache.org/repos/asf/oodt/blob/badf1676/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestPackagedWorkflowRepository.java ---------------------------------------------------------------------- diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestPackagedWorkflowRepository.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestPackagedWorkflowRepository.java index fbe1768..75a6c4d 100644 --- a/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestPackagedWorkflowRepository.java +++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestPackagedWorkflowRepository.java @@ -165,7 +165,7 @@ public class TestPackagedWorkflowRepository { * @see junit.framework.TestCase#setUp() */ @Before - protected void setUp() throws Exception { + public void setUp() throws Exception { repo = new PackagedWorkflowRepository(Collections.singletonList(new File( "src/main/resources/examples/wengine/GranuleMaps.xml"))); } @@ -176,7 +176,7 @@ public class TestPackagedWorkflowRepository { * @see junit.framework.TestCase#tearDown() */ @After - protected void tearDown() throws Exception { + public void tearDown() throws Exception { repo = null; } http://git-wip-us.apache.org/repos/asf/oodt/blob/badf1676/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java ---------------------------------------------------------------------- diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java index bf890a6..b47c80b 100644 --- a/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java +++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/repository/TestWorkflowDataSourceRepository.java @@ -23,6 +23,7 @@ import org.apache.oodt.cas.metadata.Metadata; import org.apache.oodt.cas.workflow.structs.Workflow; import org.apache.oodt.cas.workflow.structs.WorkflowCondition; import org.apache.oodt.cas.workflow.structs.WorkflowConditionInstance; +import org.apache.oodt.cas.workflow.structs.WorkflowTask; import org.apache.oodt.cas.workflow.structs.exceptions.RepositoryException; import org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory; import org.apache.oodt.commons.database.DatabaseConnectionBuilder; @@ -30,6 +31,7 @@ import org.apache.oodt.commons.database.SqlScript; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import java.io.File; @@ -41,9 +43,6 @@ import java.util.List; import javax.sql.DataSource; import static org.hamcrest.Matchers.*; - - -import static org.hamcrest.Matchers.hasSize; import static org.junit.Assert.*; @@ -233,6 +232,173 @@ public class TestWorkflowDataSourceRepository { assertThat(flows, allOf(notNullValue(), hasSize(1))); } + + @Test + @Ignore + public void testGetWorkflowsNoConditionsOrTasks() throws RepositoryException { + + DataSourceWorkflowRepository repo = new DataSourceWorkflowRepository(ds); + List<Workflow> flows = repo.getWorkflows(false, false); + + assertThat(flows, allOf(notNullValue(), hasSize(1))); + + assertThat(flows.get(0).getPreConditions(), hasSize(0)); + + assertThat(flows.get(0).getPostConditions(), hasSize(0)); + + assertThat(flows.get(0).getTasks(), hasSize(0)); + + + } + + @Ignore + @Test + public void testGetTaskByWorkflowName() throws RepositoryException { + + DataSourceWorkflowRepository repo = new DataSourceWorkflowRepository(ds); + List<WorkflowTask> tasks = repo.getTasksByWorkflowName("Test Workflow"); + + assertThat(tasks, allOf(notNullValue(), hasSize(2))); + + + + } + + @Ignore + @Test + public void testGetTasksByWorkflowNameNull() throws RepositoryException { + + DataSourceWorkflowRepository repo = new DataSourceWorkflowRepository(ds); + List<WorkflowTask> tasks = repo.getTasksByWorkflowName(null); + + assertThat(tasks, allOf(notNullValue(), hasSize(2))); + + } + + @Ignore + @Test + public void testGetTasksByWorkflowNameNoDataSource() throws RepositoryException { + DataSourceWorkflowRepository repo = new DataSourceWorkflowRepository(null); + List<WorkflowTask> tasks = repo.getTasksByWorkflowName(null); + + assertThat(tasks, allOf(notNullValue(), hasSize(2))); + + } + + @Ignore + @Test + public void testGetWorkflowsForEvent() throws RepositoryException { + DataSourceWorkflowRepository repo = new DataSourceWorkflowRepository(ds); + List<WorkflowTask> tasks = repo.getWorkflowsForEvent("event"); + + assertThat(tasks, allOf(notNullValue(), hasSize(2))); + + + } + + @Ignore + @Test + public void testGetworkflowsForEventNoTasksOrConditions() throws RepositoryException { + + DataSourceWorkflowRepository repo = new DataSourceWorkflowRepository(ds); + List<WorkflowTask> tasks = repo.getWorkflowsForEvent("event", false, false); + + assertThat(tasks, allOf(notNullValue(), hasSize(2))); + + + } + + @Ignore + @Test + public void testGetWorkflowsForEventNoDataSource(){ + + } + + @Ignore + @Test + public void testGetConditionsByTaskName(){ + + } + + @Ignore + @Test + public void testGetConditionsByTaskNameNoDataSource(){ + + } + + @Ignore + @Test + public void testGetConditionsByTaskId(){ + + } + + @Ignore + @Test + public void testGetConditionsByTaskIdNoDataSource(){ + + } + + @Ignore + @Test + public void testGetConfigurationByTaskId(){ + + } + + @Ignore + @Test + public void testGetConfigurationByTaskIdNoDataSource(){ + + } + + @Ignore + @Test + public void testGetWorkflowTaskById(){ + + } + + @Ignore + @Test + public void testGetWorkflowTaskByIdNoDataSource(){ + + } + + @Ignore + @Test + public void testGetRegisteredEvents(){ + + } + + @Ignore + @Test + public void testAddTask(){ + + } + + @Ignore + @Test + public void testAddWorkflow(){ + + + } + + @Ignore + @Test + public void testGetTaskById(){ + + } + + @Ignore + @Test + public void testGetTaskByIdNoDataSource(){ + + } + + @Ignore + @Test + public void testGetConditions(){ + + } + }
