gnumake3: adjust sfx2 complex tests to m99 changes

2 files changed, 31 insertions, 18 deletions

diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk
index a202319975dc..800612a6c55d 100755
--- a/sfx2/JunitTest_sfx2_complex.mk
+++ b/sfx2/JunitTest_sfx2_complex.mk
@@ -29,37 +29,50 @@ $(eval $(call gb_JunitTest_JunitTest,sfx2_complex))
 
 $(eval $(call gb_JunitTest_set_defs,sfx2_complex,\
     $$(DEFS) \
-    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sfx2/qa/complex/framework/testdocuments \
+    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sfx2/qa/complex/sfx2/testdocuments \
 ))
 
 $(eval $(call gb_JunitTest_add_jars,sfx2_complex,\
     $(OUTDIR)/bin/OOoRunner.jar \
     $(OUTDIR)/bin/ridl.jar \
     $(OUTDIR)/bin/test.jar \
+    $(OUTDIR)/bin/test-tools.jar \
     $(OUTDIR)/bin/unoil.jar \
     $(OUTDIR)/bin/jurt.jar \
 ))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,sfx2_complex,\
-    sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1 \
-    sfx2/qa/complex/framework/DocumentMetadataAccessTest \
-    sfx2/qa/complex/framework/DialogThread \
-    sfx2/qa/complex/framework/WriterHelper \
-    sfx2/qa/complex/framework/TestDocument \
-    sfx2/qa/complex/framework/DocumentPropertiesTest \
-    sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoTest \
-    sfx2/qa/complex/standalonedocumentinfo/TestHelper \
-    sfx2/qa/complex/standalonedocumentinfo/Test01 \
-    sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest \
-    sfx2/qa/complex/docinfo/DocumentProperties \
+    sfx2/qa/complex/sfx2/tools/DialogThread \
+    sfx2/qa/complex/sfx2/tools/WriterHelper \
+    sfx2/qa/complex/sfx2/tools/TestDocument \
+    sfx2/qa/complex/sfx2/GlobalEventBroadcaster \
+    sfx2/qa/complex/sfx2/DocumentMetadataAccess \
+    sfx2/qa/complex/sfx2/DocumentProperties \
+    sfx2/qa/complex/sfx2/DocumentInfo \
+    sfx2/qa/complex/sfx2/StandaloneDocumentInfo \
+    sfx2/qa/complex/sfx2/UndoManager \
+    sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest \
+    sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper \
+    sfx2/qa/complex/sfx2/standalonedocinfo/Test01 \
+    sfx2/qa/complex/sfx2/undo/CalcDocumentTest \
+    sfx2/qa/complex/sfx2/undo/ChartDocumentTest \
+    sfx2/qa/complex/sfx2/undo/DocumentTest \
+    sfx2/qa/complex/sfx2/undo/DocumentTestBase \
+    sfx2/qa/complex/sfx2/undo/DrawDocumentTest \
+    sfx2/qa/complex/sfx2/undo/DrawingOrPresentationDocumentTest \
+    sfx2/qa/complex/sfx2/undo/ImpressDocumentTest \
+    sfx2/qa/complex/sfx2/undo/WriterDocumentTest \
 ))
 
 $(eval $(call gb_JunitTest_add_classes,sfx2_complex,\
-    complex.docinfo.DocumentProperties \
-    complex.framework.DocumentPropertiesTest \
-    complex.framework.DocumentMetadataAccessTest \
+    complex.sfx2.DocumentInfo \
+    complex.sfx2.DocumentProperties \
+    complex.sfx2.DocumentMetadataAccess \
+    complex.sfx2.UndoManager \
 ))
-# fails currently: misses some OnUnfocus event
-#	complex.framework.CheckGlobalEventBroadcaster_writer1 \
+# #i115674# fails currently: misses some OnUnfocus event
+#	complex.sfx2.GlobalEventBroadcaster \
+# breaks because binfilter export has been removed
+#	complex.sfx2.StandaloneDocumentInfo \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java
index ab1b9de910b8..f37530aba726 100755
--- a/sfx2/qa/complex/sfx2/UndoManager.java
+++ b/sfx2/qa/complex/sfx2/UndoManager.java
@@ -159,7 +159,7 @@ public class UndoManager
     }
 
     // -----------------------------------------------------------------------------------------------------------------
-    @Test
+//#i116813# disabled   @Test
     public void checkBrokenScripts() throws com.sun.star.uno.Exception, InterruptedException
     {
         System.out.println( "testing: broken scripts" );