From b14224fe97b8a44232c9c1401d3a49771f46582e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 2 Feb 2016 16:15:51 +0200 Subject: loplugin:unusedmethods using an idea from dtardon: noelgrandin, hi. could you try to run the unusedmethods clang plugin with "make build-nocheck"? that would catch functions that are only used in tests. e.g., i just removed the whole o3tl::range class, which has not been used in many years, but htere was a test for it... dtardon, interesting idea! Sure, I can do that. Change-Id: I5653953a426a2186a1e43017212d87ffce520387 Reviewed-on: https://gerrit.libreoffice.org/22041 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- comphelper/Library_comphelper.mk | 1 - comphelper/qa/string/test_string.cxx | 57 -------------------- comphelper/source/misc/compareversionstrings.cxx | 69 ------------------------ 3 files changed, 127 deletions(-) delete mode 100644 comphelper/source/misc/compareversionstrings.cxx (limited to 'comphelper') diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index 155d293b600e..7047d8a37e36 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -76,7 +76,6 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\ comphelper/source/misc/accimplaccess \ comphelper/source/misc/anytostring \ comphelper/source/misc/asyncnotification \ - comphelper/source/misc/compareversionstrings \ comphelper/source/misc/comphelper_module \ comphelper/source/misc/comphelper_services \ comphelper/source/misc/componentbase \ diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx index af030351607c..97814da5fe4c 100644 --- a/comphelper/qa/string/test_string.cxx +++ b/comphelper/qa/string/test_string.cxx @@ -43,8 +43,6 @@ public: void testDecimalStringToNumber(); void testIsdigitAsciiString(); void testReverseString(); - void testEqualsString(); - void testCompareVersionStrings(); CPPUNIT_TEST_SUITE(TestString); CPPUNIT_TEST(testNatural); @@ -57,8 +55,6 @@ public: CPPUNIT_TEST(testDecimalStringToNumber); CPPUNIT_TEST(testIsdigitAsciiString); CPPUNIT_TEST(testReverseString); - CPPUNIT_TEST(testEqualsString); - CPPUNIT_TEST(testCompareVersionStrings); CPPUNIT_TEST_SUITE_END(); }; @@ -398,59 +394,6 @@ void TestString::testReverseString() CPPUNIT_ASSERT(aOut == "CBA"); } -void TestString::testEqualsString() -{ - OString aIn("A"); - CPPUNIT_ASSERT(::comphelper::string::equals(aIn, 'A')); - CPPUNIT_ASSERT(!::comphelper::string::equals(aIn, 'B')); - aIn = OString("AA"); - CPPUNIT_ASSERT(!::comphelper::string::equals(aIn, 'A')); - aIn.clear(); - CPPUNIT_ASSERT(!::comphelper::string::equals(aIn, 'A')); -} - -int sign(int n) -{ - if (n == 0) - return 0; - if (n < 0) - return -1; - else - return 1; -} - -void TestString::testCompareVersionStrings() -{ -#ifdef TEST -#error TEST already defined -#endif -#define TEST(a,b,result) \ - CPPUNIT_ASSERT(sign(::comphelper::string::compareVersionStrings(a, b)) == result); \ - if ( result != 0 ) \ - CPPUNIT_ASSERT(sign(::comphelper::string::compareVersionStrings(b, a)) == -(result)) - - TEST("", "", 0); - TEST("", "0", -1); - TEST("", "a", -1); - TEST("0", "1", -1); - TEST("1", "2", -1); - TEST("2", "10", -1); - TEST("01", "1", -1); - TEST("01", "001", 1); - TEST("1.00", "1", 1); - TEST("1.2", "1", 1); - TEST("1.01", "1.1", -1); - TEST("1.001", "1.1", -1); - TEST("1.001", "1.010", -1); - TEST("1.2.a", "1.2.b", -1); - TEST("1.2.3 (foo,bar)", "1.2.9", -1); - TEST("1.2.3 (foo,bar)", "1.2.4 (foo,bar)", -1); - TEST("1.2.3 (foo,bar)", "1.2.3 (foo)", 1); // Neither ordering makes any more sense than the other here, as long as they compare unequal - TEST("1.2.3 (foo,bar)", "1.2.2 (foo,bar)", 1); - -#undef TEST -} - CPPUNIT_TEST_SUITE_REGISTRATION(TestString); } diff --git a/comphelper/source/misc/compareversionstrings.cxx b/comphelper/source/misc/compareversionstrings.cxx deleted file mode 100644 index a5ca92847634..000000000000 --- a/comphelper/source/misc/compareversionstrings.cxx +++ /dev/null @@ -1,69 +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/. - */ - -#include -#include - -#include -#include - -namespace comphelper { namespace string { - -namespace { - -// BSD licensed, from http://git.musl-libc.org/cgit/musl/plain/src/string/strverscmp.c - -int strverscmp(const char *l, const char *r) -{ - int haszero=1; - while (*l==*r) { - if (!*l) return 0; - - if (*l=='0') { - if (haszero==1) { - haszero=0; - } - } else if (isdigit(*l)) { - if (haszero==1) { - haszero=2; - } - } else { - haszero=1; - } - l++; r++; - } - if (haszero==1 && (*l=='0' || *r=='0')) { - haszero=0; - } - if ((isdigit(*l) && isdigit(*r) ) && haszero) { - size_t lenl=0, lenr=0; - while (isdigit(l[lenl]) ) lenl++; - while (isdigit(r[lenr]) ) lenr++; - if (lenl==lenr) { - return (*l - *r); - } else if (lenl>lenr) { - return 1; - } else { - return -1; - } - } else { - return (*l - *r); - } -} - -} // anonymous namespace - -int compareVersionStrings(const OUString& a, const OUString& b) -{ - return strverscmp(OUStringToOString(a, RTL_TEXTENCODING_UTF8).getStr(), OUStringToOString(b, RTL_TEXTENCODING_UTF8).getStr()); -} - -} } - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit