Kaydet (Commit) fced5de4 authored tarafından Samuel Mehrbrodt's avatar Samuel Mehrbrodt Kaydeden (comit) Thorsten Behrens

Remove no longer relevant qadevOOo/qa

Change-Id: Ic1cee9e61d31a6ee8f248c7e976c5eca8e0d86bd
Reviewed-on: https://gerrit.libreoffice.org/29233Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
üst 6d9f07d5
...@@ -511,7 +511,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ ...@@ -511,7 +511,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/presentation/_XCustomPresentationSupplier \ qadevOOo/tests/java/ifc/presentation/_XCustomPresentationSupplier \
qadevOOo/tests/java/ifc/presentation/_XPresentation \ qadevOOo/tests/java/ifc/presentation/_XPresentation \
qadevOOo/tests/java/ifc/presentation/_XPresentationSupplier \ qadevOOo/tests/java/ifc/presentation/_XPresentationSupplier \
qadevOOo/tests/java/ifc/qadevooo/_SelfTest \
qadevOOo/tests/java/ifc/reflection/_XIdlReflection \ qadevOOo/tests/java/ifc/reflection/_XIdlReflection \
qadevOOo/tests/java/ifc/reflection/_XProxyFactory \ qadevOOo/tests/java/ifc/reflection/_XProxyFactory \
qadevOOo/tests/java/ifc/reflection/_XTypeDescriptionEnumerationAccess \ qadevOOo/tests/java/ifc/reflection/_XTypeDescriptionEnumerationAccess \
...@@ -1009,7 +1008,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ ...@@ -1009,7 +1008,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel \ qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel \
qadevOOo/tests/java/mod/_proxyfac/ProxyFactory \ qadevOOo/tests/java/mod/_proxyfac/ProxyFactory \
qadevOOo/tests/java/mod/_proxyfac/uno/ProxyFactory \ qadevOOo/tests/java/mod/_proxyfac/uno/ProxyFactory \
qadevOOo/tests/java/mod/_qadevOOo/SelfTest \
qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider \ qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider \
qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider \ qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider \
qadevOOo/tests/java/mod/_remotebridge/uno/various \ qadevOOo/tests/java/mod/_remotebridge/uno/various \
......
# -*- 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:
...@@ -15,8 +15,4 @@ $(eval $(call gb_Module_add_targets,qadevOOo,\ ...@@ -15,8 +15,4 @@ $(eval $(call gb_Module_add_targets,qadevOOo,\
)) ))
endif endif
$(eval $(call gb_Module_add_subsequentcheck_targets,qadevOOo,\
JunitTest_qadevOOo_unoapi \
))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
# "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()"
/*
* 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();
}
/*
* 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() {}
}
/*
* 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);
}
}
}
#
# 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
/*
* 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();
}
#
# 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
...@@ -138,66 +138,61 @@ public class MultiMethodTest ...@@ -138,66 +138,61 @@ public class MultiMethodTest
this.tRes = new TestResult(); this.tRes = new TestResult();
Class<?> testedClass; Class<?> testedClass;
// Some fake code for a self test. getInterfaceName();
// For normal test we must not be a "ifc.qadevooo._SelfTest" System.out.print("checking: [" + entry.longName + "]");
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")) // defining a name of the class corresponding to the tested interface
{ // or service
testedClassName = "com.sun.star.beans.XPropertySet"; String testedClassName;
}
try testedClassName = getTestedClassName();
{
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 + "]");
Object oObj = UnoRuntime.queryInterface(testedClass, tEnv.getTestObject()); if (entry.EntryType.equals("service"))
{
testedClassName = "com.sun.star.beans.XPropertySet";
}
if (oObj == null) try
{ {
if (entry.isOptional) testedClass = Class.forName(testedClassName);
{ }
Summarizer.summarizeDown(entry, "Not supported but optional.OK"); catch (ClassNotFoundException cnfE)
} {
else System.out.println();
{ cnfE.printStackTrace(log);
Summarizer.summarizeDown(entry, "queryInterface returned null.FAILED"); log.println("could not find a class : " + getTestedClassName());
entry.ErrorMsg = "queryInterface returned null"; return null;
entry.hasErrorMsg = true; }
} System.out.println(" is iface: [" + testedClassName + "] testcode: [" + entry.entryName + "]");
return null; Object oObj = UnoRuntime.queryInterface(testedClass, tEnv.getTestObject());
}
//setting the field oObj if (oObj == null)
try {
if (entry.isOptional)
{ {
setField("oObj", oObj); Summarizer.summarizeDown(entry, "Not supported but optional.OK");
} }
catch (Exception e) else
{ {
e.printStackTrace(); Summarizer.summarizeDown(entry, "queryInterface returned null.FAILED");
setSubStates(e.toString()); entry.ErrorMsg = "queryInterface returned null";
return tRes; 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 // to perform some stuff before all method tests
......
/*
* 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() ;
}
}
/*
* 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;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment