convert jurt/urp unit test

5 files changed, 141 insertions, 51 deletions

diff --git a/jurt/JunitTest_urp.mk b/jurt/JunitTest_urp.mk
new file mode 100644
index 000000000000..a0e708407be2
--- /dev/null
+++ b/jurt/JunitTest_urp.mk
@@ -0,0 +1,48 @@
+# -*- 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,jurt_urp))
+
+$(eval $(call gb_JunitTest_add_package_dependencies,jurt_urp,\
+    jurt_test_urp \
+))
+
+$(eval $(call gb_JunitTest_add_jars,jurt_urp,\
+    $(OUTDIR)/bin/OOoRunnerLight.jar \
+    $(OUTDIR)/bin/ridl.jar \
+    $(WORKDIR)/CustomTarget/jurt/test/com/sun/star/lib/uno/protocols/urp \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,jurt_urp,\
+    jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test \
+    jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test \
+    jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test \
+    jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge \
+    jurt/test/com/sun/star/lib/uno/protocols/urp/TestObject \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk
index b366a0ec72e4..d56de79c5fd0 100644
--- a/jurt/Module_jurt.mk
+++ b/jurt/Module_jurt.mk
@@ -48,7 +48,9 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,jurt,\
     JunitTest_java_remote \
     JunitTest_remote \
     JunitTest_uno \
+    JunitTest_urp \
     JunitTest_util \
+    Package_test_urp \
 ))
 
 endif
diff --git a/jurt/Package_test_urp.mk b/jurt/Package_test_urp.mk
new file mode 100644
index 000000000000..80b4870c867b
--- /dev/null
+++ b/jurt/Package_test_urp.mk
@@ -0,0 +1,43 @@
+# -*- 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_Package_Package,jurt_test_urp,$(WORKDIR)/CustomTarget/jurt/test/com/sun/star/lib/uno/protocols/urp))
+
+$(eval $(call gb_Package_add_customtarget,jurt_test_urp,jurt/test/com/sun/star/lib/uno/protocols/urp))
+
+$(eval $(call gb_CustomTarget_add_dependencies,jurt/test/com/sun/star/lib/uno/protocols/urp,\
+    jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl \
+))
+
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,jurt/test/com/sun/star/lib/uno/protocols/urp,\
+    $(OUTDIR_FOR_BUILD)/bin/idlc$(gb_Executable_EXT_for_build) \
+    $(OUTDIR_FOR_BUILD)/bin/javamaker$(gb_Executable_EXT_for_build) \
+    $(OUTDIR_FOR_BUILD)/bin/regmerge$(gb_Executable_EXT_for_build) \
+    $(OUTDIR)/bin/types.rdb \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/Makefile b/jurt/test/com/sun/star/lib/uno/protocols/urp/Makefile
new file mode 100644
index 000000000000..ffc0cd8c73dd
--- /dev/null
+++ b/jurt/test/com/sun/star/lib/uno/protocols/urp/Makefile
@@ -0,0 +1,48 @@
+# -*- 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.
+
+gb_PARTIALBUILD := T
+include $(GBUILDDIR)/gbuild_simple.mk
+
+done : registry.rdb
+	$(call gb_Helper_execute,javamaker -BUCR -O$(dir .) -nD $< -X$(OUTDIR)/bin/types.rdb) && \
+	touch $@
+
+# TODO: would it be possible to reuse UnoApiTarget for this?
+registry.rdb : interfaces.urd
+	rm -f $@ && \
+	$(call gb_Helper_execute,regmerge $@ /UCR $<)
+
+interfaces.urd : $(SRCDIR)/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl
+	mkdir urd && \
+	$(call gb_Helper_execute,idlc -O$(dir ./urd) -I$(OUTDIR)/idl -cid -we $<)
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : done
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/makefile.mk b/jurt/test/com/sun/star/lib/uno/protocols/urp/makefile.mk
deleted file mode 100644
index 8403b2bd71ed..000000000000
--- a/jurt/test/com/sun/star/lib/uno/protocols/urp/makefile.mk
+++ /dev/null
@@ -1,51 +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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ := ..$/..$/..$/..$/..$/..$/..$/..
-PRJNAME := jurt
-TARGET := test_com_sun_star_lib_uno_protocols_urp
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE := com$/sun$/star$/lib$/uno$/protocols$/urp
-JAVATESTFILES := \
-    Cache_Test.java \
-    Marshaling_Test.java \
-    Protocol_Test.java
-JAVAFILES := \
-    TestBridge.java \
-    TestObject.java
-JARFILES := ridl.jar
-IDLTESTFILES := interfaces.idl
-.END
-
-.INCLUDE: javaunittest.mk
-
-.END