X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Fpymol%2FPymolManagerTest.java;fp=test%2Fjalview%2Fext%2Fpymol%2FPymolManagerTest.java;h=daea0dc55a52dc89bcc7f7ef1cf71d9fcb6f0e21;hb=d043ce47fc710d3eb2629ba926a8a7417bd67d8c;hp=c415ace7e98781e00eb5a4a40ace6d4d2912de8d;hpb=49db0dff1da16c3355b43a41498c1fc93ef47e91;p=jalview.git
diff --git a/test/jalview/ext/pymol/PymolManagerTest.java b/test/jalview/ext/pymol/PymolManagerTest.java
index c415ace..daea0dc 100644
--- a/test/jalview/ext/pymol/PymolManagerTest.java
+++ b/test/jalview/ext/pymol/PymolManagerTest.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.ext.pymol;
import static org.testng.Assert.assertEquals;
@@ -21,10 +41,11 @@ public class PymolManagerTest
req = PymolManager
.getPostRequest(new StructureCommand("foobar", "blue", "all"));
- assertEquals(req, "foobar"
- + "blue"
- + "all"
- + "");
+ assertEquals(req,
+ "foobar"
+ + "blue"
+ + "all"
+ + "");
}
@Test(groups = "Functional")
@@ -53,7 +74,12 @@ public class PymolManagerTest
* Windows
*/
paths = PymolManager.getPymolPaths("Windows 10");
- assertTrue(paths.isEmpty()); // TODO - Windows paths
+ assertTrue(paths.contains(System.getProperty("user.home")
+ + "\\AppData\\Local\\Schrodinger\\PyMOL2\\PyMOLWinWithConsole.bat"));
+ assertTrue(paths.contains(System.getProperty("user.home")
+ + "\\PyMOL\\PyMOLWinWithConsole.bat"));
+ assertTrue(paths
+ .contains("C:\\ProgramData\\PyMOL\\PyMOLWinWithConsole.bat"));
/*
* Other