X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Fensembl%2FEnsemblSeqProxyTest.java;fp=test%2Fjalview%2Fext%2Fensembl%2FEnsemblSeqProxyTest.java;h=aa2c315d10a10ae384d93654d2408f691c270d6e;hb=f063821ed0be9c1581af74643a1aa5798731af65;hp=e97723369c5813ebb55afab8097c32cde61b7dfe;hpb=fd18e2c73cd015d4e38ad91da0e5d7532ff0ef42;p=jalview.git diff --git a/test/jalview/ext/ensembl/EnsemblSeqProxyTest.java b/test/jalview/ext/ensembl/EnsemblSeqProxyTest.java index e977233..aa2c315 100644 --- a/test/jalview/ext/ensembl/EnsemblSeqProxyTest.java +++ b/test/jalview/ext/ensembl/EnsemblSeqProxyTest.java @@ -22,12 +22,13 @@ package jalview.ext.ensembl; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertFalse; +import static org.testng.AssertJUnit.assertSame; import static org.testng.AssertJUnit.assertTrue; -import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals; import jalview.datamodel.Alignment; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceI; +import jalview.datamodel.features.SequenceFeatures; import jalview.gui.JvOptionPane; import jalview.io.DataSourceType; import jalview.io.FastaFile; @@ -37,6 +38,7 @@ import jalview.io.gff.SequenceOntologyLite; import java.lang.reflect.Method; import java.util.Arrays; +import java.util.List; import org.testng.Assert; import org.testng.annotations.AfterClass; @@ -269,15 +271,22 @@ public class EnsemblSeqProxyTest SequenceFeature sf2 = new SequenceFeature("", "", 8, 12, 0f, null); SequenceFeature sf3 = new SequenceFeature("", "", 8, 13, 0f, null); SequenceFeature sf4 = new SequenceFeature("", "", 11, 11, 0f, null); - SequenceFeature[] sfs = new SequenceFeature[] { sf1, sf2, sf3, sf4 }; + List sfs = Arrays.asList(new SequenceFeature[] { sf1, + sf2, sf3, sf4 }); // sort by start position ascending (forward strand) // sf2 and sf3 tie and should not be reordered by sorting - EnsemblSeqProxy.sortFeatures(sfs, true); - assertArrayEquals(new SequenceFeature[] { sf2, sf3, sf1, sf4 }, sfs); + SequenceFeatures.sortFeatures(sfs, true); + assertSame(sfs.get(0), sf2); + assertSame(sfs.get(1), sf3); + assertSame(sfs.get(2), sf1); + assertSame(sfs.get(3), sf4); // sort by end position descending (reverse strand) - EnsemblSeqProxy.sortFeatures(sfs, false); - assertArrayEquals(new SequenceFeature[] { sf1, sf3, sf2, sf4 }, sfs); + SequenceFeatures.sortFeatures(sfs, false); + assertSame(sfs.get(0), sf1); + assertSame(sfs.get(1), sf3); + assertSame(sfs.get(2), sf2); + assertSame(sfs.get(3), sf4); } }