dba34b: merge after pulling sb123

8 files changed, 361 insertions, 7 deletions

diff --git a/qadevOOo/prj/build.lst b/qadevOOo/prj/build.lst
index 1594d5c59f57..e159c6a7b6cc 100644
--- a/qadevOOo/prj/build.lst
+++ b/qadevOOo/prj/build.lst
@@ -2,4 +2,6 @@ qa  qadevOOo    : javaunohelper jurt ridljar unoil NULL
 qa  qadevOOo                                             usr1    -   all qa_mkout NULL
 qa  qadevOOo			                         nmake   -   all qa_runner_ant_build NULL
 qa  qadevOOo\runner			                 nmake   -   all qa_make_package qa_runner_ant_build NULL
-qa qadevOOo\qa\unoapi nmake - all qa_qa_unoapi NULL
+
+qa qadevOOo\qa\unoapi nmake - all qa_qa_unoapi qa_make_package NULL
+qa qadevOOo\qa\complex\junitskeleton        nmake - all qa_complex_junitskel qa_make_package NULL
diff --git a/qadevOOo/qa/complex/junitskeleton/Skeleton.java b/qadevOOo/qa/complex/junitskeleton/Skeleton.java
new file mode 100644
index 000000000000..3ae5d3dad120
--- /dev/null
+++ b/qadevOOo/qa/complex/junitskeleton/Skeleton.java
@@ -0,0 +1,194 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org 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 Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+package complex.junitskeleton;
+
+import com.sun.star.io.IOException;
+import com.sun.star.lang.IllegalArgumentException;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.util.XCloseable;
+import java.io.File;
+import java.io.RandomAccessFile;
+
+import lib.TestParameters;
+
+import util.SOfficeFactory;
+
+// ---------- junit imports -----------------
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+// ------------------------------------------
+
+public class Skeleton
+{
+    /**
+     * The test parameters
+     */
+    private static TestParameters param = null;
+
+    @Test public void check() {
+        assertTrue("Couldn't open document", open());
+        System.out.println("check");
+        assertTrue("Couldn't close document", close());
+        String tempDirURL = util.utils.getOfficeTemp/*Dir*/(getMSF());
+        System.out.println("temp dir URL is: " + tempDirURL);
+        String tempDir = graphical.FileHelper.getSystemPathFromFileURL(tempDirURL);
+        assertTrue("Temp directory doesn't exist.", new File(tempDir).exists());
+    }
+
+    private boolean open()
+        {
+            System.out.println("open()");
+            // get multiservicefactory -----------------------------------------
+            final XMultiServiceFactory xMsf = getMSF();
+
+            SOfficeFactory SOF = SOfficeFactory.getFactory(xMsf);
+
+            // some Tests need the qadevOOo TestParameters, it is like a Hashmap for Properties.
+            param = new TestParameters();
+            param.put("ServiceFactory", xMsf); // some qadevOOo functions need the ServiceFactory
+
+            return true;
+        }
+
+    private boolean close()
+        {
+            System.out.println("close()");
+            return true;
+        }
+
+    // marked as test
+    @Test public void checkDocument()
+        {
+            System.out.println("checkDocument()");
+            final String sREADME = TestDocument.getUrl("README.txt");
+            System.out.println("README is in:" + sREADME);
+            File aFile = new File(sREADME);
+            if (! aFile.exists())
+            {
+                // It is a little bit stupid that office urls not compatible to java file urls
+                System.out.println("java.io.File can't access Office file urls.");
+                String sREADMESystemPath = graphical.FileHelper.getSystemPathFromFileURL(sREADME);
+                aFile = new File(sREADMESystemPath);
+                assertTrue("File '" + sREADMESystemPath + "' doesn't exists.", aFile.exists());
+            }
+
+            try
+            {
+                RandomAccessFile aAccess = new RandomAccessFile(aFile, "r");
+                long nLength = aAccess.length();
+                System.out.println("File length: " + nLength);
+                assertTrue("File length wrong", nLength > 0);
+                String sLine = aAccess.readLine();
+                assertTrue("Line must not be empty", sLine.length() > 0);
+                System.out.println("       Line: '" + sLine + "'");
+                System.out.println("     length: " + sLine.length());
+                assertTrue("File length not near equal to string length", sLine.length() + 2 >= nLength);
+                aAccess.close();
+            }
+            catch (java.io.FileNotFoundException e)
+            {
+                fail("Can't find file: " + sREADME + " - " + e.getMessage());
+            }
+            catch (java.io.IOException e)
+            {
+                fail("IO Exception: " + e.getMessage());
+            }
+
+        }
+
+    @Test public void checkOpenDocumentWithOffice()
+    {
+        // SOfficeFactory aFactory = new SOfficeFactory(getMSF());
+        SOfficeFactory SOF = SOfficeFactory.getFactory(getMSF());
+        final String sREADME = TestDocument.getUrl("README.txt");
+        try
+        {
+            XComponent aDocument = SOF.loadDocument(sREADME);
+            complex.junitskeleton.justatest.shortWait();
+            XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, aDocument);
+            xClose.close(true);
+        }
+        catch (com.sun.star.lang.IllegalArgumentException ex)
+        {
+            fail("Illegal argument exception caught: " + ex.getMessage());
+        }
+        catch (com.sun.star.io.IOException ex)
+        {
+            fail("IOException caught: " + ex.getMessage());
+        }
+        catch (com.sun.star.uno.Exception ex)
+        {
+            fail("Exception caught: " + ex.getMessage());
+        }
+    }
+
+    // marked as prepare for test, will call before every test
+    @Before public void before()
+        {
+            System.out.println("before()");
+            System.setProperty("THIS IS A TEST", "Hallo");
+        }
+
+
+    // marked as post for test, will call after every test
+    @After public void after()
+        {
+            System.out.println("after()");
+            String sValue = System.getProperty("THIS IS A TEST");
+            assertEquals(sValue, "Hallo");
+    }
+
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+
+}
diff --git a/qadevOOo/qa/complex/junitskeleton/TestDocument.java b/qadevOOo/qa/complex/junitskeleton/TestDocument.java
new file mode 100644
index 000000000000..ff140a9991f6
--- /dev/null
+++ b/qadevOOo/qa/complex/junitskeleton/TestDocument.java
@@ -0,0 +1,41 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org 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 Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+************************************************************************/
+
+package complex.junitskeleton;
+
+import java.io.File;
+import org.openoffice.test.OfficeFileUrl;
+
+final class TestDocument
+{
+    public static String getUrl(String name)
+        {
+            return OfficeFileUrl.getAbsolute(new File("test_documents", name));
+        }
+
+    private TestDocument() {}
+}
diff --git a/qadevOOo/qa/complex/junitskeleton/justatest.java b/qadevOOo/qa/complex/junitskeleton/justatest.java
new file mode 100644
index 000000000000..5c11360b0717
--- /dev/null
+++ b/qadevOOo/qa/complex/junitskeleton/justatest.java
@@ -0,0 +1,38 @@
+/**
+ * @author: ll93751
+ * @copyright: Sun Microsystems Inc. 2010
+ */
+
+package complex.junitskeleton;
+
+public class justatest /* extends *//* implements */ {
+    //public static void main( String[] argv ) {
+    //
+    //    }
+    public void justatest()
+        {
+            System.out.println("justatest CTor.");
+        }
+
+    public void testfkt()
+        {
+            System.out.println("Test called.");
+        }
+
+      /**
+    * Sleeps for 0.5 sec. to allow StarOffice to react on <code>
+    * reset</code> call.
+    */
+    public static void shortWait()
+    {
+        try
+        {
+            Thread.sleep(500) ;
+        }
+        catch (InterruptedException e)
+        {
+            System.out.println("While waiting :" + e) ;
+        }
+    }
+
+}
diff --git a/qadevOOo/qa/complex/junitskeleton/makefile.mk b/qadevOOo/qa/complex/junitskeleton/makefile.mk
new file mode 100644
index 000000000000..301b8cf88fd7
--- /dev/null
+++ b/qadevOOo/qa/complex/junitskeleton/makefile.mk
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org 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 Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+    @echo "OOO_SUBSEQUENT_TESTS not set, do nothing."
+.ELSE
+
+PRJ = ../../..
+PRJNAME = sc
+TARGET = qa_complex_junitskeleton
+
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/junitskeleton
+
+# here store only Files which contain a @Test
+JAVATESTFILES = \
+    Skeleton.java
+
+# put here all other files
+JAVAFILES = $(JAVATESTFILES) \
+    justatest.java \
+    TestDocument.java
+
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
+
+# Sample how to debug
+# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
+
+.END
+
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
+
+ALLTAR : javatest
+
+.END
diff --git a/qadevOOo/qa/complex/junitskeleton/test_documents/README.txt b/qadevOOo/qa/complex/junitskeleton/test_documents/README.txt
new file mode 100644
index 000000000000..775f01c4924d
--- /dev/null
+++ b/qadevOOo/qa/complex/junitskeleton/test_documents/README.txt
@@ -0,0 +1 @@
+Here you can store documents.
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index c414accd44ac..519c7473a50f 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -33,10 +33,12 @@ import java.io.PrintStream;
 import java.io.LineNumberReader;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import lib.TestParameters;
