JAL-629 JAL-4124 JAL-3855 test to check we can import PAE matrices in a variety of...
[jalview.git] / test / jalview / ext / ensembl / EnsemblXrefTest.java
index 9cc6627..9247316 100644 (file)
@@ -25,13 +25,13 @@ import static org.testng.AssertJUnit.assertFalse;
 
 import jalview.datamodel.DBRefEntry;
 import jalview.gui.JvOptionPane;
+import jalview.util.JSONUtils;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.StringReader;
 import java.net.URL;
 import java.util.List;
 
+import org.json.simple.parser.ParseException;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
@@ -61,12 +61,14 @@ public class EnsemblXrefTest
     EnsemblXref testee = new EnsemblXref("http://rest.ensembl.org", dbName,
             dbVers)
     {
+      @SuppressWarnings("unchecked")
       @Override
-      protected BufferedReader getHttpResponse(URL url, List<String> ids)
-              throws IOException
+      protected Object getJSON(URL url, List<String> ids, int msDelay,
+              int mode, String mapKey) throws IOException, ParseException
       {
-        return new BufferedReader(new StringReader(JSON));
+        return ((List<Object>) JSONUtils.parse(JSON)).iterator();
       }
+
     };
 
     // synonyms and GO terms are not returned