diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-10-16 06:57:26 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-10-16 06:57:26 +0000 |
| commit | fda73e51b2876312f9f85f0aa9789a69598993e5 (patch) | |
| tree | 763dfe697d8c84244b2b226ea1791e5d84887ab1 /forms/qa | |
| parent | f1fc86b9572c9321d912afc1c606ac10c1faceda (diff) | |
CWS-TOOLING: integrate CWS odbmacros3
Diffstat (limited to 'forms/qa')
| -rw-r--r-- | forms/qa/integration/forms/ListSelection.java | 6 | ||||
| -rw-r--r-- | forms/qa/makefile.mk | 15 |
2 files changed, 6 insertions, 15 deletions
diff --git a/forms/qa/integration/forms/ListSelection.java b/forms/qa/integration/forms/ListSelection.java index c04a241aaa4d..110380cc660f 100644 --- a/forms/qa/integration/forms/ListSelection.java +++ b/forms/qa/integration/forms/ListSelection.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ListSelection.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.44.1 $ * * This file is part of OpenOffice.org. * @@ -295,7 +295,9 @@ public class ListSelection extends integration.forms.TestCase implements com.sun try { XStorable storable = (XStorable)m_document.query( XStorable.class ); - storable.storeAsURL( java.io.File.createTempFile( getTestObjectName(),".oxs").getAbsoluteFile().toURL().toString(), new com.sun.star.beans.PropertyValue[]{} ); + java.io.File testFile = java.io.File.createTempFile( getTestObjectName(),".ods"); + storable.storeAsURL( testFile.getAbsoluteFile().toURL().toString(), new com.sun.star.beans.PropertyValue[]{} ); + testFile.deleteOnExit(); } catch( java.lang.Throwable e ) { diff --git a/forms/qa/makefile.mk b/forms/qa/makefile.mk index 9f5a3fd9e1f4..7be518dc063b 100644 --- a/forms/qa/makefile.mk +++ b/forms/qa/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.2.20.2 $ # # This file is part of OpenOffice.org. # @@ -55,20 +55,9 @@ JARCOMPRESS = TRUE # --- Runner Settings ---------------------------------------------- -# create connection string for OOoRunner -.IF "$(RUNNER_CONNECTION_STRING)" == "" - .IF "$(OOO_RUNNER_PORT)" == "" - OOO_RUNNER_PORT=8100 - .ENDIF - .IF "$(OOO_RUNNER_HOST)" == "" - OOO_RUNNER_HOST=localhost - .ENDIF - RUNNER_CONNECTION_STRING=socket,host=$(OOO_RUNNER_HOST),port=$(OOO_RUNNER_PORT) -.ENDIF - # classpath and argument list RUNNER_CLASSPATH = -cp $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar$(PATH_SEPERATOR)$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/ConnectivityTools.jar -RUNNER_ARGS = org.openoffice.Runner -TestBase java_complex -cs $(RUNNER_CONNECTION_STRING) +RUNNER_ARGS = org.openoffice.Runner -TestBase java_complex .END # --- Targets ------------------------------------------------------ |