X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FStructureChooserTest.java;h=947cb992a7c6c0b5da077ca803995ba1696effe9;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=078174f6c66aad5714be144f11cb7f2d0c055b01;hpb=d9cedb863c0d5b665b8cdde3f8791d8a96030c6b;p=jalview.git

diff --git a/test/jalview/gui/StructureChooserTest.java b/test/jalview/gui/StructureChooserTest.java
index 078174f..947cb99 100644
--- a/test/jalview/gui/StructureChooserTest.java
+++ b/test/jalview/gui/StructureChooserTest.java
@@ -1,29 +1,48 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.gui;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
 import jalview.datamodel.DBRefEntry;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
-import jalview.ws.dbsources.PDBRestClient.PDBDocField;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Vector;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
 public class StructureChooserTest
 {
   Sequence seq;
 
-  @Before
+  @BeforeMethod(alwaysRun = true)
   public void setUp() throws Exception
   {
-    seq = new Sequence("Test_Seq", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 1, 26);
+    seq = new Sequence("PDB|4kqy|4KQY|A", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 1,
+            26);
     seq.setDatasetSequence(seq);
     for (int x = 1; x < 5; x++)
     {
@@ -41,56 +60,43 @@ public class StructureChooserTest
     seq.setPDBId(pdbIds);
   }
 
-  @After
+  @AfterMethod
   public void tearDown() throws Exception
   {
     seq = null;
   }
 
-  @Test
-  public void getPDBIdColumIndexTest()
-  {
-    List<PDBDocField> wantedFields = new ArrayList<PDBDocField>();
-    wantedFields.add(PDBDocField.MOLECULE_TYPE);
-    wantedFields.add(PDBDocField.GENUS);
-    wantedFields.add(PDBDocField.GENE_NAME);
-    wantedFields.add(PDBDocField.TITLE);
-    wantedFields.add(PDBDocField.PDB_ID);
-    assertEquals(5, StructureChooser.getPDBIdColumIndex(wantedFields));
-  }
-
-  @Test
+  @Test(groups = { "Functional" })
   public void buildQueryTest()
   {
+    String query = StructureChooser.buildQuery(seq);
+    System.out.println(">>>>>>>>>> query : " + query);
     assertEquals(
-            "1tim OR text:XYZ_1 OR text:XYZ_2 OR text:XYZ_3 OR text:XYZ_4",
-            StructureChooser.buildQuery(seq));
+            "4kqy OR text:1tim OR text:XYZ_1 OR text:XYZ_2 OR text:XYZ_3 OR text:XYZ_4",
+            query);
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void populateFilterComboBoxTest()
   {
-    SequenceI[] selectedSeqs = new SequenceI[]
-    { seq };
-    StructureChooser sc = new StructureChooser(selectedSeqs, seq,
-            null);
+    SequenceI[] selectedSeqs = new SequenceI[] { seq };
+    StructureChooser sc = new StructureChooser(selectedSeqs, seq, null);
     sc.populateFilterComboBox();
     int optionsSize = sc.getCmbFilterOption().getItemCount();
-    assertEquals(2, optionsSize); // if structures are not discovered then don't
+    assertEquals(3, optionsSize); // if structures are not discovered then don't
                                   // populate filter options
 
     sc.setStructuresDiscovered(true);
     sc.populateFilterComboBox();
     optionsSize = sc.getCmbFilterOption().getItemCount();
-    assertTrue(optionsSize > 2); // if structures are found, filter options
+    assertTrue(optionsSize > 3); // if structures are found, filter options
                                  // should be populated
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void fetchStructuresInfoTest()
   {
-    SequenceI[] selectedSeqs = new SequenceI[]
-    { seq };
+    SequenceI[] selectedSeqs = new SequenceI[] { seq };
     StructureChooser sc = new StructureChooser(selectedSeqs, seq, null);
     sc.fetchStructuresMetaData();
     assertTrue(sc.getDiscoveredStructuresSet() != null);