Skip to content

Commit 4be2a28

Browse files
Add test for options resetting
1 parent f996b88 commit 4be2a28

File tree

2 files changed

+61
-0
lines changed

2 files changed

+61
-0
lines changed

src/main/java/com/glencoesoftware/pyramid/PyramidFromDirectoryWriter.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,13 +368,19 @@ public void setRGB(boolean isRGB) {
368368
* @return path to output data
369369
*/
370370
public String getOutputPath() {
371+
if (outputFilePath == null) {
372+
return null;
373+
}
371374
return outputFilePath.toString();
372375
}
373376

374377
/**
375378
* @return path to input data
376379
*/
377380
public String getInputPath() {
381+
if (inputDirectory == null) {
382+
return null;
383+
}
378384
return inputDirectory.toString();
379385
}
380386

src/test/java/com/glencoesoftware/raw2ometiff/test/ConversionTest.java

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -673,6 +673,61 @@ public void testOptionsAPI() throws Exception {
673673
iteratePixels();
674674
}
675675

676+
/**
677+
* Test resetting options to their default values.
678+
*/
679+
@Test
680+
public void testResetAPI() throws Exception {
681+
input = fake("sizeC", "12", "rgb", "3");
682+
assertBioFormats2Raw();
683+
684+
outputOmeTiff = output.resolve("output.ome.tiff");
685+
686+
// make sure default options are set
687+
PyramidFromDirectoryWriter apiConverter = new PyramidFromDirectoryWriter();
688+
CommandLine cmd = new CommandLine(apiConverter);
689+
cmd.parseArgs();
690+
691+
Assert.assertEquals(apiConverter.getInputPath(), null);
692+
Assert.assertEquals(apiConverter.getOutputPath(), null);
693+
Assert.assertEquals(apiConverter.getCompression(), CompressionType.LZW);
694+
Assert.assertEquals(apiConverter.getRGB(), false);
695+
Assert.assertEquals(apiConverter.getLegacyTIFF(), false);
696+
Assert.assertEquals(apiConverter.getSplitTIFFs(), false);
697+
698+
// override default options, as though to start a conversion
699+
apiConverter.setInputPath(output.toString());
700+
apiConverter.setOutputPath(outputOmeTiff.toString());
701+
apiConverter.setCompression(CompressionType.UNCOMPRESSED);
702+
apiConverter.setRGB(true);
703+
704+
// change our minds and reset the options to defaults again
705+
cmd.parseArgs();
706+
707+
Assert.assertEquals(apiConverter.getInputPath(), null);
708+
Assert.assertEquals(apiConverter.getOutputPath(), null);
709+
Assert.assertEquals(apiConverter.getCompression(), CompressionType.LZW);
710+
Assert.assertEquals(apiConverter.getRGB(), false);
711+
Assert.assertEquals(apiConverter.getLegacyTIFF(), false);
712+
Assert.assertEquals(apiConverter.getSplitTIFFs(), false);
713+
714+
// update options, make sure they were set, and actually convert
715+
apiConverter.setInputPath(output.toString());
716+
apiConverter.setOutputPath(outputOmeTiff.toString());
717+
apiConverter.setCompression(CompressionType.UNCOMPRESSED);
718+
apiConverter.setRGB(true);
719+
720+
Assert.assertEquals(apiConverter.getInputPath(), output.toString());
721+
Assert.assertEquals(apiConverter.getOutputPath(), outputOmeTiff.toString());
722+
Assert.assertEquals(apiConverter.getCompression(),
723+
CompressionType.UNCOMPRESSED);
724+
Assert.assertEquals(apiConverter.getRGB(), true);
725+
726+
apiConverter.call();
727+
728+
iteratePixels();
729+
}
730+
676731
/**
677732
* Test "--quality" command line option.
678733
*/

0 commit comments

Comments
 (0)