strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/o3tl/qa/test-sorted_vector.cxx
Stephan Bergmann f853ec317f Extend loplugin:external to warn about classes 
...following up on 314f15bff0 "Extend
loplugin:external to warn about enums".

Cases where free functions were moved into an unnamed namespace along with a
class, to not break ADL, are in:

  filter/source/svg/svgexport.cxx
  sc/source/filter/excel/xelink.cxx
  sc/source/filter/excel/xilink.cxx
  svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx

All other free functions mentioning moved classes appear to be harmless and not
give rise to (silent, even) ADL breakage.  (One remaining TODO in
compilerplugins/clang/external.cxx is that derived classes are not covered by
computeAffectedTypes, even though they could also be affected by ADL-breakage---
but don't seem to be in any acutal case across the code base.)

For friend declarations using elaborate type specifiers, like

  class C1 {};
  class C2 { friend class C1; };

* If C2 (but not C1) is moved into an unnamed namespace, the friend declaration
must be changed to not use an elaborate type specifier (i.e., "friend C1;"; see
C++17 [namespace.memdef]/3: "If the name in a friend declaration is neither
qualified nor a template-id and the declaration is a function or an
elaborated-type-specifier, the lookup to determine whether the entity has been
previously declared shall not consider any scopes outside the innermost
enclosing namespace.")

* If C1 (but not C2) is moved into an unnamed namespace, the friend declaration
must be changed too, see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71882>
"elaborated-type-specifier friend not looked up in unnamed namespace".

Apart from that, to keep changes simple and mostly mechanical (which should help
avoid regressions), out-of-line definitions of class members have been left in
the enclosing (named) namespace.  But explicit specializations of class
templates had to be moved into the unnamed namespace to appease
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92598> "explicit specialization of
template from unnamed namespace using unqualified-id in enclosing namespace".

Also, accompanying declarations (of e.g. typedefs or static variables) that
could arguably be moved into the unnamed namespace too have been left alone.

And in some cases, mention of affected types in blacklists in other loplugins
needed to be adapted.

And sc/qa/unit/mark_test.cxx uses a hack of including other .cxx, one of which
is sc/source/core/data/segmenttree.cxx where e.g. ScFlatUInt16SegmentsImpl is
not moved into an unnamed namespace (because it is declared in
sc/inc/segmenttree.hxx), but its base ScFlatSegmentsImpl is.  GCC warns about
such combinations with enabled-by-default -Wsubobject-linkage, but "The compiler
doesn’t give this warning for types defined in the main .C file, as those are
unlikely to have multiple definitions."
(<https://gcc.gnu.org/onlinedocs/gcc-9.2.0/gcc/Warning-Options.html>)  The
warned-about classes also don't have multiple definitions in the given test, so
disable the warning when including the .cxx.

Change-Id: Ib694094c0d8168be68f8fe90dfd0acbb66a3f1e4
Reviewed-on: https://gerrit.libreoffice.org/83239
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-11-22 12:57:32 +01:00

321 lines
12 KiB
C++
Raw Blame History

/* -*- 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 <memory>
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <o3tl/sorted_vector.hxx>
#include <rtl/ustring.hxx>
using namespace ::o3tl;
namespace {
// helper class
class SwContent
{
public:
int x;
explicit SwContent(int x_) : x(x_) {}
bool operator<( const SwContent &rCmp) const
{
return x < rCmp.x;
}
};
}
class sorted_vector_test : public CppUnit::TestFixture
{
public:
void testBasics()
{
o3tl::sorted_vector<SwContent*, o3tl::less_ptr_to<SwContent> > aVec;
// create 4 test elements
std::unique_ptr<SwContent> p1( new SwContent(1) );
std::unique_ptr<SwContent> p2( new SwContent(2) );
SwContent *p3 = new SwContent(3);
std::unique_ptr<SwContent> p4( new SwContent(4) );
// insert p3, p1 -> not present -> second is true
CPPUNIT_ASSERT( aVec.insert(p3).second );
CPPUNIT_ASSERT( aVec.insert(p1.get()).second );
// insert p3 again -> already present -> second is false
CPPUNIT_ASSERT( !aVec.insert(p3).second );
// 2 element should be present
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(2), aVec.size() );
// check the order -> should be p1, p3
// by index access
CPPUNIT_ASSERT_EQUAL( p1.get(), aVec[0] );
CPPUNIT_ASSERT_EQUAL( p3, aVec[1] );
// by begin, end
CPPUNIT_ASSERT_EQUAL( p1.get(), *aVec.begin() );
CPPUNIT_ASSERT_EQUAL( p3, *(aVec.end()-1) );
// by front, back
CPPUNIT_ASSERT_EQUAL( p1.get(), aVec.front() );
CPPUNIT_ASSERT_EQUAL( p3, aVec.back() );
// find elements
CPPUNIT_ASSERT( aVec.find(p1.get()) != aVec.end() );
CPPUNIT_ASSERT_EQUAL( static_cast<std::ptrdiff_t>(0), aVec.find(p1.get()) - aVec.begin() );
CPPUNIT_ASSERT( aVec.find(p3) != aVec.end() );
CPPUNIT_ASSERT_EQUAL( static_cast<std::ptrdiff_t>(1), aVec.find(p3) - aVec.begin() );
CPPUNIT_ASSERT( bool(aVec.find(p2.get()) == aVec.end()) );
CPPUNIT_ASSERT( bool(aVec.find(p4.get()) == aVec.end()) );
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(1), aVec.erase(p1.get()) );
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(1), aVec.size() );
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(0), aVec.erase(p2.get()) );
aVec.DeleteAndDestroyAll();
}
void testErase()
{
o3tl::sorted_vector<SwContent*, o3tl::less_ptr_to<SwContent> > aVec;
SwContent *p1 = new SwContent(1);
SwContent *p2 = new SwContent(2);
SwContent *p3 = new SwContent(3);
std::unique_ptr<SwContent> p4( new SwContent(4) );
aVec.insert(p1);
aVec.insert(p2);
aVec.insert(p3);
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(1), aVec.erase(p1) );
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(2), aVec.size() );
aVec.erase(1);
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(1), aVec.size() );
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(0), aVec.erase(p4.get()) );
aVec.clear();
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(0), aVec.size() );
aVec.insert(p1);
aVec.insert(p2);
aVec.insert(p3);
aVec.DeleteAndDestroyAll();
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(0), aVec.size() );
}
void testInsertRange()
{
o3tl::sorted_vector<SwContent*, o3tl::less_ptr_to<SwContent> > aVec1;
std::unique_ptr<SwContent> p1( new SwContent(1) );
std::unique_ptr<SwContent> p2( new SwContent(2) );
std::unique_ptr<SwContent> p3( new SwContent(3) );
aVec1.insert(p1.get());
aVec1.insert(p2.get());
aVec1.insert(p3.get());
o3tl::sorted_vector<SwContent*, o3tl::less_ptr_to<SwContent> > aVec2;
aVec2.insert( aVec1 );
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(3), aVec2.size() );
}
void testLowerBound()
{
o3tl::sorted_vector<SwContent*, o3tl::less_ptr_to<SwContent> > aVec;
std::unique_ptr<SwContent> p1( new SwContent(1) );
std::unique_ptr<SwContent> p2( new SwContent(2) );
std::unique_ptr<SwContent> p3( new SwContent(3) );
std::unique_ptr<SwContent> p4( new SwContent(4) );
aVec.insert(p1.get());
aVec.insert(p2.get());
aVec.insert(p3.get());
CPPUNIT_ASSERT( bool(aVec.lower_bound(p1.get()) == aVec.begin()) );
CPPUNIT_ASSERT( bool(aVec.lower_bound(p4.get()) == aVec.end()) );
}
void testBasics_FindPtr()
{
o3tl::sorted_vector<SwContent*, o3tl::less_ptr_to<SwContent>,
o3tl::find_partialorder_ptrequals> aVec;
std::unique_ptr<SwContent> p1( new SwContent(1) );
std::unique_ptr<SwContent> p2( new SwContent(2) );
SwContent *p2_2 = new SwContent(2);
std::unique_ptr<SwContent> p2_3( new SwContent(2) );
SwContent *p2_4 = new SwContent(2);
SwContent *p3 = new SwContent(3);
std::unique_ptr<SwContent> p4( new SwContent(4) );
CPPUNIT_ASSERT( aVec.insert(p3).second );
CPPUNIT_ASSERT( aVec.insert(p1.get()).second );
CPPUNIT_ASSERT( !aVec.insert(p3).second );
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(2), aVec.size() );
CPPUNIT_ASSERT_EQUAL( p1.get(), aVec[0] );
CPPUNIT_ASSERT_EQUAL( p3, aVec[1] );
CPPUNIT_ASSERT( aVec.insert(p2_2).second );
CPPUNIT_ASSERT( aVec.insert(p2_3.get()).second );
CPPUNIT_ASSERT( !aVec.insert(p2_2).second );
CPPUNIT_ASSERT( aVec.insert(p2_4).second );
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(5), aVec.size() );
CPPUNIT_ASSERT_EQUAL( p1.get(), *aVec.begin() );
CPPUNIT_ASSERT_EQUAL( p3, *(aVec.end()-1) );
CPPUNIT_ASSERT_EQUAL( p1.get(), aVec.front() );
CPPUNIT_ASSERT_EQUAL( p3, aVec.back() );
CPPUNIT_ASSERT( aVec.find(p1.get()) != aVec.end() );
CPPUNIT_ASSERT_EQUAL( static_cast<std::ptrdiff_t>(0), aVec.find(p1.get()) - aVec.begin() );
CPPUNIT_ASSERT( aVec.find(p3) != aVec.end() );
CPPUNIT_ASSERT_EQUAL( static_cast<std::ptrdiff_t>(4), aVec.find(p3) - aVec.begin() );
CPPUNIT_ASSERT( bool(aVec.find(p2.get()) == aVec.end()) );
CPPUNIT_ASSERT( bool(aVec.find(p4.get()) == aVec.end()) );
CPPUNIT_ASSERT( aVec.find(p2_2) != aVec.end() );
CPPUNIT_ASSERT( aVec.find(p2_2) - aVec.begin() >= 1 );
CPPUNIT_ASSERT( aVec.find(p2_2) - aVec.begin() < 4 );
CPPUNIT_ASSERT( aVec.find(p2_3.get()) != aVec.end() );
CPPUNIT_ASSERT( aVec.find(p2_3.get()) - aVec.begin() >= 1 );
CPPUNIT_ASSERT( aVec.find(p2_3.get()) - aVec.begin() < 4 );
CPPUNIT_ASSERT( aVec.find(p2_4) != aVec.end() );
CPPUNIT_ASSERT( aVec.find(p2_4) - aVec.begin() >= 1 );
CPPUNIT_ASSERT( aVec.find(p2_4) - aVec.begin() < 4 );
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(1), aVec.erase(p1.get()) );
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(4), aVec.size() );
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(0), aVec.erase(p2.get()) );
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(1), aVec.erase(p2_3.get()) );
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(3), aVec.size() );
aVec.DeleteAndDestroyAll();
}
void testErase_FindPtr()
{
o3tl::sorted_vector<SwContent*, o3tl::less_ptr_to<SwContent>,
o3tl::find_partialorder_ptrequals> aVec;
std::unique_ptr<SwContent> p1( new SwContent(1) );
SwContent *p1_2 = new SwContent(1);
std::unique_ptr<SwContent> p1_3( new SwContent(1) );
SwContent *p2 = new SwContent(2);
SwContent *p3 = new SwContent(3);
std::unique_ptr<SwContent> p4( new SwContent(4) );
aVec.insert(p1.get());
aVec.insert(p2);
aVec.insert(p3);
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(1), aVec.erase(p1.get()) );
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(2), aVec.size() );
aVec.erase(1);
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(1), aVec.size() );
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(0), aVec.erase(p4.get()) );
aVec.clear();
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(0), aVec.size() );
aVec.insert(p1.get());
aVec.insert(p2);
aVec.insert(p3);
aVec.insert(p1_2);
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(4), aVec.size() );
aVec.insert(p1_3.get());
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(5), aVec.size() );
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(1), aVec.erase(p1.get()) );
CPPUNIT_ASSERT( bool(aVec.find(p1.get()) == aVec.end()) );
CPPUNIT_ASSERT( aVec.find(p1_2) != aVec.end() );
CPPUNIT_ASSERT( aVec.find(p1_3.get()) != aVec.end() );
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(1), aVec.erase(p1_3.get()) );
CPPUNIT_ASSERT( bool(aVec.find(p1.get()) == aVec.end()) );
CPPUNIT_ASSERT( aVec.find(p1_2) != aVec.end() );
CPPUNIT_ASSERT( bool(aVec.find(p1_3.get()) == aVec.end()) );
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(0), aVec.erase(p1_3.get()) );
CPPUNIT_ASSERT( bool(aVec.find(p1.get()) == aVec.end()) );
CPPUNIT_ASSERT( aVec.find(p1_2) != aVec.end() );
CPPUNIT_ASSERT( bool(aVec.find(p1_3.get()) == aVec.end()) );
aVec.DeleteAndDestroyAll();
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(0), aVec.size() );
}
void testUniquePtr1()
{
o3tl::sorted_vector<std::unique_ptr<OUString>, o3tl::less_uniqueptr_to<OUString>> aVec;
auto str_c = aVec.insert(std::make_unique<OUString>("c")).first->get();
auto str_b1 = aVec.insert(std::make_unique<OUString>("b")).first->get();
CPPUNIT_ASSERT(!aVec.insert(std::make_unique<OUString>("b")).second);
aVec.insert(std::make_unique<OUString>("a"));
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(3), aVec.size() );
CPPUNIT_ASSERT_EQUAL( OUString("a"), *aVec[0] );
CPPUNIT_ASSERT_EQUAL( OUString("b"), *aVec[1] );
CPPUNIT_ASSERT_EQUAL( OUString("c"), *aVec[2] );
CPPUNIT_ASSERT( aVec.find(str_c) != aVec.end() );
CPPUNIT_ASSERT( aVec.find(str_b1) != aVec.end() );
OUString tmp("b");
CPPUNIT_ASSERT( aVec.find(&tmp) != aVec.end() );
OUString tmp2("z");
CPPUNIT_ASSERT( bool(aVec.find(&tmp2) == aVec.end()) );
}
void testUniquePtr2()
{
o3tl::sorted_vector<std::unique_ptr<OUString>, o3tl::less_uniqueptr_to<OUString>,
o3tl::find_partialorder_ptrequals> aVec;
auto str_c = aVec.insert(std::make_unique<OUString>("c")).first->get();
auto str_b1 = aVec.insert(std::make_unique<OUString>("b")).first->get();
auto str_b2 = aVec.insert(std::make_unique<OUString>("b")).first->get();
aVec.insert(std::make_unique<OUString>("a"));
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(4), aVec.size() );
CPPUNIT_ASSERT_EQUAL( OUString("a"), *aVec[0] );
CPPUNIT_ASSERT_EQUAL( OUString("b"), *aVec[1] );
CPPUNIT_ASSERT_EQUAL( OUString("b"), *aVec[2] );
CPPUNIT_ASSERT_EQUAL( OUString("c"), *aVec[3] );
CPPUNIT_ASSERT( aVec.find(str_c) != aVec.end() );
CPPUNIT_ASSERT( aVec.find(str_b1) != aVec.end() );
CPPUNIT_ASSERT( aVec.find(str_b2) != aVec.end() );
OUString tmp2("z");
CPPUNIT_ASSERT( bool(aVec.find(&tmp2) == aVec.end()) );
}
// Change the following lines only, if you add, remove or rename
// member functions of the current class,
// because these macros are need by auto register mechanism.
CPPUNIT_TEST_SUITE(sorted_vector_test);
CPPUNIT_TEST(testBasics);
CPPUNIT_TEST(testErase);
CPPUNIT_TEST(testInsertRange);
CPPUNIT_TEST(testLowerBound);
CPPUNIT_TEST(testBasics_FindPtr);
CPPUNIT_TEST(testErase_FindPtr);
CPPUNIT_TEST(testUniquePtr1);
CPPUNIT_TEST(testUniquePtr2);
CPPUNIT_TEST_SUITE_END();
};
CPPUNIT_TEST_SUITE_REGISTRATION(sorted_vector_test);
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Reference in a new issue View git blame Copy permalink