Test coverage for WorkflowController generic git

Author: MarkRobbo

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

@@ -39,6 +39,7 @@
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -274,8 +275,10 @@ public void downloadROBundle() throws Exception {
 
         // Mock service to return a bundle file and then throw ROBundleNotFoundException
         WorkflowService mockWorkflowService = Mockito.mock(WorkflowService.class);
+        File bundle = roBundleFolder.newFile("bundle.zip").getAbsoluteFile();
         when(mockWorkflowService.getROBundle(anyObject()))
-                .thenReturn(roBundleFolder.newFile("bundle.zip").getAbsoluteFile())
+                .thenReturn(bundle)
+                .thenReturn(bundle)
                 .thenThrow(new ROBundleNotFoundException());
 
         // Mock controller/MVC
@@ -292,6 +295,11 @@ public void downloadROBundle() throws Exception {
                 .andExpect(status().isOk())
                 .andExpect(content().contentType("application/vnd.wf4ever.robundle+zip"));
 
+        // Generic git and bundle exists
+        mockMvc.perform(get("/robundle/bitbucket.org/owner/repo.git/branch/path/to/workflow.cwl"))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType("application/vnd.wf4ever.robundle+zip"));
+
         // Bundle does not exist, 404 error
         mockMvc.perform(get("/robundle/github.com/owner/repo/blob/branch/path/to/workflow.cwl"))
                 .andExpect(status().isNotFound());
@@ -307,6 +315,9 @@ public void downloadGraphVizFiles() throws Exception {
         // Mock service to return mock workflow
         WorkflowService mockWorkflowService = Mockito.mock(WorkflowService.class);
         when(mockWorkflowService.getWorkflowGraph(anyString(), anyObject()))
+                .thenReturn(new FileSystemResource("src/test/resources/graphviz/testVis.svg"))
+                .thenReturn(new FileSystemResource("src/test/resources/graphviz/testVis.png"))
+                .thenReturn(new FileSystemResource("src/test/resources/graphviz/testWorkflow.dot"))
                 .thenReturn(new FileSystemResource("src/test/resources/graphviz/testVis.svg"))
                 .thenReturn(new FileSystemResource("src/test/resources/graphviz/testVis.png"))
                 .thenReturn(new FileSystemResource("src/test/resources/graphviz/testWorkflow.dot"))
@@ -332,6 +343,17 @@ public void downloadGraphVizFiles() throws Exception {
                 .andExpect(status().isOk())
                 .andExpect(content().contentType("text/vnd.graphviz"));
 
+        // Images exist at generic git URLs
+        mockMvc.perform(get("/graph/svg/bitbucket.org/owner/repo.git/branch/path/to/workflow.cwl"))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType("image/svg+xml"));
+        mockMvc.perform(get("/graph/png/bitbucket.org/owner/repo.git/branch/path/to/workflow.cwl"))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType("image/png"));
+        mockMvc.perform(get("/graph/xdot/bitbucket.org/owner/repo.git/branch/path/to/workflow.cwl"))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType("text/vnd.graphviz"));
+
         // Images do not exist, 404 error
         mockMvc.perform(get("/graph/png/github.com/owner/repo/blob/branch/path/to/workflow.cwl"))
                 .andExpect(status().isNotFound());