sb123:#111449# change sc complex tests

sc/prj/build.lst

@@ -48,3 +48,10 @@ sc	sc\addin\datefunc					nmake	-	all	sc_addfu sc_add sc_sdi sc_inc NULL
 sc	sc\addin\rot13						nmake	-	all	sc_adrot sc_add sc_sdi sc_inc NULL
 sc	sc\addin\util						nmake	-	all	sc_adutil sc_addfu sc_adrot sc_sdi sc_inc NULL
 sc	sc\util							nmake	-	all	sc_util sc_addfu sc_adrot sc_adutil sc_app sc_attr sc_cctrl sc_cosrc sc_data sc_dbgui sc_dif sc_docsh sc_drfnc sc_excel sc_form sc_html sc_lotus sc_qpro sc_misc sc_name sc_nvipi sc_opt sc_page sc_rtf sc_scalc sc_style sc_tool sc_uisrc sc_undo sc_unobj sc_view sc_xcl97 sc_xml sc_acc sc_ftools sc_inc sc_vba NULL
+
+# remarked due to the fact, key press is need in this test.
+# sc      sc\qa\complex\calcPreview                               nmake   -       all     qa_calcpreview   NULL
+
+sc      sc\qa\complex\cellRanges                                  nmake   -       all     qa_cellranges sc_util NULL
+sc      sc\qa\complex\dataPilot                                   nmake   -       all     qa_datapilot sc_util NULL
+sc      sc\qa\complex\sc                                          nmake   -       all     qa_sc sc_util NULL

sc/qa/complex/calcPreview/TestDocument.java

