Add latest database versions for SCOP and CATH

sbliven · sbliven · commit 0aad2fb8f961 · 2018-03-14T17:09:51.000+01:00
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/scop/BerkeleyScopInstallationTest.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/scop/BerkeleyScopInstallationTest.java
@@ -48,6 +48,8 @@ public static Collection<Object[]> availableDatabases() {
 		for(String version : new String[] {
 				// All versions should pass, but comment most out for test performance.
 				ScopFactory.LATEST_VERSION,
+				ScopFactory.VERSION_2_0_6,
+				ScopFactory.VERSION_2_0_5,
 				//"1.75A",
 				//ScopFactory.VERSION_2_0_2,
 				ScopFactory.VERSION_1_75,
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/scop/ScopDatabaseTest.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/scop/ScopDatabaseTest.java
@@ -154,7 +154,10 @@ public void testNodes() {
 		node = scop.getScopNode(0); // root
 		assertEquals(tag,0,node.getSunid());
 		assertEquals(tag,-1,node.getParentSunid());
-		assertEquals(tag+"Wrong number of children",11,node.getChildren().size());
+		assertEquals(tag+"Wrong number of children",
+				// Class I (Artifacts) added in SCOP 2.06
+				scop.getScopVersion().compareToIgnoreCase( ScopFactory.VERSION_2_0_6) >= 0 ? 12 : 11,
+						node.getChildren().size());
 
 		node = scop.getScopNode(-1); // illegal
 		assertNull(tag,node);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathFactory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathFactory.java
@@ -38,7 +38,8 @@ public class CathFactory {
 	public static final String VERSION_3_5_0 = "3_5_0";
 	public static final String VERSION_4_0_0 = "4_0_0";
 	public static final String VERSION_4_1_0 = "4_1_0";
-	public static final String LATEST_VERSION = VERSION_4_1_0;
+	public static final String VERSION_4_2_0 = "4_2_0";
+	public static final String LATEST_VERSION = VERSION_4_2_0;
 
 	public static final String DEFAULT_VERSION = LATEST_VERSION;
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopFactory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopFactory.java
@@ -53,6 +53,8 @@ public class ScopFactory {
 	private static final Logger logger = LoggerFactory.getLogger(ScopFactory.class);
 
 	// berkeley 2
+	public static final String VERSION_2_0_7 = "2.07";
+	public static final String VERSION_2_0_6 = "2.06";
 	public static final String VERSION_2_0_5 = "2.05";
 	public static final String VERSION_2_0_4 = "2.04";
 	public static final String VERSION_2_0_3 = "2.03";
@@ -78,7 +80,7 @@ public class ScopFactory {
 	public static final String VERSION_1_55 = "1.55";
 
 	// The most recent version as of compilation time
-	public static final String LATEST_VERSION = VERSION_2_0_5;
+	public static final String LATEST_VERSION = VERSION_2_0_7;
 
 	// Hold one instance for each version
 	private static Map<String,ScopDatabase> versionedScopDBs = new HashMap<String, ScopDatabase>();
