X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Futil%2FMappingUtilsTest.java;h=6d046617f97dc42de62ff67e7b4fa8ccee465fa9;hb=47fd498a6fe7d2e3350a9e87c526bf1e59d00be5;hp=48495f35406a42e8fbfbeab4a8a6f24c115aaa22;hpb=db93a1adcbe0a4eaaf06e0a70ade0d6c5c1961c3;p=jalview.git diff --git a/test/jalview/util/MappingUtilsTest.java b/test/jalview/util/MappingUtilsTest.java index 48495f3..6d04661 100644 --- a/test/jalview/util/MappingUtilsTest.java +++ b/test/jalview/util/MappingUtilsTest.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -33,8 +33,8 @@ import jalview.datamodel.AlignedCodonFrame; import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentI; import jalview.datamodel.ColumnSelection; -import jalview.datamodel.SearchResults; -import jalview.datamodel.SearchResults.Match; +import jalview.datamodel.SearchResultMatchI; +import jalview.datamodel.SearchResultsI; import jalview.datamodel.Sequence; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; @@ -81,9 +81,9 @@ public class MappingUtilsTest /* * Check protein residue 12 maps to codon 5-7, 13 to codon 8-10 */ - SearchResults sr = MappingUtils.buildSearchResults(aseq1, 12, acfList); + SearchResultsI sr = MappingUtils.buildSearchResults(aseq1, 12, acfList); assertEquals(1, sr.getResults().size()); - Match m = sr.getResults().get(0); + SearchResultMatchI m = sr.getResults().get(0); assertEquals(seq1.getDatasetSequence(), m.getSequence()); assertEquals(5, m.getStart()); assertEquals(7, m.getEnd()); @@ -134,9 +134,9 @@ public class MappingUtilsTest /* * Check protein residue 8 maps to [6, 8, 9] */ - SearchResults sr = MappingUtils.buildSearchResults(aseq1, 8, acfList); + SearchResultsI sr = MappingUtils.buildSearchResults(aseq1, 8, acfList); assertEquals(2, sr.getResults().size()); - Match m = sr.getResults().get(0); + SearchResultMatchI m = sr.getResults().get(0); assertEquals(seq1.getDatasetSequence(), m.getSequence()); assertEquals(6, m.getStart()); assertEquals(6, m.getEnd());