diff options
13 files changed, 21 insertions, 23 deletions
diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java index 309633eafd4c..38be83489aee 100644 --- a/qadevOOo/runner/lib/TestParameters.java +++ b/qadevOOo/runner/lib/TestParameters.java @@ -163,8 +163,6 @@ public class TestParameters extends HashMap<String,Object> { put(PropertyName.OPERATING_SYSTEM, getSOCompatibleOSName()); //For compatibility Reasons - put("CNCSTR", DefaultConnectionString); - put("DOCPTH", DefaultTestDocumentPath); System.setProperty("DOCPTH", DefaultTestDocumentPath); } diff --git a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java index f61eb5457f21..8d72ae42d661 100644 --- a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java +++ b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java @@ -133,7 +133,7 @@ public class _XBridgeFactory extends MultiMethodTest { /** * First creates connection with StarOffice process, using environment - * property <code>'CNCSTR'</code>. Then cerates bridge with unique name + * property <code>'CONNECTION_STRING'</code>. Then create bridge with unique name * using protocol specified in environment as <code>'PROTOCOL'</code> * property. After that bridge is disposed. <p> * Has <b>OK</b> status if value returned is not null diff --git a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java index 15acdcd47b44..8c06a2a89277 100644 --- a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java +++ b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java @@ -129,14 +129,14 @@ public class _XUnoUrlResolver extends MultiMethodTest { } /** * Test calls the method using environment property - * <code>'CNCSTR'</code>. <p> + * <code>'CONNECTION_STRING'</code>. <p> * Has <b> OK </b> status if the method successfully returns * object that support interface <code>XMultiServiceFactory</code> and * no exceptions were thrown. <p> * @see com.sun.star.lang.XMultiServiceFactory */ public void _resolve() { - String connectStr = (String)tParam.get("CNCSTR"); + String connectStr = (String)tParam.get("CONNECTION_STRING"); int pIndex = connectStr.indexOf("port=") + 5; connectStr = connectStr.substring(0, pIndex); System.out.println("ConnectString: " + connectStr); diff --git a/qadevOOo/tests/java/mod/_acceptor/Acceptor.java b/qadevOOo/tests/java/mod/_acceptor/Acceptor.java index c1699b091551..1889fb60ade4 100644 --- a/qadevOOo/tests/java/mod/_acceptor/Acceptor.java +++ b/qadevOOo/tests/java/mod/_acceptor/Acceptor.java @@ -49,11 +49,11 @@ public class Acceptor extends TestCase { /** * Retrieves host name where StarOffice is started from test - * parameter <code>'CNCSTR'</code>. + * parameter <code>'CONNECTION_STRING'</code>. */ @Override public void initialize( TestParameters tParam, PrintWriter log ) { - String cncstr = (String) tParam.get("CNCSTR") ; + String cncstr = (String) tParam.get("CONNECTION_STRING") ; int idx = cncstr.indexOf("host=") + 5 ; sOfficeHost = cncstr.substring(idx, cncstr.indexOf(",", idx)) ; } diff --git a/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java b/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java index f5b90ac05bf6..209771546eb5 100644 --- a/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java +++ b/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java @@ -45,11 +45,11 @@ public class Acceptor extends TestCase { /** * Retrieves host name where StarOffice is started from test - * parameter <code>'CNCSTR'</code>. + * parameter <code>'CONNECTION_STRING'</code>. */ @Override public void initialize( TestParameters tParam, PrintWriter log ) { - String cncstr = (String) tParam.get("CNCSTR") ; + String cncstr = (String) tParam.get("CONNECTION_STRING") ; int idx = cncstr.indexOf("host=") + 5 ; sOfficeHost = cncstr.substring(idx, cncstr.indexOf(",", idx)) ; } diff --git a/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java b/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java index 4bd3f68ca44a..41e8ce122612 100644 --- a/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java +++ b/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java @@ -40,11 +40,11 @@ public class BridgeFactory extends TestCase { /** * Retrieves host name where StarOffice is started from test - * parameter <code>'CNCSTR'</code>. + * parameter <code>'CONNECTION_STRING'</code>. */ @Override protected void initialize( TestParameters tParam, PrintWriter log ) { - String cncstr = (String) tParam.get("CNCSTR") ; + String cncstr = (String) tParam.get("CONNECTION_STRING") ; int idx = cncstr.indexOf("host=") + 5 ; sOfficeHost = cncstr.substring(idx, cncstr.indexOf(",", idx)) ; } diff --git a/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java b/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java index e2be0e95d638..1392b6345ab8 100644 --- a/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java +++ b/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java @@ -38,11 +38,11 @@ public class BridgeFactory extends TestCase { /** * Retrieves host name where StarOffice is started from test - * parameter <code>'CNCSTR'</code>. + * parameter <code>'CONNECTION_STRING'</code>. */ @Override protected void initialize( TestParameters tParam, PrintWriter log ) { - String cncstr = (String) tParam.get("CNCSTR") ; + String cncstr = (String) tParam.get("CONNECTION_STRING") ; int idx = cncstr.indexOf("host=") + 5 ; sOfficeHost = cncstr.substring(idx, cncstr.indexOf(",", idx)) ; } diff --git a/qadevOOo/tests/java/mod/_connector/uno/Connector.java b/qadevOOo/tests/java/mod/_connector/uno/Connector.java index e670901d8349..341d4ebee8fc 100644 --- a/qadevOOo/tests/java/mod/_connector/uno/Connector.java +++ b/qadevOOo/tests/java/mod/_connector/uno/Connector.java @@ -49,11 +49,11 @@ public class Connector extends TestCase { /** * Retrieves host name where StarOffice is started from test - * parameter <code>'CNCSTR'</code>. + * parameter <code>'CONNECTION_STRING'</code>. */ @Override protected void initialize( TestParameters tParam, PrintWriter log ) { - String cncstr = (String) tParam.get("CNCSTR") ; + String cncstr = (String) tParam.get("CONNECTION_STRING") ; int idx = cncstr.indexOf("host=") + 5 ; sOfficeHost = cncstr.substring(idx, cncstr.indexOf(",", idx)) ; } diff --git a/qadevOOo/tests/java/mod/_connectr/Connector.java b/qadevOOo/tests/java/mod/_connectr/Connector.java index 8cdd6f52591f..2b5a35ba2eef 100644 --- a/qadevOOo/tests/java/mod/_connectr/Connector.java +++ b/qadevOOo/tests/java/mod/_connectr/Connector.java @@ -51,11 +51,11 @@ public class Connector extends TestCase { /** * Retrieves host name where StarOffice is started from test - * parameter <code>'CNCSTR'</code>. + * parameter <code>'CONNECTION_STRING'</code>. */ @Override protected void initialize( TestParameters tParam, PrintWriter log ) { - String cncstr = (String) tParam.get("CNCSTR") ; + String cncstr = (String) tParam.get("CONNECTION_STRING") ; int idx = cncstr.indexOf("host=") + 5 ; sOfficeHost = cncstr.substring(idx, cncstr.indexOf(",", idx)) ; } diff --git a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java index a4c760bd6b13..10ac369daa7c 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java @@ -190,7 +190,7 @@ public class various extends TestCase { // creating arguments for XInitialization // first, creating a connection // connection string - String cncstr = (String) tParam.get("CNCSTR") ; + String cncstr = (String) tParam.get("CONNECTION_STRING") ; int idx = cncstr.indexOf("host=") + 5 ; // select the port diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java index ac9f9b3c33a5..ee259f68a505 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/various.java @@ -182,7 +182,7 @@ public class various extends TestCase { // creating arguments for XInitialization // first, creating a connection // connection string - String cncstr = (String) tParam.get("CNCSTR") ; + String cncstr = (String) tParam.get("CONNECTION_STRING") ; int idx = cncstr.indexOf("host=") + 5 ; // select the port diff --git a/scripting/workben/mod/_scripting/ScriptInfo.java b/scripting/workben/mod/_scripting/ScriptInfo.java index 4dce6625054f..c1fd57520c3f 100644 --- a/scripting/workben/mod/_scripting/ScriptInfo.java +++ b/scripting/workben/mod/_scripting/ScriptInfo.java @@ -38,8 +38,8 @@ public class ScriptInfo extends TestCase { @Override public void initialize( TestParameters tParam, PrintWriter log ) { // Get path to test documents - String rootDocPath = ( String )tParam.get( "DOCPTH" ); - System.out.println( "DOCPTH is " + rootDocPath ); + String rootDocPath = ( String )tParam.get( "TEST_DOCUMENT_PATH" ); + System.out.println( "TEST_DOCUMENT_PATH is " + rootDocPath ); rootDocPath = util.utils.getFullTestURL( "ExampleSpreadSheetLatest.sxc" ); if ( rootDocPath != null && rootDocPath.length() > 1 ){ // convert all "\\" to "/", necessary for UCB diff --git a/scripting/workben/mod/_scripting/ScriptStorage.java b/scripting/workben/mod/_scripting/ScriptStorage.java index 3ecb91e508aa..1d55c18060af 100644 --- a/scripting/workben/mod/_scripting/ScriptStorage.java +++ b/scripting/workben/mod/_scripting/ScriptStorage.java @@ -35,8 +35,8 @@ public class ScriptStorage extends TestCase { @Override public void initialize( TestParameters tParam, PrintWriter log ) { // Get path to test documents - String rootDocPath = ( String )tParam.get( "DOCPTH" ); - System.out.println( "DOCPTH is " + rootDocPath ); + String rootDocPath = ( String )tParam.get( "TEST_DOCUMENT_PATH" ); + System.out.println( "TEST_DOCUMENT_PATH is " + rootDocPath ); rootDocPath = util.utils.getFullTestURL( "ExampleSpreadSheetLatest.sxc" ); if ( rootDocPath != null && rootDocPath.length() > 1 ){ // convert all "\\" to "/", necessary for UCB |