BlackMATov/flat.hpp
1
0
Fork 0
mirror of https://github.com/BlackMATov/flat.hpp.git synced 2025-12-13 01:36:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

replace catch2 to embedded doctest

Browse Source
This commit is contained in:
BlackMATov
2020-11-29 23:59:33 +07:00
parent 61245bc7ea
commit 7d87cd34d3
11 changed files with 6362 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.codecov.yml
View File

@@ -1,4 +0,0 @@
ignore:
- "catch.hpp"
- "catch_main.hpp"
- "*_tests.cpp"

46
.travis.yml
View File

@@ -1,32 +1,12 @@
git:
depth: false
quiet: true
language: cpp
matrix:
jobs:
include:
#
# windows (MSVC 2017)
#
- os: windows
stage: windows
name: debug, MSVC 2017, x86
script: ./scripts/build_debug_x86.bat
- os: windows
stage: windows
name: release, MSVC 2017, x86
script: ./scripts/build_release_x86.bat
- os: windows
stage: windows
name: debug, MSVC 2017, x64
script: ./scripts/build_debug_x64.bat
- os: windows
stage: windows
name: release, MSVC 2017, x64
script: ./scripts/build_release_x64.bat
#
# linux (g++-7)
#
@@ -75,7 +55,7 @@ matrix:
dist: xenial
stage: linux
name: debug, clang++-5.0
addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-xenial-5.0"], packages: ["g++-7", "clang-5.0"] } }
addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-7", "clang-5.0"] } }
env: CC=clang-5.0 CXX=clang++-5.0
script: ./scripts/build_debug.sh
@@ -83,7 +63,7 @@ matrix:
dist: xenial
stage: linux
name: release, clang++-5.0
addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-xenial-5.0"], packages: ["g++-7", "clang-5.0"] } }
addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-7", "clang-5.0"] } }
env: CC=clang-5.0 CXX=clang++-5.0
script: ./scripts/build_release.sh
@@ -95,7 +75,7 @@ matrix:
dist: xenial
stage: linux
name: debug, clang++-6.0
addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-xenial-6.0"], packages: ["g++-7", "clang-6.0"] } }
addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-7", "clang-6.0"] } }
env: CC=clang-6.0 CXX=clang++-6.0
script: ./scripts/build_debug.sh
@@ -103,7 +83,7 @@ matrix:
dist: xenial
stage: linux
name: release, clang++-6.0
addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-xenial-6.0"], packages: ["g++-7", "clang-6.0"] } }
addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-7", "clang-6.0"] } }
env: CC=clang-6.0 CXX=clang++-6.0
script: ./scripts/build_release.sh
@@ -149,11 +129,3 @@ matrix:
name: coverage, xcode10
addons: { homebrew: { packages: ["lcov"], update: true } }
script: ./scripts/upload_coverage.sh
before_install:
- if [ "$TRAVIS_OS_NAME" == 'linux' ]; then
mkdir $HOME/cmake;
export PATH="$HOME/cmake/bin:$PATH";
travis_retry wget -q https://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.sh;
sh cmake-3.11.4-Linux-x86_64.sh --prefix=$HOME/cmake --exclude-subdir --skip-license;
fi

4
scripts/upload_coverage.sh
View File

