X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FJalview2xmlTests.java;h=b3e37f4cb67649471332bbe966ce09b49d230524;hb=3412b273e964fb1a9d22564b04a5f0c827ec2461;hp=8b8393437d9bbe1b6bdad01d6a827bda8cecc504;hpb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;p=jalview.git

diff --git a/test/jalview/io/Jalview2xmlTests.java b/test/jalview/io/Jalview2xmlTests.java
index 8b83934..b3e37f4 100644
--- a/test/jalview/io/Jalview2xmlTests.java
+++ b/test/jalview/io/Jalview2xmlTests.java
@@ -20,10 +20,19 @@
  */
 package jalview.io;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.testng.AssertJUnit.assertTrue;
+
+import java.io.File;
+
+import org.testng.Assert;
+import org.testng.AssertJUnit;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
 import jalview.api.AlignmentViewPanel;
 import jalview.api.ViewStyleI;
+import jalview.bin.Cache;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
@@ -32,13 +41,6 @@ import jalview.gui.Desktop;
 import jalview.schemes.AnnotationColourGradient;
 import jalview.schemes.ColourSchemeI;
 
-import java.io.File;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 public class Jalview2xmlTests
 {
 
@@ -254,6 +256,10 @@ public class Jalview2xmlTests
   @Test
   public void viewRefPdbAnnotation() throws Exception
   {
+    Cache.applicationProperties.setProperty("STRUCT_FROM_PDB",
+            Boolean.TRUE.toString());
+    Cache.applicationProperties.setProperty("ADD_SS_ANN",
+            Boolean.TRUE.toString());
     AlignFrame af = new jalview.io.FileLoader().LoadFileWaitTillLoaded(
             "examples/exampleFile_2_7.jar", FormatAdapter.FILE);
     assertTrue("Didn't read in the example file correctly.", af != null);
@@ -299,7 +305,7 @@ public class Jalview2xmlTests
           }
           catch (NullPointerException q)
           {
-            fail("Mismatch of alignment annotations at position " + p
+            Assert.fail("Mismatch of alignment annotations at position " + p
                     + " Ref seq ann: " + refan.annotations[p]
                     + " alignment " + alaa.annotations[p]);
           }
@@ -314,7 +320,7 @@ public class Jalview2xmlTests
   {
     AlignFrame af = new jalview.io.FileLoader().LoadFileWaitTillLoaded(
             "examples/exampleFile_2_7.jar", FormatAdapter.FILE);
-    Assert.assertTrue("Didn't read in the example file correctly.", af != null);
+    assertTrue("Didn't read in the example file correctly.", af != null);
     AlignmentViewPanel sps = null, groups = null;
     for (AlignmentViewPanel ap : af.alignPanel.alignFrame.getAlignPanels())
     {
@@ -332,10 +338,10 @@ public class Jalview2xmlTests
 
     ViewStyleI structureStyle = sps.getAlignViewport().getViewStyle();
     ViewStyleI groupStyle = groups.getAlignViewport().getViewStyle();
-    Assert.assertFalse(structureStyle.sameStyle(groupStyle));
+    AssertJUnit.assertFalse(structureStyle.sameStyle(groupStyle));
 
     groups.getAlignViewport().setViewStyle(structureStyle);
-    Assert.assertFalse(groupStyle.sameStyle(groups.getAlignViewport()
+    AssertJUnit.assertFalse(groupStyle.sameStyle(groups.getAlignViewport()
             .getViewStyle()));
     Assert.assertTrue(structureStyle.sameStyle(groups.getAlignViewport()
             .getViewStyle()));