diff options
Diffstat (limited to 'qadevOOo')
79 files changed, 869 insertions, 4547 deletions
diff --git a/qadevOOo/objdsc/configmgr/com.sun.star.comp.configuration.ConfigurationProvider.csv b/qadevOOo/objdsc/configmgr/com.sun.star.comp.configuration.ConfigurationProvider.csv new file mode 100644 index 000000000000..4a56a474016c --- /dev/null +++ b/qadevOOo/objdsc/configmgr/com.sun.star.comp.configuration.ConfigurationProvider.csv @@ -0,0 +1,45 @@ +#************************************************************************* +# +# 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. +# +#***********************************************************************/ + +# In addition to the interfaces of css.configuration.ConfigurationProvider also +# test the additional, optional (but implemented) interfaces of +# css.configuration.DefaultProvider: + +"ConfigurationProvider";"com::sun::star::lang::XComponent";"addEventListener()" +"ConfigurationProvider";"com::sun::star::lang::XComponent";"dispose()" +"ConfigurationProvider";"com::sun::star::lang::XComponent";"removeEventListener()" +"ConfigurationProvider";"com::sun::star::lang::XLocalizable";"getLocale()" +"ConfigurationProvider";"com::sun::star::lang::XLocalizable";"setLocale()" +"ConfigurationProvider";"com::sun::star::lang::XMultiServiceFactory";"createInstance()" +"ConfigurationProvider";"com::sun::star::lang::XMultiServiceFactory";"createInstanceWithArguments()" +"ConfigurationProvider";"com::sun::star::lang::XMultiServiceFactory";"getAvailableServiceNames()" +"ConfigurationProvider";"com::sun::star::util::XFlushable";"addFlushListener()" +"ConfigurationProvider";"com::sun::star::util::XFlushable";"flush()" +"ConfigurationProvider";"com::sun::star::util::XFlushable";"removeFlushListener()" +"ConfigurationProvider";"com::sun::star::util::XRefreshable";"addRefreshListener()" +"ConfigurationProvider";"com::sun::star::util::XRefreshable";"refresh()" +"ConfigurationProvider";"com::sun::star::util::XRefreshable";"removeRefreshListener()" diff --git a/qadevOOo/objdsc/configmgr/com.sun.star.comp.configuration.DefaultProvider.csv b/qadevOOo/objdsc/configmgr/com.sun.star.comp.configuration.DefaultProvider.csv new file mode 100644 index 000000000000..fb668750f670 --- /dev/null +++ b/qadevOOo/objdsc/configmgr/com.sun.star.comp.configuration.DefaultProvider.csv @@ -0,0 +1,33 @@ +#************************************************************************* +# +# 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. +# +#***********************************************************************/ + +# Only test non-modifying functionality of css.configuration.DefaultProvider: + +"DefaultProvider";"com::sun::star::lang::XLocalizable";"getLocale()" +"DefaultProvider";"com::sun::star::lang::XMultiServiceFactory";"createInstance()" +"DefaultProvider";"com::sun::star::lang::XMultiServiceFactory";"createInstanceWithArguments()" +"DefaultProvider";"com::sun::star::lang::XMultiServiceFactory";"getAvailableServiceNames()" diff --git a/qadevOOo/runner/base/basic_fat.java b/qadevOOo/runner/base/basic_fat.java index cfb19d0b1edd..74a6708cf801 100644 --- a/qadevOOo/runner/base/basic_fat.java +++ b/qadevOOo/runner/base/basic_fat.java @@ -26,7 +26,6 @@ ************************************************************************/ package base; -import base.TestBase; import basicrunner.BasicIfcTest; import basicrunner.BasicTestCase; @@ -69,7 +68,7 @@ public class basic_fat implements TestBase /** * Execute a test. * @param param The test parameters. - * @param return True, if the test was executed. + * @return True, if the test was executed. */ public boolean executeTest(TestParameters param) { diff --git a/qadevOOo/runner/base/java_cmp.java b/qadevOOo/runner/base/java_cmp.java index 1c37b5e16724..c25de6efc4a9 100644 --- a/qadevOOo/runner/base/java_cmp.java +++ b/qadevOOo/runner/base/java_cmp.java @@ -28,11 +28,6 @@ package base; -import com.sun.star.uno.UnoRuntime; - -import helper.APIDescGetter; -import helper.AppProvider; -import base.TestBase; /** diff --git a/qadevOOo/runner/base/java_fat.java b/qadevOOo/runner/base/java_fat.java index b330e1c597fc..1d75c48ed43e 100644 --- a/qadevOOo/runner/base/java_fat.java +++ b/qadevOOo/runner/base/java_fat.java @@ -59,43 +59,43 @@ import util.DynamicClassLoader; public class java_fat implements TestBase { - private static boolean debug = false; + private static boolean m_isDebug = false; private static boolean keepdocument = false; private static boolean logging = true; private static boolean newOffice = false; - private DynamicClassLoader dcl = null; + private DynamicClassLoader m_aDynamicClassLoader = null; private lib.TestParameters m_aParams; private AppProvider m_aOffice; - public boolean executeTest(lib.TestParameters param) + public boolean executeTest(lib.TestParameters _aParams) { - m_aParams = param; + m_aParams = _aParams; - dcl = new DynamicClassLoader(); + m_aDynamicClassLoader = new DynamicClassLoader(); DescGetter dg = new APIDescGetter(); - String job = (String) param.get("TestJob"); - String ExclusionFile = (String) param.get("ExclusionList"); + String job = (String) m_aParams.get("TestJob"); + String ExclusionFile = (String) m_aParams.get("ExclusionList"); Vector exclusions = null; boolean retValue = true; - debug = param.getBool("DebugIsActive"); - logging = param.getBool("LoggingIsActive"); - keepdocument = param.getBool("KeepDocument"); - newOffice = param.getBool(util.PropertyName.NEW_OFFICE_INSTANCE); + m_isDebug = m_aParams.getBool("DebugIsActive"); + logging = m_aParams.getBool("LoggingIsActive"); + keepdocument = m_aParams.getBool("KeepDocument"); + newOffice = m_aParams.getBool(util.PropertyName.NEW_OFFICE_INSTANCE); if (keepdocument) { System.setProperty("KeepDocument", "true"); } if (ExclusionFile != null) { - exclusions = getExclusionList(ExclusionFile, debug); + exclusions = getExclusionList(ExclusionFile, m_isDebug); } //get Job-Descriptions - System.out.println("Getting Descriptions for Job: " + job); + // System.out.println("Getting Descriptions for Job: " + job); - String sDescriptionPath = (String) param.get("DescriptionPath"); - DescEntry[] entries = dg.getDescriptionFor(job, sDescriptionPath, debug); + String sDescriptionPath = (String) m_aParams.get("DescriptionPath"); + DescEntry[] entries = dg.getDescriptionFor(job, sDescriptionPath, m_isDebug); // System.out.println(); @@ -106,8 +106,8 @@ public class java_fat implements TestBase return false; } -// String officeProviderName = (String) param.get("OfficeProvider"); -// AppProvider office = (AppProvider) dcl.getInstance(officeProviderName); +// String officeProviderName = (String) m_aParams.get("OfficeProvider"); +// AppProvider office = (AppProvider) m_aDynamicClassLoader.getInstance(officeProviderName); // // if (office == null) { // System.out.println("ERROR: Wrong parameter 'OfficeProvider', " + @@ -115,18 +115,22 @@ public class java_fat implements TestBase // System.exit(-1); // } - m_aOffice = startOffice(param); + m_aOffice = startOffice(m_aParams); boolean firstRun = true; + // Run through all entries (e.g. sw.SwXBookmark.*) + for (int l = 0; l < entries.length; l++) { - if (entries[l] == null) + DescEntry entry = entries[l]; + + if (entry == null) { continue; } - if (entries[l].hasErrorMsg) + if (entry.hasErrorMsg) { System.out.println(entries[l].ErrorMsg); retValue = false; @@ -135,145 +139,86 @@ public class java_fat implements TestBase if (!firstRun && newOffice) { - if (!m_aOffice.closeExistingOffice(param, true)) + if (!m_aOffice.closeExistingOffice(m_aParams, true)) { - m_aOffice.disposeManager(param); + m_aOffice.disposeManager(m_aParams); } - startOffice(param); + startOffice(m_aParams); } firstRun = false; -// XMultiServiceFactory msf = (XMultiServiceFactory) office.getManager( -// param); - - XMultiServiceFactory msf = (XMultiServiceFactory) param.getMSF(); + XMultiServiceFactory msf = (XMultiServiceFactory) m_aParams.getMSF(); if (msf == null) { retValue = false; - continue; } -// param.put("ServiceFactory", msf); - - DescEntry entry = entries[l]; - //get some helper classes Summarizer sumIt = new Summarizer(); - - TestCase tCase = null; - - try - { - tCase = (TestCase) dcl.getInstance("mod._" + entry.entryName); - } - catch (java.lang.IllegalArgumentException ie) - { - entry.ErrorMsg = ie.getMessage(); - entry.hasErrorMsg = true; - } - catch (java.lang.NoClassDefFoundError ie) - { - entry.ErrorMsg = ie.getMessage(); - entry.hasErrorMsg = true; - } - + TestCase tCase = getTestCase(entry); if (tCase == null) { - Summarizer.summarizeDown(entry, entry.ErrorMsg); - - LogWriter sumObj = OutProducerFactory.createOutProducer(param); - entry.UserDefinedParams = param; - sumObj.initialize(entry, logging); - sumObj.summary(entry); - continue; } - if (debug) - { - System.out.println("sleeping 5 seconds.."); - } - util.utils.shortWait(5000); +// if (m_isDebug) +// { +// System.out.println("sleeping 2 seconds.."); +// } + util.utils.shortWait(2000); System.out.println("Creating: " + entry.entryName); - LogWriter log = (LogWriter) dcl.getInstance((String) param.get("LogWriter")); + LogWriter log = (LogWriter) m_aDynamicClassLoader.getInstance((String) m_aParams.get("LogWriter")); log.initialize(entry, logging); - entry.UserDefinedParams = param; - - TestEnvironment tEnv = null; + entry.UserDefinedParams = m_aParams; - try - { - tCase.setLogWriter((PrintWriter) log); - tCase.initializeTestCase(param); - tEnv = tCase.getTestEnvironment(param); - } - catch (Exception e) - { - System.out.println("Exception while creating " + tCase.getObjectName()); - System.out.println("Message " + e.getMessage()); - e.printStackTrace(); - tEnv = null; - } - catch (java.lang.UnsatisfiedLinkError e) - { - System.out.println("Exception while creating " + tCase.getObjectName()); - System.out.println("Message " + e.getMessage()); - tEnv = null; - } - catch (java.lang.NoClassDefFoundError e) - { - System.out.println("Exception while creating " + tCase.getObjectName()); - System.out.println("Message " + e.getMessage()); - tEnv = null; - } + tCase.setLogWriter((PrintWriter) log); + tCase.initializeTestCase(m_aParams); + TestEnvironment tEnv = getTestEnvironment(tCase, entry); if (tEnv == null) { - Summarizer.summarizeDown(entry, "Couldn't create " + tCase.getObjectName()); - - LogWriter sumObj = OutProducerFactory.createOutProducer(param); - entry.UserDefinedParams = param; - sumObj.initialize(entry, logging); - sumObj.summary(entry); - continue; } - System.out.println(tCase.getObjectName() + " recreated "); + final String sObjectName = tCase.getObjectName(); + // System.out.println(sObjectName + " recreated "); for (int j = 0; j < entry.SubEntryCount; j++) { DescEntry aSubEntry = entry.SubEntries[j]; - if (!aSubEntry.isToTest) + final boolean bIsToTest = aSubEntry.isToTest; + if (!bIsToTest) { Summarizer.summarizeDown(aSubEntry, "not part of the job"); - continue; } - if ((exclusions != null) && (exclusions.contains(aSubEntry.longName))) + // final String sEntryName = aSubEntry.entryName; + final String sLongEntryName = aSubEntry.longName; + + if ((exclusions != null) && (exclusions.contains(sLongEntryName))) { Summarizer.summarizeDown(aSubEntry, "known issue"); - continue; } - System.out.println("running: '" + aSubEntry.entryName + "'"); + // System.out.println("running: '" + sLongEntryName + "' testcode: [" + sEntryName + "]"); + // this will shown in test itself - LogWriter ifclog = (LogWriter) dcl.getInstance( (String) param.get("LogWriter")); + LogWriter ifclog = (LogWriter) m_aDynamicClassLoader.getInstance( (String) m_aParams.get("LogWriter")); ifclog.initialize(aSubEntry, logging); - aSubEntry.UserDefinedParams = param; + aSubEntry.UserDefinedParams = m_aParams; aSubEntry.Logger = ifclog; if ((tEnv == null) || tEnv.isDisposed()) { closeExistingOffice(); - tEnv = getEnv(entry, param); + tEnv = getEnv(entry, m_aParams); } // MultiMethodTest ifc = null; @@ -288,7 +233,7 @@ public class java_fat implements TestBase { countInterfaceTestRun++; finished = true; - res = executeInterfaceTest(aSubEntry, tEnv, param); + res = executeInterfaceTest(aSubEntry, tEnv, m_aParams); } catch (IllegalArgumentException iae) { @@ -305,7 +250,7 @@ public class java_fat implements TestBase catch (java.lang.RuntimeException e) { closeExistingOffice(); - tEnv = getEnv(entry, param); + tEnv = getEnv(entry, m_aParams); if (countInterfaceTestRun < 2) { finished = false; @@ -320,8 +265,8 @@ public class java_fat implements TestBase sumIt.summarizeUp(aSubEntry); - LogWriter sumIfc = OutProducerFactory.createOutProducer(param); - aSubEntry.UserDefinedParams = param; + LogWriter sumIfc = OutProducerFactory.createOutProducer(m_aParams); + aSubEntry.UserDefinedParams = m_aParams; sumIfc.initialize(aSubEntry, logging); sumIfc.summary(aSubEntry); } @@ -330,7 +275,7 @@ public class java_fat implements TestBase { if (!keepdocument) { - tCase.cleanupTestCase(param); + tCase.cleanupTestCase(m_aParams); } } catch (Exception e) @@ -344,7 +289,7 @@ public class java_fat implements TestBase sumIt.summarizeUp(entry); - LogWriter sumObj = OutProducerFactory.createOutProducer(param); + LogWriter sumObj = OutProducerFactory.createOutProducer(m_aParams); sumObj.initialize(entry, logging); sumObj.summary(entry); @@ -359,7 +304,8 @@ public class java_fat implements TestBase for (int i = 0; i < entries.length; i++) { - if (!entries[i].State.endsWith("OK")) + final String sState = entries[i].State; + if (!sState.endsWith("OK")) { System.out.println("\t " + entries[i].longName); counter++; @@ -373,6 +319,78 @@ public class java_fat implements TestBase return retValue; } +// + private TestEnvironment getTestEnvironment(TestCase tCase, DescEntry entry) + { + TestEnvironment tEnv = null; + + try + { + tEnv = tCase.getTestEnvironment(m_aParams); + } + catch (Exception e) + { + System.out.println("Exception while creating " + tCase.getObjectName()); + System.out.println("Message " + e.getMessage()); + e.printStackTrace(); + tEnv = null; + } + catch (java.lang.UnsatisfiedLinkError e) + { + System.out.println("Exception while creating " + tCase.getObjectName()); + System.out.println("Message " + e.getMessage()); + tEnv = null; + } + catch (java.lang.NoClassDefFoundError e) + { + System.out.println("Exception while creating " + tCase.getObjectName()); + System.out.println("Message " + e.getMessage()); + tEnv = null; + } + + if (tEnv == null) + { + Summarizer.summarizeDown(entry, "Couldn't create " + tCase.getObjectName()); + + LogWriter sumObj = OutProducerFactory.createOutProducer(m_aParams); + entry.UserDefinedParams = m_aParams; + sumObj.initialize(entry, logging); + sumObj.summary(entry); + } + return tEnv; + } + // ------------------------------------------------------------------------- + private TestCase getTestCase(DescEntry _aEntry) + { + TestCase tCase = null; + + try + { + tCase = (TestCase) m_aDynamicClassLoader.getInstance("mod._" + _aEntry.entryName); + } + catch (java.lang.IllegalArgumentException ie) + { + _aEntry.ErrorMsg = ie.getMessage(); + _aEntry.hasErrorMsg = true; + } + catch (java.lang.NoClassDefFoundError ie) + { + _aEntry.ErrorMsg = ie.getMessage(); + _aEntry.hasErrorMsg = true; + } + + if (tCase == null) + { + Summarizer.summarizeDown(_aEntry, _aEntry.ErrorMsg); + + LogWriter sumObj = OutProducerFactory.createOutProducer(m_aParams); + _aEntry.UserDefinedParams = m_aParams; + sumObj.initialize(_aEntry, logging); + sumObj.summary(_aEntry); + } + return tCase; +} + private void setState(DescEntry aSubEntry, lib.TestResult res) { if (res != null) @@ -390,10 +408,10 @@ public class java_fat implements TestBase private TestEnvironment getEnv(DescEntry entry, TestParameters param) { -// if (dcl == null) -// dcl = new DynamicClassLoader(); -// String officeProviderName = (String) param.get("OfficeProvider"); -// AppProvider office = (AppProvider) dcl.getInstance(officeProviderName); +// if (m_aDynamicClassLoader == null) +// m_aDynamicClassLoader = new DynamicClassLoader(); +// String officeProviderName = (String) m_aParams.get("OfficeProvider"); +// AppProvider office = (AppProvider) m_aDynamicClassLoader.getInstance(officeProviderName); // // if (office == null) { // System.out.println("ERROR: Wrong parameter 'OfficeProvider', " + @@ -402,21 +420,21 @@ public class java_fat implements TestBase // } // // XMultiServiceFactory msf = (XMultiServiceFactory) office.getManager( -// param); +// m_aParams); // // if (msf == null) { // return null; // } // -// param.put("ServiceFactory", msf); +// m_aParams.put("ServiceFactory", msf); - // AppProvider office = startOffice(param); + // AppProvider office = startOffice(m_aParams); TestCase tCase = null; try { - tCase = (TestCase) dcl.getInstance("mod._" + entry.entryName); + tCase = (TestCase) m_aDynamicClassLoader.getInstance("mod._" + entry.entryName); } catch (java.lang.IllegalArgumentException ie) { @@ -433,7 +451,7 @@ public class java_fat implements TestBase entry.UserDefinedParams = param; - LogWriter log = (LogWriter) dcl.getInstance((String) param.get("LogWriter")); + LogWriter log = (LogWriter) m_aDynamicClassLoader.getInstance((String) param.get("LogWriter")); log.initialize(entry, logging); tCase.setLogWriter((PrintWriter) log); @@ -469,21 +487,21 @@ public class java_fat implements TestBase if (ph != null) { m_aOffice.closeExistingOffice(m_aParams, true); - shortWait(5000); + util.utils.shortWait(5000); } } - private void shortWait(int millis) - { - try - { - Thread.sleep(millis); - } - catch (java.lang.InterruptedException ie) - { - } - } +// private void shortWait(int millis) +// { +// try +// { +// Thread.sleep(millis); +// } +// catch (java.lang.InterruptedException ie) +// { +// } +// } private Vector getExclusionList(String url, boolean debug) { @@ -548,20 +566,20 @@ public class java_fat implements TestBase DescEntry entry, TestEnvironment tEnv, TestParameters param) throws IllegalArgumentException, java.lang.NoClassDefFoundError { - MultiMethodTest ifc = (MultiMethodTest) dcl.getInstance(entry.entryName); + MultiMethodTest ifc = (MultiMethodTest) m_aDynamicClassLoader.getInstance(entry.entryName); return ifc.run(entry, tEnv, param); } private AppProvider startOffice(lib.TestParameters param) { - if (dcl == null) + if (m_aDynamicClassLoader == null) { - dcl = new DynamicClassLoader(); + m_aDynamicClassLoader = new DynamicClassLoader(); } String officeProviderName = (String) param.get("OfficeProvider"); - AppProvider office = (AppProvider) dcl.getInstance(officeProviderName); + AppProvider office = (AppProvider) m_aDynamicClassLoader.getInstance(officeProviderName); if (office == null) { diff --git a/qadevOOo/runner/base/java_fat_service.java b/qadevOOo/runner/base/java_fat_service.java index 151a31dadeb0..0c8fd17e43ec 100644 --- a/qadevOOo/runner/base/java_fat_service.java +++ b/qadevOOo/runner/base/java_fat_service.java @@ -41,7 +41,6 @@ import com.sun.star.lang.XMultiServiceFactory; import share.DescEntry; import share.DescGetter; import helper.APIDescGetter; -import base.TestBase; import share.LogWriter; import stats.Summarizer; @@ -174,7 +173,11 @@ public class java_fat_service implements TestBase { entry.SubEntries[j].entryName); if ((tEnv != null) && (ifc != null)) { res = ifc.run(entry.SubEntries[j],tEnv,param); - } else res = null; + } + else + { + res = null; + } } if (res != null) { for (int k=0;k<entry.SubEntries[j].SubEntryCount;k++) { @@ -227,34 +230,38 @@ public class java_fat_service implements TestBase { TestCase tCase = null; - try { - tCase = (TestCase) - dcl.getInstance("mod._"+entry.entryName); - } catch (java.lang.IllegalArgumentException ie) { + try + { + tCase = (TestCase) dcl.getInstance("mod._"+entry.entryName); + } + catch (java.lang.IllegalArgumentException ie) + { entry.ErrorMsg=ie.getMessage(); entry.hasErrorMsg=true; } log.println("Creating: "+tCase.getObjectName()); - LogWriter log = (LogWriter)dcl.getInstance( - (String)param.get("LogWriter")); + // LogWriter log = (LogWriter)dcl.getInstance( (String)param.get("LogWriter")); log.initialize(entry,true); entry.UserDefinedParams = param; tCase.setLogWriter((PrintWriter) log); TestEnvironment tEnv = null; - try { + try + { tCase.initializeTestCase(param); tEnv = tCase.getTestEnvironment(param); - } catch (com.sun.star.lang.DisposedException de) { + } + catch (com.sun.star.lang.DisposedException de) + { log.println("Office disposed"); } return tEnv; } - protected void shortWait(int millis) { - try { - Thread.sleep(millis); - } catch (java.lang.InterruptedException ie) {} - } +// protected void shortWait(int millis) { +// try { +// Thread.sleep(millis); +// } catch (java.lang.InterruptedException ie) {} +// } } diff --git a/qadevOOo/runner/basicrunner/basichelper/Filter.java b/qadevOOo/runner/basicrunner/basichelper/Filter.java index dd45e1fddc81..d9616d30e5b2 100644 --- a/qadevOOo/runner/basicrunner/basichelper/Filter.java +++ b/qadevOOo/runner/basicrunner/basichelper/Filter.java @@ -32,7 +32,6 @@ import com.sun.star.lang.XTypeProvider; import com.sun.star.uno.Type; import com.sun.star.container.XNameAccess; import com.sun.star.container.NoSuchElementException; -import com.sun.star.uno.AnyConverter; import com.sun.star.uno.UnoRuntime; import com.sun.star.lang.XSingleServiceFactory; import com.sun.star.document.XFilter; @@ -224,7 +223,8 @@ class FilterImpl implements XInitialization, XTypeProvider, XNameAccess { public void initialize(Object[] parm1) throws com.sun.star.uno.Exception { XFilter oFilter = (XFilter)UnoRuntime.queryInterface( XFilter.class, parm1[0]); - PropertyValue[] FilterDesc = (PropertyValue[])AnyConverter.toArray(parm1[1]); +//? PropertyValue[] FilterDesc = (PropertyValue[])AnyConverter.toArray(parm1[1]); + PropertyValue[] FilterDesc = (PropertyValue[])UnoRuntime.queryInterface(PropertyValue[].class, parm1[1]); aState = "just initialized"; FilterThread aThread = new FilterThread(oFilter, FilterDesc); aThread.start(); diff --git a/qadevOOo/runner/complexlib/ComplexTestCase.java b/qadevOOo/runner/complexlib/ComplexTestCase.java index 8f67cd959f28..b15224bc503f 100644 --- a/qadevOOo/runner/complexlib/ComplexTestCase.java +++ b/qadevOOo/runner/complexlib/ComplexTestCase.java @@ -44,8 +44,6 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest protected static TestParameters param = null; /** Log writer **/ protected static LogWriter log = null; - /** Description entry **/ - protected DescEntry subEntry = null; /** * The method name which will be written into f.e. the data base **/ @@ -53,42 +51,33 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest /** Maximal time one method is allowed to execute * Can be set with parameter 'ThreadTimeOut' **/ - protected int mThreadTimeOut = 0; + protected int m_nThreadTimeOut = 0; /** Continue a test even if it did fail **/ // public static final boolean CONTINUE = true; /** End a test if it did fail **/ public static final boolean BREAK = true; + private boolean m_bBeforeCalled; + /** - * Call test. It is expected, that an environment is - * given to this test. - * - * @param entry The name of the test method that should be called. - * @param environment The environment for the test. + * is called before the real test starts */ - public void executeMethods(DescEntry entry, TestParameters environment) + private void before() { - - // get the environment - param = environment; - log = entry.Logger; - - mThreadTimeOut = param.getInt("ThreadTimeOut"); - if (mThreadTimeOut == 0) - { - mThreadTimeOut = 300000; - } - // start with the before() method - boolean beforeWorked = true; try { Method before = this.getClass().getMethod("before", new Class[] {} ); before.invoke(this, new Object[] {} ); + + // beforeWorked = false; + m_bBeforeCalled = true; } catch (java.lang.NoSuchMethodException e) { // simply ignore + int dummy = 0; + m_bBeforeCalled = true; } catch (java.lang.IllegalAccessException e) { @@ -96,7 +85,6 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest } catch (java.lang.reflect.InvocationTargetException e) { - beforeWorked = false; Throwable t = e.getTargetException(); if (!(t instanceof RuntimeException) || state) { @@ -110,12 +98,25 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest } } + } - //executeMethodTests - for (int i = 0; i < entry.SubEntries.length; i++) + /** Description entry **/ + // protected DescEntry subEntry = null; + + private void test_method(DescEntry _entry) + { + + m_nThreadTimeOut = param.getInt("ThreadTimeOut"); + if (m_nThreadTimeOut == 0) { - subEntry = entry.SubEntries[i]; - if (beforeWorked) + m_nThreadTimeOut = 300000; + } + + for (int i = 0; i < _entry.SubEntries.length; i++) + { + + DescEntry subEntry = _entry.SubEntries[i]; + if (m_bBeforeCalled) { state = true; message = ""; @@ -138,10 +139,7 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest { String sParameter = (entryName.substring(entryName.indexOf("(") + 1, entryName.indexOf(")"))); mTestMethodName = entryName; - parameter = new String[] - { - sParameter - }; + parameter = new String[] { sParameter }; entryName = entryName.substring(0, entryName.indexOf("(")); testMethod = this.getClass().getMethod(entryName, new Class[] { String.class }); } @@ -170,7 +168,7 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest int sleepingStep = 1000; int factor = 0; - while (th.isAlive() && (lastPing != newPing || factor * sleepingStep < mThreadTimeOut)) + while (th.isAlive() && (lastPing != newPing || factor * sleepingStep < m_nThreadTimeOut)) { Thread.sleep(sleepingStep); factor++; @@ -193,7 +191,7 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest { log.println("Destroy " + mTestMethodName); th.destroy(); - subEntry.State = "Test did sleep for " + (mThreadTimeOut / 1000) + " seconds and has been killed!"; + subEntry.State = "Test did sleep for " + (m_nThreadTimeOut / 1000) + " seconds and has been killed!"; subEntry.hasErrorMsg = true; subEntry.ErrorMsg = subEntry.State; continue; @@ -225,8 +223,14 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest subEntry.hasErrorMsg = !state; subEntry.ErrorMsg = message; } + } - if (beforeWorked) + /** + * after() is called after the test is done + */ + private void after() + { + if (m_bBeforeCalled) { // the after() method try @@ -261,8 +265,38 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest } } } + + } + + + + /** + * Call test. It is expected, that an environment is + * given to this test. + * + * @param entry The name of the test method that should be called. + * @param environment The environment for the test. + */ + public void executeMethods(DescEntry entry, TestParameters environment) + { + m_bBeforeCalled = false; + + // get the environment + param = environment; + log = entry.Logger; + + + // start with the before() method + before(); + + //executeMethodTests + test_method(entry); + + // cleanup + after(); } + /** * Implement this method in the Complex test. * @return All test method names. diff --git a/qadevOOo/runner/convwatch/BuildID.java b/qadevOOo/runner/convwatch/BuildID.java index a1ef08f118f8..efb091d160f9 100644 --- a/qadevOOo/runner/convwatch/BuildID.java +++ b/qadevOOo/runner/convwatch/BuildID.java @@ -136,28 +136,28 @@ public class BuildID } return sBuildID; } - public static void main(String[] args) - { - String sApp; - sApp = "/opt/staroffice8_m116/program/soffice -headless -accept=socket,host=localhost,port=8100;urp;"; - String sBuildID; - sBuildID = getBuildID(sApp); - System.out.println("BuildID is: " + sBuildID); - - Date aDate = new Date(); - long nStart = aDate.getTime(); - System.out.println("Time:" + nStart); - // LLA: Just some more tests for getBuildID - // sApp = "/opt/staroffice8_net/program/soffice"; - // sBuildID = getBuildID(sApp); - // System.out.println("BuildID is: " + sBuildID); - // - // sApp = "\"/opt/staroffice8_net/program/soffice\" test blah"; - // sBuildID = getBuildID(sApp); - // - // System.out.println("BuildID is: " + sBuildID); - System.exit(1); - } +// public static void main(String[] args) +// { +// String sApp; +// sApp = "/opt/staroffice8_m116/program/soffice -headless -accept=socket,host=localhost,port=8100;urp;"; +// String sBuildID; +// sBuildID = getBuildID(sApp); +// System.out.println("BuildID is: " + sBuildID); +// +// Date aDate = new Date(); +// long nStart = aDate.getTime(); +// System.out.println("Time:" + nStart); +// // LLA: Just some more tests for getBuildID +// // sApp = "/opt/staroffice8_net/program/soffice"; +// // sBuildID = getBuildID(sApp); +// // System.out.println("BuildID is: " + sBuildID); +// // +// // sApp = "\"/opt/staroffice8_net/program/soffice\" test blah"; +// // sBuildID = getBuildID(sApp); +// // +// // System.out.println("BuildID is: " + sBuildID); +// System.exit(1); +// } } diff --git a/qadevOOo/runner/convwatch/IniFile.java b/qadevOOo/runner/convwatch/IniFile.java index 27b815e81302..fbcaaea0b33b 100644 --- a/qadevOOo/runner/convwatch/IniFile.java +++ b/qadevOOo/runner/convwatch/IniFile.java @@ -435,18 +435,18 @@ class IniFile /** * some tests for this class */ - public static void main(String[] args) - { - IniFile aIniFile = new IniFile("/tmp/inifile"); - String sValue = aIniFile.getValue("Section","Key"); - // insert a new value to a already exist section - aIniFile.insertValue("Section","Key2","a new value in a existing section"); - // replace a value - aIniFile.insertValue("Section","Key","replaced value"); - // create a new value - aIniFile.insertValue("New Section", "Key", "a new key value pair"); - - String sValue2 = aIniFile.getValue("Section2","Key"); - aIniFile.store(); - } +// public static void main(String[] args) +// { +// IniFile aIniFile = new IniFile("/tmp/inifile"); +// String sValue = aIniFile.getValue("Section","Key"); +// // insert a new value to a already exist section +// aIniFile.insertValue("Section","Key2","a new value in a existing section"); +// // replace a value +// aIniFile.insertValue("Section","Key","replaced value"); +// // create a new value +// aIniFile.insertValue("New Section", "Key", "a new key value pair"); +// +// String sValue2 = aIniFile.getValue("Section2","Key"); +// aIniFile.store(); +// } } diff --git a/qadevOOo/runner/convwatch/OfficePrint.java b/qadevOOo/runner/convwatch/OfficePrint.java index adf75f093c50..7f9b86f2f920 100644 --- a/qadevOOo/runner/convwatch/OfficePrint.java +++ b/qadevOOo/runner/convwatch/OfficePrint.java @@ -108,7 +108,8 @@ public class OfficePrint { } catch (com.sun.star.lang.IllegalArgumentException e) { - GlobalLogWriter.get().println("showProperty: can't convert a object to string."); + // GlobalLogWriter.get().println("showProperty: can't convert a object to string."); + GlobalLogWriter.get().println("Property " + sName + ":= a Object which can't convert by AnyConverter()"); } } @@ -627,11 +628,12 @@ public class OfficePrint { { XPropertySet xPropSet = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, aSettings ); xPropSet.setPropertyValue( "PrintAllSheets", new Boolean( true ) ); + GlobalLogWriter.get().println("PrintAllSheets := true"); } } ArrayList aPrintProps = new ArrayList(); - GlobalLogWriter.get().println("Property FileName:=" + _sPrintFileURL); + // GlobalLogWriter.get().println("Property FileName:=" + _sPrintFileURL); // PropertyValue [] aPrintProps = new PropertyValue[nProperties]; PropertyValue Arg = new PropertyValue(); @@ -639,7 +641,7 @@ public class OfficePrint { Arg.Value = _sPrintFileURL; // aPrintProps[nPropsCount ++] = Arg; aPrintProps.add(Arg); - // showProperty(Arg); + showProperty(Arg); if (_aGTA.printAllPages() == false) { @@ -661,8 +663,8 @@ public class OfficePrint { Arg.Name = "Pages"; Arg.Value = sPages; aPrintProps.add(Arg); + showProperty(Arg); } - showProperty(Arg); // GlobalLogWriter.get().println("Start printing."); diff --git a/qadevOOo/runner/convwatch/PerformanceContainer.java b/qadevOOo/runner/convwatch/PerformanceContainer.java index 7a3c39398165..d0c1e0fb5ed1 100644 --- a/qadevOOo/runner/convwatch/PerformanceContainer.java +++ b/qadevOOo/runner/convwatch/PerformanceContainer.java @@ -232,18 +232,19 @@ public class PerformanceContainer /* extends *//* implements */ { } } - public static void main(String[] args) { +// public static void main(String[] args) { +// +///* +// BorderRemover a = new BorderRemover(); +// try +// { +// a.createNewImageWithoutBorder(args[0], args[1]); +// } +// catch(java.io.IOException e) +// { +// System.out.println("Exception caught."); +// } +// */ +// } -/* - BorderRemover a = new BorderRemover(); - try - { - a.createNewImageWithoutBorder(args[0], args[1]); - } - catch(java.io.IOException e) - { - System.out.println("Exception caught."); - } - */ - } } diff --git a/qadevOOo/runner/convwatch/PixelCounter.java b/qadevOOo/runner/convwatch/PixelCounter.java index 3398db89df33..116b07e48d8e 100644 --- a/qadevOOo/runner/convwatch/PixelCounter.java +++ b/qadevOOo/runner/convwatch/PixelCounter.java @@ -184,22 +184,23 @@ public class PixelCounter { // ----------------------------------------------------------------------------- - public static void main(String[] args) { +// public static void main(String[] args) { +// +// String a = helper.StringHelper.createValueString(10, 4); +// int dummy = 1; +///* +// BorderRemover a = new BorderRemover(); +// try +// { +// a.createNewImageWithoutBorder(args[0], args[1]); +// } +// catch(java.io.IOException e) +// { +// System.out.println("Exception caught."); +// } +// */ +// } - String a = helper.StringHelper.createValueString(10, 4); - int dummy = 1; -/* - BorderRemover a = new BorderRemover(); - try - { - a.createNewImageWithoutBorder(args[0], args[1]); - } - catch(java.io.IOException e) - { - System.out.println("Exception caught."); - } - */ - } } diff --git a/qadevOOo/runner/graphical/BuildID.java b/qadevOOo/runner/graphical/BuildID.java index a2cbf63cf8cf..4c5907ff34ad 100644 --- a/qadevOOo/runner/graphical/BuildID.java +++ b/qadevOOo/runner/graphical/BuildID.java @@ -32,20 +32,23 @@ import helper.OSHelper; public class BuildID { - public static String getBuildID(String _sApp) + private static String getOfficePath(String _sApp) + { + String sOfficePath = ""; + // TODO: StringHelper.removeQuote? + if (_sApp.startsWith("\"")) { - String sOfficePath = ""; - // TODO: StringHelper.removeQuote? - if (_sApp.startsWith("\"")) + int nIdx = _sApp.indexOf("\"", 1); + if (nIdx != -1) { - int nIdx = _sApp.indexOf("\"", 1); - if (nIdx != -1) - { - // leave double qoute out. - sOfficePath = _sApp.substring(1, nIdx); - } + // leave double qoute out. + sOfficePath = _sApp.substring(1, nIdx); } - else + } + else + { + // check if _sApp ends with the office executable, if not + if (! (_sApp.endsWith("soffice.exe") || _sApp.endsWith("soffice"))) { // check if a space exist, so we get all until space int nIdx = _sApp.indexOf(" ", 1); @@ -58,19 +61,34 @@ public class BuildID sOfficePath = _sApp.substring(0, nIdx); } } - GlobalLogWriter.get().println("Office path: " + sOfficePath); + else + { + sOfficePath = _sApp; + } + } + // GlobalLogWriter.get().println("Office path: " + sOfficePath); + return sOfficePath; + } - // String fs = System.getProperty("file.separator"); + public static String getBuildID(String _sApp) + { + final String sOfficePath = getOfficePath(_sApp); + final String sBuildID = getBuildID(sOfficePath, "buildid"); + return sBuildID; + } + + private static String getBuildID(String _sOfficePath, String _sIniSection) + { + File aSOfficeFile = new File(_sOfficePath); String sBuildID = ""; - File aSOfficeFile = new File(sOfficePath); if (aSOfficeFile.exists()) { - sOfficePath = FileHelper.getPath(sOfficePath); + String sOfficePath = FileHelper.getPath(_sOfficePath); // ok. System.out.println("directory: " + sOfficePath); - sBuildID = getBuildIDFromBootstrap(sOfficePath); + sBuildID = getBuildIDFromBootstrap(sOfficePath, _sIniSection); if (sBuildID.length() == 0) { - sBuildID = getBuildIDFromVersion(sOfficePath); + sBuildID = getBuildIDFromVersion(sOfficePath, _sIniSection); } } else @@ -82,7 +100,7 @@ public class BuildID return sBuildID; } - private static String getBuildIDFromBootstrap(String _sOfficePath) + private static String getBuildIDFromBootstrap(String _sOfficePath, String _sIniSection) { String sBuildID = ""; String sOfficePath; @@ -97,7 +115,7 @@ public class BuildID IniFile aIniFile = new IniFile(sOfficePath); if (aIniFile.is()) { - sBuildID = aIniFile.getValue("Bootstrap", "buildid"); + sBuildID = aIniFile.getValue("Bootstrap", /*"buildid"*/ _sIniSection); } else { @@ -106,7 +124,7 @@ public class BuildID return sBuildID; } - private static String getBuildIDFromVersion(String _sOfficePath) + private static String getBuildIDFromVersion(String _sOfficePath, String _sIniSection) { // String fs = System.getProperty("file.separator"); String sBuildID = ""; @@ -122,7 +140,7 @@ public class BuildID IniFile aIniFile = new IniFile(sOfficePath); if (aIniFile.is()) { - sBuildID = aIniFile.getValue("Version", "buildid"); + sBuildID = aIniFile.getValue("Version", /*"buildid"*/ _sIniSection); } else { @@ -154,5 +172,55 @@ public class BuildID // System.exit(1); // } -} + public static String getMaster(String _sOfficePath) + { + final String sOfficePath = getOfficePath(_sOfficePath); + final String sMaster = getBuildID(sOfficePath, "ProductSource"); + return sMaster; + } + public static String getMinor(String _sOfficePath) + { + final String sOfficePath = getOfficePath(_sOfficePath); + final String sMinor = "m" + getBuildID(sOfficePath, "ProductMinor"); + return sMinor; + } + + public static String getCWSName(String _sOfficePath) + { + final String sOfficePath = getOfficePath(_sOfficePath); + final String sBuildID = getBuildID(sOfficePath, "buildid"); + String sCWSName = "MWS"; + int nIdx = sBuildID.indexOf("[CWS:"); + if (nIdx > 0) + { + int nIdx2 = sBuildID.indexOf("]", nIdx); + sCWSName = sBuildID.substring(nIdx + 5, nIdx2); + } + return sCWSName; + } + +// public static void main(String[] args) +// { +// String sApp; +// sApp = "D:/staroffice9_m63/Sun/StarOffice 9/program/soffice.exe"; +// String sBuildID; +// sBuildID = getBuildID(sApp); +// System.out.println("BuildID is: " + sBuildID); +// +// String sMaster; +// sMaster = getMaster(sApp); +// System.out.println("Master is: " + sMaster); +// +// String sMinor; +// sMinor = getMinor(sApp); +// System.out.println("Minor is: " + sMinor); +// +// String sCWSName; +// sCWSName = getCWSName(sApp); +// System.out.println("CWSName is: " + sCWSName); +// +// System.exit(1); +// } + +} diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java index 5173c493f46a..832aef795e71 100644 --- a/qadevOOo/runner/graphical/IniFile.java +++ b/qadevOOo/runner/graphical/IniFile.java @@ -588,29 +588,29 @@ public class IniFile implements Enumeration /** * some tests for this class */ - public static void main(String[] args) - { - String sTempFile = System.getProperty("java.io.tmpdir"); - sTempFile += "inifile"; - - - IniFile aIniFile = new IniFile(sTempFile); - String sValue = aIniFile.getValue("Section", "Key"); - // insert a new value to a already exist section - aIniFile.insertValue("Section", "Key2", "a new value in a existing section"); - // replace a value - aIniFile.insertValue("Section", "Key", "replaced value"); - // create a new value - aIniFile.insertValue("New Section", "Key", "a new key value pair"); - aIniFile.insertValue("New Section", "Key2", "a new second key value pair"); - - String sValue2 = aIniFile.getValue("Section2", "Key"); - - aIniFile.removeSection("Section"); - aIniFile.removeSection("New Section"); - - aIniFile.close(); - } +// public static void main(String[] args) +// { +// String sTempFile = System.getProperty("java.io.tmpdir"); +// sTempFile += "inifile"; +// +// +// IniFile aIniFile = new IniFile(sTempFile); +// String sValue = aIniFile.getValue("Section", "Key"); +// // insert a new value to a already exist section +// aIniFile.insertValue("Section", "Key2", "a new value in a existing section"); +// // replace a value +// aIniFile.insertValue("Section", "Key", "replaced value"); +// // create a new value +// aIniFile.insertValue("New Section", "Key", "a new key value pair"); +// aIniFile.insertValue("New Section", "Key2", "a new second key value pair"); +// +// String sValue2 = aIniFile.getValue("Section2", "Key"); +// +// aIniFile.removeSection("Section"); +// aIniFile.removeSection("New Section"); +// +// aIniFile.close(); +// } /** * Enumeration Interface diff --git a/qadevOOo/runner/graphical/JPEGComparator.java b/qadevOOo/runner/graphical/JPEGComparator.java index 851d129141ea..ed3417e04c9c 100644 --- a/qadevOOo/runner/graphical/JPEGComparator.java +++ b/qadevOOo/runner/graphical/JPEGComparator.java @@ -338,6 +338,8 @@ public class JPEGComparator extends EnhancedComplexTestCase String sDestination = FileHelper.appendPath(sDestinationPath, sNewSourceBasename); FileHelper.copy(sSource, sDestination); sSourceBasename = sNewSourceBasename; + // + JPEGCreator.convertToNearSameFileWithWidth340(sDestination); } String sDifferenceBasename = "Difference_between_" + FileHelper.getNameNoSuffix(sSourceBasename) + "_and_" + FileHelper.getNameNoSuffix(sDestinationBasename) + ".jpg"; // String sDifferencePath = sDestinationPath; @@ -643,30 +645,30 @@ public class JPEGComparator extends EnhancedComplexTestCase - public static void main(String [] _args) - { -// give an index.ini file, ok -// give a directory, where exist jpeg files ok -// inputpath (given file) doesn't exists -// give a jpeg file. - - String args[] = { - "-TimeOut", "3600000", - "-tb", "java_complex", - "-o", "graphical.JPEGComparator", - "-DOC_COMPARATOR_INPUT_PATH", "C:\\CWS\\temp\\output\\index.ini", - "-DOC_COMPARATOR_OUTPUT_PATH", "C:\\CWS\\temp\\output2", -// "-DOC_COMPARATOR_INPUT_PATH", "C:\\CWS\\temp\\output\\GroupReport.odt.pdf_180DPI_0001.jpg", -// "-DOC_COMPARATOR_OUTPUT_PATH", "C:\\CWS\\temp\\output2\\Report1.odt.pdf_180DPI_0001.jpg", - "-DOC_COMPARATOR_HTML_OUTPUT_PREFIX", "http://so-gfxcmp-lin.germany.sun.com/gfxcmp_ui/cw.php?inifile=", -// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "PDF", /* default: "OOo" */ -// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "msoffice", /* default: "OOo" */ -// "-OFFICE_VIEWABLE", "false", -// "-AppExecutionCommand", "\"C:/Programme/sun/staroffice 9/program/soffice.exe\" -norestore -nocrashreport -accept=pipe,name=ll93751;urp;", - "-NoOffice" - }; - - org.openoffice.Runner.main(args); - } +// public static void main(String [] _args) +// { +//// give an index.ini file, ok +//// give a directory, where exist jpeg files ok +//// inputpath (given file) doesn't exists +//// give a jpeg file. +// +// String args[] = { +// "-TimeOut", "3600000", +// "-tb", "java_complex", +// "-o", "graphical.JPEGComparator", +// "-DOC_COMPARATOR_INPUT_PATH", "C:\\CWS\\temp\\output\\index.ini", +// "-DOC_COMPARATOR_OUTPUT_PATH", "C:\\CWS\\temp\\output2", +//// "-DOC_COMPARATOR_INPUT_PATH", "C:\\CWS\\temp\\output\\GroupReport.odt.pdf_180DPI_0001.jpg", +//// "-DOC_COMPARATOR_OUTPUT_PATH", "C:\\CWS\\temp\\output2\\Report1.odt.pdf_180DPI_0001.jpg", +// "-DOC_COMPARATOR_HTML_OUTPUT_PREFIX", "http://so-gfxcmp-lin.germany.sun.com/gfxcmp_ui/cw.php?inifile=", +//// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "PDF", /* default: "OOo" */ +//// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "msoffice", /* default: "OOo" */ +//// "-OFFICE_VIEWABLE", "false", +//// "-AppExecutionCommand", "\"C:/Programme/sun/staroffice 9/program/soffice.exe\" -norestore -nocrashreport -accept=pipe,name=ll93751;urp;", +// "-NoOffice" +// }; +// +// org.openoffice.Runner.main(args); +// } } diff --git a/qadevOOo/runner/graphical/JPEGCreator.java b/qadevOOo/runner/graphical/JPEGCreator.java index c35f89b39da8..5f6343d9780d 100644 --- a/qadevOOo/runner/graphical/JPEGCreator.java +++ b/qadevOOo/runner/graphical/JPEGCreator.java @@ -124,9 +124,14 @@ public class JPEGCreator extends EnhancedComplexTestCase */ public static void convertToNearSameFileWithWidth340(String _sJPEGFilename) { + String sJPEGFilename = _sJPEGFilename.replaceAll("\\\\", "/"); +// if (OSHelper.isWindows()) +// { +// sJPEGFilename = sJPEGFilename.replaceAll("/", "\\\\"); +// } String sNewJPEGFilename; - sNewJPEGFilename = util.utils.replaceAll13(_sJPEGFilename, ".jpg", "_w340.jpg"); - convertToWidth340(_sJPEGFilename, sNewJPEGFilename); + sNewJPEGFilename = util.utils.replaceAll13(sJPEGFilename, ".jpg", "_w340.jpg"); + convertToWidth340(sJPEGFilename, sNewJPEGFilename); } /** @@ -153,7 +158,9 @@ private static void convertToWidth340(String _sFrom, String _To) } if (OSHelper.isWindows()) { - sConvertEXE = "convert.exe"; + // TODO! + // HACK Hard coded! + sConvertEXE = "C:\\Programme\\ImageMagick-6.0.3-q8\\convert.exe"; } String[] sCommandArray = @@ -378,14 +385,34 @@ private static void convertToWidth340(String _sFrom, String _To) return nPages; } - public static void main(String [] _args) - { -// DONE: give an index.ini file ok +// public static void main(String [] _args) +// { +//// DONE: give an index.ini file ok +//// String args[] = { +//// "-TimeOut", "3600000", +//// "-tb", "java_complex", +//// "-o", "graphical.JPEGCreator", +//// "-DOC_COMPARATOR_INPUT_PATH", "C:\\CWS\\temp\\output\\index.ini", +//// "-DOC_COMPARATOR_OUTPUT_PATH", "C:\\CWS\\temp\\output", +//// "-DOC_COMPARATOR_PRINT_MAX_PAGE", "9999", +//// "-DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION", "180", +//// "-DOC_COMPARATOR_HTML_OUTPUT_PREFIX", "http://so-gfxcmp-lin.germany.sun.com/gfxcmp_ui/cw.php?inifile=", +////// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "PDF", /* default: "OOo" */ +////// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "msoffice", /* default: "OOo" */ +////// "-OFFICE_VIEWABLE", "false", +//// "-AppExecutionCommand", "\"C:/Programme/sun/staroffice 9/program/soffice.exe\" -norestore -nocrashreport -accept=pipe,name=ll93751;urp;", +//// "-NoOffice" +//// }; +// +//// Done: give a directory, where exist pdf/ps files ok. +//// Done: inputpath (given file) doesn't exists, ok. +//// Done: give a ps/pdf file. ok. +// // String args[] = { // "-TimeOut", "3600000", // "-tb", "java_complex", // "-o", "graphical.JPEGCreator", -// "-DOC_COMPARATOR_INPUT_PATH", "C:\\CWS\\temp\\output\\index.ini", +// "-DOC_COMPARATOR_INPUT_PATH", "C:\\CWS\\temp\\output\\Names7.odt.pdf", // "-DOC_COMPARATOR_OUTPUT_PATH", "C:\\CWS\\temp\\output", // "-DOC_COMPARATOR_PRINT_MAX_PAGE", "9999", // "-DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION", "180", @@ -396,28 +423,8 @@ private static void convertToWidth340(String _sFrom, String _To) // "-AppExecutionCommand", "\"C:/Programme/sun/staroffice 9/program/soffice.exe\" -norestore -nocrashreport -accept=pipe,name=ll93751;urp;", // "-NoOffice" // }; - -// Done: give a directory, where exist pdf/ps files ok. -// Done: inputpath (given file) doesn't exists, ok. -// Done: give a ps/pdf file. ok. - - String args[] = { - "-TimeOut", "3600000", - "-tb", "java_complex", - "-o", "graphical.JPEGCreator", - "-DOC_COMPARATOR_INPUT_PATH", "C:\\CWS\\temp\\output\\Names7.odt.pdf", - "-DOC_COMPARATOR_OUTPUT_PATH", "C:\\CWS\\temp\\output", - "-DOC_COMPARATOR_PRINT_MAX_PAGE", "9999", - "-DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION", "180", - "-DOC_COMPARATOR_HTML_OUTPUT_PREFIX", "http://so-gfxcmp-lin.germany.sun.com/gfxcmp_ui/cw.php?inifile=", -// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "PDF", /* default: "OOo" */ -// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "msoffice", /* default: "OOo" */ -// "-OFFICE_VIEWABLE", "false", - "-AppExecutionCommand", "\"C:/Programme/sun/staroffice 9/program/soffice.exe\" -norestore -nocrashreport -accept=pipe,name=ll93751;urp;", - "-NoOffice" - }; - - org.openoffice.Runner.main(args); - } +// +// org.openoffice.Runner.main(args); +// } } diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java index 9c9d7375fd60..8a85c6b32afd 100644 --- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java @@ -980,8 +980,8 @@ public class MSOfficePostscriptCreator implements IOffice return sType; } - public static void main(String [] _args) - { - String sTest = getXMLDocumentFormat("c:/cws/temp/input/Blah Fasel.xml"); - } +// public static void main(String [] _args) +// { +// String sTest = getXMLDocumentFormat("c:/cws/temp/input/Blah Fasel.xml"); +// } } diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java index 9db2f390a317..06330a06d9ab 100644 --- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java @@ -599,11 +599,12 @@ public class OpenOfficePostscriptCreator implements IOffice { XPropertySet xPropSet = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, aSettings ); xPropSet.setPropertyValue( "PrintAllSheets", new Boolean( true ) ); + GlobalLogWriter.get().println("PrintAllSheets := true"); } } ArrayList aPrintProps = new ArrayList(); - GlobalLogWriter.get().println("Property FileName:=" + _sPrintFileURL); + // GlobalLogWriter.get().println("Property FileName:=" + _sPrintFileURL); // PropertyValue [] aPrintProps = new PropertyValue[nProperties]; PropertyValue Arg = new PropertyValue(); @@ -611,7 +612,7 @@ public class OpenOfficePostscriptCreator implements IOffice Arg.Value = _sPrintFileURL; // aPrintProps[nPropsCount ++] = Arg; aPrintProps.add(Arg); - // showProperty(Arg); + showProperty(Arg); // generate pages string @@ -635,8 +636,8 @@ public class OpenOfficePostscriptCreator implements IOffice Arg.Name = "Pages"; Arg.Value = sPages; aPrintProps.add(Arg); + showProperty(Arg); } - showProperty(Arg); // GlobalLogWriter.get().println("Start printing."); @@ -666,6 +667,8 @@ public class OpenOfficePostscriptCreator implements IOffice throw new com.sun.star.uno.Exception("Convwatch exception, wait too long for printing."); } } + // TimeHelper.waitInSeconds(40, "Start waiting after print ready."); + _aGTA.getPerformance().stopTime(PerformanceContainer.Print); GlobalLogWriter.get().println(DateHelper.getDateTimeForHumanreadableLog() + " Print document done."); diff --git a/qadevOOo/runner/graphical/PostscriptCreator.java b/qadevOOo/runner/graphical/PostscriptCreator.java index f67977115bcd..ab7ad4536fa6 100644 --- a/qadevOOo/runner/graphical/PostscriptCreator.java +++ b/qadevOOo/runner/graphical/PostscriptCreator.java @@ -98,40 +98,40 @@ public class PostscriptCreator extends EnhancedComplexTestCase - public static void main(String [] _args) - { - String args[] = { - "-TimeOut", "3600000", - "-tb", "java_complex", - "-o", "graphical.PostscriptCreator", -// "-DOC_COMPARATOR_INPUT_PATH", "D:\\temp\\input", -// "-DOC_COMPARATOR_OUTPUT_PATH", "D:\\temp\\output", -// "-DOC_COMPARATOR_REFERENCE_PATH", "D:\\temp\\output\\ref", -// "-DOC_COMPARATOR_PRINT_MAX_PAGE", "9999", -// "-DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION", "180", -// "-DOC_COMPARATOR_HTML_OUTPUT_PREFIX", "http://so-gfxcmp-lin.germany.sun.com/gfxcmp_ui/cw.php?inifile=", -//// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "PDF", /* default: "OOo" */ -//// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "msoffice", /* default: "OOo" */ -//// "-OFFICE_VIEWABLE", "false", -// "-AppExecutionCommand", "\"C:/home/ll93751/staroffice9_DEV300_m25/Sun/StarOffice 9/program/soffice.exe\" -norestore -nocrashreport -accept=pipe,name=ll93751;urp;", -//// "-NoOffice" - "-DOC_COMPARATOR_PRINT_MAX_PAGE","9999", - "-DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION","180", - "-DOC_COMPARATOR_HTML_OUTPUT_PREFIX","http://so-gfxcmp.germany.sun.com/gfxcmp_ui/cw.php?inifile=", - "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE","OOo", - "-DOC_COMPARATOR_DB_INFO_STRING","p:DEV300_m18,c:,d:LLA_test,src:DEV300_m18,dest:,doc:LLA_test,id:34715,distinct:2008-06-27_13-39-09_d6f22d4c-958d-10", - "-DISTINCT","2008-06-27_13-39-09_d6f22d4c-958d-10", - "-TEMPPATH","//so-gfxcmp-lin/gfxcmp-data/wntmsci/temp/2008-06-27_13-39-09_d6f22d4c-958d-10/34715", -// "ConnectionString","socket,host=localhost,port=8101", - "-OFFICE_VIEWABLE","true", - "-wntmsci.DOC_COMPARATOR_INPUT_PATH","\\\\so-gfxcmp-lin\\doc-pool\\LLA_test\\issue_79214.odb", - "-wntmsci.DOC_COMPARATOR_OUTPUT_PATH","\\\\so-gfxcmp-lin\\gfxcmp-data\\wntmsci\\convwatch-output\\LLA_test\\DEV300_m11", - "-wntmsci.AppExecutionCommand","\"C:\\gfxcmp\\programs\\staroffice8_DEV300_m11\\Sun\\StarOffice 9\\program\\soffice.exe\" -norestore -nocrashreport -accept=pipe,name=ll93751;urp;", - "-wntmsci.AppKillCommand","\"C:\\bin\\pskill.exe soffice.bin;C:\\bin\\pskill.exe winword;C:\\bin\\pskill.exe excel\"", - - }; - - org.openoffice.Runner.main(args); - } +// public static void main(String [] _args) +// { +// String args[] = { +// "-TimeOut", "3600000", +// "-tb", "java_complex", +// "-o", "graphical.PostscriptCreator", +//// "-DOC_COMPARATOR_INPUT_PATH", "D:\\temp\\input", +//// "-DOC_COMPARATOR_OUTPUT_PATH", "D:\\temp\\output", +//// "-DOC_COMPARATOR_REFERENCE_PATH", "D:\\temp\\output\\ref", +//// "-DOC_COMPARATOR_PRINT_MAX_PAGE", "9999", +//// "-DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION", "180", +//// "-DOC_COMPARATOR_HTML_OUTPUT_PREFIX", "http://so-gfxcmp-lin.germany.sun.com/gfxcmp_ui/cw.php?inifile=", +////// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "PDF", /* default: "OOo" */ +////// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE", "msoffice", /* default: "OOo" */ +////// "-OFFICE_VIEWABLE", "false", +//// "-AppExecutionCommand", "\"C:/home/ll93751/staroffice9_DEV300_m25/Sun/StarOffice 9/program/soffice.exe\" -norestore -nocrashreport -accept=pipe,name=ll93751;urp;", +////// "-NoOffice" +// "-DOC_COMPARATOR_PRINT_MAX_PAGE","9999", +// "-DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION","180", +// "-DOC_COMPARATOR_HTML_OUTPUT_PREFIX","http://so-gfxcmp.germany.sun.com/gfxcmp_ui/cw.php?inifile=", +// "-DOC_COMPARATOR_REFERENCE_CREATOR_TYPE","OOo", +// "-DOC_COMPARATOR_DB_INFO_STRING","p:DEV300_m18,c:,d:LLA_test,src:DEV300_m18,dest:,doc:LLA_test,id:34715,distinct:2008-06-27_13-39-09_d6f22d4c-958d-10", +// "-DISTINCT","2008-06-27_13-39-09_d6f22d4c-958d-10", +// "-TEMPPATH","//so-gfxcmp-lin/gfxcmp-data/wntmsci/temp/2008-06-27_13-39-09_d6f22d4c-958d-10/34715", +//// "ConnectionString","socket,host=localhost,port=8101", +// "-OFFICE_VIEWABLE","true", +// "-wntmsci.DOC_COMPARATOR_INPUT_PATH","\\\\so-gfxcmp-lin\\doc-pool\\LLA_test\\issue_79214.odb", +// "-wntmsci.DOC_COMPARATOR_OUTPUT_PATH","\\\\so-gfxcmp-lin\\gfxcmp-data\\wntmsci\\convwatch-output\\LLA_test\\DEV300_m11", +// "-wntmsci.AppExecutionCommand","\"C:\\gfxcmp\\programs\\staroffice8_DEV300_m11\\Sun\\StarOffice 9\\program\\soffice.exe\" -norestore -nocrashreport -accept=pipe,name=ll93751;urp;", +// "-wntmsci.AppKillCommand","\"C:\\bin\\pskill.exe soffice.bin;C:\\bin\\pskill.exe winword;C:\\bin\\pskill.exe excel\"", +// +// }; +// +// org.openoffice.Runner.main(args); +// } } diff --git a/qadevOOo/runner/helper/PropertyHelper.java b/qadevOOo/runner/helper/PropertyHelper.java index a517f6c0ae41..1b2bdbb9f175 100755 --- a/qadevOOo/runner/helper/PropertyHelper.java +++ b/qadevOOo/runner/helper/PropertyHelper.java @@ -63,6 +63,18 @@ public class PropertyHelper // { // aSaveProperties = new PropertyValue[0]; // } + +// show properties? +// if (_aPropertyList.size() > 0) +// { +// // aSaveProperties = new PropertyValue[_aPropertyList.size()]; +// for (int i = 0;i<_aPropertyList.size(); i++) +// { +// PropertyValue aProp = (PropertyValue) _aPropertyList.get(i); +// showProperty(aProp); +// } +// } + } return aSaveProperties; } diff --git a/qadevOOo/runner/lib/MultiMethodTest.java b/qadevOOo/runner/lib/MultiMethodTest.java index 5a64357401f6..884059bcfd88 100644 --- a/qadevOOo/runner/lib/MultiMethodTest.java +++ b/qadevOOo/runner/lib/MultiMethodTest.java @@ -164,7 +164,8 @@ public class MultiMethodTest if (! entry.entryName.equals("ifc.qadevooo._SelfTest")) { String ifcName = getInterfaceName(); - System.out.println("checking : " + ifcName); + // System.out.println("checking : " + ifcName); + System.out.print("checking: [" + entry.longName + "]"); // defining a name of the class corresponding to the tested interface // or service @@ -183,12 +184,12 @@ public class MultiMethodTest } catch (ClassNotFoundException cnfE) { - + System.out.println(); cnfE.printStackTrace(log); log.println("could not find a class : " + getTestedClassName()); return null; - } + System.out.println(" is iface: [" + testedClassName + "] testcode: [" + entry.entryName + "]"); // quering the tested interface from the tested object XInterface tCase = tEnv.getTestObject(); @@ -231,7 +232,8 @@ public class MultiMethodTest DescEntry aSubEntry = entry.SubEntries[i]; try { - executeMethod(aSubEntry.entryName); + final String sEntryName = aSubEntry.entryName; + executeMethod(sEntryName); } catch (Exception e) { @@ -255,7 +257,7 @@ public class MultiMethodTest * Is called before calling method tests, but after initialization. * Subclasses may override to perform actions before method tests. */ - protected void before() throws Exception + protected void before() { } @@ -318,13 +320,15 @@ public class MultiMethodTest /** * Checks if the <code>method</code> is optional in the service. */ - protected boolean isOptional(String method) + protected boolean isOptional(String _method) { for (int k = 0; k < entry.SubEntryCount; k++) { - if (entry.SubEntries[k].entryName.equals(method)) + final String sName = entry.SubEntries[k].entryName; + if (sName.equals(_method)) { - return entry.SubEntries[k].isOptional; + final boolean bIsOptional = entry.SubEntries[k].isOptional; + return bIsOptional; } } return false; @@ -367,6 +371,7 @@ public class MultiMethodTest log.println("Execute: " + method); callMethod(method); log.println(method + ": " + tRes.getStatusFor(method)); + log.println(); } } diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java index f4973eb94251..286ddf1600a9 100644 --- a/qadevOOo/runner/lib/MultiPropertyTest.java +++ b/qadevOOo/runner/lib/MultiPropertyTest.java @@ -155,7 +155,8 @@ public class MultiPropertyTest extends MultiMethodTest if (info != null) { - if (!info.hasPropertyByName(propName)) + final boolean bHasProperty = info.hasPropertyByName(propName); + if (!bHasProperty) { if (isOptional(propName) || optionalService) { diff --git a/qadevOOo/runner/org/openoffice/Runner.java b/qadevOOo/runner/org/openoffice/Runner.java index 993f18018c4b..979fc527f775 100644 --- a/qadevOOo/runner/org/openoffice/Runner.java +++ b/qadevOOo/runner/org/openoffice/Runner.java @@ -184,7 +184,7 @@ public class Runner public static void main(String[] args) { - System.out.println("OOoRunner Main() version from 20090825 (yyyymmdd)"); + System.out.println("OOoRunner Main() version from 20100125 (yyyymmdd)"); setStartTime(getTime()); diff --git a/qadevOOo/runner/stats/Summarizer.java b/qadevOOo/runner/stats/Summarizer.java index eaa44a432361..b1fe5fe61dd3 100644 --- a/qadevOOo/runner/stats/Summarizer.java +++ b/qadevOOo/runner/stats/Summarizer.java @@ -24,7 +24,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - package stats; import java.util.Vector; @@ -35,57 +34,81 @@ import share.DescEntry; * this class summs up the results of the subentries of a given DescEntry<br> * and fills the subentries in cases of SKIPPED states */ -public class Summarizer { +public class Summarizer +{ /** * * gets the state for a SuperEntry according to its subentries * @param entry */ - public void summarizeUp(DescEntry entry) { - if ( ( entry.State != null ) && !entry.State.equals("UNKNOWN")) return; + public void summarizeUp(DescEntry entry) + { + if ((entry.State != null) && !entry.State.equals("UNKNOWN")) + { + return; + } int count = entry.SubEntryCount; int knownIssues = 0; Vector failures = new Vector(); Vector states = new Vector(); - for (int i=0; i<count; i++) { - if (entry.SubEntries[i].State == null) { + for (int i = 0; i < count; i++) + { + if (entry.SubEntries[i].State == null) + { entry.SubEntries[i].State = "PASSED.FAILED"; } - if (entry.SubEntries[i].State.equals("known issue")) { + if (entry.SubEntries[i].State.equals("known issue")) + { entry.SubEntries[i].State = "PASSED.OK"; knownIssues++; } - if (!entry.SubEntries[i].State.endsWith("OK")) { - failures.add(entry.SubEntries[i].entryName); + if (!entry.SubEntries[i].State.endsWith("OK")) + { + String sFailure = "[" + entry.SubEntries[i].longName + "]" + " is testcode: [" + entry.SubEntries[i].entryName + "]"; + failures.add(sFailure); states.add(entry.SubEntries[i].State); } } - if (failures.size()>0) { + if (failures.size() > 0) + { String errMsg = ""; String state = "PASSED.FAILED"; - for (int j=0; j<failures.size();j++) { - if (states.elementAt(j).equals("not part of the job")) { + for (int j = 0; j < failures.size(); j++) + { + if (states.elementAt(j).equals("not part of the job")) + { state = "Not possible since not all Interfaces/Services have been checked"; - } else errMsg += - failures.elementAt(j)+" - "+states.elementAt(j)+"\r\n"; + } + else + { + errMsg += + failures.elementAt(j) + " - " + states.elementAt(j) + "\r\n"; + } } - entry.hasErrorMsg=true; + entry.hasErrorMsg = true; entry.ErrorMsg = errMsg; entry.State = state; - } else if (entry.EntryType.equals("component") && knownIssues > 0) { + } + else if (entry.EntryType.equals("component") && knownIssues > 0) + { entry.State = "PASSED(with known issues).OK"; - } else { + } + else + { entry.State = "PASSED.OK"; } } - public static void summarizeDown(DescEntry entry, String state) { - if ( ( entry.State == null ) || entry.State.equals("UNKNOWN")) + public static void summarizeDown(DescEntry entry, String state) + { + if ((entry.State == null) || entry.State.equals("UNKNOWN")) + { entry.State = state; - for (int i=0; i<entry.SubEntryCount; i++) { + } + for (int i = 0; i < entry.SubEntryCount; i++) + { summarizeDown(entry.SubEntries[i], entry.State); } } - } diff --git a/qadevOOo/tests/basic/ifc/configuration/XTemplateContainer/configuration_XTemplateContainer.xba b/qadevOOo/tests/basic/ifc/configuration/XTemplateContainer/configuration_XTemplateContainer.xba deleted file mode 100644 index 53ff24bf2a88..000000000000 --- a/qadevOOo/tests/basic/ifc/configuration/XTemplateContainer/configuration_XTemplateContainer.xba +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<script:module xmlns:script="http://openoffice.org/2000/script" script:name="XTemplateContainer" script:language="StarBasic"> - -'************************************************************************* -' -' 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. -' -'************************************************************************* -'************************************************************************* - -' Be sure that all variables are dimensioned: -option explicit - -Sub RunTest() - -'************************************************************************* -' INTERFACE: -' com.sun.star.configuration.XTemplateContainer -'************************************************************************* -On Error Goto ErrHndl - Dim bOK As Boolean - - Test.StartMethod("getElementTemplateName()") - bOK = TRUE - Dim cResult as String - cResult = oObj.getElementTemplateName() - bOK = bOK AND (Len(cResult) > 0) - - Test.MethodTested("getElementTemplateName()", bOK) - -Exit Sub -ErrHndl: - Test.Exception() - bOK = false - resume next -End Sub -</script:module> diff --git a/qadevOOo/tests/basic/ifc/configuration/XTemplateContainer/script.xlb b/qadevOOo/tests/basic/ifc/configuration/XTemplateContainer/script.xlb deleted file mode 100644 index e430e80ad9e8..000000000000 --- a/qadevOOo/tests/basic/ifc/configuration/XTemplateContainer/script.xlb +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd"> - <library:library xmlns:library="http://openoffice.org/2000/library" library:name="configuration_XTemplateContainer" library:readonly="false" library:passwordprotected="false"> - <library:element library:name="configuration_XTemplateContainer"/> - </library:library> diff --git a/qadevOOo/tests/basic/mod/cfgmgr2/OInnerTreeSetUpdateAccess/cfgmgr2_OInnerTreeSetUpdateAccess.xba b/qadevOOo/tests/basic/mod/cfgmgr2/OInnerTreeSetUpdateAccess/cfgmgr2_OInnerTreeSetUpdateAccess.xba deleted file mode 100644 index f0fb28a88941..000000000000 --- a/qadevOOo/tests/basic/mod/cfgmgr2/OInnerTreeSetUpdateAccess/cfgmgr2_OInnerTreeSetUpdateAccess.xba +++ /dev/null @@ -1,127 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<script:module xmlns:script="http://openoffice.org/2000/script" script:name="OInnerTreeSetUpdateAccess" script:language="StarBasic"> - -'************************************************************************* -' -' 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. -' -'************************************************************************* -'************************************************************************* - -' Be sure that all variables are dimensioned: -option explicit - - -' REQUIRED VARIABLES for interface/service tests: - -' "com::sun::star::container::XNameReplace" - ' needs the following Global variables: - Global cNameToReplace As String 'name of instance to be replased - Global oReplaceInstance As Object 'instance, that will be inserted - -' "com::sun::star::container::XNameContainer" - ' needs the following Global variables: - Global oInstance As Object 'instance to insert - -' "com::sun::star::lang::XComponent#optional" - ' needs the following Global variables: - Global oComponentInstance As Object ' it will be disposed - -' "com::sun::star::lang::XMultiServiceFactory#optional" - ' needs the following Global variables: -' - Global cServiceName As String ie. "com.sun.star.drawing.RectangleShape" -' - Global bCreateInstanceWithoutArguments As Boolean -' - Global aArguments() As Variant - -' "com::sun::star::container::XContainer#optional" - ' needs the following Global variables: - Global oElementToInsert As Object - Global oContainer As Object 'in case if the component tested does - -' "com::sun::star::container::XNamed" - ' needs the following Global variables: - Global cNameToSet As String - '"fixed" if name is fixed - -' "com::sun::star::lang::XSingleServiceFactory#optional" - ' needs the following Global variables: - Global aArguments As Variant '[optional] - Global aMustSupportInterface As Variant '[optional] - - -Sub CreateObj() - -'************************************************************************* -' COMPONENT: -' OInnerTreeSetUpdateAccess -'************************************************************************* -On Error Goto ErrHndl - - Dim nodeArgs(1) as new com.sun.star.beans.PropertyValue - Dim nodepath as new com.sun.star.beans.PropertyValue - nodepath.Name = "nodepath" - nodepath.Value = "org.openoffice.Office.Jobs" - nodepath.Handle = -1 - nodepath.State = com.sun.star.beans.PropertyState.DEFAULT_VALUE - nodeArgs(0) = nodepath - - Dim oProvider as Object - oProvider = createUnoservice(_ - "com.sun.star.comp.configuration.ConfigurationProvider" - Dim oObjectNames as Object - Dim oComponentNames as Object - oObjectNames = oProvider.createInstanceWithArguments(_ - "com.sun.star.configuration.ConfigurationUpdateAccess",_ - nodeArgs()) - oComponentNames = oProvider.createInstanceWithArguments(_ - "com.sun.star.configuration.ConfigurationUpdateAccess",_ - nodeArgs()) - - - oComponentInstance = oComponentNames.getByHierarchicalName("Jobs") - oObj = oObjectNames.getByHierarchicalName("Jobs") - - Dim cNames() as String - cNames = oObj.getElementNames() - - cNameToReplace = cNames(0) 'name of instance to be replased - oReplaceInstance = oObj.createInstance()'instance, that will be inserted - oInstance = oObj.createInstance() - cNameToSet = "fixed" - oElementToInsert = oObj.createInstance() - oContainer = oObj - oObjRelation(0).Name = "cannotSwitchParent" - oObjRelation(0).Value = "configmgr: BasicElement::setParent: cannot move Entry" - oObjRelation(1).Name = "ElementName" - oObjRelation(1).Value = cNames(0) - oObjRelation(2).Name = "HierarchicalName" - oObjRelation(2).Value = "/org.openoffice.Office" - oObjRelation(3).Name = "expectedName" - oObjRelation(3).Value = cNames(0) - -Exit Sub -ErrHndl: - Test.Exception() -End Sub -</script:module> diff --git a/qadevOOo/tests/basic/mod/cfgmgr2/OInnerTreeSetUpdateAccess/script.xlb b/qadevOOo/tests/basic/mod/cfgmgr2/OInnerTreeSetUpdateAccess/script.xlb deleted file mode 100644 index 1b35dd20c108..000000000000 --- a/qadevOOo/tests/basic/mod/cfgmgr2/OInnerTreeSetUpdateAccess/script.xlb +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd"> - <library:library xmlns:library="http://openoffice.org/2000/library" library:name="cfgmgr2_OInnerTreeSetUpdateAccess" library:readonly="false" library:passwordprotected="false"> - <library:element library:name="cfgmgr2_OInnerTreeSetUpdateAccess"/> - </library:library> diff --git a/qadevOOo/tests/basic/mod/cfgmgr2/OInnerValueSetUpdateAccess/cfgmgr2_OInnerValueSetUpdateAccess.xba b/qadevOOo/tests/basic/mod/cfgmgr2/OInnerValueSetUpdateAccess/cfgmgr2_OInnerValueSetUpdateAccess.xba deleted file mode 100644 index 702a832bdf71..000000000000 --- a/qadevOOo/tests/basic/mod/cfgmgr2/OInnerValueSetUpdateAccess/cfgmgr2_OInnerValueSetUpdateAccess.xba +++ /dev/null @@ -1,150 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<script:module xmlns:script="http://openoffice.org/2000/script" script:name="OInnerValueSetUpdateAccess" script:language="StarBasic"> - -'************************************************************************* -' -' 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. -' -'************************************************************************* -'************************************************************************* - -' Be sure that all variables are dimensioned: -option explicit - - -' REQUIRED VARIABLES for interface/service tests: - -' "com::sun::star::container::XNameReplace" - ' needs the following object relation: - Global cNameToReplace As String 'name of instance to be replased - Global oReplaceInstance As Variant 'instance, that will be inserted - -' "com::sun::star::container::XNameContainer" - ' needs the following object relation: - Global oInstance As Variant 'instance to insert - -' "com::sun::star::lang::XComponent#optional" - ' needs the following object relation: - Global oComponentInstance As Variant 'it will be disposed - -' "com::sun::star::container::XHierarchicalNameAccess" - ' needs the following object relation: -' ObjectRelation: oObjRelation(0).Name = "ElementName" -' ObjectRelation: oObjRelation(0).Value = "MyAccessibleElementName" - -' "com::sun::star::lang::XMultiServiceFactory#optional" - ' needs the following object relation: -' - Global cServiceName As String ie. "com.sun.star.drawing.RectangleShape" -' - Global bCreateInstanceWithoutArguments As Boolean -' - Global aArguments() As Variant - -' "com::sun::star::beans::XExactName" - ' needs the following object relation: -' ObjectRelation: oObjRelation(0).Name = "expectedName" -' ObjectRelation: oObjRelation(0).Value = "MyExpectedName" - -' "com::sun::star::container::XContainer#optional" - ' needs the following object relation: - Global oElementToInsert As Variant - Global oContainer As Variant ' in case if the component tested does - -' "com::sun::star::container::XNamed" - ' needs the following object relation: - Global cNameToSet As String '"fixed" if name is fixed - -' "com::sun::star::lang::XSingleServiceFactory#optional" - ' needs the following object relation: -' - Global aArguments As Variant [optional] -' Global aMustSupportInterface As Variant [optional] - -' "com::sun::star::container::XChild#optional" - ' needs the following object relation: -' ObjectRelation: oObjRelation(0).Name = "cannotSwitchParent" -' ObjectRelation: oObjRelation(0).Value = "configmgr: BasicElement::setParent: cannot move Entry" - -' "com::sun::star::container::XHierarchicalName" - ' needs the following object relation: -' ObjectRelation: oObjRelation(0).Name = "ElementName" -' ObjectRelation: oObjRelation(0).Value = "MyAccessibleElementName" -' ObjectRelation: oObjRelation(1).Name = "HierarchicalName" -' ObjectRelation: oObjRelation(1).Value = "MyHierachicalName" - - -Sub CreateObj() - -'************************************************************************* -' COMPONENT: -' com.sun.star.OInnerValueSetUpdateAccess -'************************************************************************* -On Error Goto ErrHndl - - Dim nodeArgs(1) as new com.sun.star.beans.PropertyValue - Dim nodepath as new com.sun.star.beans.PropertyValue - nodepath.Name = "nodepath" - nodepath.Value = "org.openoffice.Office.Common" - nodepath.Handle = -1 - nodepath.State = com.sun.star.beans.PropertyState.DEFAULT_VALUE - - oObj = oDoc - nodeArgs(0) = nodepath - - Dim oProvider as Object - oProvider = createUnoservice(_ - "com.sun.star.comp.configuration.ConfigurationProvider" - Dim oObjectNames as Object - Dim oComponentNames as Object - oObjectNames = oProvider.createInstanceWithArguments(_ - "com.sun.star.configuration.ConfigurationUpdateAccess",_ - nodeArgs()) - oComponentNames = oProvider.createInstanceWithArguments(_ - "com.sun.star.configuration.ConfigurationUpdateAccess",_ - nodeArgs()) - - - oComponentInstance = oComponentNames.getByName("ExternalApps") - oObj = oObjectNames.getByName("ExternalApps") - - - 'Dim cNames() as String - 'cNames = oObj.getElementNames() - - cNameToReplace = "file" 'name of instance to be replased - oReplaceInstance = "NewOne"' oObj.createInstance()'instance, that will be inserted - oInstance = "AnotherOne" - cNameToSet = "fixed" - oElementToInsert = "JustAnotherOne" - oObjRelation(0).Name = "ElementName" - oObjRelation(0).Value = "file" - oObjRelation(1).Name = "HierarchicalName" - oObjRelation(1).Value = "/org.openoffice.Office" - oObjRelation(2).Name = "expectedName" - oObjRelation(2).Value = "file" - oObjRelation(3).Name = "cannotSwitchParent" - oObjRelation(3).Value = "configmgr: BasicElement::setParent: cannot move Entry" - -Exit Sub -ErrHndl: - Test.Exception() -End Sub -</script:module> diff --git a/qadevOOo/tests/basic/mod/cfgmgr2/OInnerValueSetUpdateAccess/script.xlb b/qadevOOo/tests/basic/mod/cfgmgr2/OInnerValueSetUpdateAccess/script.xlb deleted file mode 100644 index 1c1ea9721f42..000000000000 --- a/qadevOOo/tests/basic/mod/cfgmgr2/OInnerValueSetUpdateAccess/script.xlb +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd"> - <library:library xmlns:library="http://openoffice.org/2000/library" library:name="cfgmgr2_OInnerValueSetUpdateAccess" library:readonly="false" library:passwordprotected="false"> - <library:element library:name="cfgmgr2_OInnerValueSetUpdateAccess"/> - </library:library> diff --git a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java index 3ca8794b87f4..bf05553bcb6d 100644 --- a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java +++ b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java @@ -423,8 +423,6 @@ public class CheckModuleAPI extends ComplexTestCase * fwk -> framework * fwl -> framework * sch -> chart2 - * sysmgr1 -> configmgr - * cfgmgr2 -> configmgr * lnn -> lingu * lng -> linguistic * sfx -> sfx2 @@ -438,8 +436,6 @@ public class CheckModuleAPI extends ComplexTestCase aModuleHashMap.put("fwk", "framework"); aModuleHashMap.put("fwl", "framework"); aModuleHashMap.put("sch", "chart2"); - aModuleHashMap.put("sysmgr1", "configmgr"); - aModuleHashMap.put("cfgmag2", "configmgr"); aModuleHashMap.put("lnn", "lingu"); aModuleHashMap.put("lng", "linguistic"); aModuleHashMap.put("sfx", "sfx2"); diff --git a/qadevOOo/tests/java/ifc/io/_XOutputStream.java b/qadevOOo/tests/java/ifc/io/_XOutputStream.java index 3f5b00fde4e7..c49aa479ee38 100644 --- a/qadevOOo/tests/java/ifc/io/_XOutputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XOutputStream.java @@ -93,9 +93,8 @@ public class _XOutputStream extends MultiMethodTest { XInputStream xInStream = checker.getInStream(); byte[][] readData = new byte[1][data.length]; - int iReadBytes = 0; try { - iReadBytes = xInStream.readBytes(readData, data.length); + xInStream.readBytes(readData, data.length); } catch(com.sun.star.io.IOException e) { log.println("Couldn't read data:" + e); res = false; diff --git a/qadevOOo/tests/java/ifc/lang/_XComponent.java b/qadevOOo/tests/java/ifc/lang/_XComponent.java index 8e0ccdcc5ffd..e7493e377141 100644 --- a/qadevOOo/tests/java/ifc/lang/_XComponent.java +++ b/qadevOOo/tests/java/ifc/lang/_XComponent.java @@ -82,7 +82,9 @@ public class _XComponent extends MultiMethodTest { XEventListener listener2 = new MyEventListener2(); /** - * For the cfgmgr2.OSetElement tests: dispose the owner element. + * For the (no longer existing) cfgmgr2.OSetElement tests: dispose the owner + * element. TODO: Is this needed for anything else, too, or should it be + * removed? */ protected void before() { // do not dispose this component, but parent instead diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java index 08d77ccc0ee3..b11659265441 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java +++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java @@ -78,7 +78,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { * @see om.sun.star.sdb.XSingleSelectQueryAnalyzer * @see com.sun.star.beans.XPropertySet */ - protected void before() throws Exception { + protected void before() /* throws Exception*/ { xQueryAna = (XSingleSelectQueryAnalyzer) UnoRuntime.queryInterface(XSingleSelectQueryAnalyzer.class, @@ -100,7 +100,14 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { } - colName = AnyConverter.toString(tEnv.getObjRelation("colName")); + try + { + colName = AnyConverter.toString(tEnv.getObjRelation("colName")); + } + catch (com.sun.star.lang.IllegalArgumentException e) + { + colName = null; + } if (colName == null) { throw new StatusException(Status.failed( diff --git a/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java b/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java index 014152d79193..cbca4c600a4a 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java @@ -136,4 +136,4 @@ public class _XWarningsSupplier extends MultiMethodTest { tRes.tested("clearWarnings()", res); } -}
\ No newline at end of file +} diff --git a/qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java b/qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java index 7ae71682bb91..64ce14d88417 100644 --- a/qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java +++ b/qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java @@ -45,9 +45,6 @@ import util.utils; * @see ifc.connection._XAcceptor */ public class Acceptor extends TestCase { - - private XInterface acceptor = null ; - /** * Acceptor chooses the first port after <code>basePort</code> * which is free. diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/AdministrationProvider.java b/qadevOOo/tests/java/mod/_cfgmgr2/AdministrationProvider.java deleted file mode 100644 index 386b8b3b4562..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/AdministrationProvider.java +++ /dev/null @@ -1,96 +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 mod._cfgmgr2; - -import java.io.PrintWriter; -import java.util.Vector; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - -import com.sun.star.beans.PropertyState; -import com.sun.star.beans.PropertyValue; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.XInterface; - - -public class AdministrationProvider extends TestCase { - - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. - * - * For this an instance of com.sun.star.comp.configuration.AdministrationProvider - * is created at the MultiServiceFactory of the Office - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - - try { - oObj = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.AdministrationProvider"); - } catch (com.sun.star.uno.Exception e) { - } - - util.dbg.printInterfaces(oObj); - - PropertyValue[] nodeArgs = new PropertyValue[1]; - PropertyValue nodepath = new PropertyValue(); - nodepath.Name = "nodepath"; - nodepath.Value = "org.openoffice.Setup"; - nodepath.Handle = -1; - nodepath.State = PropertyState.DEFAULT_VALUE; - nodeArgs[0] = nodepath; - - Vector args = new Vector(); - - args.add(0, nodeArgs); - args.add(0, nodeArgs); - args.add(0, nodeArgs); - args.add(0, nodeArgs); - args.add(0, nodeArgs); - args.add(0, nodeArgs); - args.add(0, nodeArgs); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - tEnv.addObjRelation("XMSF.Args", - args.toArray(new Object[args.size()][])); - tEnv.addObjRelation("needArgs", "AdministrationProvider"); - - return tEnv; - } -}
\ No newline at end of file diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/BootstrapContext.java b/qadevOOo/tests/java/mod/_cfgmgr2/BootstrapContext.java deleted file mode 100644 index a0e79bd27127..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/BootstrapContext.java +++ /dev/null @@ -1,72 +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 mod._cfgmgr2; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.XInterface; - -public class BootstrapContext extends TestCase { - - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. Subclasses should implement this - * method to provide the implementation and related objects. The method is - * called from <code>getTestEnvironment()</code>. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - - XInterface oObj = null; - - try { - oObj = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.bootstrap.BootstrapContext"); - } catch (com.sun.star.uno.Exception e) { - } - - System.out.println("Implementation name: "+ util.utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - return tEnv; - - } - -} diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/ConfigurationProvider.java b/qadevOOo/tests/java/mod/_cfgmgr2/ConfigurationProvider.java deleted file mode 100644 index 15c05a4317af..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/ConfigurationProvider.java +++ /dev/null @@ -1,96 +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 mod._cfgmgr2; - -import java.io.PrintWriter; -import java.util.Vector; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - -import com.sun.star.beans.PropertyState; -import com.sun.star.beans.PropertyValue; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.XInterface; - - -public class ConfigurationProvider extends TestCase { - - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. - * - * For this an instance of com.sun.star.comp.configuration.ConfigurationProvider - * is created at the MultiServiceFactory of the Office - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - - try { - oObj = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.ConfigurationProvider"); - } catch (com.sun.star.uno.Exception e) { - } - - util.dbg.printInterfaces(oObj); - - PropertyValue[] nodeArgs = new PropertyValue[1]; - PropertyValue nodepath = new PropertyValue(); - nodepath.Name = "nodepath"; - nodepath.Value = "org.openoffice.Setup"; - nodepath.Handle = -1; - nodepath.State = PropertyState.DEFAULT_VALUE; - nodeArgs[0] = nodepath; - - Vector args = new Vector(); - - args.add(0, nodeArgs); - args.add(0, nodeArgs); - args.add(0, nodeArgs); - args.add(0, nodeArgs); - args.add(0, nodeArgs); - args.add(0, nodeArgs); - args.add(0, nodeArgs); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - tEnv.addObjRelation("XMSF.Args", - args.toArray(new Object[args.size()][])); - tEnv.addObjRelation("needArgs", "ConfigurationProvider"); - - return tEnv; - } -}
\ No newline at end of file diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/ConfigurationProviderWrapper.java b/qadevOOo/tests/java/mod/_cfgmgr2/ConfigurationProviderWrapper.java deleted file mode 100644 index 006b719d787e..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/ConfigurationProviderWrapper.java +++ /dev/null @@ -1,106 +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 mod._cfgmgr2; - -import java.io.PrintWriter; -import java.util.Vector; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - -import com.sun.star.beans.PropertyState; -import com.sun.star.beans.PropertyValue; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.XInterface; - -public class ConfigurationProviderWrapper extends TestCase { - - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. Subclasses should implement this - * method to provide the implementation and related objects. The method is - * called from <code>getTestEnvironment()</code>. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - - XInterface oObj = null; - - try { - PropertyValue[] cArgs = new PropertyValue[2]; - cArgs[0] = new PropertyValue(); - cArgs[0].Name = "Locale"; - cArgs[0].Value = "DE"; - cArgs[1] = new PropertyValue(); - cArgs[1].Name = "EnableAsync"; - cArgs[1].Value = new Boolean(true); - - oObj = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstanceWithArguments("com.sun.star.comp.configuration.ConfigurationProvider",cArgs); - } catch (com.sun.star.uno.Exception e) { - } - - log.println("Implementation name: "+ util.utils.getImplName(oObj)); - - PropertyValue[] nodeArgs = new PropertyValue[1]; - PropertyValue nodepath = new PropertyValue(); - nodepath.Name = "nodepath"; - nodepath.Value = "org.openoffice.Setup"; - nodepath.Handle = -1; - nodepath.State = PropertyState.DEFAULT_VALUE; - nodeArgs[0] = nodepath; - - Vector args = new Vector(); - - args.add(0, nodeArgs); - args.add(0, nodeArgs); - args.add(0, nodeArgs); - args.add(0, nodeArgs); - args.add(0, nodeArgs); - args.add(0, nodeArgs); - args.add(0, nodeArgs); - - - TestEnvironment tEnv = new TestEnvironment(oObj); - - tEnv.addObjRelation("XMSF.Args", - args.toArray(new Object[args.size()][])); - tEnv.addObjRelation("needArgs", "ConfigurationProvider"); - - return tEnv; - - } - -} diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/CopyImporter.java b/qadevOOo/tests/java/mod/_cfgmgr2/CopyImporter.java deleted file mode 100644 index 173d6579e0ad..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/CopyImporter.java +++ /dev/null @@ -1,72 +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 mod._cfgmgr2; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.XInterface; - -public class CopyImporter extends TestCase { - - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. Subclasses should implement this - * method to provide the implementation and related objects. The method is - * called from <code>getTestEnvironment()</code>. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - - XInterface oObj = null; - - try { - oObj = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.backend.CopyImporter"); - } catch (com.sun.star.uno.Exception e) { - } - - log.println("Implementation name: "+ util.utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - return tEnv; - - } - -} diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/LayerParser.java b/qadevOOo/tests/java/mod/_cfgmgr2/LayerParser.java deleted file mode 100644 index 984df1094207..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/LayerParser.java +++ /dev/null @@ -1,89 +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 mod._cfgmgr2; - -import com.sun.star.io.XActiveDataSink; -import com.sun.star.io.XInputStream; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.ucb.XSimpleFileAccess; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; -import java.io.PrintWriter; -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - -/** - * - * @author sw93809 - */ -public class LayerParser extends TestCase { - - - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. Subclasses should implement this - * method to provide the implementation and related objects. The method is - * called from <code>getTestEnvironment()</code>. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XInterface oObj = null; - Object Pipe = null; - XSimpleFileAccess simpleAccess = null; - XInputStream xStream = null; - - try { - oObj = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.backend.xml.LayerParser"); - Object fileacc = ((XMultiServiceFactory)tParam.getMSF()).createInstance("com.sun.star.comp.ucb.SimpleFileAccess"); - simpleAccess = (XSimpleFileAccess) - UnoRuntime.queryInterface(XSimpleFileAccess.class,fileacc); - String filename = util.utils.getOfficeURL((XMultiServiceFactory)tParam.getMSF())+"/../share/registry/data/org/openoffice/Setup.xcu"; - log.println("Going to parse: "+filename); - xStream = simpleAccess.openFileRead(filename); - } catch (com.sun.star.uno.Exception e) { - } - - log.println("Implementation name: "+ util.utils.getImplName(oObj)); - - XActiveDataSink xSink = (XActiveDataSink) UnoRuntime.queryInterface(XActiveDataSink.class, oObj); - xSink.setInputStream(xStream); - TestEnvironment tEnv = new TestEnvironment(oObj); - - tEnv.addObjRelation("InputStream", xStream); - - return tEnv; - } - -} diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/LayerUpdateMerger.java b/qadevOOo/tests/java/mod/_cfgmgr2/LayerUpdateMerger.java deleted file mode 100644 index e9b035fa3c21..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/LayerUpdateMerger.java +++ /dev/null @@ -1,85 +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 mod._cfgmgr2; - -import com.sun.star.configuration.backend.XLayer; -import com.sun.star.configuration.backend.XLayerHandler; -import com.sun.star.lang.XInitialization; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; -import java.io.PrintWriter; -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.XLayerHandlerImpl; -import util.XLayerImpl; - -public class LayerUpdateMerger extends TestCase { - - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. Subclasses should implement this - * method to provide the implementation and related objects. The method is - * called from <code>getTestEnvironment()</code>. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - XLayerHandler xLayerHandler = null; - XLayer xLayer = null; - - try { - oObj = (XInterface) ((XMultiServiceFactory) tParam.getMSF()).createInstance( - "com.sun.star.comp.configuration.backend.LayerUpdateMerger"); - - XInitialization xInit = (XInitialization) UnoRuntime.queryInterface( - XInitialization.class, oObj); - xLayerHandler = new XLayerHandlerImpl(); - xLayer = new XLayerImpl(); - - xInit.initialize(new Object[] { xLayerHandler,xLayer }); - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - log.println("Implementation name: " + util.utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - tEnv.addObjRelation("LayerHandler", xLayerHandler); - tEnv.addObjRelation("Layer", xLayer); - - return tEnv; - } -}
\ No newline at end of file diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/LayerWriter.java b/qadevOOo/tests/java/mod/_cfgmgr2/LayerWriter.java deleted file mode 100644 index 7a2714c86042..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/LayerWriter.java +++ /dev/null @@ -1,108 +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 mod._cfgmgr2; - -import com.sun.star.io.XActiveDataSource; -import com.sun.star.io.XOutputStream; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.ucb.XSimpleFileAccess; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - - -public class LayerWriter extends TestCase { - public XOutputStream xStream = null; - - /** - * Just clears flag which indicates that port is free now. - */ - public synchronized void disposeTestEnvironment(TestEnvironment tEnv, - TestParameters tParam) { - - - try { - xStream.closeOutput(); - } catch (com.sun.star.io.NotConnectedException e) { - } catch (com.sun.star.io.BufferSizeExceededException e) { - } catch (com.sun.star.io.IOException e) { - } - } - - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. Subclasses should implement this - * method to provide the implementation and related objects. The method is - * called from <code>getTestEnvironment()</code>. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - XSimpleFileAccess simpleAccess = null; - - try { - oObj = (XInterface) ((XMultiServiceFactory) tParam.getMSF()).createInstance( - "com.sun.star.comp.configuration.backend.xml.LayerWriter"); - - Object fileacc = ((XMultiServiceFactory) tParam.getMSF()).createInstance( - "com.sun.star.comp.ucb.SimpleFileAccess"); - simpleAccess = (XSimpleFileAccess) UnoRuntime.queryInterface( - XSimpleFileAccess.class, fileacc); - - String filename = util.utils.getOfficeTemp( - (XMultiServiceFactory) tParam.getMSF()) + - "LayerWriter.xcu"; - log.println("Going to parse: " + filename); - - xStream = simpleAccess.openFileWrite(filename); - } catch (com.sun.star.uno.Exception e) { - } - - log.println("Implementation name: " + util.utils.getImplName(oObj)); - - XActiveDataSource xSource = (XActiveDataSource) UnoRuntime.queryInterface( - XActiveDataSource.class, oObj); - xSource.setOutputStream(xStream); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - tEnv.addObjRelation("OutputStream", xStream); - - return tEnv; - } -} diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/LocalDataImporter.java b/qadevOOo/tests/java/mod/_cfgmgr2/LocalDataImporter.java deleted file mode 100644 index 25e3b2020482..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/LocalDataImporter.java +++ /dev/null @@ -1,79 +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 mod._cfgmgr2; - -import com.sun.star.beans.NamedValue; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.XInterface; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - - -public class LocalDataImporter extends TestCase { - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. Subclasses should implement this - * method to provide the implementation and related objects. The method is - * called from <code>getTestEnvironment()</code>. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - - try { - oObj = (XInterface) ((XMultiServiceFactory) tParam.getMSF()).createInstance( - "com.sun.star.comp.configuration.backend.LocalDataImporter"); - } catch (com.sun.star.uno.Exception e) { - } - - String filename = util.utils.getOfficeURL( - (XMultiServiceFactory) tParam.getMSF()) + - "/../share/registry/data/org/openoffice/Setup.xcs"; - - Object[] vXJobArgs = new Object[1]; - NamedValue[] vXJobArg0 = new NamedValue[1]; - vXJobArg0[0] = new NamedValue("LayerDataUrl", filename); - vXJobArgs[0] = vXJobArg0; - - log.println("Implementation name: " + util.utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("XJobArgs", vXJobArgs); - - return tEnv; - } -}
\ No newline at end of file diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/LocalHierarchyBrowser.java b/qadevOOo/tests/java/mod/_cfgmgr2/LocalHierarchyBrowser.java deleted file mode 100644 index e1428d460016..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/LocalHierarchyBrowser.java +++ /dev/null @@ -1,88 +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 mod._cfgmgr2; - -import com.sun.star.beans.NamedValue; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.XInterface; -import java.io.PrintWriter; -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - -public class LocalHierarchyBrowser extends TestCase { - - - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. Subclasses should implement this - * method to provide the implementation and related objects. The method is - * called from <code>getTestEnvironment()</code>. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - - try { - oObj = (XInterface) ((XMultiServiceFactory) tParam.getMSF()).createInstance( - "com.sun.star.comp.configuration.backend.LocalHierarchyBrowser"); - } catch (com.sun.star.uno.Exception e) { - } - - String filename = util.utils.getOfficeURL( - (XMultiServiceFactory) tParam.getMSF()) + - "/../share/registry/data/org/openoffice"; - - String filename2 = util.utils.getOfficeURL( - (XMultiServiceFactory) tParam.getMSF()) + - "/../share/registry/schema/org/openoffice/"; - - Object[] vXJobArgs = new Object[2]; - NamedValue[] vXJobArg0 = new NamedValue[1]; - vXJobArg0[0] = new NamedValue("LayerDataUrl", filename); - NamedValue[] vXJobArg1 = new NamedValue[1]; - vXJobArg1[0] = new NamedValue("SchemaDataUrl", filename2); - vXJobArgs[0] = vXJobArg0; - vXJobArgs[1] = vXJobArg1; - - - log.println("Implementation name: " + util.utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("XJobArgs", vXJobArgs); - - return tEnv; - } - -} diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/LocalSchemaSupplier.java b/qadevOOo/tests/java/mod/_cfgmgr2/LocalSchemaSupplier.java deleted file mode 100644 index df8e51095f99..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/LocalSchemaSupplier.java +++ /dev/null @@ -1,59 +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 mod._cfgmgr2; - -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.XInterface; -import java.io.PrintWriter; -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - -public class LocalSchemaSupplier extends TestCase { - - protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XInterface oObj = null; - - try { - Object[] args = new Object[1]; - args[0] = ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.configuration.bootstrap.BootstrapContext"); - oObj = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstanceWithArguments("com.sun.star.comp.configuration.backend.LocalSchemaSupplier",args); - - } catch (com.sun.star.uno.Exception e) { - } - - log.println("Implementation name: "+ util.utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - return tEnv; - } - -} diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/LocalSingleBackend.java b/qadevOOo/tests/java/mod/_cfgmgr2/LocalSingleBackend.java deleted file mode 100644 index 3f8b88551146..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/LocalSingleBackend.java +++ /dev/null @@ -1,61 +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 mod._cfgmgr2; - -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.XInterface; -import java.io.PrintWriter; -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - -public class LocalSingleBackend extends TestCase { - - protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XInterface oObj = null; - - try { - Object[] args = new Object[1]; - args[0] = ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.configuration.bootstrap.BootstrapContext"); - oObj = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstanceWithArguments("com.sun.star.comp.configuration.backend.LocalSingleBackend",args); - - } catch (com.sun.star.uno.Exception e) { - } - - log.println("Implementation name: "+ util.utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - return tEnv; - } - - -} diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/LocalSingleStratum.java b/qadevOOo/tests/java/mod/_cfgmgr2/LocalSingleStratum.java deleted file mode 100644 index 39aad3cac3a2..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/LocalSingleStratum.java +++ /dev/null @@ -1,89 +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 mod._cfgmgr2; - -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; -import com.sun.star.util.XStringSubstitution; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - - -public class LocalSingleStratum extends TestCase { - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - String AdminURL = ""; - - try { - Object[] args = new Object[1]; - XStringSubstitution sts = createStringSubstitution( - (XMultiServiceFactory) tParam.getMSF()); - String userURL = sts.getSubstituteVariableValue("$(user)"); - args[0] = userURL + "/registry"; - AdminURL = sts.getSubstituteVariableValue("$(inst)") + - "/share/registry"; - log.println("Using: " + args[0]); - oObj = (XInterface) ((XMultiServiceFactory) tParam.getMSF()).createInstanceWithArguments( - "com.sun.star.comp.configuration.backend.LocalSingleStratum", - args); - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - log.println("Implementation name: " + util.utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - tEnv.addObjRelation("NoAdmin", AdminURL); - - return tEnv; - } - - public static XStringSubstitution createStringSubstitution(XMultiServiceFactory xMSF) { - Object xPathSubst = null; - - try { - xPathSubst = xMSF.createInstance( - "com.sun.star.util.PathSubstitution"); - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - if (xPathSubst != null) { - return (XStringSubstitution) UnoRuntime.queryInterface( - XStringSubstitution.class, xPathSubst); - } else { - return null; - } - } -} diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/MergeImporter.java b/qadevOOo/tests/java/mod/_cfgmgr2/MergeImporter.java deleted file mode 100644 index 0a69f6e34e82..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/MergeImporter.java +++ /dev/null @@ -1,69 +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 mod._cfgmgr2; - -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.XInterface; -import java.io.PrintWriter; -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - -public class MergeImporter extends TestCase { - - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. Subclasses should implement this - * method to provide the implementation and related objects. The method is - * called from <code>getTestEnvironment()</code>. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XInterface oObj = null; - - try { - oObj = (XInterface) ((XMultiServiceFactory) tParam.getMSF()).createInstance( - "com.sun.star.comp.configuration.backend.MergeImporter"); - - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - log.println("Implementation name: " + util.utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - return tEnv; - } - -} diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/MultiStratumBackend.java b/qadevOOo/tests/java/mod/_cfgmgr2/MultiStratumBackend.java deleted file mode 100644 index 737a08145974..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/MultiStratumBackend.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * MultiStratumBackend.java - * - * Created on 24. March 2004, 13:48 - */ - -package mod._cfgmgr2; - -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; -import com.sun.star.util.XStringSubstitution; -import java.io.PrintWriter; -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - -public class MultiStratumBackend extends TestCase { - - protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XInterface oObj = null; - - Object[] args = new Object[1]; - String AdminURL = ""; - - try { - XStringSubstitution sts = createStringSubstitution( - (XMultiServiceFactory) tParam.getMSF()); - AdminURL = sts.getSubstituteVariableValue("$(inst)") + - "/share/registry"; - args[0] = ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.configuration.bootstrap.BootstrapContext"); - oObj = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstanceWithArguments("com.sun.star.comp.configuration.backend.MultiStratumBackend",args); - - } catch (com.sun.star.uno.Exception e) { - } - - log.println("Implementation name: "+ util.utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - //objRelation for XInitialization - tEnv.addObjRelation("XInitialization.args", args); - - //objRelation for XBackendEntities - tEnv.addObjRelation("NoAdmin", AdminURL); - tEnv.addObjRelation("MSB", Boolean.TRUE); - - return tEnv; - } - - public static XStringSubstitution createStringSubstitution(XMultiServiceFactory xMSF) { - Object xPathSubst = null; - - try { - xPathSubst = xMSF.createInstance( - "com.sun.star.util.PathSubstitution"); - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - if (xPathSubst != null) { - return (XStringSubstitution) UnoRuntime.queryInterface( - XStringSubstitution.class, xPathSubst); - } else { - return null; - } - } -} diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/OConfigurationRegistry.java b/qadevOOo/tests/java/mod/_cfgmgr2/OConfigurationRegistry.java deleted file mode 100644 index 7bc0e87daab8..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/OConfigurationRegistry.java +++ /dev/null @@ -1,79 +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 mod._cfgmgr2; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.XInterface; - - -public class OConfigurationRegistry extends TestCase { - protected static int uniq = 0; - - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. - * - * For this an instance of com.sun.star.configuration.ConfigurationRegistry - * is created at the MultiServiceFactory of the Office - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - - try { - oObj = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.configuration.ConfigurationRegistry"); - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - System.out.println("IName: " + util.utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - tEnv.addObjRelation("XSimpleRegistry.open", "org.openoffice.Setup") ; - tEnv.addObjRelation("XSimpleRegistry.merge", "org.openoffice.Inet") ; - tEnv.addObjRelation("XSimpleRegistry.destroy", "org.openoffice.Setup") ; - - tEnv.addObjRelation("configuration", new Boolean(true)); - - return tEnv; - } - -}
\ No newline at end of file diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/OInnerGroupInfoAccess.java b/qadevOOo/tests/java/mod/_cfgmgr2/OInnerGroupInfoAccess.java deleted file mode 100644 index 4dd5fa567be3..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/OInnerGroupInfoAccess.java +++ /dev/null @@ -1,142 +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 mod._cfgmgr2; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.utils; - -import com.sun.star.beans.PropertyState; -import com.sun.star.beans.PropertyValue; -import com.sun.star.container.XNameAccess; -import com.sun.star.container.XNameReplace; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; - - -public class OInnerGroupInfoAccess extends TestCase { - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. <br> - * - * An instance of com.sun.star.comp.configuration.ConfigurationProvider - * is created at the MultiServiceFactory of the Office<br> - * At this an instance of com.sun.star.configuration.ConfigurationAccess is created - * and from the resulting XNameAccess the first element is taken. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - log.println("creating the Environment"); - - PropertyValue[] nodeArgs = new PropertyValue[1]; - PropertyValue nodepath = new PropertyValue(); - nodepath.Name = "nodepath"; - nodepath.Value = "org.openoffice.Office.Common"; - nodepath.Handle = -1; - nodepath.State = PropertyState.DEFAULT_VALUE; - nodeArgs[0] = nodepath; - - XNameReplace updateAccess = null; - try { - XInterface Provider = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.ConfigurationProvider"); - XMultiServiceFactory pMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, - Provider); - XNameAccess names = (XNameAccess) UnoRuntime.queryInterface( - XNameAccess.class, - pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationAccess", - nodeArgs)); - oObj = (XInterface) names.getByName(names.getElementNames()[0]); - - names = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, - oObj); - - String[] theNames = names.getElementNames(); - - log.println("Contains " + theNames.length + " elements"); - - // create a changeable view on the element for XContainer interface - names = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", nodeArgs)); - updateAccess = (XNameReplace) UnoRuntime.queryInterface(XNameReplace.class, - names.getByName(names.getElementNames()[0])); - - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - log.println("ImplementationName: " + utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - String[] pNames = new String[] { - "AutoDetectSystemHC", "HelpTipSeconds", "IsAllowAnimatedGraphics", - "IsAllowAnimatedText", "IsAutomaticFontColor", "IsForPagePreviews", - "IsHelpTipsDisappear", "IsSelectionInReadonly", "IsSystemFont" - }; - - String[] pTypes = new String[] { - "Boolean", "Short", "Boolean", "Boolean", "Boolean", "Boolean", - "Boolean", "Boolean", "Boolean" - }; - - tEnv.addObjRelation("PropertyNames", pNames); - tEnv.addObjRelation("PropertyTypes", pTypes); - - tEnv.addObjRelation("XContainer.Container", updateAccess); - // create an unlikely value for "HelpTipSeconds" - tEnv.addObjRelation("XContainer.NewValue", new Short((short)300000)); - tEnv.addObjRelation("XContainer.ElementName", pNames[1]); - - tEnv.addObjRelation("ElementName", "AutoDetectSystemHC"); - - tEnv.addObjRelation("cannotSwitchParent", - "configmgr: BasicElement::setParent: cannot move Entry"); - - tEnv.addObjRelation("allReadOnly", - "all Properties of OInnerGroupInfoAccess are read Only"); - - tEnv.addObjRelation("expectedName", "IsSelectionInReadonly"); - tEnv.addObjRelation("HierachicalName", "/org.openoffice.Office"); - tEnv.addObjRelation("NoSetName", "OInnerGroupInfoAccess"); - - return tEnv; - } -}
\ No newline at end of file diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/OInnerGroupUpdateAccess.java b/qadevOOo/tests/java/mod/_cfgmgr2/OInnerGroupUpdateAccess.java deleted file mode 100644 index f93dade2ba45..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/OInnerGroupUpdateAccess.java +++ /dev/null @@ -1,134 +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 mod._cfgmgr2; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.utils; - -import com.sun.star.beans.PropertyState; -import com.sun.star.beans.PropertyValue; -import com.sun.star.container.XNameAccess; -import com.sun.star.container.XNameReplace; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; - - -public class OInnerGroupUpdateAccess extends TestCase { - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. <br> - * - * An instance of com.sun.star.comp.configuration.ConfigurationProvider - * is created at the MultiServiceFactory of the Office<br> - * At this an instance of com.sun.star.configuration.ConfigurationAccess is created - * and from the resulting XNameAccess the first element is taken. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - log.println("creating the Environment"); - - PropertyValue[] nodeArgs = new PropertyValue[1]; - PropertyValue nodepath = new PropertyValue(); - nodepath.Name = "nodepath"; - nodepath.Value = "org.openoffice.Office.Common"; - nodepath.Handle = -1; - nodepath.State = PropertyState.DEFAULT_VALUE; - nodeArgs[0] = nodepath; - - try { - XInterface Provider = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.ConfigurationProvider"); - XMultiServiceFactory pMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, - Provider); - XNameAccess names = (XNameAccess) UnoRuntime.queryInterface( - XNameAccess.class, - pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", - nodeArgs)); - oObj = (XInterface) names.getByName(names.getElementNames()[0]); - - names = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, - oObj); - - String[] theNames = names.getElementNames(); - - log.println("Contains " + theNames.length + " elements"); - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - log.println("ImplementationName: " + utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - String[] pNames = new String[] { - "AutoDetectSystemHC", "HelpTipSeconds", "IsAllowAnimatedGraphics", - "IsAllowAnimatedText", "IsAutomaticFontColor", "IsForPagePreviews", - "IsHelpTipsDisappear", "IsSelectionInReadonly", "IsSystemFont" - }; - - String[] pTypes = new String[] { - "Boolean", "Short", "Boolean", "Boolean", "Boolean", "Boolean", - "Boolean", "Boolean", "Boolean" - }; - - tEnv.addObjRelation("PropertyNames", pNames); - tEnv.addObjRelation("PropertyTypes", pTypes); - - tEnv.addObjRelation("ElementName", "AutoDetectSystemHC"); - - tEnv.addObjRelation("cannotSwitchParent", - "configmgr: BasicElement::setParent: cannot move Entry"); - - tEnv.addObjRelation("expectedName", "IsSelectionInReadonly"); - tEnv.addObjRelation("HierachicalName", "/org.openoffice.Office"); - - Short val = new Short((short)3); - tEnv.addObjRelation("INSTANCE1", val); - tEnv.addObjRelation("NAMEREPLACE", pNames[1]); - tEnv.addObjRelation("XContainer.NewValue", val); - tEnv.addObjRelation("XContainer.ElementName", pNames[1]); - tEnv.addObjRelation("XContainer.Container", (XNameReplace) - UnoRuntime.queryInterface(XNameReplace.class, oObj)); - tEnv.addObjRelation("NoSetName", "OInnerGroupInfoAccess"); - - return tEnv; - } -}
\ No newline at end of file diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/OInnerSetInfoAccess.java b/qadevOOo/tests/java/mod/_cfgmgr2/OInnerSetInfoAccess.java deleted file mode 100644 index 5053e9fbdfc1..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/OInnerSetInfoAccess.java +++ /dev/null @@ -1,130 +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 mod._cfgmgr2; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.utils; - -import com.sun.star.beans.PropertyState; -import com.sun.star.beans.PropertyValue; -import com.sun.star.container.XHierarchicalNameAccess; -import com.sun.star.container.XNameAccess; -import com.sun.star.container.XNameReplace; -import com.sun.star.lang.XSingleServiceFactory; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; - - -public class OInnerSetInfoAccess extends TestCase { - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. <br> - * - * An instance of com.sun.star.comp.configuration.ConfigurationProvider - * is created at the MultiServiceFactory of the Office<br> - * At this an instance of com.sun.star.configuration.ConfigurationAccess is created - * and from the resulting XNameAccess the first element is taken. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - Object instance = null; - log.println("creating the Environment"); - - PropertyValue[] nodeArgs = new PropertyValue[1]; - PropertyValue nodepath = new PropertyValue(); - nodepath.Name = "nodepath"; - nodepath.Value = "org.openoffice.Office.Jobs"; - nodepath.Handle = -1; - nodepath.State = PropertyState.DEFAULT_VALUE; - nodeArgs[0] = nodepath; - - XNameReplace updateAccess = null; - try { - XInterface Provider = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.ConfigurationProvider"); - XMultiServiceFactory pMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, - Provider); - XHierarchicalNameAccess names = (XHierarchicalNameAccess) UnoRuntime.queryInterface( - XHierarchicalNameAccess.class, - pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationAccess", - nodeArgs)); - oObj = (XInterface) names.getByHierarchicalName("Jobs"); - - // create a changeable view on the element for XContainer interface - XNameAccess access = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", nodeArgs)); - updateAccess = (XNameReplace) UnoRuntime.queryInterface(XNameReplace.class, access.getByName("Jobs")); - - XSingleServiceFactory jobsFac = (XSingleServiceFactory) UnoRuntime.queryInterface( - XSingleServiceFactory.class, - updateAccess); - instance = jobsFac.createInstance(); - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - - log.println("ImplementationName: " + utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - XNameAccess names = (XNameAccess) UnoRuntime.queryInterface( - XNameAccess.class, oObj); - - String[] pNames = names.getElementNames(); - - tEnv.addObjRelation("ElementName", pNames[0]); - - tEnv.addObjRelation("cannotSwitchParent", - "configmgr: BasicElement::setParent: cannot move Entry"); - - tEnv.addObjRelation("XContainer.Container", updateAccess) ; - tEnv.addObjRelation("XContainer.NewValue", instance); - tEnv.addObjRelation("XContainer.ElementName", pNames[0]); - - tEnv.addObjRelation("expectedName", pNames[0]); - tEnv.addObjRelation("HierachicalName", "/org.openoffice.Office"); - tEnv.addObjRelation("NoSetName", "OInnerTreeSetInfoAccess"); - tEnv.addObjRelation("TemplateName", "org.openoffice.Office.Jobs/Job"); - - return tEnv; - } -}
\ No newline at end of file diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/OInnerTreeSetUpdateAccess.java b/qadevOOo/tests/java/mod/_cfgmgr2/OInnerTreeSetUpdateAccess.java deleted file mode 100644 index 67beffbb4bbf..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/OInnerTreeSetUpdateAccess.java +++ /dev/null @@ -1,126 +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 mod._cfgmgr2; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.utils; - -import com.sun.star.beans.PropertyState; -import com.sun.star.beans.PropertyValue; -import com.sun.star.container.XHierarchicalNameAccess; -import com.sun.star.container.XNameAccess; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.XSingleServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; - - -public class OInnerTreeSetUpdateAccess extends TestCase { - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. <br> - * - * An instance of com.sun.star.comp.configuration.ConfigurationProvider - * is created at the MultiServiceFactory of the Office<br> - * At this an instance of com.sun.star.configuration.ConfigurationAccess is created - * and from the resulting XNameAccess the first element is taken. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - Object instance = null; - Object instance1 = null; - Object instance2 = null; - log.println("creating the Environment"); - - PropertyValue[] nodeArgs = new PropertyValue[1]; - PropertyValue nodepath = new PropertyValue(); - nodepath.Name = "nodepath"; - nodepath.Value = "org.openoffice.Office.Jobs"; - nodepath.Handle = -1; - nodepath.State = PropertyState.DEFAULT_VALUE; - nodeArgs[0] = nodepath; - - try { - XInterface Provider = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.ConfigurationProvider"); - XMultiServiceFactory pMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, - Provider); - XHierarchicalNameAccess names = (XHierarchicalNameAccess) UnoRuntime.queryInterface( - XHierarchicalNameAccess.class, - pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", - nodeArgs)); - oObj = (XInterface) names.getByHierarchicalName("Jobs"); - - XSingleServiceFactory jobsFac = (XSingleServiceFactory) UnoRuntime.queryInterface( - XSingleServiceFactory.class, - oObj); - instance = jobsFac.createInstance(); - instance1 = jobsFac.createInstance(); - instance2 = jobsFac.createInstance(); - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - log.println("ImplementationName: " + utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - XNameAccess names = (XNameAccess) UnoRuntime.queryInterface( - XNameAccess.class, oObj); - - String[] pNames = names.getElementNames(); - - tEnv.addObjRelation("ElementName", pNames[0]); - - tEnv.addObjRelation("cannotSwitchParent", - "configmgr: BasicElement::setParent: cannot move Entry"); - - tEnv.addObjRelation("expectedName", pNames[0]); - tEnv.addObjRelation("HierachicalName", "/org.openoffice.Office"); - tEnv.addObjRelation("INSTANCE", instance); - tEnv.addObjRelation("INSTANCE1", instance1); - tEnv.addObjRelation("INSTANCE2", instance1); - tEnv.addObjRelation("NAMEREPLACE", pNames[0]); - tEnv.addObjRelation("NoSetName", "OInnerTreeSetInfoAccess"); - tEnv.addObjRelation("TemplateName", "org.openoffice.Office.Jobs/Job"); - - return tEnv; - } -}
\ No newline at end of file diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/OInnerValueSetUpdateAccess.java b/qadevOOo/tests/java/mod/_cfgmgr2/OInnerValueSetUpdateAccess.java deleted file mode 100644 index 229869a0753e..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/OInnerValueSetUpdateAccess.java +++ /dev/null @@ -1,216 +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 mod._cfgmgr2; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.utils; - -import com.sun.star.beans.PropertyState; -import com.sun.star.beans.PropertyValue; -import com.sun.star.container.XNameAccess; -import com.sun.star.container.XNameContainer; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; -import com.sun.star.util.XChangesBatch; - - -public class OInnerValueSetUpdateAccess extends TestCase { - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. <br> - * - * An instance of com.sun.star.comp.configuration.ConfigurationProvider - * is created at the MultiServiceFactory of the Office<br> - * At this an instance of com.sun.star.configuration.ConfigurationAccess is created - * and from the resulting XNameAccess the first element is taken. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - - log.println("creating the Environment"); - - // create some entries for testing, use the ORootElementValueSetUpdateAccess - // service for this: see cfgmgr2.ORootElementValueSetUpdateAccess - createSomeEntries((XMultiServiceFactory)tParam.getMSF()); - - PropertyValue[] nodeArgs = new PropertyValue[1]; - PropertyValue nodepath = new PropertyValue(); - nodepath.Name = "nodepath"; - nodepath.Value = "/org.openoffice.Office.Common"; - nodepath.Handle = -1; - nodepath.State = PropertyState.DEFAULT_VALUE; - nodeArgs[0] = nodepath; - - try { - XInterface Provider = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.ConfigurationProvider"); - XMultiServiceFactory pMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, - Provider); - XNameAccess names = (XNameAccess) UnoRuntime.queryInterface( - XNameAccess.class, - pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", - nodeArgs)); - - oObj = (XInterface) names.getByName("ExternalApps"); - - names = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, - oObj); - - String[] theNames = names.getElementNames(); - - log.println("Contains " + theNames.length + " elements"); - -// for (int k = 0; k < theNames.length; k++) { -// System.out.println("child " + theNames[k]); -// } - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - log.println("ImplementationName: " + utils.getImplName(oObj)); - - String[] pNames = new String[] { - "file", "ftp", "http", "https", "mailto" - }; - - String[] pTypes = new String[] { - "String", "String", "String", "String", "String" - }; - - TestEnvironment tEnv = new TestEnvironment(oObj); - - tEnv.addObjRelation("cannotSwitchParent", - "configmgr: BasicElement::setParent: cannot move Entry"); - - String overwriteString = "NewOne"; - tEnv.addObjRelation("INSTANCE1", overwriteString); - tEnv.addObjRelation("NAMEREPLACE", pNames[1]); - // for XContainer - tEnv.addObjRelation("INSTANCE", overwriteString); - - tEnv.addObjRelation("HierachicalName", "/org.openoffice.Office"); - tEnv.addObjRelation("ElementName", "file"); - tEnv.addObjRelation("NoSetName", "OInnerValueSetInfoAccess"); - tEnv.addObjRelation("TemplateName", "cfg:value/cfg:any"); - tEnv.addObjRelation("expectedName", "file"); - - return tEnv; - } - - /** - * Create entries in the ExternalApps layer, so there is something to test - * @param oObj The test object: used to create some entries. - */ - private void createSomeEntries(XMultiServiceFactory xMSF) { - PropertyValue[] nodeArgs = new PropertyValue[1]; - PropertyValue nodepath = new PropertyValue(); - nodepath.Name = "nodepath"; - nodepath.Value = "org.openoffice.Office.Common/ExternalApps"; - nodepath.Handle = -1; - nodepath.State = PropertyState.DEFAULT_VALUE; - nodeArgs[0] = nodepath; - - Object oObj = null; - try { - XInterface Provider = (XInterface) xMSF.createInstance("com.sun.star.comp.configuration.ConfigurationProvider"); - XMultiServiceFactory pMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, - Provider); - oObj = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, - pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", - nodeArgs)); - - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - XNameContainer xCont = (XNameContainer)UnoRuntime.queryInterface(XNameContainer.class, oObj); - insertOrUpdate(xCont, "file", "just"); - insertOrUpdate(xCont, "ftp", "some"); - insertOrUpdate(xCont, "dummy", "arbitrary"); - insertOrUpdate(xCont, "http", "value"); - // write the changes into the user layer. - XChangesBatch xBatch = (XChangesBatch)UnoRuntime.queryInterface(XChangesBatch.class, oObj); - try { - xBatch.commitChanges(); - } - catch(com.sun.star.lang.WrappedTargetException e) { - // ignore: bug will be found with the interface test - } - } - - /** - * Insert a value in a name container or else update it - * @param xCont The name conationer to insert or update. - * @param name The name of the value. - * @param value The value itself. - */ - private void insertOrUpdate(XNameContainer xCont, String name, String value) { - boolean update = false; - try { - xCont.insertByName(name, value); - System.out.println("##### No Exception!"); - } - catch(com.sun.star.lang.IllegalArgumentException e) { - // ignore: bug will be found with the interface test - } - catch(com.sun.star.lang.WrappedTargetException e) { - // ignore: bug will be found with the interface test - } - catch(com.sun.star.container.ElementExistException e) { - update = true; - } - try { - if (update) - xCont.replaceByName(name, value); - } - catch(com.sun.star.lang.IllegalArgumentException e) { - // ignore: bug will be found with the interface test - } - catch(com.sun.star.container.NoSuchElementException e) { - // ignore: bug will be found with the interface test - } - catch(com.sun.star.lang.WrappedTargetException e) { - // ignore: bug will be found with the interface test - } - } - -} diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/ORootElementGroupInfoAccess.java b/qadevOOo/tests/java/mod/_cfgmgr2/ORootElementGroupInfoAccess.java deleted file mode 100644 index dcc6d48226e8..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/ORootElementGroupInfoAccess.java +++ /dev/null @@ -1,176 +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 mod._cfgmgr2; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.utils; - -import com.sun.star.beans.PropertyState; -import com.sun.star.beans.PropertyValue; -import com.sun.star.beans.XPropertySet; -import com.sun.star.container.XNameAccess; -import com.sun.star.container.XNameReplace; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; -import com.sun.star.util.XChangesBatch; - - -public class ORootElementGroupInfoAccess extends TestCase { - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. <br> - * - * An instance of com.sun.star.comp.configuration.ConfigurationProvider - * is created at the MultiServiceFactory of the Office<br> - * At this an instance of com.sun.star.configuration.ConfigurationAccess is created - * and from the resulting XNameAccess the first element is taken. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - log.println("creating the Environment"); - - PropertyValue[] nodeArgs = new PropertyValue[1]; - PropertyValue nodepath = new PropertyValue(); - nodepath.Name = "nodepath"; - nodepath.Value = "org.openoffice.Office.Common"; - nodepath.Handle = -1; - nodepath.State = PropertyState.DEFAULT_VALUE; - nodeArgs[0] = nodepath; - - XInterface changeView = null; - XInterface alternateObject = null; - try { - XInterface Provider = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.ConfigurationProvider"); - XMultiServiceFactory pMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, - Provider); - oObj = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, - pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationAccess", - nodeArgs)); - // create a view on a different object that can change something, so listeners can be triggered. - // this is done for XContainer test - nodepath.Value = "org.openoffice.Office.Common/Internal"; - changeView = (XNameReplace) UnoRuntime.queryInterface(XNameReplace.class, - pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", - nodeArgs)); - alternateObject = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, - pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationAccess", - nodeArgs)); - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - log.println("ImplementationName: " + utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - XPropertySet prop = (XPropertySet) UnoRuntime.queryInterface( - XPropertySet.class, oObj); - util.dbg.printPropertiesNames(prop); - - String[] pNames = new String[] { - "Accessibility", "AddXMLToStorage", "AsianLayout", "AutoCorrect", - "Cache", "DateFormat", "ExternalApps", "ExternalMailer", "Filter", - "Font", "Gallery", "Help", "History", "I18N", "Image", "Internal", - "InternalMSExport", "Java", "Load", "Menus", "Misc", - "OfficeObjects", "Passwords", "Path", "Print", "Save", - "SearchOptions", "Security", "Setup", "Startup", "Undo", - "Vectorize", "View", "WorkingSet", "_3D_Engine" - }; - - String[] pTypes = new String[36]; - - for (int k = 0; k < pTypes.length; k++) { - pTypes[k] = "XInterface"; - } - - tEnv.addObjRelation("PropertyNames", pNames); - tEnv.addObjRelation("PropertyTypes", pTypes); - - tEnv.addObjRelation("ElementName", "Accessibility"); - - tEnv.addObjRelation("XLocalizable.ReadOnly", "Locale of ORootElementGroupInfoAccess is read Only"); - tEnv.addObjRelation("allReadOnly", - "all Properties of ORootElementGroupInfoAccess are read Only"); - - tEnv.addObjRelation("XContainer.NewValue", "SenselessString"); - tEnv.addObjRelation("XContainer.ElementName", "CurrentTempURL"); - tEnv.addObjRelation("XContainer.Container", changeView); - tEnv.addObjRelation("XContainer.AlternateObject", alternateObject); - - tEnv.addObjRelation("XChangesNotifier.ChangesBatch", (XChangesBatch)UnoRuntime.queryInterface( - XChangesBatch.class, changeView)); - - // set a new temp directory: use java.io.tmpdir as substitute, for XChangesNotifier test - // get a XPropertySet from the sub element - XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, changeView); - String newTempURL = util.utils.getFullURL(util.utils.getUsersTempDir()); - String curTempURL = ""; - try { - curTempURL = (String)xProp.getPropertyValue("CurrentTempURL"); - } - catch(Exception e) { - log.println("Cannot get property for XChangesNotifier test: this test is bound to fail."); - e.printStackTrace((PrintWriter)log); - } - // fallback 1: get user home - if (newTempURL.equalsIgnoreCase(curTempURL)) { - newTempURL = util.utils.getFullURL(System.getProperty("user.home")); - // fallback 2: get user dir - if (newTempURL.equalsIgnoreCase(curTempURL)) { - newTempURL = util.utils.getFullURL(System.getProperty("user.dir")); - } - } - tEnv.addObjRelation("XChangesNotifier.ChangeElement", newTempURL); - tEnv.addObjRelation("XChangesNotifier.OriginalElement", curTempURL); - tEnv.addObjRelation("XChangesNotifier.PropertyName", "CurrentTempURL"); - tEnv.addObjRelation("XChangesNotifier.PropertySet", xProp); - - tEnv.addObjRelation("expectedName", "OfficeObjects"); - tEnv.addObjRelation("HierachicalName", "/org.openoffice"); - - tEnv.addObjRelation("NoSetName", "ORootElementGroupInfoAccess"); - - return tEnv; - } -}
\ No newline at end of file diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/ORootElementGroupUpdateAccess.java b/qadevOOo/tests/java/mod/_cfgmgr2/ORootElementGroupUpdateAccess.java deleted file mode 100644 index dc04b7a29e11..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/ORootElementGroupUpdateAccess.java +++ /dev/null @@ -1,180 +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 mod._cfgmgr2; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.utils; - -import com.sun.star.beans.PropertyState; -import com.sun.star.beans.PropertyValue; -import com.sun.star.beans.XPropertySet; -import com.sun.star.container.XNameAccess; -import com.sun.star.container.XNameReplace; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; -import com.sun.star.util.XChangesBatch; - - -public class ORootElementGroupUpdateAccess extends TestCase { - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. <br> - * - * An instance of com.sun.star.comp.configuration.ConfigurationProvider - * is created at the MultiServiceFactory of the Office<br> - * At this an instance of com.sun.star.configuration.ConfigurationAccess is created - * and from the resulting XNameAccess the first element is taken. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - log.println("creating the Environment"); - - PropertyValue[] nodeArgs = new PropertyValue[1]; - PropertyValue nodepath = new PropertyValue(); - nodepath.Name = "nodepath"; - nodepath.Value = "org.openoffice.Office.Common/Internal"; - - nodepath.Handle = -1; - nodepath.State = PropertyState.DEFAULT_VALUE; - nodeArgs[0] = nodepath; - - try { - XInterface Provider = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.ConfigurationProvider"); - XMultiServiceFactory pMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, - Provider); - oObj = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, - pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", - nodeArgs)); - -/* helper.ConfigurationRead read = new helper.ConfigurationRead(pMSF, "org.openoffice.Office.Common"); - String[] subs = read.getRootNodeNames(); - for (int i=0; i<subs.length; i++) - System.out.println("Rootnodes " + subs[i]); - subs = read.getSubNodeNames("Internal"); - for (int i=0; i<subs.length; i++) - System.out.println("Rootnodes " + subs[i]); - Object subNode = read.getByHierarchicalName("Internal/RecoveryList"); - util.dbg.getSuppServices(subNode); */ - - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - log.println("ImplementationName: " + utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - XPropertySet prop = (XPropertySet) UnoRuntime.queryInterface( - XPropertySet.class, oObj); - - Object instance = null; - - String[] pNames = new String[] { - "CurrentTempURL", - "DevelopmentChart", - "SendCrashMail", - "Slot", - "UseMailUI"//, "RecoveryList" - }; - - String[] pTypes = new String[]{ - "String", - "Boolean", - "Boolean", - "Boolean", - "Boolean" - }; - - tEnv.addObjRelation("PropertyNames", pNames); - tEnv.addObjRelation("PropertyTypes", pTypes); - - // for XHierarchicalNameAccess - tEnv.addObjRelation("ElementName", "Slot"); - - tEnv.addObjRelation("XLocalizable.ReadOnly", "Localization is final and can't be changed"); - - tEnv.addObjRelation("XChangesNotifier.ChangesBatch", (XChangesBatch)UnoRuntime.queryInterface(XChangesBatch.class, oObj)); - - // set a new temp directory: use java.io.tmpdir as substitute - String newTempURL = util.utils.getFullURL(util.utils.getUsersTempDir()); - String curTempURL = ""; - try { - curTempURL = (String)prop.getPropertyValue("CurrentTempURL"); - } - catch(Exception e) { - log.println("Cannot get property for XChangesBatch test: this test is bound to fail."); - e.printStackTrace((PrintWriter)log); - } - // fallback 1: get user home - if (newTempURL.equalsIgnoreCase(curTempURL)) { - newTempURL = util.utils.getFullURL(System.getProperty("user.home")); - // fallback 2: get user dir - if (newTempURL.equalsIgnoreCase(curTempURL)) { - newTempURL = util.utils.getFullURL(System.getProperty("user.dir")); - } - } - - tEnv.addObjRelation("XChangesBatch.ChangeElement", newTempURL); - tEnv.addObjRelation("XChangesBatch.OriginalElement", curTempURL); - tEnv.addObjRelation("XChangesBatch.PropertyName", "CurrentTempURL"); - tEnv.addObjRelation("XChangesBatch.PropertySet", prop); - tEnv.addObjRelation("XChangesNotifier.ChangeElement", newTempURL); - tEnv.addObjRelation("XChangesNotifier.OriginalElement", curTempURL); - tEnv.addObjRelation("XChangesNotifier.PropertyName", "CurrentTempURL"); - tEnv.addObjRelation("XChangesNotifier.PropertySet", prop); - - tEnv.addObjRelation("expectedName", "RecoveryList"); - tEnv.addObjRelation("HierachicalName", "/org.openoffice"); - - String overwriteString = new String("ThisIsSenselessForSure"); - tEnv.addObjRelation("INSTANCE1", overwriteString); - tEnv.addObjRelation("NAMEREPLACE", pNames[0]); - - tEnv.addObjRelation("XContainer.NewValue", overwriteString); - tEnv.addObjRelation("XContainer.ElementName", pNames[0]); - tEnv.addObjRelation("XContainer.Container", (XNameReplace)UnoRuntime.queryInterface(XNameReplace.class, oObj)); - - tEnv.addObjRelation("NoSetName", "ORootElementGroupInfoAccess"); - - return tEnv; - } -} diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/ORootElementSetInfoAccess.java b/qadevOOo/tests/java/mod/_cfgmgr2/ORootElementSetInfoAccess.java deleted file mode 100644 index 6126e2d156c5..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/ORootElementSetInfoAccess.java +++ /dev/null @@ -1,127 +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 mod._cfgmgr2; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.utils; - -import com.sun.star.beans.PropertyState; -import com.sun.star.beans.PropertyValue; -import com.sun.star.container.XNameAccess; -import com.sun.star.container.XNameReplace; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.XSingleServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; -import com.sun.star.util.XChangesBatch; - - -public class ORootElementSetInfoAccess extends TestCase { - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. <br> - * - * An instance of com.sun.star.comp.configuration.ConfigurationProvider - * is created at the MultiServiceFactory of the Office<br> - * At this an instance of com.sun.star.configuration.ConfigurationAccess is created - * and from the resulting XNameAccess the first element is taken. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - log.println("creating the Environment"); - - PropertyValue[] nodeArgs = new PropertyValue[1]; - PropertyValue nodepath = new PropertyValue(); - nodepath.Name = "nodepath"; - nodepath.Value = "org.openoffice.Office.Jobs/Jobs"; - nodepath.Handle = -1; - nodepath.State = PropertyState.DEFAULT_VALUE; - nodeArgs[0] = nodepath; - - XInterface changeView = null; - Object instance = null; - try { - XInterface Provider = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.ConfigurationProvider"); - XMultiServiceFactory pMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, - Provider); - oObj = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, - pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationAccess", - nodeArgs)); - changeView = (XNameReplace) UnoRuntime.queryInterface(XNameReplace.class, - pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", - nodeArgs)); - XSingleServiceFactory jobsFac = (XSingleServiceFactory) UnoRuntime.queryInterface( - XSingleServiceFactory.class, - changeView); - instance = jobsFac.createInstance(); - - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - log.println("ImplementationName: " + utils.getImplName(oObj)); - log.println("ChangeView: " + utils.getImplName(changeView)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - XNameReplace container = (XNameReplace)UnoRuntime.queryInterface(XNameReplace.class, changeView); - tEnv.addObjRelation("XContainer.NewValue", instance); - tEnv.addObjRelation("XContainer.ElementName", "RegistrationRequest"); - tEnv.addObjRelation("XContainer.Container", container); - - tEnv.addObjRelation("XChangesNotifier.ChangesBatch", (XChangesBatch)UnoRuntime.queryInterface(XChangesBatch.class, changeView)); - tEnv.addObjRelation("XChangesNotifier.ChangeElement", instance); - tEnv.addObjRelation("XChangesNotifier.PropertyName", "RegistrationRequest"); - tEnv.addObjRelation("XChangesNotifier.NameReplace", container); - - tEnv.addObjRelation("XLocalizable.ReadOnly", "Locale of ORootElementSetInfoAccess is read Only"); - tEnv.addObjRelation("allReadOnly", - "all Properties of ORootElementSetInfoAccess are read Only"); - tEnv.addObjRelation("NoSetName", "ORootElementSetInfoAccess"); - tEnv.addObjRelation("TemplateName", "org.openoffice.Office.Jobs/Job"); - tEnv.addObjRelation("HierachicalName", "/org.openoffice"); - tEnv.addObjRelation("ElementName", "RegistrationRequest"); - tEnv.addObjRelation("expectedName", "RegistrationRequest"); - - return tEnv; - } -} diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/ORootElementTreeSetUpdateAccess.java b/qadevOOo/tests/java/mod/_cfgmgr2/ORootElementTreeSetUpdateAccess.java deleted file mode 100644 index 31d451c97bd9..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/ORootElementTreeSetUpdateAccess.java +++ /dev/null @@ -1,128 +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 mod._cfgmgr2; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.utils; - -import com.sun.star.beans.PropertyState; -import com.sun.star.beans.PropertyValue; -import com.sun.star.container.XNameAccess; -import com.sun.star.container.XNameReplace; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.XSingleServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; -import com.sun.star.util.XChangesBatch; - - -public class ORootElementTreeSetUpdateAccess extends TestCase { - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. <br> - * - * An instance of com.sun.star.comp.configuration.ConfigurationProvider - * is created at the MultiServiceFactory of the Office<br> - * At this an instance of com.sun.star.configuration.ConfigurationAccess is created - * and from the resulting XNameAccess the first element is taken. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - Object instance = null; - Object instance1 = null; - log.println("creating the Environment"); - - PropertyValue[] nodeArgs = new PropertyValue[1]; - PropertyValue nodepath = new PropertyValue(); - nodepath.Name = "nodepath"; - nodepath.Value = "org.openoffice.Office.Jobs/Jobs"; - nodepath.Handle = -1; - nodepath.State = PropertyState.DEFAULT_VALUE; - nodeArgs[0] = nodepath; - - try { - XInterface Provider = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.ConfigurationProvider"); - XMultiServiceFactory pMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, - Provider); - oObj = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, - pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", - nodeArgs)); - - XSingleServiceFactory jobsFac = (XSingleServiceFactory) UnoRuntime.queryInterface( - XSingleServiceFactory.class, - oObj); - instance = jobsFac.createInstance(); - instance1 = jobsFac.createInstance(); - - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - log.println("ImplementationName: " + utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - tEnv.addObjRelation("NAMEREPLACE","RegistrationRequest"); - tEnv.addObjRelation("INSTANCE", instance); - tEnv.addObjRelation("INSTANCE1", instance1); - tEnv.addObjRelation("INSTANCE2", instance1); - - tEnv.addObjRelation("XChangesBatch.ChangeElement", instance); - tEnv.addObjRelation("XChangesBatch.PropertyName", "RegistrationRequest"); - tEnv.addObjRelation("XChangesBatch.NameReplace", (XNameReplace)UnoRuntime.queryInterface(XNameReplace.class, oObj)); - - tEnv.addObjRelation("XChangesNotifier.ChangeElement", instance); - tEnv.addObjRelation("XChangesNotifier.PropertyName", "RegistrationRequest"); - tEnv.addObjRelation("XChangesNotifier.NameReplace", (XNameReplace)UnoRuntime.queryInterface(XNameReplace.class, oObj)); - tEnv.addObjRelation("XChangesNotifier.ChangesBatch", (XChangesBatch)UnoRuntime.queryInterface(XChangesBatch.class, oObj)); - - tEnv.addObjRelation("XLocalizable.ReadOnly", "Locale of ORootElementTreeSetUpdateAccess is read Only"); - tEnv.addObjRelation("NoSetName", "ORootElementTreeSetUpdateAccess"); - - tEnv.addObjRelation("HierachicalName", "/org.openoffice.Office"); - tEnv.addObjRelation("ElementName","RegistrationRequest"); - tEnv.addObjRelation("TemplateName", "org.openoffice.Office.Jobs/Job"); - - tEnv.addObjRelation("expectedName","RegistrationRequest"); - return tEnv; - } - -}
\ No newline at end of file diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/ORootElementValueSetUpdateAccess.java b/qadevOOo/tests/java/mod/_cfgmgr2/ORootElementValueSetUpdateAccess.java deleted file mode 100644 index 48bfa8f489c0..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/ORootElementValueSetUpdateAccess.java +++ /dev/null @@ -1,193 +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 mod._cfgmgr2; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.utils; - -import com.sun.star.beans.PropertyState; -import com.sun.star.beans.PropertyValue; -import com.sun.star.container.XNameAccess; -import com.sun.star.container.XNameContainer; -import com.sun.star.container.XNameReplace; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; -import com.sun.star.util.XChangesBatch; - -/** - * Check the ORootElementValueSetUpdateAccess service. - * For this, the ExternalApss layer is used. Since this layer is empty (since - * cws cfgapi), some own values are created and written to the current user - * layer. The tests are then executed on these values. - */ -public class ORootElementValueSetUpdateAccess extends TestCase { - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. <br> - * - * An instance of com.sun.star.comp.configuration.ConfigurationProvider - * is created at the MultiServiceFactory of the Office<br> - * At this an instance of com.sun.star.configuration.ConfigurationAccess is created - * and from the resulting XNameAccess the first element is taken. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - Object instance = null; - Object instance1 = null; - Object instance2 = null; - log.println("creating the Environment"); - - PropertyValue[] nodeArgs = new PropertyValue[1]; - PropertyValue nodepath = new PropertyValue(); - nodepath.Name = "nodepath"; - nodepath.Value = "org.openoffice.Office.Common/ExternalApps"; - nodepath.Handle = -1; - nodepath.State = PropertyState.DEFAULT_VALUE; - nodeArgs[0] = nodepath; - - try { - XInterface Provider = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.ConfigurationProvider"); - XMultiServiceFactory pMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, - Provider); - oObj = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, - pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", - nodeArgs)); - - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - log.println("ImplementationName: " + utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - String[] pNames = new String[] { - "file", "ftp", "dummy", "http" - }; - - String[] pTypes = new String[] { - "String", "String", "String", "String" - }; - - createSomeEntries(oObj); - - tEnv.addObjRelation("INSTANCE1", "NewOne1"); - tEnv.addObjRelation("NAMEREPLACE", pNames[0]); - - // for XContainer - tEnv.addObjRelation("INSTANCE", "NewOne2"); - - tEnv.addObjRelation("XChangesBatch.PropertyName", pNames[0]); - tEnv.addObjRelation("XChangesBatch.ChangeElement", "NewOne3"); - tEnv.addObjRelation("XChangesBatch.NameReplace", (XNameReplace)UnoRuntime.queryInterface(XNameReplace.class, oObj)); - - tEnv.addObjRelation("XChangesNotifier.PropertyName", pNames[0]); - tEnv.addObjRelation("XChangesNotifier.ChangeElement", "NewOne4"); - tEnv.addObjRelation("XChangesNotifier.ChangesBatch" , (XChangesBatch)UnoRuntime.queryInterface(XChangesBatch.class, oObj)); - tEnv.addObjRelation("XChangesNotifier.NameReplace", (XNameReplace)UnoRuntime.queryInterface(XNameReplace.class, oObj)); - - tEnv.addObjRelation("XLocalizable.ReadOnly", "Locale of ORootElementValueSetUpdateAccess is read Only"); - tEnv.addObjRelation("NoSetName", "ORootElementValueSetUpdateAccess"); - - tEnv.addObjRelation("HierachicalName", "/org.openoffice.Office"); - tEnv.addObjRelation("ElementName","http"); - tEnv.addObjRelation("TemplateName", "cfg:value/cfg:any"); - - tEnv.addObjRelation("expectedName","http"); - return tEnv; - } - - /** - * Create entries in the ExternalApps layer, so there is something to test - * @param oObj The test object: used to create some entries. - */ - private void createSomeEntries(XInterface oObj) { - XNameContainer xCont = (XNameContainer)UnoRuntime.queryInterface(XNameContainer.class, oObj); - insertOrUpdate(xCont, "file", "just"); - insertOrUpdate(xCont, "ftp", "some"); - insertOrUpdate(xCont, "dummy", "arbitrary"); - insertOrUpdate(xCont, "http", "value"); - // write the changes into the user layer. - XChangesBatch xBatch = (XChangesBatch)UnoRuntime.queryInterface(XChangesBatch.class, oObj); - try { - xBatch.commitChanges(); - } - catch(com.sun.star.lang.WrappedTargetException e) { - // ignore: bug will be found with the interface test - } - } - - /** - * Insert a value in a name container or else update it - * @param xCont The name conationer to insert or update. - * @param name The name of the value. - * @param value The value itself. - */ - private void insertOrUpdate(XNameContainer xCont, String name, String value) { - boolean update = false; - try { - xCont.insertByName(name, value); - } - catch(com.sun.star.lang.IllegalArgumentException e) { - // ignore: bug will be found with the interface test - } - catch(com.sun.star.lang.WrappedTargetException e) { - // ignore: bug will be found with the interface test - } - catch(com.sun.star.container.ElementExistException e) { - update = true; - } - try { - if (update) - xCont.replaceByName(name, value); - } - catch(com.sun.star.lang.IllegalArgumentException e) { - // ignore: bug will be found with the interface test - } - catch(com.sun.star.container.NoSuchElementException e) { - // ignore: bug will be found with the interface test - } - catch(com.sun.star.lang.WrappedTargetException e) { - // ignore: bug will be found with the interface test - } - } -}
\ No newline at end of file diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/OSetElementGroupInfoAccess.java b/qadevOOo/tests/java/mod/_cfgmgr2/OSetElementGroupInfoAccess.java deleted file mode 100644 index ad31d2228968..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/OSetElementGroupInfoAccess.java +++ /dev/null @@ -1,234 +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 mod._cfgmgr2; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.utils; - -import com.sun.star.beans.PropertyState; -import com.sun.star.beans.PropertyValue; -import com.sun.star.container.XNameAccess; -import com.sun.star.container.XNameContainer; -import com.sun.star.container.XNameReplace; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.XSingleServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; -import com.sun.star.util.XChangesBatch; - - -public class OSetElementGroupInfoAccess extends TestCase { - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. <br> - * - * An instance of com.sun.star.comp.configuration.ConfigurationProvider - * is created at the MultiServiceFactory of the Office<br> - * At this an instance of com.sun.star.configuration.ConfigurationAccess is created - * and from the resulting XNameAccess the first element is taken. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - log.println("creating the Environment"); - - PropertyValue[] nodeArgs = new PropertyValue[1]; - PropertyValue nodepath = new PropertyValue(); - nodepath.Name = "nodepath"; - nodepath.Value = "org.openoffice.Office.Common/Menus"; - nodepath.Handle = -1; - nodepath.State = PropertyState.DEFAULT_VALUE; - nodeArgs[0] = nodepath; - - XNameAccess xHierachNameAccess = null; - XNameReplace xChangeView = null; - XComponent xDisposeComponent = null; - - try { - XInterface Provider = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.ConfigurationProvider"); - XMultiServiceFactory pMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, - Provider); - - xHierachNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, - pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationAccess", nodeArgs)); - - XInterface oInnerSetInfoAccess = (XInterface) xHierachNameAccess.getByName("New"); - - XNameAccess names = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, - oInnerSetInfoAccess); - - String[] theNames = names.getElementNames(); - - log.println("Contains " + theNames.length + " elements"); - - xDisposeComponent = (XComponent) - UnoRuntime.queryInterface(XComponent.class, xHierachNameAccess); - - String[] elnames = names.getElementNames(); - - log.println("use node 'm0'"); - oObj = (XInterface) names.getByName("m0"); - - - - log.println("create ConfigurationUpdateAccess to modify the object..."); - - xHierachNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, - pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", - nodeArgs)); - - oInnerSetInfoAccess = (XInterface) xHierachNameAccess.getByName("New"); - - names = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, - oInnerSetInfoAccess); - - log.println("use node 'm0'"); - - XInterface xInt = (XInterface) names.getByName("m0"); - xChangeView = (XNameReplace) UnoRuntime.queryInterface(XNameReplace.class, - xInt); - - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - log.println("ImplementationName: " + utils.getImplName(oObj)); - - String[] pNames = new String[] { "ImageIdentifier", "Title", "URL", "TargetName" }; - - String[] pTypes = new String[] { "String", "String", "String", "String" }; - - TestEnvironment tEnv = new TestEnvironment(oObj); - - tEnv.addObjRelation("cannotSwitchParent", - "configmgr: BasicElement::setParent: cannot move Entry"); - - tEnv.addObjRelation("HierachicalName", "/org.openoffice.Office"); - tEnv.addObjRelation("ElementName", "Title"); - tEnv.addObjRelation("NoSetName", "OInnerValueSetInfoAccess"); - tEnv.addObjRelation("TemplateName", "cfg:value/cfg:any"); - tEnv.addObjRelation("expectedName", "ImageIdentifier"); - - tEnv.addObjRelation("XContainer.NewValue", "aValue"); - tEnv.addObjRelation("XContainer.ElementName", "TargetName"); - tEnv.addObjRelation("XContainer.Container", xChangeView); - - // dispose the owner of the test object - tEnv.addObjRelation("XComponent.DisposeThis", xDisposeComponent); - - tEnv.addObjRelation("PropertyNames", pNames); - tEnv.addObjRelation("PropertyTypes", pTypes); - tEnv.addObjRelation("allReadOnly", - "all Properties of OSetElementGroupInfoAccess are read Only"); - - tEnv.addObjRelation("TemplateInstance", "org.openoffice.Office.Common/MenuType"); - - return tEnv; - } - /** - * Create entries in the ExternalApps layer, so there is something to test - * @param oObj The test object: used to create some entries. - */ - private void createSomeEntries(XInterface xObj) { - XNameContainer xCont = (XNameContainer)UnoRuntime.queryInterface(XNameContainer.class, xObj); - insertOrUpdate(xCont, "file", xObj); -// insertOrUpdate(xCont, "ftp", "some"); -// insertOrUpdate(xCont, "dummy", "arbitrary"); -// insertOrUpdate(xCont, "http", "value"); - // write the changes into the user layer. - XChangesBatch xBatch = (XChangesBatch)UnoRuntime.queryInterface(XChangesBatch.class, xObj); - try { - xBatch.commitChanges(); - } - catch(com.sun.star.lang.WrappedTargetException e) { - // ignore: bug will be found with the interface test - } - } - - /** - * Insert a value in a name container or else update it - * @param xCont The name conationer to insert or update. - * @param name The name of the value. - * @param value The value itself. - */ - private void insertOrUpdate(XNameContainer xCont, String name, XInterface value) { - boolean update = false; - XSingleServiceFactory xFac = (XSingleServiceFactory) UnoRuntime.queryInterface( - XSingleServiceFactory.class, - value); - - try { - xCont.insertByName(name, xFac.createInstance()); - } - catch(com.sun.star.lang.IllegalArgumentException e) { - log.println("ERROR: " + e.toString()); - // ignore: bug will be found with the interface test - } - catch(com.sun.star.lang.WrappedTargetException e) { - log.println("ERROR: " + e.toString()); - // ignore: bug will be found with the interface test - } - catch(com.sun.star.container.ElementExistException e) { - update = true; - } - catch(com.sun.star.uno.Exception e) { - log.println("could not create Instance: " + e.toString()); - } - - try { - if (update) - xCont.replaceByName(name, xFac.createInstance()); - } - catch(com.sun.star.lang.IllegalArgumentException e) { - // ignore: bug will be found with the interface test - } - catch(com.sun.star.container.NoSuchElementException e) { - // ignore: bug will be found with the interface test - } - catch(com.sun.star.lang.WrappedTargetException e) { - // ignore: bug will be found with the interface test - } - catch(com.sun.star.uno.Exception e) { - log.println("could not create Instance: " + e.toString()); - } - } -}
\ No newline at end of file diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/OSetElementGroupUpdateAccess.java b/qadevOOo/tests/java/mod/_cfgmgr2/OSetElementGroupUpdateAccess.java deleted file mode 100644 index 45132f890185..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/OSetElementGroupUpdateAccess.java +++ /dev/null @@ -1,132 +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 mod._cfgmgr2; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.utils; - -import com.sun.star.beans.PropertyState; -import com.sun.star.beans.PropertyValue; -import com.sun.star.container.XHierarchicalNameAccess; -import com.sun.star.container.XNameAccess; -import com.sun.star.container.XNameReplace; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.XSingleServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; - - -public class OSetElementGroupUpdateAccess extends TestCase { - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. <br> - * - * An instance of com.sun.star.comp.configuration.ConfigurationProvider - * is created at the MultiServiceFactory of the Office<br> - * At this an instance of com.sun.star.configuration.ConfigurationAccess is created - * and from the resulting XNameAccess the first element is taken. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - log.println("creating the Environment"); - - PropertyValue[] nodeArgs = new PropertyValue[1]; - PropertyValue nodepath = new PropertyValue(); - nodepath.Name = "nodepath"; - nodepath.Value = "org.openoffice.Office.Jobs"; - nodepath.Handle = -1; - nodepath.State = PropertyState.DEFAULT_VALUE; - nodeArgs[0] = nodepath; - - try { - XInterface Provider = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.ConfigurationProvider"); - XMultiServiceFactory pMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, - Provider); - XHierarchicalNameAccess names = (XHierarchicalNameAccess) UnoRuntime.queryInterface( - XHierarchicalNameAccess.class, - pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", - nodeArgs)); - - XSingleServiceFactory jobsFac = (XSingleServiceFactory) UnoRuntime.queryInterface( - XSingleServiceFactory.class, - names.getByHierarchicalName("Jobs")); - oObj = (XInterface) jobsFac.createInstance(); - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - log.println("ImplementationName: " + utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - XNameAccess names = (XNameAccess) UnoRuntime.queryInterface( - XNameAccess.class, oObj); - - String[] pNames = names.getElementNames(); - String[] pTypes = new String[pNames.length]; - - for (int k=0;k<pNames.length;k++) { - pTypes[k] = "boolean"; - } - - - tEnv.addObjRelation("ElementName", pNames[0]); - - tEnv.addObjRelation("PropertyNames", pNames); - tEnv.addObjRelation("PropertyTypes", pTypes); - - tEnv.addObjRelation("cannotSwitchParent", - "configmgr: BasicElement::setParent: cannot move Entry"); - - tEnv.addObjRelation("expectedName", pNames[0]); - tEnv.addObjRelation("INSTANCE1", "newValue"); - tEnv.addObjRelation("HierachicalName", "//Job"); - tEnv.addObjRelation("NoSetName", "OSetElementGroupUpdateAccess"); - - tEnv.addObjRelation("XContainer.NewValue", "aValue"); - tEnv.addObjRelation("XContainer.ElementName", pNames[0]); - tEnv.addObjRelation("XContainer.Container", (XNameReplace) - UnoRuntime.queryInterface(XNameReplace.class, oObj)); - - tEnv.addObjRelation("TemplateInstance", (String)nodepath.Value + "/Job"); - return tEnv; - } -}
\ No newline at end of file diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/OSetElementSetInfoAccess.java b/qadevOOo/tests/java/mod/_cfgmgr2/OSetElementSetInfoAccess.java deleted file mode 100644 index 255698e14cd8..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/OSetElementSetInfoAccess.java +++ /dev/null @@ -1,145 +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 mod._cfgmgr2; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.utils; - -import com.sun.star.beans.PropertyState; -import com.sun.star.beans.PropertyValue; -import com.sun.star.container.XHierarchicalNameAccess; -import com.sun.star.container.XNameAccess; -import com.sun.star.container.XNameContainer; -import com.sun.star.container.XNameReplace; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.XSingleServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; - - -public class OSetElementSetInfoAccess extends TestCase { - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. <br> - * - * An instance of com.sun.star.comp.configuration.ConfigurationProvider - * is created at the MultiServiceFactory of the Office<br> - * At this an instance of com.sun.star.configuration.ConfigurationAccess is created - * and from the resulting XNameAccess the first element is taken. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - Object instance = null; - Object instance1 = null; - log.println("creating the Environment"); - - PropertyValue[] nodeArgs = new PropertyValue[1]; - PropertyValue nodepath = new PropertyValue(); - nodepath.Name = "nodepath"; - nodepath.Value = "org.openoffice.Office.Labels/Manufacturer"; - nodepath.Handle = -1; - nodepath.State = PropertyState.DEFAULT_VALUE; - nodeArgs[0] = nodepath; - - String hierarchicalElementName = "Labels['Avery A4']"; - String elementName = "Avery A4"; - - XNameReplace xChangeView = null; - XNameContainer xContainer = null; - XHierarchicalNameAccess xHierachNameAccess = null; - try { - XInterface Provider = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.ConfigurationProvider"); - XMultiServiceFactory pMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, - Provider); - xHierachNameAccess = (XHierarchicalNameAccess) UnoRuntime.queryInterface( - XHierarchicalNameAccess.class, - pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationAccess", - nodeArgs)); - - oObj = (XInterface) xHierachNameAccess.getByHierarchicalName(hierarchicalElementName); - - // craete a changeable view. - XHierarchicalNameAccess changeableNames = (XHierarchicalNameAccess) UnoRuntime.queryInterface(XHierarchicalNameAccess.class, - pMSF.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess", nodeArgs)); - - XInterface xInt = (XInterface) changeableNames.getByHierarchicalName(hierarchicalElementName); - xChangeView = (XNameReplace)UnoRuntime.queryInterface(XNameReplace.class, xInt); - XSingleServiceFactory jobsFac = (XSingleServiceFactory) UnoRuntime.queryInterface( - XSingleServiceFactory.class, xChangeView); - instance1 = jobsFac.createInstance(); - - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - log.println("ImplementationName: " + utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - XNameAccess xNameAccess = (XNameAccess) UnoRuntime.queryInterface( - XNameAccess.class, oObj); - - String[] pNames = xNameAccess.getElementNames(); - - tEnv.addObjRelation("ElementName", pNames[0]); - - tEnv.addObjRelation("cannotSwitchParent", - "configmgr: BasicElement::setParent: cannot move Entry"); - - tEnv.addObjRelation("XContainer.NewValue", instance1); - tEnv.addObjRelation("XContainer.ElementName", "L0"); - tEnv.addObjRelation("XContainer.Container", xChangeView); - - // dispose the owner of the test object - tEnv.addObjRelation("XComponent.DisposeThis", (XComponent) - UnoRuntime.queryInterface(XComponent.class, xHierachNameAccess)); - - tEnv.addObjRelation("expectedName", pNames[0]); - tEnv.addObjRelation("HierachicalName", "/org.openoffice.Office"); - tEnv.addObjRelation("NAMEREPLACE", pNames[0]); - tEnv.addObjRelation("NoSetName", "OInnerTreeSetInfoAccess"); - tEnv.addObjRelation("TemplateName", "org.openoffice.Office.Labels/LabelType"); - tEnv.addObjRelation("TemplateInstance", "org.openoffice.Office.Labels/Labels"); - - return tEnv; - } -} diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/OSetElementTreeSetUpdateAccess.java b/qadevOOo/tests/java/mod/_cfgmgr2/OSetElementTreeSetUpdateAccess.java deleted file mode 100644 index de39c8d9868d..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/OSetElementTreeSetUpdateAccess.java +++ /dev/null @@ -1,135 +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 mod._cfgmgr2; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.utils; - -import com.sun.star.beans.PropertyState; -import com.sun.star.beans.PropertyValue; -import com.sun.star.container.XHierarchicalNameAccess; -import com.sun.star.container.XNameAccess; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.XSingleServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; - - -public class OSetElementTreeSetUpdateAccess extends TestCase { - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. <br> - * - * An instance of com.sun.star.comp.configuration.ConfigurationProvider - * is created at the MultiServiceFactory of the Office<br> - * At this an instance of com.sun.star.configuration.ConfigurationAccess is created - * and from the resulting XNameAccess the first element is taken. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, - PrintWriter log) { - XInterface oObj = null; - Object instance = null; - Object instance1 = null; - Object instance2 = null; - log.println("creating the Environment"); - - PropertyValue[] nodeArgs = new PropertyValue[1]; - PropertyValue nodepath = new PropertyValue(); - nodepath.Name = "nodepath"; - nodepath.Value = "org.openoffice.Office.Labels/Manufacturer"; - nodepath.Handle = -1; - nodepath.State = PropertyState.DEFAULT_VALUE; - nodeArgs[0] = nodepath; - - XHierarchicalNameAccess xHierachNameAccess = null; - try { - - XInterface Provider = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.ConfigurationProvider"); - XMultiServiceFactory pMSF = (XMultiServiceFactory) UnoRuntime.queryInterface( - XMultiServiceFactory.class, - Provider); - xHierachNameAccess = (XHierarchicalNameAccess) UnoRuntime.queryInterface( - XHierarchicalNameAccess.class, - pMSF.createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", - nodeArgs)); - - oObj = (XInterface) xHierachNameAccess.getByHierarchicalName("Labels['Avery A4']"); - - XSingleServiceFactory jobsFac = (XSingleServiceFactory) UnoRuntime.queryInterface( - XSingleServiceFactory.class, - oObj); - instance = jobsFac.createInstance(); - instance1 = jobsFac.createInstance(); - instance2 = jobsFac.createInstance(); - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - log.println("ImplementationName: " + utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - XNameAccess names = (XNameAccess) UnoRuntime.queryInterface( - XNameAccess.class, oObj); - - String[] pNames = names.getElementNames(); - - tEnv.addObjRelation("ElementName", pNames[0]); - - tEnv.addObjRelation("cannotSwitchParent", - "configmgr: BasicElement::setParent: cannot move Entry"); - - // dispose the owner of the test object - tEnv.addObjRelation("XComponent.DisposeThis", (XComponent) - UnoRuntime.queryInterface(XComponent.class, xHierachNameAccess)); - - tEnv.addObjRelation("expectedName", pNames[0]); - tEnv.addObjRelation("HierachicalName", "/org.openoffice.Office"); - tEnv.addObjRelation("INSTANCE", instance); - tEnv.addObjRelation("INSTANCE1", instance1); - tEnv.addObjRelation("INSTANCE2", instance1); - tEnv.addObjRelation("NAMEREPLACE", pNames[0]); - tEnv.addObjRelation("NoSetName", "OSetElementTreeSetUpdateAccess"); - tEnv.addObjRelation("TemplateName", "org.openoffice.Office.Labels/LabelType"); - tEnv.addObjRelation("TemplateInstance", "org.openoffice.Office.Labels/Labels"); - - return tEnv; - } -}
\ No newline at end of file diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/SchemaParser.java b/qadevOOo/tests/java/mod/_cfgmgr2/SchemaParser.java deleted file mode 100644 index 73315eabebd0..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/SchemaParser.java +++ /dev/null @@ -1,75 +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 mod._cfgmgr2; - -import com.sun.star.io.XActiveDataSink; -import com.sun.star.io.XInputStream; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.ucb.XSimpleFileAccess; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; -import java.io.PrintWriter; -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - -public class SchemaParser extends TestCase { - - protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - - XInterface oObj = null; - XSimpleFileAccess simpleAccess = null; - XInputStream xStream = null; - String filename = null; - - try { - oObj = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.backend.xml.SchemaParser"); - Object fileacc = ((XMultiServiceFactory)tParam.getMSF()).createInstance("com.sun.star.comp.ucb.SimpleFileAccess"); - simpleAccess = (XSimpleFileAccess) - UnoRuntime.queryInterface(XSimpleFileAccess.class,fileacc); - filename = util.utils.getOfficeURL((XMultiServiceFactory)tParam.getMSF())+"/../share/registry/schema/org/openoffice/Setup.xcs"; - - log.println("Going to parse: "+filename); - xStream = simpleAccess.openFileRead(filename); - } catch (com.sun.star.uno.Exception e) { - } - - log.println("Implementation name: "+ util.utils.getImplName(oObj)); - - XActiveDataSink xSink = (XActiveDataSink) UnoRuntime.queryInterface(XActiveDataSink.class, oObj); - xSink.setInputStream(xStream); - TestEnvironment tEnv = new TestEnvironment(oObj); - - tEnv.addObjRelation("InputStream", xStream); - tEnv.addObjRelation("ParsedFileName", filename); - return tEnv; - } - -} diff --git a/qadevOOo/tests/java/mod/_cfgmgr2/SingleBackendAdapter.java b/qadevOOo/tests/java/mod/_cfgmgr2/SingleBackendAdapter.java deleted file mode 100644 index 7e0d757b6b94..000000000000 --- a/qadevOOo/tests/java/mod/_cfgmgr2/SingleBackendAdapter.java +++ /dev/null @@ -1,80 +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 mod._cfgmgr2; - -import com.sun.star.lang.XInitialization; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; -import java.io.PrintWriter; -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - -public class SingleBackendAdapter extends TestCase { - - /** Called to create an instance of <code>TestEnvironment</code> with an - * object to test and related objects. Subclasses should implement this - * method to provide the implementation and related objects. The method is - * called from <code>getTestEnvironment()</code>. - * - * @param tParam test parameters - * @param log writer to log information while testing - * - * @see TestEnvironment - * @see #getTestEnvironment() - * - */ - protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XInterface oObj = null; - XInterface backend = null; - - try { - Object[] args = new Object[1]; - args[0] = ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.configuration.bootstrap.BootstrapContext"); - backend = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstanceWithArguments("com.sun.star.comp.configuration.backend.LocalSingleBackend",args); - oObj = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.backend.SingleBackendAdapter"); - XInitialization xInit = (XInitialization) UnoRuntime.queryInterface( - XInitialization.class, oObj); - - xInit.initialize(new Object[] { backend }); - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - log.println("Implementation name: "+ util.utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - return tEnv; - } - -} diff --git a/qadevOOo/tests/java/mod/_configmgr/ConfigurationProvider.java b/qadevOOo/tests/java/mod/_configmgr/ConfigurationProvider.java new file mode 100644 index 000000000000..6626ceaa3a9b --- /dev/null +++ b/qadevOOo/tests/java/mod/_configmgr/ConfigurationProvider.java @@ -0,0 +1,57 @@ +/************************************************************************* +* +* 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 mod._configmgr; + +import com.sun.star.beans.NamedValue; +import com.sun.star.uno.XComponentContext; +import lib.TestCase; +import lib.TestEnvironment; +import lib.TestParameters; +import java.io.PrintWriter; + +public final class ConfigurationProvider extends TestCase { + public ConfigurationProvider() {} + + protected TestEnvironment createTestEnvironment( + TestParameters tParam, PrintWriter log) + { + // Create a non-default ConfigurationProvider instance, so that testing + // its XComponent.dispose does not accidentally dispose the + // DefaultProvider: + XComponentContext ctxt = tParam.getComponentContext(); + try { + return ProviderTestEnvironment.create( + ctxt.getServiceManager().createInstanceWithArgumentsAndContext( + "com.sun.star.configuration.ConfigurationProvider", + new Object[] { new NamedValue("Locale", "*") }, + ctxt)); + } catch (com.sun.star.uno.Exception e) { + throw new RuntimeException(e); + } + } +} diff --git a/qadevOOo/tests/java/mod/_configmgr/DefaultProvider.java b/qadevOOo/tests/java/mod/_configmgr/DefaultProvider.java new file mode 100644 index 000000000000..f8a023ea2f12 --- /dev/null +++ b/qadevOOo/tests/java/mod/_configmgr/DefaultProvider.java @@ -0,0 +1,54 @@ +/************************************************************************* +* +* 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 mod._configmgr; + +import com.sun.star.uno.AnyConverter; +import com.sun.star.uno.XInterface; +import lib.TestCase; +import lib.TestEnvironment; +import lib.TestParameters; +import java.io.PrintWriter; + +public final class DefaultProvider extends TestCase { + public DefaultProvider() {} + + protected TestEnvironment createTestEnvironment( + TestParameters tParam, PrintWriter log) + { + try { + return ProviderTestEnvironment.create( + AnyConverter.toObject( + XInterface.class, + tParam.getComponentContext().getValueByName( + "/singletons/" + + "com.sun.star.configuration.theDefaultProvider"))); + } catch (com.sun.star.lang.IllegalArgumentException e) { + throw new RuntimeException(e); + } + } +} diff --git a/qadevOOo/tests/java/mod/_configmgr/ProviderTestEnvironment.java b/qadevOOo/tests/java/mod/_configmgr/ProviderTestEnvironment.java new file mode 100644 index 000000000000..ebd487305f3b --- /dev/null +++ b/qadevOOo/tests/java/mod/_configmgr/ProviderTestEnvironment.java @@ -0,0 +1,51 @@ +/************************************************************************* +* +* 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 mod._configmgr; + +import com.sun.star.beans.NamedValue; +import com.sun.star.uno.XInterface; +import lib.TestEnvironment; + +final class ProviderTestEnvironment { + private ProviderTestEnvironment() {} + + public static TestEnvironment create(Object provider) { + TestEnvironment env = new TestEnvironment((XInterface) provider); + env.addObjRelation( + "XMSF.serviceNamesWithArgs", + new String[] { + "com.sun.star.configuration.ConfigurationAccess", + "com.sun.star.configuration.ConfigurationUpdateAccess" }); + Object[] args = new Object[] { + new NamedValue("nodepath", "/org.openoffice.Setup") }; + env.addObjRelation("XMSF.Args", new Object[][] { args, args }); + env.addObjRelation( + "needArgs", "com.sun.star.configuration.ConfigurationProvider"); + return env; + } +} diff --git a/qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader.java b/qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader.java index de082c380da5..7e9a5f68f5a7 100644 --- a/qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader.java +++ b/qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader.java @@ -84,7 +84,6 @@ public class JavaComponentLoader extends TestCase { tEnv.addObjRelation("ImplementationLoader", "com.sun.star.loader.JavaComponentLoader") ; - String jarname = "MyPersistentObjectImpl.jar"; String implURL = utils.getFullTestURL("qadevlibs/MyPersistObjectImpl.jar"); tEnv.addObjRelation("ImplementationUrl", implURL) ; log.println("looking for shared lib: " + implURL); diff --git a/qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java b/qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java index 7bb057435f82..6c5f7dc53997 100644 --- a/qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java +++ b/qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java @@ -136,7 +136,6 @@ public class NestedRegistry extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object oInterface = null; - Object fileAcc = null; final String tmpDir = utils.getOfficeTempDirSys( (XMultiServiceFactory)Param.getMSF()) ; diff --git a/qadevOOo/tests/java/mod/_remotebridge.uno/various.java b/qadevOOo/tests/java/mod/_remotebridge.uno/various.java index 76f5cab28e85..0bcaecc361db 100644 --- a/qadevOOo/tests/java/mod/_remotebridge.uno/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge.uno/various.java @@ -160,7 +160,7 @@ public class various extends TestCase { public void run() { try { acceptedCall = acc.accept(connectString) ; - XBridge xBridge = xBrdgFctr.createBridge("MyBridge", "urp", + xBrdgFctr.createBridge("MyBridge", "urp", acceptedCall, xInstProv); } catch (com.sun.star.lang.IllegalArgumentException e) { ex = e ; diff --git a/qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java b/qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java index ad16c00bc7a2..a7bcb00a2087 100644 --- a/qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java +++ b/qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java @@ -110,9 +110,6 @@ public class MarkableInputStream extends TestCase { XActiveDataSource xdSmo = (XActiveDataSource) UnoRuntime.queryInterface(XActiveDataSource.class, mostream); - XOutputStream moStream = (XOutputStream) - UnoRuntime.queryInterface(XOutputStream.class, mostream); - XOutputStream PipeOut = (XOutputStream) UnoRuntime.queryInterface(XOutputStream.class, aPipe); XInputStream PipeIn = (XInputStream) diff --git a/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java index 5f9aeac2a598..d7bfd8efbb96 100644 --- a/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java @@ -96,10 +96,6 @@ public class MarkableOutputStream extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; - Object ostream = null; - - Object istream = null ; - XOutputStream moStream = null ; XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); Object aPipe = null; diff --git a/qadevOOo/tests/java/mod/_streams.uno/Pipe.java b/qadevOOo/tests/java/mod/_streams.uno/Pipe.java index d501febc0017..440550a5b444 100644 --- a/qadevOOo/tests/java/mod/_streams.uno/Pipe.java +++ b/qadevOOo/tests/java/mod/_streams.uno/Pipe.java @@ -88,7 +88,6 @@ public class Pipe extends TestCase { TestEnvironment tEnv = new TestEnvironment( oObj ); //add relation for io.XOutputStream - final XMultiServiceFactory msf = (XMultiServiceFactory)Param.getMSF(); final XInputStream iStream = (XInputStream) UnoRuntime.queryInterface(XInputStream.class, oObj); @@ -97,7 +96,6 @@ public class Pipe extends TestCase { tEnv.addObjRelation("XOutputStream.StreamChecker", new ifc.io._XOutputStream.StreamChecker() { - XInputStream inStream = null; public void resetStreams() { } diff --git a/qadevOOo/tests/java/mod/_sysmgr1/SystemIntegration.java b/qadevOOo/tests/java/mod/_sysmgr1/SystemIntegration.java deleted file mode 100644 index cfec26dd61f1..000000000000 --- a/qadevOOo/tests/java/mod/_sysmgr1/SystemIntegration.java +++ /dev/null @@ -1,65 +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 mod._sysmgr1; - -import com.sun.star.lang.XInitialization; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; -import java.io.PrintWriter; -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; - -public class SystemIntegration extends TestCase { - - protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XInterface oObj = null; - Object[] args = new Object[0]; - - try { - - oObj = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) - .createInstance("com.sun.star.comp.configuration.backend.SystemIntegration"); - XInitialization xInit = (XInitialization) UnoRuntime.queryInterface(XInitialization.class,oObj); - xInit.initialize(args); - - } catch (com.sun.star.uno.Exception e) { - } - - log.println("Implementation name: "+ util.utils.getImplName(oObj)); - - TestEnvironment tEnv = new TestEnvironment(oObj); - - //objRelation for XBackend - tEnv.addObjRelation("noUpdate", "SystemIntegrationManager: No Update Operation allowed, Read Only access -- OK"); - - return tEnv; - } - -} |