+import share.LogWriter;
 import util.PropertyName;
 import util.utils;
 
@@ -58,6 +60,7 @@ class Pump extends Thread
     private String pref;
     private StringBuffer buf = new StringBuffer(256);
     private PrintWriter log;
+    private boolean bOutput;
 
     /**
      * Creates Pump for specified <code>InputStream</code>.
@@ -70,11 +73,12 @@ class Pump extends Thread
      * @param outPrefix A prefix which is printed at the
      *   beginning of each output line.
      */
-    public Pump(InputStream is, PrintWriter log, String outPrefix)
+    public Pump(InputStream is, PrintWriter log, String outPrefix, boolean _bOutput)
     {
         this.pref = (outPrefix == null) ? "" : outPrefix;
         reader = new LineNumberReader(new InputStreamReader(is));
         this.log = log;
+        this.bOutput = _bOutput;
         start();
     }
 
@@ -85,8 +89,11 @@ class Pump extends Thread
             String line = reader.readLine();
             while (line != null)
             {
-                log.println(pref + line);
-                log.flush();
+                if (bOutput)
+                {
+                    log.println(pref + line);
+                    log.flush();
+                }
                 buf.append(line).append('\n');
                 line = reader.readLine();
             }
@@ -134,6 +141,8 @@ public class ProcessHandler
     private TestParameters param = null;
     private boolean debug = false;
 
