Skip to content
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

Jump to bottom

Move X macro list for C++ harness closer to #includes #506

Merged
merged 1 commit into from
Aug 13, 2021
Merged

Move X macro list for C++ harness closer to #includes #506

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 21 additions & 19 deletions tests/harness/cc/harness.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,26 @@

#include "tests/harness/harness.pb.h"

// These macros are defined in the various validation headers and call the
// X macro once for each message class in the header. Add macros here with new
// pb.validate.h headers.
#define X_TESTS_HARNESS_CASES(X) \
X_TESTS_HARNESS_CASES_BOOL(X) \
X_TESTS_HARNESS_CASES_BYTES(X) \
X_TESTS_HARNESS_CASES_ENUMS(X) \
X_TESTS_HARNESS_CASES_FILENAME_WITH_DASH(X) \
X_TESTS_HARNESS_CASES_MAPS(X) \
X_TESTS_HARNESS_CASES_MESSAGES(X) \
X_TESTS_HARNESS_CASES_NUMBERS(X) \
X_TESTS_HARNESS_CASES_ONEOFS(X) \
X_TESTS_HARNESS_CASES_REPEATED(X) \
X_TESTS_HARNESS_CASES_STRINGS(X) \
X_TESTS_HARNESS_CASES_WKT_ANY(X) \
X_TESTS_HARNESS_CASES_WKT_DURATION(X) \
X_TESTS_HARNESS_CASES_WKT_TIMESTAMP(X) \
X_TESTS_HARNESS_CASES_WKT_WRAPPERS(X) \
X_TESTS_HARNESS_CASES_KITCHEN_SINK(X) \

namespace {

using tests::harness::TestCase;
Expand Down Expand Up @@ -107,25 +127,7 @@ std::function<TestResult()> GetValidationCheck(const Any& msg) {
}; \
}

// These macros are defined in the various validation headers and call the
// above macro once for each message class in the header.
X_TESTS_HARNESS_CASES_BOOL(TRY_RETURN_VALIDATE_CALLABLE)
X_TESTS_HARNESS_CASES_BYTES(TRY_RETURN_VALIDATE_CALLABLE)
X_TESTS_HARNESS_CASES_ENUMS(TRY_RETURN_VALIDATE_CALLABLE)
X_TESTS_HARNESS_CASES_MAPS(TRY_RETURN_VALIDATE_CALLABLE)
X_TESTS_HARNESS_CASES_MESSAGES(TRY_RETURN_VALIDATE_CALLABLE)
X_TESTS_HARNESS_CASES_NUMBERS(TRY_RETURN_VALIDATE_CALLABLE)
X_TESTS_HARNESS_CASES_ONEOFS(TRY_RETURN_VALIDATE_CALLABLE)
X_TESTS_HARNESS_CASES_REPEATED(TRY_RETURN_VALIDATE_CALLABLE)
X_TESTS_HARNESS_CASES_STRINGS(TRY_RETURN_VALIDATE_CALLABLE)
X_TESTS_HARNESS_CASES_WKT_ANY(TRY_RETURN_VALIDATE_CALLABLE)
X_TESTS_HARNESS_CASES_WKT_DURATION(TRY_RETURN_VALIDATE_CALLABLE)
X_TESTS_HARNESS_CASES_WKT_TIMESTAMP(TRY_RETURN_VALIDATE_CALLABLE)
X_TESTS_HARNESS_CASES_WKT_WRAPPERS(TRY_RETURN_VALIDATE_CALLABLE)
X_TESTS_HARNESS_CASES_KITCHEN_SINK(TRY_RETURN_VALIDATE_CALLABLE)
// TODO(akonradi) add macros as the C++ validation code gets fleshed out for
// more field types.

X_TESTS_HARNESS_CASES(TRY_RETURN_VALIDATE_CALLABLE)
#undef TRY_RETURN_VALIDATE_CALLABLE

// TODO(akonradi) remove this once all C++ validation code is done
Expand Down