[Libreoffice-commits] .: sal/CppunitTest_sal_testHelperFunctions.mk sal/Module_sal.mk sal/qa
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Sep 10 13:28:04 PDT 2012
sal/CppunitTest_sal_testHelperFunctions.mk | 33 -
sal/Module_sal.mk | 1
sal/qa/testHelperFunctions/makefile.mk | 64 --
sal/qa/testHelperFunctions/testHelperFunctions.cxx | 455 --------------------
sal/qa/testHelperFunctions/testHelperFunctions2.cxx | 64 --
5 files changed, 617 deletions(-)
New commits:
commit f50ea409e49a9a3f5f0a9eb353a400040b94b5f4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Sep 10 21:26:02 2012 +0100
what gets tested here turns out to be out of date now
Change-Id: I61b96b8d0e9c821f0e6228430eece1617871a916
diff --git a/sal/CppunitTest_sal_testHelperFunctions.mk b/sal/CppunitTest_sal_testHelperFunctions.mk
deleted file mode 100644
index 9e4ba1a..0000000
--- a/sal/CppunitTest_sal_testHelperFunctions.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Radu Ioan <ioan.radu.g at gmail.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-
-$(eval $(call gb_CppunitTest_CppunitTest,sal_testHelperFunctions))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_testHelperFunctions,\
- sal/qa/testHelperFunctions/testHelperFunctions \
- sal/qa/testHelperFunctions/testHelperFunctions2 \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sal_testHelperFunctions,\
- $$(INCLUDE) \
- -I$(SRCDIR)/sal/qa/inc \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sal_testHelperFunctions,\
- sal \
- $(gb_STDLIBS) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index e693abc..ec6545d 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_Module_add_check_targets,sal,\
CppunitTest_sal_rtl_strings \
CppunitTest_sal_rtl_uuid \
CppunitTest_sal_tcwf \
- CppunitTest_sal_testHelperFunctions \
CppunitTest_sal_types \
))
diff --git a/sal/qa/testHelperFunctions/makefile.mk b/sal/qa/testHelperFunctions/makefile.mk
deleted file mode 100644
index 603f573..0000000
--- a/sal/qa/testHelperFunctions/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=sal
-TARGET=qa_testHelperFunctions
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
-# --- BEGIN --------------------------------------------------------
-SHL1OBJS= \
- $(SLO)$/testHelperFunctions.obj \
- $(SLO)$/testHelperFunctions2.obj
-
-SHL1TARGET= testHelperFunctions
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-DEF1NAME =$(SHL1TARGET)
-SHL1USE_EXPORTS = name
-
-# END --------------------------------------------------------------
-
-#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/testHelperFunctions/testHelperFunctions.cxx b/sal/qa/testHelperFunctions/testHelperFunctions.cxx
deleted file mode 100644
index 6b8d768..0000000
--- a/sal/qa/testHelperFunctions/testHelperFunctions.cxx
+++ /dev/null
@@ -1,455 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-// This is a test of helperfunctions
-
-#include <osl/time.h>
-#include <osl/thread.hxx>
-
-#include "stringhelper.hxx"
-
-#include <rtl/ustring.hxx>
-
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
-
-
-inline sal_Int64 t_abs64(sal_Int64 _nValue)
-{
- // std::abs() seems to have some ambiguity problems (so-texas)
- // return abs(_nValue);
- printf("t_abs64(%ld)\n", _nValue);
- // CPPUNIT_ASSERT(_nValue < 2147483647);
-
- if (_nValue < 0)
- {
- _nValue = -_nValue;
- }
- return _nValue;
-}
-
-void t_print64(sal_Int64 n)
-{
- if (n < 0)
- {
- // negativ
- printf("-");
- n = -n;
- }
- if (n > 2147483647)
- {
- sal_Int64 n64 = n >> 32;
- sal_uInt32 n32 = n64 & 0xffffffff;
- printf("0x%.8x ", n32);
- n32 = n & 0xffffffff;
- printf("%.8x (64bit)", n32);
- }
- else
- {
- sal_uInt32 n32 = n & 0xffffffff;
- printf("0x%.8x (32bit) ", n32);
- }
- printf("\n");
-}
-
-// -----------------------------------------------------------------------------
-namespace testOfHelperFunctions
-{
- class test_t_abs64 : public CppUnit::TestFixture
- {
- public:
- void test0();
- void test1_0();
- void test1();
- void test1_1();
- void test2();
- void test3();
- void test4();
-
- CPPUNIT_TEST_SUITE( test_t_abs64 );
- CPPUNIT_TEST( test0 );
- CPPUNIT_TEST( test1_0 );
- CPPUNIT_TEST( test1 );
- CPPUNIT_TEST( test1_1 );
- CPPUNIT_TEST( test2 );
- CPPUNIT_TEST( test3 );
- CPPUNIT_TEST( test4 );
- CPPUNIT_TEST_SUITE_END( );
- };
-
- void test_t_abs64::test0()
- {
- // this values has an overrun!
- sal_Int32 n32 = 2147483648;
- printf("n32 should be -2^31 is: %d\n", n32);
- CPPUNIT_ASSERT_MESSAGE("n32!=2147483648", n32 == -2147483648 );
- }
-
-
- void test_t_abs64::test1_0()
- {
- sal_Int64 n;
- n = 1073741824;
- n <<= 9;
- printf("Value of n is ");
- t_print64(n);
- CPPUNIT_ASSERT_MESSAGE("n=2^30 << 9", t_abs64(n) > 0 );
- }
-
- void test_t_abs64::test1()
- {
- sal_Int64 n;
- n = 2147483648 << 8;
- printf("Value of n is ");
- t_print64(n);
- CPPUNIT_ASSERT_MESSAGE("n=2^31 << 8", t_abs64(n) > 0 );
- }
- void test_t_abs64::test1_1()
- {
- sal_Int64 n;
- n = sal_Int64(2147483648) << 8;
- printf("Value of n is ");
- t_print64(n);
- CPPUNIT_ASSERT_MESSAGE("n=2^31 << 8", t_abs64(n) > 0 );
- }
-
- void test_t_abs64::test2()
- {
- sal_Int64 n;
- n = 2147483648 << 1;
- printf("Value of n is ");
- t_print64(n);
-
- CPPUNIT_ASSERT_MESSAGE("(2147483648 << 1) is != 0", n != 0 );
-
- sal_Int64 n2 = 2147483648 * 2;
- CPPUNIT_ASSERT_MESSAGE("2147483648 * 2 is != 0", n2 != 0 );
-
- sal_Int64 n3 = 4294967296LL;
- CPPUNIT_ASSERT_MESSAGE("4294967296 is != 0", n3 != 0 );
-
- CPPUNIT_ASSERT_MESSAGE("n=2^31 << 1, n2 = 2^31 * 2, n3 = 2^32, all should equal!", n == n2 && n == n3 );
- }
-
-
- void test_t_abs64::test3()
- {
- sal_Int64 n = 0;
- CPPUNIT_ASSERT_MESSAGE("n=0", t_abs64(n) == 0 );
-
- n = 1;
- CPPUNIT_ASSERT_MESSAGE("n=1", t_abs64(n) > 0 );
-
- n = 2147483647;
- CPPUNIT_ASSERT_MESSAGE("n=2^31 - 1", t_abs64(n) > 0 );
-
- n = 2147483648;
- CPPUNIT_ASSERT_MESSAGE("n=2^31", t_abs64(n) > 0 );
- }
-
- void test_t_abs64::test4()
- {
- sal_Int64 n = 0;
- n = -1;
- printf("Value of n is -1 : ");
- t_print64(n);
- CPPUNIT_ASSERT_MESSAGE("n=-1", t_abs64(n) > 0 );
-
- n = -2147483648;
- printf("Value of n is -2^31 : ");
- t_print64(n);
- CPPUNIT_ASSERT_MESSAGE("n=-2^31", t_abs64(n) > 0 );
-
- n = -8589934592LL;
- printf("Value of n is -2^33 : ");
- t_print64(n);
- CPPUNIT_ASSERT_MESSAGE("n=-2^33", t_abs64(n) > 0 );
- }
-
-
-// -----------------------------------------------------------------------------
- class test_t_print : public CppUnit::TestFixture
- {
- public:
- void t_print_001();
-
- CPPUNIT_TEST_SUITE( test_t_print );
- CPPUNIT_TEST( t_print_001 );
- CPPUNIT_TEST_SUITE_END( );
- };
-
- void test_t_print::t_print_001( )
- {
- printf("This is only a test of some helper functions\n");
- sal_Int32 nValue = 12345;
- printf("a value %d (should be 12345)\n", nValue);
-
- rtl::OString sValue("foo bar");
- printf("a String '%s' (should be 'foo bar')\n", sValue.getStr());
-
- rtl::OUString suValue("a unicode string");
- sValue <<= suValue;
- printf("a String '%s'\n", sValue.getStr());
- }
-
-
- class StopWatch
- {
- TimeValue m_aStartTime;
- TimeValue m_aEndTime;
- bool m_bStarted;
- public:
- StopWatch()
- :m_bStarted(false)
- {
- }
-
- void start()
- {
- m_bStarted = true;
- osl_getSystemTime(&m_aStartTime);
- }
- void stop()
- {
- osl_getSystemTime(&m_aEndTime);
- OSL_ENSURE(m_bStarted, "Not Started.");
- m_bStarted = false;
- }
- rtl::OString makeTwoDigits(rtl::OString const& _sStr)
- {
- rtl::OString sBack;
- if (_sStr.getLength() == 0)
- {
- sBack = "00";
- }
- else
- {
- if (_sStr.getLength() == 1)
- {
- sBack = "0" + _sStr;
- }
- else
- {
- sBack = _sStr;
- }
- }
- return sBack;
- }
- rtl::OString makeThreeDigits(rtl::OString const& _sStr)
- {
- rtl::OString sBack;
- if (_sStr.getLength() == 0)
- {
- sBack = "000";
- }
- else
- {
- if (_sStr.getLength() == 1)
- {
- sBack = "00" + _sStr;
- }
- else
- {
- if (_sStr.getLength() == 2)
- {
- sBack = "0" + _sStr;
- }
- else
- {
- sBack = _sStr;
- }
- }
- }
- return sBack;
- }
-
- void showTime(const rtl::OString & aWhatStr)
- {
- OSL_ENSURE(!m_bStarted, "Not Stopped.");
-
- sal_Int32 nSeconds = m_aEndTime.Seconds - m_aStartTime.Seconds;
- sal_Int32 nNanoSec = sal_Int32(m_aEndTime.Nanosec) - sal_Int32(m_aStartTime.Nanosec);
- // printf("Seconds: %d Nanosec: %d ", nSeconds, nNanoSec);
- if (nNanoSec < 0)
- {
- nNanoSec = 1000000000 + nNanoSec;
- nSeconds--;
- // printf(" NEW Seconds: %d Nanosec: %d\n", nSeconds, nNanoSec);
- }
-
- rtl::OString aStr = "Time for ";
- aStr += aWhatStr;
- aStr += " ";
- aStr += makeTwoDigits(rtl::OString::valueOf(nSeconds / 3600));
- aStr += ":";
- aStr += makeTwoDigits(rtl::OString::valueOf((nSeconds % 3600) / 60));
- aStr += ":";
- aStr += makeTwoDigits(rtl::OString::valueOf((nSeconds % 60)));
- aStr += ":";
- aStr += makeThreeDigits(rtl::OString::valueOf((nNanoSec % 1000000000) / 1000000));
- aStr += ":";
- aStr += makeThreeDigits(rtl::OString::valueOf((nNanoSec % 1000000) / 1000));
- aStr += ":";
- aStr += makeThreeDigits(rtl::OString::valueOf((nNanoSec % 1000)));
-
- printf("%s\n", aStr.getStr());
- // cout << aStr.getStr() << endl;
- }
-
- };
-
-static sal_Bool isEqualTimeValue ( const TimeValue* time1, const TimeValue* time2)
-{
- if( time1->Seconds == time2->Seconds &&
- time1->Nanosec == time2->Nanosec)
- return sal_True;
- else
- return sal_False;
-}
-
-static sal_Bool isGreaterTimeValue( const TimeValue* time1, const TimeValue* time2)
-{
- sal_Bool retval= sal_False;
- if ( time1->Seconds > time2->Seconds)
- retval= sal_True;
- else if ( time1->Seconds == time2->Seconds)
- {
- if( time1->Nanosec > time2->Nanosec)
- retval= sal_True;
- }
- return retval;
-}
-
-static sal_Bool isGreaterEqualTimeValue( const TimeValue* time1, const TimeValue* time2)
-{
- if( isEqualTimeValue( time1, time2) )
- return sal_True;
- else if( isGreaterTimeValue( time1, time2))
- return sal_True;
- else
- return sal_False;
-}
-
-bool isBTimeGreaterATime(TimeValue const& A, TimeValue const& B)
-{
- if (B.Seconds > A.Seconds) return true;
- if (B.Nanosec > A.Nanosec) return true;
-
- // lower or equal
- return false;
-}
- // -----------------------------------------------------------------------------
-
-
- class test_TimeValues : public CppUnit::TestFixture
- {
- public:
-
- void t_time1();
- void t_time2();
- void t_time3();
-
- CPPUNIT_TEST_SUITE( test_TimeValues );
- CPPUNIT_TEST( t_time1 );
- CPPUNIT_TEST( t_time2 );
- CPPUNIT_TEST( t_time3 );
- CPPUNIT_TEST_SUITE_END( );
- };
-
-void test_TimeValues::t_time1()
-{
- StopWatch aWatch;
- aWatch.start();
- TimeValue aTimeValue={3,0};
- osl::Thread::wait(aTimeValue);
- aWatch.stop();
- aWatch.showTime("Wait for 3 seconds");
-}
-
-void test_TimeValues::t_time2()
-{
- printf("Wait repeats 20 times.\n");
- int i=0;
- while(i++<20)
- {
- StopWatch aWatch;
- aWatch.start();
- TimeValue aTimeValue={0,1000 * 1000 * 500};
- osl::Thread::wait(aTimeValue);
- aWatch.stop();
- aWatch.showTime("wait for 500msec");
- }
-}
-
-void test_TimeValues::t_time3()
-{
- printf("Wait repeats 100 times.\n");
- int i=0;
- while(i++<20)
- {
- StopWatch aWatch;
- aWatch.start();
- TimeValue aTimeValue={0,1000*1000*100};
- osl::Thread::wait(aTimeValue);
- aWatch.stop();
- aWatch.showTime("wait for 100msec");
- }
-}
-
- // void demoTimeValue()
- // {
- // TimeValue aStartTime, aEndTime;
- // osl_getSystemTime(&aStartTime);
- // // testSession(xORB, false);
- // osl_getSystemTime(&aEndTime);
- //
- // sal_Int32 nSeconds = aEndTime.Seconds - aStartTime.Seconds;
- // sal_Int32 nNanoSec = aEndTime.Nanosec - aStartTime.Nanosec;
- // if (nNanoSec < 0)
- // {
- // nNanoSec = 1000000000 - nNanoSec;
- // nSeconds++;
- // }
- //
- // // cout << "Time: " << nSeconds << ". " << nNanoSec << endl;
- // }
-
-
-} // namespace testOfHelperFunctions
-
-// -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_REGISTRATION( testOfHelperFunctions::test_t_print );
-CPPUNIT_TEST_SUITE_REGISTRATION( testOfHelperFunctions::test_t_abs64 );
-CPPUNIT_TEST_SUITE_REGISTRATION( testOfHelperFunctions::test_TimeValues );
-
-// -----------------------------------------------------------------------------
-CPPUNIT_PLUGIN_IMPLEMENT();
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/testHelperFunctions/testHelperFunctions2.cxx b/sal/qa/testHelperFunctions/testHelperFunctions2.cxx
deleted file mode 100644
index 966b495..0000000
--- a/sal/qa/testHelperFunctions/testHelperFunctions2.cxx
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
-#include "stringhelper.hxx"
-
-namespace testOfHelperFunctions
-{
- class test_valueequal : public CppUnit::TestFixture
- {
- public:
- void valueequal_001();
-
- CPPUNIT_TEST_SUITE( test_valueequal );
- CPPUNIT_TEST( valueequal_001 );
- CPPUNIT_TEST_SUITE_END( );
- };
-
- void test_valueequal::valueequal_001( )
- {
- rtl::OString sValue;
- rtl::OUString suValue("This is only a test of some helper functions");
- sValue <<= suValue;
- printf("'%s'\n", sValue.getStr());
- }
-
-} // namespace testOfHelperFunctions
-
-// -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_REGISTRATION( testOfHelperFunctions::test_valueequal );
-
-// -----------------------------------------------------------------------------
-// This is only allowed to be in one file!
-// NOADDITIONAL;
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list