X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Fensembl%2FEnsemblXrefTest.java;h=9247316bd82b9a8856308facc9fc32a5809b6424;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=df1c1adfd9a051980af1cf05cc70aaa46a85fabd;hpb=6c43dd36929855a7907380ffb36b4df249d4a557;p=jalview.git
diff --git a/test/jalview/ext/ensembl/EnsemblXrefTest.java b/test/jalview/ext/ensembl/EnsemblXrefTest.java
index df1c1ad..9247316 100644
--- a/test/jalview/ext/ensembl/EnsemblXrefTest.java
+++ b/test/jalview/ext/ensembl/EnsemblXrefTest.java
@@ -1,20 +1,50 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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.
+ *
+ * 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.ext.ensembl;
import static org.testng.AssertJUnit.assertEquals;
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;
public class EnsemblXrefTest
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
//@formatter:off
private static final String JSON =
"[{\"primary_id\":\"CCDS5863\",\"dbname\":\"CCDS\"}," +
@@ -31,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 ids)
- throws IOException
+ protected Object getJSON(URL url, List ids, int msDelay,
+ int mode, String mapKey) throws IOException, ParseException
{
- return new BufferedReader(new StringReader(JSON));
+ return ((List