X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FJalviewJabawsTestUtils.java;h=8f003cb9ada534522141681abe0be0ba22f457c0;hb=d79e3747b8ce78b1ac7aa83402e31b7e5dccfe1b;hp=873d0ccbf20443088a39a20223634ab81168dc56;hpb=db93a1adcbe0a4eaaf06e0a70ade0d6c5c1961c3;p=jalview.git diff --git a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java index 873d0cc..8f003cb 100644 --- a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java +++ b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,6 +20,7 @@ */ package jalview.ws.jabaws; +import jalview.gui.JvOptionPane; import jalview.ws.jws2.Jws2Discoverer; import java.util.Vector; @@ -33,6 +34,13 @@ public class JalviewJabawsTestUtils { @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() + { + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + } + + @BeforeClass(alwaysRun = true) public static void setUpBeforeClass() throws Exception { } @@ -97,8 +105,8 @@ public class JalviewJabawsTestUtils } catch (Exception e) { e.printStackTrace(); - Assert.fail("Aborting. Problem discovering services. Tried " - + svcurls); + Assert.fail( + "Aborting. Problem discovering services. Tried " + svcurls); } Assert.assertTrue(disc.getServices().size() > 0, "Failed to discover any services at ");