Passing Tests on Linux

git-svn-id: https://www.silverpeas.org/svn/silverpeas/services/office-online/trunk@1158 a8e77078-a1c7-4fa5-b8fc-53c5178a176c

Author: Emmanuel Hugonnet

src/test/java/com/silverpeas/openoffice/MimeTypesTest.java

@@ -21,11 +21,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package com.silverpeas.openoffice;
 
 import com.silverpeas.openoffice.util.MsOfficeType;

src/test/java/com/silverpeas/openoffice/linux/WhereisStubHelper.java

@@ -22,11 +22,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
 package com.silverpeas.openoffice.linux;
 
 /**

src/test/java/com/silverpeas/openoffice/util/UrlExtractorTest.java

@@ -21,11 +21,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package com.silverpeas.openoffice.util;
 
 import junit.framework.TestCase;
@@ -36,6 +31,7 @@
  */
 public class UrlExtractorTest extends TestCase {
 
+  private static final String REAL_OS = System.getProperty("os.name");
   public UrlExtractorTest(String testName) {
     super(testName);
   }
@@ -48,6 +44,7 @@ protected void setUp() throws Exception {
   @Override
   protected void tearDown() throws Exception {
     super.tearDown();
+    System.setProperty("os.name", REAL_OS);
   }
 
   /**

src/test/java/com/silverpeas/openoffice/windows/MsOfficeFinderTest.java

@@ -51,18 +51,27 @@ protected void tearDown() throws Exception {
   }
 
   public void testFindExcel() throws Exception {
+    if (!System.getProperty("os.name").startsWith("Windows")) {
+      return;
+    }
     String path = helper.findSpreadsheet();
     assertNotNull(path);
     assertEquals("\"" + INSTALLED_OFFICE_PATH + "EXCEL.EXE\"", path);
   }
 
   public void testFindPowerpoint() throws Exception {
+    if (!System.getProperty("os.name").startsWith("Windows")) {
+      return;
+    }
     String path = helper.findPresentation();
     assertNotNull(path);
     assertEquals("\"" + INSTALLED_OFFICE_PATH + "POWERPNT.EXE\"", path);
   }
 
   public void testFindWord() throws Exception {
+    if (!System.getProperty("os.name").startsWith("Windows")) {
+      return;
+    }
     String path = helper.findWordEditor();
     assertNotNull(path);
     assertEquals("\"" + INSTALLED_OFFICE_PATH + "WINWORD.EXE\" /m", path);
@@ -80,6 +89,9 @@ public void testExtractPath() {
   }
 
   public void testIsMicrosoftOffice2007() throws Exception {
+    if (!System.getProperty("os.name").startsWith("Windows")) {
+      return;
+    }
     assertTrue(helper.isMicrosoftOffice2007());
   }
 }

src/test/java/com/silverpeas/openoffice/windows/RegistryHelperTest.java

@@ -24,7 +24,6 @@
 
 package com.silverpeas.openoffice.windows;
 
-import com.silverpeas.openoffice.util.OsEnum;
 import com.silverpeas.openoffice.util.RegistryKeyReader;
 import junit.framework.TestCase;
 
@@ -52,7 +51,7 @@ protected void tearDown() throws Exception {
   }
 
   public void testReadKey() throws Exception {
-    if (OsEnum.getOS() != OsEnum.LINUX && OsEnum.getOS() != OsEnum.MAC_OSX) {
+    if (!System.getProperty("os.name").startsWith("Windows")) {
       return;
     }
     String clockFormat = RegistryKeyReader.readKey(