X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Furls%2FUrlLinkDisplayTest.java;h=9eeac9f652bc6f011aaa542d80fa15409a950c84;hb=648e4d6232f149d6844a2a6b5c2613938a917f2f;hp=51723042acf5699ce1d731cfa39457df3672936e;hpb=96b8ecca446eca75f8fddea49387436a25b536eb;p=jalview.git

diff --git a/test/jalview/urls/UrlLinkDisplayTest.java b/test/jalview/urls/UrlLinkDisplayTest.java
index 5172304..9eeac9f 100644
--- a/test/jalview/urls/UrlLinkDisplayTest.java
+++ b/test/jalview/urls/UrlLinkDisplayTest.java
@@ -12,21 +12,22 @@ public class UrlLinkDisplayTest {
   @Test(groups = { "Functional" })
   public void testDisplayColumnNames()
   {
-    // 4 column names returned although 5 names internal to UrlLinkDisplay
+    // 5 column names returned although 6 names internal to UrlLinkDisplay
     List<String> names = UrlLinkDisplay.getDisplayColumnNames();
-    Assert.assertEquals(names.size(), 4);
+    Assert.assertEquals(names.size(), 5);
   }
 
   @Test(groups = { "Functional" })
   public void getValue()
   {
-    UrlLink link = new UrlLink("Test Url",
-            "http://identifiers.org/$DB_ACCESSION$");
+    UrlLink link = new UrlLink("Test Name",
+            "http://identifiers.org/$DB_ACCESSION$", "TestDB");
     UrlLinkDisplay u = new UrlLinkDisplay("Test", link, false, false);
 
-    Assert.assertFalse((boolean) u.getValue(UrlLinkDisplay.DEFAULT));
+    Assert.assertFalse((boolean) u.getValue(UrlLinkDisplay.PRIMARY));
     Assert.assertEquals(u.getValue(UrlLinkDisplay.ID), "Test");
-    Assert.assertEquals(u.getValue(UrlLinkDisplay.NAME), "Test Url");
+    Assert.assertEquals(u.getValue(UrlLinkDisplay.DATABASE), "TestDB");
+    Assert.assertEquals(u.getValue(UrlLinkDisplay.NAME), "Test Name");
     Assert.assertFalse((boolean) u.getValue(UrlLinkDisplay.SELECTED));
     Assert.assertEquals(u.getValue(UrlLinkDisplay.URL),
             "http://identifiers.org/$DB_ACCESSION$");
@@ -39,46 +40,64 @@ public class UrlLinkDisplayTest {
     // default only editable if link contains $SEQUENCE_ID$
 
     UrlLink link = new UrlLink("Test Url",
-            "http://identifiers.org/$DB_ACCESSION$");
+            "http://identifiers.org/$DB_ACCESSION$",
+ "TestName");
     UrlLinkDisplay u = new UrlLinkDisplay("Test", link, false, false);
 
-    Assert.assertFalse(u.isEditable(UrlLinkDisplay.DEFAULT));
+    Assert.assertFalse(u.isEditable(UrlLinkDisplay.PRIMARY));
     Assert.assertTrue(u.isEditable(UrlLinkDisplay.SELECTED));
     Assert.assertFalse(u.isEditable(UrlLinkDisplay.ID));
     Assert.assertFalse(u.isEditable(UrlLinkDisplay.URL));
     Assert.assertFalse(u.isEditable(UrlLinkDisplay.NAME));
+    Assert.assertFalse(u.isEditable(UrlLinkDisplay.DATABASE));
 
     UrlLink vlink = new UrlLink("Test Sequence ID Url",
-            "http://myurl/$SEQUENCE_ID$");
+            "http://myurl/$SEQUENCE_ID$", "TestName");
     UrlLinkDisplay v = new UrlLinkDisplay("Test", vlink, false, false);
 
-    Assert.assertTrue(v.isEditable(UrlLinkDisplay.DEFAULT));
+    Assert.assertTrue(v.isEditable(UrlLinkDisplay.PRIMARY));
     Assert.assertTrue(v.isEditable(UrlLinkDisplay.SELECTED));
     Assert.assertFalse(v.isEditable(UrlLinkDisplay.ID));
     Assert.assertFalse(v.isEditable(UrlLinkDisplay.URL));
     Assert.assertFalse(v.isEditable(UrlLinkDisplay.NAME));
+    Assert.assertFalse(v.isEditable(UrlLinkDisplay.DATABASE));
   }
 
   @Test(groups = { "Functional" })
   public void testName()
   {
     UrlLink link = new UrlLink("Test Url",
-            "http://identifiers.org/$DB_ACCESSION$");
+            "http://identifiers.org/$DB_ACCESSION$", "TestName");
     UrlLinkDisplay u = new UrlLinkDisplay("Test", link, false, false);
 
     // Name initially as input in link