@@ -11,7 +11,7 @@ lcov -d . -z
ctest --verbose
lcov -d . -c -o "coverage.info"
lcov -r "coverage.info" "*/usr/*" "*/catch.hpp" "*/catch_main.cpp" "*_tests.cpp" "*_examples.cpp" -o "coverage.info"
lcov -r "coverage.info" "*/usr/*" "*/doctest/*" "*/untests/*" -o "coverage.info"
lcov -l "coverage.info"
bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
bash <(curl -s https://codecov.io/bash) -f "coverage.info" || echo "Codecov did not collect coverage reports"

20
untests/CMakeLists.txt
View File

@@ -1,6 +1,3 @@
# 3.11 version is required for `FetchContent`
cmake_minimum_required(VERSION 3.11 FATAL_ERROR)
project(flat.hpp.untests)
#
@@ -32,20 +29,3 @@ target_compile_options(${PROJECT_NAME}
-Wall -Wextra -Wpedantic>)
add_test(${PROJECT_NAME} ${PROJECT_NAME})
#
# catchorg/catch2
#
include(FetchContent)
FetchContent_Declare(
catchorg_catch2
GIT_REPOSITORY https://github.com/catchorg/catch2
GIT_TAG v2.13.2)
FetchContent_GetProperties(catchorg_catch2)
if(NOT catchorg_catch2_POPULATED)
FetchContent_Populate(catchorg_catch2)
target_include_directories(${PROJECT_NAME}
PRIVATE ${catchorg_catch2_SOURCE_DIR}/single_include)
endif()

6260
untests/doctest/doctest.h Normal file
View File

File diff suppressed because it is too large Load Diff

40
untests/flat_map_tests.cpp
View File

@@ -4,19 +4,19 @@
* Copyright (C) 2019-2020, by Matvey Cherevko (blackmatov@gmail.com)
******************************************************************************/
#define CATCH_CONFIG_FAST_COMPILE
#include <catch2/catch.hpp>
#include <flat.hpp/flat_map.hpp>
#include "doctest/doctest.h"
#include "flat_tests.hpp"
#include <deque>
#include <string>
#include <string_view>
#include <flat.hpp/flat_map.hpp>
using namespace flat_hpp;
namespace
{
using namespace flat_hpp;
template < typename T >
class dummy_less {
public:
@@ -57,11 +57,11 @@ namespace
}
TEST_CASE("flat_map") {
SECTION("detail") {
SUBCASE("detail") {
STATIC_REQUIRE(detail::is_transparent<std::less<>, int>::value);
STATIC_REQUIRE_FALSE(detail::is_transparent<std::less<int>, int>::value);
}
SECTION("sizeof") {
SUBCASE("sizeof") {
REQUIRE(sizeof(flat_map<int, unsigned>) == sizeof(std::vector<std::pair<int, unsigned>>));
struct vc : flat_map<int, unsigned>::value_compare {
@@ -69,7 +69,7 @@ TEST_CASE("flat_map") {
};
REQUIRE(sizeof(vc) == sizeof(int));
}
SECTION("noexcept") {
SUBCASE("noexcept") {
using alloc_t = std::allocator<std::pair<int,unsigned>>;
using map_t = flat_map<int, unsigned, dummy_less<int>, std::vector<std::pair<int,unsigned>, alloc_t>>;
using map2_t = flat_map<int, unsigned, dummy_less2<int>>;
@@ -103,7 +103,7 @@ TEST_CASE("flat_map") {
STATIC_REQUIRE(noexcept(std::declval<map_t&>().clear()));
}
SECTION("types") {
SUBCASE("types") {
using map_t = flat_map<int, unsigned>;
STATIC_REQUIRE(std::is_same_v<map_t::key_type, int>);
@@ -119,7 +119,7 @@ TEST_CASE("flat_map") {
STATIC_REQUIRE(std::is_same_v<map_t::pointer, std::pair<int, unsigned>*>);
STATIC_REQUIRE(std::is_same_v<map_t::const_pointer, const std::pair<int, unsigned>*>);
}
SECTION("ctors") {
SUBCASE("ctors") {
using alloc_t = std::allocator<
std::pair<int,unsigned>>;
@@ -210,7 +210,7 @@ TEST_CASE("flat_map") {
REQUIRE(s1 == map_t{{1,4},{2,3},{3,1}});
}
}
SECTION("capacity") {
SUBCASE("capacity") {
using map_t = flat_map<int, unsigned>;
{
@@ -266,7 +266,7 @@ TEST_CASE("flat_map") {
REQUIRE(s1 == map2_t{{1,2},{2,3},{3,4}});
}
}
SECTION("access") {
SUBCASE("access") {
struct obj_t {
obj_t(int i) : i(i) {}
int i;
@@ -302,7 +302,7 @@ TEST_CASE("flat_map") {
REQUIRE_THROWS_AS(s0.at(0), std::out_of_range);
REQUIRE_THROWS_AS(my_as_const(s0).at(0), std::out_of_range);
}
SECTION("inserts") {
SUBCASE("inserts") {
struct obj_t {
obj_t(int i) : i(i) {}
int i;
@@ -398,7 +398,7 @@ TEST_CASE("flat_map") {
REQUIRE(s0 == map_t{{1,4}});
}
}
SECTION("erasers") {
SUBCASE("erasers") {
using map_t = flat_map<int, unsigned>;
{
map_t s0{{1,2},{2,3},{3,4}};
@@ -434,7 +434,7 @@ TEST_CASE("flat_map") {
REQUIRE(s1 == map_t{{2,3},{3,4},{5,6}});
}
}
SECTION("lookup") {
SUBCASE("lookup") {
using map_t = flat_map<int, unsigned>;
{
map_t s0{{1,2},{2,3},{3,4},{4,5},{5,6}};
@@ -469,7 +469,7 @@ TEST_CASE("flat_map") {
REQUIRE(my_as_const(s0).lower_bound(7) == s0.cbegin() + 3);
}
}
SECTION("heterogeneous") {
SUBCASE("heterogeneous") {
flat_map<std::string, int, std::less<>> s0{{"hello", 42}, {"world", 84}};
REQUIRE(s0.find(std::string_view("hello")) == s0.begin());
REQUIRE(my_as_const(s0).find(std::string_view("world")) == s0.begin() + 1);
@@ -488,7 +488,7 @@ TEST_CASE("flat_map") {
REQUIRE(s0.at(std::string_view("world")) == 84);
REQUIRE(my_as_const(s0).at(std::string_view("world")) == 84);
}
SECTION("observers") {
SUBCASE("observers") {
struct my_less {
int i;
my_less(int i) : i(i) {}
@@ -501,7 +501,7 @@ TEST_CASE("flat_map") {
REQUIRE(my_as_const(s0).key_comp().i == 42);
REQUIRE(my_as_const(s0).value_comp()({2,50},{4,20}));
}
SECTION("custom_less") {
SUBCASE("custom_less") {
using map_t = flat_map<int, unsigned, dummy_less<int>>;
auto s0 = map_t(dummy_less<int>(42));
auto s1 = map_t(dummy_less<int>(21));
@@ -511,7 +511,7 @@ TEST_CASE("flat_map") {
REQUIRE(s0.key_comp().i == 21);
REQUIRE(s1.key_comp().i == 42);
}
SECTION("operators") {
SUBCASE("operators") {
using map_t = flat_map<int, unsigned>;
REQUIRE(map_t{{1,2},{3,4}} == map_t{{3,4},{1,2}});

40
untests/flat_multimap_tests.cpp
View File

@@ -4,19 +4,19 @@
* Copyright (C) 2019-2020, by Matvey Cherevko (blackmatov@gmail.com)
******************************************************************************/
#define CATCH_CONFIG_FAST_COMPILE
#include <catch2/catch.hpp>
#include <flat.hpp/flat_multimap.hpp>
#include "doctest/doctest.h"
#include "flat_tests.hpp"
#include <deque>
#include <string>
#include <string_view>
#include <flat.hpp/flat_multimap.hpp>
using namespace flat_hpp;
namespace
{
using namespace flat_hpp;
template < typename T >
class dummy_less {
public:
@@ -57,11 +57,11 @@ namespace
}
TEST_CASE("flat_multimap") {
SECTION("detail") {
SUBCASE("detail") {
STATIC_REQUIRE(detail::is_transparent<std::less<>, int>::value);
STATIC_REQUIRE_FALSE(detail::is_transparent<std::less<int>, int>::value);
}
SECTION("sizeof") {
SUBCASE("sizeof") {
REQUIRE(sizeof(flat_multimap<int, unsigned>) == sizeof(std::vector<std::pair<int, unsigned>>));
struct vc : flat_multimap<int, unsigned>::value_compare {
@@ -69,7 +69,7 @@ TEST_CASE("flat_multimap") {
};
REQUIRE(sizeof(vc) == sizeof(int));
}
SECTION("noexcept") {
SUBCASE("noexcept") {
using alloc_t = std::allocator<std::pair<int,unsigned>>;
using map_t = flat_multimap<int, unsigned, dummy_less<int>, std::vector<std::pair<int,unsigned>, alloc_t>>;
using map2_t = flat_multimap<int, unsigned, dummy_less2<int>>;
@@ -103,7 +103,7 @@ TEST_CASE("flat_multimap") {
STATIC_REQUIRE(noexcept(std::declval<map_t&>().clear()));
}
SECTION("types") {
SUBCASE("types") {
using map_t = flat_multimap<int, unsigned>;
STATIC_REQUIRE(std::is_same_v<map_t::key_type, int>);
@@ -119,7 +119,7 @@ TEST_CASE("flat_multimap") {
STATIC_REQUIRE(std::is_same_v<map_t::pointer, std::pair<int, unsigned>*>);
STATIC_REQUIRE(std::is_same_v<map_t::const_pointer, const std::pair<int, unsigned>*>);
}
SECTION("ctors") {
SUBCASE("ctors") {
using alloc_t = std::allocator<
std::pair<int,unsigned>>;
@@ -210,7 +210,7 @@ TEST_CASE("flat_multimap") {
REQUIRE(s1 == map_t{{1,4},{2,3},{2,2},{3,1}});
}
}
SECTION("capacity") {
SUBCASE("capacity") {
using map_t = flat_multimap<int, unsigned>;
{
@@ -266,7 +266,7 @@ TEST_CASE("flat_multimap") {
REQUIRE(s1 == map2_t{{1,2},{2,3},{3,4}});
}
}
SECTION("access") {
SUBCASE("access") {
struct obj_t {
obj_t(int i) : i(i) {}
int i;
@@ -302,7 +302,7 @@ TEST_CASE("flat_multimap") {
REQUIRE_THROWS_AS(s0.at(0), std::out_of_range);
REQUIRE_THROWS_AS(my_as_const(s0).at(0), std::out_of_range);
}
SECTION("inserts") {
SUBCASE("inserts") {
struct obj_t {
obj_t(int i) : i(i) {}
int i;
@@ -370,7 +370,7 @@ TEST_CASE("flat_multimap") {
REQUIRE(s1 == map_t{{1,3},{2,2},{2,2},{3,1}});
}
}
SECTION("erasers") {
SUBCASE("erasers") {
using map_t = flat_multimap<int, unsigned>;
{
map_t s0{{1,2},{2,3},{3,4}};
@@ -407,7 +407,7 @@ TEST_CASE("flat_multimap") {
REQUIRE(s1 == map_t{{2,3},{3,4},{5,6}});
}
}
SECTION("lookup") {
SUBCASE("lookup") {
using map_t = flat_multimap<int, unsigned>;
{
map_t s0{{1,2},{2,3},{2,1},{3,4},{4,5},{5,6}};
@@ -443,7 +443,7 @@ TEST_CASE("flat_multimap") {
REQUIRE(my_as_const(s0).lower_bound(7) == s0.cbegin() + 4);
}
}
SECTION("heterogeneous") {
SUBCASE("heterogeneous") {
flat_multimap<std::string, int, std::less<>> s0{{"hello", 42}, {"world", 84}};
REQUIRE(s0.find(std::string_view("hello")) == s0.begin());
REQUIRE(my_as_const(s0).find(std::string_view("world")) == s0.begin() + 1);
@@ -462,7 +462,7 @@ TEST_CASE("flat_multimap") {
REQUIRE(s0.at(std::string_view("world")) == 84);
REQUIRE(my_as_const(s0).at(std::string_view("world")) == 84);
}
SECTION("observers") {
SUBCASE("observers") {
struct my_less {
int i;
my_less(int i) : i(i) {}
@@ -475,7 +475,7 @@ TEST_CASE("flat_multimap") {
REQUIRE(my_as_const(s0).key_comp().i == 42);
REQUIRE(my_as_const(s0).value_comp()({2,50},{4,20}));
}
SECTION("custom_less") {
SUBCASE("custom_less") {
using map_t = flat_multimap<int, unsigned, dummy_less<int>>;
auto s0 = map_t(dummy_less<int>(42));
auto s1 = map_t(dummy_less<int>(21));
@@ -485,7 +485,7 @@ TEST_CASE("flat_multimap") {
REQUIRE(s0.key_comp().i == 21);
REQUIRE(s1.key_comp().i == 42);
}
SECTION("operators") {
SUBCASE("operators") {
using map_t = flat_multimap<int, unsigned>;
REQUIRE(map_t{{1,2},{3,4}} == map_t{{3,4},{1,2}});

38
untests/flat_multiset_tests.cpp
View File

@@ -4,19 +4,19 @@
* Copyright (C) 2019-2020, by Matvey Cherevko (blackmatov@gmail.com)
******************************************************************************/
#define CATCH_CONFIG_FAST_COMPILE
#include <catch2/catch.hpp>
#include <flat.hpp/flat_multiset.hpp>
#include "doctest/doctest.h"
#include "flat_tests.hpp"
#include <deque>
#include <string>
#include <string_view>
#include <flat.hpp/flat_multiset.hpp>
using namespace flat_hpp;
namespace
{
using namespace flat_hpp;
template < typename T >
class dummy_less {
public:
@@ -57,11 +57,11 @@ namespace
}
TEST_CASE("flat_multiset") {
SECTION("detail") {
SUBCASE("detail") {
STATIC_REQUIRE(detail::is_transparent<std::less<>, int>::value);
STATIC_REQUIRE_FALSE(detail::is_transparent<std::less<int>, int>::value);
}
SECTION("sizeof") {
SUBCASE("sizeof") {
REQUIRE(sizeof(flat_multiset<int>) == sizeof(std::vector<int>));
struct vc : flat_multiset<int>::value_compare {
@@ -69,7 +69,7 @@ TEST_CASE("flat_multiset") {
};
REQUIRE(sizeof(vc) == sizeof(int));
}
SECTION("noexcept") {
SUBCASE("noexcept") {
using alloc_t = std::allocator<int>;
using set_t = flat_multiset<int, dummy_less<int>, std::vector<int, alloc_t>>;
using set2_t = flat_multiset<int, dummy_less2<int>>;
@@ -103,7 +103,7 @@ TEST_CASE("flat_multiset") {
STATIC_REQUIRE(noexcept(std::declval<set_t&>().clear()));
}
SECTION("types") {
SUBCASE("types") {
using set_t = flat_multiset<int>;
STATIC_REQUIRE(std::is_same_v<set_t::key_type, int>);
@@ -118,7 +118,7 @@ TEST_CASE("flat_multiset") {
STATIC_REQUIRE(std::is_same_v<set_t::pointer, int*>);
STATIC_REQUIRE(std::is_same_v<set_t::const_pointer, const int*>);
}
SECTION("ctors") {
SUBCASE("ctors") {
using alloc_t = std::allocator<int>;
using set_t = flat_multiset<int, std::less<int>, std::vector<int, alloc_t>>;
using set2_t = flat_multiset<int, std::greater<int>, std::vector<int, alloc_t>>;
@@ -196,7 +196,7 @@ TEST_CASE("flat_multiset") {
REQUIRE(s1 == set_t{1,2,3,3});
}
}
SECTION("capacity") {
SUBCASE("capacity") {
using set_t = flat_multiset<int>;
{
@@ -250,7 +250,7 @@ TEST_CASE("flat_multiset") {
REQUIRE(s1 == set2_t{1,2,3});
}
}
SECTION("inserts") {
SUBCASE("inserts") {
struct obj_t {
obj_t(int i) : i(i) {}
int i;
@@ -346,7 +346,7 @@ TEST_CASE("flat_multiset") {
REQUIRE(s1 == set_t{1,2,2,3});
}
}
SECTION("erasers") {
SUBCASE("erasers") {
using set_t = flat_multiset<int>;
{
set_t s0{1,2,3,4,5};
@@ -383,7 +383,7 @@ TEST_CASE("flat_multiset") {
REQUIRE(s1 == set_t{3,4,5});
}
}
SECTION("lookup") {
SUBCASE("lookup") {
using set_t = flat_multiset<int>;
{
set_t s0{1,2,3,3,4,5};
@@ -419,7 +419,7 @@ TEST_CASE("flat_multiset") {
REQUIRE(my_as_const(s0).lower_bound(7) == s0.cbegin() + 4);
}
}
SECTION("heterogeneous") {
SUBCASE("heterogeneous") {
flat_multiset<std::string, std::less<>> s0{"hello", "world"};
REQUIRE(s0.find(std::string_view("hello")) == s0.begin());
REQUIRE(my_as_const(s0).find(std::string_view("world")) == s0.begin() + 1);
@@ -435,7 +435,7 @@ TEST_CASE("flat_multiset") {
REQUIRE(s0.upper_bound(std::string_view("hello")) == s0.begin() + 1);
REQUIRE(my_as_const(s0).upper_bound(std::string_view("hello")) == s0.begin() + 1);
}
SECTION("observers") {
SUBCASE("observers") {
struct my_less {
int i;
my_less(int i) : i(i) {}
@@ -448,7 +448,7 @@ TEST_CASE("flat_multiset") {
REQUIRE(my_as_const(s0).key_comp().i == 42);
REQUIRE(my_as_const(s0).value_comp().i == 42);
}
SECTION("custom_less") {
SUBCASE("custom_less") {
using set_t = flat_multiset<int, dummy_less<int>>;
auto s0 = set_t(dummy_less<int>(42));
auto s1 = set_t(dummy_less<int>(21));
@@ -458,7 +458,7 @@ TEST_CASE("flat_multiset") {
REQUIRE(s0.key_comp().i == 21);
REQUIRE(s1.key_comp().i == 42);
}
SECTION("operators") {
SUBCASE("operators") {
using set_t = flat_multiset<int>;
REQUIRE(set_t{1,2,3} == set_t{3,2,1});

38
untests/flat_set_tests.cpp
View File

@@ -4,19 +4,19 @@
* Copyright (C) 2019-2020, by Matvey Cherevko (blackmatov@gmail.com)
******************************************************************************/
#define CATCH_CONFIG_FAST_COMPILE
#include <catch2/catch.hpp>
#include <flat.hpp/flat_set.hpp>
#include "doctest/doctest.h"
#include "flat_tests.hpp"
#include <deque>
#include <string>
#include <string_view>
#include <flat.hpp/flat_set.hpp>
using namespace flat_hpp;
namespace
{
using namespace flat_hpp;
template < typename T >
class dummy_less {
public:
@@ -57,11 +57,11 @@ namespace
}
TEST_CASE("flat_set") {
SECTION("detail") {
SUBCASE("detail") {
STATIC_REQUIRE(detail::is_transparent<std::less<>, int>::value);
STATIC_REQUIRE_FALSE(detail::is_transparent<std::less<int>, int>::value);
}
SECTION("sizeof") {
SUBCASE("sizeof") {
REQUIRE(sizeof(flat_set<int>) == sizeof(std::vector<int>));
struct vc : flat_set<int>::value_compare {
@@ -69,7 +69,7 @@ TEST_CASE("flat_set") {
};
REQUIRE(sizeof(vc) == sizeof(int));
}
SECTION("noexcept") {
SUBCASE("noexcept") {
using alloc_t = std::allocator<int>;
using set_t = flat_set<int, dummy_less<int>, std::vector<int, alloc_t>>;
using set2_t = flat_set<int, dummy_less2<int>>;
@@ -103,7 +103,7 @@ TEST_CASE("flat_set") {
STATIC_REQUIRE(noexcept(std::declval<set_t&>().clear()));
}
SECTION("types") {
SUBCASE("types") {
using set_t = flat_set<int>;
STATIC_REQUIRE(std::is_same_v<set_t::key_type, int>);
@@ -118,7 +118,7 @@ TEST_CASE("flat_set") {
STATIC_REQUIRE(std::is_same_v<set_t::pointer, int*>);
STATIC_REQUIRE(std::is_same_v<set_t::const_pointer, const int*>);
}
SECTION("ctors") {
SUBCASE("ctors") {
using alloc_t = std::allocator<int>;
using set_t = flat_set<int, std::less<int>, std::vector<int, alloc_t>>;
using set2_t = flat_set<int, std::greater<int>, std::vector<int, alloc_t>>;
@@ -196,7 +196,7 @@ TEST_CASE("flat_set") {
REQUIRE(s1 == set_t{1,2,3});
}
}
SECTION("capacity") {
SUBCASE("capacity") {
using set_t = flat_set<int>;
{
@@ -250,7 +250,7 @@ TEST_CASE("flat_set") {
REQUIRE(s1 == set2_t{1,2,3});
}
}
SECTION("inserts") {
SUBCASE("inserts") {
struct obj_t {
obj_t(int i) : i(i) {}
int i;
@@ -346,7 +346,7 @@ TEST_CASE("flat_set") {
REQUIRE(s1 == set_t{1,2,3});
}
}
SECTION("erasers") {
SUBCASE("erasers") {
using set_t = flat_set<int>;
{
set_t s0{1,2,3,4,5};
@@ -382,7 +382,7 @@ TEST_CASE("flat_set") {
REQUIRE(s1 == set_t{3,4,5});
}
}
SECTION("lookup") {
SUBCASE("lookup") {
using set_t = flat_set<int>;
{
set_t s0{1,2,3,4,5};
@@ -417,7 +417,7 @@ TEST_CASE("flat_set") {
REQUIRE(my_as_const(s0).lower_bound(7) == s0.cbegin() + 3);
}
}
SECTION("heterogeneous") {
SUBCASE("heterogeneous") {
flat_set<std::string, std::less<>> s0{"hello", "world"};
REQUIRE(s0.find(std::string_view("hello")) == s0.begin());
REQUIRE(my_as_const(s0).find(std::string_view("world")) == s0.begin() + 1);
@@ -433,7 +433,7 @@ TEST_CASE("flat_set") {
REQUIRE(s0.upper_bound(std::string_view("hello")) == s0.begin() + 1);
REQUIRE(my_as_const(s0).upper_bound(std::string_view("hello")) == s0.begin() + 1);
}
SECTION("observers") {
SUBCASE("observers") {
struct my_less {
int i;
my_less(int i) : i(i) {}
@@ -446,7 +446,7 @@ TEST_CASE("flat_set") {
REQUIRE(my_as_const(s0).key_comp().i == 42);
REQUIRE(my_as_const(s0).value_comp().i == 42);
}
SECTION("custom_less") {
SUBCASE("custom_less") {
using set_t = flat_set<int, dummy_less<int>>;
auto s0 = set_t(dummy_less<int>(42));
auto s1 = set_t(dummy_less<int>(21));
@@ -456,7 +456,7 @@ TEST_CASE("flat_set") {
REQUIRE(s0.key_comp().i == 21);
REQUIRE(s1.key_comp().i == 42);
}
SECTION("operators") {
SUBCASE("operators") {
using set_t = flat_set<int>;
REQUIRE(set_t{1,2,3} == set_t{3,2,1});

12
untests/flat_tests.cpp
View File

@@ -4,18 +4,18 @@
* Copyright (C) 2019-2020, by Matvey Cherevko (blackmatov@gmail.com)
******************************************************************************/
#define CATCH_CONFIG_FAST_COMPILE
#include <catch2/catch.hpp>
#include <flat.hpp/flat.hpp>
using namespace flat_hpp;
#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
#include "doctest/doctest.h"
namespace
{
using namespace flat_hpp;
}
TEST_CASE("flat_map_detail") {
SECTION("is_sorted") {
SUBCASE("is_sorted") {
auto i1 = {1,2,3,4};
REQUIRE(detail::is_sorted(i1.begin(), i1.end(), std::less<int>()));
REQUIRE_FALSE(detail::is_sorted(i1.begin(), i1.end(), std::greater<int>()));
@@ -28,7 +28,7 @@ TEST_CASE("flat_map_detail") {
REQUIRE_FALSE(detail::is_sorted(i3.begin(), i3.end(), std::less<int>()));
REQUIRE_FALSE(detail::is_sorted(i3.begin(), i3.end(), std::greater<int>()));
}
SECTION("is_sorted_unique") {
SUBCASE("is_sorted_unique") {
auto i1 = {1,2,3,4};
auto i1d = {1,2,2,3,4};
REQUIRE(detail::is_sorted_unique(i1.begin(), i1.end(), std::less<int>()));

10
untests/catch_main.cpp → untests/flat_tests.hpp
View File

@@ -4,6 +4,10 @@
* Copyright (C) 2019-2020, by Matvey Cherevko (blackmatov@gmail.com)
******************************************************************************/
#define CATCH_CONFIG_MAIN
#define CATCH_CONFIG_FAST_COMPILE
#include <catch2/catch.hpp>
#define STATIC_REQUIRE(...)\
static_assert(__VA_ARGS__, #__VA_ARGS__);\
REQUIRE(__VA_ARGS__);
#define STATIC_REQUIRE_FALSE(...)\
static_assert(!(__VA_ARGS__), "!(" #__VA_ARGS__ ")");\
REQUIRE(!(__VA_ARGS__));