Add junit Assumption for SCOP reachability

sbliven · sbliven · commit 7e71497c0259 · 2014-02-22T18:17:13.000+01:00
diff --git a/biojava3-structure/src/main/java/org/biojava/bio/structure/scop/ScopInstallation.java b/biojava3-structure/src/main/java/org/biojava/bio/structure/scop/ScopInstallation.java
@@ -904,6 +904,12 @@ public void addMirror(String scopDownloadURL) {
 	void addMirror(ScopMirror scopURLs) {
 		mirrors.add(scopURLs);
 	}
+	List<ScopMirror> getMirrors() {
+		if(mirrors.isEmpty()) {
+			this.initScopURLs();
+		}
+		return mirrors;
+	}
 
 	/* (non-Javadoc)
 	 * @see org.biojava.bio.structure.scop.ScopDatabase#getScopDomainsBySunid(java.lang.Integer)
diff --git a/biojava3-structure/src/test/java/org/biojava/bio/structure/scop/BerkeleyScopInstallationTest.java b/biojava3-structure/src/test/java/org/biojava/bio/structure/scop/BerkeleyScopInstallationTest.java
@@ -23,6 +23,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.junit.Assume;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
@@ -53,6 +54,16 @@ public static Collection<Object[]> availableDatabases() {
 		}) {
 			scop = new BerkeleyScopInstallation();
 			scop.setScopVersion(version);
+			// Don't fail if the server is down
+			boolean reachable = false;
+			for(ScopMirror mirror: scop.getMirrors()) {
+				if(mirror.isReachable()) {
+					reachable = true;
+					break;
+				}
+			}
+			Assume.assumeTrue("SCOP server is currently unreachable.",reachable);
+
 			databases.add(new Object[] {version, scop});
 		}
 		return databases;
diff --git a/biojava3-structure/src/test/java/org/biojava/bio/structure/scop/ScopInstallationTest.java b/biojava3-structure/src/test/java/org/biojava/bio/structure/scop/ScopInstallationTest.java
@@ -23,6 +23,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.junit.Assume;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
@@ -51,6 +52,17 @@ public static Collection<Object[]> availableDatabases() {
         }) {
             scop = new ScopInstallation();
             scop.setScopVersion(version);
+            
+            // Don't fail if the server is down
+            boolean reachable = false;
+            for(ScopMirror mirror: scop.getMirrors()) {
+                if(mirror.isReachable()) {
+                    reachable = true;
+                    break;
+                }
+            }
+            Assume.assumeTrue("SCOP server is currently unreachable.",reachable);
+            
             databases.add(new Object[] {version, scop});
         }
         return databases;
