gnumake3: renamed TestFixture to CppunitTest

sfx2/CppunitTest_sfx2_metadatable.mk

@@ -25,18 +25,18 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_TestFixture_TestFixture,sfx2_metadatable))
+$(eval $(call gb_CppunitTest_CppunitTest,sfx2_metadatable))
 
-$(eval $(call gb_TestFixture_add_exception_objects,sfx2_metadatable, \
+$(eval $(call gb_CppunitTest_add_exception_objects,sfx2_metadatable, \
     sfx2/qa/cppunit/test_metadatable \
 ))
 
-$(eval $(call gb_TestFixture_add_linked_libs,sfx2_metadatable, \
+$(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \
     sal \
     sfx \
 ))
 
-$(eval $(call gb_TestFixture_set_include,sfx2_metadatable,\
+$(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \

sfx2/JunitTest_sfx2_complex.mk

@@ -31,13 +31,6 @@ $(eval $(call gb_JunitTest_set_defs,sfx2_complex,\
     $$(DEFS) \
     -Dorg.openoffice.test.arg.docpath=$(SRCDIR)/sfx2/qa/complex/framework/testdocuments \
 ))
-$(info $(call gb_JunitTest_set_defs,sfx2_complex,\
-    -Dorg.openoffice.test.arg.soffice=path:$(OUTDIR)/installation/opt/openoffice.org3/program/soffice \
-    -Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
-    -Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$*) \
-    -Dorg.openoffice.test.arg.docpath=$(SRCDIR)/sfx2/qa/complex/framework/testdocuments \
-    $$(DEFS) \
-))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,sfx2_complex,\
     sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1 \

sfx2/Module_sfx2.mk

@@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,sfx2,\
 ))
 
 $(eval $(call gb_Module_add_check_targets,sfx2,\
-    TestFixture_sfx2_metadatable \
+    CppunitTest_sfx2_metadatable \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\