diff options
6 files changed, 21 insertions, 22 deletions
diff --git a/scripting/workben/ifc/scripting/_XScriptInfo.java b/scripting/workben/ifc/scripting/_XScriptInfo.java index 4d13a28e1b9f..2fb4c625b3b4 100644 --- a/scripting/workben/ifc/scripting/_XScriptInfo.java +++ b/scripting/workben/ifc/scripting/_XScriptInfo.java @@ -2,9 +2,9 @@ * * $RCSfile: _XScriptInfo.java,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change:$Date: 2002-12-10 14:12:05 $ + * last change:$Date: 2003-02-25 16:22:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -351,7 +351,8 @@ public class _XScriptInfo extends MultiMethodTest { else if (output.length() == 0) output = "empty"; - log.println("expected: " + expected + ", output: " + output); + log.println("expected: [" + expected + "], output: [" + + output + "]"); result &= output.equals(expected); } } diff --git a/scripting/workben/ifc/scripting/_XScriptNameResolver.java b/scripting/workben/ifc/scripting/_XScriptNameResolver.java index a510400b253d..0166ca7f2a20 100644 --- a/scripting/workben/ifc/scripting/_XScriptNameResolver.java +++ b/scripting/workben/ifc/scripting/_XScriptNameResolver.java @@ -2,9 +2,9 @@ * * $RCSfile: _XScriptNameResolver.java,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change:$Date: 2002-12-10 14:12:06 $ + * last change:$Date: 2003-02-25 16:22:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -126,7 +126,7 @@ public class _XScriptNameResolver extends MultiMethodTest { HashMap map = new HashMap(); map.put("SCRIPTING_DOC_STORAGE_ID", new Integer(storageId)); - map.put("SCRIPTING_DOC_URI", "hahaha"); + map.put("SCRIPTING_DOC_URI", util.utils.getFullTestURL(location)); Parameters params = new Parameters(map); Object[] args = new Object[] {params}; diff --git a/scripting/workben/mod/_scripting/Dispatch.java b/scripting/workben/mod/_scripting/Dispatch.java index 7871c583f1ee..bed97a790f77 100644 --- a/scripting/workben/mod/_scripting/Dispatch.java +++ b/scripting/workben/mod/_scripting/Dispatch.java @@ -2,9 +2,9 @@ * * $RCSfile: Dispatch.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change:$Date: 2002-11-20 14:32:06 $ + * last change:$Date: 2003-02-25 16:22:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -104,8 +104,8 @@ public class Dispatch extends TestCase { XMultiServiceFactory xMSF = tParam.getMSF(); SOfficeFactory SOF = null; SOF = SOfficeFactory.getFactory( xMSF ); - String docPath = util.utils.getFullTestDocName( "ExampleSpreadSheetLatest.sxc" ); - XComponent doc = SOF.loadDocument("file://" + docPath ); + String docPath = util.utils.getFullTestURL( "ExampleSpreadSheetLatest.sxc" ); + XComponent doc = SOF.loadDocument( docPath ); XModel model = ( XModel ) UnoRuntime.queryInterface( XModel.class, doc ); XFrame frame = model.getCurrentController().getFrame(); diff --git a/scripting/workben/mod/_scripting/Function.java b/scripting/workben/mod/_scripting/Function.java index a57cff774952..604baa0a3ee5 100644 --- a/scripting/workben/mod/_scripting/Function.java +++ b/scripting/workben/mod/_scripting/Function.java @@ -2,9 +2,9 @@ * * $RCSfile: Function.java,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change:$Date: 2002-12-10 14:12:41 $ + * last change:$Date: 2003-02-25 16:22:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,8 +97,8 @@ public class Function extends TestCase { XMultiServiceFactory xMSF = tParam.getMSF(); SOfficeFactory SOF = null; SOF = SOfficeFactory.getFactory( xMSF ); - String docPath = util.utils.getFullTestDocName( "ExampleSpreadSheetLatest.sxc" ); - XComponent doc = SOF.loadDocument("file://" + docPath ); + String docPath = util.utils.getFullTestURL( "ExampleSpreadSheetLatest.sxc" ); + XComponent doc = SOF.loadDocument( docPath ); XModel model = ( XModel ) UnoRuntime.queryInterface( XModel.class, doc ); oObj = diff --git a/scripting/workben/mod/_scripting/ScriptInfo.java b/scripting/workben/mod/_scripting/ScriptInfo.java index 1d4e3b3653a6..bfd692033f54 100644 --- a/scripting/workben/mod/_scripting/ScriptInfo.java +++ b/scripting/workben/mod/_scripting/ScriptInfo.java @@ -2,9 +2,9 @@ * * $RCSfile: ScriptInfo.java,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change:$Date: 2002-12-10 14:12:41 $ + * last change:$Date: 2003-02-25 16:22:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,13 +83,12 @@ public class ScriptInfo extends TestCase { // Get path to test documents String rootDocPath = ( String )tParam.get( "DOCPTH" ); System.out.println( "DOCPTH is " + rootDocPath ); - rootDocPath = util.utils.getFullTestDocName( "ExampleSpreadSheetLatest.sxc" ); + rootDocPath = util.utils.getFullTestURL( "ExampleSpreadSheetLatest.sxc" ); if ( rootDocPath != null && rootDocPath.length() > 1 ){ // convert all "\\" to "/", necessary for UCB if ( rootDocPath.indexOf( "\\" ) > 0 ){ rootDocPath = rootDocPath.replace( '\\','/' ); } - rootDocPath = "file://" + rootDocPath; System.out.println("After processing the path is " + rootDocPath); // encode the ulr (for UCB) String encodedPath = URLEncoder.encode( rootDocPath ); diff --git a/scripting/workben/mod/_scripting/ScriptStorage.java b/scripting/workben/mod/_scripting/ScriptStorage.java index eee3e9ac5090..e8dfc22caf01 100644 --- a/scripting/workben/mod/_scripting/ScriptStorage.java +++ b/scripting/workben/mod/_scripting/ScriptStorage.java @@ -2,9 +2,9 @@ * * $RCSfile: ScriptStorage.java,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change:$Date: 2002-12-10 14:12:41 $ + * last change:$Date: 2003-02-25 16:22:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,13 +80,12 @@ public class ScriptStorage extends TestCase { // Get path to test documents String rootDocPath = ( String )tParam.get( "DOCPTH" ); System.out.println( "DOCPTH is " + rootDocPath ); - rootDocPath = util.utils.getFullTestDocName( "ExampleSpreadSheetLatest.sxc" ); + rootDocPath = util.utils.getFullTestURL( "ExampleSpreadSheetLatest.sxc" ); if ( rootDocPath != null && rootDocPath.length() > 1 ){ // convert all "\\" to "/", necessary for UCB if ( rootDocPath.indexOf( "\\" ) > 0 ){ rootDocPath = rootDocPath.replace( '\\','/' ); } - rootDocPath = "file://" + rootDocPath; System.out.println("After processing the path is " + rootDocPath); // encode the ulr (for UCB) String encodedPath = URLEncoder.encode( rootDocPath ); |