summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--svl/qa/complex/ConfigItems/makefile.mk3
-rw-r--r--svl/qa/complex/passwordcontainer/makefile.mk3
-rw-r--r--toolkit/prj/build.lst1
-rwxr-xr-xtoolkit/qa/complex/toolkit/CheckAccessibleStatusBar.java4
-rwxr-xr-xtoolkit/qa/complex/toolkit/CheckAccessibleStatusBarItem.java5
-rw-r--r--toolkit/qa/complex/toolkit/CheckAsyncCallback.java1
-rwxr-xr-xtoolkit/qa/complex/toolkit/_XAccessibleComponent.java (renamed from toolkit/qa/complex/toolkit/interface_tests/_XAccessibleComponent.java)2
-rwxr-xr-xtoolkit/qa/complex/toolkit/_XAccessibleContext.java (renamed from toolkit/qa/complex/toolkit/interface_tests/_XAccessibleContext.java)2
-rwxr-xr-xtoolkit/qa/complex/toolkit/_XAccessibleEventBroadcaster.java (renamed from toolkit/qa/complex/toolkit/interface_tests/_XAccessibleEventBroadcaster.java)2
-rwxr-xr-xtoolkit/qa/complex/toolkit/_XAccessibleExtendedComponent.java (renamed from toolkit/qa/complex/toolkit/interface_tests/_XAccessibleExtendedComponent.java)2
-rwxr-xr-xtoolkit/qa/complex/toolkit/_XAccessibleText.java (renamed from toolkit/qa/complex/toolkit/interface_tests/_XAccessibleText.java)2
-rw-r--r--toolkit/qa/complex/toolkit/_XRequestCallback.java (renamed from toolkit/qa/complex/toolkit/interface_tests/_XRequestCallback.java)2
-rwxr-xr-xtoolkit/qa/complex/toolkit/makefile.mk18
-rwxr-xr-xvcl/qa/complex/memCheck/makefile.mk3
-rw-r--r--vcl/qa/complex/persistent_window_states/makefile.mk3
15 files changed, 19 insertions, 34 deletions
diff --git a/svl/qa/complex/ConfigItems/makefile.mk b/svl/qa/complex/ConfigItems/makefile.mk
index ba980e325904..b4241f24dfee 100644
--- a/svl/qa/complex/ConfigItems/makefile.mk
+++ b/svl/qa/complex/ConfigItems/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/svl/qa/complex/passwordcontainer/makefile.mk b/svl/qa/complex/passwordcontainer/makefile.mk
index d05af97d77f1..625404682761 100644
--- a/svl/qa/complex/passwordcontainer/makefile.mk
+++ b/svl/qa/complex/passwordcontainer/makefile.mk
@@ -54,9 +54,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/toolkit/prj/build.lst b/toolkit/prj/build.lst
index c22df110654e..f4854de8e0c4 100644
--- a/toolkit/prj/build.lst
+++ b/toolkit/prj/build.lst
@@ -19,5 +19,4 @@ ti toolkit\qa\unoapi nmake - all ti_qa_unoapi NULL
#ti toolkit\qa\complex\xunitconversion nmake - all ti_complex_conv ti_util NULL
# fails
-# ti toolkit\qa\complex\toolkit\interface_tests nmake - all ti_qa_complex_toolkit_interface_tests ti_util NULL
# ti toolkit\qa\complex\toolkit nmake - all ti_complex_ti ti_qa_complex_toolkit_interface_tests ti_util NULL
diff --git a/toolkit/qa/complex/toolkit/CheckAccessibleStatusBar.java b/toolkit/qa/complex/toolkit/CheckAccessibleStatusBar.java
index 7daf9c68bdea..cfb40614beab 100755
--- a/toolkit/qa/complex/toolkit/CheckAccessibleStatusBar.java
+++ b/toolkit/qa/complex/toolkit/CheckAccessibleStatusBar.java
@@ -31,10 +31,6 @@ package complex.toolkit;
import lib.TestParameters;
import util.SOfficeFactory;
import util.AccessibilityTools;
-import complex.toolkit.interface_tests._XAccessibleComponent;
-import complex.toolkit.interface_tests._XAccessibleContext;
-import complex.toolkit.interface_tests._XAccessibleExtendedComponent;
-import complex.toolkit.interface_tests._XAccessibleEventBroadcaster;
import com.sun.star.awt.XWindow;
// import com.sun.star.chart.XChartDocument;
import com.sun.star.lang.XMultiServiceFactory;
diff --git a/toolkit/qa/complex/toolkit/CheckAccessibleStatusBarItem.java b/toolkit/qa/complex/toolkit/CheckAccessibleStatusBarItem.java
index f626a0bb68b8..537654c6aacc 100755
--- a/toolkit/qa/complex/toolkit/CheckAccessibleStatusBarItem.java
+++ b/toolkit/qa/complex/toolkit/CheckAccessibleStatusBarItem.java
@@ -33,11 +33,6 @@ import lib.TestParameters;
// import complexlib.ComplexTestCase;
import util.SOfficeFactory;
import util.AccessibilityTools;
-import complex.toolkit.interface_tests._XAccessibleComponent;
-import complex.toolkit.interface_tests._XAccessibleContext;
-import complex.toolkit.interface_tests._XAccessibleEventBroadcaster;
-import complex.toolkit.interface_tests._XAccessibleExtendedComponent;
-import complex.toolkit.interface_tests._XAccessibleText;
import com.sun.star.awt.XWindow;
// import com.sun.star.chart.XChartDocument;
import com.sun.star.lang.XMultiServiceFactory;
diff --git a/toolkit/qa/complex/toolkit/CheckAsyncCallback.java b/toolkit/qa/complex/toolkit/CheckAsyncCallback.java
index a83f607e030b..3a1e51729f11 100644
--- a/toolkit/qa/complex/toolkit/CheckAsyncCallback.java
+++ b/toolkit/qa/complex/toolkit/CheckAsyncCallback.java
@@ -29,7 +29,6 @@ package complex.toolkit;
// import complexlib.ComplexTestCase;
import util.SOfficeFactory;
-import complex.toolkit.interface_tests._XRequestCallback;
// import complex.toolkit.CallbackClass;
import com.sun.star.awt.XRequestCallback;
import com.sun.star.lang.XMultiServiceFactory;
diff --git a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleComponent.java b/toolkit/qa/complex/toolkit/_XAccessibleComponent.java
index 9d27c7b7d23a..ae3e293e50fc 100755
--- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleComponent.java
+++ b/toolkit/qa/complex/toolkit/_XAccessibleComponent.java
@@ -25,7 +25,7 @@
*
************************************************************************/
-package complex.toolkit.interface_tests;
+package complex.toolkit;
// import share.LogWriter;
import com.sun.star.awt.Point;
diff --git a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleContext.java b/toolkit/qa/complex/toolkit/_XAccessibleContext.java
index 20c99d3e129e..de2928fdabe3 100755
--- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleContext.java
+++ b/toolkit/qa/complex/toolkit/_XAccessibleContext.java
@@ -25,7 +25,7 @@
*
************************************************************************/
-package complex.toolkit.interface_tests;
+package complex.toolkit;
import com.sun.star.lang.Locale;
import com.sun.star.uno.XInterface;
diff --git a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleEventBroadcaster.java b/toolkit/qa/complex/toolkit/_XAccessibleEventBroadcaster.java
index dc14e8057a5a..899028daec87 100755
--- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleEventBroadcaster.java
+++ b/toolkit/qa/complex/toolkit/_XAccessibleEventBroadcaster.java
@@ -25,7 +25,7 @@
*
************************************************************************/
-package complex.toolkit.interface_tests;
+package complex.toolkit;
import com.sun.star.lang.EventObject;
import com.sun.star.awt.Rectangle;
diff --git a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleExtendedComponent.java b/toolkit/qa/complex/toolkit/_XAccessibleExtendedComponent.java
index 45535fa0007c..2ba5c190cf31 100755
--- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleExtendedComponent.java
+++ b/toolkit/qa/complex/toolkit/_XAccessibleExtendedComponent.java
@@ -25,7 +25,7 @@
*
************************************************************************/
-package complex.toolkit.interface_tests;
+package complex.toolkit;
// import lib.MultiMethodTest;
import com.sun.star.accessibility.XAccessibleExtendedComponent;
diff --git a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleText.java b/toolkit/qa/complex/toolkit/_XAccessibleText.java
index 2075a0ef30a5..151e6b3f7d0b 100755
--- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleText.java
+++ b/toolkit/qa/complex/toolkit/_XAccessibleText.java
@@ -25,7 +25,7 @@
*
************************************************************************/
-package complex.toolkit.interface_tests;
+package complex.toolkit;
import com.sun.star.accessibility.XAccessibleText;
// import lib.MultiMethodTest;
diff --git a/toolkit/qa/complex/toolkit/interface_tests/_XRequestCallback.java b/toolkit/qa/complex/toolkit/_XRequestCallback.java
index 21787a70a2de..b9486c04c80a 100644
--- a/toolkit/qa/complex/toolkit/interface_tests/_XRequestCallback.java
+++ b/toolkit/qa/complex/toolkit/_XRequestCallback.java
@@ -25,7 +25,7 @@
*
************************************************************************/
-package complex.toolkit.interface_tests;
+package complex.toolkit;
import com.sun.star.awt.XRequestCallback;
// import lib.MultiMethodTest;
diff --git a/toolkit/qa/complex/toolkit/makefile.mk b/toolkit/qa/complex/toolkit/makefile.mk
index 48386843a15f..70918d602624 100755
--- a/toolkit/qa/complex/toolkit/makefile.mk
+++ b/toolkit/qa/complex/toolkit/makefile.mk
@@ -36,14 +36,22 @@ TARGET = qa_complex_toolkit
.IF "$(OOO_JUNIT_JAR)" != ""
PACKAGE = complex/toolkit
-JAVATESTFILES = CheckAccessibleStatusBar.java CheckAccessibleStatusBarItem.java CheckAsyncCallback.java CallbackClass.java
-JAVAFILES = $(JAVATESTFILES)
+JAVATESTFILES = CheckAccessibleStatusBar.java \
+ CheckAccessibleStatusBarItem.java \
+ CheckAsyncCallback.java \
+ CallbackClass.java
+
+JAVAFILES = $(JAVATESTFILES) \
+ _XAccessibleComponent.java \
+ _XAccessibleContext.java \
+ _XAccessibleEventBroadcaster.java \
+ _XAccessibleExtendedComponent.java \
+ _XAccessibleText.java \
+ _XRequestCallback.java
+
JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
EXTRAJARFILES = $(OOO_JUNIT_JAR)
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-SUBDIRS = interface_tests
-
.END
.INCLUDE: settings.mk
diff --git a/vcl/qa/complex/memCheck/makefile.mk b/vcl/qa/complex/memCheck/makefile.mk
index e75d71e36453..4a809e71e50e 100755
--- a/vcl/qa/complex/memCheck/makefile.mk
+++ b/vcl/qa/complex/memCheck/makefile.mk
@@ -49,9 +49,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/vcl/qa/complex/persistent_window_states/makefile.mk b/vcl/qa/complex/persistent_window_states/makefile.mk
index f82718a74f94..e4d9f6b514a0 100644
--- a/vcl/qa/complex/persistent_window_states/makefile.mk
+++ b/vcl/qa/complex/persistent_window_states/makefile.mk
@@ -47,9 +47,6 @@ DocumentHandle.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