X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fseqfetcher%2FDbRefFetcherTest.java;h=07167bdfcbba7099ab70209e1dc41bf304e98a17;hb=3b20366969476761c4756c0d19789953a66f26af;hp=a269eccc823bd7503e70b4a0661f23b9f35c279e;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git diff --git a/test/jalview/ws/seqfetcher/DbRefFetcherTest.java b/test/jalview/ws/seqfetcher/DbRefFetcherTest.java index a269ecc..07167bd 100644 --- a/test/jalview/ws/seqfetcher/DbRefFetcherTest.java +++ b/test/jalview/ws/seqfetcher/DbRefFetcherTest.java @@ -1,19 +1,21 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) * Copyright (C) 2014 The Jalview Authors * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.ws.seqfetcher; @@ -34,7 +36,7 @@ import org.junit.Test; /** * @author jimp - * + * */ public class DbRefFetcherTest { @@ -59,35 +61,37 @@ public class DbRefFetcherTest public void testStandardProtDbs() { String[] defdb = DBRefSource.PROTEINDBS; - List srces = new ArrayList(); - for (String ddb : defdb) - { - SequenceFetcher sfetcher= new SequenceFetcher(); - List srcesfordb = sfetcher.getSourceProxy(ddb); - - if (srcesfordb != null) - { - srces.addAll(srcesfordb); - } - } - DbSourceProxy uniprot=null; - int i=0; - // append the selected sequence sources to the default dbs - for (DbSourceProxy s:srces) - { - if (s.getDbSource().equalsIgnoreCase(DBRefSource.UNIPROT)) + List srces = new ArrayList(); + for (String ddb : defdb) { - i++; + SequenceFetcher sfetcher = new SequenceFetcher(); + List srcesfordb = sfetcher.getSourceProxy(ddb); + + if (srcesfordb != null) + { + srces.addAll(srcesfordb); + } } - - if (s instanceof jalview.ws.dbsources.Uniprot) + DbSourceProxy uniprot = null; + int i = 0; + // append the selected sequence sources to the default dbs + for (DbSourceProxy s : srces) { - uniprot = s; - break; + if (s.getDbSource().equalsIgnoreCase(DBRefSource.UNIPROT)) + { + i++; + } + + if (s instanceof jalview.ws.dbsources.Uniprot) + { + uniprot = s; + break; + } } - } - - assertTrue("Failed to find Uniprot source as first source amongst "+srces.size()+" sources (source was at position "+i+")", uniprot!=null && i<2); + + assertTrue("Failed to find Uniprot source as first source amongst " + + srces.size() + " sources (source was at position " + i + ")", + uniprot != null && i < 2); } }