From 53d11881f2919e477801b80b612ddc6b11adbb55 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mst@openoffice.org>
Date: Mon, 14 Feb 2011 17:33:19 +0100
Subject: [PATCH] sw34bf03: #i116192#: sw: enable complex tests again

---
 sw/JunitTest_sw_complex.mk             | 13 +++++++++++++
 sw/qa/complex/writer/TestDocument.java |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index 4eb0dc405264..df81b22f712d 100755
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -27,6 +27,11 @@
 
 $(eval $(call gb_JunitTest_JunitTest,sw_complex))
 
+$(eval $(call gb_JunitTest_set_defs,sw_complex,\
+    $$(DEFS) \
+    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sw/qa/complex/writer/testdocuments \
+))
+
 $(eval $(call gb_JunitTest_add_sourcefiles,sw_complex,\
     sw/qa/complex/checkColor/CheckChangeColor \
     sw/qa/complex/indeterminateState/CheckIndeterminateState \
@@ -52,6 +57,14 @@ $(eval $(call gb_JunitTest_add_jars,sw_complex,\
 $(eval $(call gb_JunitTest_add_classes,sw_complex,\
     complex.accessibility.AccessibleRelationSet \
     complex.checkColor.CheckChangeColor \
+    complex.writer.CheckCrossReferences \
+    complex.writer.CheckFlies \
+    complex.writer.CheckIndexedPropertyValues \
+    complex.writer.CheckNamedPropertyValues \
+    complex.writer.TextPortionEnumerationTest \
 ))
 
+# currently fails (should run again in os146) (except on windows)
+#	complex.writer.CheckBookmarks \
+
 # vim: set noet sw=4 ts=4:
diff --git a/sw/qa/complex/writer/TestDocument.java b/sw/qa/complex/writer/TestDocument.java
index 25a11338ae5c..088c9aede3d6 100644
--- a/sw/qa/complex/writer/TestDocument.java
+++ b/sw/qa/complex/writer/TestDocument.java
@@ -29,10 +29,11 @@ package complex.writer;
 
 import java.io.File;
 import org.openoffice.test.OfficeFileUrl;
+import org.openoffice.test.Argument;
 
 final class TestDocument {
     public static String getUrl(String name) {
-        return OfficeFileUrl.getAbsolute(new File("testdocuments", name));
+        return OfficeFileUrl.getAbsolute(new File(Argument.get("tdoc"), name));
     }
 
     private TestDocument() {}