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
/
structure
/
Mapping.java
diff --git
a/test/jalview/structure/Mapping.java
b/test/jalview/structure/Mapping.java
index
74dddb4
..
c057980
100644
(file)
--- a/
test/jalview/structure/Mapping.java
+++ b/
test/jalview/structure/Mapping.java
@@
-3,12
+3,6
@@
package jalview.structure;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
-import org.testng.Assert;
-import org.testng.AssertJUnit;
-import org.testng.annotations.Test;
-
-import MCview.PDBfile;
-
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.Annotation;
import jalview.datamodel.Sequence;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.Annotation;
import jalview.datamodel.Sequence;
@@
-17,6
+11,12
@@
import jalview.gui.AlignFrame;
import jalview.io.FileLoader;
import jalview.io.FormatAdapter;
import jalview.io.FileLoader;
import jalview.io.FormatAdapter;
+import org.testng.Assert;
+import org.testng.AssertJUnit;
+import org.testng.annotations.Test;
+
+import MCview.PDBfile;
+
public class Mapping
{
public class Mapping
{
@@
-27,7
+27,8
@@
public class Mapping
* 115 in PDB Res Numbering secondary structure numbers in jmol seem to be in
* msd numbering, not pdb res numbering.
*/
* 115 in PDB Res Numbering secondary structure numbers in jmol seem to be in
* msd numbering, not pdb res numbering.
*/
- @Test(enabled = false)
+ @Test(groups =
+ { "Functional" }, enabled = false)
public void pdbEntryPositionMap() throws Exception
{
Assert.fail("This test intentionally left to fail");
public void pdbEntryPositionMap() throws Exception
{
Assert.fail("This test intentionally left to fail");
@@
-109,7
+110,8
@@
public class Mapping
}
}
}
}
- @Test(enabled = false)
+ @Test(groups =
+ { "Functional" }, enabled = false)
public void testPDBentryMapping() throws Exception
{
Assert.fail("This test intentionally left to fail");
public void testPDBentryMapping() throws Exception
{
Assert.fail("This test intentionally left to fail");
@@
-210,7
+212,7
@@
public class Mapping
* transform
*
*/
* transform
*
*/
- @Test
+ @Test(groups ={ "Functional" })
public void mapFer1From3W5V() throws Exception
{
AlignFrame seqf = new FileLoader(false)
public void mapFer1From3W5V() throws Exception
{
AlignFrame seqf = new FileLoader(false)
@@
-233,7
+235,7
@@
public class Mapping
* compare reference annotation for imported pdb sequence to identical
* seuqence with transferred annotation from mapped pdb file
*/
* compare reference annotation for imported pdb sequence to identical
* seuqence with transferred annotation from mapped pdb file
*/
- @Test
+ @Test(groups ={ "Functional" })
public void compareTransferredToRefPDBAnnot() throws Exception
{
AlignFrame ref = new FileLoader(false)
public void compareTransferredToRefPDBAnnot() throws Exception
{
AlignFrame ref = new FileLoader(false)