X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Fjmol%2FJmolViewerTest.java;h=792f7ad8fb4c9d62e7a3b4392915a3548371d9da;hb=f7a7a1b85e3ab978220c8ccc924f3356c2a0e523;hp=8f616deee6445731414d841ff7cdda8b31f3f7f5;hpb=dc907895da88980fabf5df80a8967bc6332fe883;p=jalview.git diff --git a/test/jalview/ext/jmol/JmolViewerTest.java b/test/jalview/ext/jmol/JmolViewerTest.java index 8f616de..792f7ad 100644 --- a/test/jalview/ext/jmol/JmolViewerTest.java +++ b/test/jalview/ext/jmol/JmolViewerTest.java @@ -33,7 +33,6 @@ import jalview.gui.StructureViewer; import jalview.gui.StructureViewer.ViewerType; import jalview.io.DataSourceType; -import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -117,56 +116,5 @@ public class JmolViewerTest } } - @Test(groups = { "Functional, Network" }) - public void testStructureLoadingViaURL() - { - Cache.setProperty(Preferences.STRUCTURE_DISPLAY, ViewerType.JMOL.name()); - String inFile = "http://www.jalview.org/builds/develop/examples/3W5V.pdb"; - AlignFrame af = new jalview.io.FileLoader().LoadFileWaitTillLoaded( - inFile, DataSourceType.URL); - assertTrue("Didn't read input file " + inFile, af != null); - for (SequenceI sq : af.getViewport().getAlignment().getSequences()) - { - SequenceI dsq = sq.getDatasetSequence(); - while (dsq.getDatasetSequence() != null) - { - dsq = dsq.getDatasetSequence(); - } - if (dsq.getAllPDBEntries() != null - && dsq.getAllPDBEntries().size() > 0) - { - for (int q = 0; q < dsq.getAllPDBEntries().size(); q++) - { - final StructureViewer structureViewer = new StructureViewer(af - .getViewport().getStructureSelectionManager()); - structureViewer.setViewerType(ViewerType.JMOL); - JalviewStructureDisplayI jmolViewer = structureViewer - .viewStructures(dsq.getAllPDBEntries().elementAt(q), - new SequenceI[] { sq }, af.getCurrentView() - .getAlignPanel()); - /* - * Wait for viewer load thread to complete - */ - try - { - while (!jmolViewer.getBinding().isFinishedInit()) - { - Thread.sleep(500); - } - } catch (InterruptedException e) - { - } - // System.out.println(">>>>>>>>>>>>>>>>> " - // + jmolViewer.getBinding().getPdbFile()); - String[] expectedModelFiles = new String[] { "http://www.jalview.org/builds/develop/examples/3W5V.pdb" }; - String[] actualModelFiles = jmolViewer.getBinding().getStructureFiles(); - Assert.assertEqualsNoOrder(actualModelFiles, expectedModelFiles); - jmolViewer.closeViewer(true); - // todo: break here means only once through this loop? - break; - } - break; - } - } - } + }