Skip to content

Eliminate use of assert_that in favor of assert_eq #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkoncek merged 1 commit into from
Jul 23, 2025
Merged

Eliminate use of assert_that in favor of assert_eq #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 21 additions & 23 deletions src/jurand_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@

using namespace java_symbols;

template <typename T1, typename T2>
static std::ostream &operator<<(std::ostream &os, const std::tuple<T1, T2> &t)
{
return os << "(" << std::get<0>(t) << ", " << std::get<1>(t) << ")";
}

static void assert_eq(const auto& expected, const auto& actual)
{
if (expected != actual)
Expand All @@ -15,14 +21,6 @@ static void assert_eq(const auto& expected, const auto& actual)
}
}

static void assert_that(bool value)
{
if (not value)
{
throw std::runtime_error("Test failed");
}
}

int main()
{
std::cout << "Running tests..." << "\n";
Expand Down Expand Up @@ -96,28 +94,28 @@ int main()
assert_eq(0, find_token("import/", "import", 0, true));
assert_eq(0, find_token("import+", "import", 0, true));

assert_that(next_annotation_t("@A", "A") == next_annotation("@A"));
assert_that(next_annotation_t("@A", "A") == next_annotation("@A\n"));
assert_that(next_annotation_t("@A()", "A") == next_annotation("@A()"));
assert_eq(next_annotation_t("@A", "A"), next_annotation("@A"));
assert_eq(next_annotation_t("@A", "A"), next_annotation("@A\n"));
assert_eq(next_annotation_t("@A()", "A"), next_annotation("@A()"));

assert_that(next_annotation_t("@A", "A") == next_annotation("@A class B {}"));
assert_eq(next_annotation_t("@A", "A"), next_annotation("@A class B {}"));

assert_that(next_annotation_t("@A(a = ')')", "A") == next_annotation("@A(a = ')')"));
assert_that(next_annotation_t("@A(a = ')')", "A") == next_annotation("@A(a = ')') class B {}"));
assert_eq(next_annotation_t("@A(a = ')')", "A"), next_annotation("@A(a = ')')"));
assert_eq(next_annotation_t("@A(a = ')')", "A"), next_annotation("@A(a = ')') class B {}"));

assert_that(next_annotation_t("@A(a = \")\")", "A") == next_annotation("@A(a = \")\")"));
assert_that(next_annotation_t("@A(a = \")))\" /*)))*/)", "A") == next_annotation("@A(a = \")))\" /*)))*/) class B {}"));
assert_that(next_annotation_t("@A(/* ) */)", "A") == next_annotation("@A(/* ) */)"));
assert_that(next_annotation_t("@A", "A") == next_annotation("method(@A Object o)"));
assert_eq(next_annotation_t("@A(a = \")\")", "A"), next_annotation("@A(a = \")\")"));
assert_eq(next_annotation_t("@A(a = \")))\" /*)))*/)", "A"), next_annotation("@A(a = \")))\" /*)))*/) class B {}"));
assert_eq(next_annotation_t("@A(/* ) */)", "A"), next_annotation("@A(/* ) */)"));
assert_eq(next_annotation_t("@A", "A"), next_annotation("method(@A Object o)"));

assert_that(next_annotation_t("@A(\nvalue = \")\" /* ) */\n// )\n)", "A") == next_annotation("@A(\nvalue = \")\" /* ) */\n// )\n)\n"));
assert_eq(next_annotation_t("@A(\nvalue = \")\" /* ) */\n// )\n)", "A"), next_annotation("@A(\nvalue = \")\" /* ) */\n// )\n)\n"));

assert_that(next_annotation_t("@D", "D") == next_annotation(" // @A\n/* @B */\nvalue = \"@C\";\n@D"));
assert_eq(next_annotation_t("@D", "D"), next_annotation(" // @A\n/* @B */\nvalue = \"@C\";\n@D"));

assert_that(next_annotation_t("@a.b.C", "a.b.C") == next_annotation("@a.b.C"));
assert_that(next_annotation_t("@a/**/.B", "a.B") == next_annotation("@a/**/.B"));
assert_eq(next_annotation_t("@a.b.C", "a.b.C"), next_annotation("@a.b.C"));
assert_eq(next_annotation_t("@a/**/.B", "a.B"), next_annotation("@a/**/.B"));

assert_that(next_annotation_t("@A(value = /* ) */ \")\")", "A") == next_annotation("@A(value = /* ) */ \")\")//)"));
assert_eq(next_annotation_t("@A(value = /* ) */ \")\")", "A"), next_annotation("@A(value = /* ) */ \")\")//)"));

{
constexpr std::string_view original_content = R"(
Expand Down