Skip to content

Commit 83c06c1

Browse files
committed
tests use simplified Workflow constructor
1 parent f6cbd89 commit 83c06c1

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public void parseWorkflowWithCwltool() throws Exception {
140140

141141
GitDetails gitInfo = new GitDetails("https://github.com/common-workflow-language/workflows.git",
142142
"549c973ccc01781595ce562dea4cedc6c9540fe0", "workflows/make-to-cwl/dna.cwl");
143-
Workflow basicModel = new Workflow(null, null, null, null, null, null);
143+
Workflow basicModel = new Workflow();
144144
basicModel.setRetrievedFrom(gitInfo);
145145
gitInfo.setPackedId("main");
146146
basicModel.setLastCommit("549c973ccc01781595ce562dea4cedc6c9540fe0");

src/test/java/org/commonwl/view/graphviz/ModelDotWriterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void setUp() throws Exception {
9191
outputs.put("output", output);
9292

9393
// Save workflow model
94-
testWorkflow = new Workflow("Example Workflow", "Description", inputs, outputs, steps, null);
94+
testWorkflow = new Workflow("Example Workflow", "Description", inputs, outputs, steps);
9595
}
9696

9797
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class ROBundleFactoryTest {
4444
public void bundleForValidWorkflow() throws Exception {
4545

4646
Workflow validWorkflow = new Workflow("Valid Workflow", "Doc for Valid Workflow",
47-
new HashMap<>(), new HashMap<>(), new HashMap<>(), null);
47+
new HashMap<>(), new HashMap<>(), new HashMap<>());
4848
validWorkflow.setRetrievedFrom(Mockito.mock(GitDetails.class));
4949

5050
// Mocked path to a RO bundle

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public void newWorkflowFromGithubURLJson() throws Exception {
151151
@Test
152152
public void getWorkflowByGithubDetailsJson() throws Exception {
153153

154-
Workflow workflow1 = new Workflow("label", "doc", null, null, null, null);
154+
Workflow workflow1 = new Workflow("label", "doc", null, null, null);
155155
workflow1.setRetrievedFrom(new GitDetails("https://github.com/owner/repo.git",
156156
"branch", "path/to/workflow.cwl"));
157157

@@ -198,7 +198,7 @@ public void checkQueue() throws Exception {
198198

199199
QueuedWorkflow qwfSuccess = new QueuedWorkflow();
200200
qwfSuccess.setCwltoolStatus(CWLToolStatus.SUCCESS);
201-
Workflow wfSuccess = new Workflow(null, null, null, null, null, null);
201+
Workflow wfSuccess = new Workflow(null, null, null, null, null);
202202
wfSuccess.setRetrievedFrom(new GitDetails("https://github.com/owner/repoName.git",
203203
"branch", "path/to/workflow.cwl"));
204204
qwfSuccess.setTempRepresentation(wfSuccess);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,15 @@ public void getWorkflowCacheHasExpired() throws Exception {
119119
"master", "dna.cwl");
120120

121121
Workflow oldWorkflow = new Workflow("old", "This is the expired workflow",
122-
new HashMap<>(), new HashMap<>(), new HashMap<>(), null);
122+
new HashMap<>(), new HashMap<>(), new HashMap<>());
123123
oldWorkflow.setId("theworkflowid");
124124
oldWorkflow.setRetrievedOn(new Date());
125125
oldWorkflow.setRetrievedFrom(githubInfo);
126126
oldWorkflow.setLastCommit("d46ce365f1a10c4c4d6b0caed51c6f64b84c2f63");
127127
oldWorkflow.setRoBundlePath(roBundleFolder.newFile("robundle.zip").getAbsolutePath());
128128

129129
Workflow updatedWorkflow = new Workflow("new", "This is the updated workflow",
130-
new HashMap<>(), new HashMap<>(), new HashMap<>(), null);
130+
new HashMap<>(), new HashMap<>(), new HashMap<>());
131131
updatedWorkflow.setId("newworkflowid");
132132

133133
WorkflowRepository mockWorkflowRepo = Mockito.mock(WorkflowRepository.class);
@@ -174,7 +174,7 @@ public void getWorkflowCacheHasExpired() throws Exception {
174174
public void getROBundle() throws Exception {
175175

176176
Workflow workflow = new Workflow("Label", "Doc for the workflow",
177-
new HashMap<>(), new HashMap<>(), new HashMap<>(), null);
177+
new HashMap<>(), new HashMap<>(), new HashMap<>());
178178
workflow.setRetrievedFrom(new GitDetails("url", "commitID", "path"));
179179
workflow.setLastCommit("commitID");
180180

0 commit comments

Comments
 (0)