diff options
author | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
---|---|---|
committer | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
commit | 3c1d4742e649fe9c8aed8c2817fe3e1f3364f298 (patch) | |
tree | e0c6e02c89aa9227726c9469da1001b3e29c41df /framework/qa | |
parent | c5c31e2aeaedbdf76e1f38d3c385e34f5ed875ca (diff) |
Resync to trunk, windows non-pro build
aoo/aw080
Diffstat (limited to 'framework/qa')
13 files changed, 55 insertions, 55 deletions
diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java index daa0d586e397..dda68f17fdc2 100644 --- a/framework/qa/complex/XUserInputInterception/EventTest.java +++ b/framework/qa/complex/XUserInputInterception/EventTest.java @@ -415,7 +415,7 @@ public class EventTest { return true; } /** - * This event does nothing usefull + * This event does nothing useful * @param oEvent refers to the object that fired the event. */ public void disposing( EventObject oEvent ){ @@ -451,7 +451,7 @@ public class EventTest { return true; } /** - * This event does nothing usefull + * This event does nothing useful * @param oEvent refers to the object that fired the event. */ public void disposing( EventObject oEvent ){ diff --git a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java index 953e7b0c5ac5..77da45516894 100644 --- a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java +++ b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java @@ -123,7 +123,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor } catch (com.sun.star.uno.Exception ex) { - // something strange has happend! + // something strange has happened! } catch (java.lang.Throwable ex) { diff --git a/framework/qa/complex/dispatches/Interceptor.java b/framework/qa/complex/dispatches/Interceptor.java index c4fb088a2a7c..d41b6ba59dee 100644 --- a/framework/qa/complex/dispatches/Interceptor.java +++ b/framework/qa/complex/dispatches/Interceptor.java @@ -90,7 +90,7 @@ public class Interceptor implements XDispatchProvider, /** counts calls of setSlave...(). So the outside API test can use this value to know if this interceptor - was realy added to the interceptor chain of OOo. + was really added to the interceptor chain of OOo. */ private int m_nRegistrationCount = 0; @@ -260,7 +260,7 @@ public class Interceptor implements XDispatchProvider, // ____________________ /** set a new list of URL's, which should be used on registration time - (that's why it's neccessary to call this impl-method before the interceptor + (that's why it's necessary to call this impl-method before the interceptor is used at the OOo API!) to optimize the interception chain. */ public synchronized void setURLs4InterceptionInfo(String[] lURLs) @@ -271,7 +271,7 @@ public class Interceptor implements XDispatchProvider, // ____________________ /** set a new list of URL's, which should be blocked by this interceptor. - (that's why it's neccessary to call this impl-method before the interceptor + (that's why it's necessary to call this impl-method before the interceptor is used at the OOo API!) */ public synchronized void setURLs4URLs4Blocking(String[] lURLs) diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java index fd93a8029841..270a89fffbbc 100644 --- a/framework/qa/complex/dispatches/checkdispatchapi.java +++ b/framework/qa/complex/dispatches/checkdispatchapi.java @@ -125,7 +125,7 @@ public class checkdispatchapi } catch (java.lang.Throwable ex) { - fail("Cant initialize test environment."); + fail("Can't initialize test environment."); } } @@ -258,7 +258,7 @@ public class checkdispatchapi public void checkInterceptorLifeTime() { // Note: It's important for the following test, that aInterceptor will be hold alive by the uno reference - // xInterceptor. Otherwhise we cant check some internal states of aInterceptor at the end of this method, because + // xInterceptor. Otherwise we can't check some internal states of aInterceptor at the end of this method, because // it was already killed .-) Interceptor aInterceptor = new Interceptor(); @@ -283,7 +283,7 @@ public class checkdispatchapi if (bIsRegistered) { - fail("Interceptor was not deregistered automaticly on closing the corresponding frame."); + fail("Interceptor was not deregistered automatically on closing the corresponding frame."); } System.out.println("Destruction of interception chain works as designed .-)"); diff --git a/framework/qa/complex/framework/autosave/AutoSave.java b/framework/qa/complex/framework/autosave/AutoSave.java index 2bd97f45bea6..8b3da1a541b7 100644 --- a/framework/qa/complex/framework/autosave/AutoSave.java +++ b/framework/qa/complex/framework/autosave/AutoSave.java @@ -317,7 +317,7 @@ public class AutoSave { m_aLog.log(Protocol.TYPE_WARNING , "got IOException on calling doc.store()." ); m_aLog.log(Protocol.TYPE_WARNING_INFO, "Please check the reason for that more in detail." ); - m_aLog.log(Protocol.TYPE_WARNING_INFO, "A message like \"Concurrent save requests are not allowed.\" was intended and doesnt show an error!"); + m_aLog.log(Protocol.TYPE_WARNING_INFO, "A message like \"Concurrent save requests are not allowed.\" was intended and doesn't show an error!"); m_aLog.log(Protocol.TYPE_WARNING_INFO, "Message of the original exception:" ); m_aLog.log(Protocol.TYPE_WARNING_INFO, exIO.getMessage()); } @@ -351,14 +351,14 @@ public class AutoSave } else { - m_aLog.log(Protocol.TYPE_ERROR, "closeDoc() = ERROR. Doc doesnt provide needed interface!"); + m_aLog.log(Protocol.TYPE_ERROR, "closeDoc() = ERROR. Doc doesn't provide needed interface!"); } } catch(com.sun.star.util.CloseVetoException exVeto) { m_aLog.log(Protocol.TYPE_WARNING , "got CloseVetoException on calling doc.close()." ); m_aLog.log(Protocol.TYPE_WARNING_INFO, "Please check the reason for that more in detail." ); - m_aLog.log(Protocol.TYPE_WARNING_INFO, "A message like \"Cant close while saving.\" was intended and doesnt show an error!"); + m_aLog.log(Protocol.TYPE_WARNING_INFO, "A message like \"Can't close while saving.\" was intended and doesn't show an error!"); m_aLog.log(Protocol.TYPE_WARNING_INFO, exVeto.getMessage()); } diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java index 271d4bdf977e..2196ce3d30c8 100644 --- a/framework/qa/complex/framework/autosave/Protocol.java +++ b/framework/qa/complex/framework/autosave/Protocol.java @@ -59,10 +59,10 @@ import java.sql.*; /** * Implements a log mechanism to create a protocol of all steps of e.g. an api test * It provides the possibility to write the logged meesages to a file and/or - * to stdout/stderr (if neccessary at the same time!). + * to stdout/stderr (if necessary at the same time!). * * TODO - * - implement filter, which e.g. supress showing of INFO data + * - implement filter, which e.g. suppress showing of INFO data */ public class Protocol extends JComponent { @@ -195,7 +195,7 @@ public class Protocol extends JComponent private int m_nType; /// of course, we have to know the logged message too :-) private String m_sMessage; - /// and it can be usefull to know the current time, when this line was created + /// and it can be useful to know the current time, when this line was created private Timestamp m_aStamp; /** ctor for fast initializing of such line */ @@ -502,7 +502,7 @@ public class Protocol extends JComponent // ____________________ /** - * For some modes it's neccessary, that we write some additional + * For some modes it's necessary, that we write some additional * informations to the log. E.g. for html we must generate close targets. */ public synchronized void finish() @@ -524,7 +524,7 @@ public class Protocol extends JComponent /** * log an unspecified message. * - * Sometimes it's not neccessary to set a special type for an message. + * Sometimes it's not necessary to set a special type for an message. * The pure message seams to be enough. The type of such "pure messages" * will be set to INFO. * @@ -635,7 +635,7 @@ public class Protocol extends JComponent ++m_nLine; - // it's neccessary to open scopes before creatig the protocol line + // it's necessary to open scopes before creatig the protocol line // to guarantee right tab handling for new scope value! if ((nType & TYPE_SCOPE_OPEN) == TYPE_SCOPE_OPEN) ++m_nScope; @@ -645,7 +645,7 @@ public class Protocol extends JComponent String sAsciiLog = aLine.toString(); String sHTMLLog = aLine.toHTML(); - // it's neccessary to close scope after creatig the protocol line + // it's necessary to close scope after creatig the protocol line // to guarantee right tab handling for old scope value! if ( ( m_nScope > 0 ) && @@ -671,7 +671,7 @@ public class Protocol extends JComponent System.err.print(sAsciiLog); // no else - it's a bit field of possible reactions! // But these both conditions must be handled together. - // Because we cant generate different types of log contents to the same log file. + // Because we can't generate different types of log contents to the same log file. // We preferr HTML if both types are set. if ( ((m_nMode & MODE_HTML ) == MODE_HTML ) || @@ -757,7 +757,7 @@ public class Protocol extends JComponent * returns a generic html header for generating html log files * * It's used from the method finish() to generate a valid html formated file. - * For that its neccessary to open some special html targets like e.g. <html>. + * For that its necessary to open some special html targets like e.g. <html>. * * @return A string, which includes the whole header. * diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java index 58c530a2d7fb..98ec2390bbaa 100644 --- a/framework/qa/complex/framework/recovery/RecoveryTest.java +++ b/framework/qa/complex/framework/recovery/RecoveryTest.java @@ -584,7 +584,7 @@ public class RecoveryTest extends ComplexTestCase { } String tempURL = utils.getOfficeTempDir(xMSF); - log.println("the destination for saveing is: " + tempURL); + log.println("the destination for saving is: " + tempURL); try{ oUITools.setTextEditFiledText("Save to", tempURL); } catch (java.lang.Exception e){ @@ -603,7 +603,7 @@ public class RecoveryTest extends ComplexTestCase { /** * This function gets the current screen size and calculate the first - * quarter of it. This qaurter was used to postion to Office windows. + * quarter of it. This qaurter was used to position to Office windows. * Further this function calculates the maximum window size so the window * is visible if it placed on extreme position. */ @@ -725,7 +725,7 @@ public class RecoveryTest extends ComplexTestCase { try{ xMathDoc = SOF.createMathDoc(frameName); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while creating math document '"+frameName+"':"); + log.println("Exception occurred while creating math document '"+frameName+"':"); failed("Couldn't create test environment"); } return xMathDoc; @@ -739,16 +739,16 @@ public class RecoveryTest extends ComplexTestCase { try { xPS.setPropertyValue("Formula", expFormula); } catch(com.sun.star.lang.WrappedTargetException e) { - log.println("Exception occured while filling math document with content."); + log.println("Exception occurred while filling math document with content."); failed("Couldn't create test environment"); } catch(com.sun.star.lang.IllegalArgumentException e) { - log.println("Exception occured while filling math document with content."); + log.println("Exception occurred while filling math document with content."); failed("Couldn't create test environment"); } catch(com.sun.star.beans.PropertyVetoException e) { - log.println("Exception occured while filling math document with content."); + log.println("Exception occurred while filling math document with content."); failed("Couldn't create test environment"); } catch(com.sun.star.beans.UnknownPropertyException e) { - log.println("Exception occured while filling math document with content."); + log.println("Exception occurred while filling math document with content."); failed("Couldn't create test environment"); } } @@ -758,7 +758,7 @@ public class RecoveryTest extends ComplexTestCase { try{ xImpressDoc = SOF.createImpressDoc(frameName); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while creating impress document '"+frameName+"':"); + log.println("Exception occurred while creating impress document '"+frameName+"':"); failed("Couldn't create test environment"); } return xImpressDoc; @@ -809,7 +809,7 @@ public class RecoveryTest extends ComplexTestCase { try{ xDrawDoc = SOF.createDrawDoc(frameName); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while creating draw document '"+frameName+"':"); + log.println("Exception occurred while creating draw document '"+frameName+"':"); failed("Couldn't create test environment"); } return xDrawDoc; @@ -861,16 +861,16 @@ public class RecoveryTest extends ComplexTestCase { new Type(XStyle.class),oShapeProps.getPropertyValue("Style")); oShapeProps.setPropertyValue("ZOrder", new Integer(1)); } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Exception occured while setting or getting property value while filling draw document with content."); + log.println("Exception occurred while setting or getting property value while filling draw document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.beans.UnknownPropertyException e) { - log.println("Exception occured while setting or getting property value while filling draw document with content."); + log.println("Exception occurred while setting or getting property value while filling draw document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("Exception occured while setting or getting property value while filling draw document with content."); + log.println("Exception occurred while setting or getting property value while filling draw document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.beans.PropertyVetoException e) { - log.println("Exception occured while setting or getting property value while filling draw document with content."); + log.println("Exception occurred while setting or getting property value while filling draw document with content."); failed("Couldn't create test environment"); } } @@ -888,7 +888,7 @@ public class RecoveryTest extends ComplexTestCase { try { xTextDoc = SOF.createTextDoc(frameName); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while creating text document '"+frameName+"':"); + log.println("Exception occurred while creating text document '"+frameName+"':"); failed("Couldn't create test environment"); } return xTextDoc; @@ -915,10 +915,10 @@ public class RecoveryTest extends ComplexTestCase { oCursor, ControlCharacter.LINE_BREAK, false ); } } catch ( com.sun.star.lang.IllegalArgumentException e ){ - log.println("Exception occured while filling text document with content."); + log.println("Exception occurred while filling text document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while filling text document with content."); + log.println("Exception occurred while filling text document with content."); failed("Couldn't create test environment"); } } @@ -930,7 +930,7 @@ public class RecoveryTest extends ComplexTestCase { try { xSheetDoc = SOF.createCalcDoc(frameName); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while creating calc document '"+frameName+"':"); + log.println("Exception occurred while creating calc document '"+frameName+"':"); failed("Couldn't create test environment"); } return xSheetDoc; @@ -956,19 +956,19 @@ public class RecoveryTest extends ComplexTestCase { oSheet.getCellByPosition(3, 2).setFormula("xTextDoc"); oSheet.getCellByPosition(3, 3).setFormula("xTextDoc"); } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Exception occured while filling calc document with content."); + log.println("Exception occurred while filling calc document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Exception occured while filling calc document with content."); + log.println("Exception occurred while filling calc document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - log.println("Exception occured while filling calc document with content."); + log.println("Exception occurred while filling calc document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("Exception occured while filling calc document with content."); + log.println("Exception occurred while filling calc document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while filling calc document with content."); + log.println("Exception occurred while filling calc document with content."); failed("Couldn't create test environment"); } } diff --git a/framework/qa/complex/imageManager/_XInitialization.java b/framework/qa/complex/imageManager/_XInitialization.java index 0337c6a160b4..78e21c82dd79 100644 --- a/framework/qa/complex/imageManager/_XInitialization.java +++ b/framework/qa/complex/imageManager/_XInitialization.java @@ -71,7 +71,7 @@ public class _XInitialization { } } catch (com.sun.star.uno.Exception e) { - System.out.println("Exception occured while method calling.") ; + System.out.println("Exception occurred while method calling.") ; result = false ; } diff --git a/framework/qa/complex/imageManager/_XTypeProvider.java b/framework/qa/complex/imageManager/_XTypeProvider.java index f25571ac8992..27356488e96d 100644 --- a/framework/qa/complex/imageManager/_XTypeProvider.java +++ b/framework/qa/complex/imageManager/_XTypeProvider.java @@ -54,7 +54,7 @@ public class _XTypeProvider { /** * Just calls the method.<p> - * Has <b>OK</b> status if no runtime exceptions occured. + * Has <b>OK</b> status if no runtime exceptions occurred. */ public boolean _getImplementationId() { boolean result = true; diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java index 6495ccab97c1..e9e9f77d6863 100644 --- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java +++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java @@ -71,7 +71,7 @@ import static org.junit.Assert.*; The parameters for this have to be "ftp_access" and "http_access". If they are not given, tests for ftp and http will fail. - @todo We need a further test for accessing UNC pathes on windows! + @todo We need a further test for accessing UNC paths on windows! */ public class CheckXComponentLoader { @@ -185,7 +185,7 @@ public class CheckXComponentLoader // define default loader for testing // TODO think about using of bot loader instances! m_xLoader = UnoRuntime.queryInterface(XComponentLoader.class, m_xDesktop); - assertNotNull("Desktop service doesnt support needed component loader interface.", m_xLoader); + assertNotNull("Desktop service doesn't support needed component loader interface.", m_xLoader); // get temp path for this environment final String tempDirURL = util.utils.getOfficeTemp/*Dir*/(getMSF()); @@ -529,7 +529,7 @@ public class CheckXComponentLoader // loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sEmptyDocs, "_blank", 0, // lProps); // -// System.out.println("check case senstive URLs"); +// System.out.println("check case sensitive URLs"); // // sIllegalArgs = new String[] { // "sLot:5000", "sloT:10909", ".unO:SaveAs", ".uno:OPEN", diff --git a/framework/qa/complex/loadAllDocuments/StatusIndicator.java b/framework/qa/complex/loadAllDocuments/StatusIndicator.java index e16e3221affb..5c5e069cbe38 100644 --- a/framework/qa/complex/loadAllDocuments/StatusIndicator.java +++ b/framework/qa/complex/loadAllDocuments/StatusIndicator.java @@ -53,7 +53,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator /** * @const SHOWSTATUS_NO don't show the status - but save information about using of this indicator object - * @const SHOWSTATUS_LOG the possible set protocol object will be used (it covers STDOUT, STDERR automaticly too) + * @const SHOWSTATUS_LOG the possible set protocol object will be used (it covers STDOUT, STDERR automatically too) * @const SHOWSTATUS_DIALOG the status will be shown inside a java dialog * @const SHOWSTATUS_LINK the status will be notified to interested listener (one listener only!) */ diff --git a/framework/qa/complex/loadAllDocuments/StreamSimulator.java b/framework/qa/complex/loadAllDocuments/StreamSimulator.java index 340ddc6dd5e8..52556f0cd0dd 100644 --- a/framework/qa/complex/loadAllDocuments/StreamSimulator.java +++ b/framework/qa/complex/loadAllDocuments/StreamSimulator.java @@ -75,7 +75,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , * @throw com.sun.star.io.NotConnectedException * in case the internal streams to the file on disk couldn't * be established. - * They are neccessary. Otherwhise this simulator can't + * They are necessary. Otherwise this simulator can't * really work. */ public StreamSimulator(XMultiServiceFactory xMSF, @@ -121,7 +121,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , /** * following methods simulates the XInputStream. * The notice all actions inside the internal protocol - * and try to map all neccessary functions to the internal + * and try to map all necessary functions to the internal * open in-stream. */ public int readBytes(byte[][] lData, int nBytesToRead ) @@ -275,7 +275,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , /** * following methods simulates the XOutputStream. * The notice all actions inside the internal protocol - * and try to map all neccessary functions to the internal + * and try to map all necessary functions to the internal * open out-stream. */ public void writeBytes(byte[] lData) @@ -369,7 +369,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , /** * following methods simulates the XSeekable. * The notice all actions inside the internal protocol - * and try to map all neccessary functions to the internal + * and try to map all necessary functions to the internal * open stream. */ public void seek(long nLocation ) diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java index 043df0356d63..48e5d13e34ee 100644 --- a/framework/qa/complex/path_settings/PathSettingsTest.java +++ b/framework/qa/complex/path_settings/PathSettingsTest.java @@ -198,7 +198,7 @@ public class PathSettingsTest } /** - * Simple existance test, if this fails, the Lists must update + * Simple existence test, if this fails, the Lists must update */ @Test public void checkInternalListConsistence() @@ -909,7 +909,7 @@ public class PathSettingsTest */ private String changeToCorrectValue(String path) { - // the simplest possiblity + // the simplest possibility if (path == null || path.equals("")) { String sTempDir = System.getProperty("java.io.tmpdir"); |