X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fseqfetcher%2FDbRefFetcherTest.java;h=d9b1d90122c2248caa7266eb34eaef57276216ff;hb=8bbcfb93404decd6d660ca32b69a29f8a1f34e82;hp=7540edfd9cfbc1fba4f7b70e26d61094eccfba49;hpb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;p=jalview.git diff --git a/test/jalview/ws/seqfetcher/DbRefFetcherTest.java b/test/jalview/ws/seqfetcher/DbRefFetcherTest.java index 7540edf..d9b1d90 100644 --- a/test/jalview/ws/seqfetcher/DbRefFetcherTest.java +++ b/test/jalview/ws/seqfetcher/DbRefFetcherTest.java @@ -20,16 +20,9 @@ */ package jalview.ws.seqfetcher; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.ArrayList; -import java.util.List; - -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertNotNull; +import static org.testng.AssertJUnit.assertTrue; import jalview.analysis.CrossRef; import jalview.datamodel.AlignmentI; @@ -38,6 +31,13 @@ import jalview.datamodel.DBRefSource; import jalview.util.DBRefUtils; import jalview.ws.SequenceFetcher; +import java.util.ArrayList; +import java.util.List; + +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + /** * @author jimp * @@ -48,7 +48,7 @@ public class DbRefFetcherTest /** * @throws java.lang.Exception */ - @BeforeClass + @BeforeClass(alwaysRun = true) public static void setUpBeforeClass() throws Exception { jalview.bin.Cache.initLogger(); @@ -62,7 +62,7 @@ public class DbRefFetcherTest { } - @Test + @Test(groups ={ "Functional" }) public void testStandardProtDbs() { String[] defdb = DBRefSource.PROTEINDBS; @@ -99,7 +99,8 @@ public class DbRefFetcherTest uniprot != null && i < 2); } - @Test + @Test(groups = + { "External" }) public void testEmblUniprotProductRecovery() throws Exception { String retrievalId = "CAA23748"; // "V00488"; @@ -108,7 +109,8 @@ public class DbRefFetcherTest verifyProteinNucleotideXref(retrievalId, embl); } - @Test + @Test(groups = + { "External" }) public void testEmblCDSUniprotProductRecovery() throws Exception { String retrievalId = "AAH29712";