diff options
51 files changed, 60 insertions, 113 deletions
diff --git a/framework/prj/build.lst b/framework/prj/build.lst index 9c1feb3e8f5b..153dea29af2c 100644 --- a/framework/prj/build.lst +++ b/framework/prj/build.lst @@ -27,8 +27,6 @@ fr framework\qa\unoapi nmake - all fr_qa_unoapi NULL # fr framework\qa\complex\ModuleManager nmake - all fr_qa_complex_modulemanager NULL # fr framework\qa\complex\XUserInputInterception nmake - all fr_qa_complex_xuserinputinterception NULL -# subdir has to remove -# fr framework\qa\complex\accelerators\helper nmake - all fr_qa_complex_accel_helper NULL # fr framework\qa\complex\accelerators nmake - all fr_qa_complex_accel fr_qa_complex_accel_helper NULL # unclear should be remove @@ -38,8 +36,6 @@ fr framework\qa\unoapi nmake - all fr_qa_unoapi NULL # fr framework\qa\complex\broken_document nmake - all fr_qa_complex_broken_doc NULL fr framework\qa\complex\desktop nmake - all fr_qa_complex_desktop NULL -# subdir has to remove -# fr framework\qa\complex\dispatches\helper nmake - all fr_qa_complex_dispatches_helper NULL # fr framework\qa\complex\dispatches nmake - all fr_qa_complex_dispatches fr_qa_complex_dispatches_helper NULL # fr framework\qa\complex\disposing nmake - all fr_qa_complex_disposing NULL @@ -49,12 +45,8 @@ fr framework\qa\complex\desktop nmake - all fr_qa_complex_deskt # much too complex, will not change to new junit # fr framework\qa\complex\framework\recovery nmake - all fr_qa_complex_framework_recovery NULL -# subdir has to remove -# fr framework\qa\complex\imageManager\interfaces nmake - all fr_qa_complex_imageManager_interfaces NULL # fr framework\qa\complex\imageManager nmake - all fr_qa_complex_imageManager fr_qa_complex_imageManager_interfaces NULL -# subdir has to remove -# fr framework\qa\complex\loadAllDocuments\helper nmake - all fr_qa_complex_loadAllDocuments_helper NULL # fr framework\qa\complex\loadAllDocuments nmake - all fr_qa_complex_loadAllDocuments fr_qa_complex_loadAllDocuments_helper NULL # need cleanups diff --git a/framework/qa/complex/ModuleManager/makefile.mk b/framework/qa/complex/ModuleManager/makefile.mk index a27f0bcc36b4..4ad6d8929030 100644 --- a/framework/qa/complex/ModuleManager/makefile.mk +++ b/framework/qa/complex/ModuleManager/makefile.mk @@ -45,9 +45,6 @@ JAVAFILES = $(JAVATESTFILES) JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -# SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/XUserInputInterception/makefile.mk b/framework/qa/complex/XUserInputInterception/makefile.mk index d25ec9b4f6f7..8b08bec171ee 100644 --- a/framework/qa/complex/XUserInputInterception/makefile.mk +++ b/framework/qa/complex/XUserInputInterception/makefile.mk @@ -52,9 +52,6 @@ JAVAFILES = $(JAVATESTFILES) JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -# SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java index 98e73189ea7e..b0d89ad81858 100644 --- a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java +++ b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java @@ -46,7 +46,7 @@ import com.sun.star.uno.XInterface; import com.sun.star.uno.UnoRuntime; import com.sun.star.util.XChangesBatch; -import complex.accelerators.helper.KeyMapping; +// import complex.accelerators.KeyMapping; // ---------- junit imports ----------------- diff --git a/framework/qa/complex/accelerators/helper/KeyMapping.java b/framework/qa/complex/accelerators/KeyMapping.java index 946f431791a5..d09a51162e7c 100644 --- a/framework/qa/complex/accelerators/helper/KeyMapping.java +++ b/framework/qa/complex/accelerators/KeyMapping.java @@ -25,7 +25,7 @@ * ************************************************************************/ -package complex.accelerators.helper; +package complex.accelerators; import java.util.HashMap; diff --git a/framework/qa/complex/accelerators/makefile.mk b/framework/qa/complex/accelerators/makefile.mk index a444964f57e6..7d5460324849 100644 --- a/framework/qa/complex/accelerators/makefile.mk +++ b/framework/qa/complex/accelerators/makefile.mk @@ -40,16 +40,14 @@ JAVATESTFILES = \ AcceleratorsConfigurationTest.java # put here all other files -JAVAFILES = $(JAVATESTFILES) +JAVAFILES = $(JAVATESTFILES) \ + KeyMapping.java JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar #JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ # OOoRunner.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/api_internal/makefile.mk b/framework/qa/complex/api_internal/makefile.mk index cad245b3a40d..f1a22011a8e7 100755 --- a/framework/qa/complex/api_internal/makefile.mk +++ b/framework/qa/complex/api_internal/makefile.mk @@ -48,9 +48,6 @@ JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar # OOoRunner.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -# SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/broken_document/makefile.mk b/framework/qa/complex/broken_document/makefile.mk index cdd5cb42cd2b..8b1cf2ac3bfd 100755 --- a/framework/qa/complex/broken_document/makefile.mk +++ b/framework/qa/complex/broken_document/makefile.mk @@ -50,9 +50,6 @@ JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar # OOoRunner.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -# SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/contextMenuInterceptor/makefile.mk b/framework/qa/complex/contextMenuInterceptor/makefile.mk index fcaeb6f8cb96..574d98641468 100644 --- a/framework/qa/complex/contextMenuInterceptor/makefile.mk +++ b/framework/qa/complex/contextMenuInterceptor/makefile.mk @@ -49,9 +49,6 @@ JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar # OOoRunner.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -# SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/desktop/makefile.mk b/framework/qa/complex/desktop/makefile.mk index abff76d8e505..74db8d34e160 100755 --- a/framework/qa/complex/desktop/makefile.mk +++ b/framework/qa/complex/desktop/makefile.mk @@ -48,9 +48,6 @@ JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar # OOoRunner.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -# SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/dispatches/helper/Interceptor.java b/framework/qa/complex/dispatches/Interceptor.java index 70e50b212a01..fc5b57b1215e 100644 --- a/framework/qa/complex/dispatches/helper/Interceptor.java +++ b/framework/qa/complex/dispatches/Interceptor.java @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex.dispatches.helper; +package complex.dispatches; // __________ Imports __________ diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java index ce08c8bed6da..b0ba4b55da75 100644 --- a/framework/qa/complex/dispatches/checkdispatchapi.java +++ b/framework/qa/complex/dispatches/checkdispatchapi.java @@ -37,7 +37,7 @@ import com.sun.star.lang.XComponent; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; import com.sun.star.util.XCloseable; -import complex.dispatches.helper.Interceptor; +import complex.dispatches.Interceptor; import java.util.HashMap; diff --git a/framework/qa/complex/dispatches/makefile.mk b/framework/qa/complex/dispatches/makefile.mk index 46c0772061da..6a5ff79dd793 100644 --- a/framework/qa/complex/dispatches/makefile.mk +++ b/framework/qa/complex/dispatches/makefile.mk @@ -41,14 +41,12 @@ JAVATESTFILES = \ checkdispatchapi.java # put here all other files -JAVAFILES = $(JAVATESTFILES) +JAVAFILES = $(JAVATESTFILES) \ + Interceptor.java JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar ConnectivityTools.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/disposing/makefile.mk b/framework/qa/complex/disposing/makefile.mk index 41ff799e2761..f24960421f21 100755 --- a/framework/qa/complex/disposing/makefile.mk +++ b/framework/qa/complex/disposing/makefile.mk @@ -46,9 +46,6 @@ JAVAFILES = $(JAVATESTFILES) JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -# SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/framework/autosave/makefile.mk b/framework/qa/complex/framework/autosave/makefile.mk index a50d9144b859..2e8e3dca1f76 100644 --- a/framework/qa/complex/framework/autosave/makefile.mk +++ b/framework/qa/complex/framework/autosave/makefile.mk @@ -48,9 +48,6 @@ JAVAFILES = $(JAVATESTFILES) \ JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -# SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/imageManager/CheckImageManager.java b/framework/qa/complex/imageManager/CheckImageManager.java index ee7e95dbded3..7db880958ab5 100755 --- a/framework/qa/complex/imageManager/CheckImageManager.java +++ b/framework/qa/complex/imageManager/CheckImageManager.java @@ -1,11 +1,5 @@ package complex.imageManager; -import complex.imageManager.interfaces._XComponent; -import complex.imageManager.interfaces._XImageManager; -import complex.imageManager.interfaces._XInitialization; -import complex.imageManager.interfaces._XTypeProvider; -import complex.imageManager.interfaces._XUIConfiguration; -import complex.imageManager.interfaces._XUIConfigurationPersistence; import com.sun.star.lang.XComponent; import com.sun.star.lang.XInitialization; import com.sun.star.lang.XMultiServiceFactory; @@ -105,12 +99,12 @@ public class CheckImageManager { assertTrue(testObjectName + "::XImageManager.replaceImages", _xImage._replaceImages()); assertTrue(testObjectName + "::XImageManager.reset", _xImage._reset()); - XTypeProvider xType = (XTypeProvider)UnoRuntime.queryInterface(XTypeProvider.class, xImageManager); + XTypeProvider xType = UnoRuntime.queryInterface(XTypeProvider.class, xImageManager); _XTypeProvider _xType = new _XTypeProvider(param, xType); assertTrue(testObjectName + "::XTypeProvider.getImplementationId", _xType._getImplementationId()); assertTrue(testObjectName + "::XTypeProvider.getTypes", _xType._getTypes()); - XUIConfiguration xUIConfig = (XUIConfiguration)UnoRuntime.queryInterface(XUIConfiguration.class, xImageManager); + XUIConfiguration xUIConfig = UnoRuntime.queryInterface(XUIConfiguration.class, xImageManager); _XUIConfiguration _xUIConfig = new _XUIConfiguration(param, xUIConfig); _xUIConfig.before(); assertTrue(testObjectName + "::XUIConfig.addConfigurationListener", _xUIConfig._addConfigurationListener()); @@ -126,7 +120,7 @@ public class CheckImageManager { assertTrue(testObjectName + "::XUIConfigPersistence.store", _xUIConfigPersistence._store()); assertTrue(testObjectName + "::XUIConfigPersistence.storeToStorage", _xUIConfigPersistence._storeToStorage()); - XComponent xComp = (XComponent)UnoRuntime.queryInterface(XComponent.class, xImageManager); + XComponent xComp = UnoRuntime.queryInterface(XComponent.class, xImageManager); _XComponent _xComp = new _XComponent(param, xComp); _xComp.before(); assertTrue(testObjectName + "::XComponent.addEventListener", _xComp._addEventListener()); diff --git a/framework/qa/complex/imageManager/interfaces/_XComponent.java b/framework/qa/complex/imageManager/_XComponent.java index 1d4db9d76fec..9affbb9499b5 100755 --- a/framework/qa/complex/imageManager/interfaces/_XComponent.java +++ b/framework/qa/complex/imageManager/_XComponent.java @@ -25,7 +25,7 @@ * ************************************************************************/ -package complex.imageManager.interfaces; +package complex.imageManager; import com.sun.star.container.XNameContainer; import com.sun.star.frame.XDesktop; diff --git a/framework/qa/complex/imageManager/interfaces/_XImageManager.java b/framework/qa/complex/imageManager/_XImageManager.java index 4c62039e348d..5887fd8fa0d8 100755 --- a/framework/qa/complex/imageManager/interfaces/_XImageManager.java +++ b/framework/qa/complex/imageManager/_XImageManager.java @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex.imageManager.interfaces; +package complex.imageManager; import com.sun.star.graphic.XGraphic; import com.sun.star.ui.ImageType; diff --git a/framework/qa/complex/imageManager/interfaces/_XInitialization.java b/framework/qa/complex/imageManager/_XInitialization.java index d1da1b2158e7..fcfaf5f981d3 100755 --- a/framework/qa/complex/imageManager/interfaces/_XInitialization.java +++ b/framework/qa/complex/imageManager/_XInitialization.java @@ -25,7 +25,7 @@ * ************************************************************************/ -package complex.imageManager.interfaces; +package complex.imageManager; diff --git a/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java b/framework/qa/complex/imageManager/_XTypeProvider.java index bf8e1ca6f850..08b810198d9b 100755 --- a/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java +++ b/framework/qa/complex/imageManager/_XTypeProvider.java @@ -25,7 +25,7 @@ * ************************************************************************/ -package complex.imageManager.interfaces; +package complex.imageManager; diff --git a/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java b/framework/qa/complex/imageManager/_XUIConfiguration.java index 39e2fccfb09d..ec9d5f3fc634 100755 --- a/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java +++ b/framework/qa/complex/imageManager/_XUIConfiguration.java @@ -25,7 +25,7 @@ * ************************************************************************/ -package complex.imageManager.interfaces; +package complex.imageManager; import com.sun.star.ui.XUIConfiguration; diff --git a/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java b/framework/qa/complex/imageManager/_XUIConfigurationPersistence.java index 12de107296e5..1dec01ad0660 100755 --- a/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java +++ b/framework/qa/complex/imageManager/_XUIConfigurationPersistence.java @@ -25,7 +25,7 @@ * ************************************************************************/ -package complex.imageManager.interfaces; +package complex.imageManager; import com.sun.star.embed.XStorage; import com.sun.star.ui.XUIConfigurationPersistence; diff --git a/framework/qa/complex/imageManager/makefile.mk b/framework/qa/complex/imageManager/makefile.mk index e455a297072d..133e522b13b4 100755 --- a/framework/qa/complex/imageManager/makefile.mk +++ b/framework/qa/complex/imageManager/makefile.mk @@ -41,14 +41,17 @@ JAVATESTFILES = \ CheckImageManager.java # put here all other files -JAVAFILES = $(JAVATESTFILES) +JAVAFILES = $(JAVATESTFILES) \ + _XComponent.java \ + _XImageManager.java \ + _XInitialization.java \ + _XTypeProvider.java \ + _XUIConfiguration.java \ + _XUIConfigurationPersistence.java JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -SUBDIRS = interfaces - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java index 7eb4972d630a..1c67271fd6bb 100644 --- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java +++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java @@ -39,8 +39,6 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.util.XCloseable; import com.sun.star.ucb.XSimpleFileAccess; -import complex.loadAllDocuments.helper.InteractionHandler; -import complex.loadAllDocuments.helper.StatusIndicator; import helper.URLHelper; diff --git a/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java b/framework/qa/complex/loadAllDocuments/InteractionHandler.java index ff4bf87c4f23..92d8f3c34543 100644 --- a/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java +++ b/framework/qa/complex/loadAllDocuments/InteractionHandler.java @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex.loadAllDocuments.helper; +package complex.loadAllDocuments; import com.sun.star.beans.PropertyValue; diff --git a/framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java b/framework/qa/complex/loadAllDocuments/StatusIndicator.java index 61f6d9fc525c..c28993010ed8 100644 --- a/framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java +++ b/framework/qa/complex/loadAllDocuments/StatusIndicator.java @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex.loadAllDocuments.helper; +package complex.loadAllDocuments; // __________ Imports __________ diff --git a/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java b/framework/qa/complex/loadAllDocuments/StreamSimulator.java index 2f09044960ad..7b59c25d0a79 100644 --- a/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java +++ b/framework/qa/complex/loadAllDocuments/StreamSimulator.java @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex.loadAllDocuments.helper; +package complex.loadAllDocuments; import com.sun.star.uno.UnoRuntime; import com.sun.star.ucb.XSimpleFileAccess; diff --git a/framework/qa/complex/loadAllDocuments/makefile.mk b/framework/qa/complex/loadAllDocuments/makefile.mk index dd2d78984da6..ebf0265620bf 100644 --- a/framework/qa/complex/loadAllDocuments/makefile.mk +++ b/framework/qa/complex/loadAllDocuments/makefile.mk @@ -41,14 +41,15 @@ JAVATESTFILES = \ CheckXComponentLoader.java # put here all other files -JAVAFILES = $(JAVATESTFILES) +JAVAFILES = $(JAVATESTFILES) \ + InteractionHandler.java \ + StatusIndicator.java \ + StreamSimulator.java \ + TestDocument.java JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/path_settings/makefile.mk b/framework/qa/complex/path_settings/makefile.mk index 21586cc9435b..05900d46e190 100755 --- a/framework/qa/complex/path_settings/makefile.mk +++ b/framework/qa/complex/path_settings/makefile.mk @@ -47,9 +47,6 @@ JAVAFILES = $(JAVATESTFILES) JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -# SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/path_substitution/makefile.mk b/framework/qa/complex/path_substitution/makefile.mk index 707a00c0b0f6..338affbf70d7 100755 --- a/framework/qa/complex/path_substitution/makefile.mk +++ b/framework/qa/complex/path_substitution/makefile.mk @@ -46,9 +46,6 @@ JAVAFILES = $(JAVATESTFILES) JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -# SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/linguistic/qa/complex/linguistic/makefile.mk b/linguistic/qa/complex/linguistic/makefile.mk index 2d10ec4c832d..43a88ee0a198 100644 --- a/linguistic/qa/complex/linguistic/makefile.mk +++ b/linguistic/qa/complex/linguistic/makefile.mk @@ -47,9 +47,6 @@ JAVAFILES = $(JAVATESTFILES) \ JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -# SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index d2964afdc3ee..1e471312c6cf 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -27,7 +27,5 @@ sf sfx2\qa\cppunit nmake - all sf_qa_cppunit sf_util NULL # fails on unxsoli4 # sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL -# subdir has to remove -# sf sfx2\qa\complex\framework\DocHelper nmake - all sf_qa_complex_framework_dochelper sf_util NULL # sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL # sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL diff --git a/sfx2/qa/complex/framework/DocHelper/DialogThread.java b/sfx2/qa/complex/framework/DialogThread.java index 7151ccbb292d..7151ccbb292d 100644 --- a/sfx2/qa/complex/framework/DocHelper/DialogThread.java +++ b/sfx2/qa/complex/framework/DialogThread.java diff --git a/sfx2/qa/complex/framework/DocHelper/WriterHelper.java b/sfx2/qa/complex/framework/WriterHelper.java index d3f19703bb9d..d3f19703bb9d 100644 --- a/sfx2/qa/complex/framework/DocHelper/WriterHelper.java +++ b/sfx2/qa/complex/framework/WriterHelper.java diff --git a/sfx2/qa/complex/framework/makefile.mk b/sfx2/qa/complex/framework/makefile.mk index 093bc828d4ef..325135b9133c 100644 --- a/sfx2/qa/complex/framework/makefile.mk +++ b/sfx2/qa/complex/framework/makefile.mk @@ -41,14 +41,14 @@ JAVATESTFILES = \ CheckGlobalEventBroadcaster_writer1.java JAVAFILES = $(JAVATESTFILES) \ - TestDocument.java + TestDocument.java \ + WriterHelper.java \ + DialogThread.java JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -SUBDIRS = DocHelper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/ucb/prj/build.lst b/ucb/prj/build.lst index fc66b41b74b2..8d8c87f3ae4b 100644 --- a/ucb/prj/build.lst +++ b/ucb/prj/build.lst @@ -19,5 +19,4 @@ uc ucb\qa\unoapi nmake - all uc_qa_unoapi NULL uc ucb\qa\complex\ucb nmake - all uc_complex_ucb uc_inc NULL # fails, please fix -# uc ucb\qa\complex\tdoc\interfaces nmake - all uc_complex_tdoc_interfaces uc_inc NULL # uc ucb\qa\complex\tdoc nmake - all uc_complex_tdoc uc_complex_tdoc_interfaces uc_inc NULL diff --git a/ucb/qa/complex/tdoc/CheckContentProvider.java b/ucb/qa/complex/tdoc/CheckContentProvider.java index d3dfd120611e..a039c0c14e87 100755 --- a/ucb/qa/complex/tdoc/CheckContentProvider.java +++ b/ucb/qa/complex/tdoc/CheckContentProvider.java @@ -42,16 +42,6 @@ import com.sun.star.ucb.XContentIdentifier; import com.sun.star.ucb.XContentIdentifierFactory; import com.sun.star.ucb.XContentProvider; import com.sun.star.uno.UnoRuntime; -import complex.tdoc.interfaces._XChild; -import complex.tdoc.interfaces._XCommandInfoChangeNotifier; -import complex.tdoc.interfaces._XComponent; -import complex.tdoc.interfaces._XServiceInfo; -import complex.tdoc.interfaces._XTypeProvider; -import complex.tdoc.interfaces._XCommandProcessor; -import complex.tdoc.interfaces._XContent; -import complex.tdoc.interfaces._XPropertiesChangeNotifier; -import complex.tdoc.interfaces._XPropertyContainer; -import complex.tdoc.interfaces._XPropertySetInfoChangeNotifier; import util.WriterTools; import org.junit.After; diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java index 3320ef890841..ed121e92f9f1 100755 --- a/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java +++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java @@ -51,6 +51,7 @@ import static org.junit.Assert.*; * */ public class CheckTransientDocumentsContent { + // TODO: document doesn't exists private final String testDocuments[] = new String[]{"sForm.sxw"};//, "chinese.sxw", "Iterator.sxw"}; private final int countDocs = testDocuments.length; private XMultiServiceFactory xMSF = null; diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java index 9d3ea87b1d4a..d5aebc7fc3cd 100755 --- a/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java +++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java @@ -56,7 +56,8 @@ import static org.junit.Assert.*; * */ public class CheckTransientDocumentsContentProvider { - private final String testDocuments[] = new String[]{"sForm.sxw", "chinese.sxw", "Iterator.sxw"}; + // TODO: document doesn't exists + private final String testDocuments[] = new String[]{/*"sForm.sxw",*/ "chinese.sxw", "Iterator.sxw"}; private final int countDocs = testDocuments.length; private XMultiServiceFactory xMSF = null; private XTextDocument[] xTextDoc = null; diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java index ad0001161c49..30411458daee 100755 --- a/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java +++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java @@ -59,6 +59,7 @@ import static org.junit.Assert.*; * */ public class CheckTransientDocumentsDocumentContent { + // TODO: document doesn't exists private final String testDocuments = "sForm.sxw"; private final String folderName = "TestFolder"; private XMultiServiceFactory xMSF = null; diff --git a/ucb/qa/complex/tdoc/interfaces/_XChild.java b/ucb/qa/complex/tdoc/_XChild.java index 351fc6f84aa1..4ed71e62008a 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XChild.java +++ b/ucb/qa/complex/tdoc/_XChild.java @@ -25,7 +25,7 @@ * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import lib.MultiMethodTest; import lib.Status; diff --git a/ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.java b/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java index 9800c5c0a398..ab32873e9ffb 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.java +++ b/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import com.sun.star.ucb.XCommandInfoChangeListener; import com.sun.star.ucb.XCommandInfoChangeNotifier; diff --git a/ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.java b/ucb/qa/complex/tdoc/_XCommandProcessor.java index 2fc31a4bd586..92411d05456f 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.java +++ b/ucb/qa/complex/tdoc/_XCommandProcessor.java @@ -25,7 +25,7 @@ * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import com.sun.star.beans.Property; import com.sun.star.beans.XPropertySetInfo; diff --git a/ucb/qa/complex/tdoc/interfaces/_XComponent.java b/ucb/qa/complex/tdoc/_XComponent.java index 1716e51d1358..16d5c9bebeea 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XComponent.java +++ b/ucb/qa/complex/tdoc/_XComponent.java @@ -25,7 +25,7 @@ * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import com.sun.star.container.XNameContainer; import lib.MultiMethodTest; diff --git a/ucb/qa/complex/tdoc/interfaces/_XContent.java b/ucb/qa/complex/tdoc/_XContent.java index 4c84ecc1d8df..820d2cef0fc7 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XContent.java +++ b/ucb/qa/complex/tdoc/_XContent.java @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import com.sun.star.ucb.XContent; import com.sun.star.ucb.XContentEventListener; diff --git a/ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.java b/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java index 790f295c7be5..88e080cd9ec2 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.java +++ b/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import com.sun.star.beans.XPropertiesChangeListener; import com.sun.star.beans.XPropertiesChangeNotifier; diff --git a/ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.java b/ucb/qa/complex/tdoc/_XPropertyContainer.java index fd7ff94c8f8f..e425a703d403 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.java +++ b/ucb/qa/complex/tdoc/_XPropertyContainer.java @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import com.sun.star.beans.XPropertyContainer; import share.LogWriter; diff --git a/ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.java b/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java index ec1d7d64ada5..4671a0d21571 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.java +++ b/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import com.sun.star.beans.XPropertySetInfoChangeListener; import com.sun.star.beans.XPropertySetInfoChangeNotifier; diff --git a/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java b/ucb/qa/complex/tdoc/_XServiceInfo.java index 761cca87998a..9c2089f212f9 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java +++ b/ucb/qa/complex/tdoc/_XServiceInfo.java @@ -25,7 +25,7 @@ * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import lib.MultiMethodTest; diff --git a/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java b/ucb/qa/complex/tdoc/_XTypeProvider.java index aef931bdeef1..f8247e7016fe 100755 --- a/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java +++ b/ucb/qa/complex/tdoc/_XTypeProvider.java @@ -25,7 +25,7 @@ * ************************************************************************/ -package complex.tdoc.interfaces; +package complex.tdoc; import lib.MultiMethodTest; diff --git a/ucb/qa/complex/tdoc/makefile.mk b/ucb/qa/complex/tdoc/makefile.mk index f5f2629f5592..01f8ec0f76fa 100755 --- a/ucb/qa/complex/tdoc/makefile.mk +++ b/ucb/qa/complex/tdoc/makefile.mk @@ -43,15 +43,21 @@ JAVATESTFILES = \ CheckTransientDocumentsDocumentContent.java JAVAFILES = $(JAVATESTFILES) \ - TestDocument.java + TestDocument.java \ + _XChild.java \ + _XCommandInfoChangeNotifier.java \ + _XCommandProcessor.java \ + _XComponent.java \ + _XContent.java \ + _XPropertiesChangeNotifier.java \ + _XPropertyContainer.java \ + _XPropertySetInfoChangeNotifier.java \ + _XServiceInfo.java \ + _XTypeProvider.java JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) - -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) -SUBDIRS = interfaces - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y |