6b00d0576a
...by re-enabling the code temporarily #if'ed-out in
a528392e71
"Fixed/improved
loplugin:cppunitassertequals" (and which then triggers lots of other
lopglugin:cppunitassertequal CPPUNIT_ASSERT -> CPPUNIT_ASSERT_EQUAL warnings).
For two css::uno::Reference equality comparisons in cppu/qa/test_any.cxx, it
was more straightforward to rewrite them with an explicit call to operator ==
(which silences loplugin:cppunitassertequal) than to adapt them to
CPPUNIT_ASSERT_EQUAL's requirement for arguments of identical types.
In sc/qa/unit/ucalc_pivottable.cxx, ScDPItemData needs toString, which has been
implemented trivially for now, but might want to combine that with the
DEBUG_PIVOT_TABLE-only ScDPItemData::Dump.
Change-Id: Iae6d09cf69bd4e52fe4411bba9e50c48e696291c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110546
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
107 lines
3.8 KiB
C++
107 lines
3.8 KiB
C++
/* -*- 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 <com/sun/star/i18n/XCharacterClassification.hpp>
|
|
#include <o3tl/cppunittraitshelper.hxx>
|
|
#include <unotest/bootstrapfixturebase.hxx>
|
|
|
|
using namespace ::com::sun::star;
|
|
|
|
class TestCharacterClassification : public test::BootstrapFixtureBase
|
|
{
|
|
public:
|
|
virtual void setUp() override;
|
|
virtual void tearDown() override;
|
|
|
|
void testTitleCase();
|
|
void testStringType();
|
|
|
|
CPPUNIT_TEST_SUITE(TestCharacterClassification);
|
|
CPPUNIT_TEST(testTitleCase);
|
|
CPPUNIT_TEST(testStringType);
|
|
CPPUNIT_TEST_SUITE_END();
|
|
private:
|
|
uno::Reference<i18n::XCharacterClassification> m_xCC;
|
|
};
|
|
|
|
//A test to ensure that our Title Case functionality is working
|
|
//http://lists.freedesktop.org/archives/libreoffice/2012-June/032767.html
|
|
//https://bz.apache.org/ooo/show_bug.cgi?id=30863
|
|
void TestCharacterClassification::testTitleCase()
|
|
{
|
|
lang::Locale aLocale;
|
|
aLocale.Language = "en";
|
|
aLocale.Country = "US";
|
|
|
|
{
|
|
//basic example
|
|
OUString sTest("Some text");
|
|
OUString sTitleCase = m_xCC->toTitle(sTest, 0, sTest.getLength(), aLocale);
|
|
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", OUString("Some Text"), sTitleCase);
|
|
OUString sUpperCase = m_xCC->toUpper(sTest, 0, sTest.getLength(), aLocale);
|
|
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", OUString("SOME TEXT"), sUpperCase);
|
|
OUString sLowerCase = m_xCC->toLower(sTest, 0, sTest.getLength(), aLocale);
|
|
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower ", OUString("some text"), sLowerCase);
|
|
}
|
|
|
|
{
|
|
//tricky one
|
|
static constexpr OUStringLiteral aTest = u"\u01F3"; // LATIN SMALL LETTER DZ
|
|
OUString sTitleCase = m_xCC->toTitle(aTest, 0, aTest.getLength(), aLocale);
|
|
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", sal_Int32(1), sTitleCase.getLength());
|
|
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", u'\u01F2', sTitleCase[0]);
|
|
OUString sUpperCase = m_xCC->toUpper(aTest, 0, aTest.getLength(), aLocale);
|
|
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", sal_Int32(1), sUpperCase.getLength());
|
|
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", u'\u01F1', sUpperCase[0]);
|
|
OUString sLowerCase = m_xCC->toLower(aTest, 0, aTest.getLength(), aLocale);
|
|
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower ", sal_Int32(1), sLowerCase.getLength());
|
|
CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower ", u'\u01F3', sLowerCase[0]);
|
|
}
|
|
}
|
|
|
|
//https://bugs.libreoffice.org/show_bug.cgi?id=69641
|
|
void TestCharacterClassification::testStringType()
|
|
{
|
|
lang::Locale aLocale;
|
|
aLocale.Language = "en";
|
|
aLocale.Country = "US";
|
|
|
|
{
|
|
//simple case
|
|
OUString sTest("Some text");
|
|
sal_Int32 nResult = m_xCC->getStringType(sTest, 0, sTest.getLength(), aLocale);
|
|
CPPUNIT_ASSERT_EQUAL(sal_Int32(230), nResult);
|
|
}
|
|
|
|
{
|
|
//tricky case
|
|
static constexpr OUStringLiteral sTest = u"\U0001D703"; // MATHEMATICAL ITALIC SMALL THETA
|
|
sal_Int32 nResult = m_xCC->getStringType(sTest, 0, sTest.getLength(), aLocale);
|
|
CPPUNIT_ASSERT_EQUAL(sal_Int32(228), nResult);
|
|
}
|
|
|
|
}
|
|
|
|
void TestCharacterClassification::setUp()
|
|
{
|
|
BootstrapFixtureBase::setUp();
|
|
m_xCC.set(m_xSFactory->createInstance("com.sun.star.i18n.CharacterClassification"), uno::UNO_QUERY_THROW);
|
|
}
|
|
|
|
void TestCharacterClassification::tearDown()
|
|
{
|
|
BootstrapFixtureBase::tearDown();
|
|
m_xCC.clear();
|
|
}
|
|
|
|
CPPUNIT_TEST_SUITE_REGISTRATION(TestCharacterClassification);
|
|
|
|
CPPUNIT_PLUGIN_IMPLEMENT();
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|