replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[libc++][format[[nfc] Use string_view in tests. 

This change is a preparation for adapting the tests for
  P2216 std::format improvements

Reviewed By: #libc, Quuxplusone, ldionne

Differential Revision: https://reviews.llvm.org/D118717
This commit is contained in:
Mark de Wever 2022-01-29 14:52:41 +01:00
parent 841817b1ed
commit e885b1137b
14 changed files with 3154 additions and 3156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libcxx/test/std/utilities/format/format.functions/format.locale.pass.cpp
View File

@ -27,7 +27,7 @@
#include "test_macros.h"
#include "format_tests.h"
auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, std::basic_string<CharT> fmt,
auto test = []<class CharT, class... Args>(std::basic_string_view<CharT> expected, std::basic_string_view<CharT> fmt,
const Args&... args) {
std::basic_string<CharT> out = std::format(std::locale(), fmt, args...);
if constexpr (std::same_as<CharT, char>)
@ -37,15 +37,15 @@ auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, st
assert(out == expected);
};
auto test_exception =
[]<class CharT, class... Args>(std::string_view what, std::basic_string<CharT> fmt, const Args&... args) {
auto test_exception = []<class CharT, class... Args>(std::string_view what, std::basic_string_view<CharT> fmt,
const Args&... args) {
#ifndef TEST_HAS_NO_EXCEPTIONS
try {
std::format(std::locale(), fmt, args...);
if constexpr (std::same_as<CharT, char>)
std::cerr << "\nFormat string " << fmt << "\nDidn't throw an exception.\n";
assert(false);
} catch (std::format_error& e) {
} catch (const std::format_error& e) {
# ifdef _LIBCPP_VERSION
if constexpr (std::same_as<CharT, char>)
if (e.what() != what)

8
libcxx/test/std/utilities/format/format.functions/format.pass.cpp
View File

@ -32,7 +32,7 @@
#include "test_macros.h"
#include "format_tests.h"
auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, std::basic_string<CharT> fmt,
auto test = []<class CharT, class... Args>(std::basic_string_view<CharT> expected, std::basic_string_view<CharT> fmt,
const Args&... args) {
std::basic_string<CharT> out = std::format(fmt, args...);
#ifndef _LIBCPP_HAS_NO_LOCALIZATION
@ -44,8 +44,8 @@ auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, st
assert(out == expected);
};
auto test_exception =
[]<class CharT, class... Args>(std::string_view what, std::basic_string<CharT> fmt, const Args&... args) {
auto test_exception = []<class CharT, class... Args>(std::string_view what, std::basic_string_view<CharT> fmt,
const Args&... args) {
#ifndef TEST_HAS_NO_EXCEPTIONS
try {
std::format(fmt, args...);
@ -54,7 +54,7 @@ auto test_exception =
std::cerr << "\nFormat string " << fmt << "\nDidn't throw an exception.\n";
# endif
assert(false);
} catch (std::format_error& e) {
} catch (const std::format_error& e) {
# if defined(_LIBCPP_VERSION) && !defined(_LIBCPP_HAS_NO_LOCALIZATION)
if constexpr (std::same_as<CharT, char>)
if (e.what() != what)

2956
libcxx/test/std/utilities/format/format.functions/format_tests.h
View File

File diff suppressed because it is too large Load Diff

8
libcxx/test/std/utilities/format/format.functions/format_to.locale.pass.cpp
View File

@ -30,7 +30,7 @@
#include "test_macros.h"
#include "format_tests.h"
auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, std::basic_string<CharT> fmt,
auto test = []<class CharT, class... Args>(std::basic_string_view<CharT> expected, std::basic_string_view<CharT> fmt,
const Args&... args) {
{
std::basic_string<CharT> out(expected.size(), CharT(' '));
@ -58,14 +58,14 @@ auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, st
}
};
auto test_exception =
[]<class CharT, class... Args>(std::string_view what, std::basic_string<CharT> fmt, const Args&... args) {
auto test_exception = []<class CharT, class... Args>(std::string_view what, std::basic_string_view<CharT> fmt,
const Args&... args) {
#ifndef TEST_HAS_NO_EXCEPTIONS
try {
std::basic_string<CharT> out;
std::format_to(std::back_inserter(out), std::locale(), fmt, args...);
assert(false);
} catch (std::format_error& e) {
} catch (const std::format_error& e) {
LIBCPP_ASSERT(e.what() == what);
return;
}

8
libcxx/test/std/utilities/format/format.functions/format_to.pass.cpp
View File

@ -31,7 +31,7 @@
#include "test_macros.h"
#include "format_tests.h"
auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, std::basic_string<CharT> fmt,
auto test = []<class CharT, class... Args>(std::basic_string_view<CharT> expected, std::basic_string_view<CharT> fmt,
const Args&... args) {
{
std::basic_string<CharT> out(expected.size(), CharT(' '));
@ -59,14 +59,14 @@ auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, st
}
};
auto test_exception =
[]<class CharT, class... Args>(std::string_view what, std::basic_string<CharT> fmt, const Args&... args) {
auto test_exception = []<class CharT, class... Args>(std::string_view what, std::basic_string_view<CharT> fmt,
const Args&... args) {
#ifndef TEST_HAS_NO_EXCEPTIONS
try {
std::basic_string<CharT> out;
std::format_to(std::back_inserter(out), fmt, args...);
assert(false);
} catch (std::format_error& e) {
} catch (const std::format_error& e) {
LIBCPP_ASSERT(e.what() == what);
return;
}

8
libcxx/test/std/utilities/format/format.functions/format_to_n.locale.pass.cpp
View File

@ -32,7 +32,7 @@
#include "test_macros.h"
#include "format_tests.h"
auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, std::basic_string<CharT> fmt,
auto test = []<class CharT, class... Args>(std::basic_string_view<CharT> expected, std::basic_string_view<CharT> fmt,
const Args&... args) {
{
std::list<CharT> out;
@ -92,14 +92,14 @@ auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, st
}
};
auto test_exception =
[]<class CharT, class... Args>(std::string_view what, std::basic_string<CharT> fmt, const Args&... args) {
auto test_exception = []<class CharT, class... Args>(std::string_view what, std::basic_string_view<CharT> fmt,
const Args&... args) {
#ifndef TEST_HAS_NO_EXCEPTIONS
try {
std::basic_string<CharT> out;
std::format_to_n(std::back_inserter(out), 0, std::locale(), fmt, args...);
assert(false);
} catch (std::format_error& e) {
} catch (const std::format_error& e) {
LIBCPP_ASSERT(e.what() == what);
return;
}

8
libcxx/test/std/utilities/format/format.functions/format_to_n.pass.cpp
View File

@ -29,7 +29,7 @@
#include "test_macros.h"
#include "format_tests.h"
auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, std::basic_string<CharT> fmt,
auto test = []<class CharT, class... Args>(std::basic_string_view<CharT> expected, std::basic_string_view<CharT> fmt,
const Args&... args) {
{
std::list<CharT> out;
@ -89,14 +89,14 @@ auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, st
}
};
auto test_exception =
[]<class CharT, class... Args>(std::string_view what, std::basic_string<CharT> fmt, const Args&... args) {
auto test_exception = []<class CharT, class... Args>(std::string_view what, std::basic_string_view<CharT> fmt,
const Args&... args) {
#ifndef TEST_HAS_NO_EXCEPTIONS
try {
std::basic_string<CharT> out;
std::format_to_n(std::back_inserter(out), 0, fmt, args...);
assert(false);
} catch (std::format_error& e) {
} catch (const std::format_error& e) {
LIBCPP_ASSERT(e.what() == what);
return;
}

8
libcxx/test/std/utilities/format/format.functions/formatted_size.locale.pass.cpp
View File

@ -28,19 +28,19 @@
#include "test_macros.h"
#include "format_tests.h"
auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, std::basic_string<CharT> fmt,
auto test = []<class CharT, class... Args>(std::basic_string_view<CharT> expected, std::basic_string_view<CharT> fmt,
const Args&... args) {
size_t size = std::formatted_size(std::locale(), fmt, args...);
assert(size == expected.size());
};
auto test_exception =
[]<class CharT, class... Args>(std::string_view what, std::basic_string<CharT> fmt, const Args&... args) {
auto test_exception = []<class CharT, class... Args>(std::string_view what, std::basic_string_view<CharT> fmt,
const Args&... args) {
#ifndef TEST_HAS_NO_EXCEPTIONS
try {
std::formatted_size(std::locale(), fmt, args...);
assert(false);
} catch (std::format_error& e) {
} catch (const std::format_error& e) {
LIBCPP_ASSERT(e.what() == what);
return;
}

8
libcxx/test/std/utilities/format/format.functions/formatted_size.pass.cpp
View File

@ -25,19 +25,19 @@
#include "test_macros.h"
#include "format_tests.h"
auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, std::basic_string<CharT> fmt,
auto test = []<class CharT, class... Args>(std::basic_string_view<CharT> expected, std::basic_string_view<CharT> fmt,
const Args&... args) {
size_t size = std::formatted_size(fmt, args...);
assert(size == expected.size());
};
auto test_exception =
[]<class CharT, class... Args>(std::string_view what, std::basic_string<CharT> fmt, const Args&... args) {
auto test_exception = []<class CharT, class... Args>(std::string_view what, std::basic_string_view<CharT> fmt,
const Args&... args) {
#ifndef TEST_HAS_NO_EXCEPTIONS
try {
std::formatted_size(fmt, args...);
assert(false);
} catch (std::format_error& e) {
} catch (const std::format_error& e) {
LIBCPP_ASSERT(e.what() == what);
return;
}

3258
libcxx/test/std/utilities/format/format.functions/locale-specific_form.pass.cpp
View File

File diff suppressed because it is too large Load Diff

8
libcxx/test/std/utilities/format/format.functions/vformat.locale.pass.cpp
View File

@ -24,19 +24,19 @@
#include "test_macros.h"
#include "format_tests.h"
auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, std::basic_string<CharT> fmt,
auto test = []<class CharT, class... Args>(std::basic_string_view<CharT> expected, std::basic_string_view<CharT> fmt,
const Args&... args) {
std::basic_string<CharT> out = std::vformat(std::locale(), fmt, std::make_format_args<context_t<CharT>>(args...));
assert(out == expected);
};
auto test_exception =
[]<class CharT, class... Args>(std::string_view what, std::basic_string<CharT> fmt, const Args&... args) {
auto test_exception = []<class CharT, class... Args>(std::string_view what, std::basic_string_view<CharT> fmt,
const Args&... args) {
#ifndef TEST_HAS_NO_EXCEPTIONS
try {
(void)std::vformat(std::locale(), fmt, std::make_format_args<context_t<CharT>>(args...));
assert(false);
} catch ([[maybe_unused]] std::format_error& e) {
} catch ([[maybe_unused]] const std::format_error& e) {
LIBCPP_ASSERT(e.what() == what);
return;
}

8
libcxx/test/std/utilities/format/format.functions/vformat.pass.cpp
View File

@ -23,19 +23,19 @@
#include "test_macros.h"
#include "format_tests.h"
auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, std::basic_string<CharT> fmt,
auto test = []<class CharT, class... Args>(std::basic_string_view<CharT> expected, std::basic_string_view<CharT> fmt,
const Args&... args) {
std::basic_string<CharT> out = std::vformat(fmt, std::make_format_args<context_t<CharT>>(args...));
assert(out == expected);
};
auto test_exception =
[]<class CharT, class... Args>(std::string_view what, std::basic_string<CharT> fmt, const Args&... args) {
auto test_exception = []<class CharT, class... Args>(std::string_view what, std::basic_string_view<CharT> fmt,
const Args&... args) {
#ifndef TEST_HAS_NO_EXCEPTIONS
try {
TEST_IGNORE_NODISCARD std::vformat(fmt, std::make_format_args<context_t<CharT>>(args...));
assert(false);
} catch ([[maybe_unused]] std::format_error& e) {
} catch ([[maybe_unused]] const std::format_error& e) {
LIBCPP_ASSERT(e.what() == what);
return;
}

8
libcxx/test/std/utilities/format/format.functions/vformat_to.locale.pass.cpp
View File

@ -30,7 +30,7 @@
#include "test_macros.h"
#include "format_tests.h"
auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, std::basic_string<CharT> fmt,
auto test = []<class CharT, class... Args>(std::basic_string_view<CharT> expected, std::basic_string_view<CharT> fmt,
const Args&... args) {
{
std::basic_string<CharT> out(expected.size(), CharT(' '));
@ -58,14 +58,14 @@ auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, st
}
};
auto test_exception =
[]<class CharT, class... Args>(std::string_view what, std::basic_string<CharT> fmt, const Args&... args) {
auto test_exception = []<class CharT, class... Args>(std::string_view what, std::basic_string_view<CharT> fmt,
const Args&... args) {
#ifndef TEST_HAS_NO_EXCEPTIONS
try {
std::basic_string<CharT> out;
std::vformat_to(std::back_inserter(out), std::locale(), fmt, std::make_format_args<context_t<CharT>>(args...));
assert(false);
} catch ([[maybe_unused]] std::format_error& e) {
} catch ([[maybe_unused]] const std::format_error& e) {
LIBCPP_ASSERT(e.what() == what);
return;
}

8
libcxx/test/std/utilities/format/format.functions/vformat_to.pass.cpp
View File

@ -31,7 +31,7 @@
#include "test_macros.h"
#include "format_tests.h"
auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, std::basic_string<CharT> fmt,
auto test = []<class CharT, class... Args>(std::basic_string_view<CharT> expected, std::basic_string_view<CharT> fmt,
const Args&... args) {
{
std::basic_string<CharT> out(expected.size(), CharT(' '));
@ -59,14 +59,14 @@ auto test = []<class CharT, class... Args>(std::basic_string<CharT> expected, st
}
};
auto test_exception =
[]<class CharT, class... Args>(std::string_view what, std::basic_string<CharT> fmt, const Args&... args) {
auto test_exception = []<class CharT, class... Args>(std::string_view what, std::basic_string_view<CharT> fmt,
const Args&... args) {
#ifndef TEST_HAS_NO_EXCEPTIONS
try {
std::basic_string<CharT> out;
std::vformat_to(std::back_inserter(out), fmt, std::make_format_args<context_t<CharT>>(args...));
assert(false);
} catch ([[maybe_unused]] std::format_error& e) {
} catch ([[maybe_unused]] const std::format_error& e) {
LIBCPP_ASSERT(e.what() == what);
return;
}