utfcpp: Update to 4.0.4

12 files changed, 0 insertions, 747 deletions

diff --git a/lib/utfcpp/v3/tests/CMakeLists.txt b/lib/utfcpp/v3/tests/CMakeLists.txt
deleted file mode 100644
index f3ce2584..00000000
--- a/lib/utfcpp/v3/tests/CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-add_executable(negative ${PROJECT_SOURCE_DIR}/tests/negative.cpp)
-add_executable(cpp11 ${PROJECT_SOURCE_DIR}/tests/test_cpp11.cpp)
-add_executable(cpp17 ${PROJECT_SOURCE_DIR}/tests/test_cpp17.cpp)
-add_executable(apitests ${PROJECT_SOURCE_DIR}/tests/apitests.cpp)
-
-add_executable(noexceptionstests ${PROJECT_SOURCE_DIR}/tests/noexceptionstests.cpp)
-
-target_link_libraries(negative PRIVATE utf8::cpp)
-target_link_libraries(cpp11 PRIVATE utf8::cpp)
-target_link_libraries(cpp17 PRIVATE utf8::cpp)
-target_link_libraries(apitests PRIVATE utf8::cpp)
-target_link_libraries(noexceptionstests PRIVATE utf8::cpp)
-
-target_compile_options(${PROJECT_NAME} INTERFACE
-  $<$<CXX_COMPILER_ID:MSVC>:/W4>
-  $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Wconversion>)
-
-target_compile_options(noexceptionstests PUBLIC -fno-exceptions)
-
-set_target_properties(negative apitests noexceptionstests
-                      PROPERTIES
-                      CXX_STANDARD 98
-                      CXX_STANDARD_REQUIRED YES
-                      CXX_EXTENSIONS NO)
-
-set_target_properties(cpp11
-                      PROPERTIES
-                      CXX_STANDARD 11
-                      CXX_STANDARD_REQUIRED YES
-                      CXX_EXTENSIONS NO)
-
-set_target_properties(cpp17
-                      PROPERTIES
-                      CXX_STANDARD 17
-                      CXX_STANDARD_REQUIRED YES
-                      CXX_EXTENSIONS NO)
-
-add_test(negative_test negative ${PROJECT_SOURCE_DIR}/tests/test_data/utf8_invalid.txt)
-add_test(cpp11_test cpp11)
-add_test(cpp17_test cpp17)
-add_test(api_test apitests)
-add_test(noexceptions_test noexceptionstests)
-
diff --git a/lib/utfcpp/v3/tests/apitests.cpp b/lib/utfcpp/v3/tests/apitests.cpp
deleted file mode 100644
index 083266d7..00000000
--- a/lib/utfcpp/v3/tests/apitests.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "../extern/ftest/ftest.h"
-
-#include "test_checked_api.h"
-#include "test_checked_iterator.h"
-#include "test_unchecked_api.h"
-#include "test_unchecked_iterator.h"
diff --git a/lib/utfcpp/v3/tests/docker/Dockerfile b/lib/utfcpp/v3/tests/docker/Dockerfile
deleted file mode 100644
index 9df3717a..00000000
--- a/lib/utfcpp/v3/tests/docker/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM debian:buster-slim
-
-RUN  apt-get update \
-  && apt-get install -y make g++ cmake git \
-  && rm -rf /var/lib/apt/lists/*
diff --git a/lib/utfcpp/v3/tests/negative.cpp b/lib/utfcpp/v3/tests/negative.cpp
deleted file mode 100644
index f1bcc993..00000000
--- a/lib/utfcpp/v3/tests/negative.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "utf8.h"
-using namespace utf8;
-
-#include <string>
-#include <iostream>
-#include <fstream>
-#include <algorithm>
-using namespace std;
-
-const unsigned INVALID_LINES[] = { 75, 76, 83, 84, 85, 93, 102, 103, 105, 106, 107, 108, 109, 110, 114, 115, 116, 117, 124, 125, 130, 135, 140, 145, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 169, 175, 176, 177, 207, 208, 209, 210, 211, 220, 221, 222, 223, 224, 232, 233, 234, 235, 236, 247, 248, 249, 250, 251, 252, 253, 257, 258, 259, 260, 261, 262, 263, 264};
-const unsigned* INVALID_LINES_END = INVALID_LINES + sizeof(INVALID_LINES)/sizeof(unsigned);
-
-int main(int argc, char** argv)
-{
-    string test_file_path;
-    if (argc == 2) 
-        test_file_path = argv[1];
-    else {
-        cout << "Wrong number of arguments" << endl;
-        return 1;
-    }
-    // Open the test file
-    ifstream fs8(test_file_path.c_str());
-    if (!fs8.is_open()) {
-        cout << "Could not open " << test_file_path << endl;
-        return 1;
-    }
-
-    // Read it line by line
-    unsigned int line_count = 0;
-    char byte;
-    while (!fs8.eof()) {
-        string line;
-        while ((byte = static_cast<char>(fs8.get())) != '\n' && !fs8.eof())
-            line.push_back(byte);
-
-        line_count++;
-        bool expected_valid = (find(INVALID_LINES, INVALID_LINES_END, line_count) == INVALID_LINES_END);
-        // Print out lines that contain unexpected invalid UTF-8
-        if (!is_valid(line.begin(), line.end())) {
-            if (expected_valid) {
-                cout << "Unexpected invalid utf-8 at line " << line_count << '\n';
-                return 1;
-            }
-
-            // try fixing it:
-            string fixed_line;
-            replace_invalid(line.begin(), line.end(), back_inserter(fixed_line));
-            if (!is_valid(fixed_line.begin(), fixed_line.end())) {
-                cout << "replace_invalid() resulted in an invalid utf-8 at line " << line_count << '\n';
-                return 1;
-            }
-        }
-        else if (!expected_valid) {
-            cout << "Invalid utf-8 NOT detected at line " << line_count << '\n';
-            return 1;
-        }
-    }
-}
diff --git a/lib/utfcpp/v3/tests/noexceptionstests.cpp b/lib/utfcpp/v3/tests/noexceptionstests.cpp
deleted file mode 100644
index 108ee750..00000000
--- a/lib/utfcpp/v3/tests/noexceptionstests.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "../extern/ftest/ftest.h"
-
-#include "test_unchecked_api.h"
-#include "test_unchecked_iterator.h"
diff --git a/lib/utfcpp/v3/tests/test_checked_api.h b/lib/utfcpp/v3/tests/test_checked_api.h
deleted file mode 100644
index 3a7067b7..00000000
--- a/lib/utfcpp/v3/tests/test_checked_api.h
+++ /dev/null
@@ -1,198 +0,0 @@
-#ifndef UTF8_FOR_CPP_TEST_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-#define UTF8_FOR_CPP_TEST_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-
-#include "utf8.h"
-
-#include <string>
-#include <vector>
-using namespace utf8;
-using namespace std;
-
-
-TEST(CheckedAPITests, test_append)
-{
-    unsigned char u[5] = {0,0,0,0,0};
-    append(0x0448, u);
-    EXPECT_EQ (u[0], 0xd1);
-    EXPECT_EQ (u[1], 0x88);
-    EXPECT_EQ (u[2], 0);
-    EXPECT_EQ (u[3], 0);
-    EXPECT_EQ (u[4], 0);
-
-    append(0x65e5, u);
-    EXPECT_EQ (u[0], 0xe6);
-    EXPECT_EQ (u[1], 0x97);
-    EXPECT_EQ (u[2], 0xa5);
-    EXPECT_EQ (u[3], 0);
-    EXPECT_EQ (u[4], 0);
-
-    append(0x3044, u);
-    EXPECT_EQ (u[0], 0xe3);
-    EXPECT_EQ (u[1], 0x81);
-    EXPECT_EQ (u[2], 0x84);
-    EXPECT_EQ (u[3], 0);
-    EXPECT_EQ (u[4], 0);
-
-    append(0x10346, u);
-    EXPECT_EQ (u[0], 0xf0);
-    EXPECT_EQ (u[1], 0x90);
-    EXPECT_EQ (u[2], 0x8d);
-    EXPECT_EQ (u[3], 0x86);
-    EXPECT_EQ (u[4], 0);
-
-    // Ensure no warnings with plain char
-    char c[2] = {0,0};
-    append('a', c);
-    EXPECT_EQ (c[0], 'a');
-    EXPECT_EQ (c[1], 0);
-}
-
-TEST(CheckedAPITests, test_next)
-{
-    const char* twochars = "\xe6\x97\xa5\xd1\x88";
-    const char* w = twochars;
-    unsigned int cp = next(w, twochars + 6);
-    EXPECT_EQ (cp, 0x65e5);
-    EXPECT_EQ (w, twochars + 3);
-
-    const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
-    w = threechars;
-
-    cp = next(w, threechars + 9);
-    EXPECT_EQ (cp, 0x10346);
-    EXPECT_EQ (w, threechars + 4);
-
-    cp = next(w, threechars + 9);
-    EXPECT_EQ (cp, 0x65e5);
-    EXPECT_EQ (w, threechars + 7);
-
-    cp = next(w, threechars + 9);
-    EXPECT_EQ (cp, 0x0448);
-    EXPECT_EQ (w, threechars + 9);
-}
-
-TEST(CheckedAPITests, test_peek_next)
-{
-    const char* const cw = "\xe6\x97\xa5\xd1\x88";
-    unsigned int cp = peek_next(cw, cw + 6);
-    EXPECT_EQ (cp, 0x65e5);
-}
-
-TEST(CheckedAPITests, test_prior)
-{
-    const char* twochars = "\xe6\x97\xa5\xd1\x88";
-    const char* w = twochars + 3;
-    unsigned int cp = prior (w, twochars);
-    EXPECT_EQ (cp, 0x65e5);
-    EXPECT_EQ (w, twochars);
-
-    const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
-    w = threechars + 9;
-    cp = prior(w, threechars);
-    EXPECT_EQ (cp, 0x0448);
-    EXPECT_EQ (w, threechars + 7);
-    cp = prior(w, threechars);
-    EXPECT_EQ (cp, 0x65e5);
-    EXPECT_EQ (w, threechars + 4);
-    cp = prior(w, threechars);
-    EXPECT_EQ (cp, 0x10346);
-    EXPECT_EQ (w, threechars);
-}
-
-TEST(CheckedAPITests, test_advance)
-{
-    const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
-    const char* w = threechars;
-    advance(w, 2, threechars + 9);
-    EXPECT_EQ(w, threechars + 7);
-    advance(w, -2, threechars);
-    EXPECT_EQ(w, threechars);
-    advance(w, 3, threechars + 9);
-    EXPECT_EQ(w, threechars + 9);
-    advance(w, -2, threechars);
-    EXPECT_EQ(w, threechars + 4);
-    advance(w, -1, threechars);
-    EXPECT_EQ(w, threechars);
-}
-
-TEST(CheckedAPITests, test_distance)
-{
-    const char* twochars = "\xe6\x97\xa5\xd1\x88";
-    size_t dist = static_cast<size_t>(utf8::distance(twochars, twochars + 5));
-    EXPECT_EQ (dist, 2);
-}
-
-TEST(CheckedAPITests, test_utf32to8)
-{
-    unsigned int utf32string[] = {0x448, 0x65E5, 0x10346, 0};
-    string utf8result;
-    utf32to8(utf32string, utf32string + 3, back_inserter(utf8result));
-    EXPECT_EQ (utf8result.size(), 9);
-}
-
-TEST(CheckedAPITests, test_utf8to32)
-{
-    const char* twochars = "\xe6\x97\xa5\xd1\x88";
-    vector<unsigned int> utf32result;
-    utf8to32(twochars, twochars + 5, back_inserter(utf32result));
-    EXPECT_EQ (utf32result.size(), 2);
-}
-
-TEST(CheckedAPITests, test_utf16to8)
-{
-    unsigned short utf16string[] = {0x41, 0x0448, 0x65e5, 0xd834, 0xdd1e};
-    string utf8result;
-    utf16to8(utf16string, utf16string + 5, back_inserter(utf8result));
-    EXPECT_EQ (utf8result.size(), 10);
-}
-
-TEST(CheckedAPITests, test_utf8to16)
-{
-    char utf8_with_surrogates[] = "\xe6\x97\xa5\xd1\x88\xf0\x9d\x84\x9e";
-    vector <unsigned short> utf16result;
-    utf8to16(utf8_with_surrogates, utf8_with_surrogates + 9, back_inserter(utf16result));
-    EXPECT_EQ (utf16result.size(), 4);
-    EXPECT_EQ (utf16result[2], 0xd834);
-    EXPECT_EQ (utf16result[3], 0xdd1e);
-}
-
-TEST(CheckedAPITests, test_replace_invalid)
-{
-    char invalid_sequence[] = "a\x80\xe0\xa0\xc0\xaf\xed\xa0\x80z";
-    vector<char> replace_invalid_result;
-    replace_invalid (invalid_sequence, invalid_sequence + sizeof(invalid_sequence), std::back_inserter(replace_invalid_result), '?');
-    bool bvalid = is_valid(replace_invalid_result.begin(), replace_invalid_result.end());
-    EXPECT_TRUE (bvalid);
-    const char fixed_invalid_sequence[] = "a????z";
-    EXPECT_EQ (sizeof(fixed_invalid_sequence), replace_invalid_result.size());
-    EXPECT_TRUE (std::equal(replace_invalid_result.begin(), replace_invalid_result.begin() + sizeof(fixed_invalid_sequence), fixed_invalid_sequence));
-}
-
-TEST(CheckedAPITests, test_find_invalid)
-{
-    char utf_invalid[] = "\xe6\x97\xa5\xd1\x88\xfa";
-    char* invalid = find_invalid(utf_invalid, utf_invalid + 6);
-    EXPECT_EQ (invalid, utf_invalid + 5);
-}
-
-TEST(CheckedAPITests, test_is_valid)
-{
-    char utf_invalid[] = "\xe6\x97\xa5\xd1\x88\xfa";
-    bool bvalid = is_valid(utf_invalid, utf_invalid + 6);
-    EXPECT_FALSE (bvalid);
-    char utf8_with_surrogates[] = "\xe6\x97\xa5\xd1\x88\xf0\x9d\x84\x9e";
-    bvalid = is_valid(utf8_with_surrogates, utf8_with_surrogates + 9);
-    EXPECT_TRUE (bvalid);
-}
-
-TEST(CheckedAPITests, test_starts_with_bom)
-{
-    unsigned char byte_order_mark[] = {0xef, 0xbb, 0xbf};
-    bool bbom = starts_with_bom(byte_order_mark, byte_order_mark + sizeof(byte_order_mark));
-    EXPECT_TRUE (bbom);
-    const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
-    bool no_bbom = starts_with_bom(threechars, threechars + sizeof(threechars));
-    EXPECT_FALSE (no_bbom);
-}
-
-#endif
diff --git a/lib/utfcpp/v3/tests/test_checked_iterator.h b/lib/utfcpp/v3/tests/test_checked_iterator.h
deleted file mode 100644
index 2829a734..00000000
--- a/lib/utfcpp/v3/tests/test_checked_iterator.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef UTF8_FOR_CPP_TEST_CHECKED_ITERATOR_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-#define UTF8_FOR_CPP_TEST_CHECKED_ITERATOR_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-
-#include "utf8.h"
-
-using namespace utf8;
-
-
-TEST(CheckedIteratrTests, test_increment)
-{
-    const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
-    utf8::iterator<const char*> it(threechars, threechars, threechars + 9);
-    utf8::iterator<const char*> it2 = it;
-    EXPECT_EQ (it2, it);
-    EXPECT_EQ (*it, 0x10346);
-    EXPECT_EQ (*(++it), 0x65e5);
-    EXPECT_EQ ((*it++), 0x65e5);
-    EXPECT_EQ (*it, 0x0448);
-    EXPECT_NE (it, it2);
-    utf8::iterator<const char*> endit (threechars + 9, threechars, threechars + 9);
-    EXPECT_EQ (++it, endit);
-}
-
-TEST(CheckedIteratrTests, test_decrement)
-{
-    const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
-    utf8::iterator<const char*> it(threechars+9, threechars, threechars + 9);
-    EXPECT_EQ (*(--it), 0x0448);
-    EXPECT_EQ ((*it--), 0x0448);
-    EXPECT_EQ (*it, 0x65e5);
-    EXPECT_EQ (--it, utf8::iterator<const char*>(threechars, threechars, threechars + 9));
-    EXPECT_EQ (*it, 0x10346);
-}
-
-#endif
diff --git a/lib/utfcpp/v3/tests/test_cpp11.cpp b/lib/utfcpp/v3/tests/test_cpp11.cpp
deleted file mode 100644
index ee4ddd8f..00000000
--- a/lib/utfcpp/v3/tests/test_cpp11.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-#include "../extern/ftest/ftest.h"
-#include "utf8.h"
-#include <string>
-using namespace utf8;
-using namespace std;
-
-#if __cplusplus >= 201103L // C++ 11 or later
-
-TEST(CPP11APITests, test_append)
-{
-    string u;
-    append(0x0448, u);
-    EXPECT_EQ (u[0], char(0xd1));
-    EXPECT_EQ (u[1], char(0x88));
-    EXPECT_EQ (u.length(), 2);
-
-    u.clear();
-    append(0x65e5, u);
-    EXPECT_EQ (u[0], char(0xe6));
-    EXPECT_EQ (u[1], char(0x97));
-    EXPECT_EQ (u[2], char(0xa5));
-    EXPECT_EQ (u.length(), 3);
-
-    u.clear();
-    append(0x3044, u);
-    EXPECT_EQ (u[0], char(0xe3));
-    EXPECT_EQ (u[1], char(0x81));
-    EXPECT_EQ (u[2], char(0x84));
-    EXPECT_EQ (u.length(), 3);
-
-    u.clear();
-    append(0x10346, u);
-    EXPECT_EQ (u[0], char(0xf0));
-    EXPECT_EQ (u[1], char(0x90));
-    EXPECT_EQ (u[2], char(0x8d));
-    EXPECT_EQ (u[3], char(0x86));
-    EXPECT_EQ (u.length(), 4);
-}
-
-TEST(CPP11APITests, test_utf16to8)
-{
-    u16string utf16string = {0x41, 0x0448, 0x65e5, 0xd834, 0xdd1e};
-    string u = utf16to8(utf16string);
-    EXPECT_EQ (u.size(), 10);
-}
-
-TEST(CPP11APITests, test_utf8to16)
-{
-    string utf8_with_surrogates = "\xe6\x97\xa5\xd1\x88\xf0\x9d\x84\x9e";
-    u16string utf16result = utf8to16(utf8_with_surrogates);
-    EXPECT_EQ (utf16result.size(), 4);
-    EXPECT_EQ (utf16result[2], 0xd834);
-    EXPECT_EQ (utf16result[3], 0xdd1e);
-    // Just to make sure it compiles with string literals
-    utf8to16(u8"simple");
-    utf8to16("simple");
-}
-
-TEST(CPP11APITests, test_utf32to8)
-{
-    u32string utf32string = {0x448, 0x65E5, 0x10346};
-    string utf8result = utf32to8(utf32string);
-    EXPECT_EQ (utf8result.size(), 9);
-}
-
-TEST(CPP11APITests, test_utf8to32)
-{
-    const char* twochars = "\xe6\x97\xa5\xd1\x88";
-    u32string utf32result = utf8to32(twochars);
-    EXPECT_EQ (utf32result.size(), 2);
-}
-
-TEST(CPP11APITests, test_find_invalid)
-{
-    string utf_invalid = "\xe6\x97\xa5\xd1\x88\xfa";
-    auto invalid = find_invalid(utf_invalid);
-    EXPECT_EQ (invalid, 5);
-}
-
-TEST(CPP11APITests, test_is_valid)
-{
-    string utf_invalid = "\xe6\x97\xa5\xd1\x88\xfa";
-    bool bvalid = is_valid(utf_invalid);
-    EXPECT_FALSE (bvalid);
-    string utf8_with_surrogates = "\xe6\x97\xa5\xd1\x88\xf0\x9d\x84\x9e";
-    bvalid = is_valid(utf8_with_surrogates);
-    EXPECT_TRUE (bvalid);
-}
-
-TEST(CPP11APITests, test_replace_invalid)
-{
-    string invalid_sequence = "a\x80\xe0\xa0\xc0\xaf\xed\xa0\x80z";
-    string replace_invalid_result = replace_invalid(invalid_sequence, '?');
-    bool bvalid = is_valid(replace_invalid_result);
-    EXPECT_TRUE (bvalid);
-    const string fixed_invalid_sequence = "a????z";
-    EXPECT_EQ(fixed_invalid_sequence, replace_invalid_result);
-}
-
-TEST(CPP11APITests, test_starts_with_bom)
-{
-    string byte_order_mark = {char(0xef), char(0xbb), char(0xbf)};
-    bool bbom = starts_with_bom(byte_order_mark);
-    EXPECT_TRUE (bbom);
-    string threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
-    bool no_bbom = starts_with_bom(threechars);
-    EXPECT_FALSE (no_bbom);
-}
-#endif  // C++ 11 or later
diff --git a/lib/utfcpp/v3/tests/test_cpp17.cpp b/lib/utfcpp/v3/tests/test_cpp17.cpp
deleted file mode 100644
index 4b87816b..00000000
--- a/lib/utfcpp/v3/tests/test_cpp17.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-#include "../extern/ftest/ftest.h"
-#include "utf8.h"
-#include <string>
-using namespace utf8;
-using namespace std;
-
-#if __cplusplus >= 201703L // C++ 17 or later
-
-
-TEST(CPP17APITests, test_utf16to8)
-{
-    u16string utf16string = {0x41, 0x0448, 0x65e5, 0xd834, 0xdd1e};
-    u16string_view utf16stringview(u16string);
-    string u = utf16to8(utf16string);
-    EXPECT_EQ (u.size(), 10);
-}
-
-TEST(CPP17APITests, test_utf8to16)
-{
-    string_view utf8_with_surrogates = "\xe6\x97\xa5\xd1\x88\xf0\x9d\x84\x9e";
-    u16string utf16result = utf8to16(utf8_with_surrogates);
-    EXPECT_EQ (utf16result.size(), 4);
-    EXPECT_EQ (utf16result[2], 0xd834);
-    EXPECT_EQ (utf16result[3], 0xdd1e);
-}
-
-TEST(CPP17APITests, test_utf32to8)
-{
-    u32string utf32string = {0x448, 0x65E5, 0x10346};
-    u32string_view utf32stringview(utf32string);
-    string utf8result = utf32to8(utf32stringview);
-    EXPECT_EQ (utf8result.size(), 9);
-}
-
-TEST(CPP17APITests, test_utf8to32)
-{
-    string_view twochars = "\xe6\x97\xa5\xd1\x88";
-    u32string utf32result = utf8to32(twochars);
-    EXPECT_EQ (utf32result.size(), 2);
-}
-
-TEST(CPP17APITests, test_find_invalid)
-{
-    string_view utf_invalid = "\xe6\x97\xa5\xd1\x88\xfa";
-    auto invalid = find_invalid(utf_invalid);
-    EXPECT_EQ (invalid, 5);
-}
-
-TEST(CPP17APITests, test_is_valid)
-{
-    string_view utf_invalid = "\xe6\x97\xa5\xd1\x88\xfa";
-    bool bvalid = is_valid(utf_invalid);
-    EXPECT_FALSE (bvalid);
-    string_view utf8_with_surrogates = "\xe6\x97\xa5\xd1\x88\xf0\x9d\x84\x9e";
-    bvalid = is_valid(utf8_with_surrogates);
-    EXPECT_TRUE (bvalid);
-}
-
-TEST(CPP17APITests, test_replace_invalid)
-{
-    string_view invalid_sequence = "a\x80\xe0\xa0\xc0\xaf\xed\xa0\x80z";
-    string replace_invalid_result = replace_invalid(invalid_sequence, '?');
-    bool bvalid = is_valid(replace_invalid_result);
-    EXPECT_TRUE (bvalid);
-    const string fixed_invalid_sequence = "a????z";
-    EXPECT_EQ(fixed_invalid_sequence, replace_invalid_result);
-}
-
-TEST(CPP17APITests, test_starts_with_bom)
-{
-    string byte_order_mark = {char(0xef), char(0xbb), char(0xbf)};
-    string_view byte_order_mark_view(byte_order_mark);
-    bool bbom = starts_with_bom(byte_order_mark_view);
-    EXPECT_TRUE (bbom);
-    string_view threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
-    bool no_bbom = starts_with_bom(threechars);
-    EXPECT_FALSE (no_bbom);
-}
-
-TEST(CPP17APITests, string_class_and_literals)
-{
-    const char* twochars = u8"ab";
-    EXPECT_TRUE (is_valid(twochars));
-    const string two_chars_string(twochars);
-    EXPECT_TRUE (is_valid(two_chars_string));
-}
-
-#endif  // C++ 11 or later
diff --git a/lib/utfcpp/v3/tests/test_data/utf8_invalid.txt b/lib/utfcpp/v3/tests/test_data/utf8_invalid.txt
deleted file mode 100644
index ae831593..00000000
--- a/lib/utfcpp/v3/tests/test_data/utf8_invalid.txt
+++ /dev/null
diff --git a/lib/utfcpp/v3/tests/test_unchecked_api.h b/lib/utfcpp/v3/tests/test_unchecked_api.h
deleted file mode 100644
index 10c5991e..00000000
--- a/lib/utfcpp/v3/tests/test_unchecked_api.h
+++ /dev/null
@@ -1,164 +0,0 @@
-#ifndef UTF8_FOR_CPP_TEST_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-#define UTF8_FOR_CPP_TEST_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-
-#include "utf8/unchecked.h"
-
-#include <string>
-#include <vector>
-
-using namespace std;
-
-TEST(UnCheckedAPITests, test_append)
-{
-    unsigned char u[5] = {0,0,0,0,0};
-    utf8::unchecked::append(0x0448, u);
-    EXPECT_EQ (u[0], 0xd1);
-    EXPECT_EQ (u[1], 0x88);
-    EXPECT_EQ (u[2], 0);
-    EXPECT_EQ (u[3], 0);
-    EXPECT_EQ (u[4], 0);
-
-    utf8::unchecked::append(0x65e5, u);
-    EXPECT_EQ (u[0], 0xe6);
-    EXPECT_EQ (u[1], 0x97);
-    EXPECT_EQ (u[2], 0xa5);
-    EXPECT_EQ (u[3], 0);
-    EXPECT_EQ (u[4], 0);
-
-    utf8::unchecked::append(0x3044, u);
-    EXPECT_EQ (u[0], 0xe3);
-    EXPECT_EQ (u[1], 0x81);
-    EXPECT_EQ (u[2], 0x84);
-    EXPECT_EQ (u[3], 0);
-    EXPECT_EQ (u[4], 0);
-
-    utf8::unchecked::append(0x10346, u);
-    EXPECT_EQ (u[0], 0xf0);
-    EXPECT_EQ (u[1], 0x90);
-    EXPECT_EQ (u[2], 0x8d);
-    EXPECT_EQ (u[3], 0x86);
-    EXPECT_EQ (u[4], 0);
-}
-
-TEST(UnCheckedAPITests, test_next)
-{
-    const char* twochars = "\xe6\x97\xa5\xd1\x88";
-    const char* w = twochars;
-    unsigned int cp = utf8::unchecked::next(w);
-    EXPECT_EQ (cp, 0x65e5);
-    EXPECT_EQ (w, twochars + 3);
-
-    const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
-    w = threechars;
-
-    cp = utf8::unchecked::next(w);
-    EXPECT_EQ (cp, 0x10346);
-    EXPECT_EQ (w, threechars + 4);
-
-    cp = utf8::unchecked::next(w);
-    EXPECT_EQ (cp, 0x65e5);
-    EXPECT_EQ (w, threechars + 7);
-
-    cp = utf8::unchecked::next(w);
-    EXPECT_EQ (cp, 0x0448);
-    EXPECT_EQ (w, threechars + 9);
-}
-
-TEST(UnCheckedAPITests, test_peek_next)
-{
-    const char* const cw = "\xe6\x97\xa5\xd1\x88";
-    unsigned int cp = utf8::unchecked::peek_next(cw);
-    EXPECT_EQ (cp, 0x65e5);
-}
-
-TEST(UnCheckedAPITests, test_prior)
-{
-    const char* twochars = "\xe6\x97\xa5\xd1\x88";
-    const char* w = twochars + 3;
-    unsigned int cp = utf8::unchecked::prior (w);
-    EXPECT_EQ (cp, 0x65e5);
-    EXPECT_EQ (w, twochars);
-
-    const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
-    w = threechars + 9;
-    cp = utf8::unchecked::prior(w);
-    EXPECT_EQ (cp, 0x0448);
-    EXPECT_EQ (w, threechars + 7);
-    cp = utf8::unchecked::prior(w);
-    EXPECT_EQ (cp, 0x65e5);
-    EXPECT_EQ (w, threechars + 4);
-    cp = utf8::unchecked::prior(w);
-    EXPECT_EQ (cp, 0x10346);
-    EXPECT_EQ (w, threechars);
-}
-
-TEST(UnCheckedAPITests, test_advance)
-{
-    const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
-    const char* w = threechars;
-    utf8::unchecked::advance(w, 2);
-    EXPECT_EQ(w, threechars + 7);
-    utf8::unchecked::advance(w, -2);
-    EXPECT_EQ(w, threechars);
-    utf8::unchecked::advance(w, 3);
-    EXPECT_EQ(w, threechars + 9);
-    utf8::unchecked::advance(w, -2);
-    EXPECT_EQ(w, threechars + 4);
-    utf8::unchecked::advance(w, -1);
-    EXPECT_EQ(w, threechars);
-}
-
-TEST(UnCheckedAPITests, test_distance)
-{
-    const char* twochars = "\xe6\x97\xa5\xd1\x88";
-    size_t dist = static_cast<size_t>(utf8::unchecked::distance(twochars, twochars + 5));
-    EXPECT_EQ (dist, 2);
-}
-
-TEST(UnCheckedAPITests, test_utf32to8)
-{
-    unsigned int utf32string[] = {0x448, 0x65E5, 0x10346, 0};
-    string utf8result;
-    utf8::unchecked::utf32to8(utf32string, utf32string + 3, back_inserter(utf8result));
-    EXPECT_EQ (utf8result.size(), 9);
-}
-
-TEST(UnCheckedAPITests, test_utf8to32)
-{
-    const char* twochars = "\xe6\x97\xa5\xd1\x88";
-    vector<unsigned int> utf32result;
-    utf8::unchecked::utf8to32(twochars, twochars + 5, back_inserter(utf32result));
-    EXPECT_EQ (utf32result.size(), 2);
-}
-
-TEST(UnCheckedAPITests, test_utf16to8)
-{
-    unsigned short utf16string[] = {0x41, 0x0448, 0x65e5, 0xd834, 0xdd1e};
-    string utf8result;
-    utf8::unchecked::utf16to8(utf16string, utf16string + 5, back_inserter(utf8result));
-    EXPECT_EQ (utf8result.size(), 10);
-}
-
-TEST(UnCheckedAPITests, test_utf8to16)
-{
-    char utf8_with_surrogates[] = "\xe6\x97\xa5\xd1\x88\xf0\x9d\x84\x9e";
-    vector <unsigned short> utf16result;
-    utf8::unchecked::utf8to16(utf8_with_surrogates, utf8_with_surrogates + 9, back_inserter(utf16result));
-    EXPECT_EQ (utf16result.size(), 4);
-    EXPECT_EQ (utf16result[2], 0xd834);
-    EXPECT_EQ (utf16result[3], 0xdd1e);
-}
-
-TEST(UnCheckedAPITests, test_replace_invalid)
-{
-    char invalid_sequence[] = "a\x80\xe0\xa0\xc0\xaf\xed\xa0\x80z";
-    vector<char> replace_invalid_result;
-    utf8::unchecked::replace_invalid (invalid_sequence, invalid_sequence + sizeof(invalid_sequence), std::back_inserter(replace_invalid_result), '?');
-    bool bvalid = utf8::is_valid(replace_invalid_result.begin(), replace_invalid_result.end());
-    EXPECT_TRUE (bvalid);
-    const char fixed_invalid_sequence[] = "a????z";
-    EXPECT_EQ (sizeof(fixed_invalid_sequence), replace_invalid_result.size());
-    EXPECT_TRUE (std::equal(replace_invalid_result.begin(), replace_invalid_result.begin() + sizeof(fixed_invalid_sequence), fixed_invalid_sequence));
-}
-
-#endif
diff --git a/lib/utfcpp/v3/tests/test_unchecked_iterator.h b/lib/utfcpp/v3/tests/test_unchecked_iterator.h
deleted file mode 100644
index 4294232d..00000000
--- a/lib/utfcpp/v3/tests/test_unchecked_iterator.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef UTF8_FOR_CPP_TEST_UNCHECKED_ITERATOR_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-#define UTF8_FOR_CPP_TEST_UNCHECKED_ITERATOR_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-
-#include "utf8/unchecked.h"
-
-using namespace utf8::unchecked;
-
-
-TEST(UnCheckedIteratrTests, test_increment)
-{
-    const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
-    utf8::unchecked::iterator<const char*> it(threechars);
-    utf8::unchecked::iterator<const char*> it2 = it;
-    EXPECT_EQ (it2, it);
-    EXPECT_EQ (*it, 0x10346);
-    EXPECT_EQ (*(++it), 0x65e5);
-    EXPECT_EQ ((*it++), 0x65e5);
-    EXPECT_EQ (*it, 0x0448);
-    EXPECT_NE (it, it2);
-    utf8::unchecked::iterator<const char*> endit (threechars + 9);
-    EXPECT_EQ (++it, endit);
-}
-
-TEST(UnCheckedIteratrTests, test_decrement)
-{
-    const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
-    utf8::unchecked::iterator<const char*> it(threechars+9);
-    EXPECT_EQ (*(--it), 0x0448);
-    EXPECT_EQ ((*it--), 0x0448);
-    EXPECT_EQ (*it, 0x65e5);
-    EXPECT_EQ (--it, utf8::unchecked::iterator<const char*>(threechars));
-    EXPECT_EQ (*it, 0x10346);
-
-}
-
-#endif