From 4fa02869e039bb879849419737510b4b29ea5a4c Mon Sep 17 00:00:00 2001 From: gmungoc Date: Mon, 30 Mar 2020 12:45:30 +0100 Subject: [PATCH] JAL-3210 test updated for changed signature of SequenceI.getDBRefs() --- test/jalview/project/Jalview2xmlTests.java | 41 ++++++++++++++-------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/test/jalview/project/Jalview2xmlTests.java b/test/jalview/project/Jalview2xmlTests.java index 0609ee5..80ed4c1 100644 --- a/test/jalview/project/Jalview2xmlTests.java +++ b/test/jalview/project/Jalview2xmlTests.java @@ -27,6 +27,21 @@ import static org.testng.Assert.assertNull; import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; +import java.awt.Color; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.swing.JInternalFrame; + +import org.testng.Assert; +import org.testng.AssertJUnit; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + import jalview.analysis.scoremodels.SimilarityParams; import jalview.api.AlignViewportI; import jalview.api.AlignmentViewPanel; @@ -40,6 +55,7 @@ import jalview.datamodel.HiddenSequences; import jalview.datamodel.Mapping; import jalview.datamodel.PDBEntry; import jalview.datamodel.PDBEntry.Type; +import jalview.datamodel.Sequence.DBModList; import jalview.datamodel.SequenceCollectionI; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceGroup; @@ -75,21 +91,6 @@ import jalview.util.matcher.Condition; import jalview.viewmodel.AlignmentViewport; import jalview.viewmodel.seqfeatures.FeatureRendererModel; -import java.awt.Color; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.swing.JInternalFrame; - -import org.testng.Assert; -import org.testng.AssertJUnit; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - @Test(singleThreaded = true) public class Jalview2xmlTests extends Jalview2xmlBase { @@ -1241,10 +1242,10 @@ public class Jalview2xmlTests extends Jalview2xmlBase DataSourceType.FILE); AlignmentViewPanel rap = Desktop.getAlignmentPanels(null)[0]; SequenceI rpep = rap.getAlignment().getSequenceAt(0); + DBModList dbrefs = rpep.getDBRefs(); assertEquals(rpep.getName(), "P30419"); - DBRefEntry[] dbrefs = (DBRefEntry[]) rpep.getDBRefs().toArray(); - assertEquals(dbrefs.length, 3); - DBRefEntry dbRef = dbrefs[0]; + assertEquals(dbrefs.size(), 3); + DBRefEntry dbRef = dbrefs.get(0); assertFalse(dbRef instanceof GeneLocus); assertNull(dbRef.getMap()); assertEquals(dbRef, dbref1); @@ -1253,7 +1254,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase * restored dbrefs with mapping have a different 'map to' * sequence but otherwise match the original dbrefs */ - dbRef = dbrefs[1]; + dbRef = dbrefs.get(1); assertFalse(dbRef instanceof GeneLocus); assertTrue(dbRef.equalRef(dbref2)); assertNotNull(dbRef.getMap()); @@ -1265,7 +1266,7 @@ public class Jalview2xmlTests extends Jalview2xmlBase /* * GeneLocus map.to is null so can compare Mapping objects */ - dbRef = dbrefs[2]; + dbRef = dbrefs.get(2); assertTrue(dbRef instanceof GeneLocus); assertEquals(dbRef, dbref3); } -- 1.7.10.2