-    Assert.assertEquals(u.getName(), "Test Url");
+    Assert.assertEquals(u.getDBName(), "TestName");
 
     // Setting updates name
-    u.setName("New Name");
-    Assert.assertEquals(u.getName(), "New Name");
+    u.setDBName("NewName");
+    Assert.assertEquals(u.getDBName(), "NewName");
+  }
+
+  @Test(groups = { "Functional" })
+  public void testDescription()
+  {
+    UrlLink link = new UrlLink("Test Name",
+            "http://identifiers.org/$DB_ACCESSION$", "TestDB");
+    UrlLinkDisplay u = new UrlLinkDisplay("Test", link, false, false);
+
+    // Desc initially as input in link
+    Assert.assertEquals(u.getDescription(), "Test Name");
+
+    // Setting updates name
+    u.setDescription("New Desc");
+    Assert.assertEquals(u.getDescription(), "New Desc");
   }
 
   @Test(groups = { "Functional" })
   public void testUrl()
   {
-    UrlLink link = new UrlLink("Test Url",
-            "http://identifiers.org/$DB_ACCESSION$");
+    UrlLink link = new UrlLink("Test Name",
+            "http://identifiers.org/$DB_ACCESSION$", "TestDB");
     UrlLinkDisplay u = new UrlLinkDisplay("Test", link, false, false);
 
     // Url initially as input in link
@@ -92,25 +111,30 @@ public class UrlLinkDisplayTest {
   @Test(groups = { "Functional" })
   public void testGetSetValue()
   {
-    UrlLink link = new UrlLink("Test Url",
-            "http://identifiers.org/$DB_ACCESSION$");
+    UrlLink link = new UrlLink("Test Name",
+            "http://identifiers.org/$DB_ACCESSION$", "TestDB");
     UrlLinkDisplay u = new UrlLinkDisplay("Test", link, false, false);
 
-    Assert.assertFalse((boolean) u.getValue(UrlLinkDisplay.DEFAULT));
+    Assert.assertFalse((boolean) u.getValue(UrlLinkDisplay.PRIMARY));
     Assert.assertFalse((boolean) u.getValue(UrlLinkDisplay.SELECTED));
-    Assert.assertEquals(u.getValue(UrlLinkDisplay.NAME), "Test Url");
+    Assert.assertEquals(u.getValue(UrlLinkDisplay.DATABASE), "TestDB");
+    Assert.assertEquals(u.getValue(UrlLinkDisplay.NAME), "Test Name");
     Assert.assertEquals(u.getValue(UrlLinkDisplay.ID), "Test");
     Assert.assertEquals(u.getValue(UrlLinkDisplay.URL),
             "http://identifiers.org/$DB_ACCESSION$");
 
-    u.setValue(UrlLinkDisplay.DEFAULT, true);
-    Assert.assertTrue((boolean) u.getValue(UrlLinkDisplay.DEFAULT));
+    u.setValue(UrlLinkDisplay.PRIMARY, true);
+    Assert.assertTrue((boolean) u.getValue(UrlLinkDisplay.PRIMARY));
 
     u.setValue(UrlLinkDisplay.SELECTED, true);
     Assert.assertTrue((boolean) u.getValue(UrlLinkDisplay.SELECTED));
 
-    u.setValue(UrlLinkDisplay.NAME, "New Name");
-    Assert.assertEquals(u.getValue(UrlLinkDisplay.NAME), "New Name");
+    u.setValue(UrlLinkDisplay.NAME, "New Desc");
+    Assert.assertEquals(u.getValue(UrlLinkDisplay.NAME), "New Desc");
+    Assert.assertEquals(u.getValue(UrlLinkDisplay.DATABASE), "New Desc");
+
+    u.setValue(UrlLinkDisplay.DATABASE, "NewName");
+    Assert.assertEquals(u.getValue(UrlLinkDisplay.DATABASE), "NewName");
 
     u.setValue(UrlLinkDisplay.ID, "New ID");
     Assert.assertEquals(u.getValue(UrlLinkDisplay.ID), "New ID");