From 1ce6886ff239dba3c3555aa73456269fae33d53a Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Mon, 2 May 2016 12:22:32 +0100 Subject: [PATCH] JAL-1270 move some Network tests to External (require third-party services) --- test/jalview/fts/service/pdb/PDBFTSPanelTest.java | 2 +- test/jalview/fts/service/pdb/PDBFTSRestClientTest.java | 3 ++- test/jalview/ws/dbsources/XfamFetcherTest.java | 4 ++-- test/jalview/ws/jabaws/DisorderAnnotExportImport.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/jalview/fts/service/pdb/PDBFTSPanelTest.java b/test/jalview/fts/service/pdb/PDBFTSPanelTest.java index 6837847..ac1d304 100644 --- a/test/jalview/fts/service/pdb/PDBFTSPanelTest.java +++ b/test/jalview/fts/service/pdb/PDBFTSPanelTest.java @@ -90,7 +90,7 @@ public class PDBFTSPanelTest assertEquals(expectedString, outcome); } - @Test(groups = { "Network", "External" }, timeOut = 7000) + @Test(groups = { "External" }, timeOut = 7000) public void txt_search_ActionPerformedTest() { PDBFTSPanel searchPanel = new PDBFTSPanel(null); diff --git a/test/jalview/fts/service/pdb/PDBFTSRestClientTest.java b/test/jalview/fts/service/pdb/PDBFTSRestClientTest.java index d6203c6..ebc0405 100644 --- a/test/jalview/fts/service/pdb/PDBFTSRestClientTest.java +++ b/test/jalview/fts/service/pdb/PDBFTSRestClientTest.java @@ -191,7 +191,7 @@ public class PDBFTSRestClientTest } @Test( - groups = { "External", "Network" }, + groups = { "External" }, expectedExceptions = Exception.class) public void testForExpectedRuntimeException() throws Exception { @@ -206,6 +206,7 @@ public class PDBFTSRestClientTest PDBFTSRestClient.getInstance().executeRequest(request); } + // JBP: Is this actually external ? Looks like it is mocked @Test(groups = { "External" }) public void parsePDBJsonResponseTest() { diff --git a/test/jalview/ws/dbsources/XfamFetcherTest.java b/test/jalview/ws/dbsources/XfamFetcherTest.java index ce4d1bc..c894fd1 100644 --- a/test/jalview/ws/dbsources/XfamFetcherTest.java +++ b/test/jalview/ws/dbsources/XfamFetcherTest.java @@ -27,7 +27,7 @@ import org.testng.annotations.Test; public class XfamFetcherTest { - @Test(groups = { "network" }) + @Test(groups = { "External" }) public void testRfamSeed() throws Exception { // RfamFull rff = new RfamFull(); @@ -41,7 +41,7 @@ public class XfamFetcherTest + " didn't contain more than one sequence."); } - @Test(groups = { "network" }) + @Test(groups = { "External" }) public void testPfamFullAndSeed() throws Exception { PfamFull pff = new PfamFull(); diff --git a/test/jalview/ws/jabaws/DisorderAnnotExportImport.java b/test/jalview/ws/jabaws/DisorderAnnotExportImport.java index 64840c2..557ef7e 100644 --- a/test/jalview/ws/jabaws/DisorderAnnotExportImport.java +++ b/test/jalview/ws/jabaws/DisorderAnnotExportImport.java @@ -40,7 +40,7 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -@Test(groups = { "Network" }) +@Test(groups = { "External" }) public class DisorderAnnotExportImport { public static String testseqs = "examples/uniref50.fa"; -- 1.7.10.2