mirror of https://github.com/oxen-io/lokinet
Update deprecated gtest macros
gtest ~renamed INSTANTIATE_TEST_CASE_P to INSTANTIATE_TEST_SUITE_P and added a "backwards compatibility" shim, but the shim fails at compile time if you pass in an empty fourth argument.
This commit is contained in:
parent
edbe0c7bf4
commit
8aacc2d317
|
@ -52,8 +52,8 @@ ToStringData toStringData[] = {
|
|||
};
|
||||
// clang-format on
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestCryptoTypes, PubKeyString,
|
||||
::testing::ValuesIn(toStringData), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestCryptoTypes, PubKeyString,
|
||||
::testing::ValuesIn(toStringData));
|
||||
|
||||
// Concerns
|
||||
// - file missing
|
||||
|
|
|
@ -84,5 +84,5 @@ makeData()
|
|||
return result;
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestDhtXorMetric, XorMetric,
|
||||
::testing::ValuesIn(makeData()), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestDhtXorMetric, XorMetric,
|
||||
::testing::ValuesIn(makeData()));
|
||||
|
|
|
@ -47,7 +47,7 @@ static constexpr Array seqArray{
|
|||
|
||||
static const Array data[] = {emptyArray, fullArray, seqArray};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestDhtKey, DHT, ::testing::ValuesIn(data), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestDhtKey, DHT, ::testing::ValuesIn(data));
|
||||
|
||||
TEST(TestDhtKey, eq)
|
||||
{
|
||||
|
|
|
@ -116,8 +116,8 @@ namespace
|
|||
}
|
||||
} // namespace
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestDhtTxOwner, TxOwner,
|
||||
::testing::ValuesIn(makeData()), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestDhtTxOwner, TxOwner,
|
||||
::testing::ValuesIn(makeData()));
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestDhtTxOwner, TxOwnerOps,
|
||||
::testing::ValuesIn(makeCmpData()), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestDhtTxOwner, TxOwnerOps,
|
||||
::testing::ValuesIn(makeCmpData()));
|
||||
|
|
|
@ -47,8 +47,8 @@ MetricFormatSpecTestData metricFormatTestData[] = {
|
|||
MetricFormatSpecTestData{2.0, "%.0f", 3.0, "6"},
|
||||
MetricFormatSpecTestData{2.0, "%.1f", 1.1, "2.2"}};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(MetricsTypes, MetricFormatSpecTest,
|
||||
ValuesIn(metricFormatTestData));
|
||||
INSTANTIATE_TEST_SUITE_P(MetricsTypes, MetricFormatSpecTest,
|
||||
ValuesIn(metricFormatTestData));
|
||||
|
||||
TEST(MetricsTypes, Format)
|
||||
{
|
||||
|
@ -372,5 +372,5 @@ std::pair< absl::Time, std::string > sampleTestData[] = {
|
|||
{fromYYMMDD(2001, 9, 9), "R4E1R3E2R2E3R1E4"},
|
||||
{fromYYMMDD(2001, 9, 9), "R1E1R2E2R1E1R2E2R1E1R2E1R1E2"}};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(MetricsTypes, SampleTest,
|
||||
::testing::ValuesIn(sampleTestData));
|
||||
INSTANTIATE_TEST_SUITE_P(MetricsTypes, SampleTest,
|
||||
::testing::ValuesIn(sampleTestData));
|
||||
|
|
|
@ -80,8 +80,8 @@ static const TestReadInt testReadInt[] = {
|
|||
{{z}, false, 0},
|
||||
};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestBencode, ReadInt,
|
||||
::testing::ValuesIn(testReadInt), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestBencode, ReadInt,
|
||||
::testing::ValuesIn(testReadInt));
|
||||
|
||||
struct ReadStr : public ::testing::TestWithParam< TestReadString >
|
||||
{
|
||||
|
@ -118,8 +118,8 @@ static const TestReadString testReadStr[] = {
|
|||
{{colon, colon}, false, ""},
|
||||
};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestBencode, ReadStr,
|
||||
::testing::ValuesIn(testReadStr), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestBencode, ReadStr,
|
||||
::testing::ValuesIn(testReadStr));
|
||||
|
||||
template < typename Input >
|
||||
struct TestWriteData
|
||||
|
@ -165,8 +165,8 @@ static const TestWriteByteString testWriteByteString[] = {
|
|||
{"a", 1, false, ""},
|
||||
};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestBencode, WriteByteStr,
|
||||
::testing::ValuesIn(testWriteByteString), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestBencode, WriteByteStr,
|
||||
::testing::ValuesIn(testWriteByteString));
|
||||
|
||||
struct WriteInt : public ::testing::TestWithParam< TestWriteInt >
|
||||
{
|
||||
|
@ -194,8 +194,8 @@ static const TestWriteInt testWriteInt[] = {
|
|||
{1234567, 3, false, ""},
|
||||
};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestBencode, WriteInt,
|
||||
::testing::ValuesIn(testWriteInt), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestBencode, WriteInt,
|
||||
::testing::ValuesIn(testWriteInt));
|
||||
|
||||
struct WriteIntValues : public ::testing::TestWithParam< uint64_t >
|
||||
{
|
||||
|
@ -224,12 +224,12 @@ TEST_P(WriteIntValues, anyvalue)
|
|||
}
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(
|
||||
INSTANTIATE_TEST_SUITE_P(
|
||||
TestBencode, WriteIntValues,
|
||||
::testing::Values(std::numeric_limits< uint64_t >::min(),
|
||||
std::numeric_limits< uint64_t >::max(),
|
||||
std::numeric_limits< uint64_t >::max() / 2,
|
||||
std::numeric_limits< uint64_t >::max() / 3), );
|
||||
std::numeric_limits< uint64_t >::max() / 3));
|
||||
|
||||
TEST(TestBencode, good_uint64_entry)
|
||||
{
|
||||
|
@ -306,8 +306,8 @@ ListTestData listTestData[] = {
|
|||
"li123e3:abc3:abce"},
|
||||
};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestBencode, ListTest,
|
||||
::testing::ValuesIn(listTestData), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestBencode, ListTest,
|
||||
::testing::ValuesIn(listTestData));
|
||||
|
||||
struct DictTestData
|
||||
{
|
||||
|
@ -363,8 +363,8 @@ DictTestData dictTestData[] = {
|
|||
"d1:ai123e1:b3:abc1:c3:abce"},
|
||||
};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestBencode, DictTest,
|
||||
::testing::ValuesIn(dictTestData), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestBencode, DictTest,
|
||||
::testing::ValuesIn(dictTestData));
|
||||
|
||||
struct ReadData
|
||||
{
|
||||
|
@ -404,8 +404,8 @@ ReadData dictReadData[] = {{"de", {}},
|
|||
{"d1:be", {"b"}},
|
||||
{"d1:b2:23e", {"b", "23"}}};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestBencode, DictReadTest,
|
||||
::testing::ValuesIn(dictReadData), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestBencode, DictReadTest,
|
||||
::testing::ValuesIn(dictReadData));
|
||||
|
||||
struct ListReadTest : public ::testing::TestWithParam< ReadData >
|
||||
{
|
||||
|
@ -439,8 +439,8 @@ TEST_P(ListReadTest, readtest)
|
|||
ReadData listReadData[] = {
|
||||
{"le", {}}, {"l1:ae", {"a"}}, {"l1:be", {"b"}}, {"l1:b2:23e", {"b", "23"}}};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestBencode, ListReadTest,
|
||||
::testing::ValuesIn(listReadData), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestBencode, ListReadTest,
|
||||
::testing::ValuesIn(listReadData));
|
||||
|
||||
TEST(TestBencode, ReadDictEmptyBuffer)
|
||||
{
|
||||
|
|
|
@ -63,4 +63,4 @@ static const InputData inputData[] = {
|
|||
};
|
||||
// clang-format on
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestBits, TestBits, ::testing::ValuesIn(inputData), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestBits, TestBits, ::testing::ValuesIn(inputData));
|
||||
|
|
|
@ -39,8 +39,8 @@ static const TestParseLog testParseLog[] = {
|
|||
{"error", llarp::eLogError},
|
||||
{"none", llarp::eLogNone}};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestLogConfig, LogLevelTest,
|
||||
::testing::ValuesIn(testParseLog), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestLogConfig, LogLevelTest,
|
||||
::testing::ValuesIn(testParseLog));
|
||||
|
||||
TEST_F(LogLevelTest, TestLogLevelToName)
|
||||
{
|
||||
|
|
|
@ -65,8 +65,8 @@ static const SingleType singleType[] = {
|
|||
};
|
||||
// clang-format on
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(Printer, SingleValueTest,
|
||||
::testing::ValuesIn(singleType), );
|
||||
INSTANTIATE_TEST_SUITE_P(Printer, SingleValueTest,
|
||||
::testing::ValuesIn(singleType));
|
||||
|
||||
using SingleAttributeType =
|
||||
std::tuple< std::string, SingleVariant, Matcher< std::string > >;
|
||||
|
@ -108,8 +108,8 @@ static const SingleAttributeType singleAttributeType[] = {
|
|||
};
|
||||
// clang-format on
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(Printer, SingleAttributeTest,
|
||||
::testing::ValuesIn(singleAttributeType), );
|
||||
INSTANTIATE_TEST_SUITE_P(Printer, SingleAttributeTest,
|
||||
::testing::ValuesIn(singleAttributeType));
|
||||
|
||||
using ManyAttributes =
|
||||
std::pair< std::vector< std::pair< std::string, SingleVariant > >,
|
||||
|
@ -141,5 +141,5 @@ static const ManyAttributes manyAttributes[] = {
|
|||
};
|
||||
// clang-format on
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(Printer, ManyAttributesTest,
|
||||
::testing::ValuesIn(manyAttributes), );
|
||||
INSTANTIATE_TEST_SUITE_P(Printer, ManyAttributesTest,
|
||||
::testing::ValuesIn(manyAttributes));
|
||||
|
|
|
@ -376,8 +376,8 @@ TEST_P(BasicFunctionality, pushIndex)
|
|||
}
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestQueueManagerBasic, BasicFunctionality,
|
||||
::testing::Range(1u, 100u), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestQueueManagerBasic, BasicFunctionality,
|
||||
::testing::Range(1u, 100u));
|
||||
|
||||
// Potential issues:
|
||||
// - That pushing an element at the max combined index will push the next
|
||||
|
@ -556,8 +556,8 @@ CombinedIndexData PopAtMaxData[] =
|
|||
{7, 13, 7},
|
||||
{7, 14, 7}};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestQueueManagerMaxCombinedIndex, PopAtMax,
|
||||
::testing::ValuesIn(PopAtMaxData), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestQueueManagerMaxCombinedIndex, PopAtMax,
|
||||
::testing::ValuesIn(PopAtMaxData));
|
||||
|
||||
class ReservePop : public ::testing::TestWithParam< CombinedIndexData >
|
||||
{
|
||||
|
@ -631,8 +631,8 @@ CombinedIndexData ReservePopIndexForClearData[] = {
|
|||
{7, 13, 7},
|
||||
};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestQueueManagerMaxCombinedIndex, ReservePop,
|
||||
::testing::ValuesIn(ReservePopIndexForClearData), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestQueueManagerMaxCombinedIndex, ReservePop,
|
||||
::testing::ValuesIn(ReservePopIndexForClearData));
|
||||
|
||||
struct CircularDifferenceData
|
||||
{
|
||||
|
@ -715,8 +715,8 @@ CircularDifferenceData circularDifferenceData[] = {
|
|||
{0, 180, 360, -180},
|
||||
};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestQueueManagerMaxCombinedIndex, CircularDifference,
|
||||
::testing::ValuesIn(circularDifferenceData), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestQueueManagerMaxCombinedIndex, CircularDifference,
|
||||
::testing::ValuesIn(circularDifferenceData));
|
||||
|
||||
class NumGenerations : public ::testing::TestWithParam< uint32_t >
|
||||
{
|
||||
|
@ -749,8 +749,8 @@ uint32_t GenerationData[] = {1,
|
|||
QueueManager::MAX_CAPACITY - 1,
|
||||
QueueManager::MAX_CAPACITY};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestQueueManagerMaxCombinedIndex, NumGenerations,
|
||||
::testing::ValuesIn(GenerationData), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestQueueManagerMaxCombinedIndex, NumGenerations,
|
||||
::testing::ValuesIn(GenerationData));
|
||||
|
||||
TEST(TestQueueManager, abortPushIndexReservation)
|
||||
{
|
||||
|
@ -879,8 +879,8 @@ AbortData abortData[] = {
|
|||
{7, 24, 18, 6},
|
||||
};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestQueueManagerMaxCombinedIndex, AbortPush,
|
||||
::testing::ValuesIn(abortData), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestQueueManagerMaxCombinedIndex, AbortPush,
|
||||
::testing::ValuesIn(abortData));
|
||||
|
||||
// Testing reservePopForClear
|
||||
// - Failure is returned when the head of the queue is the same as the given end
|
||||
|
@ -1055,8 +1055,8 @@ ReserveData reserveData[] = {
|
|||
{7, 24, 18, 6},
|
||||
};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestQueueManagerReserve, Reserve,
|
||||
::testing::ValuesIn(reserveData), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestQueueManagerReserve, Reserve,
|
||||
::testing::ValuesIn(reserveData));
|
||||
|
||||
TEST(TestQueueManager, Enabled)
|
||||
{
|
||||
|
|
|
@ -164,8 +164,8 @@ TEST_P(Accessors, accessors)
|
|||
static const AccessorsData accessorsData[] = {
|
||||
{10, 50}, {1, 1}, {50, 100}, {2, 22}, {100, 200}};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestThreadPool, Accessors,
|
||||
::testing::ValuesIn(accessorsData), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestThreadPool, Accessors,
|
||||
::testing::ValuesIn(accessorsData));
|
||||
|
||||
struct ClosingData
|
||||
{
|
||||
|
@ -343,8 +343,8 @@ TEST_P(Closing, shutdown)
|
|||
ClosingData closingData[] = {{1, 1}, {2, 2}, {10, 10},
|
||||
{10, 50}, {50, 75}, {25, 80}};
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TestThreadPool, Closing,
|
||||
::testing::ValuesIn(closingData), );
|
||||
INSTANTIATE_TEST_SUITE_P(TestThreadPool, Closing,
|
||||
::testing::ValuesIn(closingData));
|
||||
|
||||
struct TryAddData
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue