Fix for new tests so that they don't pollute other tests

josemduarte · josemduarte · commit 83b9c09d012d · 2017-09-07T21:52:34.000-07:00
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/InputStreamProvider.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/InputStreamProvider.java
@@ -65,15 +65,15 @@ public class InputStreamProvider {
 
 	private boolean cacheRawFiles ;
 
-	FlatFileCache cache ;
 	public InputStreamProvider() {
 		super();
 		cacheRawFiles = false;
 
 		String prop = System.getProperty(CACHE_PROPERTY);
 		if ( prop != null && prop.equals("true")) {
 			cacheRawFiles = true;
-			cache = FlatFileCache.getInstance();
+			// init the singleton
+			FlatFileCache.getInstance();
 		}
 
 	}
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestDownloadChemCompProvider.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestDownloadChemCompProvider.java
@@ -20,6 +20,7 @@
  */
 package org.biojava.nbio.structure;
 
+import org.biojava.nbio.core.util.FlatFileCache;
 import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
 import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
 import org.junit.Test;
@@ -67,6 +68,10 @@ public void testRedirectWorks() {
 		// just in case the we did get garbage, let's clean up
 		file.delete();
 		
+		// very important: we have a memory cache of files, we need to reset it not to pollute the cache for later tests
+		FlatFileCache ffc = FlatFileCache.getInstance();
+		ffc.clear();
+		
 		assertNotNull(cc);
 		
 		assertNotNull(cc.getName());
@@ -95,6 +100,10 @@ public void testWeDontCacheGarbage() {
 		
 		file.delete();
 		
+		// very important: we have a memory cache of files, we need to reset it not to pollute the cache for later tests
+		FlatFileCache ffc = FlatFileCache.getInstance();
+		ffc.clear();
+		
 		// we couldn't parse, thus there should be no content
 		assertNull(cc.getName());
 		
@@ -122,6 +131,10 @@ public void testIfWeCachedGarbageWeCanDetectIt() throws IOException {
 		
 		file.delete();
 		
+		// very important: we have a memory cache of files, we need to reset it not to pollute the cache for later tests
+		FlatFileCache ffc = FlatFileCache.getInstance();
+		ffc.clear();
+		
 		assertNull(cc.getName());
 		
 		

Original file line number	Diff line number	Diff line change
`@@ -65,15 +65,15 @@ public class InputStreamProvider {`
`65`	`65`
`66`	`66`	`private boolean cacheRawFiles ;`
`67`	`67`
`68`		`- FlatFileCache cache ;`
`69`	`68`	`public InputStreamProvider() {`
`70`	`69`	`super();`
`71`	`70`	`cacheRawFiles = false;`
`72`	`71`
`73`	`72`	`String prop = System.getProperty(CACHE_PROPERTY);`
`74`	`73`	`if ( prop != null && prop.equals("true")) {`
`75`	`74`	`cacheRawFiles = true;`
`76`		`- cache = FlatFileCache.getInstance();`
	`75`	`+ // init the singleton`
	`76`	`+ FlatFileCache.getInstance();`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`}`