+/*************************************************************************
+*
+* 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.calcPreview;
+
+import java.io.File;
+import org.openoffice.test.OfficeFileUrl;
+
+final class TestDocument {
+    public static String getUrl(String name) {
+        return OfficeFileUrl.getAbsolute(new File("testdocuments", name));
+    }
+
+    private TestDocument() {}
+}

sc/qa/complex/calcPreview/makefile.mk

@@ -25,69 +25,99 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
-TARGET  = ViewForward
-PRJNAME = $(TARGET)
-PACKAGE = complex$/calcPreview
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
-JAVAFILES       = ViewForwarder.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
 .ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
 
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
+PRJ = ../../..
+PRJNAME = sc
+TARGET = qa_complex_calcpreview
 
-# set test document path 
-CT_TESTDOCS = -tdoc $(PWD)$/test_documents
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/calcPreview
+JAVATESTFILES = \
+    TestDocument.java \
+    ViewForwarder.java
 
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
+JAVAFILES = $(JAVATESTFILES)
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar jurt.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
+.END
 
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-# set the timeout to a bigger value
-CT_TIMEOUT = -TimeOut 120000
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(depend)" == ""
-$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR
-.ELSE
-$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP
-.ENDIF
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-.INCLUDE :  target.mk
+ALLTAR : javatest
 
+.END
 
-RUN:
-    +java -cp "$(CLASSPATH)" $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTDOCS) $(CT_TESTBASE) $(CT_WORKDIR) $(CT_TIMEOUT) $(CT_TEST)
 
-run: RUN
 
-tst:
-    +@echo $(CT_TESTDOCS)
 
+# PRJ = ..$/..$/..
+# TARGET  = ViewForward
+# PRJNAME = $(TARGET)
+# PACKAGE = complex$/calcPreview
+# 
+# # --- Settings -----------------------------------------------------
+# .INCLUDE: settings.mk
+# 
+# 
+# #----- compile .java files -----------------------------------------
+# 
+# JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
+# JAVAFILES       = ViewForwarder.java
+# JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+# 
+# #----- make a jar from compiled files ------------------------------
+# 
+# MAXLINELENGTH = 100000
+# 
+# JARCLASSDIRS    = $(PACKAGE)
+# JARTARGET       = $(TARGET).jar
+# JARCOMPRESS 	= TRUE
+# 
+# # --- Parameters for the test --------------------------------------
+# 
+# # start an office if the parameter is set for the makefile
+# .IF "$(OFFICE)" == ""
+# CT_APPEXECCOMMAND =
+# .ELSE
+# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
+# .ENDIF
+# 
+# # test base is java complex
+# CT_TESTBASE = -TestBase java_complex
+# 
+# # set test document path 
+# CT_TESTDOCS = -tdoc $(PWD)$/test_documents
+# 
+# # test looks something like the.full.package.TestName
+# CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
+# 
+# # start the runner application
+# CT_APP      = org.openoffice.Runner
+# 
+# # set the timeout to a bigger value
+# CT_TIMEOUT = -TimeOut 120000
+# 
+# # --- Targets ------------------------------------------------------
+# 
+# .IF "$(depend)" == ""
+# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR
+# .ELSE
+# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP
+# .ENDIF
+# 
+# .INCLUDE :  target.mk
+# 
+# 
+# RUN:
+#     +java -cp "$(CLASSPATH)" $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTDOCS) $(CT_TESTBASE) $(CT_WORKDIR) $(CT_TIMEOUT) $(CT_TEST)
+# 
+# run: RUN
+# 
+# tst:
+# 	+@echo $(CT_TESTDOCS)
+# 

sc/qa/complex/cellRanges/makefile.mk

@@ -25,53 +25,27 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
-TARGET  = CheckXCellRangesQuery
-PRJNAME = $(TARGET)
-PACKAGE = complex$/cellRanges
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = $(TARGET).java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
 .ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
 
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
+PRJ = ../../..
+PRJNAME = sc
+TARGET = qa_complex_cellRanges
 
-# start the runner application
-CT_APP      = org.openoffice.Runner
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/cellRanges
+JAVATESTFILES = \
+    CheckXCellRangesQuery.java
+JAVAFILES = $(JAVATESTFILES)
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
+.END
 
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-RUN: run
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-run:
-    +java -cp "$(CLASSPATH)" $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_TEST)
+ALLTAR : javatest
 
+.END

sc/qa/complex/dataPilot/interfaceTests/beans/makefile.mk

@@ -25,10 +25,10 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..$/..$/..
+PRJ = ../../../../..
 TARGET  = DataPilotInterfaceBeans
 PRJNAME = sc
-PACKAGE = complex$/dataPilot$/interfaceTests$/beans
+PACKAGE = complex/dataPilot/interfaceTests/beans
 
 # --- Settings -----------------------------------------------------
 .INCLUDE: settings.mk
@@ -38,7 +38,7 @@ PACKAGE = complex$/dataPilot$/interfaceTests$/beans
 
 JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = _XPropertySet.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class)
 
 # --- Targets ------------------------------------------------------
 

sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.java

@@ -29,8 +29,8 @@ package complex.dataPilot.interfaceTests.container;
 
 import com.sun.star.container.XNamed;
 import lib.TestParameters;
-import share.LogWriter;
-import util.utils;
+// import share.LogWriter;
+// import util.utils;
 
 /**
 * Testing <code>com.sun.star.container.XNamed</code>
@@ -64,7 +64,7 @@ public class _XNamed {
     /**
      * The log writer
      */
-    private LogWriter log = null;
+    // private LogWriter log = null;
 
     /**
      * Constructor: gets the object to test, a logger and the test parameters
@@ -72,9 +72,9 @@ public class _XNamed {
      * @param log A log writer
      * @param param The test parameters
      */
