X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Frest%2FShmmrRSBSService.java;h=d04e8c8b319e75b4a94b204aed5d7c895f3e40b2;hb=ee198b3ca3687f18a2ee186f4e7c7330f4ea30f0;hp=d562644ca66f2a3e2f1c617908a83773ee131693;hpb=3412b273e964fb1a9d22564b04a5f0c827ec2461;p=jalview.git diff --git a/test/jalview/ws/rest/ShmmrRSBSService.java b/test/jalview/ws/rest/ShmmrRSBSService.java index d562644..d04e8c8 100644 --- a/test/jalview/ws/rest/ShmmrRSBSService.java +++ b/test/jalview/ws/rest/ShmmrRSBSService.java @@ -23,12 +23,12 @@ package jalview.ws.rest; import static org.testng.AssertJUnit.assertNotNull; import static org.testng.AssertJUnit.assertTrue; +import jalview.gui.AlignFrame; + import java.util.Map; import org.testng.annotations.Test; -import jalview.gui.AlignFrame; - /** * @author jimp * @@ -36,7 +36,7 @@ import jalview.gui.AlignFrame; public class ShmmrRSBSService { - @Test + @Test(groups = { "Functional" }) public void testShmmrService() { @@ -46,17 +46,17 @@ public class ShmmrRSBSService RestClient.makeShmmrRestClient().service)); } - @Test + @Test(groups = { "Functional" }) public void testShmmrServiceDataprep() throws Exception { RestClient _rc = RestClient.makeShmmrRestClient(); assertNotNull(_rc); AlignFrame alf = new jalview.io.FileLoader(false) .LoadFileWaitTillLoaded("examples/testdata/smad.fa", - jalview.io.FormatAdapter.FILE); + jalview.io.DataSourceType.FILE); assertNotNull("Couldn't find test data.", alf); alf.loadJalviewDataFile("examples/testdata/smad_groups.jva", - jalview.io.FormatAdapter.FILE, null, null); + jalview.io.DataSourceType.FILE, null, null); assertTrue( "Couldn't load the test data's annotation file (should be 5 groups but found " + alf.getViewport().getAlignment().getGroups().size()