Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity
98fd17589d
osrm-backend/third_party/libosmium/test/t/util/test_misc.cpp

69 lines
2.9 KiB
C++
Raw Normal View History

Squashed 'third_party/libosmium/' changes from ce865381f..d2c1d872b d2c1d872b Release v2.14.0 9c9aedd50 Update embedded catch.hpp to version 1.12.1. f94e70d32 Change comment on namespace closing brace to make clang-tidy happy. ad9f03afc Prefer prefix increment operator. a141b9c0c Update change log. 363fc7a15 Add more XML tests. 303a3090f Refactor XML tests. a1ee5dd56 Make util namespace inline. 6f1709a83 Cleanup progress bar code. 1b02b65e0 Use Location setters taking a string in osmium_tiles example. 7ffdc7618 Disable clang-tidy warning. 882631085 Better implementation of str_to_int. 4cbf53725 Fix another bitwise op on signed integer. 903bfac9d Disable clang-tidy warning. 01de3f518 Don't change location if set_lon() or set_lat() functions throw. 9a27e899d Fix bitwise operation on signed integer. 61650224f Disable some clang-tidy warnings. 9dfa8437e Provide a way to better mock the getenv function in tests. ae2c172a2 Explicitly set integer type for integers in test code. 878850068 Simpler implementation. We don't need to look at errno at all. 8f9b886f5 Formatting cf4760cb0 Use bit operations on unsigned where possible. c7cb4cde8 No conversion needed later if we declare it this way. 01357a540 Add missing inline for free function. 3feef81ee Disable clang-tidy warning in place we can't do anything about. bf083b8ee Avoid binary bitwise operations on signed integers. f70b1c803 Move content of osmium::util::detail namespace into osmium::detail. caf2f0033 Remove use of atoi and atol from code. f564cef07 Formatting. f0885fc73 Disable travis build with sanitizers. 858c58444 Use explicit asserts and then casts, not static_cast_with_assert. a613b1b0a Disable clang-tidy warning. 50e327677 Always build and run data tests on travis. 20d7a09b0 Update submodule to add more XML tests. 6c8f652bf Merge pull request #250 from Nakaner/object-comparison-without-timestamp 38ea437c0 Make XML parser more strict. 7788f5108 Remove object_order_type_id_reverse_version_without_timestamp fe2223d25 Ignore timestamps if only one object has a valid timestamp a4515161a Code cleanup. eb5ea1a0e Use explicit conversions. 105905c45 Only disable warning on non-MSVC compilers. 80fc1b35d Change the way IDs are parsed from strings. 78aedf91e More tests for StringMatcher and disable a clang-tidy warning. 644a00752 Move catch.hpp into its own directory. 19842756c Update to newest osm-testdata submodule. 0402f64d7 Fix the problem with "git submodule" in appveyor. ec4095d32 Cleanup metadata_options code. d7390741e Add static_cast to avoid conversion warning. dd16be1c3 Remove else after throw. ef4d618de Remove unused variable. 0fdb58d13 Check out submodule in appveyor builds. 6406282d3 Merge pull request #248 from Nakaner/metadata-options-more eb138a902 make clang < 3.9 work e703b0d1d make sections their own independent test cases f68888006 detect_available_metadata must be inline b53224588 move metadata_options into osmium namespace edd363cfa make const what could be const 302a485e5 remove unnecessary include, add missing include 93a76e07e give osmium::io::metadata_from_object a better name 91dfbc427 update documentation 453cd6395 replace REQUIRE(!foo) by REQUIRE_FALSE(foo) 247c3b021 replace friend function by setter methods 0a62e589c performance improvement: check first character instead using std::strlen() 73568bbff move ctor of metadata_options which taks an OSMObject out of class 1879c9e47 restore metadata_options::to_string 71a303608 add more unit tests for osmium::io::metadata_options 843cdc89c replace osmium::io::metdata_options::to_string fully by operator<< 6402a8793 Fix bug in code which determines if an OSM object has a valid user. a6d8143ae Move metadata_options out of "detail" subnamespace 61e32df10 add metadata_options::operator|= d5f7cc0ab Use newest osm-testdata submodule. 31e34f10c add operator&=, operator<< and a to_string method to metadata_options 77d507172 Formatting fixes. 1c38b2a61 Update some URLs. Use https where possible. 10066cb3e Merge pull request #247 from Nakaner/issue-245 3c938ce82 Allow version=-1 and changeset=-1 for PBF input. 9a542c133 Add ReaderWithProgressBar class. 49839a1ce Replace strftime by our own implementation. b32b90942 Update osm-testdata version used. f88b6e548 Add more tests. cb7e778f6 Handle NULL geometries in test cases. 1961a9c95 Clean up some test cases. d7f45e071 Update osm-testdata submodule. 73a2ef18f Remove check for lost ways in multipolygon assembler. 1244e498a Update submodule also in msys2 build. 229fc2453 Revert "Make util namespace inline." 9f942d2e9 Revert "Add inline declaration to one util namespace we forgot." 40d4835ea Really fix appveyor build (I hope). 5ae071135 Add inline declaration to one util namespace we forgot. e0916257c Clean up debug message. 2ddc474cc Make util namespace inline. 4b4e25f87 Travis config: Do not install clang-tidy, we are not using it. 5a608fba1 Fix travis build. a075cc323 Fix appveyor build. 41ee9920b Add submodule with osm-testdata repository. 4d42245c0 Revert "Add clang-tidy build to travis." 9df355b64 Fix issue on some compilers. c8a3c00d6 Add clang-tidy build to travis. 2fc80ad17 Fixed clang-tidy config file order. 2adf05267 Fix various clang-tidy warnings 1dca92459 Use the right syntax to override clang-tidy settings in the code. 25baecb46 Fix some issues found by clang-tidy. 54a8de6c0 Disable more clang-tidy tests. de46d562e Also look for clang-tidy-6.0 in CMake config. 2172553d8 Add build with sanitizers on travis. 7e4e45562 Add object comparators ignoring the timestamp. 92fb231a1 Fix test code. e541df0fc Cleanup test code. 5640269da Add comment in appveyor script about unusual parameter. acb872376 Workaround for failing appveyor MSYS2 build. 0634bcf70 Set default value for m_file_size member. 3a2fe5781 Set default values on output options. 43d289fda Make metadata_options constructor explicit. 6e54992b4 Update change log. e54b955cf Update included `catch.hpp` to version 1.12.0. e50b40d53 Update copyright date. 0d8b401b6 Merge branch 'metadata' c7da3a3b6 Remove superfluous has_visibles boolean. 7f74d33d3 Some cleanups of metadata code and fixes test. 5b3c34990 Output XML attributes uid and user independently of each other. 384167334 Merge pull request #243 from Nakaner/metadata_other 733f1916c Change path of nuget installs in appveyor config. e48672999 Debug output from FindOsmium.cmake script is better formatted now. 79663be5d Change appveyor scripts to work without deprecated prebuilt libs. 443f7a9e4 Remove dependency on (win)getopt completely. c133b8b14 Fix osmium_convert: Long options with = syntax. b55daf00a Remove dependency on (win)getopt from area_test and convert examples. 92f7275a9 output visibility directly after the object ID in debug format a771279f0 deprecate format option pbf_add_metadata 18e3f6005 The value "no" should be treated as "none" by metadata_options c8b0b2e28 re-assign metadata_options instead of calling a public method of it 15bc4a200 Add more flexible metadata handling to PBF output b085632b7 add more flexible metadata handling to OPL and debug output a12c65974 Remove now wrong check. 767ad883a Allow PBF DenseNodes with only some attributes to be read. fd5a7eb6c More flexible metadata encoding in OSM files. d16c18581 Add instructions for bug reporting. db52591ab Use __COUNTER__ instead of name for internal dummy name. 89e634dfc Cleanup. 931ec30ca Marks some false positives for clang-tidy google-runtime-int warning. b59ef02a2 More rule of zero/rule of five fixes. 1b72b3386 Pass by value and use std::move. b7d7017cc Handle some clang-tidy google-runtime-int warnings. c043ca016 Fix special functions. 41d9f0795 Use fixed sized ints where possible. 0899a66a7 Revert some changes older compilers don't like. 41e05989a Fix several rule of zero/rule of five issues. 4e78a828f Various fixes based on clang-tidy reports. 636bda372 Default initialize arrays. 466e5aa6a Handle various clang-tidy warnings. 9f47aa07d Disable clang-tidy misc-forwarding-reference-overload warning. 5e97bf29f Mark Reader and Writer non-movable. 3a2221b27 Add minimal tests for thread-safe queue class. affdeed6f Add some tests. 5ed055d50 Handle some warnings regarding "explicit". b9d4c9bf5 Disable clang-tidy cert-err58-cpp warning. 254c25349 Make ADL work for begin()/end() of InputIterator<Reader>. b64cb32ae Disable clang-tidy android-cloexec-* warnings. 6d6934ffc Fix various warnings reported by clang-tidy. 30dcabaed Another travis build fix. 88c59e669 Fix travis build. 2facb461f Fix travis and appveyor builds. bba631a51 Remove protozero from repository. aebe4a914 Use pass by value and std::move in some constructors. c8c24c8fd Name unused parameters in comments. 9c2e321f9 Make deleted special functions public. 265c16284 Fix some problems with older compilers. 174e95211 Modernize class initialization code for some classes. 4e3e584f8 Disable more clang-tidy warnings. 6b53981bb Fix some class initializations. fe1405ef8 Add/remove special functions for some classes. c6dd930d9 Disable cppcoreguidelines-pro-type-static-cast-downcast warning. 0d09210ec Disable misc-unused-parameters warning in clang-tidy. 1dbc43112 Refactor to avoid misc-suspicious-string-compare clang-tidy warning. 91262cc86 Merge pull request #232 from worace/wkt-geojson-polygons 438076b09 Cleanup: Avoid else after return/break. e0368e92c Disable modernize-raw-string-literal and hicpp-no-assembler check. c822888fc Mark C style cast in macro from a library as NOLINT. 662d4a641 Moving a TypedMemoryMapping is noexcept. aec1c4526 Use auto (clang-tidy check modernize-use-auto). 64857589d Consistent include order. d1ce8de00 Disable hicpp-invalid-access-moved clang-tidy check. 0d3902420 Refactor test without SECTION. 32e9e9e1e Rewrite test avoiding nested sections. eeb532902 Reorder includes according to best practice. 249e7b553 Revert "Add build with sanitizers to travis." 362cb419a Set CC env var in travis config. 9f520eca3 Add build with sanitizers to travis. cfc18fef0 Travis config cleanup. 212c6cd42 Remove tests that triggers undefined behaviour in the std lib. f30985884 Bugfix: Avoid undefined behaviour. 90191619a Make test work even if unused memory isn't returned to OS. 876867e68 Make older compilers happy. 925d1a797 Add names for unused parameters. 014b3a056 Avoid repeating the return type from the declaration c4e705f92 Disable hicpp-invalid-access-moved clang-tidy warnings. 8c03b3827 Disable some warnings. c49962ffe Refactor test to avoid spurious use-after-move warning. 04a0afbba Sort includes. 2aaab9a89 Use auto where possible. e2d84109b More changes for old compilers. 5364ca2a8 Changes for old compilers. 098fc1fa2 Move initializations of class members to the declaration. eea463026 Fix buffer overflow in o5m parser. 5dc74f2d5 Remove check from static cast (and document why). 7a2dfdcdc Add NOLINT for using namespace osmium::builder::attr. 01fa05f1e Clang-tidy config cleanup. 5e8f8df3f Order includes. 6b78d9b24 Various small fixes for problems detected by clang-tidy. b815f71b7 Fix gdal check in CMake config. d47487093 Fix integer type error. dec9de9ec Bugfix: Throw if elemens in XML file are nested too deep. 85e37723b Various small cleanups. 5f40d726a Additional checks in o5m parser. b59b4b6a6 Check before static cast and throw. e57b15700 Disable compiling some header files if gdal lib is not available. 1d3056646 Better checking that PBF data is in range. c586521d3 Add some consts to the code. df17e8189 Trying to get the types right... 8e9b759e0 Check read and write system call for EINTR. 28c676054 Rename license file so that Github finds it. be29e9a52 Remove duplicate space character. 36c14136f Update protozero to newest version (1.6.0). a19181998 Make libosmium work with different protozero versions. 5c5d9fb36 Use tag and type from protozero to make PBF parser more robust. 03f894400 Add repology.org badge to README.md. 1840739dd Merge pull request #234 from AMDmi3/patch-1 d8e737196 Add support for DragonFly BSD 8de181c8d Revert "Return const object from postfix ++ operator." 0dfb1d649 Add polygon implementation for WKT and GeoJSON Geometry Factories 150e05aea Fix indentation. 6fdee974a Merge pull request #229 from alex85k/no-winsock f302f08ce Merge pull request #228 from alex85k/fix-test-win bfb60c888 remove ws2_32 from needed libraries ef187851c no winsock2 on windows: replace htonl with protozero::detail::byteswap_inplace 9343f8453 Fix testdata-multipolygon test on Windows (executable path differs) 381cf9272 Do not return const from postfix increment operator. 46ec985e9 Add const version of OutputIterator::operator*. c67de374f Disable clang-tidy test for const params. f5eda165f Make functions noexcept and return const value from post increment op. 1e4e3160f Use {} when calling constructors. Use .empty() to check empty strings. 8893d16be Mark some tests using size() with NOLINT. f8a74a8aa Make functions noexcept. 45c1e072c Use REQUIRE_FALSE(...) instead of REQUIRE(!...) for readability. fc173dae7 Merge pull request #227 from alex85k/msys2-appveor 0a281c064 Add MSYS2 building to Appveyor c93f73120 fix FindGem for Windows Ruby distributions 8bf6702b3 Merge pull request #226 from alex85k/master e8dad731d gmtime_s should be used on both MSVC and GCC from MinGW64 d0d98e9c1 remove "osmium::util::MemoryMapping::" from class body 6830ee9bd ftruncate is not available only on MSVC (MinGW has it) c0597584f Disable some clang-tidy checks. 578db8e4a Use empty() instead of size() or == "" to check for empty collections. 53c8f3a21 Return const object from postfix ++ operator. bd5e4d109 Use emplace_back() instead of push_back(). 0a0a4f24c Use correct C++ header. 35226ea86 Remove unused move. df843a9cf Fix header guard. 759e76131 Avoid default argument on virtual function. db4f1bdb9 Update included catch.hpp to version 1.10.0. 59e70e5c6 Pass constructor arguments by value and std::move() into members. ee9b598ed Add tests for thread_handler. ac661209a CMake config: Update list of clang-tidy versions we look for. d7281215c Add comment to unusual code. cbb4c09fb Split up some overlong test functions. 9870a6b90 Fix noexcept specification. 5e27c37d0 Use array instead of map to store input/output format creators. 987d12922 Mark some constructors noexcept. 17f4d8b7e Avoid static variable only needed as constant value. fe705cef0 Avoid else after return in several cases. d4a85878e Beautifying travis config. f07d1e375 Make some special functions noexcept. 4bb0f7f22 Do not declare special functions on some classes. bc6c5943d Disable some clang-tidy checks that produce false positives. 6b6598a5b Remove superfluous std::move() of POD type. 71c3f5e16 Make some special functions noexcept. 1cb32778c Remove explicit true/false in tests. 929ba89cf Always catch by const ref. a9a255820 Code readability: No else clause after return. f14364bd3 Code formatting fixes. f41feb6a5 Simplify code. 727f6eff4 Mark dummy includes for IWYU. 72d20f835 Switch travis build to 'trusty'. c480e6808 Do not run gcov from codecov script. d16c6e90a Clean up lambda captures in xml_input_format.hpp. git-subtree-dir: third_party/libosmium git-subtree-split: d2c1d872bc915d9579350007383ce1ebfea3665f
2018-04-19 15:03:25 -04:00
#include "catch.hpp"
#include <osmium/util/misc.hpp>
template <typename T>
void test_conv() {
REQUIRE(osmium::detail::str_to_int<T>("0") == 0);
REQUIRE(osmium::detail::str_to_int<T>("1") == 1);
REQUIRE(osmium::detail::str_to_int<T>("9") == 9);
REQUIRE(osmium::detail::str_to_int<T>("10") == 10);
REQUIRE(osmium::detail::str_to_int<T>("44") == 44);
REQUIRE(osmium::detail::str_to_int<T>("45") == 45);
REQUIRE(osmium::detail::str_to_int<T>(" 123") == 123);
REQUIRE(osmium::detail::str_to_int<T>("-1") == 0);
REQUIRE(osmium::detail::str_to_int<T>("-100") == 0);
REQUIRE(osmium::detail::str_to_int<T>("1 ") == 0);
REQUIRE(osmium::detail::str_to_int<T>("x1") == 0);
REQUIRE(osmium::detail::str_to_int<T>("1x") == 0);
REQUIRE(osmium::detail::str_to_int<T>("2 3") == 0);
REQUIRE(osmium::detail::str_to_int<T>("9999999999999999999999") == 0);
}
TEST_CASE("string to integer conversion") {
test_conv<int>();
test_conv<unsigned int>();
test_conv<int8_t>();
REQUIRE(osmium::detail::str_to_int<int8_t>("126") == 126);
REQUIRE(osmium::detail::str_to_int<int8_t>("127") == 0);
REQUIRE(osmium::detail::str_to_int<int8_t>("128") == 0);
test_conv<uint8_t>();
REQUIRE(osmium::detail::str_to_int<uint8_t>("254") == 254);
REQUIRE(osmium::detail::str_to_int<uint8_t>("255") == 0);
REQUIRE(osmium::detail::str_to_int<uint8_t>("256") == 0);
test_conv<int16_t>();
REQUIRE(osmium::detail::str_to_int<int16_t>("32766") == 32766);
REQUIRE(osmium::detail::str_to_int<int16_t>("32767") == 0);
REQUIRE(osmium::detail::str_to_int<int16_t>("32768") == 0);
test_conv<uint16_t>();
REQUIRE(osmium::detail::str_to_int<uint16_t>("65534") == 65534);
REQUIRE(osmium::detail::str_to_int<uint16_t>("65535") == 0);
REQUIRE(osmium::detail::str_to_int<uint16_t>("65536") == 0);
test_conv<int32_t>();
REQUIRE(osmium::detail::str_to_int<int32_t>("2147483646") == 2147483646ll);
REQUIRE(osmium::detail::str_to_int<int32_t>("2147483647") == 0);
REQUIRE(osmium::detail::str_to_int<int32_t>("2147483648") == 0);
test_conv<uint32_t>();
REQUIRE(osmium::detail::str_to_int<uint32_t>("4294967294") == 4294967294ull);
REQUIRE(osmium::detail::str_to_int<uint32_t>("4294967295") == 0);
REQUIRE(osmium::detail::str_to_int<uint32_t>("4294967296") == 0);
test_conv<int64_t>();
REQUIRE(osmium::detail::str_to_int<int64_t>("9223372036854775806") == 9223372036854775806ll);
REQUIRE(osmium::detail::str_to_int<int64_t>("9223372036854775807") == 0);
REQUIRE(osmium::detail::str_to_int<int64_t>("9223372036854775808") == 0);
test_conv<uint64_t>();
REQUIRE(osmium::detail::str_to_int<uint64_t>("9223372036854775806") == 9223372036854775806ull);
REQUIRE(osmium::detail::str_to_int<uint64_t>("9223372036854775807") == 0);
REQUIRE(osmium::detail::str_to_int<uint64_t>("9223372036854775808") == 0);
}
Reference in New Issue Copy Permalink