JAL-4020 updated tests

[jalview.git] / test / jalview / ext / pymol / PymolManagerTest.java

diff --git a/test/jalview/ext/pymol/PymolManagerTest.java b/test/jalview/ext/pymol/PymolManagerTest.java
index c415ace..daea0dc 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
+ * 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, "<methodCall><methodName>foobar</methodName><params>"
-            + "<parameter><value>blue</value></parameter>"
-            + "<parameter><value>all</value></parameter>"
-            + "</params></methodCall>");
+    assertEquals(req,
+            "<methodCall><methodName>foobar</methodName><params>"
+                    + "<parameter><value>blue</value></parameter>"
+                    + "<parameter><value>all</value></parameter>"
+                    + "</params></methodCall>");
   }
 
   @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