Repository: oodt Updated Branches: refs/heads/master badf16765 -> dc689d5bb
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/dc689d5b Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/dc689d5b Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/dc689d5b Branch: refs/heads/master Commit: dc689d5bbce4c45c9134d240cdb8c910c109fafe Parents: badf167 Author: Tom Barber <[email protected]> Authored: Fri Oct 30 22:48:55 2015 +0000 Committer: Tom Barber <[email protected]> Committed: Fri Oct 30 22:48:55 2015 +0000 ---------------------------------------------------------------------- .../DataSourceWorkflowRepository.java | 8 +-- .../oodt/cas/workflow/engine/SimpleTester.java | 2 - .../TestWorkflowDataSourceRepository.java | 56 +++++++++++++------- workflow/src/test/resources/workflow.sql | 6 +++ 4 files changed, 46 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/dc689d5b/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 23d2c7b..ba97f07 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 @@ -509,17 +509,17 @@ public class DataSourceWorkflowRepository implements WorkflowRepository { return tasks; } - public List getWorkflowsForEvent(String eventName) throws RepositoryException { + public List<Workflow> getWorkflowsForEvent(String eventName) throws RepositoryException { return getWorkflowsForEvent(eventName, true, true); } - public List getWorkflowsForEvent(String eventName, boolean getTasks, + public List<Workflow> getWorkflowsForEvent(String eventName, boolean getTasks, boolean getConditions) throws RepositoryException { Connection conn = null; Statement statement = null; ResultSet rs = null; - List workflows = null; + List<Workflow> workflows = null; try { conn = dataSource.getConnection(); @@ -602,7 +602,7 @@ public class DataSourceWorkflowRepository implements WorkflowRepository { * @see org.apache.oodt.cas.workflow.repository.WorkflowRepository# * getConditionsByTaskName(java.lang.String) */ - public List getConditionsByTaskName(String taskName) + public List<WorkflowCondition> getConditionsByTaskName(String taskName) throws RepositoryException { Connection conn = null; Statement statement = null; http://git-wip-us.apache.org/repos/asf/oodt/blob/dc689d5b/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 9c84a46..407811f 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 @@ -33,8 +33,6 @@ import java.io.PrintWriter; import java.util.logging.Level; import java.util.logging.Logger; -//OODT imports - /** * * A simple workflow task instance that writes its start date time to a file. http://git-wip-us.apache.org/repos/asf/oodt/blob/dc689d5b/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 b47c80b..6a89ad8 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 @@ -234,7 +234,6 @@ public class TestWorkflowDataSourceRepository { } @Test - @Ignore public void testGetWorkflowsNoConditionsOrTasks() throws RepositoryException { DataSourceWorkflowRepository repo = new DataSourceWorkflowRepository(ds); @@ -251,7 +250,6 @@ public class TestWorkflowDataSourceRepository { } - @Ignore @Test public void testGetTaskByWorkflowName() throws RepositoryException { @@ -260,23 +258,23 @@ public class TestWorkflowDataSourceRepository { assertThat(tasks, allOf(notNullValue(), hasSize(2))); + assertThat(tasks.get(0).getTaskName(), equalTo("Test Task")); + assertThat(tasks.get(1).getTaskName(), equalTo("Test Task2")); } - @Ignore @Test public void testGetTasksByWorkflowNameNull() throws RepositoryException { DataSourceWorkflowRepository repo = new DataSourceWorkflowRepository(ds); List<WorkflowTask> tasks = repo.getTasksByWorkflowName(null); - assertThat(tasks, allOf(notNullValue(), hasSize(2))); + assertThat(tasks, nullValue()); } - @Ignore - @Test + @Test(expected=RepositoryException.class) public void testGetTasksByWorkflowNameNoDataSource() throws RepositoryException { DataSourceWorkflowRepository repo = new DataSourceWorkflowRepository(null); List<WorkflowTask> tasks = repo.getTasksByWorkflowName(null); @@ -285,45 +283,63 @@ public class TestWorkflowDataSourceRepository { } - @Ignore @Test public void testGetWorkflowsForEvent() throws RepositoryException { DataSourceWorkflowRepository repo = new DataSourceWorkflowRepository(ds); - List<WorkflowTask> tasks = repo.getWorkflowsForEvent("event"); + List<Workflow> workflow = repo.getWorkflowsForEvent("event"); - assertThat(tasks, allOf(notNullValue(), hasSize(2))); + assertThat(workflow, allOf(notNullValue(), hasSize(1))); + assertThat(workflow.get(0).getName(), equalTo("Test Workflow")); } - @Ignore @Test public void testGetworkflowsForEventNoTasksOrConditions() throws RepositoryException { DataSourceWorkflowRepository repo = new DataSourceWorkflowRepository(ds); - List<WorkflowTask> tasks = repo.getWorkflowsForEvent("event", false, false); + List<Workflow> workflow = repo.getWorkflowsForEvent("event", false, false); - assertThat(tasks, allOf(notNullValue(), hasSize(2))); + assertThat(workflow, allOf(notNullValue(), hasSize(1))); + assertThat(workflow.get(0).getPreConditions(), allOf(notNullValue(), hasSize(0))); + assertThat(workflow.get(0).getPostConditions(), allOf(notNullValue(), hasSize(0))); } - @Ignore - @Test - public void testGetWorkflowsForEventNoDataSource(){ + @Test(expected=RepositoryException.class) + public void testGetWorkflowsForEventNoDataSource() throws RepositoryException { + + DataSourceWorkflowRepository repo = new DataSourceWorkflowRepository(null); + List<Workflow> workflow = repo.getWorkflowsForEvent("event", false, false); + + assertThat(workflow, allOf(notNullValue(), hasSize(2))); + + assertThat(workflow.get(0).getPreConditions(), allOf(notNullValue(), hasSize(0))); + assertThat(workflow.get(0).getPostConditions(), allOf(notNullValue(), hasSize(0))); } - @Ignore @Test - public void testGetConditionsByTaskName(){ + public void testGetConditionsByTaskName() throws RepositoryException { + + DataSourceWorkflowRepository repo = new DataSourceWorkflowRepository(ds); + List<WorkflowCondition> workflow = repo.getConditionsByTaskName("Test Task"); + + assertThat(workflow, allOf(notNullValue(), hasSize(1))); + assertThat(workflow.get(0).getConditionName(), equalTo("TrueCond")); + + } - @Ignore - @Test - public void testGetConditionsByTaskNameNoDataSource(){ + @Test(expected=RepositoryException.class) + public void testGetConditionsByTaskNameNoDataSource() throws RepositoryException { + DataSourceWorkflowRepository repo = new DataSourceWorkflowRepository(null); + List<WorkflowCondition> workflow = repo.getConditionsByTaskName("Test Task"); + assertThat(workflow, allOf(notNullValue(), hasSize(1))); + assertThat(workflow.get(0).getConditionName(), equalTo("Test Condition")); } @Ignore http://git-wip-us.apache.org/repos/asf/oodt/blob/dc689d5b/workflow/src/test/resources/workflow.sql ---------------------------------------------------------------------- diff --git a/workflow/src/test/resources/workflow.sql b/workflow/src/test/resources/workflow.sql index e025a69..ad91b80 100644 --- a/workflow/src/test/resources/workflow.sql +++ b/workflow/src/test/resources/workflow.sql @@ -79,3 +79,9 @@ INSERT INTO workflow_conditions VALUES ('2', 'FalseCond', 'org.apache.oodt.cas.w INSERT INTO workflow_conditions VALUES ('3', 'TrueCond', 'org.apache.oodt.cas.workflow.examples.TrueCondition', 30, true); INSERT INTO workflows VALUES ('1', 'Test Workflow'); INSERT INTO workflow_condition_map VALUES ('1', '3', '1'); +INSERT INTO workflow_tasks VALUES ('1', 'Test Task', 'org.apache.org.cas.workflow.examples.LongTask'); +INSERT INTO workflow_task_map VALUES ('1','1', '1'); +INSERT INTO workflow_tasks VALUES ('2', 'Test Task2', 'org.apache.org.cas.workflow.examples.LongTask'); +INSERT INTO workflow_task_map VALUES ('1','2', '1'); +INSERT INTO event_workflow_map VALUES ('1', 'event'); +INSERT INTO task_condition_map VALUES ('1', '3', '1'); \ No newline at end of file
