[Libreoffice-commits] .: 23 commits - bridges/test connectivity/com connectivity/Jar_sdbc_hsqldb.mk connectivity/org dbaccess/qa extensions/JunitTest_extensions_unoapi.mk extensions/Module_extensions.mk extensions/qa extensions/test odk/examples qadevOOo/Jar_OOoRunner.mk qadevOOo/qa qadevOOo/tests scripting/workben sfx2/JunitTest_sfx2_unoapi.mk sfx2/qa stoc/test testtools/qa testtools/source toolkit/test unotest/Jar_test.mk unotest/source vcl/qa
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Sep 5 12:04:13 PDT 2012
bridges/test/com/sun/star/lib/TestBed.java | 223 ----
bridges/test/com/sun/star/lib/makefile.mk | 27
bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug107753_Test.java | 385 --------
bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug108825_Test.java | 154 ---
bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug110892_Test.java | 115 --
bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug111153_Test.java | 94 --
bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug114133_Test.java | 67 -
bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug51323_Test.java | 75 -
bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug92174_Test.java | 90 -
bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug97697_Test.java | 96 --
bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug98508_Test.idl | 28
bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug98508_Test.java | 95 --
bridges/test/com/sun/star/lib/uno/bridges/java_remote/MethodIdTest.java | 464 ----------
bridges/test/com/sun/star/lib/uno/bridges/java_remote/PolyStructTest.idl | 43
bridges/test/com/sun/star/lib/uno/bridges/java_remote/PolyStructTest.java | 251 -----
bridges/test/com/sun/star/lib/uno/bridges/java_remote/StopMessageDispatcherTest.java | 99 --
bridges/test/com/sun/star/lib/uno/bridges/java_remote/makefile.mk | 42
bridges/test/java_remote/Bug107753_Test.java | 385 ++++++++
bridges/test/java_remote/Bug108825_Test.java | 154 +++
bridges/test/java_remote/Bug110892_Test.java | 115 ++
bridges/test/java_remote/Bug111153_Test.java | 94 ++
bridges/test/java_remote/Bug114133_Test.java | 67 +
bridges/test/java_remote/Bug51323_Test.java | 75 +
bridges/test/java_remote/Bug92174_Test.java | 90 +
bridges/test/java_remote/Bug97697_Test.java | 96 ++
bridges/test/java_remote/Bug98508_Test.idl | 28
bridges/test/java_remote/Bug98508_Test.java | 95 ++
bridges/test/java_remote/MethodIdTest.java | 464 ++++++++++
bridges/test/java_remote/PolyStructTest.idl | 43
bridges/test/java_remote/PolyStructTest.java | 251 +++++
bridges/test/java_remote/StopMessageDispatcherTest.java | 99 ++
bridges/test/java_remote/makefile.mk | 42
bridges/test/java_uno/acquire/TestAcquire.java | 2
bridges/test/java_uno/acquire/makefile.mk | 2
bridges/test/java_uno/acquire/types.idl | 2
bridges/test/java_uno/any/TestAny.java | 4
bridges/test/java_uno/any/TestJni.java | 5
bridges/test/java_uno/any/TestRemote.java | 7
bridges/test/java_uno/any/makefile.mk | 2
bridges/test/java_uno/equals/TestEquals.java | 2
bridges/test/java_uno/nativethreadpool/Relay.java | 2
bridges/test/java_uno/nativethreadpool/makefile.mk | 2
bridges/test/java_uno/nativethreadpool/types.idl | 2
bridges/test/lib/TestBed.java | 223 ++++
bridges/test/lib/makefile.mk | 27
bridges/test/makefile.mk | 2
bridges/test/testclient.java | 4
connectivity/Jar_sdbc_hsqldb.mk | 2
connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java | 64 -
connectivity/org/hsqldb/lib/FileSystemRuntimeException.java | 64 +
dbaccess/qa/unoapi/Test.java | 55 -
extensions/JunitTest_extensions_unoapi.mk | 31
extensions/Module_extensions.mk | 4
extensions/qa/unoapi/Test.java | 43
extensions/qa/unoapi/makefile.mk | 41
extensions/test/pgp/TestPGP.java | 4
odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java | 2
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java | 2
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java | 2
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/SampleFilter.components | 2
odk/examples/java/EmbedDocument/Container1/EmbedContApp.java | 24
odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java | 4
odk/examples/java/EmbedDocument/EmbeddedObject/Makefile | 2
odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.components | 2
odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java | 4
odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java | 4
odk/examples/java/Inspector/UnoFacetteNode.java | 85 -
odk/examples/java/Storage/StorageFunctionality.java | 2
odk/examples/java/Storage/StorageTest.java | 2
odk/examples/java/Storage/Test01.java | 21
odk/examples/java/Storage/Test02.java | 18
odk/examples/java/Storage/Test03.java | 11
odk/examples/java/Storage/Test04.java | 27
odk/examples/java/Storage/Test05.java | 41
odk/examples/java/Storage/Test06.java | 15
odk/examples/java/Storage/Test07.java | 9
odk/examples/java/Storage/Test08.java | 25
odk/examples/java/Storage/Test09.java | 9
odk/examples/java/Storage/TestHelper.java | 26
qadevOOo/Jar_OOoRunner.mk | 58 -
qadevOOo/qa/unoapi/Test.java | 2
qadevOOo/qa/unoapi/makefile.mk | 41
qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java | 113 --
qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java | 111 ++
qadevOOo/tests/java/mod/_bridgefac.uno/BridgeFactory.java | 107 --
qadevOOo/tests/java/mod/_bridgefac.uno/package.html | 23
qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java | 105 ++
qadevOOo/tests/java/mod/_bridgefac/uno/package.html | 23
qadevOOo/tests/java/mod/_connector.uno/Connector.java | 113 --
qadevOOo/tests/java/mod/_connector.uno/package.html | 23
qadevOOo/tests/java/mod/_connector/uno/Connector.java | 111 ++
qadevOOo/tests/java/mod/_connector/uno/package.html | 23
qadevOOo/tests/java/mod/_corereflection.uno/CoreReflection.java | 74 -
qadevOOo/tests/java/mod/_corereflection.uno/package.html | 23
qadevOOo/tests/java/mod/_corereflection/uno/CoreReflection.java | 73 +
qadevOOo/tests/java/mod/_corereflection/uno/package.html | 23
qadevOOo/tests/java/mod/_implreg.uno/ImplementationRegistration.java | 72 -
qadevOOo/tests/java/mod/_implreg.uno/package.html | 23
qadevOOo/tests/java/mod/_implreg/uno/ImplementationRegistration.java | 71 +
qadevOOo/tests/java/mod/_implreg/uno/package.html | 23
qadevOOo/tests/java/mod/_introspection.uno/Introspection.java | 67 -
qadevOOo/tests/java/mod/_introspection.uno/package.html | 23
qadevOOo/tests/java/mod/_introspection/uno/Introspection.java | 67 +
qadevOOo/tests/java/mod/_introspection/uno/package.html | 23
qadevOOo/tests/java/mod/_invocadapt.uno/InvocationAdapterFactory.java | 65 -
qadevOOo/tests/java/mod/_invocadapt.uno/package.html | 23
qadevOOo/tests/java/mod/_invocadapt/uno/InvocationAdapterFactory.java | 65 +
qadevOOo/tests/java/mod/_invocadapt/uno/package.html | 23
qadevOOo/tests/java/mod/_invocation.uno/Invocation.java | 95 --
qadevOOo/tests/java/mod/_invocation.uno/package.html | 23
qadevOOo/tests/java/mod/_invocation/uno/Invocation.java | 95 ++
qadevOOo/tests/java/mod/_invocation/uno/package.html | 23
qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader.java | 87 -
qadevOOo/tests/java/mod/_javaloader/uno/JavaComponentLoader.java | 87 +
qadevOOo/tests/java/mod/_javavm.uno/JavaVirtualMachine.java | 66 -
qadevOOo/tests/java/mod/_javavm.uno/package.html | 6
qadevOOo/tests/java/mod/_javavm/uno/JavaVirtualMachine.java | 66 +
qadevOOo/tests/java/mod/_javavm/uno/package.html | 6
qadevOOo/tests/java/mod/_namingservice.uno/NamingService.java | 90 -
qadevOOo/tests/java/mod/_namingservice/uno/NamingService.java | 90 +
qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java | 189 ----
qadevOOo/tests/java/mod/_nestedreg.uno/package.html | 23
qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java | 189 ++++
qadevOOo/tests/java/mod/_nestedreg/uno/package.html | 23
qadevOOo/tests/java/mod/_proxyfac.uno/ProxyFactory.java | 67 -
qadevOOo/tests/java/mod/_proxyfac/uno/ProxyFactory.java | 67 +
qadevOOo/tests/java/mod/_regtypeprov.uno/RegistryTypeDescriptionProvider.java | 117 --
qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java | 117 ++
qadevOOo/tests/java/mod/_remotebridge.uno/various.java | 300 ------
qadevOOo/tests/java/mod/_remotebridge/uno/various.java | 300 ++++++
qadevOOo/tests/java/mod/_servicemgr.uno/OServiceManager.java | 160 ---
qadevOOo/tests/java/mod/_servicemgr.uno/package.html | 23
qadevOOo/tests/java/mod/_servicemgr/uno/OServiceManager.java | 160 +++
qadevOOo/tests/java/mod/_servicemgr/uno/package.html | 23
qadevOOo/tests/java/mod/_shlibloader.uno/DLLComponentLoader.java | 108 --
qadevOOo/tests/java/mod/_shlibloader.uno/package.html | 23
qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java | 108 ++
qadevOOo/tests/java/mod/_shlibloader/uno/package.html | 23
qadevOOo/tests/java/mod/_simplereg.uno/SimpleRegistry.java | 154 ---
qadevOOo/tests/java/mod/_simplereg.uno/package.html | 23
qadevOOo/tests/java/mod/_simplereg/uno/SimpleRegistry.java | 154 +++
qadevOOo/tests/java/mod/_simplereg/uno/package.html | 23
qadevOOo/tests/java/mod/_streams.uno/DataInputStream.java | 185 ---
qadevOOo/tests/java/mod/_streams.uno/DataOutputStream.java | 170 ---
qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java | 135 --
qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java | 195 ----
qadevOOo/tests/java/mod/_streams.uno/ObjectInputStream.java | 287 ------
qadevOOo/tests/java/mod/_streams.uno/ObjectOutputStream.java | 308 ------
qadevOOo/tests/java/mod/_streams.uno/Pipe.java | 102 --
qadevOOo/tests/java/mod/_streams.uno/Pump.java | 178 ---
qadevOOo/tests/java/mod/_streams.uno/package.html | 23
qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java | 185 +++
qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java | 170 +++
qadevOOo/tests/java/mod/_streams/uno/MarkableInputStream.java | 135 ++
qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java | 195 ++++
qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java | 287 ++++++
qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java | 308 ++++++
qadevOOo/tests/java/mod/_streams/uno/Pipe.java | 102 ++
qadevOOo/tests/java/mod/_streams/uno/Pump.java | 178 +++
qadevOOo/tests/java/mod/_streams/uno/package.html | 23
qadevOOo/tests/java/mod/_typeconverter.uno/TypeConverter.java | 57 -
qadevOOo/tests/java/mod/_typeconverter.uno/package.html | 23
qadevOOo/tests/java/mod/_typeconverter/uno/TypeConverter.java | 57 +
qadevOOo/tests/java/mod/_typeconverter/uno/package.html | 23
qadevOOo/tests/java/mod/_typemgr.uno/TypeDescriptionManager.java | 75 -
qadevOOo/tests/java/mod/_typemgr.uno/package.html | 23
qadevOOo/tests/java/mod/_typemgr/uno/TypeDescriptionManager.java | 75 +
qadevOOo/tests/java/mod/_typemgr/uno/package.html | 23
qadevOOo/tests/java/mod/_uuresolver.uno/UnoUrlResolver.java | 59 -
qadevOOo/tests/java/mod/_uuresolver.uno/package.html | 23
qadevOOo/tests/java/mod/_uuresolver/uno/UnoUrlResolver.java | 59 +
qadevOOo/tests/java/mod/_uuresolver/uno/package.html | 23
scripting/workben/ifc/scripting/ScriptingUtils.java | 2
scripting/workben/ifc/scripting/SecurityDialogUtil.java | 6
scripting/workben/ifc/scripting/_XFunction.java | 2
scripting/workben/ifc/scripting/_XFunctionProvider.java | 2
scripting/workben/ifc/scripting/_XScriptInfo.java | 2
scripting/workben/ifc/scripting/_XScriptInfoAccess.java | 6
scripting/workben/ifc/scripting/_XScriptInvocation.java | 6
scripting/workben/ifc/scripting/_XScriptNameResolver.java | 4
scripting/workben/ifc/scripting/_XScriptSecurity.java | 14
scripting/workben/ifc/scripting/_XScriptStorageManager.java | 4
scripting/workben/ifc/scripting/_XScriptStorageRefresh.java | 2
scripting/workben/mod/_scripting/Dispatch.java | 4
scripting/workben/mod/_scripting/Function.java | 2
scripting/workben/mod/_scripting/FunctionProvider.java | 2
scripting/workben/mod/_scripting/ScriptInfo.java | 2
scripting/workben/mod/_scripting/ScriptRuntimeManager.java | 3
scripting/workben/mod/_scripting/ScriptStorage.java | 2
scripting/workben/mod/_scripting/ScriptStorageManager.java | 2
sfx2/JunitTest_sfx2_unoapi.mk | 6
sfx2/qa/unoapi/Test.java | 45
stoc/test/javavm/testapplet/TestApplet.java | 3
testtools/qa/cli/CLITest.java | 2
testtools/qa/cli/makefile.mk | 2
testtools/qa/cliversioning/VersionTestCase.java | 2
testtools/qa/cliversioning/makefile.mk | 2
testtools/source/servicetests/LocalServiceTest.java | 2
testtools/source/servicetests/RemoteServiceTest.java | 2
testtools/source/servicetests/TestBase.java | 2
testtools/source/servicetests/TestService.java | 2
testtools/source/servicetests/TestService1.idl | 4
testtools/source/servicetests/TestService2.idl | 4
testtools/source/servicetests/XTestService1.idl | 4
testtools/source/servicetests/XTestService2.idl | 4
testtools/source/servicetests/XTestService3.idl | 4
testtools/source/servicetests/XTestService4.idl | 4
testtools/source/servicetests/makefile.mk | 2
toolkit/test/accessibility/ov/StateSetView.java | 8
unotest/Jar_test.mk | 1
unotest/source/java/org/openoffice/test/TestArgument.java | 30
vcl/qa/complex/memCheck/CheckMemoryUsage.java | 35
212 files changed, 6817 insertions(+), 7186 deletions(-)
New commits:
commit 800133e8c89b697f952aeb082686b13e618c45de
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Sep 5 21:00:33 2012 +0200
extensions: convert unoapi test to gbuild
It even seems to run on my system
Change-Id: I0246467b82bec7617d6de7dbad84c45fc279c24c
diff --git a/extensions/JunitTest_extensions_unoapi.mk b/extensions/JunitTest_extensions_unoapi.mk
new file mode 100644
index 0000000..0d98b1e
--- /dev/null
+++ b/extensions/JunitTest_extensions_unoapi.mk
@@ -0,0 +1,31 @@
+# -*- 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,extensions_unoapi))
+
+$(eval $(call gb_JunitTest_set_defs,extensions_unoapi,\
+ $$(DEFS) \
+ -Dorg.openoffice.test.arg.sce=$(SRCDIR)/extensions/qa/unoapi/extensions.sce \
+ -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/extensions/qa/unoapi/knownissues.xcl \
+ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/extensions/qa/unoapi/testdocuments \
+))
+
+$(eval $(call gb_JunitTest_use_jars,extensions_unoapi,\
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
+))
+
+$(eval $(call gb_JunitTest_add_classes,extensions_unoapi,\
+ org.openoffice.test.UnoApiTest \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 0f7b6f1..40ae09b 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -135,4 +135,8 @@ $(eval $(call gb_Module_add_targets,extensions,\
))
endif # OS=MACOSX
+$(eval $(call gb_Module_add_subsequentcheck_targets,extensions,\
+ JunitTest_extensions_unoapi \
+))
+
# vim:set shiftwidth=4 softtabstop=4 noexpandtab:
diff --git a/extensions/qa/unoapi/makefile.mk b/extensions/qa/unoapi/makefile.mk
deleted file mode 100644
index 76c65eb..0000000
--- a/extensions/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,41 +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:
-.ELSE
-
-PRJ = ../..
-PRJNAME = extensions
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/extensions/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
commit b1fd48de5fd7cd6385a63463d914d6d50e154bf9
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Sep 5 20:49:38 2012 +0200
remove some obsolete boilerplate Test.java
Change-Id: I694cff583fddb713a59e5d6b8e15ea06a2be63b6
diff --git a/dbaccess/qa/unoapi/dbaccess/Test.java b/dbaccess/qa/unoapi/dbaccess/Test.java
deleted file mode 100644
index 38ff47f..0000000
--- a/dbaccess/qa/unoapi/dbaccess/Test.java
+++ /dev/null
@@ -1,55 +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.
-************************************************************************/
-
-package unoapi.dbaccess;
-
-import org.openoffice.Runner;
-import org.openoffice.test.OfficeConnection;
-import org.openoffice.test.Argument;
-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() {
- assertTrue(
- Runner.run(
- "-sce", Argument.get("sce"),
- "-xcl", Argument.get("xcl"),
- "-ini", Argument.get("ini"),
- "-tdoc", Argument.get("tdoc"),
- "-cs", connection.getDescription()));
- }
-
- private final OfficeConnection connection = new OfficeConnection();
-}
diff --git a/extensions/qa/unoapi/Test.java b/extensions/qa/unoapi/Test.java
deleted file mode 100644
index ca3e724..0000000
--- a/extensions/qa/unoapi/Test.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 org.openoffice.extensions.qa.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() {
- assertTrue(
- Runner.run(
- "-sce", "extensions.sce", "-cs", connection.getDescription()));
- }
-
- private final OfficeConnection connection = new OfficeConnection();
-}
diff --git a/qadevOOo/qa/unoapi/makefile.mk b/qadevOOo/qa/unoapi/makefile.mk
deleted file mode 100644
index 1f0ec5e..0000000
--- a/qadevOOo/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,41 +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:
-.ELSE
-
-PRJ = ../..
-PRJNAME = qadevOOo
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = 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/sfx2/JunitTest_sfx2_unoapi.mk b/sfx2/JunitTest_sfx2_unoapi.mk
index eb0735f..14da689 100644
--- a/sfx2/JunitTest_sfx2_unoapi.mk
+++ b/sfx2/JunitTest_sfx2_unoapi.mk
@@ -34,12 +34,8 @@ $(eval $(call gb_JunitTest_use_jars,sfx2_unoapi,\
jurt \
))
-$(eval $(call gb_JunitTest_add_sourcefiles,sfx2_unoapi,\
- sfx2/qa/unoapi/Test \
-))
-
$(eval $(call gb_JunitTest_add_classes,sfx2_unoapi,\
- unoapi.Test \
+ org.openoffice.test.UnoApiTest \
))
# vim: set noet sw=4 ts=4:
diff --git a/sfx2/qa/unoapi/Test.java b/sfx2/qa/unoapi/Test.java
deleted file mode 100644
index 4b20ae0..0000000
--- a/sfx2/qa/unoapi/Test.java
+++ /dev/null
@@ -1,45 +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 org.openoffice.test.Argument;
-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() {
- assertTrue(
- Runner.run(
- "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc",
- Argument.get("tdoc"), "-cs", connection.getDescription()));
- }
-
- private final OfficeConnection connection = new OfficeConnection();
-}
commit cd0308ba9c284d6ed336955e758a689bd8028a96
Author: Noel Grandin <noel at peralex.com>
Date: Mon Sep 3 14:04:31 2012 +0200
Java cleanup, make package name match folder name
Change-Id: I4d472f088a370ea99beb621d1b1fd722a9f6f144
diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java b/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java
index efa1b8f..e75d1ee 100644
--- a/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java
+++ b/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java
@@ -16,8 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package org.openoffice.examples.embedding;
-
import java.awt.*;
import java.awt.event.*;
import java.awt.image.*;
@@ -26,8 +24,6 @@ import javax.swing.JFrame;
import java.io.*;
import javax.imageio.ImageIO;
-import org.openoffice.examples.embedding.OwnEmbeddedObject;
-
public class EditorFrame extends JFrame
{
OwnEmbeddedObject m_aEmbObj;
diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/Makefile b/odk/examples/java/EmbedDocument/EmbeddedObject/Makefile
index 62fb17e..59e7186 100755
--- a/odk/examples/java/EmbedDocument/EmbeddedObject/Makefile
+++ b/odk/examples/java/EmbedDocument/EmbeddedObject/Makefile
@@ -59,7 +59,7 @@ COMP_UNOPKG_MANIFEST = $(COMP_GEN_OUT)/META-INF/manifest.xml
COMP_REGISTERFLAG=$(COMP_GEN_OUT)$(PS)java_$(COMP_NAME)_register_component.flag
COMP_COMPONENTS=$(COMP_NAME).components
-PACKAGE = org/openoffice/examples/embedding
+PACKAGE =
COMP_JAVAFILES =\
OwnEmbeddedObject.java\
diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.components b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.components
index 421706f..a77b099 100644
--- a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.components
+++ b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.components
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<components xmlns="http://openoffice.org/2010/uno-components">
<component loader="com.sun.star.loader.Java2" uri="OwnEmbeddedObject.uno.jar">
- <implementation name="org.openoffice.examples.embedding.OwnEmbeddedObjectFactory">
+ <implementation name="OwnEmbeddedObjectFactory">
<service name="org.openoffice.examples.embedding.Factory69474366FD6F480683748EDD1B6E771D"/>
</implementation>
</component>
diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java
index cdf6666..5ebb009 100644
--- a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java
+++ b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java
@@ -16,8 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package org.openoffice.examples.embedding;
-
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
import com.sun.star.lang.XMultiComponentFactory;
@@ -42,8 +40,6 @@ import java.awt.Dimension;
import java.lang.Integer;
import org.omg.CORBA.COMM_FAILURE;
-import org.openoffice.examples.embedding.EditorFrame;
-
public final class OwnEmbeddedObject extends WeakBase
implements com.sun.star.embed.XEmbedPersist,
com.sun.star.embed.XEmbeddedObject
diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java
index 882bc59..721703a 100644
--- a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java
+++ b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java
@@ -16,8 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package org.openoffice.examples.embedding;
-
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
import com.sun.star.lib.uno.helper.Factory;
@@ -29,8 +27,6 @@ import com.sun.star.lang.IllegalArgumentException;
import com.sun.star.embed.*;
-import org.openoffice.examples.embedding.OwnEmbeddedObject;
-
public final class OwnEmbeddedObjectFactory extends WeakBase
implements com.sun.star.lang.XServiceInfo,
com.sun.star.embed.XEmbedObjectFactory
commit 39b6fc96fcd8e59431eb12d0abb0305121b8a84d
Author: Noel Grandin <noel at peralex.com>
Date: Mon Sep 3 13:51:41 2012 +0200
Java cleanup, remove dead code
Which doesn't even compile any more.
Change-Id: I44a25ce3bd3b1fa554280b80e3fe88e25f63e8fb
diff --git a/odk/examples/java/Inspector/UnoFacetteNode.java b/odk/examples/java/Inspector/UnoFacetteNode.java
deleted file mode 100644
index 5329612..0000000
--- a/odk/examples/java/Inspector/UnoFacetteNode.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*************************************************************************
- *
- * The Contents of this file are made available subject to the terms of
- * the BSD license.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Sun Microsystems, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *************************************************************************/
-
-import com.sun.star.reflection.XIdlMethod;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.XComponentContext;
-import javax.swing.tree.DefaultMutableTreeNode;
-
-public class UnoFacetteNode extends UnoNode{
- String m_sFilter = "";
-
-
- /** Creates a new instance of UnoMethodNode */
- public UnoFacetteNode(Object _oUnoObject){
- super(_oUnoObject);
- addDummyNode();
- }
-
-
- public String getFilter(){
- return m_sFilter;
- }
-
- public void setFilter(String _sFilter){
- m_sFilter = _sFilter;
- }
-
- public String getName(){
- return toString();
- }
-
-// TODO The implementation of the following nodes is not really robust and should be changed!!!
- public boolean isMethodNode(){
- return ((String) getUserObject()).equals(SMETHODDESCRIPTION);
- }
-
- public boolean isPropertyNode(){
- String sNodeDescription = (String) getUserObject();
- return ((sNodeDescription.equals(SPROPERTYDESCRIPTION)) || (sNodeDescription.equals(SPROPERTYINFODESCRIPTION)) || (sNodeDescription.equals(SPROPERTYVALUEDESCRIPTION)));
- }
-
- public boolean isContainerNode(){
- return ((String) getUserObject()).equals(SCONTAINERDESCRIPTION);
- }
-
- public boolean isServiceNode(){
- return ((String) getUserObject()).equals(SSERVICEDESCRIPTION);
- }
-
- public boolean isInterfaceNode(){
- return ((String) getUserObject()).equals(SINTERFACEDESCRIPTION);
- }
-}
-
commit 8f7848ccd6c43cfedd47d0f5de5ecddd388a9294
Author: Noel Grandin <noel at peralex.com>
Date: Mon Sep 3 13:04:17 2012 +0200
Java cleanup, remove unused class
Change-Id: I27403fabc3b5326108a34655ffe8b2b0846c0694
diff --git a/unotest/Jar_test.mk b/unotest/Jar_test.mk
index 014a835..5e78e91 100644
--- a/unotest/Jar_test.mk
+++ b/unotest/Jar_test.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_Jar_add_sourcefiles,test,\
unotest/source/java/org/openoffice/test/FileHelper \
unotest/source/java/org/openoffice/test/OfficeConnection \
unotest/source/java/org/openoffice/test/OfficeFileUrl \
- unotest/source/java/org/openoffice/test/TestArgument \
unotest/source/java/org/openoffice/test/UnoApiTest \
))
diff --git a/unotest/source/java/org/openoffice/test/TestArgument.java b/unotest/source/java/org/openoffice/test/TestArgument.java
deleted file mode 100644
index adf2490..0000000
--- a/unotest/source/java/org/openoffice/test/TestArgument.java
+++ /dev/null
@@ -1,30 +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 org.openoffice.test;
-
-/** Obtain the value of a test argument (tunneled in via an
- "org.openoffice.test.arg.testarg.<name>" system property).
- */
-public final class TestArgument {
- public static String get(String name) {
- return Argument.get("testarg." + name);
- }
-
- private TestArgument() {}
-}
commit bb257014cdc0374db1a8d9932ba8629ce9aac8f4
Author: Noel Grandin <noel at peralex.com>
Date: Mon Sep 3 10:44:20 2012 +0200
Java cleanup, fix compile errors
Change-Id: Ia16a54432291935125d53de9d7cc010917b8373d
diff --git a/scripting/workben/mod/_scripting/Function.java b/scripting/workben/mod/_scripting/Function.java
index 7aa40a6..21eab2a 100644
--- a/scripting/workben/mod/_scripting/Function.java
+++ b/scripting/workben/mod/_scripting/Function.java
@@ -54,7 +54,7 @@ public class Function extends TestCase {
log.println("creating test environment");
try {
- XMultiServiceFactory xMSF = tParam.getMSF();
+ XMultiServiceFactory xMSF = (XMultiServiceFactory) tParam.getMSF();
SOfficeFactory SOF = null;
SOF = SOfficeFactory.getFactory( xMSF );
String docPath = util.utils.getFullTestURL(doc);
diff --git a/scripting/workben/mod/_scripting/FunctionProvider.java b/scripting/workben/mod/_scripting/FunctionProvider.java
index 278e10d..653a6de 100644
--- a/scripting/workben/mod/_scripting/FunctionProvider.java
+++ b/scripting/workben/mod/_scripting/FunctionProvider.java
@@ -44,7 +44,7 @@ public class FunctionProvider extends TestCase {
log.println("creating test environment");
try {
- XMultiServiceFactory xMSF = tParam.getMSF();
+ XMultiServiceFactory xMSF = (XMultiServiceFactory) tParam.getMSF();
Object xInterface = xMSF.createInstance( "com.sun.star.frame.Desktop" );
XDesktop dtop = ( XDesktop )UnoRuntime.queryInterface( XDesktop.class,
diff --git a/scripting/workben/mod/_scripting/ScriptInfo.java b/scripting/workben/mod/_scripting/ScriptInfo.java
index a0f2333..aff4a55 100644
--- a/scripting/workben/mod/_scripting/ScriptInfo.java
+++ b/scripting/workben/mod/_scripting/ScriptInfo.java
@@ -70,7 +70,7 @@ public class ScriptInfo extends TestCase {
XInterface oObj = null;
XSimpleFileAccess access = null;
try {
- XMultiServiceFactory xMSF = tParam.getMSF();
+ XMultiServiceFactory xMSF = (XMultiServiceFactory) tParam.getMSF();
Object xInterface =
xMSF.createInstance( "com.sun.star.ucb.SimpleFileAccess" );
access = ( XSimpleFileAccess )
diff --git a/scripting/workben/mod/_scripting/ScriptRuntimeManager.java b/scripting/workben/mod/_scripting/ScriptRuntimeManager.java
index 66fb906..4894673 100644
--- a/scripting/workben/mod/_scripting/ScriptRuntimeManager.java
+++ b/scripting/workben/mod/_scripting/ScriptRuntimeManager.java
@@ -19,6 +19,7 @@
package mod._scripting;
import com.sun.star.uno.XInterface;
+import com.sun.star.lang.XMultiServiceFactory;
import java.io.PrintWriter;
import lib.StatusException;
import lib.TestCase;
@@ -38,7 +39,7 @@ public class ScriptRuntimeManager extends TestCase {
XInterface oObj = null;
try {
- oObj = (XInterface) Param.getMSF().createInstance
+ oObj = (XInterface) ((XMultiServiceFactory)Param.getMSF()).createInstance
("drafts.com.sun.star.script.framework.runtime.ScriptRuntimeManager");
} catch (com.sun.star.uno.Exception e) {
throw new StatusException("Can't create object environment", e) ;
diff --git a/scripting/workben/mod/_scripting/ScriptStorage.java b/scripting/workben/mod/_scripting/ScriptStorage.java
index 72decfb..e1c9f01 100644
--- a/scripting/workben/mod/_scripting/ScriptStorage.java
+++ b/scripting/workben/mod/_scripting/ScriptStorage.java
@@ -67,7 +67,7 @@ public class ScriptStorage extends TestCase {
XInterface oObj = null;
XSimpleFileAccess access = null;
try {
- XMultiServiceFactory xMSF = tParam.getMSF();
+ XMultiServiceFactory xMSF = (XMultiServiceFactory) tParam.getMSF();
Object xInterface =
xMSF.createInstance( "com.sun.star.ucb.SimpleFileAccess" );
access = ( XSimpleFileAccess )
diff --git a/scripting/workben/mod/_scripting/ScriptStorageManager.java b/scripting/workben/mod/_scripting/ScriptStorageManager.java
index cc726b9..2f8798c 100644
--- a/scripting/workben/mod/_scripting/ScriptStorageManager.java
+++ b/scripting/workben/mod/_scripting/ScriptStorageManager.java
@@ -42,7 +42,7 @@ public class ScriptStorageManager extends TestCase {
Object oInterface = null;
try {
- XMultiServiceFactory xMSF = Param.getMSF();
+ XMultiServiceFactory xMSF = (XMultiServiceFactory) Param.getMSF();
XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(
XPropertySet.class, xMSF);
// get context
commit bc6a9e9b47d90f550452c5c4a9cd093b1b60bbe6
Author: Noel Grandin <noel at peralex.com>
Date: Mon Sep 3 10:40:41 2012 +0200
Java cleanup, fix compile errors
Change-Id: I2620ccf17a24572b4bd6a79f2410c4b746164b9a
diff --git a/scripting/workben/ifc/scripting/SecurityDialogUtil.java b/scripting/workben/ifc/scripting/SecurityDialogUtil.java
index 90bb94a..2c8ee11 100644
--- a/scripting/workben/ifc/scripting/SecurityDialogUtil.java
+++ b/scripting/workben/ifc/scripting/SecurityDialogUtil.java
@@ -22,8 +22,8 @@ import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.*;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.accessibility.*;
+import com.sun.star.awt.XExtendedToolkit;
// Jsuite classes
import util.AccessibilityTools;
diff --git a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
index 31cc411..cd7c3c0 100644
--- a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
+++ b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
@@ -192,7 +192,7 @@ public class _XScriptInfoAccess extends MultiMethodTest {
log.println(testdata.get("description"));
Object obj = ScriptingUtils.getDefault().getScriptStorage(
- tParam.getMSF(), location);
+ (XMultiServiceFactory) tParam.getMSF(), location);
XScriptInfoAccess access = (XScriptInfoAccess)
UnoRuntime.queryInterface(XScriptInfoAccess.class, obj);
diff --git a/scripting/workben/ifc/scripting/_XScriptInvocation.java b/scripting/workben/ifc/scripting/_XScriptInvocation.java
index 09bde39..ec13d4d 100644
--- a/scripting/workben/ifc/scripting/_XScriptInvocation.java
+++ b/scripting/workben/ifc/scripting/_XScriptInvocation.java
@@ -183,7 +183,7 @@ public class _XScriptInvocation extends MultiMethodTest {
XSimpleFileAccess access = null;
try {
- Object fa = tParam.getMSF().createInstance(
+ Object fa = ((XMultiServiceFactory) tParam.getMSF()).createInstance(
"com.sun.star.ucb.SimpleFileAccess");
access = (XSimpleFileAccess)
@@ -197,7 +197,7 @@ public class _XScriptInvocation extends MultiMethodTest {
private XModel loadDocument(String name) {
XModel model = null;
- SOfficeFactory factory = SOfficeFactory.getFactory(tParam.getMSF());
+ SOfficeFactory factory = SOfficeFactory.getFactory((XMultiServiceFactory) tParam.getMSF());
String fullname = util.utils.getFullTestURL(name);
diff --git a/scripting/workben/ifc/scripting/_XScriptNameResolver.java b/scripting/workben/ifc/scripting/_XScriptNameResolver.java
index a67148c..0a77a3f 100644
--- a/scripting/workben/ifc/scripting/_XScriptNameResolver.java
+++ b/scripting/workben/ifc/scripting/_XScriptNameResolver.java
@@ -163,7 +163,7 @@ public class _XScriptNameResolver extends MultiMethodTest {
XSimpleFileAccess access = null;
try {
- Object fa = tParam.getMSF().createInstance(
+ Object fa = ((XMultiServiceFactory) tParam.getMSF()).createInstance(
"com.sun.star.ucb.SimpleFileAccess");
access = (XSimpleFileAccess)
diff --git a/scripting/workben/ifc/scripting/_XScriptSecurity.java b/scripting/workben/ifc/scripting/_XScriptSecurity.java
index 2ee6233..d2b6b21 100644
--- a/scripting/workben/ifc/scripting/_XScriptSecurity.java
+++ b/scripting/workben/ifc/scripting/_XScriptSecurity.java
@@ -148,7 +148,7 @@ public class _XScriptSecurity extends MultiMethodTest {
{
checkBox = true;
}
- new SecurityDialogUtil( tParam.getMSF(), buttonName, checkBox ).start();
+ new SecurityDialogUtil( (XMultiServiceFactory) tParam.getMSF(), buttonName, checkBox ).start();
}
// need to set up dialog utils thread first
int storageId = getStorageId(location);
@@ -203,7 +203,7 @@ public class _XScriptSecurity extends MultiMethodTest {
{
String result = "";
try {
- Object oProv = tParam.getMSF().createInstance(
+ Object oProv = ((XMultiServiceFactory) tParam.getMSF()).createInstance(
"com.sun.star.configuration.ConfigurationProvider" );
XMultiServiceFactory xProv = (XMultiServiceFactory)
@@ -245,7 +245,7 @@ public class _XScriptSecurity extends MultiMethodTest {
{
boolean success=false;
try {
- Object oProv = tParam.getMSF().createInstance(
+ Object oProv = ((XMultiServiceFactory) tParam.getMSF()).createInstance(
"com.sun.star.configuration.ConfigurationProvider" );
XMultiServiceFactory xProv = (XMultiServiceFactory)
@@ -358,7 +358,7 @@ public class _XScriptSecurity extends MultiMethodTest {
XSimpleFileAccess access = null;
try {
- Object fa = tParam.getMSF().createInstance(
+ Object fa = ((XMultiServiceFactory)tParam.getMSF()).createInstance(
"com.sun.star.ucb.SimpleFileAccess");
access = (XSimpleFileAccess)
@@ -372,7 +372,7 @@ public class _XScriptSecurity extends MultiMethodTest {
private XModel loadDocument(String name) {
XModel model = null;
- SOfficeFactory factory = SOfficeFactory.getFactory(tParam.getMSF());
+ SOfficeFactory factory = SOfficeFactory.getFactory((XMultiServiceFactory) tParam.getMSF());
String fullname = util.utils.getFullTestURL(name);
diff --git a/scripting/workben/ifc/scripting/_XScriptStorageManager.java b/scripting/workben/ifc/scripting/_XScriptStorageManager.java
index 6ec3b5c..1703ea7 100644
--- a/scripting/workben/ifc/scripting/_XScriptStorageManager.java
+++ b/scripting/workben/ifc/scripting/_XScriptStorageManager.java
@@ -244,7 +244,7 @@ public class _XScriptStorageManager extends MultiMethodTest {
XSimpleFileAccess access = null;
try {
- Object fa = tParam.getMSF().createInstance(
+ Object fa = ((XMultiServiceFactory) tParam.getMSF()).createInstance(
"com.sun.star.ucb.SimpleFileAccess");
access = (XSimpleFileAccess)
commit 975866d5920e77b351408494855fa6759e716b72
Author: Noel Grandin <noel at peralex.com>
Date: Mon Sep 3 10:22:20 2012 +0200
Java cleanup, make package name match folder name
Change-Id: I4229ea7a4ad4d669db824e14ee6a8acb2ac205a0
diff --git a/qadevOOo/qa/unoapi/Test.java b/qadevOOo/qa/unoapi/Test.java
index 1c124fc..cecd71c 100644
--- a/qadevOOo/qa/unoapi/Test.java
+++ b/qadevOOo/qa/unoapi/Test.java
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package org.openoffice.qadevOOo.qa.unoapi;
+package unoapi;
import org.openoffice.Runner;
import org.openoffice.test.OfficeConnection;
diff --git a/qadevOOo/qa/unoapi/makefile.mk b/qadevOOo/qa/unoapi/makefile.mk
index 080db7c..1f0ec5e 100644
--- a/qadevOOo/qa/unoapi/makefile.mk
+++ b/qadevOOo/qa/unoapi/makefile.mk
@@ -25,7 +25,7 @@ PRJNAME = qadevOOo
TARGET = qa_unoapi
.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/qadevOOo/qa/unoapi
+PACKAGE = unoapi
JAVATESTFILES = Test.java
JAVAFILES = $(JAVATESTFILES)
JARFILES = OOoRunner.jar ridl.jar test.jar
diff --git a/sfx2/JunitTest_sfx2_unoapi.mk b/sfx2/JunitTest_sfx2_unoapi.mk
index 436ed6e..eb0735f 100644
--- a/sfx2/JunitTest_sfx2_unoapi.mk
+++ b/sfx2/JunitTest_sfx2_unoapi.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sfx2_unoapi,\
))
$(eval $(call gb_JunitTest_add_classes,sfx2_unoapi,\
- org.openoffice.sfx2.qa.unoapi.Test \
+ unoapi.Test \
))
# vim: set noet sw=4 ts=4:
diff --git a/sfx2/qa/unoapi/Test.java b/sfx2/qa/unoapi/Test.java
index b61698e..4b20ae0 100644
--- a/sfx2/qa/unoapi/Test.java
+++ b/sfx2/qa/unoapi/Test.java
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package org.openoffice.sfx2.qa.unoapi;
+package unoapi;
import org.openoffice.Runner;
import org.openoffice.test.OfficeConnection;
diff --git a/testtools/source/servicetests/LocalServiceTest.java b/testtools/source/servicetests/LocalServiceTest.java
index 3d1ef0e..713b912 100644
--- a/testtools/source/servicetests/LocalServiceTest.java
+++ b/testtools/source/servicetests/LocalServiceTest.java
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package testtools.servicetests;
+package servicetests;
import com.sun.star.comp.helper.Bootstrap;
import com.sun.star.container.XSet;
diff --git a/testtools/source/servicetests/RemoteServiceTest.java b/testtools/source/servicetests/RemoteServiceTest.java
index ef01a25..a474e37 100644
--- a/testtools/source/servicetests/RemoteServiceTest.java
+++ b/testtools/source/servicetests/RemoteServiceTest.java
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package testtools.servicetests;
+package servicetests;
import com.sun.star.bridge.XBridgeFactory;
import com.sun.star.bridge.XInstanceProvider;
diff --git a/testtools/source/servicetests/TestBase.java b/testtools/source/servicetests/TestBase.java
index 5677445..f3d2651 100644
--- a/testtools/source/servicetests/TestBase.java
+++ b/testtools/source/servicetests/TestBase.java
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package testtools.servicetests;
+package servicetests;
import com.sun.star.uno.UnoRuntime;
import complexlib.ComplexTestCase;
diff --git a/testtools/source/servicetests/TestService.java b/testtools/source/servicetests/TestService.java
index d563d7b..6124aaa 100644
--- a/testtools/source/servicetests/TestService.java
+++ b/testtools/source/servicetests/TestService.java
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package testtools.servicetests;
+package servicetests;
import com.sun.star.lang.NoSupportException;
import com.sun.star.lang.XServiceInfo;
diff --git a/testtools/source/servicetests/TestService1.idl b/testtools/source/servicetests/TestService1.idl
index adcf6eb..45e56a6 100644
--- a/testtools/source/servicetests/TestService1.idl
+++ b/testtools/source/servicetests/TestService1.idl
@@ -21,7 +21,7 @@
#include <XTestService1.idl>
-module testtools { module servicetests {
+module servicetests {
interface TestService1 {
interface XTestService1;
@@ -41,6 +41,6 @@ interface TestService1 {
[attribute/*, optional*/] long Prop8Long;
};
-}; };
+};
#endif
diff --git a/testtools/source/servicetests/TestService2.idl b/testtools/source/servicetests/TestService2.idl
index 048f633..4319594 100644
--- a/testtools/source/servicetests/TestService2.idl
+++ b/testtools/source/servicetests/TestService2.idl
@@ -24,7 +24,7 @@
#include <XTestService3.idl>
#include <XTestService4.idl>
-module testtools { module servicetests {
+module servicetests {
interface TestService2 {
interface TestService1;
@@ -33,6 +33,6 @@ interface TestService2 {
/*[optional] interface XTestService4;*/
};
-}; };
+};
#endif
diff --git a/testtools/source/servicetests/XTestService1.idl b/testtools/source/servicetests/XTestService1.idl
index 8e949c7..17fd87c 100644
--- a/testtools/source/servicetests/XTestService1.idl
+++ b/testtools/source/servicetests/XTestService1.idl
@@ -21,12 +21,12 @@
#include <com/sun/star/uno/XInterface.idl>
-module testtools { module servicetests {
+module servicetests {
interface XTestService1: com::sun::star::uno::XInterface {
long fn1();
};
-}; };
+};
#endif
diff --git a/testtools/source/servicetests/XTestService2.idl b/testtools/source/servicetests/XTestService2.idl
index 69adba4..081f031 100644
--- a/testtools/source/servicetests/XTestService2.idl
+++ b/testtools/source/servicetests/XTestService2.idl
@@ -21,12 +21,12 @@
#include <com/sun/star/uno/XInterface.idl>
-module testtools { module servicetests {
+module servicetests {
interface XTestService2: com::sun::star::uno::XInterface {
long fn2();
};
-}; };
+};
#endif
diff --git a/testtools/source/servicetests/XTestService3.idl b/testtools/source/servicetests/XTestService3.idl
index d20a660..478454e 100644
--- a/testtools/source/servicetests/XTestService3.idl
+++ b/testtools/source/servicetests/XTestService3.idl
@@ -21,12 +21,12 @@
#include <com/sun/star/uno/XInterface.idl>
-module testtools { module servicetests {
+module servicetests {
interface XTestService3: com::sun::star::uno::XInterface {
long fn3();
};
-}; };
+};
#endif
diff --git a/testtools/source/servicetests/XTestService4.idl b/testtools/source/servicetests/XTestService4.idl
index 9b53e98..7bae274 100644
--- a/testtools/source/servicetests/XTestService4.idl
+++ b/testtools/source/servicetests/XTestService4.idl
@@ -21,12 +21,12 @@
#include <com/sun/star/uno/XInterface.idl>
-module testtools { module servicetests {
+module servicetests {
interface XTestService4: com::sun::star::uno::XInterface {
long fn4();
};
-}; };
+};
#endif
diff --git a/testtools/source/servicetests/makefile.mk b/testtools/source/servicetests/makefile.mk
index f135241..fd59d84 100644
--- a/testtools/source/servicetests/makefile.mk
+++ b/testtools/source/servicetests/makefile.mk
@@ -20,7 +20,7 @@ PRJ := ..$/..
PRJNAME := testtools
TARGET := testtools_servicetests
-PACKAGE := testtools$/servicetests
+PACKAGE := servicetests
JAVATESTFILES := LocalServiceTest.java RemoteServiceTest.java
JAVAFILES := TestBase.java TestService.java
IDLTESTFILES := \
commit bd0ed13efccc6db2e5db8412ae79709343503c60
Author: Noel Grandin <noel at peralex.com>
Date: Mon Sep 3 10:04:14 2012 +0200
Java cleanup, make package name match filter name
Change-Id: I49ac6732650663a33bdc55a22e2870c47c1c509a
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
index 9a8bad5..fd2674d 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
@@ -32,7 +32,7 @@
*
*************************************************************************/
-package OfficeDev.samples.Filter;
+package FilterDevelopment.AsciiFilter;
import com.sun.star.lib.uno.helper.Factory;
import com.sun.star.lib.uno.helper.WeakBase;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java
index 013f93a..b7e560e 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java
@@ -32,7 +32,7 @@
*
*************************************************************************/
-package OfficeDev.samples.Filter;
+package FilterDevelopment.AsciiFilter;
import com.sun.star.uno.AnyConverter;
import com.sun.star.beans.PropertyValue;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/SampleFilter.components b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/SampleFilter.components
index f288f7e..6b2545d 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/SampleFilter.components
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/SampleFilter.components
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<components xmlns="http://openoffice.org/2010/uno-components">
<component loader="com.sun.star.loader.Java2" uri="SampleFilter.uno.jar">
- <implementation name="OfficeDev.samples.Filter.AsciiReplaceFilter$_AsciiReplaceFilter">
+ <implementation name="FilterDevelopment.AsciiFilter.AsciiReplaceFilter$_AsciiReplaceFilter">
<service name="com.sun.star.comp.ansifilter.AsciiReplaceFilter"/>
<service name="com.sun.star.document.ImportFilter"/>
<service name="com.sun.star.document.ExportFilter"/>
commit 110e43cc1b4f864aac2b5bd0da1fa6d0ffbb81fc
Author: Noel Grandin <noel at peralex.com>
Date: Mon Sep 3 09:57:47 2012 +0200
Java cleanup, make package name match folder name
Change-Id: I8807ce7a6f5a115570d61a2a8c216d817d0334be
diff --git a/testtools/qa/cli/CLITest.java b/testtools/qa/cli/CLITest.java
index a30f095..4bfafe1 100644
--- a/testtools/qa/cli/CLITest.java
+++ b/testtools/qa/cli/CLITest.java
@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package clitest;
+package cli;
import complexlib.ComplexTestCase;
diff --git a/testtools/qa/cli/makefile.mk b/testtools/qa/cli/makefile.mk
index 13a63b4..1b56ff7 100644
--- a/testtools/qa/cli/makefile.mk
+++ b/testtools/qa/cli/makefile.mk
@@ -19,7 +19,7 @@
PRJ := ..$/..
PRJNAME := testtools
TARGET := test_cli
-PACKAGE = clitest
+PACKAGE = cli
.INCLUDE: settings.mk
diff --git a/testtools/qa/cliversioning/VersionTestCase.java b/testtools/qa/cliversioning/VersionTestCase.java
index b76aa17..6b6fdc3 100644
--- a/testtools/qa/cliversioning/VersionTestCase.java
+++ b/testtools/qa/cliversioning/VersionTestCase.java
@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package cliversion;
+package cliversioning;
import complexlib.ComplexTestCase;
diff --git a/testtools/qa/cliversioning/makefile.mk b/testtools/qa/cliversioning/makefile.mk
index 329fa15..708e4e4 100644
--- a/testtools/qa/cliversioning/makefile.mk
+++ b/testtools/qa/cliversioning/makefile.mk
@@ -31,7 +31,7 @@
PRJ = ..$/..
PRJNAME = cli_ure
TARGET := qa_test_climaker
-PACKAGE = cliversion
+PACKAGE = cliversioning
.INCLUDE: settings.mk
commit 9dce74e9309ea932537abb13f3c22c26496c4230
Author: Noel Grandin <noel at peralex.com>
Date: Mon Sep 3 09:50:01 2012 +0200
Java cleanup, fix compile errors because of changes in UNO API
Some of the enums have obviously changed names at some point in the
past.
Note that the code still has more compile errors.
Change-Id: Ibb152fa0ee35a0580876e621e42d049541c088bb
diff --git a/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java b/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java
index 63ad80f..a56a2ad 100644
--- a/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java
+++ b/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java
@@ -46,6 +46,8 @@ import com.sun.star.io.XInputStream;
import com.sun.star.io.XOutputStream;
import com.sun.star.io.XTruncate;
+import com.sun.star.util.XCloseable;
+
import com.sun.star.embed.*;
public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClient
@@ -152,20 +154,20 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
try {
int nOldState = m_xEmbedObj.getCurrentState();
int nState = nOldState;
- if ( nOldState == EmbedStates.EMBED_LOADED )
+ if ( nOldState == EmbedStates.LOADED )
{
- m_xEmbedObj.changeState( EmbedStates.EMBED_RUNNING );
- nState = EmbedStates.EMBED_RUNNING;
+ m_xEmbedObj.changeState( EmbedStates.RUNNING );
+ nState = EmbedStates.RUNNING;
}
- if ( nState == EmbedStates.EMBED_ACTIVE || nState == EmbedStates.EMBED_RUNNING )
+ if ( nState == EmbedStates.ACTIVE || nState == EmbedStates.RUNNING )
{
XComponentSupplier xCompProv = (XComponentSupplier)UnoRuntime.queryInterface(
XComponentSupplier.class,
m_xEmbedObj );
if ( xCompProv != null )
{
- XComponent xComp = xCompProv.getComponent();
+ XCloseable xComp = xCompProv.getComponent();
XTransferable xTransfer = (XTransferable)UnoRuntime.queryInterface(
XTransferable.class,
xComp );
@@ -208,7 +210,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
if ( m_xEmbedObj != null )
{
try {
- m_xEmbedObj.changeState( EmbedStates.EMBED_ACTIVE );
+ m_xEmbedObj.changeState( EmbedStates.ACTIVE );
}
catch( Exception ex )
{
@@ -639,7 +641,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
if ( xPersist != null )
{
PropertyValue[] pEmp = new PropertyValue[0];
- xPersist.setPersistentEntry( m_xStorage, "EmbedSub", EntryInitModes.ENTRY_NO_INIT, pEmp );
+ xPersist.setPersistentEntry( m_xStorage, "EmbedSub", EntryInitModes.NO_INIT, pEmp );
m_bLinkObj = false;
m_aLinkURI = null;
}
@@ -890,7 +892,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
{
Object aArgs[] = new Object[2];
aArgs[0] = aFileURI;
- aArgs[1] = new Integer( ElementModes.ELEMENT_READWRITE );
+ aArgs[1] = new Integer( ElementModes.READWRITE );
Object oStorage = xStorageFactory.createInstanceWithArguments( aArgs );
XStorage xTargetStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oStorage );
@@ -925,7 +927,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
oStorageFactory );
Object aArgs[] = new Object[2];
aArgs[0] = aFileURI;
- aArgs[1] = new Integer( ElementModes.ELEMENT_READWRITE );
+ aArgs[1] = new Integer( ElementModes.READWRITE );
Object oStorage = xStorageFactory.createInstanceWithArguments( aArgs );
XStorage xTargetStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oStorage );
@@ -946,7 +948,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
Object oEmbObj = null;
if ( xNameAccess.hasByName( "LinkName" ) && xTargetStorage.isStreamElement( "LinkName" ) )
{
- XStream xLinkStream = xTargetStorage.openStreamElement( "LinkName", ElementModes.ELEMENT_READ );
+ XStream xLinkStream = xTargetStorage.openStreamElement( "LinkName", ElementModes.READ );
if ( xLinkStream != null )
{
XInputStream xInStream = xLinkStream.getInputStream();
@@ -990,7 +992,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie
if ( m_xStorage != null && m_bLinkObj )
{
try {
- XStream xLinkStream = m_xStorage.openStreamElement( "LinkName", ElementModes.ELEMENT_WRITE );
+ XStream xLinkStream = m_xStorage.openStreamElement( "LinkName", ElementModes.WRITE );
if ( xLinkStream != null )
{
commit eb4be23d470e4ea21414970c22787d4d69d5482b
Author: Noel Grandin <noel at peralex.com>
Date: Mon Sep 3 09:45:58 2012 +0200
Java cleanup, make package name match folder name
Change-Id: I9011cb674d85d4469f2f72444c158e0eeb44c1ec
diff --git a/odk/examples/java/Storage/StorageFunctionality.java b/odk/examples/java/Storage/StorageFunctionality.java
index 96445ec..a54245f 100644
--- a/odk/examples/java/Storage/StorageFunctionality.java
+++ b/odk/examples/java/Storage/StorageFunctionality.java
@@ -33,8 +33,6 @@ import com.sun.star.container.*;
import com.sun.star.beans.*;
import com.sun.star.lang.*;
-import storagetesting.*;
-
public class StorageFunctionality {
public static void main( String args[] )
diff --git a/odk/examples/java/Storage/StorageTest.java b/odk/examples/java/Storage/StorageTest.java
index c651db2..50b9d8e 100644
--- a/odk/examples/java/Storage/StorageTest.java
+++ b/odk/examples/java/Storage/StorageTest.java
@@ -16,8 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package storagetesting;
-
public interface StorageTest
{
boolean test();
diff --git a/odk/examples/java/Storage/Test01.java b/odk/examples/java/Storage/Test01.java
index 5ecf767..ad60cfa 100644
--- a/odk/examples/java/Storage/Test01.java
+++ b/odk/examples/java/Storage/Test01.java
@@ -16,8 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package storagetesting;
-
import com.sun.star.uno.XInterface;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.lang.XSingleServiceFactory;
@@ -28,9 +26,6 @@ import com.sun.star.uno.XInterface;
import com.sun.star.embed.*;
-import storagetesting.TestHelper;
-import storagetesting.StorageTest;
-
public class Test01 implements StorageTest {
XMultiServiceFactory m_xMSF;
diff --git a/odk/examples/java/Storage/Test02.java b/odk/examples/java/Storage/Test02.java
index e4bc5b7..382fbcc 100644
--- a/odk/examples/java/Storage/Test02.java
+++ b/odk/examples/java/Storage/Test02.java
@@ -16,7 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package storagetesting;
import com.sun.star.uno.XInterface;
import com.sun.star.lang.XMultiServiceFactory;
@@ -30,9 +29,6 @@ import com.sun.star.io.XInputStream;
import com.sun.star.embed.*;
-import storagetesting.TestHelper;
-import storagetesting.StorageTest;
-
public class Test02 implements StorageTest {
XMultiServiceFactory m_xMSF;
diff --git a/odk/examples/java/Storage/Test03.java b/odk/examples/java/Storage/Test03.java
index deff72a..9159b1b 100644
--- a/odk/examples/java/Storage/Test03.java
+++ b/odk/examples/java/Storage/Test03.java
@@ -16,8 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package storagetesting;
-
import com.sun.star.uno.XInterface;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.lang.XSingleServiceFactory;
@@ -29,9 +27,6 @@ import com.sun.star.uno.XInterface;
import com.sun.star.embed.*;
import com.sun.star.container.XNameAccess;
-import storagetesting.TestHelper;
-import storagetesting.StorageTest;
-
public class Test03 implements StorageTest {
XMultiServiceFactory m_xMSF;
diff --git a/odk/examples/java/Storage/Test04.java b/odk/examples/java/Storage/Test04.java
index c5a7fd6..18f4a80 100644
--- a/odk/examples/java/Storage/Test04.java
+++ b/odk/examples/java/Storage/Test04.java
@@ -16,8 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package storagetesting;
-
import com.sun.star.uno.XInterface;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.lang.XSingleServiceFactory;
@@ -31,9 +29,6 @@ import com.sun.star.container.XNameAccess;
import com.sun.star.embed.*;
-import storagetesting.TestHelper;
-import storagetesting.StorageTest;
-
public class Test04 implements StorageTest {
XMultiServiceFactory m_xMSF;
diff --git a/odk/examples/java/Storage/Test05.java b/odk/examples/java/Storage/Test05.java
index c9877e0..4e82396 100644
--- a/odk/examples/java/Storage/Test05.java
+++ b/odk/examples/java/Storage/Test05.java
@@ -16,8 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package storagetesting;
-
import com.sun.star.uno.XInterface;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.lang.XSingleServiceFactory;
@@ -29,9 +27,6 @@ import com.sun.star.io.XStream;
import com.sun.star.embed.*;
-import storagetesting.TestHelper;
-import storagetesting.StorageTest;
-
public class Test05 implements StorageTest {
XMultiServiceFactory m_xMSF;
diff --git a/odk/examples/java/Storage/Test06.java b/odk/examples/java/Storage/Test06.java
index 6702a10..271334e 100644
--- a/odk/examples/java/Storage/Test06.java
+++ b/odk/examples/java/Storage/Test06.java
@@ -16,8 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package storagetesting;
-
import com.sun.star.uno.XInterface;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.lang.XSingleServiceFactory;
@@ -32,9 +30,6 @@ import com.sun.star.container.ElementExistException;
import com.sun.star.embed.*;
-import storagetesting.TestHelper;
-import storagetesting.StorageTest;
-
public class Test06 implements StorageTest {
XMultiServiceFactory m_xMSF;
diff --git a/odk/examples/java/Storage/Test07.java b/odk/examples/java/Storage/Test07.java
index 164c113..2c20f64 100644
--- a/odk/examples/java/Storage/Test07.java
+++ b/odk/examples/java/Storage/Test07.java
@@ -16,8 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package storagetesting;
-
import com.sun.star.uno.XInterface;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.lang.XSingleServiceFactory;
@@ -28,9 +26,6 @@ import com.sun.star.uno.XInterface;
import com.sun.star.embed.*;
-import storagetesting.TestHelper;
-import storagetesting.StorageTest;
-
public class Test07 implements StorageTest {
XMultiServiceFactory m_xMSF;
diff --git a/odk/examples/java/Storage/Test08.java b/odk/examples/java/Storage/Test08.java
index df058d5..af6994f 100644
--- a/odk/examples/java/Storage/Test08.java
+++ b/odk/examples/java/Storage/Test08.java
@@ -16,8 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package storagetesting;
-
import com.sun.star.uno.XInterface;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.lang.XSingleServiceFactory;
@@ -28,9 +26,6 @@ import com.sun.star.uno.XInterface;
import com.sun.star.embed.*;
-import storagetesting.TestHelper;
-import storagetesting.StorageTest;
-
public class Test08 implements StorageTest {
XMultiServiceFactory m_xMSF;
diff --git a/odk/examples/java/Storage/Test09.java b/odk/examples/java/Storage/Test09.java
index 557d908..29cf632 100644
--- a/odk/examples/java/Storage/Test09.java
+++ b/odk/examples/java/Storage/Test09.java
@@ -16,8 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package storagetesting;
-
import com.sun.star.uno.XInterface;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.lang.XSingleServiceFactory;
@@ -28,9 +26,6 @@ import com.sun.star.uno.XInterface;
import com.sun.star.embed.*;
-import storagetesting.TestHelper;
-import storagetesting.StorageTest;
-
public class Test09 implements StorageTest {
XMultiServiceFactory m_xMSF;
diff --git a/odk/examples/java/Storage/TestHelper.java b/odk/examples/java/Storage/TestHelper.java
index d34c17d..2948b1a 100644
--- a/odk/examples/java/Storage/TestHelper.java
+++ b/odk/examples/java/Storage/TestHelper.java
@@ -16,8 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-package storagetesting;
-
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
import com.sun.star.uno.AnyConverter;
commit 97b5851e97c72f44c4d1f498c8cd786fe8561803
Author: Noel Grandin <noel at peralex.com>
Date: Mon Sep 3 09:43:32 2012 +0200
Java cleanup, update code for changes in UNO encryption API
Change-Id: Ib7133d090dbf881d43b4adf363fb065c682476c5
diff --git a/odk/examples/java/Storage/Test01.java b/odk/examples/java/Storage/Test01.java
index 4cc08ab..5ecf767 100644
--- a/odk/examples/java/Storage/Test01.java
+++ b/odk/examples/java/Storage/Test01.java
@@ -68,7 +68,7 @@ public class Test01 implements StorageTest {
// open a new substorage
XStorage xTempSubStorage = m_aTestHelper.openSubStorage( xTempStorage,
"SubStorage1",
- ElementModes.ELEMENT_WRITE );
+ ElementModes.WRITE );
if ( xTempSubStorage == null )
{
m_aTestHelper.Error( "Can't create substorage!" );
@@ -91,20 +91,20 @@ public class Test01 implements StorageTest {
if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempStorage,
"MediaType3",
true,
- ElementModes.ELEMENT_READWRITE ) )
+ ElementModes.READWRITE ) )
return false;
// set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage,
"MediaType4",
false,
- ElementModes.ELEMENT_WRITE ) )
+ ElementModes.WRITE ) )
return false;
// create temporary storage based on a previously created temporary file
Object pArgs[] = new Object[2];
pArgs[0] = (Object) sTempFileURL;
- pArgs[1] = new Integer( ElementModes.ELEMENT_WRITE );
+ pArgs[1] = new Integer( ElementModes.WRITE );
Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage );
@@ -128,7 +128,7 @@ public class Test01 implements StorageTest {
// ================================================
// the temporary file must not be locked any more after storage disposing
- pArgs[1] = new Integer( ElementModes.ELEMENT_READWRITE );
+ pArgs[1] = new Integer( ElementModes.READWRITE );
Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
XStorage xResultStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResultStorage );
if ( xResultStorage == null )
@@ -137,20 +137,20 @@ public class Test01 implements StorageTest {
return false;
}
- if ( !m_aTestHelper.checkStorageProperties( xResultStorage, "MediaType3", true, ElementModes.ELEMENT_READWRITE ) )
+ if ( !m_aTestHelper.checkStorageProperties( xResultStorage, "MediaType3", true, ElementModes.READWRITE ) )
return false;
// open existing substorage
XStorage xResultSubStorage = m_aTestHelper.openSubStorage( xResultStorage,
"SubStorage1",
- ElementModes.ELEMENT_READ );
+ ElementModes.READ );
if ( xResultSubStorage == null )
{
m_aTestHelper.Error( "Can't open existing substorage!" );
return false;
}
- if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage, "MediaType4", false, ElementModes.ELEMENT_READ ) )
+ if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage, "MediaType4", false, ElementModes.READ ) )
return false;
if ( !m_aTestHelper.checkStream( xResultSubStorage, "SubStream1", "MediaType1", pBytes1 ) )
diff --git a/odk/examples/java/Storage/Test02.java b/odk/examples/java/Storage/Test02.java
index 015ebb1..e4bc5b7 100644
--- a/odk/examples/java/Storage/Test02.java
+++ b/odk/examples/java/Storage/Test02.java
@@ -57,7 +57,7 @@ public class Test02 implements StorageTest {
// create storage based on the temporary stream
Object pArgs[] = new Object[2];
pArgs[0] = (Object) xTempFileStream;
- pArgs[1] = new Integer( ElementModes.ELEMENT_WRITE );
+ pArgs[1] = new Integer( ElementModes.WRITE );
Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage );
@@ -70,7 +70,7 @@ public class Test02 implements StorageTest {
// open a new substorage
XStorage xTempSubStorage = m_aTestHelper.openSubStorage( xTempStorage,
"SubStorage1",
- ElementModes.ELEMENT_WRITE );
+ ElementModes.WRITE );
if ( xTempSubStorage == null )
{
m_aTestHelper.Error( "Can't create substorage!" );
@@ -87,14 +87,14 @@ public class Test02 implements StorageTest {
if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempStorage,
"MediaType2",
true,
- ElementModes.ELEMENT_WRITE ) )
+ ElementModes.WRITE ) )
return false;
// set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage,
"MediaType3",
false,
- ElementModes.ELEMENT_WRITE ) )
+ ElementModes.WRITE ) )
return false;
// commit substorage first
@@ -138,20 +138,20 @@ public class Test02 implements StorageTest {
return false;
}
- if ( !m_aTestHelper.checkStorageProperties( xResultStorage, "MediaType2", true, ElementModes.ELEMENT_READ ) )
+ if ( !m_aTestHelper.checkStorageProperties( xResultStorage, "MediaType2", true, ElementModes.READ ) )
return false;
// open existing substorage
XStorage xResultSubStorage = m_aTestHelper.openSubStorage( xResultStorage,
"SubStorage1",
- ElementModes.ELEMENT_READ );
+ ElementModes.READ );
if ( xResultSubStorage == null )
{
m_aTestHelper.Error( "Can't open existing substorage!" );
return false;
}
- if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage, "MediaType3", false, ElementModes.ELEMENT_READ ) )
+ if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage, "MediaType3", false, ElementModes.READ ) )
return false;
if ( !m_aTestHelper.checkStream( xResultSubStorage, "SubStream1", "MediaType1", pBytes1 ) )
diff --git a/odk/examples/java/Storage/Test03.java b/odk/examples/java/Storage/Test03.java
index fd59a6c..deff72a 100644
--- a/odk/examples/java/Storage/Test03.java
+++ b/odk/examples/java/Storage/Test03.java
@@ -62,7 +62,7 @@ public class Test03 implements StorageTest {
// open a new substorage
XStorage xTempSubStorage = m_aTestHelper.openSubStorage( xTempStorage,
"SubStorage1",
- ElementModes.ELEMENT_WRITE );
+ ElementModes.WRITE );
if ( xTempSubStorage == null )
{
m_aTestHelper.Error( "Can't create substorage!" );
@@ -85,7 +85,7 @@ public class Test03 implements StorageTest {
if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage,
"MediaType3",
false,
- ElementModes.ELEMENT_WRITE ) )
+ ElementModes.WRITE ) )
return false;
if ( !m_aTestHelper.commitStorage( xTempSubStorage ) )
@@ -176,7 +176,7 @@ public class Test03 implements StorageTest {
if ( xResultSubStorage == null )
return false;
- if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage, "MediaType3", false, ElementModes.ELEMENT_READ ) )
+ if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage, "MediaType3", false, ElementModes.READ ) )
return false;
XNameAccess xChildAccess = (XNameAccess) UnoRuntime.queryInterface( XNameAccess.class, xResultSubStorage );
diff --git a/odk/examples/java/Storage/Test04.java b/odk/examples/java/Storage/Test04.java
index 18d9ab9..c5a7fd6 100644
--- a/odk/examples/java/Storage/Test04.java
+++ b/odk/examples/java/Storage/Test04.java
@@ -73,7 +73,7 @@ public class Test04 implements StorageTest {
// first substorage of the root storage
XStorage xTempSubStorage1 = m_aTestHelper.openSubStorage( xTempStorage,
"SubStorage1",
- ElementModes.ELEMENT_WRITE );
+ ElementModes.WRITE );
if ( xTempSubStorage1 == null )
{
m_aTestHelper.Error( "Can't create substorage!" );
@@ -89,7 +89,7 @@ public class Test04 implements StorageTest {
// second substorage of the root storage
XStorage xTempSubStorage2 = m_aTestHelper.openSubStorage( xTempStorage,
"SubStorage2",
- ElementModes.ELEMENT_WRITE );
+ ElementModes.WRITE );
if ( xTempSubStorage2 == null )
{
m_aTestHelper.Error( "Can't create substorage!" );
@@ -106,27 +106,27 @@ public class Test04 implements StorageTest {
if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempStorage,
"MediaType3",
true,
- ElementModes.ELEMENT_READWRITE ) )
+ ElementModes.READWRITE ) )
return false;
// set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage1,
"MediaType4",
false,
- ElementModes.ELEMENT_WRITE ) )
+ ElementModes.WRITE ) )
return false;
// set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage2,
"MediaType5",
false,
- ElementModes.ELEMENT_WRITE ) )
+ ElementModes.WRITE ) )
return false;
// create temporary storage based on a previously created temporary file
Object pArgs[] = new Object[2];
pArgs[0] = (Object) sTempFileURL;
- pArgs[1] = new Integer( ElementModes.ELEMENT_WRITE );
+ pArgs[1] = new Integer( ElementModes.WRITE );
Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage );
@@ -187,7 +187,7 @@ public class Test04 implements StorageTest {
// ================================================
// the temporary file must not be locked any more after storage disposing
- pArgs[1] = new Integer( ElementModes.ELEMENT_READWRITE );
+ pArgs[1] = new Integer( ElementModes.READWRITE );
Object oResStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
XStorage xResStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResStorage );
if ( xResStorage == null )
@@ -199,28 +199,28 @@ public class Test04 implements StorageTest {
// open and check SubStorage1
XStorage xResSubStorage1 = m_aTestHelper.openSubStorage( xResStorage,
"SubStorage1",
- ElementModes.ELEMENT_READ );
+ ElementModes.READ );
if ( xResSubStorage1 == null )
{
m_aTestHelper.Error( "Can't open existing substorage!" );
return false;
}
- if ( !m_aTestHelper.checkStorageProperties( xResSubStorage1, "MediaType4", false, ElementModes.ELEMENT_READ ) )
+ if ( !m_aTestHelper.checkStorageProperties( xResSubStorage1, "MediaType4", false, ElementModes.READ ) )
return false;
// open and check SubStorage2
XStorage xResSubStorage2 = m_aTestHelper.openSubStorage( xResStorage,
"SubStorage2",
- ElementModes.ELEMENT_READ );
+ ElementModes.READ );
if ( xResSubStorage2 == null )
{
m_aTestHelper.Error( "Can't open existing substorage!" );
return false;
}
- if ( !m_aTestHelper.checkStorageProperties( xResSubStorage2, "MediaType5", false, ElementModes.ELEMENT_READ ) )
+ if ( !m_aTestHelper.checkStorageProperties( xResSubStorage2, "MediaType5", false, ElementModes.READ ) )
return false;
diff --git a/odk/examples/java/Storage/Test05.java b/odk/examples/java/Storage/Test05.java
index 0b0fa4e..c9877e0 100644
--- a/odk/examples/java/Storage/Test05.java
+++ b/odk/examples/java/Storage/Test05.java
@@ -59,7 +59,7 @@ public class Test05 implements StorageTest {
// create temporary storage based on a previously created temporary file
Object pArgs[] = new Object[2];
pArgs[0] = (Object) sTempFileURL;
- pArgs[1] = new Integer( ElementModes.ELEMENT_WRITE );
+ pArgs[1] = new Integer( ElementModes.WRITE );
Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage );
@@ -72,7 +72,7 @@ public class Test05 implements StorageTest {
// open a new substorage
XStorage xTempSubStorage = m_aTestHelper.openSubStorage( xTempFileStorage,
"SubStorage1",
- ElementModes.ELEMENT_WRITE );
+ ElementModes.WRITE );
if ( xTempSubStorage == null )
{
m_aTestHelper.Error( "Can't create substorage!" );
@@ -82,7 +82,7 @@ public class Test05 implements StorageTest {
// open a new substorage
XStorage xSubSubStorage = m_aTestHelper.openSubStorage( xTempSubStorage,
"SubSubStorage1",
- ElementModes.ELEMENT_WRITE );
+ ElementModes.WRITE );
if ( xSubSubStorage == null )
{
m_aTestHelper.Error( "Can't create substorage!" );
@@ -106,21 +106,21 @@ public class Test05 implements StorageTest {
if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempFileStorage,
"MediaType3",
true,
- ElementModes.ELEMENT_WRITE ) )
+ ElementModes.WRITE ) )
return false;
// set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage,
"MediaType4",
false,
- ElementModes.ELEMENT_WRITE ) )
+ ElementModes.WRITE ) )
return false;
// set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
if ( !m_aTestHelper.setStorageTypeAndCheckProps( xSubSubStorage,
"MediaType5",
false,
- ElementModes.ELEMENT_WRITE ) )
+ ElementModes.WRITE ) )
return false;
@@ -142,28 +142,28 @@ public class Test05 implements StorageTest {
// reopen created streams
XStream xSubStream1 = m_aTestHelper.OpenStream( xSubSubStorage,
"SubStream1",
- ElementModes.ELEMENT_READWRITE | ElementModes.ELEMENT_NOCREATE );
+ ElementModes.READWRITE | ElementModes.NOCREATE );
XStream xSubStream2 = m_aTestHelper.OpenStream( xSubSubStorage,
"SubStream2",
- ElementModes.ELEMENT_READ | ElementModes.ELEMENT_NOCREATE );
+ ElementModes.READ | ElementModes.NOCREATE );
if ( xSubStream1 == null || xSubStream2 == null )
return false;
// it should be possible to have more then one copy of stream for reading
XStream xSubStream2clone = m_aTestHelper.OpenStream( xSubSubStorage,
"SubStream2",
- ElementModes.ELEMENT_READ | ElementModes.ELEMENT_NOCREATE );
+ ElementModes.READ | ElementModes.NOCREATE );
if ( xSubStream2 == null )
return false;
// so now the first stream can not be open neither for reading nor for writing
- if ( !m_aTestHelper.cantOpenStream( xSubSubStorage, "SubStream1", ElementModes.ELEMENT_WRITE )
- || !m_aTestHelper.cantOpenStream( xSubSubStorage, "SubStream1", ElementModes.ELEMENT_READ ) )
+ if ( !m_aTestHelper.cantOpenStream( xSubSubStorage, "SubStream1", ElementModes.WRITE )
+ || !m_aTestHelper.cantOpenStream( xSubSubStorage, "SubStream1", ElementModes.READ ) )
return false;
// the second stream can not be open for writing
- if ( !m_aTestHelper.cantOpenStream( xSubSubStorage, "SubStream2", ElementModes.ELEMENT_WRITE ) )
+ if ( !m_aTestHelper.cantOpenStream( xSubSubStorage, "SubStream2", ElementModes.WRITE ) )
return false;
@@ -224,7 +224,7 @@ public class Test05 implements StorageTest {
// now check all the written and copied information
// ================================================
- pArgs[1] = new Integer( ElementModes.ELEMENT_READ );
+ pArgs[1] = new Integer( ElementModes.READ );
Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
XStorage xResultStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResultStorage );
if ( xResultStorage == null )
@@ -233,33 +233,33 @@ public class Test05 implements StorageTest {
return false;
}
- if ( !m_aTestHelper.checkStorageProperties( xResultStorage, "MediaType3", true, ElementModes.ELEMENT_READ ) )
+ if ( !m_aTestHelper.checkStorageProperties( xResultStorage, "MediaType3", true, ElementModes.READ ) )
return false;
// open existing substorage
XStorage xResSubStorage = m_aTestHelper.openSubStorage( xResultStorage,
"SubStorage1",
- ElementModes.ELEMENT_READ );
+ ElementModes.READ );
if ( xResSubStorage == null )
{
m_aTestHelper.Error( "Can't open existing substorage 'SubSubStorage'!" );
return false;
}
- if ( !m_aTestHelper.checkStorageProperties( xResSubStorage, "MediaType4", false, ElementModes.ELEMENT_READ ) )
+ if ( !m_aTestHelper.checkStorageProperties( xResSubStorage, "MediaType4", false, ElementModes.READ ) )
return false;
// open existing substorage
XStorage xResSubSubStorage = m_aTestHelper.openSubStorage( xResSubStorage,
"SubSubStorage1",
- ElementModes.ELEMENT_READ );
+ ElementModes.READ );
if ( xResSubSubStorage == null )
{
m_aTestHelper.Error( "Can't open existing substorage 'SubSubStorage'!" );
return false;
}
- if ( !m_aTestHelper.checkStorageProperties( xResSubSubStorage, "MediaType5", false, ElementModes.ELEMENT_READ ) )
+ if ( !m_aTestHelper.checkStorageProperties( xResSubSubStorage, "MediaType5", false, ElementModes.READ ) )
return false;
// check substreams
diff --git a/odk/examples/java/Storage/Test06.java b/odk/examples/java/Storage/Test06.java
index bbc9aad..6702a10 100644
--- a/odk/examples/java/Storage/Test06.java
+++ b/odk/examples/java/Storage/Test06.java
@@ -81,10 +81,10 @@ public class Test06 implements StorageTest {
// open new substorages
XStorage xTempSubStorage1 = m_aTestHelper.openSubStorage( xTempStorage,
"SubStorage1",
- ElementModes.ELEMENT_WRITE );
+ ElementModes.WRITE );
XStorage xTempSubStorage2 = m_aTestHelper.openSubStorage( xTempStorage,
"SubStorage2",
- ElementModes.ELEMENT_WRITE );
+ ElementModes.WRITE );
if ( xTempSubStorage1 == null || xTempSubStorage2 == null )
{
m_aTestHelper.Error( "Can't create substorage!" );
@@ -94,7 +94,7 @@ public class Test06 implements StorageTest {
// in case stream is open for reading it must exist
try
{
- xTempSubStorage1.openStreamElement( "NonExistingStream", ElementModes.ELEMENT_READ );
+ xTempSubStorage1.openStreamElement( "NonExistingStream", ElementModes.READ );
m_aTestHelper.Error( "The method must throw an exception in case of try to open nonexistent stream for reading!" );
return false;
}
@@ -109,7 +109,7 @@ public class Test06 implements StorageTest {
// in case a storage is open for reading it must exist
try
{
- xTempSubStorage1.openStreamElement( "NonExistingStorage", ElementModes.ELEMENT_READ );
+ xTempSubStorage1.openStreamElement( "NonExistingStorage", ElementModes.READ );
m_aTestHelper.Error( "The method must throw an exception in case of try to open nonexistent storage for reading!" );
return false;
}
@@ -215,7 +215,7 @@ public class Test06 implements StorageTest {
// open a new substorage
XStorage xTargetSubStorage = m_aTestHelper.openSubStorage( xTargetStorage,
"SubStorage1",
- ElementModes.ELEMENT_WRITE );
+ ElementModes.WRITE );
if ( xTargetSubStorage == null )
{
m_aTestHelper.Error( "Can't create substorage!" );
diff --git a/odk/examples/java/Storage/Test07.java b/odk/examples/java/Storage/Test07.java
index 52daa13..164c113 100644
--- a/odk/examples/java/Storage/Test07.java
+++ b/odk/examples/java/Storage/Test07.java
@@ -82,7 +82,7 @@ public class Test07 implements StorageTest {
// create temporary storage based on a previously created temporary file
Object pArgs[] = new Object[2];
pArgs[0] = (Object) sTempFileURL;
- pArgs[1] = new Integer( ElementModes.ELEMENT_WRITE );
+ pArgs[1] = new Integer( ElementModes.WRITE );
Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage );
@@ -106,7 +106,7 @@ public class Test07 implements StorageTest {
// ================================================
// the temporary file must not be locked any more after storage disposing
- pArgs[1] = new Integer( ElementModes.ELEMENT_READWRITE );
+ pArgs[1] = new Integer( ElementModes.READWRITE );
Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
XStorage xResultStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResultStorage );
if ( xResultStorage == null )
diff --git a/odk/examples/java/Storage/Test08.java b/odk/examples/java/Storage/Test08.java
index 7511ec6..df058d5 100644
--- a/odk/examples/java/Storage/Test08.java
+++ b/odk/examples/java/Storage/Test08.java
@@ -73,7 +73,7 @@ public class Test08 implements StorageTest {
byte pPass2[] = { 3, 2, 1 };
try {
- xTempStorageEncryption.setEncryptionKey( pPass1 );
+ xTempStorageEncryption.setEncryptionPassword( new String(pPass1) );
}
catch( Exception e )
{
@@ -84,7 +84,7 @@ public class Test08 implements StorageTest {
// open a new substorage
XStorage xTempSubStorage = m_aTestHelper.openSubStorage( xTempStorage,
"SubStorage1",
- ElementModes.ELEMENT_WRITE );
+ ElementModes.WRITE );
if ( xTempSubStorage == null )
{
m_aTestHelper.Error( "Can't create substorage!" );
@@ -116,14 +116,14 @@ public class Test08 implements StorageTest {
if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempStorage,
"MediaType4",
true,
- ElementModes.ELEMENT_READWRITE ) )
+ ElementModes.READWRITE ) )
return false;
// set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage,
"MediaType5",
false,
- ElementModes.ELEMENT_WRITE ) )
+ ElementModes.WRITE ) )
return false;
// create temporary file
@@ -137,7 +137,7 @@ public class Test08 implements StorageTest {
// create temporary storage based on a previously created temporary file
Object pArgs[] = new Object[2];
pArgs[0] = (Object) sTempFileURL;
- pArgs[1] = new Integer( ElementModes.ELEMENT_WRITE );
+ pArgs[1] = new Integer( ElementModes.WRITE );
Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage );
@@ -161,7 +161,7 @@ public class Test08 implements StorageTest {
// ================================================
// the temporary file must not be locked any more after storage disposing
- pArgs[1] = new Integer( ElementModes.ELEMENT_READ );
+ pArgs[1] = new Integer( ElementModes.READ );
Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
XStorage xResultStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResultStorage );
if ( xResultStorage == null )
@@ -170,20 +170,20 @@ public class Test08 implements StorageTest {
return false;
}
- if ( !m_aTestHelper.checkStorageProperties( xResultStorage, "MediaType4", true, ElementModes.ELEMENT_READ ) )
+ if ( !m_aTestHelper.checkStorageProperties( xResultStorage, "MediaType4", true, ElementModes.READ ) )
return false;
// open existing substorage
XStorage xResultSubStorage = m_aTestHelper.openSubStorage( xResultStorage,
"SubStorage1",
- ElementModes.ELEMENT_READ );
+ ElementModes.READ );
if ( xResultSubStorage == null )
{
m_aTestHelper.Error( "Can't open existing substorage!" );
return false;
}
- if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage, "MediaType5", false, ElementModes.ELEMENT_READ ) )
+ if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage, "MediaType5", false, ElementModes.READ ) )
return false;
// set the global password for the root storage
@@ -197,7 +197,7 @@ public class Test08 implements StorageTest {
}
try {
- xResultStorageEncryption.setEncryptionKey( pPass2 );
+ xResultStorageEncryption.setEncryptionPassword( new String(pPass2) );
}
catch( Exception e )
{
diff --git a/odk/examples/java/Storage/Test09.java b/odk/examples/java/Storage/Test09.java
index 76ac582..557d908 100644
--- a/odk/examples/java/Storage/Test09.java
+++ b/odk/examples/java/Storage/Test09.java
@@ -79,7 +79,7 @@ public class Test09 implements StorageTest {
// create temporary storage based on a previously created temporary file
Object pArgs[] = new Object[2];
pArgs[0] = (Object) sTempFileURL;
- pArgs[1] = new Integer( ElementModes.ELEMENT_WRITE );
+ pArgs[1] = new Integer( ElementModes.WRITE );
Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage );
@@ -113,7 +113,7 @@ public class Test09 implements StorageTest {
// ================================================
// the temporary file must not be locked any more after storage disposing
- pArgs[1] = new Integer( ElementModes.ELEMENT_READ );
+ pArgs[1] = new Integer( ElementModes.READ );
Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
XStorage xResultStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResultStorage );
if ( xResultStorage == null )
diff --git a/odk/examples/java/Storage/TestHelper.java b/odk/examples/java/Storage/TestHelper.java
index 1aeca03..d34c17d 100644
--- a/odk/examples/java/Storage/TestHelper.java
+++ b/odk/examples/java/Storage/TestHelper.java
@@ -130,7 +130,7 @@ public class TestHelper {
XStream xSubStream = null;
try
{
- Object oSubStream = xStorage.openStreamElement( sStreamName, ElementModes.ELEMENT_WRITE );
+ Object oSubStream = xStorage.openStreamElement( sStreamName, ElementModes.WRITE );
xSubStream = (XStream) UnoRuntime.queryInterface( XStream.class, oSubStream );
if ( xSubStream == null )
{
@@ -158,7 +158,7 @@ public class TestHelper {
XStream xSubStream = null;
try
{
- Object oSubStream = xStorage.openEncryptedStreamElement( sStreamName, ElementModes.ELEMENT_WRITE, pPass );
+ Object oSubStream = xStorage.openEncryptedStreamElement( sStreamName, ElementModes.WRITE, new String(pPass) );
xSubStream = (XStream) UnoRuntime.queryInterface( XStream.class, oSubStream );
if ( xSubStream == null )
{
@@ -186,7 +186,7 @@ public class TestHelper {
XStream xSubStream = null;
try
{
- Object oSubStream = xStorage.openStreamElement( sStreamName, ElementModes.ELEMENT_WRITE );
+ Object oSubStream = xStorage.openStreamElement( sStreamName, ElementModes.WRITE );
xSubStream = (XStream) UnoRuntime.queryInterface( XStream.class, oSubStream );
if ( xSubStream == null )
{
@@ -231,7 +231,7 @@ public class TestHelper {
XStream xSubStream = null;
try
{
- Object oSubStream = xStorage.openEncryptedStreamElement( sStreamName, ElementModes.ELEMENT_WRITE, pOldPass );
+ Object oSubStream = xStorage.openEncryptedStreamElement( sStreamName, ElementModes.WRITE, new String(pOldPass) );
xSubStream = (XStream) UnoRuntime.queryInterface( XStream.class, oSubStream );
if ( xSubStream == null )
{
@@ -257,7 +257,7 @@ public class TestHelper {
}
try {
- xStreamEncryption.setEncryptionKey( pNewPass );
+ xStreamEncryption.setEncryptionPassword( new String(pNewPass) );
}
catch( Exception e )
{
@@ -301,7 +301,7 @@ public class TestHelper {
bOk = false;
}
- if ( ( bIsRoot && ( nPropMode | ElementModes.ELEMENT_READ ) != ( nMode | ElementModes.ELEMENT_READ ) )
+ if ( ( bIsRoot && ( nPropMode | ElementModes.READ ) != ( nMode | ElementModes.READ ) )
|| ( !bIsRoot && ( nPropMode & nMode ) != nMode ) )
{
Error( "'OpenMode' property contains wrong value!" );
@@ -350,7 +350,7 @@ public class TestHelper {
bOk = false;
}
- if ( ( bIsRoot && ( nPropMode | ElementModes.ELEMENT_READ ) != ( nMode | ElementModes.ELEMENT_READ ) )
+ if ( ( bIsRoot && ( nPropMode | ElementModes.READ ) != ( nMode | ElementModes.READ ) )
|| ( !bIsRoot && ( nPropMode & nMode ) != nMode ) )
{
Error( "'OpenMode' property contains wrong value!" );
@@ -469,7 +469,7 @@ public class TestHelper {
XStream xSubStream = null;
try
{
- Object oSubStream = xParentStorage.openStreamElement( sName, ElementModes.ELEMENT_READ );
+ Object oSubStream = xParentStorage.openStreamElement( sName, ElementModes.READ );
xSubStream = (XStream) UnoRuntime.queryInterface( XStream.class, oSubStream );
if ( xSubStream == null )
{
@@ -503,7 +503,7 @@ public class TestHelper {
try
{
- Object oSubStream = xParentStorage.openStreamElement( sName, ElementModes.ELEMENT_READ );
+ Object oSubStream = xParentStorage.openStreamElement( sName, ElementModes.READ );
Error( "Encrypted stream '" + sName + "' was opened without password!" );
return false;
}
@@ -519,7 +519,7 @@ public class TestHelper {
pWrongPass[0] += pPass[0];
try
{
- Object oSubStream = xParentStorage.openEncryptedStreamElement( sName, ElementModes.ELEMENT_READ, pWrongPass );
+ Object oSubStream = xParentStorage.openEncryptedStreamElement( sName, ElementModes.READ, new String(pWrongPass) );
Error( "Encrypted stream '" + sName + "' was opened with wrong password!" );
return false;
}
@@ -534,7 +534,7 @@ public class TestHelper {
XStream xSubStream = null;
try
{
- Object oSubStream = xParentStorage.openEncryptedStreamElement( sName, ElementModes.ELEMENT_READ, pPass );
+ Object oSubStream = xParentStorage.openEncryptedStreamElement( sName, ElementModes.READ, new String(pPass) );
xSubStream = (XStream) UnoRuntime.queryInterface( XStream.class, oSubStream );
if ( xSubStream == null )
{
@@ -842,7 +842,7 @@ public class TestHelper {
// try to open an opened substorage, open call must fail
try
{
- Object oDummyStorage = xStorage.openStorageElement( sName, ElementModes.ELEMENT_READ );
+ Object oDummyStorage = xStorage.openStorageElement( sName, ElementModes.READ );
Error( "The trying to reopen opened substorage '" + sName + "' must fail!" );
}
catch( Exception e )
commit 44325e03b1740dd91fd8b6a7b54d4f916adbd2b0
Author: Noel Grandin <noel at peralex.com>
Date: Mon Sep 3 09:35:22 2012 +0200
Java cleanup, make the package name match the folder name
Note that the code doesn't compile after this change, it is still
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list