Merge branch 'merge/develop_JAL-1260' into develop

[jalview.git] / test / jalview / io / EmblFlatFileTest.java

diff --git a/test/jalview/io/EmblFlatFileTest.java b/test/jalview/io/EmblFlatFileTest.java
index b04cddd..ee853f3 100644 (file)
--- a/test/jalview/io/EmblFlatFileTest.java
+++ b/test/jalview/io/EmblFlatFileTest.java
@@ -3,9 +3,9 @@ package jalview.io;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertNull;
 import static org.testng.AssertJUnit.assertSame;
 import static org.testng.AssertJUnit.fail;
-import static org.testng.AssertJUnit.assertNull;
 
 import java.io.File;
 import java.io.IOException;
@@ -14,8 +14,10 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import jalview.bin.Cache;
 import jalview.datamodel.DBRefEntry;
 import jalview.datamodel.Mapping;
 import jalview.datamodel.Sequence.DBModList;
@@ -26,6 +28,12 @@ import jalview.util.MapList;
 
 public class EmblFlatFileTest
 {
+  @BeforeClass(alwaysRun = true)
+  public void setUp()
+  {
+    Cache.initLogger();
+  }
+
   /**
    * A fairly tough test, using J03321 (circular DNA), which has 8 CDS features,
    * one of them reverse strand
@@ -39,7 +47,6 @@ public class EmblFlatFileTest
     File dataFile = new File("test/jalview/io/J03321.embl.txt");
     FileParse fp = new FileParse(dataFile, DataSourceType.FILE);
     EmblFlatFile parser = new EmblFlatFile(fp, "EmblTest");
-    parser.parse();
     List<SequenceI> seqs = parser.getSeqs();
 
     assertEquals(seqs.size(), 1);
@@ -255,7 +262,6 @@ public class EmblFlatFileTest
             + "     ggatGcgtaa gttagacgaa attttgtctt tgcgcacaga        40\n";
     FileParse fp = new FileParse(data, DataSourceType.PASTE);
     EmblFlatFile parser = new EmblFlatFile(fp, "EmblTest");
-    parser.parse();
     List<SequenceI> seqs = parser.getSeqs();
     assertEquals(seqs.size(), 1);
     SequenceI seq = seqs.get(0);