diff options
author | Andras Timar <atimar@suse.com> | 2012-01-11 19:21:33 +0100 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-01-11 19:25:45 +0100 |
commit | aab14cb9fbc7d82b804a89e4cc61fb874c8636c8 (patch) | |
tree | 06076784fd47291174d9d51811da496191ae5cf4 /framework/qa | |
parent | 8a3b584528e30f346cbab34141ee088eea16020c (diff) |
fix prefix of command line switches (-- instead of -)
Diffstat (limited to 'framework/qa')
-rwxr-xr-x | framework/qa/complex/api_internal/CheckAPI.props | 2 | ||||
-rwxr-xr-x | framework/qa/complex/framework/recovery/RecoveryTest.java | 4 | ||||
-rwxr-xr-x | framework/qa/complex/framework/recovery/RecoveryTools.java | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/framework/qa/complex/api_internal/CheckAPI.props b/framework/qa/complex/api_internal/CheckAPI.props index 14b01071d503..b25eb9ae0022 100755 --- a/framework/qa/complex/api_internal/CheckAPI.props +++ b/framework/qa/complex/api_internal/CheckAPI.props @@ -1,4 +1,4 @@ ParamList=-OutProducer stats.SimpleFileOutProducer -OutputPath /dev/null -#AppExecutionCommand=d:\\prj_new\\install\\src680_m17\\program\\soffice -norestore -nocrashreport -accept=socket,host=0,port=8100;urp; +#AppExecutionCommand=d:\\prj_new\\install\\src680_m17\\program\\soffice --norestore --nocrashreport --accept=socket,host=0,port=8100;urp; # the test job list job1=sw.SwXTextTable diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java index df75f7305122..0aa60a4747f9 100755 --- a/framework/qa/complex/framework/recovery/RecoveryTest.java +++ b/framework/qa/complex/framework/recovery/RecoveryTest.java @@ -168,9 +168,9 @@ public class RecoveryTest extends ComplexTestCase { msg +="\tPlease run your command with the following parameter:\n\n"; msg +="\t-AppExecutionCommand=OFFICEBINARY CONNECTIONSTRING\n\n"; msg +="Example Windows:\n"; - msg +="-AppExecutionCommand=C:\\office\\soffice.exe -accept=socket,host=localhost,port=8101;urp;\n\n"; + msg +="-AppExecutionCommand=C:\\office\\soffice.exe --accept=socket,host=localhost,port=8101;urp;\n\n"; msg +="Example UNIX:\n"; - msg +="-AppExecutionCommand=/office/soffice \"-accept=socket,host=localhost,port=8101;urp;\"\n\n"; + msg +="-AppExecutionCommand=/office/soffice \"--accept=socket,host=localhost,port=8101;urp;\"\n\n"; msg+="NOTE: on UNIX be shure to have the connection string inside quotation mark!\n"; assure(msg, param.get("AppExecutionCommand") != null && ! param.get("AppExecutionCommand").equals("")); diff --git a/framework/qa/complex/framework/recovery/RecoveryTools.java b/framework/qa/complex/framework/recovery/RecoveryTools.java index 28936949d8ef..ccd0e9e7f59b 100755 --- a/framework/qa/complex/framework/recovery/RecoveryTools.java +++ b/framework/qa/complex/framework/recovery/RecoveryTools.java @@ -267,14 +267,14 @@ public class RecoveryTools { /** * The office must be started WITH restore and crashreporter functionality. - * Therefore the parmater '<CODE>-norestore</CODE>' and '<CODE>-nocrashreport</CODE>' + * Therefore the paramater '<CODE>--norestore</CODE>' and '<CODE>--nocrashreport</CODE>' * was removed from the <CODE>AppExecutionCommand</CODE> parameter */ public void removeParametersFromAppExecutionCommand(){ //remove some params to start office String office = (String) param.get("AppExecutionCommand"); - String[] params = {"-norestore", "-nocrashreport"}; + String[] params = {"--norestore", "--nocrashreport"}; for (int i = 0; i < params.length; i++){ int index = office.indexOf(params[i]); @@ -292,8 +292,8 @@ public class RecoveryTools { /** * This function uses accessibility to handle modal dialogs like the * "Are you sure" dialog. - * It cklick the named button given in parameter <CODE>buttonName</CODE> - * @param buttonName the name of the button wich should be chlicked + * It clicks the named button given in parameter <CODE>buttonName</CODE> + * @param buttonName the name of the button wich should be clicked */ public void handleModalDialog(XMultiServiceFactory xMSF, String buttonName) throws com.sun.star.accessibility.IllegalAccessibleComponentStateException @@ -315,7 +315,7 @@ public class RecoveryTools { log.println("click ' " + buttonName + "' button.."); oUITools.clickButton(buttonName); } catch ( java.lang.Exception e){ - throw new com.sun.star.accessibility.IllegalAccessibleComponentStateException("Could not klick '"+buttonName +"' at modal dialog: " + e.toString()); + throw new com.sun.star.accessibility.IllegalAccessibleComponentStateException("Could not click '"+buttonName +"' at modal dialog: " + e.toString()); } pause(); } @@ -363,4 +363,4 @@ public class RecoveryTools { } -}
\ No newline at end of file +} |