summaryrefslogtreecommitdiff
path: root/svx/qa
diff options
context:
space:
mode:
Diffstat (limited to 'svx/qa')
-rwxr-xr-x[-rw-r--r--]svx/qa/unoapi/Test.java5
-rwxr-xr-x[-rw-r--r--]svx/qa/unoapi/knownissues.xcl3
-rw-r--r--svx/qa/unoapi/makefile.mk48
-rwxr-xr-x[-rw-r--r--]svx/qa/unoapi/svx.sce0
-rwxr-xr-x[-rw-r--r--]svx/qa/unoapi/testdocuments/SvxShape.sxdbin6344 -> 6344 bytes
-rwxr-xr-x[-rw-r--r--]svx/qa/unoapi/testdocuments/crazy-blue.jpgbin4451 -> 4451 bytes
-rwxr-xr-x[-rw-r--r--]svx/qa/unoapi/testdocuments/space-metal.jpgbin4313 -> 4313 bytes
7 files changed, 6 insertions, 50 deletions
diff --git a/svx/qa/unoapi/Test.java b/svx/qa/unoapi/Test.java
index 90abd12776d0..2f7581e22efa 100644..100755
--- a/svx/qa/unoapi/Test.java
+++ b/svx/qa/unoapi/Test.java
@@ -27,6 +27,7 @@ package org.openoffice.svx.qa.unoapi;
import org.openoffice.Runner;
import org.openoffice.test.OfficeConnection;
+import org.openoffice.test.Argument;
import static org.junit.Assert.*;
public final class Test {
@@ -43,8 +44,8 @@ public final class Test {
@org.junit.Test public void test() {
assertTrue(
Runner.run(
- "-sce", "svx.sce", "-xcl", "knownissues.xcl", "-tdoc",
- "testdocuments", "-cs", connection.getDescription()));
+ "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc",
+ Argument.get("tdoc"), "-cs", connection.getDescription()));
}
private final OfficeConnection connection = new OfficeConnection();
diff --git a/svx/qa/unoapi/knownissues.xcl b/svx/qa/unoapi/knownissues.xcl
index 89369160bb45..b26db6b7f99e 100644..100755
--- a/svx/qa/unoapi/knownissues.xcl
+++ b/svx/qa/unoapi/knownissues.xcl
@@ -85,3 +85,6 @@ svx.AccessiblePresentationOLEShape::com::sun::star::accessibility::XAccessibleCo
### i111169 ###
svx.AccessiblePageShape::com::sun::star::accessibility::XAccessibleComponent
+
+### i114642 ###
+svx.SvxUnoTextContent::com::sun::star::style::CharacterProperties
diff --git a/svx/qa/unoapi/makefile.mk b/svx/qa/unoapi/makefile.mk
deleted file mode 100644
index 133e9a3458e4..000000000000
--- a/svx/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-# 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.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = svx
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/svx/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce
index 82ee2ea6b193..82ee2ea6b193 100644..100755
--- a/svx/qa/unoapi/svx.sce
+++ b/svx/qa/unoapi/svx.sce
diff --git a/svx/qa/unoapi/testdocuments/SvxShape.sxd b/svx/qa/unoapi/testdocuments/SvxShape.sxd
index 27f06d54166d..27f06d54166d 100644..100755
--- a/svx/qa/unoapi/testdocuments/SvxShape.sxd
+++ b/svx/qa/unoapi/testdocuments/SvxShape.sxd
Binary files differ
diff --git a/svx/qa/unoapi/testdocuments/crazy-blue.jpg b/svx/qa/unoapi/testdocuments/crazy-blue.jpg
index 001c88b63d88..001c88b63d88 100644..100755
--- a/svx/qa/unoapi/testdocuments/crazy-blue.jpg
+++ b/svx/qa/unoapi/testdocuments/crazy-blue.jpg
Binary files differ
diff --git a/svx/qa/unoapi/testdocuments/space-metal.jpg b/svx/qa/unoapi/testdocuments/space-metal.jpg
index d23344389073..d23344389073 100644..100755
--- a/svx/qa/unoapi/testdocuments/space-metal.jpg
+++ b/svx/qa/unoapi/testdocuments/space-metal.jpg
Binary files differ