X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fws%2Fdbsources%2FPDBRestClientTest.java;h=401f4c9edddadfba2bcd7373621cf10b14b06053;hb=1df694418a9563a3bab8b5421a77bc7c83f03f90;hp=86cb3a38037a63e649ff2b62f1e8ef4d798f434b;hpb=dc53250eeeb8c854c876b0fc896c541bd8cd8710;p=jalview.git
diff --git a/test/jalview/ws/dbsources/PDBRestClientTest.java b/test/jalview/ws/dbsources/PDBRestClientTest.java
index 86cb3a3..401f4c9 100644
--- a/test/jalview/ws/dbsources/PDBRestClientTest.java
+++ b/test/jalview/ws/dbsources/PDBRestClientTest.java
@@ -1,8 +1,28 @@
+/*
+ * 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.ws.dbsources;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
import jalview.ws.dbsources.PDBRestClient.PDBDocField;
import jalview.ws.uimodel.PDBRestRequest;
import jalview.ws.uimodel.PDBRestResponse;
@@ -20,9 +40,10 @@ import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.ClientResponse;
@@ -33,17 +54,17 @@ import com.sun.jersey.api.client.config.DefaultClientConfig;
public class PDBRestClientTest
{
- @Before
+ @BeforeMethod(alwaysRun = true)
public void setUp() throws Exception
{
}
- @After
+ @AfterMethod
public void tearDown() throws Exception
{
}
- @Test
+ @Test(groups = { "External", "Network" })
public void executeRequestTest()
{
List wantedFields = new ArrayList();
@@ -60,13 +81,22 @@ public class PDBRestClientTest
request.setSearchTerm("abc");
request.setWantedFields(wantedFields);
- PDBRestResponse response = new PDBRestClient().executeRequest(request);
+ PDBRestResponse response;
+ try
+ {
+ response = new PDBRestClient().executeRequest(request);
+ } catch (Exception e)
+ {
+ e.printStackTrace();
+ Assert.fail("Couldn't execute webservice call!");
+ return;
+ }
assertTrue(response.getNumberOfItemsFound() > 99);
assertTrue(response.getSearchSummary() != null);
assertTrue(response.getSearchSummary().size() > 99);
}
- @Test
+ @Test(groups = { "Functional" })
public void getPDBDocFieldsAsCommaDelimitedStringTest()
{
List wantedFields = new ArrayList();
@@ -83,7 +113,7 @@ public class PDBRestClientTest
assertEquals("", expectedResult, actualResult);
}
- @Test
+ @Test(groups = { "External, Network" })
public void parsePDBJsonExceptionStringTest()
{
List wantedFields = new ArrayList();
@@ -121,8 +151,10 @@ public class PDBRestClientTest
assertEquals(expectedErrorMsg, parsedErrorResponse);
}
- @Test(expected = RuntimeException.class)
- public void testForExpectedRuntimeException()
+ @Test(
+ groups = { "External", "Network" },
+ expectedExceptions = Exception.class)
+ public void testForExpectedRuntimeException() throws Exception
{
List wantedFields = new ArrayList();
wantedFields.add(PDBDocField.PDB_ID);
@@ -134,7 +166,7 @@ public class PDBRestClientTest
new PDBRestClient().executeRequest(request);
}
- @Test
+ @Test(groups = { "External" })
public void parsePDBJsonResponseTest()
{
List wantedFields = new ArrayList();
@@ -163,7 +195,7 @@ public class PDBRestClientTest
assertTrue(response.getSearchSummary().size() == 14);
}
- @Test
+ @Test(groups = { "Functional" })
public void getPDBIdColumIndexTest()
{
List wantedFields = new ArrayList();
@@ -176,7 +208,7 @@ public class PDBRestClientTest
assertEquals(4, PDBRestClient.getPDBIdColumIndex(wantedFields, false));
}
- @Test
+ @Test(groups = { "External" })
public void externalServiceIntegrationTest()
{
ClientConfig clientConfig = new DefaultClientConfig();
@@ -198,7 +230,7 @@ public class PDBRestClientTest
// Check the response status and report exception if one occurs
if (clientResponse.getStatus() != 200)
{
- fail("Webservice call failed!!!");
+ Assert.fail("Webservice call failed!!!");
}
else
{
@@ -232,14 +264,14 @@ public class PDBRestClientTest
if (pdbJsonDoc.get(field.getCode()) == null)
{
// System.out.println(">>>\t" + field.getCode());
- assertTrue(field.getClass()
+ assertTrue(field.getCode()
+ " has been removed from PDB doc Entity",
!pdbJsonResponseString.contains(field.getCode()));
}
}
} catch (ParseException e)
{
- fail(">>> Test failed due to exception while parsing pdb response json !!!");
+ Assert.fail(">>> Test failed due to exception while parsing pdb response json !!!");
e.printStackTrace();
}
}
@@ -259,7 +291,7 @@ public class PDBRestClientTest
sb.append(line);
sb.append(System.lineSeparator());
line = br.readLine();
- }
+ }
fileContent = sb.toString();
} finally
{