#i125003# migrate main/sfx2 to Google Test, using gbuild for the first time.

sfx2/CppunitTest_sfx2_metadatable.mk → sfx2/GoogleTest_sfx2_metadatable.mk

@@ -21,28 +21,27 @@
 
 
 
-$(eval $(call gb_CppunitTest_CppunitTest,sfx2_metadatable))
+$(eval $(call gb_GoogleTest_GoogleTest,sfx2_metadatable))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sfx2_metadatable, \
-    sfx2/qa/cppunit/test_metadatable \
+$(eval $(call gb_GoogleTest_add_exception_objects,sfx2_metadatable, \
+	sfx2/qa/gtest/test_metadatable \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \
+$(eval $(call gb_GoogleTest_add_linked_libs,sfx2_metadatable, \
     sal \
     sfx \
     stl \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\
-    $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
-    -I$(OUTDIR)/inc \
+$(eval $(call gb_GoogleTest_set_include,sfx2_metadatable,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc/offuh \
+	-I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_CppunitTest_set_ldflags,sfx2_metadatable,\
+$(eval $(call gb_GoogleTest_set_ldflags,sfx2_metadatable,\
     $$(LDFLAGS) \
-    -lcppunit \
 ))
 
 # vim: set noet sw=4 ts=4:

sfx2/Module_sfx2.mk

@@ -30,9 +30,9 @@ $(eval $(call gb_Module_add_targets,sfx2,\
     Package_sdi \
 ))
 
-ifeq ($(WITH_CPPUNIT),YES)
+ifeq ($(ENABLE_UNIT_TESTS),YES)
 $(eval $(call gb_Module_add_check_targets,sfx2,\
-    CppunitTest_sfx2_metadatable \
+    GoogleTest_sfx2_metadatable \
 ))
 endif
 

sfx2/qa/cppunit/makefile.mk

-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ=../..
-PRJNAME=sfx2
-TARGET=qa_cppunit
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(ENABLE_UNIT_TESTS)" != "YES"
-all:
-    @echo unit tests are disabled. Nothing to do.
-
-.ELSE
-
-APP1OBJS=  \
-    $(SLO)/test_metadatable.obj \
-
-
-APP1STDLIBS= \
-     $(GTESTLIB) \
-     $(SALLIB) \
-     $(CPPULIB) \
-     $(CPPUHELPERLIB) \
-     $(VCLLIB) \
-     $(SFXLIB) \
-
-
-APP1TARGET= test_metadatable
-APP1RPATH = NONE
-APP1TEST = enabled
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
-
-.END

sfx2/qa/cppunit/version.map

-#**************************************************************
-#
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#
-#**************************************************************
-
-
-
-UDK_3_0_0 {
-    global:
-        cppunitTestPlugIn;
-
-    local:
-        *;
-};