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 org.testng.annotations.AfterMethod;
+import org.testng.annotations.Test;
+import org.testng.annotations.BeforeMethod;
import jalview.datamodel.DBRefEntry;
import jalview.datamodel.PDBEntry;
import jalview.datamodel.Sequence;
import java.util.Vector;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
public class StructureChooserTest
{
Sequence seq;
- @Before
+ @BeforeMethod
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++)
{
seq.setPDBId(pdbIds);
}
- @After
+ @AfterMethod
public void tearDown() throws Exception
{
seq = null;
@Test
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
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
}