convert ridljar unit tests

8 files changed, 127 insertions, 144 deletions

diff --git a/ridljar/JunitTest_typedesc.mk b/ridljar/JunitTest_typedesc.mk
new file mode 100644
index 000000000000..2242e9daf065
--- /dev/null
+++ b/ridljar/JunitTest_typedesc.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_JunitTest_JunitTest,ridljar_typedesc))
+
+$(eval $(call gb_JunitTest_add_jars,ridljar_typedesc,\
+    $(OUTDIR)/bin/OOoRunnerLight.jar \
+    $(OUTDIR)/bin/ridl.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,ridljar_typedesc,\
+    ridljar/test/com/sun/star/lib/uno/typedesc/TypeDescription_Test \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ridljar/JunitTest_uno.mk b/ridljar/JunitTest_uno.mk
new file mode 100644
index 000000000000..62ca80c19779
--- /dev/null
+++ b/ridljar/JunitTest_uno.mk
@@ -0,0 +1,41 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_JunitTest_JunitTest,ridljar_uno))
+
+$(eval $(call gb_JunitTest_add_jars,ridljar_uno,\
+    $(OUTDIR)/bin/OOoRunnerLight.jar \
+    $(OUTDIR)/bin/ridl.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,ridljar_uno,\
+    ridljar/test/com/sun/star/uno/Any_Test \
+    ridljar/test/com/sun/star/uno/Type_Test \
+    ridljar/test/com/sun/star/uno/UnoRuntime_Test \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ridljar/JunitTest_util.mk b/ridljar/JunitTest_util.mk
new file mode 100644
index 000000000000..976554e1f597
--- /dev/null
+++ b/ridljar/JunitTest_util.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_JunitTest_JunitTest,ridljar_util))
+
+$(eval $(call gb_JunitTest_add_jars,ridljar_util,\
+    $(OUTDIR)/bin/OOoRunnerLight.jar \
+    $(OUTDIR)/bin/ridl.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,ridljar_util,\
+    ridljar/test/com/sun/star/lib/util/WeakMap_Test \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ridljar/Module_ridljar.mk b/ridljar/Module_ridljar.mk
index c1cdfa6a1afc..dde756f983b7 100644
--- a/ridljar/Module_ridljar.mk
+++ b/ridljar/Module_ridljar.mk
@@ -35,6 +35,14 @@ $(eval $(call gb_Module_add_targets,ridljar,\
     Zip_ridl \
     Zip_unoloader \
 ))
+
+# unfortunately, these tests depend on qadevOOo, which depends on
+# ridl.jar for build...
+$(eval $(call gb_Module_add_subsequentcheck_targets,ridljar,\
+    JunitTest_typedesc \
+    JunitTest_uno \
+    JunitTest_util \
+))
 endif
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ridljar/test/com/sun/star/lib/uno/typedesc/makefile.mk b/ridljar/test/com/sun/star/lib/uno/typedesc/makefile.mk
deleted file mode 100644
index e329026542cd..000000000000
--- a/ridljar/test/com/sun/star/lib/uno/typedesc/makefile.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..$/..$/..
-PRJNAME := ridljar
-TARGET := test_com_sun_star_lib_uno_typedesc
-
-PACKAGE := com$/sun$/star$/lib$/uno$/typedesc
-JAVATESTFILES := TypeDescription_Test.java
-
-.INCLUDE: javaunittest.mk
diff --git a/ridljar/test/com/sun/star/lib/util/makefile.mk b/ridljar/test/com/sun/star/lib/util/makefile.mk
deleted file mode 100644
index 7da28b6e1b47..000000000000
--- a/ridljar/test/com/sun/star/lib/util/makefile.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..$/..
-PRJNAME := ridljar
-TARGET := test_com_sun_star_lib_util
-
-PACKAGE := com$/sun$/star$/lib$/util
-JAVATESTFILES := \
-    WeakMap_Test.java
-
-.INCLUDE: javaunittest.mk
diff --git a/ridljar/test/com/sun/star/uno/makefile.mk b/ridljar/test/com/sun/star/uno/makefile.mk
deleted file mode 100644
index 6f2fd8332378..000000000000
--- a/ridljar/test/com/sun/star/uno/makefile.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..
-PRJNAME := ridljar
-TARGET := test_com_sun_star_uno
-
-PACKAGE := com$/sun$/star$/uno
-JAVATESTFILES := \
-    Any_Test.java \
-    Type_Test.java \
-    UnoRuntime_Test.java
-
-.INCLUDE: javaunittest.mk
diff --git a/ridljar/test/makefile.mk b/ridljar/test/makefile.mk
deleted file mode 100644
index 86b432dc3bb4..000000000000
--- a/ridljar/test/makefile.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# Quick and dirty way to run all tests in sub-directories; probably only works
-# on Unix.
-# Can be removed once tests are included in regular builds.
-
-all .PHONY:
-    cd com/sun/star/lib/uno/typedesc && dmake
-    cd com/sun/star/lib/util && dmake
-    cd com/sun/star/uno && dmake