X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2FMCview%2FPDBfileTest.java;h=3e24f520922aad6c59e1c7f055c5916d7ba7f1e8;hb=943312d4f2466b5cbfb91690d4e143e185f15e4d;hp=03b60e675f1cc87192a4739e43612f50c44aca7d;hpb=b80b8920baba71a797b3c17c2be4ca0a3ba2bf25;p=jalview.git

diff --git a/test/MCview/PDBfileTest.java b/test/MCview/PDBfileTest.java
index 03b60e6..3e24f52 100644
--- a/test/MCview/PDBfileTest.java
+++ b/test/MCview/PDBfileTest.java
@@ -21,7 +21,7 @@ import org.testng.annotations.Test;
 
 public class PDBfileTest
 {
-  @Test
+  @Test(groups ={ "Functional" })
   public void testIsRna()
   {
     SequenceI seq = new Sequence("Seq1", "CGAU");
@@ -43,7 +43,7 @@ public class PDBfileTest
    * 
    * @throws IOException
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testParse() throws IOException
   {
     /*
@@ -71,8 +71,8 @@ public class PDBfileTest
     assertTrue(chainA.sequence.getSequenceAsString().endsWith("WNVEVY"));
     assertEquals("3W5V|A", chainA.sequence.getName());
     assertNull(chainA.sequence.getAnnotation());
-    assertEquals(1, chainA.sequence.getPDBId().size());
-    PDBEntry pdb = chainA.sequence.getPDBId().get(0);
+    assertEquals(1, chainA.sequence.getAllPDBEntries().size());
+    PDBEntry pdb = chainA.sequence.getAllPDBEntries().get(0);
     assertEquals("A", pdb.getChainCode());
     assertEquals("PDB", pdb.getType());
     assertEquals("3W5V", pdb.getId());
@@ -107,8 +107,8 @@ public class PDBfileTest
     assertEquals("3W5V|B", seqs.get(1).getName());
     assertEquals("3W5V|C", seqs.get(2).getName());
     assertEquals("3W5V|D", seqs.get(3).getName());
-    assertEquals(1, seqs.get(0).getPDBId().size());
-    PDBEntry pdbe = seqs.get(0).getPDBId().get(0);
+    assertEquals(1, seqs.get(0).getAllPDBEntries().size());
+    PDBEntry pdbe = seqs.get(0).getAllPDBEntries().get(0);
     assertEquals("A", pdbe.getChainCode());
     assertEquals("3W5V", pdbe.getId());
     assertEquals(PDBEntry.Type.PDB.toString(), pdbe.getType());
@@ -120,7 +120,7 @@ public class PDBfileTest
    * 
    * @throws IOException
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testParse_withAnnotations_noSS() throws IOException
   {
     PDBfile pf = new PDBfile(true, false, false, "examples/3W5V.pdb",
@@ -178,7 +178,7 @@ public class PDBfileTest
    * 
    * @throws IOException
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testParse_withJmol_noAnnotations() throws IOException
   {
     PDBfile pf = new PDBfile(false, true, false, "examples/3W5V.pdb",
@@ -207,7 +207,7 @@ public class PDBfileTest
    * 
    * @throws IOException
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testParse_withJmolAddAlignmentAnnotations()
           throws IOException
   {
@@ -264,7 +264,8 @@ public class PDBfileTest
    * @throws IOException
    */
 
-  @Test(enabled = false)
+  @Test(groups =
+  { "Functional" }, enabled = false)
   public void testParse_withAnnotate3D() throws IOException
   {
     // TODO requires a mock for Annotate3D processing