Revert "JAL-2245 Castor mapping and code changes for change to ENA XML format"

[jalview.git] / test / jalview / datamodel / xdb / embl / EmblEntryTest.java

diff --git a/test/jalview/datamodel/xdb/embl/EmblEntryTest.java b/test/jalview/datamodel/xdb/embl/EmblEntryTest.java
index f332fa6..abe5099 100644 (file)
--- a/test/jalview/datamodel/xdb/embl/EmblEntryTest.java
+++ b/test/jalview/datamodel/xdb/embl/EmblEntryTest.java
@@ -1,7 +1,6 @@
 package jalview.datamodel.xdb.embl;
 
 import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNotNull;
 import static org.testng.AssertJUnit.assertNull;
 import static org.testng.AssertJUnit.assertSame;
 
@@ -41,21 +40,20 @@ public class EmblEntryTest
     // not the whole sequence but enough for this test...
     List<SequenceI> peptides = new ArrayList<SequenceI>();
     SequenceIdMatcher matcher = new SequenceIdMatcher(peptides);
-    EmblEntry ef = EmblTestHelper.getEmblFile();
-    assertNotNull(ef);
-    // assertEquals(1, ef.getEntries().size());
-    // EmblEntry testee = ef.getEntries().get(0);
+    EmblFile ef = EmblTestHelper.getEmblFile();
+    assertEquals(1, ef.getEntries().size());
+    EmblEntry testee = ef.getEntries().get(0);
     String sourceDb = "EMBL";
-    SequenceI dna = ef.makeSequence(sourceDb);
+    SequenceI dna = testee.makeSequence(sourceDb);
 
     /*
      * parse three CDS features, with two/one/no Uniprot cross-refs
      */
-    for (EmblFeature feature : ef.getFeatures())
+    for (EmblFeature feature : ef.getEntries().get(0).getFeatures())
     {
       if ("CDS".equals(feature.getName()))
       {
-        ef.parseCodingFeature(feature, sourceDb, dna, peptides, matcher);
+        testee.parseCodingFeature(feature, sourceDb, dna, peptides, matcher);
       }
     }