From 27baf15b1a8c07743d844afdf2a66a1e661169fb Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Thu, 26 Jul 2012 07:07:50 +0000
Subject: [PATCH] Adapt test expectations to Bioformats 4.4.1.
SVN: 26214
---
.../ch/systemsx/cisd/imagereaders/ImageReaderFactoryTest.java | 3 ++-
.../imagereaders/bioformats/BioFormatsMetaDataReadingTest.java | 2 --
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReaderFactoryTest.java b/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReaderFactoryTest.java
index 57d4783b2a3..09fb275d4db 100644
--- a/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReaderFactoryTest.java
+++ b/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReaderFactoryTest.java
@@ -93,12 +93,13 @@ public class ImageReaderFactoryTest extends ImageReaderTestCase
@Test(expectedExceptions = IOExceptionUnchecked.class)
public void testReadNonExistingFile() throws Exception
{
- final String invalidName = "invalid_file_path.jpg";
+ final String invalidName = "invalid_file_path.tif";
final File invalidFile = new File(invalidName);
ImageReadersTestHelper.setUpLibraries(ImageReaderConstants.BIOFORMATS_LIBRARY);
IImageReader reader =
ImageReaderFactory.tryGetReaderForFile(BIOFORMATS_LIBRARY, invalidName);
+ assertNotNull(reader);
reader.readImage(invalidFile, ImageID.NULL, null);
}
diff --git a/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsMetaDataReadingTest.java b/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsMetaDataReadingTest.java
index dbbcc4f7b69..c9bddeb4de8 100644
--- a/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsMetaDataReadingTest.java
+++ b/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/bioformats/BioFormatsMetaDataReadingTest.java
@@ -105,7 +105,6 @@ public class BioFormatsMetaDataReadingTest extends ImageReaderTestCase
+ "camera-chip-offset-x: 0\n"
+ "camera-chip-offset-y: 0\n"
+ "exposure time 0 (ms): 10.0\n"
- + "exposure time 1 (ms): 10.0\n"
+ "gamma: 1\n"
+ "gray-calibration-curve-fit-algorithm: 4\n"
+ "gray-calibration-max: -1\n"
@@ -136,7 +135,6 @@ public class BioFormatsMetaDataReadingTest extends ImageReaderTestCase
+ "threshold-low: 0\n"
+ "threshold-state: ThresholdOff\n"
+ "timestamp 0: 1290354772986\n"
- + "timestamp 1: 1290354772986\n"
+ "wavelength: 624\n" + "z-position: 11145.7\n" + "zoom-percent: 50\n";
}
--
GitLab