-    public _XNamed(XNamed xObj, LogWriter log, TestParameters param) {
+    public _XNamed(XNamed xObj/*, LogWriter log*/, TestParameters param) {
         oObj = xObj;
-        this.log = log;
+        // this.log = log;
         this.param = param;
     }
 
@@ -87,7 +87,7 @@ public class _XNamed {
     public boolean _getName() {
 
         // write to log what we try next
-        log.println( "test for getName()" );
+        System.out.println( "test for getName()" );
 
         boolean result = true;
         boolean loc_result = true;
@@ -95,10 +95,16 @@ public class _XNamed {
         String NewName = null;
 
         loc_result = ((name = oObj.getName()) != null);
-        log.println("getting the name \"" + name + "\"");
-
-        if (loc_result) log.println("... getName() - OK");
-        else log.println("... getName() - FAILED");
+        System.out.println("getting the name \"" + name + "\"");
+
+        if (loc_result)
+        {
+            System.out.println("... getName() - OK");
+        }
+        else
+        {
+            System.out.println("... getName() - FAILED");
+        }
         result &= loc_result;
         return result;
     }
@@ -121,23 +127,29 @@ public class _XNamed {
     */
     public boolean _setName(){
 //        requiredMethod("getName()");
-        log.println("testing setName() ... ");
+        System.out.println("testing setName() ... ");
 
         String oldName = oObj.getName();
         String NewName = oldName == null ? "XNamed" : oldName + "X" ;
 
         boolean result = true;
         boolean loc_result = true;
-        log.println("set the name of object to \"" + NewName + "\"");
+        System.out.println("set the name of object to \"" + NewName + "\"");
         oObj.setName(NewName);
-        log.println("check that container has element with this name");
+        System.out.println("check that container has element with this name");
 
         String name = oObj.getName();
-        log.println("getting the name \"" + name + "\"");
+        System.out.println("getting the name \"" + name + "\"");
         loc_result = name.equals(NewName);
 
-        if (loc_result) log.println("... setName() - OK");
-                        else log.println("... setName() - FAILED");
+        if (loc_result)
+        {
+            System.out.println("... setName() - OK");
+        }
+        else
+        {
+            System.out.println("... setName() - FAILED");
+        }
         result &= loc_result;
         oObj.setName(oldName);
         return result;

sc/qa/complex/dataPilot/interfaceTests/container/makefile.mk

@@ -25,10 +25,10 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..$/..$/..
+PRJ = ../../../../..
 TARGET  = DataPilotInterfaceContainer
 PRJNAME = sc
-PACKAGE = complex$/dataPilot$/interfaceTests$/container
+PACKAGE = complex/dataPilot/interfaceTests/container
 
 # --- Settings -----------------------------------------------------
 .INCLUDE: settings.mk
@@ -38,7 +38,7 @@ PACKAGE = complex$/dataPilot$/interfaceTests$/container
 
 JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = _XNamed.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class)
 
 # --- Targets ------------------------------------------------------
 

sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.java

@@ -31,10 +31,10 @@ import com.sun.star.sheet.XDataPilotTable;
 import com.sun.star.table.CellAddress;
 import com.sun.star.table.CellRangeAddress;
 import com.sun.star.table.XCell;
-import lib.Status;
+// import lib.Status;
 //import lib.StatusException;
 import lib.TestParameters;
-import share.LogWriter;
+// import share.LogWriter;
 
 /**
 * Testing <code>com.sun.star.sheet.XDataPilotTable</code>
@@ -71,18 +71,18 @@ public class _XDataPilotTable {
     /**
      * The log writer
      */
-    private LogWriter log = null;
+    // private LogWriter log = null;
 
     /**
      * Constructor: gets the object to test, a logger and the test parameters
      * @param xObj The test object
-     * @param log A log writer
+
      * @param param The test parameters
      */
-    public _XDataPilotTable(XDataPilotTable xObj,
-                                    LogWriter log, TestParameters param) {
+    public _XDataPilotTable(XDataPilotTable xObj/*,
+                                    LogWriter log*/, TestParameters param) {
         oObj = xObj;
-        this.log = log;
+        // this.log = log;
         this.param = param;
     }
 
@@ -94,7 +94,7 @@ public class _XDataPilotTable {
 
         if (xCellForChange == null || OutputRange == null ||
                 xCellForCheck == null) {
-            log.println("Relation not found");
+            System.out.println("Relation not found");
             return false;
         }
         return true;
@@ -103,7 +103,8 @@ public class _XDataPilotTable {
     * Test calls the method and checks returned value using value obtained by
     * object relation <code>'OUTPUTRANGE'</code>. <p>
     * Has <b> OK </b> status if values are equal. <p>
-    */
+     * @return
+     */
     public boolean _getOutputRange(){
         boolean bResult = true;
         CellRangeAddress objRange = oObj.getOutputRange();
@@ -119,13 +120,14 @@ public class _XDataPilotTable {
     * relation 'CELLFORCHECK'.<p>
     * Has <b>OK</b> status if value of the cell obtained by object relation
     * 'CELLFORCHECK' is changed. <p>
-    */
+     * @return
+     */
     public boolean _refresh(){
         xCellForChange.setValue(changeValue);
         double oldData = xCellForCheck.getValue();
         oObj.refresh();
         double newData = xCellForCheck.getValue();
-        log.println("Old data:" + oldData + "; new data:" + newData);
+        System.out.println("Old data:" + oldData + "; new data:" + newData);
 
         return oldData != newData;
     }

sc/qa/complex/dataPilot/interfaceTests/sheet/makefile.mk

@@ -25,10 +25,10 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..$/..$/..
+PRJ = ../../../../..
 TARGET  = DataPilotInterfaceSheet
 PRJNAME = sc
-PACKAGE = complex$/dataPilot$/interfaceTests$/sheet
+PACKAGE = complex/dataPilot/interfaceTests/sheet
 
 # --- Settings -----------------------------------------------------
 .INCLUDE: settings.mk
@@ -38,7 +38,7 @@ PACKAGE = complex$/dataPilot$/interfaceTests$/sheet
 
 JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = _XDataPilotDescriptor.java _XDataPilotTable.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class)
 
 # --- Targets ------------------------------------------------------
 

sc/qa/complex/dataPilot/makefile.mk

@@ -25,34 +25,33 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
-TARGET  = DataPilot
-PRJNAME = sc
-PACKAGE = complex$/dataPilot
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
 
+PRJ = ../../..
+PRJNAME = sc
+TARGET = qa_complex_datapilot
 
-#----- compile .java files -----------------------------------------
-
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = CheckDataPilot.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/dataPilot
+JAVATESTFILES = \
+    CheckDataPilot.java
 
-SUBDIRS         = interfaceTests$/beans interfaceTests$/container interfaceTests$/sheet
-#----- make a jar from compiled files ------------------------------
+JAVAFILES = $(JAVATESTFILES)
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
-MAXLINELENGTH = 100000
+JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class)
+SUBDIRS         = interfaceTests/beans interfaceTests/container interfaceTests/sheet
 
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
+.END
 
-# --- Targets ------------------------------------------------------
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-.INCLUDE :  target.mk
+ALLTAR : javatest
 
+.END
 
-run:
-    +java -cp $(CLASSPATH) org.openoffice.Runner -TimeOut 0 -tb java_complex -o $(PACKAGE:s#$/#.#).$(JAVAFILES:b)

sc/qa/complex/sc/makefile.mk

@@ -25,33 +25,27 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
-TARGET  = CalcRTL
-PRJNAME = sc
-PACKAGE = complex$/sc
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
 
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = CalcRTL.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
+PRJ = ../../..
+PRJNAME = sc
+TARGET = qa_complex_sc
 
-# --- Targets ------------------------------------------------------
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/sc
+JAVATESTFILES = \
+    CalcRTL.java
+JAVAFILES = $(JAVATESTFILES)
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar jurt.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
+.END
 
-.INCLUDE :  target.mk
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
+ALLTAR : javatest
 
-run:
-    +java -cp "$(CLASSPATH)" org.openoffice.Runner -TimeOut 0 -tb java_complex -o $(PACKAGE:s#$/#.#).$(JAVAFILES:b)
+.END