Merge branch 'mmw/JAL-4199-web-services-testing' into mmw/bug/JAL-4241-annotation...

diff --git a/test/jalview/ws2/actions/alignment/AlignmentActionTest.java b/test/jalview/ws2/actions/alignment/AlignmentActionTest.java
index b4a1388..d7ef20b 100644 (file)
--- a/test/jalview/ws2/actions/alignment/AlignmentActionTest.java
+++ b/test/jalview/ws2/actions/alignment/AlignmentActionTest.java
@@ -50,7 +50,7 @@ public class AlignmentActionTest
 
   protected WebServiceJobHandle jobRef;
 
-  @BeforeMethod
+  @BeforeMethod(alwaysRun = true)
   public void setupMockClient() throws IOException
   {
     jobRef = new WebServiceJobHandle(
@@ -64,7 +64,7 @@ public class AlignmentActionTest
     doThrow(new UnsupportedOperationException()).when(mockClient).cancel(any());
   }
 
-  @BeforeMethod(dependsOnMethods = { "setupMockClient" })
+  @BeforeMethod(alwaysRun = true, dependsOnMethods = { "setupMockClient" })
   public void setupActionBuilder() throws IOException
   {
     actionBuilder = AlignmentAction.newBuilder(mockClient);
@@ -213,7 +213,7 @@ class AlignmentActionListenerNotifiedTest extends AlignmentActionTest
 {
   private AlignViewport viewport;
 
-  @BeforeMethod
+  @BeforeMethod(alwaysRun = true)
   public void setupViewport()
   {
     viewport = new AlignViewport(new Alignment(new SequenceI[] {

diff --git a/test/jalview/ws2/client/slivka/SlivkaWSDiscovererTest.java b/test/jalview/ws2/client/slivka/SlivkaWSDiscovererTest.java
index 6824a10..1611b6f 100644 (file)
--- a/test/jalview/ws2/client/slivka/SlivkaWSDiscovererTest.java
+++ b/test/jalview/ws2/client/slivka/SlivkaWSDiscovererTest.java
@@ -50,7 +50,7 @@ public class SlivkaWSDiscovererTest
     Console.initLogger();
   }
 
-  @BeforeMethod
+  @BeforeMethod(alwaysRun = true)
   public void setupDiscoverer() throws IOException
   {
     clientMock = mock(SlivkaClient.class);