Refactor tests for new dependencies

Author: MarkRobbo

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

@@ -26,6 +26,7 @@
 import org.apache.taverna.robundle.manifest.PathMetadata;
 import org.commonwl.view.cwl.CWLTool;
 import org.commonwl.view.git.GitDetails;
+import org.commonwl.view.git.GitSemaphore;
 import org.commonwl.view.git.GitService;
 import org.commonwl.view.graphviz.GraphVizService;
 import org.commonwl.view.workflow.Workflow;
@@ -45,8 +46,7 @@
 import java.util.Set;
 
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.when;
 
 public class ROBundleServiceTest {
@@ -76,7 +76,7 @@ public void generateAndSaveROBundle() throws Exception {
 
         // Get mock Git service
         GitService mockGitService = Mockito.mock(GitService.class);
-        when(mockGitService.getRepository(anyObject())).thenReturn(gitRepo);
+        when(mockGitService.getRepository(anyObject(), anyBoolean())).thenReturn(gitRepo);
 
         Set<HashableAgent> authors = new HashSet<>();
         authors.add(new HashableAgent("Mark Robinson", null, new URI("mailto:[email protected]")));
@@ -110,7 +110,7 @@ public void generateAndSaveROBundle() throws Exception {
         // Create new RO bundle
         ROBundleService bundleService = new ROBundleService(roBundleFolder.getRoot().toPath(),
                 "CWL Viewer", "https://view.commonwl.org", 5242880,
-                mockGraphvizService, mockGitService, mockCwlTool);
+                mockGraphvizService, mockGitService, Mockito.mock(GitSemaphore.class), mockCwlTool);
         Bundle bundle = bundleService.createBundle(lobSTRv1, lobSTRv1RODetails);
         Path bundleRoot = bundle.getRoot().resolve("workflow");
 
@@ -173,7 +173,7 @@ public void filesOverLimit() throws Exception {
 
         // Get mock Git service
         GitService mockGitService = Mockito.mock(GitService.class);
-        when(mockGitService.getRepository(anyObject())).thenReturn(gitRepo);
+        when(mockGitService.getRepository(anyObject(), anyBoolean())).thenReturn(gitRepo);
 
         Set<HashableAgent> authors = new HashSet<>();
         authors.add(new HashableAgent("Mark Robinson", null, new URI("mailto:[email protected]")));
@@ -207,7 +207,7 @@ public void filesOverLimit() throws Exception {
         // Create new RO bundle
         ROBundleService bundleService = new ROBundleService(roBundleFolder.getRoot().toPath(),
                 "CWL Viewer", "https://view.commonwl.org", 0, mockGraphvizService,
-                mockGitService, mockCwlTool);
+                mockGitService, Mockito.mock(GitSemaphore.class), mockCwlTool);
         Bundle bundle = bundleService.createBundle(lobSTRv1, lobSTRv1RODetails);
 
         Manifest manifest = bundle.getManifest();

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

@@ -22,6 +22,7 @@
 import org.commonwl.view.cwl.CWLService;
 import org.commonwl.view.cwl.CWLToolRunner;
 import org.commonwl.view.git.GitDetails;
+import org.commonwl.view.git.GitSemaphore;
 import org.commonwl.view.git.GitService;
 import org.commonwl.view.graphviz.GraphVizService;
 import org.commonwl.view.researchobject.ROBundleFactory;
@@ -37,6 +38,7 @@
 import java.util.HashMap;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Mockito.when;
 
@@ -82,7 +84,7 @@ public void getWorkflowCacheHasExpired() throws Exception {
         when(mockGitRepo.getRepository()).thenReturn(mockRepo);
 
         GitService mockGitService = Mockito.mock(GitService.class);
-        when(mockGitService.getRepository(anyObject())).thenReturn(mockGitRepo);
+        when(mockGitService.getRepository(anyObject(), anyBoolean())).thenReturn(mockGitRepo);
         when(mockGitService.getCurrentCommitID(anyObject())).thenReturn("newCommitId");
 
         // Create service under test with negative cache time (always create new workflow)
@@ -91,7 +93,8 @@ public void getWorkflowCacheHasExpired() throws Exception {
                 mockWorkflowRepo, Mockito.mock(QueuedWorkflowRepository.class),
                 Mockito.mock(ROBundleFactory.class),
                 Mockito.mock(GraphVizService.class),
-                Mockito.mock(CWLToolRunner.class), -1);
+                Mockito.mock(CWLToolRunner.class),
+                Mockito.mock(GitSemaphore.class), -1);
 
         // Will use check cache algorithm, find expired,
         // check git and find commit IDs do not match,
@@ -128,7 +131,8 @@ public void getROBundle() throws Exception {
                 mockWorkflowRepo, Mockito.mock(QueuedWorkflowRepository.class),
                 Mockito.mock(ROBundleFactory.class),
                 Mockito.mock(GraphVizService.class),
-                Mockito.mock(CWLToolRunner.class), -1);
+                Mockito.mock(CWLToolRunner.class),
+                Mockito.mock(GitSemaphore.class), -1);
 
         File fetchedBundle = testWorkflowService.getROBundle(Mockito.mock(GitDetails.class));
         assertEquals(roBundlePath, fetchedBundle.getAbsolutePath());