X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2FCrossRefTest.java;h=c5f956b88836b826b59eb244afd5cc9d5a4cd282;hb=d043ce47fc710d3eb2629ba926a8a7417bd67d8c;hp=2970e3d886cacdf39512cf90a86248b54c05b6b7;hpb=04c8f7bff663aa469127e9eed4164e02933782f1;p=jalview.git diff --git a/test/jalview/analysis/CrossRefTest.java b/test/jalview/analysis/CrossRefTest.java index 2970e3d..c5f956b 100644 --- a/test/jalview/analysis/CrossRefTest.java +++ b/test/jalview/analysis/CrossRefTest.java @@ -28,6 +28,14 @@ import static org.testng.AssertJUnit.assertNull; import static org.testng.AssertJUnit.assertSame; import static org.testng.AssertJUnit.assertTrue; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + import jalview.datamodel.AlignedCodonFrame; import jalview.datamodel.AlignedCodonFrame.SequenceToSequenceMapping; import jalview.datamodel.Alignment; @@ -41,16 +49,6 @@ import jalview.gui.JvOptionPane; import jalview.util.DBRefUtils; import jalview.util.MapList; import jalview.ws.SequenceFetcher; -import jalview.ws.SequenceFetcherFactory; -import jalview.ws.params.InvalidArgumentException; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; public class CrossRefTest { @@ -455,7 +453,7 @@ public class CrossRefTest return new SequenceI[] { pep1, pep2 }; } }; - SequenceFetcherFactory.setSequenceFetcher(mockFetcher); + SequenceFetcher.setMockFetcher(mockFetcher); /* * find UNIPROT xrefs for nucleotide sequence @@ -471,7 +469,7 @@ public class CrossRefTest @AfterClass(alwaysRun = true) public void tearDown() { - SequenceFetcherFactory.setSequenceFetcher(null); + SequenceFetcher.setMockFetcher(null); } /** @@ -535,7 +533,7 @@ public class CrossRefTest return new SequenceI[] { pep1, pep2 }; } }; - SequenceFetcherFactory.setSequenceFetcher(mockFetcher); + SequenceFetcher.setMockFetcher(mockFetcher); /* * find UNIPROT xrefs for gene and transcripts @@ -698,7 +696,7 @@ public class CrossRefTest } } }; - SequenceFetcherFactory.setSequenceFetcher(mockFetcher); + SequenceFetcher.setMockFetcher(mockFetcher); /* * find EMBL xrefs for Uniprot seqs and verify that