cleanup of unoapi test

3 files changed, 80 insertions, 3 deletions

diff --git a/test/source/java/org/openoffice/test/OfficeConnection.java b/test/source/java/org/openoffice/test/OfficeConnection.java
index 084453fdaf35..fcdd2ac4cfa6 100644
--- a/test/source/java/org/openoffice/test/OfficeConnection.java
+++ b/test/source/java/org/openoffice/test/OfficeConnection.java
@@ -46,6 +46,21 @@ import static org.junit.Assert.*;
     Details about the OOo instance are tunneled in via
     org.openoffice.test.arg.... system properties.
 */
+final class ShutdownKiller implements java.lang.Runnable {
+    private java.lang.Thread m_watchedThread;
+    ShutdownKiller(java.lang.Thread watchedThread) {
+        m_watchedThread = watchedThread;
+    }
+    public void run() {
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException e) {
+            return;
+        };
+        m_watchedThread.interrupt();
+    }
+}
+
 public final class OfficeConnection {
     /** Start up an OOo instance.
     */
@@ -81,6 +96,7 @@ public final class OfficeConnection {
                 "\"soffice\" argument \"" + sofficeArg +
                 " starts with neither \"path:\" nor \"connect:\"");
         }
+        Thread.sleep(2000);
         XUnoUrlResolver resolver = UnoUrlResolver.create(
             Bootstrap.createInitialComponentContext(null));
         for (;;) {
@@ -125,7 +141,14 @@ public final class OfficeConnection {
         }
         int code = 0;
         if (process != null) {
-            code = process.waitFor();
+            Thread watcher = new Thread(new ShutdownKiller(Thread.currentThread()));
+            watcher.run();
+            try {
+                code = process.waitFor();
+            } catch (InterruptedException e) {
+                assertTrue(false);
+            };
+            watcher.interrupt();
         }
         boolean outTerminated = outForward == null || outForward.terminated();
         boolean errTerminated = errForward == null || errForward.terminated();
diff --git a/test/source/java/org/openoffice/test/UnoApiTest.java b/test/source/java/org/openoffice/test/UnoApiTest.java
new file mode 100644
index 000000000000..fc5ba5a9c68f
--- /dev/null
+++ b/test/source/java/org/openoffice/test/UnoApiTest.java
@@ -0,0 +1,52 @@
+/*************************************************************************
+* 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 org.openoffice.test;
+
+import org.openoffice.Runner;
+import org.openoffice.test.OfficeConnection;
+import org.openoffice.test.Argument;
+import static org.junit.Assert.*;
+
+public final class UnoApiTest {
+    @org.junit.Before public void setUp() throws Exception {
+        connection.setUp();
+    }
+
+    @org.junit.After public void tearDown()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        connection.tearDown();
+    }
+
+    @org.junit.Test public void test() {
+        assertTrue(
+            Runner.run(
+                "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc",
+                Argument.get("tdoc"), "-cs", connection.getDescription()));
+    }
+
+    private final OfficeConnection connection = new OfficeConnection();
+}
diff --git a/test/source/java/org/openoffice/test/makefile.mk b/test/source/java/org/openoffice/test/makefile.mk
index 8340f144aed3..65b54d11da65 100644
--- a/test/source/java/org/openoffice/test/makefile.mk
+++ b/test/source/java/org/openoffice/test/makefile.mk
@@ -35,8 +35,10 @@ JAVAFILES = \
     FileHelper.java \
     OfficeConnection.java \
     OfficeFileUrl.java \
-    TestArgument.java
-JARFILES = juh.jar ridl.jar unoil.jar
+    TestArgument.java \
+    UnoApiTest.java \
+
+JARFILES = juh.jar ridl.jar unoil.jar OOoRunner.jar
 EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
 JARTARGET        = $(TARGET).jar