You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2015/08/30 18:41:27 UTC
svn commit: r1700138 - in /openoffice/trunk/main/salhelper: prj/build.lst
qa/main.cxx qa/makefile.mk qa/test_api.cxx qa/version.map
Author: damjan
Date: Sun Aug 30 16:41:27 2015
New Revision: 1700138
URL: http://svn.apache.org/r1700138
Log:
#i125003# migrate main/salhelper from cppunit to Google Test
and run it on every build.
Added:
openoffice/trunk/main/salhelper/qa/main.cxx
Removed:
openoffice/trunk/main/salhelper/qa/version.map
Modified:
openoffice/trunk/main/salhelper/prj/build.lst
openoffice/trunk/main/salhelper/qa/makefile.mk
openoffice/trunk/main/salhelper/qa/test_api.cxx
Modified: openoffice/trunk/main/salhelper/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/prj/build.lst?rev=1700138&r1=1700137&r2=1700138&view=diff
==============================================================================
--- openoffice/trunk/main/salhelper/prj/build.lst (original)
+++ openoffice/trunk/main/salhelper/prj/build.lst Sun Aug 30 16:41:27 2015
@@ -1,3 +1,4 @@
shp salhelper : sal NULL
shp salhelper usr1 - all shp_mkout NULL
shp salhelper\source nmake - all shp_source NULL
+shp salhelper\qa nmake - all shp_qa shp_source NULL
Added: openoffice/trunk/main/salhelper/qa/main.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/qa/main.cxx?rev=1700138&view=auto
==============================================================================
--- openoffice/trunk/main/salhelper/qa/main.cxx (added)
+++ openoffice/trunk/main/salhelper/qa/main.cxx Sun Aug 30 16:41:27 2015
@@ -0,0 +1,28 @@
+/**************************************************************
+ *
+ * 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.
+ *
+ *************************************************************/
+
+#include "gtest/gtest.h"
+
+int main(int argc, char **argv)
+{
+ ::testing::InitGoogleTest(&argc, argv);
+ return RUN_ALL_TESTS();
+}
Modified: openoffice/trunk/main/salhelper/qa/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/qa/makefile.mk?rev=1700138&r1=1700137&r2=1700138&view=diff
==============================================================================
--- openoffice/trunk/main/salhelper/qa/makefile.mk (original)
+++ openoffice/trunk/main/salhelper/qa/makefile.mk Sun Aug 30 16:41:27 2015
@@ -29,20 +29,18 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_api.obj
-SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(SALHELPERLIB) $(TESTSHL2LIB)
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1VERSIONMAP = version.map
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+ @echo unit tests are disabled. Nothing to do.
+
+.ELSE
+
+APP1TARGET = $(TARGET)
+APP1OBJS = $(SLO)$/test_api.obj $(SLO)$/main.obj
+APP1STDLIBS = $(GTESTLIB) $(SALLIB) $(SALHELPERLIB) $(TESTSHL2LIB)
+APP1RPATH = NONE
+APP1TEST = enabled
.INCLUDE: target.mk
-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
- cd $(SHL1TARGETN:d) && $(TESTSHL2) $(SHL1TARGETN:f)
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
Modified: openoffice/trunk/main/salhelper/qa/test_api.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/qa/test_api.cxx?rev=1700138&r1=1700137&r2=1700138&view=diff
==============================================================================
--- openoffice/trunk/main/salhelper/qa/test_api.cxx (original)
+++ openoffice/trunk/main/salhelper/qa/test_api.cxx Sun Aug 30 16:41:27 2015
@@ -52,11 +52,11 @@ std::type_info const & getSimpleReferenc
}
-#include "testshl/simpleheader.hxx"
#include "osl/mutex.hxx"
#include "salhelper/condition.hxx"
#include "salhelper/dynload.hxx"
#include "salhelper/simplereferenceobject.hxx"
+#include "gtest/gtest.h"
#include <memory>
@@ -76,91 +76,62 @@ class DerivedConditionWaiterTimedout:
class DerivedSimpleReferenceObject: public salhelper::SimpleReferenceObject {};
-class Test: public CppUnit::TestFixture {
+class Test: public ::testing::Test {
public:
- void testCondition();
-
- void testConditionModifier();
-
- void testConditionWaiter();
-
- void testConditionWaiterTimedout();
-
- void testORealDynamicLoader();
-
- void testSimpleReferenceObject();
-
- void testDerivedCondition();
-
- void testDerivedConditionWaiterTimedout();
-
- void testDerivedSimpleReferenceObject();
-
- CPPUNIT_TEST_SUITE(Test);
- CPPUNIT_TEST(testCondition);
- CPPUNIT_TEST(testConditionModifier);
- CPPUNIT_TEST(testConditionWaiter);
- CPPUNIT_TEST(testConditionWaiterTimedout);
- CPPUNIT_TEST(testORealDynamicLoader);
- CPPUNIT_TEST(testSimpleReferenceObject);
- CPPUNIT_TEST(testDerivedCondition);
- CPPUNIT_TEST(testDerivedConditionWaiterTimedout);
- CPPUNIT_TEST(testDerivedSimpleReferenceObject);
- CPPUNIT_TEST_SUITE_END();
};
-void Test::testCondition() {
+TEST_F(Test, testCondition) {
osl::Mutex mutex;
std::auto_ptr< salhelper::Condition > p(new DerivedCondition(mutex));
- CPPUNIT_ASSERT(typeid (*p.get()) != typeid (salhelper::Condition));
- CPPUNIT_ASSERT(typeid (p.get()) == typeid (salhelper::Condition *));
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(typeid (*p.get()) != typeid (salhelper::Condition));
+ ASSERT_TRUE(typeid (p.get()) == typeid (salhelper::Condition *));
+ ASSERT_TRUE(
typeid (const_cast< salhelper::Condition const * >(p.get()))
== typeid (salhelper::Condition const *));
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(
typeid (const_cast< salhelper::Condition volatile * >(p.get()))
== typeid (salhelper::Condition volatile *));
- CPPUNIT_ASSERT(typeid (salhelper::Condition *) == getConditionTypeInfo());
+ ASSERT_TRUE(typeid (salhelper::Condition *) == getConditionTypeInfo());
}
-void Test::testConditionModifier() {
+TEST_F(Test, testConditionModifier) {
salhelper::ConditionModifier * p = 0;
- CPPUNIT_ASSERT(typeid (*p) == typeid (salhelper::ConditionModifier));
- CPPUNIT_ASSERT(typeid (p) == typeid (salhelper::ConditionModifier *));
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(typeid (*p) == typeid (salhelper::ConditionModifier));
+ ASSERT_TRUE(typeid (p) == typeid (salhelper::ConditionModifier *));
+ ASSERT_TRUE(
typeid (const_cast< salhelper::ConditionModifier const * >(p))
== typeid (salhelper::ConditionModifier const *));
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(
typeid (const_cast< salhelper::ConditionModifier volatile * >(p))
== typeid (salhelper::ConditionModifier volatile *));
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(
typeid (salhelper::ConditionModifier *)
== getConditionModifierTypeInfo());
}
-void Test::testConditionWaiter() {
+TEST_F(Test, testConditionWaiter) {
salhelper::ConditionWaiter * p = 0;
- CPPUNIT_ASSERT(typeid (*p) == typeid (salhelper::ConditionWaiter));
- CPPUNIT_ASSERT(typeid (p) == typeid (salhelper::ConditionWaiter *));
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(typeid (*p) == typeid (salhelper::ConditionWaiter));
+ ASSERT_TRUE(typeid (p) == typeid (salhelper::ConditionWaiter *));
+ ASSERT_TRUE(
typeid (const_cast< salhelper::ConditionWaiter const * >(p))
== typeid (salhelper::ConditionWaiter const *));
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(
typeid (const_cast< salhelper::ConditionWaiter volatile * >(p))
== typeid (salhelper::ConditionWaiter volatile *));
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(
typeid (salhelper::ConditionWaiter *) == getConditionWaiterTypeInfo());
}
-void Test::testConditionWaiterTimedout() {
+TEST_F(Test, testConditionWaiterTimedout) {
salhelper::ConditionWaiter::timedout x;
- CPPUNIT_ASSERT(typeid (x) == typeid (salhelper::ConditionWaiter::timedout));
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(typeid (x) == typeid (salhelper::ConditionWaiter::timedout));
+ ASSERT_TRUE(
typeid (&x) == typeid (salhelper::ConditionWaiter::timedout *));
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(
typeid (const_cast< salhelper::ConditionWaiter::timedout const * >(&x))
== typeid (salhelper::ConditionWaiter::timedout const *));
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(
(typeid
(const_cast< salhelper::ConditionWaiter::timedout volatile * >(&x)))
== typeid (salhelper::ConditionWaiter::timedout volatile *));
@@ -168,40 +139,40 @@ void Test::testConditionWaiterTimedout()
throw salhelper::ConditionWaiter::timedout();
} catch (salhelper::ConditionWaiter::timedout &) {
} catch (...) {
- CPPUNIT_FAIL("not caught");
+ FAIL() << "not caught";
}
}
-void Test::testORealDynamicLoader() {
+TEST_F(Test, testORealDynamicLoader) {
salhelper::ORealDynamicLoader * p = 0;
- CPPUNIT_ASSERT(typeid (p) != typeid (salhelper::ORealDynamicLoader));
- CPPUNIT_ASSERT(typeid (p) == typeid (salhelper::ORealDynamicLoader *));
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(typeid (p) != typeid (salhelper::ORealDynamicLoader));
+ ASSERT_TRUE(typeid (p) == typeid (salhelper::ORealDynamicLoader *));
+ ASSERT_TRUE(
typeid (const_cast< salhelper::ORealDynamicLoader const * >(p))
== typeid (salhelper::ORealDynamicLoader const *));
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(
typeid (const_cast< salhelper::ORealDynamicLoader volatile * >(p))
== typeid (salhelper::ORealDynamicLoader volatile *));
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(
typeid (salhelper::ORealDynamicLoader *)
== getORealDynamicLoaderTypeInfo());
}
-void Test::testSimpleReferenceObject() {
+TEST_F(Test, testSimpleReferenceObject) {
salhelper::SimpleReferenceObject * p = new DerivedSimpleReferenceObject;
try {
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(
typeid (*p) != typeid (salhelper::SimpleReferenceObject));
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(
typeid (p) == typeid (salhelper::SimpleReferenceObject *));
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(
typeid (const_cast< salhelper::SimpleReferenceObject const * >(p))
== typeid (salhelper::SimpleReferenceObject const *));
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(
(typeid
(const_cast< salhelper::SimpleReferenceObject volatile * >(p)))
== typeid (salhelper::SimpleReferenceObject volatile *));
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(
typeid (salhelper::SimpleReferenceObject *)
== getSimpleReferenceObjectTypeInfo());
} catch (...) {
@@ -210,37 +181,34 @@ void Test::testSimpleReferenceObject() {
}
}
-void Test::testDerivedCondition() {
+TEST_F(Test, testDerivedCondition) {
osl::Mutex mutex;
std::auto_ptr< salhelper::Condition > p(new DerivedCondition(mutex));
- CPPUNIT_ASSERT(dynamic_cast< DerivedCondition * >(p.get()) != 0);
+ ASSERT_TRUE(dynamic_cast< DerivedCondition * >(p.get()) != 0);
}
-void Test::testDerivedConditionWaiterTimedout() {
+TEST_F(Test, testDerivedConditionWaiterTimedout) {
std::auto_ptr< salhelper::ConditionWaiter::timedout > p(
new DerivedConditionWaiterTimedout);
- CPPUNIT_ASSERT(
+ ASSERT_TRUE(
dynamic_cast< DerivedConditionWaiterTimedout * >(p.get()) != 0);
try {
throw DerivedConditionWaiterTimedout();
} catch (salhelper::ConditionWaiter::timedout &) {
} catch (...) {
- CPPUNIT_FAIL("not caught");
+ FAIL() << "not caught";
}
}
-void Test::testDerivedSimpleReferenceObject() {
+TEST_F(Test, testDerivedSimpleReferenceObject) {
salhelper::SimpleReferenceObject * p = new DerivedSimpleReferenceObject;
try {
- CPPUNIT_ASSERT(dynamic_cast< DerivedSimpleReferenceObject * >(p) != 0);
+ ASSERT_TRUE(dynamic_cast< DerivedSimpleReferenceObject * >(p) != 0);
} catch (...) {
delete static_cast< DerivedSimpleReferenceObject * >(p);
throw;
}
}
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
}
-
-NOADDITIONAL;