From 6805d77c70c98d6fadccb3d4d8c0823924aca18b Mon Sep 17 00:00:00 2001 From: Juan Picca Date: Thu, 23 Oct 2014 21:37:43 -0200 Subject: Fract: enable tests Change-Id: I00650503f15f2dcd45b07e3c529965336e8391e6 Reviewed-on: https://gerrit.libreoffice.org/12080 Reviewed-by: David Tardon Tested-by: David Tardon --- tools/CppunitTest_tools_test.mk | 1 + tools/qa/cppunit/test_fract.cxx | 102 ++++++++++++++++++++++++++++++++++++ tools/test/tests.cxx | 111 ---------------------------------------- 3 files changed, 103 insertions(+), 111 deletions(-) create mode 100644 tools/qa/cppunit/test_fract.cxx delete mode 100644 tools/test/tests.cxx (limited to 'tools') diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk index bd514b516517..58baeb5b0496 100644 --- a/tools/CppunitTest_tools_test.mk +++ b/tools/CppunitTest_tools_test.mk @@ -15,6 +15,7 @@ $(eval $(call gb_CppunitTest_use_external,tools_test,boost_headers)) $(eval $(call gb_CppunitTest_add_exception_objects,tools_test, \ tools/qa/cppunit/test_bigint \ + tools/qa/cppunit/test_fract \ tools/qa/cppunit/test_inetmime \ tools/qa/cppunit/test_pathutils \ tools/qa/cppunit/test_reversemap \ diff --git a/tools/qa/cppunit/test_fract.cxx b/tools/qa/cppunit/test_fract.cxx new file mode 100644 index 000000000000..bcc6ad2e7aa5 --- /dev/null +++ b/tools/qa/cppunit/test_fract.cxx @@ -0,0 +1,102 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + * + * This file incorporates work covered by the following license notice: + * + * 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 . + */ + +#include +#include +#include +#include + +#include +#include + +namespace tools +{ + +class FractionTest : public CppUnit::TestFixture +{ +public: + + void testFraction() + { + const Fraction aFract(1082130431,1073741824); + CPPUNIT_ASSERT_MESSAGE( "Fraction #1 not approximately equal to 1.007812499068677", + rtl::math::approxEqual((double)aFract,1.007812499068677) ); + + Fraction aFract2( aFract ); + aFract2.ReduceInaccurate(8); + CPPUNIT_ASSERT_MESSAGE( "Fraction #2 not 1", + aFract2.GetNumerator() == 1 && + aFract2.GetDenominator() == 1 ); + + Fraction aFract3( 0x7AAAAAAA, 0x35555555 ); + CPPUNIT_ASSERT_MESSAGE( "Fraction #3 cancellation wrong", + aFract3.GetNumerator() == 0x7AAAAAAA && + aFract3.GetDenominator() == 0x35555555 ); + aFract3.ReduceInaccurate(30); + CPPUNIT_ASSERT_MESSAGE( "Fraction #3 ReduceInaccurate errorneously cut precision", + aFract3.GetNumerator() == 0x7AAAAAAA && + aFract3.GetDenominator() == 0x35555555 ); + + aFract3.ReduceInaccurate(29); + CPPUNIT_ASSERT_MESSAGE( "Fraction #3 reduce to 29 bits failed", + aFract3.GetNumerator() == 0x3D555555 && + aFract3.GetDenominator() == 0x1AAAAAAA ); + + aFract3.ReduceInaccurate(9); + CPPUNIT_ASSERT_MESSAGE( "Fraction #3 reduce to 9 bits failed", + aFract3.GetNumerator() == 0x0147 && + aFract3.GetDenominator() == 0x008E ); + + aFract3.ReduceInaccurate(1); + CPPUNIT_ASSERT_MESSAGE( "Fraction #3 reduce to 1 bit failed", + aFract3.GetNumerator() == 2 && + aFract3.GetDenominator() == 1 ); + + aFract3.ReduceInaccurate(0); + CPPUNIT_ASSERT_MESSAGE( "Fraction #3 reduce to 0 bits failed", + aFract3.GetNumerator() == 2 && + aFract3.GetDenominator() == 1 ); + +#if SAL_TYPES_SIZEOFLONG == 8 + Fraction aFract4(0x7AAAAAAAAAAAAAAA, 0x3555555555555555); + CPPUNIT_ASSERT_MESSAGE( "Fraction #4 cancellation wrong", + aFract4.GetNumerator() == 0x7AAAAAAAAAAAAAAA && + aFract4.GetDenominator() == 0x3555555555555555 ); + aFract4.ReduceInaccurate(62); + CPPUNIT_ASSERT_MESSAGE( "Fraction #4 ReduceInaccurate errorneously cut precision", + aFract4.GetNumerator() == 0x7AAAAAAAAAAAAAAA && + aFract4.GetDenominator() == 0x3555555555555555 ); + + aFract4.ReduceInaccurate(61); + CPPUNIT_ASSERT_MESSAGE( "Fraction #4 ReduceInaccurate reduce to 61 bit failed", + aFract4.GetNumerator() == 0x3D55555555555555 && + aFract4.GetDenominator() == 0x1AAAAAAAAAAAAAAA ); +#endif + } + + CPPUNIT_TEST_SUITE(FractionTest); + CPPUNIT_TEST(testFraction); + CPPUNIT_TEST_SUITE_END(); +}; + + +CPPUNIT_TEST_SUITE_REGISTRATION(FractionTest); +} // namespace tools + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/test/tests.cxx b/tools/test/tests.cxx deleted file mode 100644 index 5e848c492cca..000000000000 --- a/tools/test/tests.cxx +++ /dev/null @@ -1,111 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * 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 . - */ - -#include -#include -#include -#include - -#include -#include - -namespace tools -{ - -class FractionTest : public CppUnit::TestFixture -{ -public: - void setUp() - { - } - - void tearDown() - { - } - - void testFraction() - { - const Fraction aFract(1082130431,1073741824); - CPPUNIT_ASSERT_MESSAGE( "Fraction #1 not approximately equal to 1.007812499068677", - rtl::math::approxEqual((double)aFract,1.007812499068677) ); - - Fraction aFract2( aFract ); - aFract2.ReduceInaccurate(8); - CPPUNIT_ASSERT_MESSAGE( "Fraction #2 not 1", - aFract2.GetNumerator() == 1 && - aFract2.GetDenominator() == 1 ); - - Fraction aFract3( 0x7AAAAAAA, 0x35555555 ); - CPPUNIT_ASSERT_MESSAGE( "Fraction #3 cancellation wrong", - aFract3.GetNumerator() == 0x7AAAAAAA && - aFract3.GetDenominator() == 0x35555555 ); - aFract3.ReduceInaccurate(30); - CPPUNIT_ASSERT_MESSAGE( "Fraction #3 ReduceInaccurate errorneously cut precision", - aFract3.GetNumerator() == 0x7AAAAAAA && - aFract3.GetDenominator() == 0x35555555 ); - - aFract3.ReduceInaccurate(29); - CPPUNIT_ASSERT_MESSAGE( "Fraction #3 reduce to 29 bits failed", - aFract3.GetNumerator() == 0x3D555555 && - aFract3.GetDenominator() == 0x1AAAAAAA ); - - aFract3.ReduceInaccurate(9); - CPPUNIT_ASSERT_MESSAGE( "Fraction #3 reduce to 9 bits failed", - aFract3.GetNumerator() == 0x0147 && - aFract3.GetDenominator() == 0x008E ); - - aFract3.ReduceInaccurate(1); - CPPUNIT_ASSERT_MESSAGE( "Fraction #3 reduce to 1 bit failed", - aFract3.GetNumerator() == 2 && - aFract3.GetDenominator() == 1 ); - - aFract3.ReduceInaccurate(0); - CPPUNIT_ASSERT_MESSAGE( "Fraction #3 reduce to 0 bits failed", - aFract3.GetNumerator() == 2 && - aFract3.GetDenominator() == 1 ); - -#if SAL_TYPES_SIZEOFLONG == 8 - Fraction aFract4(0x7AAAAAAAAAAAAAAA, 0x3555555555555555); - CPPUNIT_ASSERT_MESSAGE( "Fraction #4 cancellation wrong", - aFract4.GetNumerator() == 0x7AAAAAAAAAAAAAAA && - aFract4.GetDenominator() == 0x3555555555555555 ); - aFract4.ReduceInaccurate(62); - CPPUNIT_ASSERT_MESSAGE( "Fraction #4 ReduceInaccurate errorneously cut precision", - aFract4.GetNumerator() == 0x7AAAAAAAAAAAAAAA && - aFract4.GetDenominator() == 0x3555555555555555 ); - - aFract4.ReduceInaccurate(61); - CPPUNIT_ASSERT_MESSAGE( "Fraction #4 ReduceInaccurate reduce to 61 bit failed", - aFract4.GetNumerator() == 0x3D55555555555555 && - aFract4.GetDenominator() == 0x1AAAAAAAAAAAAAAA ); -#endif - } - - CPPUNIT_TEST_SUITE(FractionTest); - CPPUNIT_TEST(testFraction); - CPPUNIT_TEST_SUITE_END(); -}; - - -CPPUNIT_TEST_SUITE_REGISTRATION(FractionTest); -} // namespace tools - -CPPUNIT_PLUGIN_IMPLEMENT(); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit