Fix disk cache test for ontology service

Author: arteymix

test/ubic/basecode/ontology/providers/AbstractOntologyServiceTest.java

@@ -19,28 +19,27 @@
 
 package ubic.basecode.ontology.providers;
 
-import java.io.File;
-import java.net.URL;
-import java.util.Collection;
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
-
 import ubic.basecode.ontology.jena.OntologyLoader;
 import ubic.basecode.ontology.model.OntologyTerm;
 import ubic.basecode.util.Configuration;
 
+import java.io.File;
+import java.net.URL;
+import java.util.Collection;
+
 import static org.junit.Assert.*;
+import static org.junit.Assume.assumeTrue;
 
 /**
  * @author mjacobson
  */
 public class AbstractOntologyServiceTest {
 
     private static String prevDir = null;
-    private static String dataResource = "/data/nif.organism.test.owl.xml";
+    private static final String dataResource = "/data/nif.organism.test.owl.xml";
 
     @BeforeClass
     public static void setup() throws Exception {
@@ -54,54 +53,46 @@ public static void tearDown() throws Exception {
     }
 
     @Test
-    @Ignore("This test was always broken, but the failure was obscured in a thread.")
     public void testCacheOntologyToDisk() throws Exception {
         String name = "fooTEST1234";
 
         File f = OntologyLoader.getDiskCachePath( name );
+        assertNotNull( f );
         if ( f.exists() ) {
-            f.delete();
+            assumeTrue( String.format( "Failed to delete existing ontology cache file %s.", f.getAbsolutePath() ), f.delete() );
         }
 
-        assertTrue( !f.exists() );
+        assertFalse( f.exists() );
 
         URL resource = this.getClass().getResource( dataResource );
+        assertNotNull( resource );
         GenericOntologyService s = createService( name, resource.toString(), true );
 
         Collection<OntologyTerm> r = s.findTerm( "Mouse" );
-        assertTrue( !r.isEmpty() );
+        assertFalse( r.isEmpty() );
 
         // Check if cache was created
         assertTrue( f.exists() );
-        assertTrue( f.length() != 0 );
+        assertNotEquals( 0, f.length() );
 
         // Recreate OntologyService using this cache file
         s = createService( name, "/data/NONEXISTENT_RESOURCE", true );
 
         r = s.findTerm( "Mouse" );
-        assertTrue( !r.isEmpty() );
+        assertFalse( r.isEmpty() );
 
         // Recreate OntologyService with bad URL and no cache
-        s = createService( "NO_CACHE_WITH_THIS_NAME", "/data/NONEXISTENT_RESOURCE", true );
-
-        r = s.findTerm( "Mouse" );
-        assertTrue( r.isEmpty() );
-
+        assertThrows( RuntimeException.class, () -> createService( "NO_CACHE_WITH_THIS_NAME", "/data/NONEXISTENT_RESOURCE", true ) );
     }
 
     @Test
     public void testGenericOntologyServiceMem() throws Exception {
         URL resource = this.getClass().getResource( dataResource );
-
+        assertNotNull( resource );
         GenericOntologyService s = createService( "foo", resource.toString(), false );
 
         Collection<OntologyTerm> r = s.findTerm( "Mouse" );
-        assertTrue( !r.isEmpty() );
-
-    }
-
-    @Test
-    public void testReindexOnInitialize() throws Exception {
+        assertFalse( r.isEmpty() );
 
     }
 
@@ -118,7 +109,7 @@ public void testInitializeInBackgroundThread() throws InterruptedException {
         assertFalse( s.isInitializationThreadAlive() );
     }
 
-    private GenericOntologyService createService( String name, String resourceURL, boolean cache ) throws Exception {
+    private GenericOntologyService createService( String name, String resourceURL, boolean cache ) {
         GenericOntologyService s = new GenericOntologyService( name, resourceURL, cache );
         s.initialize( true, false );
         return s;