mock permalink for test

Author: stain

src/test/java/org/commonwl/view/researchobject/ROBundleServiceTest.java

@@ -119,14 +119,15 @@ public void setUp() throws Exception {
         when(lobSTRdraft3.getID()).thenReturn("testID");
         when(lobSTRdraft3.getRetrievedFrom()).thenReturn(lobSTRdraft3Details);
         when(lobSTRdraft3.getLastCommit()).thenReturn("933bf2a1a1cce32d88f88f136275535da9df0954");
-        when(lobSTRdraft3.getIdentifier()).thenReturn("https://w3id.org/cwl/view/git/" +
-                "933bf2a1a1cce32d88f88f136275535da9df0954/workflows/lobSTR/lobSTR-workflow.cwl");
+        final String permalink = "https://w3id.org/cwl/view/git/" +
+                "933bf2a1a1cce32d88f88f136275535da9df0954/workflows/lobSTR/lobSTR-workflow.cwl";
+		when(lobSTRdraft3.getIdentifier()).thenReturn(permalink);
+		when(lobSTRdraft3.getPermalink()).thenReturn(permalink);
         when(lobSTRdraft3.getPermalink(any())).thenAnswer(new Answer<String>() {
             @Override
             public String answer(InvocationOnMock invocation) throws Throwable {
                 Object[] args = invocation.getArguments();
-                return "https://w3id.org/cwl/view/git/933bf2a1a1cce32d88f88f136275535da9df0954/" +
-                        "workflows/lobSTR/lobSTR-workflow.cwl?format=" + args[0];
+                return permalink + "?format=" + args[0];
             }
         });
     }

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

@@ -34,6 +34,7 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.util.Optional;
 
 import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.when;
@@ -61,9 +62,15 @@ public void setUp() throws Exception {
                 .thenReturn(new GitDetails("https://github.com/MarkRobbo/workflows.git",
                         "master", "path/to/workflow.cwl"));
 
+        
+        
         WorkflowService mockWorkflowService = Mockito.mock(WorkflowService.class);
-        when(mockWorkflowService.findByCommitAndPath(anyString(), anyString()))
-                .thenReturn(mockWorkflow);
+        when(mockWorkflowService.findByCommitAndPath(anyString(), anyString(), anyObject()))
+        	.thenReturn(mockWorkflow);
+
+        when(mockWorkflowService.findRawBaseForCommit(anyString())).thenReturn(
+        		Optional.of("https://raw.githubusercontent.com/MarkRobbo/workflows/commitidhere/"));
+        
         when(mockWorkflowService.getWorkflowGraph(eq("svg"), anyObject())).thenReturn(svg);
         when(mockWorkflowService.getWorkflowGraph(eq("png"), anyObject())).thenReturn(png);
         when(mockWorkflowService.getWorkflowGraph(eq("xdot"), anyObject())).thenReturn(dot);