Test fixes

bbimber · bbimber · commit ac2b4e7ebd17 · 2025-12-15T10:57:02.000-08:00
diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceIntegrationTests.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceIntegrationTests.java
@@ -1288,7 +1288,7 @@ public void pairedEndTestMovingInputs() throws Exception
 
             appendSamplesForImport(config, List.of(g));
 
-            Set<PipelineJob> jobs = createPipelineJob(jobName, config, SequenceAnalysisController.AnalyzeForm.TYPE.readsetImport, _project);
+            Set<PipelineJob> jobs = createPipelineJob(jobName, config, SequenceAnalysisController.AnalyzeForm.TYPE.readsetImport, workbook);
             waitForJobs(jobs);
 
             Set<File> expectedOutputs = new HashSet<>();
@@ -1307,7 +1307,7 @@ public void pairedEndTestMovingInputs() throws Exception
             try
             {
                 verifyFileOutputs(basedir, expectedOutputs);
-                verifyFileInputs(basedir, fileNames, config, prefix, _project);
+                verifyFileInputs(basedir, fileNames, config, prefix, workbook);
                 validateReadsets(jobs, config);
             }
             catch (Exception e)

Original file line number	Diff line number	Diff line change
`@@ -1288,7 +1288,7 @@ public void pairedEndTestMovingInputs() throws Exception`
`1288`	`1288`
`1289`	`1289`	`appendSamplesForImport(config, List.of(g));`
`1290`	`1290`
`1291`		`- Set<PipelineJob> jobs = createPipelineJob(jobName, config, SequenceAnalysisController.AnalyzeForm.TYPE.readsetImport, _project);`
	`1291`	`+ Set<PipelineJob> jobs = createPipelineJob(jobName, config, SequenceAnalysisController.AnalyzeForm.TYPE.readsetImport, workbook);`
`1292`	`1292`	`waitForJobs(jobs);`
`1293`	`1293`
`1294`	`1294`	`Set<File> expectedOutputs = new HashSet<>();`
`@@ -1307,7 +1307,7 @@ public void pairedEndTestMovingInputs() throws Exception`
`1307`	`1307`	`try`
`1308`	`1308`	`{`
`1309`	`1309`	`verifyFileOutputs(basedir, expectedOutputs);`
`1310`		`- verifyFileInputs(basedir, fileNames, config, prefix, _project);`
	`1310`	`+ verifyFileInputs(basedir, fileNames, config, prefix, workbook);`
`1311`	`1311`	`validateReadsets(jobs, config);`
`1312`	`1312`	`}`
`1313`	`1313`	`catch (Exception e)`