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

Update googletest code in third_party #1238

Merged
merged 5 commits into from
Apr 11, 2024
Merged

Update googletest code in third_party #1238

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa8eb9e
gtest-update
nibblerenush Apr 5, 2024
6a9ade0
Fix typo
nibblerenush Apr 5, 2024
764e9b3
Replace TYPED_TEST_CASE to TYPED_TEST_SUITE
nibblerenush Apr 5, 2024
cfe971e
Replace INSTANTIATE_TEST_CASE_P to INSTANTIATE_TEST_SUITE_P
nibblerenush Apr 5, 2024
2835e5f
Update to v1.12.1
nibblerenush Apr 6, 2024
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
2 changes: 1 addition & 1 deletion tests/test_actions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ class ActionsStringParamTest : public ActionsTest {
};

using SaveStringTypes = ::testing::Types<SaveString, SaveCString>;
TYPED_TEST_CASE(ActionsStringParamTest, SaveStringTypes);
TYPED_TEST_SUITE(ActionsStringParamTest, SaveStringTypes);

TYPED_TEST(ActionsStringParamTest, Basic) {
const std::string testString("testString");
Expand Down
12 changes: 6 additions & 6 deletions tests/test_assert_assume.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ TEST_P(AssertAssumeDeathTest, ConditionFalse) {
EXPECT_DEATH(testActionFnEntry(pkt.get()), "");
}

INSTANTIATE_TEST_CASE_P(AssertAssumeTest,
AssertAssumeTest,
::testing::Values("assert", "assume"));
INSTANTIATE_TEST_CASE_P(AssertAssumeDeathTest,
AssertAssumeDeathTest,
::testing::Values("assert", "assume"));
INSTANTIATE_TEST_SUITE_P(AssertAssumeTest,
AssertAssumeTest,
::testing::Values("assert", "assume"));
INSTANTIATE_TEST_SUITE_P(AssertAssumeDeathTest,
AssertAssumeDeathTest,
::testing::Values("assert", "assume"));
2 changes: 1 addition & 1 deletion tests/test_calculations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ TEST_P(CrcMapTest, Check) {
EXPECT_EQ(expected_output, output);
}

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
CrcMapList, CrcMapTest,
::testing::ValuesIn(CrcCheckMap::get_instance()->names()));

