1 files changed, 35 insertions, 48 deletions
diff --git a/ucb/qa/complex/tdoc/makefile.mk b/ucb/qa/complex/tdoc/makefile.mk
index 175184de0f27..01f8ec0f76fa 100755
--- a/ucb/qa/complex/tdoc/makefile.mk
+++ b/ucb/qa/complex/tdoc/makefile.mk
@@ -25,62 +25,49 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
-TARGET  = TransientDocument
-PRJNAME = $(TARGET)
-PACKAGE = complex.tdoc
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES = CheckContentProvider.java \
-            CheckTransientDocumentsContent.java \
-            CheckTransientDocumentsContentProvider.java \
-            CheckTransientDocumentsDocumentContent.java
-
-#            CheckSimpleFileAccess.java \
-#----- make a jar from compiled files ------------------------------
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
 
-MAXLINELENGTH = 100000
+PRJ = ../../..
+PRJNAME = sc
+TARGET = qa_complex_tdoc
 
-JARCLASSDIRS  = $(PACKAGE)
-JARTARGET     = $(TARGET).jar
-JARCOMPRESS   = TRUE
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/tdoc
 
-# --- Parameters for the test --------------------------------------
+JAVATESTFILES = \
+   CheckContentProvider.java \
+   CheckTransientDocumentsContent.java \
+   CheckTransientDocumentsContentProvider.java \
+   CheckTransientDocumentsDocumentContent.java
 
-# 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
+JAVAFILES = $(JAVATESTFILES) \
+    TestDocument.java \
+    _XChild.java \
+    _XCommandInfoChangeNotifier.java \
+    _XCommandProcessor.java \
+    _XComponent.java \
+    _XContent.java \
+    _XPropertiesChangeNotifier.java \
+    _XPropertyContainer.java \
+    _XPropertySetInfoChangeNotifier.java \
+    _XServiceInfo.java \
+    _XTypeProvider.java
 
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
-# replace $/ with . in package name
-CT_PACKAGE  = -o $(PACKAGE:s\$/\.\)
+# Sample how to debug
+# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
 
-# start the runner application
-CT_APP      = org.openoffice.Runner
+.END
 
-# test document path
-CT_TESTDOCS = -tdoc $(PWD)$/..$/test_documents
-
-# --- Targets ------------------------------------------------------
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-run: ALLTAR
-    @echo .
-    @echo "The followig tests are available:"
-    @echo $(foreach,i,$(JAVAFILES) "dmake $(i:b)     ")
+ALLTAR : javatest
 
-.INCLUDE :  target.mk
+.END
 
-Check%:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_TESTDOCS) $(CT_APPEXECCOMMAND) $(CT_PACKAGE).$@