diff options
| -rw-r--r-- | forms/qa/integration/forms/ListSelection.java | 26 | ||||
| -rw-r--r-- | forms/qa/integration/forms/ListSelection.props | 2 | ||||
| -rw-r--r-- | qadevOOo/runner/helper/CfgParser.java | 45 |
3 files changed, 8 insertions, 65 deletions
diff --git a/forms/qa/integration/forms/ListSelection.java b/forms/qa/integration/forms/ListSelection.java index ee7d7ca4606a..5e9fd8a55e21 100644 --- a/forms/qa/integration/forms/ListSelection.java +++ b/forms/qa/integration/forms/ListSelection.java @@ -63,28 +63,14 @@ public class ListSelection extends integration.forms.TestCase /* ------------------------------------------------------------------ */ public void checkUserListSelection() throws com.sun.star.uno.Exception, java.lang.Exception { - boolean interactiveTest = param.getBool( "Interactive" ); - - if ( interactiveTest ) + int runs = 5; + for ( int i = 0; i < runs; ++i ) { + log.println( "Round " + ( i + 1 ) + " of " + runs ); prepareDocument(); - waitForUserInput(); - closeDocumentByUI(); - } - else - { - int runs = param.getInt( "Runs" ); - if ( runs == 0 ) - runs = 10; - - for ( int i = 0; i < runs; ++i ) - { - log.println( "Round " + ( i + 1 ) + " of " + runs ); - prepareDocument(); - impl_clickListBox(); - synchronized( this ) { this.wait( 1000 ); } - closeDocument(); - } + impl_clickListBox(); + synchronized( this ) { this.wait( 1000 ); } + closeDocument(); } } diff --git a/forms/qa/integration/forms/ListSelection.props b/forms/qa/integration/forms/ListSelection.props index 4464e320561c..92b56bef9909 100644 --- a/forms/qa/integration/forms/ListSelection.props +++ b/forms/qa/integration/forms/ListSelection.props @@ -1,3 +1 @@ ThreadTimeOut=600000 -Interactive=false -Runs=5 diff --git a/qadevOOo/runner/helper/CfgParser.java b/qadevOOo/runner/helper/CfgParser.java index d6cf0e60a762..7c7e17a208c0 100644 --- a/qadevOOo/runner/helper/CfgParser.java +++ b/qadevOOo/runner/helper/CfgParser.java @@ -41,30 +41,13 @@ public class CfgParser public CfgParser(String ini) { - if (ini != null) - { - this.iniFile = ini; - } + this.iniFile = ini; } public void getIniParameters(TestParameters param) { debug = param.getBool(PropertyName.DEBUG_IS_ACTIVE); - Properties cfg = null; - if (iniFile.length() == 0) - { - //no iniFile given, search one in the users home directory - cfg = getProperties(getDefaultFileName(true)); - //try to search the user dir if no iniFile could be found yet - if (cfg == null) - { - cfg = getProperties(getDefaultFileName(false)); - } - } - else - { - cfg = getProperties(iniFile); - } + Properties cfg = getProperties(iniFile); if (cfg != null) { @@ -161,28 +144,4 @@ public class CfgParser return prop; } - private String getDefaultFileName(boolean home) - { - String fileSeparator = System.getProperty("file.separator"); - String path = ""; - if (home) - { - //look inside the home directory - path = System.getProperty("user.home"); - } - else - { - path = System.getProperty("user.dir"); - } - if (fileSeparator.equals("/")) - { - //suppose I'm on Unix-platform - return path + fileSeparator + ".runner.props"; - } - else - { - //suppose I'm on Windows - return path + fileSeparator + "runner.props"; - } - } } |