Expand Down
2 changes: 1 addition & 1 deletion tests/test_devmgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ PortMonitorTest<PMActive>::set_port_status(port_t port, PortStatus status) {

using PMTypes = Types<PMPassive, PMActive>;

TYPED_TEST_CASE(PortMonitorTest, PMTypes);
TYPED_TEST_SUITE(PortMonitorTest, PMTypes);

using std::chrono::milliseconds;
using std::this_thread::sleep_for;
Expand Down
2 changes: 1 addition & 1 deletion tests/test_extern.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ TEST_P(ExternTestTestRegister, TestRegister) {
ASSERT_EQ(expected, dst.get<int>());
}

INSTANTIATE_TEST_CASE_P(RegisterExternFunction, ExternTestTestRegister,
INSTANTIATE_TEST_SUITE_P(RegisterExternFunction, ExternTestTestRegister,
::testing::Values(
std::make_pair("set_field1", 1),
std::make_pair("set_field2_test", 2),
Expand Down
18 changes: 9 additions & 9 deletions tests/test_fields.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,14 +175,14 @@ TEST_P(FieldSerializeTest, DeparseWSentinel) {
run_deparse_test(1);
}

INSTANTIATE_TEST_CASE_P(TestParameters,
FieldSerializeTest,
Combine(Range(1, 17), Range(0, 8)));
INSTANTIATE_TEST_SUITE_P(TestParameters,
FieldSerializeTest,
Combine(Range(1, 17), Range(0, 8)));

// one bug only appeared for fields > 2 bytes, thus this addition
INSTANTIATE_TEST_CASE_P(TestParameters2,
FieldSerializeTest,
Combine(Values(18), Range(0, 8)));
INSTANTIATE_TEST_SUITE_P(TestParameters2,
FieldSerializeTest,
Combine(Values(18), Range(0, 8)));


namespace {
Expand Down Expand Up @@ -250,9 +250,9 @@ TEST_P(SignedFieldTest, ExportBytes) {
}
}

INSTANTIATE_TEST_CASE_P(TestParameters,
SignedFieldTest,
Range(2, 17));
INSTANTIATE_TEST_SUITE_P(TestParameters,
SignedFieldTest,
Range(2, 17));


class SaturatingFieldTest : public ::testing::Test {
Expand Down
2 changes: 1 addition & 1 deletion tests/test_handle_mgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class HandleMgrIteratorTest : public ::testing::Test {

using IteratorTypes = Types<HandleMgr::iterator, HandleMgr::const_iterator>;

TYPED_TEST_CASE(HandleMgrIteratorTest, IteratorTypes);
TYPED_TEST_SUITE(HandleMgrIteratorTest, IteratorTypes);

TYPED_TEST(HandleMgrIteratorTest, Iterate) {
HandleMgr handle_mgr;
Expand Down
2 changes: 1 addition & 1 deletion tests/test_header_stacks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class HeaderStackTest : public ::testing::Test {
using HeaderStackTypes =
::testing::Types<HeaderStackLegacy, HeaderStackP4_16<true> >;

TYPED_TEST_CASE(HeaderStackTest, HeaderStackTypes);
TYPED_TEST_SUITE(HeaderStackTest, HeaderStackTypes);

TYPED_TEST(HeaderStackTest, Basic) {
auto &stack = this->stack;
Expand Down
4 changes: 2 additions & 2 deletions tests/test_parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1254,8 +1254,8 @@ TEST_P(IPv4VLParsingTest, ParseAndDeparse) {
ASSERT_EQ(0, memcmp(buf_save.data(), packet.data(), buf_save.size()));
}

INSTANTIATE_TEST_CASE_P(IPv4VLOptionWords, IPv4VLParsingTest,
Range(0, 10));
INSTANTIATE_TEST_SUITE_P(IPv4VLOptionWords, IPv4VLParsingTest,
Range(0, 10));


class ParseVSetTest : public ::testing::Test {
Expand Down
4 changes: 2 additions & 2 deletions tests/test_phv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ class PHVHeaderNameIteratorTest : public PHVTest {
using NameIteratorTypes = Types<PHV::header_name_iterator,
PHV::const_header_name_iterator>;

TYPED_TEST_CASE(PHVHeaderNameIteratorTest, NameIteratorTypes);
TYPED_TEST_SUITE(PHVHeaderNameIteratorTest, NameIteratorTypes);

TYPED_TEST(PHVHeaderNameIteratorTest, Iterate) {
typename PHVRef<TypeParam>::type phv_ref = *(this->phv).get();
Expand Down Expand Up @@ -285,7 +285,7 @@ class PHVHeaderIteratorTest : public PHVTest {

using IteratorTypes = Types<PHV::header_iterator, PHV::const_header_iterator>;

TYPED_TEST_CASE(PHVHeaderIteratorTest, IteratorTypes);
TYPED_TEST_SUITE(PHVHeaderIteratorTest, IteratorTypes);

template <typename IteratorType>
struct HeaderRef { };
Expand Down
8 changes: 4 additions & 4 deletions tests/test_queue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ TEST_P(QueueTest, ProducerConsumer) {
}


INSTANTIATE_TEST_CASE_P(TestParameters,
QueueTest,
Combine(Values(16, 1024, 20000),
Values(1000, 200000)));
INSTANTIATE_TEST_SUITE_P(TestParameters,
QueueTest,
Combine(Values(16, 1024, 20000),
Values(1000, 200000)));
2 changes: 1 addition & 1 deletion tests/test_queueing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ using QueueingTypes = Types<QueueingLogic<QEm, WorkerMapper>,
QueueingLogicRL<QEm, WorkerMapper>,
QueueingLogicPriRL<QEm, WorkerMapper> >;

TYPED_TEST_CASE(QueueingTest, QueueingTypes);
TYPED_TEST_SUITE(QueueingTest, QueueingTypes);

TYPED_TEST(QueueingTest, ProducerConsummer) {
thread producer_thread(&QueueingTest<TypeParam>::produce, this);
Expand Down
10 changes: 5 additions & 5 deletions tests/test_tables.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ using MUTypes = Types<MUExact,
MUTernary,
MURange>;

TYPED_TEST_CASE(TableSizeTwo, MUTypes);
TYPED_TEST_SUITE(TableSizeTwo, MUTypes);

TYPED_TEST(TableSizeTwo, AddEntry) {
std::string key_1 = "\xaa\xaa";
Expand Down Expand Up @@ -2163,7 +2163,7 @@ TableBigMask<MURange>::make_key_builder() {
MatchKeyParam::Type::EXACT);
}

TYPED_TEST_CASE(TableBigMask, MUTypes);
TYPED_TEST_SUITE(TableBigMask, MUTypes);

TYPED_TEST(TableBigMask, HitMiss) {
const std::string key_1 = "\x11\x22";
Expand Down Expand Up @@ -2797,7 +2797,7 @@ std::string TableEntryDebug<MURange>::gen_entry_string() const {
"Action entry: actionA - aba,\n");
}

TYPED_TEST_CASE(TableEntryDebug, MUTypes);
TYPED_TEST_SUITE(TableEntryDebug, MUTypes);

namespace {

Expand Down Expand Up @@ -3151,7 +3151,7 @@ TableBadInputKey<MURange>::gen_match_key() const {
return match_key;
}

TYPED_TEST_CASE(TableBadInputKey, MUTypes);
TYPED_TEST_SUITE(TableBadInputKey, MUTypes);

TYPED_TEST(TableBadInputKey, NonByteAligned) {
entry_handle_t handle, lookup_handle;
Expand Down Expand Up @@ -3560,7 +3560,7 @@ TableDefaultDefaultEntryTest<MatchTableIndirect>::set_default_entry(
}

using MTTypes = Types<MatchTable, MatchTableIndirect>;
TYPED_TEST_CASE(TableDefaultDefaultEntryTest, MTTypes);
TYPED_TEST_SUITE(TableDefaultDefaultEntryTest, MTTypes);

TYPED_TEST(TableDefaultDefaultEntryTest, DefaultEntryLookup) {
auto pkt = this->get_pkt();
Expand Down
9 changes: 5 additions & 4 deletions third_party/gtest/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,19 @@ include/gtest/internal/gtest-internal.h \
include/gtest/internal/gtest-port-arch.h \
include/gtest/internal/gtest-port.h \
include/gtest/internal/gtest-type-util.h \
include/gtest/internal/gtest-tuple.h \
include/gtest/internal/gtest-linked_ptr.h \
include/gtest/internal/gtest-string.h \
include/gtest/internal/gtest-filepath.h \
include/gtest/internal/gtest-param-util.h \
include/gtest/internal/gtest-death-test-internal.h \
include/gtest/internal/gtest-param-util-generated.h \
include/gtest/gtest-param-test.h \
include/gtest/gtest-typed-test.h \
include/gtest/gtest-message.h \
include/gtest/gtest_prod.h \
include/gtest/gtest_pred_impl.h \
include/gtest/gtest-spi.h \
include/gtest/gtest-death-test.h
include/gtest/gtest-death-test.h \
include/gtest/gtest-assertion-result.h \
include/gtest/gtest-matchers.h

EXTRA_DIST += \
src/gtest-test-part.cc \
Expand All @@ -37,6 +36,8 @@ src/gtest_main.cc \
src/gtest-death-test.cc \
src/gtest.cc \
src/gtest-printers.cc \
src/gtest-assertion-result.cc \
src/gtest-matchers.cc \
src/gtest-internal-inl.h

libgtest_la_SOURCES = \
Expand Down
Loading