[Libreoffice-commits] core.git: qadevOOo/Jar_OOoRunner.mk qadevOOo/JunitTest_qadevOOo_unoapi.mk qadevOOo/Module_qadevOOo.mk qadevOOo/objdsc qadevOOo/qa qadevOOo/runner qadevOOo/tests
Samuel Mehrbrodt
Samuel.Mehrbrodt at cib.de
Mon Oct 10 10:40:58 UTC 2016
qadevOOo/Jar_OOoRunner.mk | 2
qadevOOo/JunitTest_qadevOOo_unoapi.mk | 31 --
qadevOOo/Module_qadevOOo.mk | 4
qadevOOo/objdsc/qadevOOo/bogus.SelfTest.csv | 7
qadevOOo/qa/complex/junitskeleton/Skeleton.java | 181 ------------
qadevOOo/qa/complex/junitskeleton/TestDocument.java | 32 --
qadevOOo/qa/complex/junitskeleton/justatest.java | 43 --
qadevOOo/qa/complex/junitskeleton/makefile.mk | 54 ---
qadevOOo/qa/complex/junitskeleton/test_documents/README.txt | 1
qadevOOo/qa/unoapi/Test.java | 48 ---
qadevOOo/qa/unoapi/knownissues.xcl | 1
qadevOOo/qa/unoapi/qadevOOo.sce | 18 -
qadevOOo/runner/lib/MultiMethodTest.java | 95 ++----
qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java | 73 ----
qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java | 85 -----
15 files changed, 45 insertions(+), 630 deletions(-)
New commits:
commit fced5de4b44f949f7a203a68a3df1d6f3293b183
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date: Fri Sep 23 17:36:45 2016 +0200
Remove no longer relevant qadevOOo/qa
Change-Id: Ic1cee9e61d31a6ee8f248c7e976c5eca8e0d86bd
Reviewed-on: https://gerrit.libreoffice.org/29233
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 2c21d7d..7708c34 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -511,7 +511,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/presentation/_XCustomPresentationSupplier \
qadevOOo/tests/java/ifc/presentation/_XPresentation \
qadevOOo/tests/java/ifc/presentation/_XPresentationSupplier \
- qadevOOo/tests/java/ifc/qadevooo/_SelfTest \
qadevOOo/tests/java/ifc/reflection/_XIdlReflection \
qadevOOo/tests/java/ifc/reflection/_XProxyFactory \
qadevOOo/tests/java/ifc/reflection/_XTypeDescriptionEnumerationAccess \
@@ -1009,7 +1008,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel \
qadevOOo/tests/java/mod/_proxyfac/ProxyFactory \
qadevOOo/tests/java/mod/_proxyfac/uno/ProxyFactory \
- qadevOOo/tests/java/mod/_qadevOOo/SelfTest \
qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider \
qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider \
qadevOOo/tests/java/mod/_remotebridge/uno/various \
diff --git a/qadevOOo/JunitTest_qadevOOo_unoapi.mk b/qadevOOo/JunitTest_qadevOOo_unoapi.mk
deleted file mode 100644
index 9868ab7..0000000
--- a/qadevOOo/JunitTest_qadevOOo_unoapi.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_JunitTest_JunitTest,qadevOOo_unoapi))
-
-$(eval $(call gb_JunitTest_set_defs,qadevOOo_unoapi,\
- $$(DEFS) \
- -Dorg.openoffice.test.arg.sce=$(SRCDIR)/qadevOOo/qa/unoapi/qadevOOo.sce \
- -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/qadevOOo/qa/unoapi/knownissues.xcl \
- -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/qadevOOo/qa/unoapi/testdocuments \
-))
-
-$(eval $(call gb_JunitTest_use_jars,qadevOOo_unoapi,\
- OOoRunner \
- ridl \
- test \
- unoil \
- jurt \
-))
-
-$(eval $(call gb_JunitTest_add_classes,qadevOOo_unoapi,\
- org.openoffice.test.UnoApiTest \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/qadevOOo/Module_qadevOOo.mk b/qadevOOo/Module_qadevOOo.mk
index 3093a18..3a97b53 100644
--- a/qadevOOo/Module_qadevOOo.mk
+++ b/qadevOOo/Module_qadevOOo.mk
@@ -15,8 +15,4 @@ $(eval $(call gb_Module_add_targets,qadevOOo,\
))
endif
-$(eval $(call gb_Module_add_subsequentcheck_targets,qadevOOo,\
- JunitTest_qadevOOo_unoapi \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/qadevOOo/objdsc/qadevOOo/bogus.SelfTest.csv b/qadevOOo/objdsc/qadevOOo/bogus.SelfTest.csv
deleted file mode 100644
index 3983a1e..0000000
--- a/qadevOOo/objdsc/qadevOOo/bogus.SelfTest.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-# "Name";
-# "com::sun::star::" will overread
-# method name which is called
-"SelfTest";"com::sun::star::qadevooo::SelfTest";"testmethod()"
-"SelfTest";"com::sun::star::qadevooo::SelfTest";"testmethod2()"
-"SelfTest";"com::sun::star::qadevooo::SelfTest";"testmethod3()"
-# "SelfTest";"com::sun::star::qadevooo::SelfTest#optional";"testmethod4_bogus()"
diff --git a/qadevOOo/qa/complex/junitskeleton/Skeleton.java b/qadevOOo/qa/complex/junitskeleton/Skeleton.java
deleted file mode 100644
index e15a29c..0000000
--- a/qadevOOo/qa/complex/junitskeleton/Skeleton.java
+++ /dev/null
@@ -1,181 +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.junitskeleton;
-
-import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.util.XCloseable;
-import java.io.File;
-import java.io.RandomAccessFile;
-
-import lib.TestParameters;
-
-import util.SOfficeFactory;
-
-// ---------- junit imports -----------------
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.openoffice.test.OfficeConnection;
-import static org.junit.Assert.*;
-
-
-public class Skeleton
-{
- /**
- * The test parameters
- */
- private static TestParameters param = null;
-
- @Test public void check() {
- assertTrue("Couldn't open document", open());
- System.out.println("check");
- assertTrue("Couldn't close document", close());
- String tempDirURL = util.utils.getOfficeTemp/*Dir*/(getMSF());
- System.out.println("temp dir URL is: " + tempDirURL);
- String tempDir = graphical.FileHelper.getSystemPathFromFileURL(tempDirURL);
- assertTrue("Temp directory doesn't exist.", new File(tempDir).exists());
- }
-
- private boolean open()
- {
- System.out.println("open()");
- // get multiservicefactory -----------------------------------------
- final XMultiServiceFactory xMsf = getMSF();
-
- SOfficeFactory.getFactory(xMsf);
-
- // some Tests need the qadevOOo TestParameters, it is like a Hashmap for Properties.
- param = new TestParameters();
- param.put("ServiceFactory", xMsf); // some qadevOOo functions need the ServiceFactory
-
- return true;
- }
-
- private boolean close()
- {
- System.out.println("close()");
- return true;
- }
-
- // marked as test
- @Test public void checkDocument()
- {
- System.out.println("checkDocument()");
- final String sREADME = TestDocument.getUrl("README.txt");
- System.out.println("README is in:" + sREADME);
- File aFile = new File(sREADME);
- if (! aFile.exists())
- {
- // It is a little bit stupid that office urls not compatible to java file urls
- System.out.println("java.io.File can't access Office file urls.");
- String sREADMESystemPath = graphical.FileHelper.getSystemPathFromFileURL(sREADME);
- aFile = new File(sREADMESystemPath);
- assertTrue("File '" + sREADMESystemPath + "' doesn't exists.", aFile.exists());
- }
-
- try
- {
- RandomAccessFile aAccess = new RandomAccessFile(aFile, "r");
- long nLength = aAccess.length();
- System.out.println("File length: " + nLength);
- assertTrue("File length wrong", nLength > 0);
- String sLine = aAccess.readLine();
- assertTrue("Line must not be empty", sLine.length() > 0);
- System.out.println(" Line: '" + sLine + "'");
- System.out.println(" length: " + sLine.length());
- assertTrue("File length not near equal to string length", sLine.length() + 2 >= nLength);
- aAccess.close();
- }
- catch (java.io.FileNotFoundException e)
- {
- fail("Can't find file: " + sREADME + " - " + e.getMessage());
- }
- catch (java.io.IOException e)
- {
- fail("IO Exception: " + e.getMessage());
- }
-
- }
-
- @Test public void checkOpenDocumentWithOffice()
- {
- SOfficeFactory SOF = SOfficeFactory.getFactory(getMSF());
- final String sREADME = TestDocument.getUrl("README.txt");
- try
- {
- XComponent aDocument = SOF.loadDocument(sREADME);
- complex.junitskeleton.justatest.shortWait();
- XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, aDocument);
- xClose.close(true);
- }
- catch (com.sun.star.lang.IllegalArgumentException ex)
- {
- fail("Illegal argument exception caught: " + ex.getMessage());
- }
- catch (com.sun.star.io.IOException ex)
- {
- fail("IOException caught: " + ex.getMessage());
- }
- catch (com.sun.star.uno.Exception ex)
- {
- fail("Exception caught: " + ex.getMessage());
- }
- }
-
- // marked as prepare for test, will call before every test
- @Before public void before()
- {
- System.out.println("before()");
- System.setProperty("THIS IS A TEST", "Hallo");
- }
-
-
- // marked as post for test, will call after every test
- @After public void after()
- {
- System.out.println("after()");
- String sValue = System.getProperty("THIS IS A TEST");
- assertEquals(sValue, "Hallo");
- }
-
-
- private XMultiServiceFactory getMSF()
- {
- return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
- }
-
- // setup and close connections
- @BeforeClass public static void setUpConnection() throws Exception {
- System.out.println("setUpConnection()");
- connection.setUp();
- }
-
- @AfterClass public static void tearDownConnection()
- throws InterruptedException, com.sun.star.uno.Exception
- {
- System.out.println("tearDownConnection()");
- connection.tearDown();
- }
-
- private static final OfficeConnection connection = new OfficeConnection();
-
-}
diff --git a/qadevOOo/qa/complex/junitskeleton/TestDocument.java b/qadevOOo/qa/complex/junitskeleton/TestDocument.java
deleted file mode 100644
index 4b68138..0000000
--- a/qadevOOo/qa/complex/junitskeleton/TestDocument.java
+++ /dev/null
@@ -1,32 +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.junitskeleton;
-
-import java.io.File;
-import org.openoffice.test.OfficeFileUrl;
-
-final class TestDocument
-{
- public static String getUrl(String name)
- {
- return OfficeFileUrl.getAbsolute(new File("test_documents", name));
- }
-
- private TestDocument() {}
-}
diff --git a/qadevOOo/qa/complex/junitskeleton/justatest.java b/qadevOOo/qa/complex/junitskeleton/justatest.java
deleted file mode 100644
index ccd3278..0000000
--- a/qadevOOo/qa/complex/junitskeleton/justatest.java
+++ /dev/null
@@ -1,43 +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.junitskeleton;
-
-public class justatest {
-
- public justatest() {
- System.out.println("justatest CTor.");
- }
-
- public void testfkt() {
- System.out.println("Test called.");
- }
-
- /**
- * Sleeps for 0.5 sec. to allow StarOffice to react on <code>
- * reset</code> 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 ff513ed..0000000
--- 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 775f01c..0000000
--- 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 e6b8120..0000000
--- 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 02c5090..0000000
--- 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 34958d2..0000000
--- 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 fd27c42..75c2a16 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();
+ getInterfaceName();
+ System.out.print("checking: [" + entry.longName + "]");
- if (entry.EntryType.equals("service"))
- {
- 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"))
+ {
+ testedClassName = "com.sun.star.beans.XPropertySet";
+ }
- 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;
- }
+ 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());
- //setting the field oObj
- try
+ if (oObj == null)
+ {
+ if (entry.isOptional)
{
- setField("oObj", oObj);
+ Summarizer.summarizeDown(entry, "Not supported but optional.OK");
}
- catch (Exception e)
+ else
{
- e.printStackTrace();
- setSubStates(e.toString());
- return tRes;
+ 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;
}
// 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 c67dde3..0000000
--- 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 <code>ifc.qadevooo._SelfTest</code>
-* interface methods:
-* <ul>
-* <li><code>testmethod()</code></li>
-* </ul> <p>
-*
-*/
-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 bc7b0d9..0000000
--- 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;
- }
-}
More information about the Libreoffice-commits
mailing list