summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorjmzambon <jeanmarczambon@gmail.com>2017-12-10 14:20:59 +0100
committerMichael Stahl <mstahl@redhat.com>2017-12-11 13:21:40 +0100
commitc4d0cd148128ceec55b95407d637d42e27426966 (patch)
tree87c2a56128a9b6b182b1491347349386cb697ad9 /sw
parent18aaca86fc0733244f36b761479c8dd476752a30 (diff)
tdf#97362: convert sw java complex tests to Python (#final)
Move test documents to python folder. Delete remaining java helper class "TestDocument" and parent folder. Change-Id: I76ba4e82e96b39df207c337fc1f17052b750774d Reviewed-on: https://gerrit.libreoffice.org/46188 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/JunitTest_sw_complex.mk6
-rw-r--r--sw/PythonTest_sw_python.mk2
-rw-r--r--sw/qa/complex/writer/TestDocument.java31
-rw-r--r--sw/qa/python/testdocuments/CheckCrossReferences.odt (renamed from sw/qa/complex/writer/testdocuments/CheckCrossReferences.odt)bin17626 -> 17626 bytes
-rw-r--r--sw/qa/python/testdocuments/CheckFlies.odt (renamed from sw/qa/complex/writer/testdocuments/CheckFlies.odt)bin65022 -> 65022 bytes
-rw-r--r--sw/qa/python/testdocuments/TESTMETA.odt (renamed from sw/qa/complex/writer/testdocuments/TESTMETA.odt)bin8678 -> 8678 bytes
-rw-r--r--sw/qa/python/testdocuments/TESTXMLID.odt (renamed from sw/qa/complex/writer/testdocuments/TESTXMLID.odt)bin10879 -> 10879 bytes
-rw-r--r--sw/qa/python/testdocuments/fdo39694.ott (renamed from sw/qa/complex/writer/testdocuments/fdo39694.ott)bin9357 -> 9357 bytes
8 files changed, 1 insertions, 38 deletions
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index 79b87a5094cb..d39f39f22515 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -19,15 +19,9 @@
$(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/accessibility/AccessibleRelationSet \
sw/qa/complex/indeterminateState/CheckIndeterminateState \
- sw/qa/complex/writer/TestDocument \
))
$(eval $(call gb_JunitTest_use_jars,sw_complex,\
diff --git a/sw/PythonTest_sw_python.mk b/sw/PythonTest_sw_python.mk
index 2d1d8bb44eca..c47c5cbcbbd3 100644
--- a/sw/PythonTest_sw_python.mk
+++ b/sw/PythonTest_sw_python.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_PythonTest_PythonTest,sw_python))
$(eval $(call gb_PythonTest_set_defs,sw_python,\
- TDOC="$(SRCDIR)/sw/qa/complex/writer/testdocuments" \
+ TDOC="$(SRCDIR)/sw/qa/python/testdocuments" \
))
$(eval $(call gb_PythonTest_add_modules,sw_python,$(SRCDIR)/sw/qa/python,\
diff --git a/sw/qa/complex/writer/TestDocument.java b/sw/qa/complex/writer/TestDocument.java
deleted file mode 100644
index da6c6d4573ae..000000000000
--- a/sw/qa/complex/writer/TestDocument.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-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(Argument.get("tdoc"), name));
- }
-
- private TestDocument() {}
-}
diff --git a/sw/qa/complex/writer/testdocuments/CheckCrossReferences.odt b/sw/qa/python/testdocuments/CheckCrossReferences.odt
index d9484421d3dc..d9484421d3dc 100644
--- a/sw/qa/complex/writer/testdocuments/CheckCrossReferences.odt
+++ b/sw/qa/python/testdocuments/CheckCrossReferences.odt
Binary files differ
diff --git a/sw/qa/complex/writer/testdocuments/CheckFlies.odt b/sw/qa/python/testdocuments/CheckFlies.odt
index 8f42989b3a0d..8f42989b3a0d 100644
--- a/sw/qa/complex/writer/testdocuments/CheckFlies.odt
+++ b/sw/qa/python/testdocuments/CheckFlies.odt
Binary files differ
diff --git a/sw/qa/complex/writer/testdocuments/TESTMETA.odt b/sw/qa/python/testdocuments/TESTMETA.odt
index 004af82e5ddf..004af82e5ddf 100644
--- a/sw/qa/complex/writer/testdocuments/TESTMETA.odt
+++ b/sw/qa/python/testdocuments/TESTMETA.odt
Binary files differ
diff --git a/sw/qa/complex/writer/testdocuments/TESTXMLID.odt b/sw/qa/python/testdocuments/TESTXMLID.odt
index 063d392a489f..063d392a489f 100644
--- a/sw/qa/complex/writer/testdocuments/TESTXMLID.odt
+++ b/sw/qa/python/testdocuments/TESTXMLID.odt
Binary files differ
diff --git a/sw/qa/complex/writer/testdocuments/fdo39694.ott b/sw/qa/python/testdocuments/fdo39694.ott
index 959d2a656603..959d2a656603 100644
--- a/sw/qa/complex/writer/testdocuments/fdo39694.ott
+++ b/sw/qa/python/testdocuments/fdo39694.ott
Binary files differ