Skip to content

MINIFICPP-1602 upgrade Catch2 to v2.13.6#1128

Closed
szaszm wants to merge 6 commits intoapache:mainfrom
szaszm:MINIFICPP-1602
Closed

MINIFICPP-1602 upgrade Catch2 to v2.13.6#1128
szaszm wants to merge 6 commits intoapache:mainfrom
szaszm:MINIFICPP-1602

Conversation

@szaszm
Copy link
Member

@szaszm szaszm commented Jul 8, 2021

Thank you for submitting a contribution to Apache NiFi - MiNiFi C++.

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:

For all changes:

  • Is there a JIRA ticket associated with this PR? Is it referenced
    in the commit message?

  • Does your PR title start with MINIFICPP-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.

  • Has your PR been rebased against the latest commit within the target branch (typically main)?

  • Is your initial contribution a single, squashed commit?

For code changes:

  • If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
  • If applicable, have you updated the LICENSE file?
  • If applicable, have you updated the NOTICE file?

For documentation related changes:

  • Have you ensured that format looks appropriate for the output in which it is rendered?

Note:

Please ensure that once the PR is submitted, you check GitHub Actions CI results for build issues and submit an update to your PR as soon as possible.

REQUIRE(3 == test3.value());
REQUIRE(!test4);
REQUIRE_THROWS_AS(utils::optional<bool>{} | utils::orElse([]{ throw ex{}; }), const ex&);
REQUIRE_THROWS_AS(utils::optional<bool>{} | utils::orElse([]{ throw ex{}; }), ex);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Catch2 REQUIRE_THROWS_AS now adds const& to the type internally.

@@ -1,4 +1,4 @@
filter=-build/namespaces
filter=-build/namespaces,-whitespace/braces
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There were two false positives in PersistableKeyValueStoreServiceTest.cpp and UnorderedMapKeyValueStoreServiceTest.cpp, "missing whitespace before {" at Catch::clara::Opt construction. The google style guide allows uniform initialization without a space before the brace.

}
{
SCOPED_INFO("ConsumeKafka timed out when waiting to receive the message published to the kafka broker.");
INFO("ConsumeKafka timed out when waiting to receive the message published to the kafka broker.");
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

INFO in Catch2 is practically the same as SCOPED_INFO in Catch 1.x

szaszm added 2 commits July 9, 2021 19:49
It called PdhAddEnglishCounterA with an uninitialized handle. MSDN documents
that the handle must be one returned by PdhOpenQuery function. The test
was violating this precondition, and I believe we don't need to test
undefined behavior.
@arpadboda arpadboda closed this in 311e0b7 Jul 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants