X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fsifts%2FSiftsClientTest.java;h=6f9a864382d0b2a7422ff614f63ddcd14ecd7fc5;hb=0f40a8334651302a74a223ecd3e583451302bb42;hp=2a8e5845acc4156882c21b54232e94b95c45e887;hpb=69f930f786254940db0a7c247cc350098e940bbf;p=jalview.git

diff --git a/test/jalview/ws/sifts/SiftsClientTest.java b/test/jalview/ws/sifts/SiftsClientTest.java
index 2a8e584..6f9a864 100644
--- a/test/jalview/ws/sifts/SiftsClientTest.java
+++ b/test/jalview/ws/sifts/SiftsClientTest.java
@@ -27,6 +27,7 @@ import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
 import jalview.io.AppletFormatAdapter;
 import jalview.structure.StructureMapping;
+import jalview.xml.binding.sifts.Entry.Entity;
 
 import java.io.File;
 import java.io.IOException;
@@ -250,8 +251,6 @@ public class SiftsClientTest
 
     // TODO delete when auto-fetching of DBRefEntry is implemented
     DBRefEntry dbRef = new DBRefEntry("uniprot", "", "P00221");
-    dbRef.setStartRes(1);
-    dbRef.setEndRes(147);
     testSeq.addDBRef(dbRef);
     // testSeq.setSourceDBRef(dbRef);
 
@@ -326,8 +325,6 @@ public class SiftsClientTest
       DBRefEntryI expectedDBRef = new DBRefEntry();
       expectedDBRef.setSource(DBRefSource.UNIPROT);
       expectedDBRef.setAccessionId("P00221");
-      expectedDBRef.setStartRes(1);
-      expectedDBRef.setEndRes(147);
       expectedDBRef.setVersion("");
       Assert.assertEquals(actualValidSrcDBRef, expectedDBRef);
     } catch (Exception e)
@@ -375,8 +372,6 @@ public class SiftsClientTest
     DBRefEntryI validDBRef = new DBRefEntry();
     validDBRef.setSource(DBRefSource.UNIPROT);
     validDBRef.setAccessionId("P00221");
-    validDBRef.setStartRes(1);
-    validDBRef.setEndRes(147);
     validDBRef.setVersion("");
     Assert.assertTrue(siftsClient.isValidDBRefEntry(validDBRef));
   }
@@ -451,4 +446,29 @@ public class SiftsClientTest
     System.out.println("Actual DbVersion: " + actualDbVersion);
     Assert.assertEquals(actualDbVersion, "2.0");
   }
+
+  @Test(groups = { "Functional" })
+  public void getEntityByMostOptimalMatchedIdTest()
+  {
+    SiftsClient siftsClientX = null;
+    PDBfile pdbFile;
+    try
+    {
+      pdbFile = new PDBfile(false, false, false, "test/jalview/io/2nq2"
+              + ".pdb", AppletFormatAdapter.FILE);
+      siftsClientX = new SiftsClient(pdbFile);
+    } catch (Exception e)
+    {
+      e.printStackTrace();
+    }
+    Entity entityA = siftsClientX.getEntityByMostOptimalMatchedId("A");
+    Assert.assertEquals(entityA.getEntityId(), "A");
+    Entity entityB = siftsClientX.getEntityByMostOptimalMatchedId("B");
+    Assert.assertEquals(entityB.getEntityId(), "C");
+    Entity entityC = siftsClientX.getEntityByMostOptimalMatchedId("C");
+    Assert.assertEquals(entityC.getEntityId(), "B");
+    Entity entityD = siftsClientX.getEntityByMostOptimalMatchedId("D");
+    Assert.assertEquals(entityD.getEntityId(), "D");
+
+  }
 }