+    private boolean bUseOutput = true;
+
     /**
      * Creates instance with specified external command.
      * Debug info and output
@@ -566,8 +575,8 @@ public class ProcessHandler
             return;
         }
         dbg("execute: pump io-streams");
-        stdout = new Pump(m_aProcess.getInputStream(), log, "out > ");
-        stderr = new Pump(m_aProcess.getErrorStream(), log, "err > ");
+        stdout = new Pump(m_aProcess.getInputStream(), log, "out > ", bUseOutput);
+        stderr = new Pump(m_aProcess.getErrorStream(), log, "err > ", bUseOutput);
         stdIn = new PrintStream(m_aProcess.getOutputStream());
 
         // int nExitValue = m_aProcess.exitValue();
@@ -821,4 +830,10 @@ public class ProcessHandler
             log.println(utils.getDateTime() + "PH." + message);
         }
     }
+
+    public void noOutput()
+    {
+        bUseOutput = false;
+    }
+
 }
diff --git a/qadevOOo/runner/org/openoffice/Runner.java b/qadevOOo/runner/org/openoffice/Runner.java
index a3741774917e..41f96a4d384e 100644
--- a/qadevOOo/runner/org/openoffice/Runner.java
+++ b/qadevOOo/runner/org/openoffice/Runner.java
@@ -184,7 +184,7 @@ public class Runner
 
     public static boolean run(String... args)
     {
-        System.out.println("OOoRunner Main() version from 20100323 (yyyymmdd)");
+        System.out.println("OOoRunner Main() version from 20100630 (yyyymmdd)");
 
         setStartTime(getTime());