Merge branch 'hotfix/JAL-1521' into develop

[jalview.git] / test / jalview / ws / seqfetcher / DbRefFetcherTest.java

diff --git a/test/jalview/ws/seqfetcher/DbRefFetcherTest.java b/test/jalview/ws/seqfetcher/DbRefFetcherTest.java
index a269ecc..07167bd 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * 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<DbSourceProxy> srces = new ArrayList<DbSourceProxy>();
-  for (String ddb : defdb)
-  {
-    SequenceFetcher sfetcher= new SequenceFetcher();
-    List<DbSourceProxy> 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<DbSourceProxy> srces = new ArrayList<DbSourceProxy>();
+    for (String ddb : defdb)
     {
-      i++;
+      SequenceFetcher sfetcher = new SequenceFetcher();
+      List<DbSourceProxy> 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);
   }
 
 }