Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

[jalview.git] / test / jalview / ws / dbsources / RemoteFormatTest.java

diff --git a/test/jalview/ws/dbsources/RemoteFormatTest.java b/test/jalview/ws/dbsources/RemoteFormatTest.java
index e04d195..4cacf01 100644 (file)
--- a/test/jalview/ws/dbsources/RemoteFormatTest.java
+++ b/test/jalview/ws/dbsources/RemoteFormatTest.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.ws.dbsources;
 
 import static org.testng.Assert.assertEquals;
@@ -46,9 +66,9 @@ public class RemoteFormatTest
   {
     Cache.loadProperties("test/jalview/io/testProps.jvprops");
     // ensure 'add annotation from structure' is selected
-    Cache.applicationProperties.setProperty("STRUCT_FROM_PDB",
+    Cache.setPropertyNoSave("STRUCT_FROM_PDB",
             Boolean.TRUE.toString());
-    Cache.applicationProperties.setProperty("ADD_SS_ANN",
+    Cache.setPropertyNoSave("ADD_SS_ANN",
             Boolean.TRUE.toString());
 
     sf = new SequenceFetcher();
@@ -58,7 +78,8 @@ public class RemoteFormatTest
   protected Object[][] getAccessions()
   {
     return new Object[][] { { DBRefSource.UNIPROT, "P30419" },
-        { DBRefSource.PDB, "1QIP" }, { DBRefSource.EMBL, "X53828" },
+        { DBRefSource.PDB, "1QIP" },
+        { DBRefSource.EMBL, "X53828" },
         { DBRefSource.EMBLCDS, "CAA37824" },
         { DBRefSource.ENSEMBL, "ENSG00000157764" },
         { new EnsemblGenomes().getDbSource(), "DDB_G0283883" },
@@ -80,7 +101,7 @@ public class RemoteFormatTest
     SequenceI sq = al.getSequenceAt(0);
     // suppress this check as only Uniprot and PDB acquire PDB refs
     // assertTrue(sq.getAllPDBEntries().size() > 0, "No PDBEntry on sequence.");
-    assertTrue(sq.getDBRefs().length > 0, "No DBRef on sequence.");
+    assertTrue(sq.getDBRefs().size() > 0, "No DBRef on sequence.");
     // suppress this test as only certain databases provide 'primary' dbrefs
     // assertFalse(sq.getPrimaryDBRefs().isEmpty());
     int length = AlignSeq.extractGaps("-. ", sq.getSequenceAsString())
@@ -99,14 +120,14 @@ public class RemoteFormatTest
     wantedFields.add(client.getDataColumnByNameOrCode("organism"));
     wantedFields.add(client.getDataColumnByNameOrCode("reviewed")); // Status
     wantedFields.add(client.getDataColumnByNameOrCode("length"));
-  
+
     FTSRestRequest request = new FTSRestRequest();
     request.setAllowEmptySeq(false);
     request.setResponseSize(100);
     request.setFieldToSearchBy("Search All");
     request.setSearchTerm("metanephrops"); // lobster!
     request.setWantedFields(wantedFields);
-  
+
     FTSRestResponse response;
     response = client.executeRequest(request);
     assertTrue(response.getNumberOfItemsFound() > 20);