X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2FAlignmentUtilsTests.java;fp=test%2Fjalview%2Fanalysis%2FAlignmentUtilsTests.java;h=449514adcf1023a356dde0be4a9627cbe368c8d8;hb=52402128d98c6744eb6348dd788fe6e8cd34575c;hp=4aed7e71d2a62018ce35196175f4255612204d00;hpb=08a75320d4e492edb4f308d0ab6c1044896dfd96;p=jalview.git diff --git a/test/jalview/analysis/AlignmentUtilsTests.java b/test/jalview/analysis/AlignmentUtilsTests.java index 4aed7e7..449514a 100644 --- a/test/jalview/analysis/AlignmentUtilsTests.java +++ b/test/jalview/analysis/AlignmentUtilsTests.java @@ -35,8 +35,8 @@ import jalview.datamodel.AlignmentI; import jalview.datamodel.Annotation; import jalview.datamodel.DBRefEntry; import jalview.datamodel.Mapping; -import jalview.datamodel.SearchResults; -import jalview.datamodel.SearchResults.Match; +import jalview.datamodel.SearchResultMatchI; +import jalview.datamodel.SearchResultsI; import jalview.datamodel.Sequence; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceI; @@ -1119,9 +1119,9 @@ public class AlignmentUtilsTests assertEquals(1, mappings.size()); // map G to GGG - SearchResults sr = MappingUtils.buildSearchResults(pep1, 1, mappings); + SearchResultsI sr = MappingUtils.buildSearchResults(pep1, 1, mappings); assertEquals(1, sr.getResults().size()); - Match m = sr.getResults().get(0); + SearchResultMatchI m = sr.getResults().get(0); assertSame(cds1Dss, m.getSequence()); assertEquals(1, m.getStart()); assertEquals(3, m.getEnd()); @@ -1650,10 +1650,10 @@ public class AlignmentUtilsTests List pep1CdsMappings = MappingUtils .findMappingsForSequence(cds.getSequenceAt(0), pep1Mappings); assertEquals(1, pep1CdsMappings.size()); - SearchResults sr = MappingUtils.buildSearchResults(pep1, 1, + SearchResultsI sr = MappingUtils.buildSearchResults(pep1, 1, pep1CdsMappings); assertEquals(1, sr.getResults().size()); - Match m = sr.getResults().get(0); + SearchResultMatchI m = sr.getResults().get(0); assertEquals(cds.getSequenceAt(0).getDatasetSequence(), m.getSequence()); assertEquals(1, m.getStart()); assertEquals(3, m.getEnd()); @@ -2388,9 +2388,9 @@ public class AlignmentUtilsTests assertEquals(1, mappings.size()); // map G to GGG - SearchResults sr = MappingUtils.buildSearchResults(pep3, 1, mappings); + SearchResultsI sr = MappingUtils.buildSearchResults(pep3, 1, mappings); assertEquals(1, sr.getResults().size()); - Match m = sr.getResults().get(0); + SearchResultMatchI m = sr.getResults().get(0); assertSame(cds.getSequenceAt(0).getDatasetSequence(), m.getSequence()); assertEquals(1, m.getStart()); assertEquals(3, m.getEnd());