Merge branch 'merge_review/JAL-3490_2_11_2_develop' into develop

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

diff --git a/test/jalview/io/FileFormatsTest.java b/test/jalview/io/FileFormatsTest.java
index ffc844c..53f18bf 100644 (file)
--- a/test/jalview/io/FileFormatsTest.java
+++ b/test/jalview/io/FileFormatsTest.java
@@ -10,16 +10,23 @@ import static org.testng.Assert.assertTrue;
 import java.util.Iterator;
 
 import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class FileFormatsTest
 {
-  @AfterMethod()
+  @AfterMethod(alwaysRun = true)
   public void tearDown()
   {
     FileFormats.getInstance().reset();
   }
 
+  @BeforeMethod(alwaysRun = true)
+  public void setUp()
+  {
+    FileFormats.getInstance().reset();
+  }
+
   @Test(groups = "Functional")
   public void testIsIdentifiable()
   {
@@ -30,7 +37,7 @@ public class FileFormatsTest
             .getName())));
     assertTrue(formats.isIdentifiable(formats.forName(FileFormat.Jnet
             .getName())));
-    assertFalse(formats.isIdentifiable(formats.forName(FileFormat.Jalview
+    assertTrue(formats.isIdentifiable(formats.forName(FileFormat.Jalview
             .getName())));
     assertFalse(formats.isIdentifiable(null));