Merge branch 'develop' into improvement/JAL-4111_suffixed_DEVELOP_channels
[jalview.git] / test / mc_view / PDBfileTest.java
index b636669..cae183a 100644 (file)
@@ -26,6 +26,13 @@ import static org.testng.AssertJUnit.assertNull;
 import static org.testng.AssertJUnit.assertSame;
 import static org.testng.AssertJUnit.assertTrue;
 
+import java.io.IOException;
+import java.util.List;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
 import jalview.bin.Cache;
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentAnnotation;
@@ -37,13 +44,6 @@ import jalview.gui.JvOptionPane;
 import jalview.io.DataSourceType;
 import jalview.structure.StructureImportSettings;
 
-import java.io.IOException;
-import java.util.List;
-
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
 public class PDBfileTest
 {
 
@@ -286,10 +286,10 @@ public class PDBfileTest
     for (int i = 0; i < 20; i++)
     {
       assertNull(anns[0].annotations[i]);
-      assertEquals("E", anns[0].annotations[20].displayCharacter);
+      assertNull(anns[0].annotations[20].displayCharacter);
       assertEquals('E', anns[0].annotations[20].secondaryStructure);
-      assertEquals("E", anns[2].annotations[18].displayCharacter);
-      assertEquals("H", anns[2].annotations[23].displayCharacter);
+      assertEquals('E', anns[2].annotations[18].secondaryStructure);
+      assertEquals('H', anns[2].annotations[23].secondaryStructure);
     }
   }