- * reset call.
- */
- public static void shortWait() {
- try {
- Thread.sleep(500);
- } catch (InterruptedException e) {
- System.out.println("While waiting :" + e);
- }
- }
-
-}
diff --git a/qadevOOo/qa/complex/junitskeleton/makefile.mk b/qadevOOo/qa/complex/junitskeleton/makefile.mk
deleted file mode 100644
index ff513ed67001..000000000000
--- a/qadevOOo/qa/complex/junitskeleton/makefile.mk
+++ /dev/null
@@ -1,54 +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 .
-#
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
- @echo "OOO_SUBSEQUENT_TESTS not set, do nothing."
-.ELSE
-
-PRJ = ../../..
-PRJNAME = sc
-TARGET = qa_complex_junitskeleton
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/junitskeleton
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
- Skeleton.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
- justatest.java \
- TestDocument.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/qadevOOo/qa/complex/junitskeleton/test_documents/README.txt b/qadevOOo/qa/complex/junitskeleton/test_documents/README.txt
deleted file mode 100644
index 775f01c4924d..000000000000
--- a/qadevOOo/qa/complex/junitskeleton/test_documents/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-Here you can store documents.
diff --git a/qadevOOo/qa/unoapi/Test.java b/qadevOOo/qa/unoapi/Test.java
deleted file mode 100644
index e6b8120dbdf7..000000000000
--- a/qadevOOo/qa/unoapi/Test.java
+++ /dev/null
@@ -1,48 +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 unoapi;
-
-import org.openoffice.Runner;
-import org.openoffice.test.OfficeConnection;
-import static org.junit.Assert.*;
-
-public final class Test {
- @org.junit.Before public void setUp() throws Exception {
- connection.setUp();
- }
-
- @org.junit.After public void tearDown()
- throws InterruptedException, com.sun.star.uno.Exception
- {
- connection.tearDown();
- }
-
- @org.junit.Test public void test() {
- try {
- assertTrue(
- Runner.run(
- "-sce", "qadevOOo.sce", "-xcl", "knownissues.xcl", "-cs",
- connection.getDescription()));
- } catch (Exception e) {
- fail("Could not run test");
- }
- }
-
- private final OfficeConnection connection = new OfficeConnection();
-}
diff --git a/qadevOOo/qa/unoapi/knownissues.xcl b/qadevOOo/qa/unoapi/knownissues.xcl
deleted file mode 100644
index 02c509060d97..000000000000
--- a/qadevOOo/qa/unoapi/knownissues.xcl
+++ /dev/null
@@ -1 +0,0 @@
-# This file contains all Errors
diff --git a/qadevOOo/qa/unoapi/qadevOOo.sce b/qadevOOo/qa/unoapi/qadevOOo.sce
deleted file mode 100644
index 34958d270804..000000000000
--- a/qadevOOo/qa/unoapi/qadevOOo.sce
+++ /dev/null
@@ -1,18 +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 .
-#
--o qadevOOo.SelfTest
diff --git a/qadevOOo/runner/lib/MultiMethodTest.java b/qadevOOo/runner/lib/MultiMethodTest.java
index fd27c42dc00a..75c2a163c8a9 100644
--- a/qadevOOo/runner/lib/MultiMethodTest.java
+++ b/qadevOOo/runner/lib/MultiMethodTest.java
@@ -138,66 +138,61 @@ public class MultiMethodTest
this.tRes = new TestResult();
Class testedClass;
- // Some fake code for a self test.
- // For normal test we must not be a "ifc.qadevooo._SelfTest"
- if (! ("ifc.qadevooo._SelfTest").equals(entry.entryName))
+ getInterfaceName();
+ System.out.print("checking: [" + entry.longName + "]");
+
+ // defining a name of the class corresponding to the tested interface
+ // or service
+ String testedClassName;
+
+ testedClassName = getTestedClassName();
+
+ if (entry.EntryType.equals("service"))
{
- getInterfaceName();
- System.out.print("checking: [" + entry.longName + "]");
+ testedClassName = "com.sun.star.beans.XPropertySet";
+ }
- // defining a name of the class corresponding to the tested interface
- // or service
- String testedClassName;
+ try
+ {
+ testedClass = Class.forName(testedClassName);
+ }
+ catch (ClassNotFoundException cnfE)
+ {
+ System.out.println();
+ cnfE.printStackTrace(log);
+ log.println("could not find a class : " + getTestedClassName());
+ return null;
+ }
+ System.out.println(" is iface: [" + testedClassName + "] testcode: [" + entry.entryName + "]");
- testedClassName = getTestedClassName();
+ Object oObj = UnoRuntime.queryInterface(testedClass, tEnv.getTestObject());
- if (entry.EntryType.equals("service"))
+ if (oObj == null)
+ {
+ if (entry.isOptional)
{
- testedClassName = "com.sun.star.beans.XPropertySet";
+ Summarizer.summarizeDown(entry, "Not supported but optional.OK");
+ }
+ else
+ {
+ Summarizer.summarizeDown(entry, "queryInterface returned null.FAILED");
+ entry.ErrorMsg = "queryInterface returned null";
+ entry.hasErrorMsg = true;
}
- try
- {
- testedClass = Class.forName(testedClassName);
- }
- catch (ClassNotFoundException cnfE)
- {
- System.out.println();
- cnfE.printStackTrace(log);
- log.println("could not find a class : " + getTestedClassName());
- return null;
- }
- System.out.println(" is iface: [" + testedClassName + "] testcode: [" + entry.entryName + "]");
+ return null;
+ }
- Object oObj = UnoRuntime.queryInterface(testedClass, tEnv.getTestObject());
-
- if (oObj == null)
- {
- if (entry.isOptional)
- {
- Summarizer.summarizeDown(entry, "Not supported but optional.OK");
- }
- else
- {
- Summarizer.summarizeDown(entry, "queryInterface returned null.FAILED");
- entry.ErrorMsg = "queryInterface returned null";
- entry.hasErrorMsg = true;
- }
-
- return null;
- }
-
- //setting the field oObj
- try
- {
- setField("oObj", oObj);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- setSubStates(e.toString());
- return tRes;
- }
+ //setting the field oObj
+ try
+ {
+ setField("oObj", oObj);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ setSubStates(e.toString());
+ return tRes;
}
// to perform some stuff before all method tests
diff --git a/qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java b/qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java
deleted file mode 100644
index c67dde39b07e..000000000000
--- a/qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java
+++ /dev/null
@@ -1,73 +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 ifc.qadevooo;
-
-import lib.MultiMethodTest;
-
-/**
-* Testing ifc.qadevooo._SelfTest
-* interface methods:
-* testmethod()-* -*/ -public class _SelfTest extends MultiMethodTest -{ - - /** - */ - @Override - public void before() - { - log.println("_SelfTest.before()"); - } - - /** - * Test calls the method - */ - public void _testmethod() - { - log.println("_SelfTest._testmethod()"); - tRes.tested("testmethod()", true); - } - - public void _testmethod2() - { - log.println("_SelfTest._testmethod2()"); - tRes.tested("testmethod2()", true); - } - - public void _testmethod3() - { - log.println("_SelfTest._testmethod3()"); - tRes.tested("testmethod3()", true); - } - - /** - * Forces object environment recreation. - */ - @Override - public void after() - { - log.println("_SelfTest.after()"); - this.disposeEnvironment() ; - } -} - diff --git a/qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java b/qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java deleted file mode 100644 index bc7b0d9fa01b..000000000000 --- a/qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java +++ /dev/null @@ -1,85 +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 mod._qadevOOo; - -import com.sun.star.uno.XInterface; - -import java.io.PrintWriter; - -import lib.StatusException; -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - -import util.SOfficeFactory; - -import com.sun.star.text.XSimpleText; -import com.sun.star.text.XTextCursor; -import com.sun.star.text.XTextDocument; - -public class SelfTest extends TestCase -{ - private XTextDocument xTextDoc = null; - - @Override - protected void initialize(TestParameters tParam, PrintWriter log) - { - // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF()); - - log.println("initialize the selftest"); - try - { - log.println("creating a textdocument"); - xTextDoc = SOF.createTextDoc(null); - } - catch (com.sun.star.uno.Exception e) - { - e.printStackTrace(log); - throw new StatusException("Couldn't create document", e); - } - } - - /** - * Disposes text document. - */ - @Override - protected void cleanup(TestParameters tParam, PrintWriter log) - { - log.println(" cleanup selftest"); - util.DesktopTools.closeDoc(xTextDoc); - } - - @Override - protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) - { - XInterface oObj = null; - log.println("creating a test environment"); - - // get the bodytext of textdocument here - log.println("getting the TextCursor"); - - final XSimpleText aText = xTextDoc.getText(); - final XTextCursor textCursor = aText.createTextCursor(); - oObj = textCursor; - - TestEnvironment tEnv = new TestEnvironment(oObj); - - return tEnv; - } -}