LMS-2265 tests fixed

SVN: 21521

image_readers/source/java/ch/systemsx/cisd/imagereaders/ImageReaderFactory.java

@@ -128,4 +128,12 @@ public class ImageReaderFactory
     {
         libraries = newLibraries;
     }
+    
+    /**
+     * used only for testing purposes.
+     */
+    static List<IImageReaderLibrary> getLibraries()
+    {
+        return libraries;
+    }
 }

image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReaderFactoryTest.java

@@ -90,11 +90,12 @@ public class ImageReaderFactoryTest extends ImageReaderTestCase
     }
 
     @Test(expectedExceptions = IOExceptionUnchecked.class)
-    public void testReadNonExistingFile()
+    public void testReadNonExistingFile() throws Exception
     {
         final String invalidName = "invalid_file_path.jpg";
         final File invalidFile = new File(invalidName);
 
+        ImageReadersTestHelper.setUpLibraries(ImageReaderConstants.BIOFORMATS_LIBRARY);
         IImageReader reader =
                 ImageReaderFactory.tryGetReaderForFile(BIOFORMATS_LIBRARY, invalidName);
         reader.readImage(invalidFile, ImageID.NULL, null);

image_readers/sourceTest/java/ch/systemsx/cisd/imagereaders/ImageReaderTestCase.java

@@ -17,8 +17,11 @@
 package ch.systemsx.cisd.imagereaders;
 
 import java.io.File;
+import java.util.List;
 
 import org.testng.AssertJUnit;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
 
 /**
  * Common super class for unit test using example image files.
@@ -34,6 +37,19 @@ public abstract class ImageReaderTestCase extends AssertJUnit
 
     protected static final String INVALID_SUBDIR = "invalid";
 
+    private List<IImageReaderLibrary> libraries;
+    
+    @BeforeMethod
+    public void setUp()
+    {
+        libraries = ImageReaderFactory.getLibraries();
+    }
+
+    @AfterMethod
+    public void tearDown()
+    {
+        ImageReaderFactory.setLibraries(libraries);
+    }
 
     protected File getImageFileForLibrary(String libraryName, String fileName)
     {