Add tests for workflow overviews

Author: MarkRobbo

src/test/java/org/commonwl/view/cwl/CWLServiceTest.java

@@ -24,6 +24,7 @@
 import org.apache.jena.rdf.model.ModelFactory;
 import org.commonwl.view.git.GitDetails;
 import org.commonwl.view.workflow.Workflow;
+import org.commonwl.view.workflow.WorkflowOverview;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -159,6 +160,48 @@ public void workflowOverSingleFileSizeLimitThrowsIOException() throws Exception
 
     }
 
+    /**
+     * Test retrieval of a workflow overview for hello world example in cwl
+     */
+    @Test
+    public void getHelloWorkflowOverview() throws Exception {
+
+        // Test cwl service
+        CWLService cwlService = new CWLService(Mockito.mock(RDFService.class),
+                Mockito.mock(CWLTool.class), 5242880);
+
+        // Run workflow overview
+        File helloWorkflow = new File("src/test/resources/cwl/hello/hello.cwl");
+        WorkflowOverview hello = cwlService.getWorkflowOverview(helloWorkflow);
+        assertNotNull(hello);
+
+        // No docs for this workflow
+        assertEquals("Hello World", hello.getLabel());
+        assertEquals("Puts a message into a file using echo", hello.getDoc());
+        assertEquals("hello.cwl", hello.getFileName());
+
+    }
+
+    /**
+     * Test IOException is thrown when files are over limit with getWorkflowOverview
+     */
+    @Test
+    public void workflowOverviewOverSingleFileSizeLimitThrowsIOException() throws Exception {
+
+        // Test cwl service
+        CWLService cwlService = new CWLService(Mockito.mock(RDFService.class),
+                Mockito.mock(CWLTool.class), 0);
+
+        // File to test
+        File helloWorkflow = new File("src/test/resources/cwl/hello/hello.cwl");
+
+        // Should throw IOException due to oversized file
+        thrown.expect(IOException.class);
+        thrown.expectMessage("File 'hello.cwl' is over singleFileSizeLimit - 672 bytes/0 bytes");
+        cwlService.getWorkflowOverview(helloWorkflow);
+
+    }
+
     /**
      * Validate a LobSTR workflow
      * See: https://github.com/common-workflow-language/workflows/tree/master/workflows/lobSTR

src/test/java/org/commonwl/view/workflow/WorkflowControllerTest.java

@@ -100,13 +100,13 @@ public void newWorkflowFromGithubURL() throws Exception {
         WorkflowFormValidator mockValidator = Mockito.mock(WorkflowFormValidator.class);
         when(mockValidator.validateAndParse(anyObject(), anyObject()))
                 .thenReturn(null)
-                .thenReturn(new GitDetails("https://repo.url/repo.git", "branch", "path/within"))
-                .thenReturn(new GitDetails("https://repo.url/repo.git", "branch", "path/workflow.cwl"));
+                .thenReturn(new GitDetails("https://github.com/owner/repoName.git", "branch", "path/within"))
+                .thenReturn(new GitDetails("https://github.com/owner/repoName.git", "branch", "path/workflow.cwl"));
 
         // The eventual accepted valid workflow
         Workflow mockWorkflow = Mockito.mock(Workflow.class);
         when(mockWorkflow.getRetrievedFrom())
-                .thenReturn(new GitDetails("https://repo.url/repo.git", "branch", "path/workflow.cwl"));
+                .thenReturn(new GitDetails("https://github.com/owner/repoName.git", "branch", "path/workflow.cwl"));
         QueuedWorkflow mockQueuedWorkflow = Mockito.mock(QueuedWorkflow.class);
         when(mockQueuedWorkflow.getTempRepresentation())
                 .thenReturn(mockWorkflow);
@@ -132,17 +132,23 @@ public void newWorkflowFromGithubURL() throws Exception {
                 .andExpect(status().isOk())
                 .andExpect(view().name("index"));
 
+        // Valid directory URL redirect
+        mockMvc.perform(post("/workflows")
+                .param("url", "https://github.com/owner/repoName/blob/branch/path/within"))
+                .andExpect(status().isFound())
+                .andExpect(redirectedUrl("/workflows/github.com/owner/repoName/blob/branch/path/within"));
+
         // Invalid workflow URL, go to index to show error
         mockMvc.perform(post("/workflows")
-                .param("url", "https://github.com/owner/repoName/tree/branch/path/nonexistant.cwl"))
+                .param("url", "https://github.com/owner/repoName/blob/branch/path/nonexistant.cwl"))
                 .andExpect(status().isOk())
                 .andExpect(view().name("index"));
 
         // Valid workflow URL redirect
         mockMvc.perform(post("/workflows")
-                .param("url", "https://repo.url/repo.git/branch/path/workflow.cwl"))
+                .param("url", "https://github.com/owner/repoName/blob/branch/path/workflow.cwl"))
                 .andExpect(status().isFound())
-                .andExpect(redirectedUrl("/workflows/repo.url/repo.git/branch/path/workflow.cwl"));
+                .andExpect(redirectedUrl("/workflows/github.com/owner/repoName/blob/branch/path/workflow.cwl"));
 
     }
 

src/test/java/org/commonwl/view/workflow/WorkflowServiceTest.java

@@ -36,7 +36,9 @@
 import java.io.File;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 
+import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyObject;
@@ -50,6 +52,54 @@ public class WorkflowServiceTest {
     @Rule
     public TemporaryFolder roBundleFolder = new TemporaryFolder();
 
+    /**
+     * Getting a list of workflow overviews from a directory
+     */
+    @Test
+    public void getWorkflowsFromDirectory() throws Exception {
+
+        // Mock CWL service which returns simple overview once simulating 1 workflow found
+        CWLService mockCWLService = Mockito.mock(CWLService.class);
+        when(mockCWLService.getWorkflowOverview(anyObject()))
+                .thenReturn(new WorkflowOverview("workflow.cwl", "label", "doc"))
+                .thenReturn(new WorkflowOverview("workflow2.cwl", "label2", "doc2"))
+                .thenReturn(null);
+
+        Repository mockRepo = Mockito.mock(Repository.class);
+        when(mockRepo.getWorkTree()).thenReturn(new File("src/test/resources/cwl/hello"));
+
+        Git mockGitRepo = Mockito.mock(Git.class);
+        when(mockGitRepo.getRepository()).thenReturn(mockRepo);
+
+        GitService mockGitService = Mockito.mock(GitService.class);
+        when(mockGitService.getRepository(anyObject(), anyBoolean())).thenReturn(mockGitRepo);
+
+        // Create service under test
+        WorkflowService testWorkflowService = new WorkflowService(
+                mockGitService, mockCWLService,
+                Mockito.mock(WorkflowRepository.class),
+                Mockito.mock(QueuedWorkflowRepository.class),
+                Mockito.mock(ROBundleFactory.class),
+                Mockito.mock(GraphVizService.class),
+                Mockito.mock(CWLToolRunner.class),
+                Mockito.mock(GitSemaphore.class), 1);
+
+        // Get a list of workflows from the directory
+        List<WorkflowOverview> list = testWorkflowService.getWorkflowsFromDirectory(
+                new GitDetails(null, null, "/"));
+
+        // 1 workflow should be found
+        assertTrue(list.size() == 2);
+        assertEquals("workflow.cwl", list.get(0).getFileName());
+        assertEquals("label", list.get(0).getLabel());
+        assertEquals("doc", list.get(0).getDoc());
+
+        assertEquals("workflow2.cwl", list.get(1).getFileName());
+        assertEquals("label2", list.get(1).getLabel());
+        assertEquals("doc2", list.get(1).getDoc());
+
+    }
+
     /**
      * Getting a workflow when cache has expired
      * And a new workflow needs to be created