git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of http://source.jalview.org/git/jalview into develop
[jalview.git]
/
test
/
jalview
/
ws
/
seqfetcher
/
DbRefFetcherTest.java
diff --git
a/test/jalview/ws/seqfetcher/DbRefFetcherTest.java
b/test/jalview/ws/seqfetcher/DbRefFetcherTest.java
index
302c0f7
..
d9b1d90
100644
(file)
--- a/
test/jalview/ws/seqfetcher/DbRefFetcherTest.java
+++ b/
test/jalview/ws/seqfetcher/DbRefFetcherTest.java
@@
-23,11
+23,6
@@
package jalview.ws.seqfetcher;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNotNull;
import static org.testng.AssertJUnit.assertTrue;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNotNull;
import static org.testng.AssertJUnit.assertTrue;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeClass;
-import java.util.ArrayList;
-import java.util.List;
import jalview.analysis.CrossRef;
import jalview.datamodel.AlignmentI;
import jalview.analysis.CrossRef;
import jalview.datamodel.AlignmentI;
@@
-36,6
+31,13
@@
import jalview.datamodel.DBRefSource;
import jalview.util.DBRefUtils;
import jalview.ws.SequenceFetcher;
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
*
/**
* @author jimp
*
@@
-46,7
+48,7
@@
public class DbRefFetcherTest
/**
* @throws java.lang.Exception
*/
/**
* @throws java.lang.Exception
*/
- @BeforeClass
+ @BeforeClass(alwaysRun = true)
public static void setUpBeforeClass() throws Exception
{
jalview.bin.Cache.initLogger();
public static void setUpBeforeClass() throws Exception
{
jalview.bin.Cache.initLogger();
@@
-60,7
+62,7
@@
public class DbRefFetcherTest
{
}
{
}
- @Test
+ @Test(groups ={ "Functional" })
public void testStandardProtDbs()
{
String[] defdb = DBRefSource.PROTEINDBS;
public void testStandardProtDbs()
{
String[] defdb = DBRefSource.PROTEINDBS;
@@
-97,7
+99,8
@@
public class DbRefFetcherTest
uniprot != null && i < 2);
}
uniprot != null && i < 2);
}
- @Test
+ @Test(groups =
+ { "External" })
public void testEmblUniprotProductRecovery() throws Exception
{
String retrievalId = "CAA23748"; // "V00488";
public void testEmblUniprotProductRecovery() throws Exception
{
String retrievalId = "CAA23748"; // "V00488";
@@
-106,7
+109,8
@@
public class DbRefFetcherTest
verifyProteinNucleotideXref(retrievalId, embl);
}
verifyProteinNucleotideXref(retrievalId, embl);
}
- @Test
+ @Test(groups =
+ { "External" })
public void testEmblCDSUniprotProductRecovery() throws Exception
{
String retrievalId = "AAH29712";
public void testEmblCDSUniprotProductRecovery() throws Exception
{
String retrievalId = "AAH29712";