X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fsifts%2FSiftsClientTest.java;fp=test%2Fjalview%2Fws%2Fsifts%2FSiftsClientTest.java;h=c0f9b6642823db15d73fd391aa9a408a6a8ff6c6;hb=a0360dbe6e403b4034ba3a7d2cd46b883d776bea;hp=4540bd8c0f43aa786878dac453884e08752f1de6;hpb=6e3f3a3599f1cbb436ebb1f8e93c811e6b6e7b6c;p=jalview.git diff --git a/test/jalview/ws/sifts/SiftsClientTest.java b/test/jalview/ws/sifts/SiftsClientTest.java index 4540bd8..c0f9b66 100644 --- a/test/jalview/ws/sifts/SiftsClientTest.java +++ b/test/jalview/ws/sifts/SiftsClientTest.java @@ -23,18 +23,6 @@ package jalview.ws.sifts; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import jalview.api.DBRefEntryI; -import jalview.bin.Cache; -import jalview.datamodel.DBRefEntry; -import jalview.datamodel.DBRefSource; -import jalview.datamodel.Sequence; -import jalview.datamodel.SequenceI; -import jalview.gui.JvOptionPane; -import jalview.io.DataSourceType; -import jalview.structure.StructureMapping; -import jalview.util.Platform; -import jalview.xml.binding.sifts.Entry.Entity; - import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -49,6 +37,16 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; +import jalview.api.DBRefEntryI; +import jalview.bin.Cache; +import jalview.datamodel.DBRefEntry; +import jalview.datamodel.DBRefSource; +import jalview.datamodel.Sequence; +import jalview.datamodel.SequenceI; +import jalview.gui.JvOptionPane; +import jalview.io.DataSourceType; +import jalview.structure.StructureMapping; +import jalview.xml.binding.sifts.Entry.Entity; import mc_view.Atom; import mc_view.PDBfile; @@ -311,7 +309,7 @@ public class SiftsClientTest atom.atomIndex = 7; atoms.add(atom); int actualAtomIndex = siftsClient.getAtomIndex(1, atoms); - Assert.assertEquals(actualAtomIndex, siftsClient.UNASSIGNED); + Assert.assertEquals(actualAtomIndex, SiftsClient.UNASSIGNED); actualAtomIndex = siftsClient.getAtomIndex(43, atoms); Assert.assertEquals(actualAtomIndex, 7); } @@ -514,22 +512,4 @@ groups = { "Network" }, Assert.assertNull(entityP); } - - @Test(groups = { "Network" }) - public void getLeadingIntegerFromString() - { - Assert.assertEquals( - Platform.getLeadingIntegerValue("1234abcd", -1), 1234); - Assert.assertEquals( - Platform.getLeadingIntegerValue("1234", -1), - 1234); - Assert.assertEquals( - Platform.getLeadingIntegerValue("abcd", -1), -1); - Assert.assertEquals( - Platform.getLeadingIntegerValue("abcd1234", -1), -1); - Assert.assertEquals( - Platform.getLeadingIntegerValue("None", -1), -1); - Assert.assertEquals( - Platform.getLeadingIntegerValue("Null", -1), -1); - } }