X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Futil%2FDBRefUtilsTest.java;h=4ced1a797dffdc71ce6784fb41572b8ca2eca13f;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=e6066658e41b59dc2e3921cd4ac1c289b744de0b;hpb=3ef44bef1f825d26977dedd1608469712a87fe15;p=jalview.git diff --git a/test/jalview/util/DBRefUtilsTest.java b/test/jalview/util/DBRefUtilsTest.java index e606665..4ced1a7 100644 --- a/test/jalview/util/DBRefUtilsTest.java +++ b/test/jalview/util/DBRefUtilsTest.java @@ -1,12 +1,30 @@ +/* + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors + * + * This file is part of Jalview. + * + * Jalview is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * + * Jalview is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. + */ package jalview.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertFalse; +import static org.testng.AssertJUnit.assertNull; +import static org.testng.AssertJUnit.assertSame; +import static org.testng.AssertJUnit.assertTrue; import jalview.datamodel.DBRefEntry; import jalview.datamodel.DBRefSource; @@ -15,6 +33,8 @@ import jalview.datamodel.PDBEntry; import jalview.datamodel.Sequence; import jalview.datamodel.SequenceI; +import org.testng.annotations.Test; + public class DBRefUtilsTest { @@ -22,7 +42,7 @@ public class DBRefUtilsTest * Test the method that selects DBRefEntry items whose source is in a supplied * list */ - @Test + @Test(groups = { "Functional" }) public void testSelectRefs() { assertNull(DBRefUtils.selectRefs(null, null)); @@ -32,10 +52,8 @@ public class DBRefUtilsTest DBRefEntry ref2 = new DBRefEntry("UNIPROT", "1.2", "A12346"); // Source is converted to upper-case by this constructor! DBRefEntry ref3 = new DBRefEntry("Uniprot", "1.2", "A12347"); - DBRefEntry[] dbrefs = new DBRefEntry[] - { ref1, ref2, ref3 }; - String[] sources = new String[] - { "EMBL", "UNIPROT" }; + DBRefEntry[] dbrefs = new DBRefEntry[] { ref1, ref2, ref3 }; + String[] sources = new String[] { "EMBL", "UNIPROT" }; DBRefEntry[] selected = DBRefUtils.selectRefs(dbrefs, sources); assertEquals(3, selected.length); @@ -43,21 +61,18 @@ public class DBRefUtilsTest assertSame(ref2, selected[1]); assertSame(ref3, selected[2]); - sources = new String[] - { "EMBL" }; + sources = new String[] { "EMBL" }; selected = DBRefUtils.selectRefs(dbrefs, sources); assertEquals(1, selected.length); assertSame(ref1, selected[0]); - sources = new String[] - { "UNIPROT" }; + sources = new String[] { "UNIPROT" }; selected = DBRefUtils.selectRefs(dbrefs, sources); assertEquals(2, selected.length); assertSame(ref2, selected[0]); assertSame(ref3, selected[1]); - sources = new String[] - { "Uniprot", "EMBLCDS" }; + sources = new String[] { "Uniprot", "EMBLCDS" }; selected = DBRefUtils.selectRefs(dbrefs, sources); assertNull(selected); } @@ -66,7 +81,7 @@ public class DBRefUtilsTest * Test the method that converts (currently three) database names to a * canonical name (not case-sensitive) */ - @Test + @Test(groups = { "Functional" }) public void testGetCanonicalName() { assertNull(DBRefUtils.getCanonicalName(null)); @@ -83,7 +98,7 @@ public class DBRefUtilsTest DBRefUtils.getCanonicalName("UNIPROTKB/SWISS-CHEESE")); } - @Test + @Test(groups = { "Functional" }) public void testIsDasCoordinateSystem() { assertFalse(DBRefUtils.isDasCoordinateSystem(null, null)); @@ -106,8 +121,7 @@ public class DBRefUtilsTest assertTrue(DBRefUtils.isDasCoordinateSystem("Uniprot", new DBRefEntry( "UNIPROT", "v1", "a1"))); assertFalse(DBRefUtils.isDasCoordinateSystem("UNIPROTKB", - new DBRefEntry( - "pdb", "v1", "a1"))); + new DBRefEntry("pdb", "v1", "a1"))); assertTrue(DBRefUtils.isDasCoordinateSystem("EMBL", new DBRefEntry( "EMBL", "v1", "a1"))); @@ -118,7 +132,7 @@ public class DBRefUtilsTest /** * Test 'parsing' a DBRef - non PDB case */ - @Test + @Test(groups = { "Functional" }) public void testParseToDbRef() { SequenceI seq = new Sequence("Seq1", "ABCD"); @@ -129,13 +143,13 @@ public class DBRefUtilsTest assertEquals("EMBL", ref.getSource()); assertEquals("1.2", ref.getVersion()); assertEquals("a7890", ref.getAccessionId()); - assertNull(seq.getPDBId()); + assertNull(seq.getAllPDBEntries()); } /** * Test 'parsing' a DBRef - Stockholm PDB format */ - @Test + @Test(groups = { "Functional" }) public void testParseToDbRef_PDB() { SequenceI seq = new Sequence("Seq1", "ABCD"); @@ -148,19 +162,19 @@ public class DBRefUtilsTest assertEquals("1.2", ref.getVersion()); // DBRef id is pdbId + chain code assertEquals("1WRIA", ref.getAccessionId()); - assertEquals(1, seq.getPDBId().size()); - PDBEntry pdbRef = seq.getPDBId().get(0); + assertEquals(1, seq.getAllPDBEntries().size()); + PDBEntry pdbRef = seq.getAllPDBEntries().get(0); assertEquals("1WRI", pdbRef.getId()); assertNull(pdbRef.getFile()); - assertEquals("A", pdbRef.getProperty().get("CHAIN")); - assertNull(pdbRef.getType()); + assertEquals("A", pdbRef.getChainCode()); + assertEquals("PDB", pdbRef.getType()); } /** * Test the method that searches for matches references - case when we are * matching a reference with no mappings */ - @Test + @Test(groups = { "Functional" }) public void testSearchRefs_noMapping() { DBRefEntry target = new DBRefEntry("EMBL", "2", "A1234"); @@ -173,12 +187,11 @@ public class DBRefUtilsTest DBRefEntry ref4 = new DBRefEntry("EMBLCDS", "1", "A1234"); // no match // ref5 matches although it has a mapping - ignored DBRefEntry ref5 = new DBRefEntry("EMBL", "1", "A1234"); - ref5.setMap(new Mapping(new MapList(new int[] - { 1, 1 }, new int[] - { 1, 1 }, 1, 1))); + ref5.setMap(new Mapping(new MapList(new int[] { 1, 1 }, new int[] { 1, + 1 }, 1, 1))); - DBRefEntry[] matches = DBRefUtils.searchRefs(new DBRefEntry[] - { ref1, ref2, ref3, ref4, ref5 }, target); + DBRefEntry[] matches = DBRefUtils.searchRefs(new DBRefEntry[] { ref1, + ref2, ref3, ref4, ref5 }, target); assertEquals(3, matches.length); assertSame(ref1, matches[0]); assertSame(ref2, matches[1]); @@ -189,32 +202,29 @@ public class DBRefUtilsTest * Test the method that searches for matches references - case when we are * matching a reference with a mapping */ - @Test + @Test(groups = { "Functional" }) public void testSearchRefs_withMapping() { DBRefEntry target = new DBRefEntry("EMBL", "2", "A1234"); - final Mapping map1 = new Mapping(new MapList(new int[] - { 1, 1 }, new int[] - { 1, 1 }, 1, 1)); + final Mapping map1 = new Mapping(new MapList(new int[] { 1, 1 }, + new int[] { 1, 1 }, 1, 1)); target.setMap(map1); // these all match target iff mappings match DBRefEntry ref1 = new DBRefEntry("EMBL", "1", "A1234"); // no map: matches DBRefEntry ref2 = new DBRefEntry("EMBL", "1", "A1234"); // =map: matches - final Mapping map2 = new Mapping(new MapList(new int[] - { 1, 1 }, new int[] - { 1, 1 }, 1, 1)); + final Mapping map2 = new Mapping(new MapList(new int[] { 1, 1 }, + new int[] { 1, 1 }, 1, 1)); ref2.setMap(map2); // different map: no match DBRefEntry ref3 = new DBRefEntry("EMBL", "1", "A1234"); - final Mapping map3 = new Mapping(new MapList(new int[] - { 1, 1 }, new int[] - { 1, 1 }, 2, 2)); + final Mapping map3 = new Mapping(new MapList(new int[] { 1, 1 }, + new int[] { 1, 1 }, 2, 2)); ref3.setMap(map3); - DBRefEntry[] matches = DBRefUtils.searchRefs(new DBRefEntry[] - { ref1, ref2, ref3 }, target); + DBRefEntry[] matches = DBRefUtils.searchRefs(new DBRefEntry[] { ref1, + ref2, ref3 }, target); assertEquals(2, matches.length); assertSame(ref1, matches[0]); assertSame(ref2, matches[1]);