[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/qa
Damjan Jovanovic
damjan at apache.org
Sun Aug 30 13:08:09 PDT 2015
sal/qa/rtl/uuid/makefile.mk | 26 +++----
sal/qa/rtl/uuid/rtl_Uuid.cxx | 140 ++++++++++++++++++++-----------------------
2 files changed, 78 insertions(+), 88 deletions(-)
New commits:
commit 933db9c80d5510abdd3569a025f654102d83aaf5
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sun Aug 30 19:10:42 2015 +0000
#i125003# migrate main/sal/qa/rtl/uuid from cppunit to Google Test.
diff --git a/sal/qa/rtl/uuid/makefile.mk b/sal/qa/rtl/uuid/makefile.mk
index 80f6b9a..df42f80 100644
--- a/sal/qa/rtl/uuid/makefile.mk
+++ b/sal/qa/rtl/uuid/makefile.mk
@@ -33,32 +33,30 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+ @echo unit tests are disabled. Nothing to do.
+
+.ELSE
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
# BEGIN ----------------------------------------------------------------
# auto generated Target:joblist by codegen.pl
-SHL1OBJS= \
+APP1OBJS= \
$(SLO)$/rtl_Uuid.obj
-SHL1TARGET= rtl_Uuid
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF= $(MISC)$/$(SHL1TARGET).def
+APP1TARGET= rtl_Uuid
+APP1STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP1RPATH = NONE
+APP1TEST = enabled
-DEF1NAME =$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
# END ------------------------------------------------------------------
-#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx
index 1016af1..42a6eed 100644
--- a/sal/qa/rtl/uuid/rtl_Uuid.cxx
+++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx
@@ -27,7 +27,6 @@
#include <math.h>
#include <stdio.h>
-#include <testshl/simpleheader.hxx>
#include <rtl/uuid.h>
#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
@@ -37,16 +36,18 @@
#include <time.h>
#endif
+#include "gtest/gtest.h"
+
using namespace rtl;
/** print a UNI_CODE String. And also print some comments of the string.
*/
inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = "" )
{
- t_print("#%s #printUString_u# ", msg );
+ printf("#%s #printUString_u# ", msg );
rtl::OString aString;
aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
- t_print("%s\n", (char *)aString.getStr( ) );
+ printf("%s\n", (char *)aString.getStr( ) );
}
/************************************************************************
@@ -71,21 +72,23 @@ void printUuid( sal_uInt8 *pNode )
namespace rtl_Uuid
{
-class createUuid : public CppUnit::TestFixture
+class createUuid : public ::testing::Test
{
public:
// initialise your test code values here.
- void setUp()
+ void SetUp()
{
}
- void tearDown()
+ void TearDown()
{
}
+}; // class createUuid
+
#define TEST_UUID 20
- void createUuid_001()
- {
+TEST_F(createUuid, createUuid_001)
+{
sal_uInt8 aNode[TEST_UUID][16];
sal_Int32 i,i2;
for( i = 0 ; i < TEST_UUID ; i ++ )
@@ -106,11 +109,12 @@ public:
if ( bRes == sal_False )
break;
}
- CPPUNIT_ASSERT_MESSAGE("createUuid: every uuid must be different.", bRes == sal_True );
- }
- /*
- void createUuid_002()
- {
+ ASSERT_TRUE(bRes == sal_True) << "createUuid: every uuid must be different.";
+}
+
+/*
+TEST_F(createUuid, createUuid_002)
+{
sal_uInt8 pNode[16];
sal_uInt8 aNode[TEST_UUID][16];
sal_Int32 i,i2;
@@ -133,14 +137,8 @@ public:
if ( bRes == sal_False )
break;
}
- CPPUNIT_ASSERT_MESSAGE("createUuid: every uuid must be different.", bRes == sal_True );
- }*/
-
- CPPUNIT_TEST_SUITE(createUuid);
- CPPUNIT_TEST(createUuid_001);
- //CPPUNIT_TEST(createUuid_002);
- CPPUNIT_TEST_SUITE_END();
-}; // class createUuid
+ ASSERT_TRUE(bRes == sal_True) << "createUuid: every uuid must be different.";
+}*/
namespace ThreadHelper
{
@@ -155,70 +153,64 @@ namespace ThreadHelper
}
}
-class createNamedUuid : public CppUnit::TestFixture
+class createNamedUuid : public ::testing::Test
{
public:
// initialise your test code values here.
- void setUp()
+ void SetUp()
{
}
- void tearDown()
+ void TearDown()
{
}
+}; // class createNamedUuid
- void createNamedUuid_001()
- {
- sal_uInt8 NameSpace_DNS[16] = RTL_UUID_NAMESPACE_DNS;
- sal_uInt8 NameSpace_URL[16] = RTL_UUID_NAMESPACE_URL;
- sal_uInt8 pPriorCalculatedUUID[16] = {
- 0x52,0xc9,0x30,0xa5,
- 0xd1,0x61,0x3b,0x16,
- 0x98,0xc5,0xf8,0xd1,
- 0x10,0x10,0x6d,0x4d };
-
- sal_uInt8 pNamedUUID[16], pNamedUUID2[16];
-
- // Same name does generate the same uuid
- rtl_String *pName = 0;
- rtl_string_newFromStr( &pName , "this is a bla.blubs.DNS-Name" );
- rtl_createNamedUuid( pNamedUUID , NameSpace_DNS , pName );
- rtl_createNamedUuid( pNamedUUID2 , NameSpace_DNS , pName );
- CPPUNIT_ASSERT_MESSAGE( "Same name should generate the same uuid", ! memcmp( pNamedUUID , pNamedUUID2 , 16 ) && rtl_compareUuid( pNamedUUID , pNamedUUID2 ) == 0 );
- CPPUNIT_ASSERT_MESSAGE( "Same name should generate the same uuid", ! memcmp( pNamedUUID , pPriorCalculatedUUID , 16 ) );
-
- // Different names does not generate the same uuid
- rtl_string_newFromStr( &pName , "this is a bla.blubs.DNS-Namf" );
- rtl_createNamedUuid( pNamedUUID2 , NameSpace_DNS , pName );
- CPPUNIT_ASSERT_MESSAGE("Different names does not generate the same uuid.", memcmp( pNamedUUID , pNamedUUID2 , 16 ) );
-
- // the same name with different namespace uuid produces different uuids
- rtl_createNamedUuid( pNamedUUID , NameSpace_URL , pName );
- CPPUNIT_ASSERT_MESSAGE( " same name with different namespace uuid produces different uuids", memcmp( pNamedUUID , pNamedUUID2 , 16 ) && rtl_compareUuid( pNamedUUID , pNamedUUID2 ) != 0);
-
- //test compareUuid
- if ( rtl_compareUuid( pNamedUUID , pNamedUUID2 ) > 0 )
- { CPPUNIT_ASSERT_MESSAGE( " compare uuids", rtl_compareUuid( pNamedUUID2 , pNamedUUID ) < 0);
- }
- else
- CPPUNIT_ASSERT_MESSAGE( " compare uuids", rtl_compareUuid( pNamedUUID2 , pNamedUUID ) > 0);
-
- rtl_string_release( pName );
+TEST_F(createNamedUuid, createNamedUuid_001)
+{
+ sal_uInt8 NameSpace_DNS[16] = RTL_UUID_NAMESPACE_DNS;
+ sal_uInt8 NameSpace_URL[16] = RTL_UUID_NAMESPACE_URL;
+ sal_uInt8 pPriorCalculatedUUID[16] = {
+ 0x52,0xc9,0x30,0xa5,
+ 0xd1,0x61,0x3b,0x16,
+ 0x98,0xc5,0xf8,0xd1,
+ 0x10,0x10,0x6d,0x4d };
+
+ sal_uInt8 pNamedUUID[16], pNamedUUID2[16];
+
+ // Same name does generate the same uuid
+ rtl_String *pName = 0;
+ rtl_string_newFromStr( &pName , "this is a bla.blubs.DNS-Name" );
+ rtl_createNamedUuid( pNamedUUID , NameSpace_DNS , pName );
+ rtl_createNamedUuid( pNamedUUID2 , NameSpace_DNS , pName );
+ ASSERT_TRUE(! memcmp( pNamedUUID , pNamedUUID2 , 16 ) && rtl_compareUuid( pNamedUUID , pNamedUUID2 ) == 0)
+ << "Same name should generate the same uuid";
+ ASSERT_TRUE(! memcmp( pNamedUUID , pPriorCalculatedUUID , 16 )) << "Same name should generate the same uuid";
+
+ // Different names does not generate the same uuid
+ rtl_string_newFromStr( &pName , "this is a bla.blubs.DNS-Namf" );
+ rtl_createNamedUuid( pNamedUUID2 , NameSpace_DNS , pName );
+ ASSERT_TRUE(memcmp( pNamedUUID , pNamedUUID2 , 16 )) << "Different names does not generate the same uuid.";
+
+ // the same name with different namespace uuid produces different uuids
+ rtl_createNamedUuid( pNamedUUID , NameSpace_URL , pName );
+ ASSERT_TRUE(memcmp( pNamedUUID , pNamedUUID2 , 16 ) && rtl_compareUuid( pNamedUUID , pNamedUUID2 ) != 0)
+ << " same name with different namespace uuid produces different uuids";
+
+ //test compareUuid
+ if ( rtl_compareUuid( pNamedUUID , pNamedUUID2 ) > 0 )
+ { ASSERT_TRUE(rtl_compareUuid( pNamedUUID2 , pNamedUUID ) < 0) << " compare uuids";
}
+ else
+ ASSERT_TRUE(rtl_compareUuid( pNamedUUID2 , pNamedUUID ) > 0) << " compare uuids";
- CPPUNIT_TEST_SUITE(createNamedUuid);
- CPPUNIT_TEST(createNamedUuid_001);
- CPPUNIT_TEST_SUITE_END();
-}; // class createNamedUuid
+ rtl_string_release( pName );
+}
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Uuid::createUuid, "rtl_Uuid");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Uuid::createNamedUuid, "rtl_Uuid");
} // namespace rtl_Uuid
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
-
-
+int main(int argc, char **argv)
+{
+ ::testing::InitGoogleTest(&argc, argv);
+ return RUN_ALL_TESTS();
+}
More information about the Libreoffice-commits
mailing list