From 0ade92ae1aa0ddf380d38fd5b37db57c2218f567 Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Wed, 20 Apr 2011 09:04:40 +0000
Subject: [PATCH] minor: do not throw exceptions if a library does not exist
SVN: 20998
---
.../ch/systemsx/cisd/imagereaders/ImageReaderFactory.java | 2 +-
.../systemsx/cisd/imagereaders/ImageReaderFactoryTest.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/image_readers/source/java/ch/systemsx/cisd/imagereaders/ImageReaderFactory.java b/image_readers/source/java/ch/systemsx/cisd/imagereaders/ImageReaderFactory.java
index aad31f3ac4c..a9059274b56 100644
--- a/image_readers/source/java/ch/systemsx/cisd/imagereaders/ImageReaderFactory.java
+++ b/image_readers/source/java/ch/systemsx/cisd/imagereaders/ImageReaderFactory.java
@@ -123,7 +123,7 @@ public class ImageReaderFactory
return library;
}
}
- throw new IllegalArgumentException("Unvalid library name '" + libraryName + "'");
+ return null;
}
/**
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 02cea552d36..139516f6dc3 100644
--- a/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReaderFactoryTest.java
+++ b/image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReaderFactoryTest.java
@@ -83,10 +83,10 @@ public class ImageReaderFactoryTest extends AbstractImageReaderFactoryTest
}
- @Test(expectedExceptions = IllegalArgumentException.class)
- public void testGetInvalidLibrary()
+ public void testGetReaderFromInvalidLibrary()
{
- ImageReaderFactory.tryGetReaderForFile("invalid_library", null);
+ IImageReader reader = ImageReaderFactory.tryGetReaderForFile("invalid_library", null);
+ assertNull(reader);
}
@Test(expectedExceptions = IOExceptionUnchecked.class)
--
GitLab