From a4da7308cd43dcd4bddd773453007c916735d68a Mon Sep 17 00:00:00 2001 From: gmungoc Date: Mon, 19 Sep 2016 11:29:08 +0100 Subject: [PATCH] JAL-1270 use test properties file --- test/jalview/gui/AnnotationChooserTest.java | 1 + test/jalview/ws/PDBSequenceFetcherTest.java | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/test/jalview/gui/AnnotationChooserTest.java b/test/jalview/gui/AnnotationChooserTest.java index f08fa8d..6621a94 100644 --- a/test/jalview/gui/AnnotationChooserTest.java +++ b/test/jalview/gui/AnnotationChooserTest.java @@ -75,6 +75,7 @@ public class AnnotationChooserTest @BeforeMethod(alwaysRun = true) public void setUp() throws IOException { + Cache.loadProperties("test/jalview/io/testProps.jvprops"); // pin down annotation sort order for test Cache.applicationProperties.setProperty(Preferences.SORT_ANNOTATIONS, SequenceAnnotationOrder.NONE.name()); diff --git a/test/jalview/ws/PDBSequenceFetcherTest.java b/test/jalview/ws/PDBSequenceFetcherTest.java index b911107..4cdb621 100644 --- a/test/jalview/ws/PDBSequenceFetcherTest.java +++ b/test/jalview/ws/PDBSequenceFetcherTest.java @@ -41,6 +41,7 @@ public class PDBSequenceFetcherTest @BeforeMethod(alwaysRun = true) public void setUp() throws Exception { + Cache.loadProperties("test/jalview/io/testProps.jvprops"); // ensure 'add annotation from structure' is selected Cache.applicationProperties.setProperty("STRUCT_FROM_PDB", Boolean.TRUE.toString()); @@ -61,8 +62,6 @@ public class PDBSequenceFetcherTest @Test(groups = { "Network" }, enabled = true) public void testRnaSeqRetrieve() throws Exception { - Cache.applicationProperties.setProperty("STRUCT_FROM_PDB", - Boolean.TRUE.toString()); Cache.applicationProperties.setProperty("PDB_DOWNLOAD_FORMAT", "PDB"); List sps = sf.getSourceProxy("PDB"); @@ -84,8 +83,6 @@ public class PDBSequenceFetcherTest @Test(groups = { "Network" }, enabled = true) public void testPdbSeqRetrieve() throws Exception { - Cache.applicationProperties.setProperty("STRUCT_FROM_PDB", - Boolean.TRUE.toString()); StructureImportSettings.setDefaultStructureFileFormat("PDB"); testRetrieveProteinSeqFromPDB(); @@ -94,8 +91,6 @@ public class PDBSequenceFetcherTest @Test(groups = { "Network" }, enabled = true) public void testmmCifSeqRetrieve() throws Exception { - Cache.applicationProperties.setProperty("STRUCT_FROM_PDB", - Boolean.TRUE.toString()); StructureImportSettings.setDefaultStructureFileFormat("mmCIF"); testRetrieveProteinSeqFromPDB(); } -- 1.7.10.2