From 6086cec5c29974076c81f4548afd226f85b1ec46 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Fri, 10 Dec 2010 14:37:57 +0100
Subject: sb135: #i116046# fixed jurt.com.sun.star.lib.uno.protocols.urp.Cache
 typo, adapted corresponding tests plus solenv/inc/javaunittest.mk to JUnit
 framework

---
 solenv/inc/javaunittest.mk | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'solenv/inc/javaunittest.mk')

diff --git a/solenv/inc/javaunittest.mk b/solenv/inc/javaunittest.mk
index e129052a445e..6d7c564da2a0 100644
--- a/solenv/inc/javaunittest.mk
+++ b/solenv/inc/javaunittest.mk
@@ -52,9 +52,8 @@
 # <platform>/class/, so that they are not accidentally included in jar files
 # packed from <platform>/class/ subdirectories.
 
-TESTS := $(subst,.java,.test $(JAVATESTFILES))
 JAVAFILES +:= $(JAVATESTFILES)
-JARFILES +:= OOoRunner.jar
+EXTRAJARFILES += $(OOO_JUNIT_JAR)
 
 .INCLUDE: settings.mk
 
@@ -67,22 +66,26 @@ CLASSDIR !:= $(CLASSDIR)/test
 
 .INCLUDE: target.mk
 
-ALLTAR: $(TESTS)
-
-$(JAVAFILES): $(MISC)/$(TARGET).classdir.flag
+$(JAVATARGET) : $(MISC)/$(TARGET).classdir.flag
 
 $(MISC)/$(TARGET).classdir.flag:
     - $(MKDIR) $(CLASSDIR)
     $(TOUCH) $@
 
-.IF "$(TESTS)" != ""
-$(TESTS): $(JAVACLASSFILES)
-.ENDIF
+.IF "$(JAVATESTFILES)" != ""
+ALLTAR : test
+.END
 
-%.test .PHONY: %.java
-    $(JAVAI) $(JAVAIFLAGS) $(JAVACPS) $(CLASSPATH) org.openoffice.Runner \
-        -TestBase java_complex -NoOffice yes \
-        -o $(subst,/,. $(subst,.test, $(PACKAGE).$@))
+.IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != ""
+test .PHONY : $(JAVATARGET)
+    $(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \
+        '$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \
+        org.junit.runner.JUnitCore \
+        $(foreach,i,$(JAVATESTFILES) $(subst,/,. $(PACKAGE)).$(i:s/.java//))
+.ELSE
+test .PHONY :
+    echo 'test needs SOLAR_JAVA=TRUE and OOO_JUNIT_JAR'
+.END
 
 .IF "$(IDLTESTFILES)" != ""
 
-- 
cgit