From 9e595d388ee836c294c82d31a867fec680f55319 Mon Sep 17 00:00:00 2001
From: patrick96
Date: Wed, 6 Feb 2019 12:56:39 +0100
Subject: [PATCH] fix(gtest): INSTANTIATE_TEST_CASE_P with zero variadic
arguments
Due to google/googletest#1419 [1], we had to add a comma after the last
argument of INSTANTIATE_TEST_CASE_P.
This was "fixed" in a backwards incompatible way in the googletest
project in 7c4164bf404d899b6d4c74beb1070da5647f55a2
[1]: https://github.com/google/googletest/issues/1419
---
tests/unit_tests/components/bar.cpp | 4 ++--
tests/unit_tests/components/builder.cpp | 2 +-
tests/unit_tests/components/parser.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/unit_tests/components/bar.cpp b/tests/unit_tests/components/bar.cpp
index 839a0088..4181100a 100644
--- a/tests/unit_tests/components/bar.cpp
+++ b/tests/unit_tests/components/bar.cpp
@@ -36,10 +36,10 @@ vector> to_pixels_with_offset_list = {
};
INSTANTIATE_TEST_CASE_P(NoOffset, GeomFormatToPixelsTest,
- ::testing::ValuesIn(to_pixels_no_offset_list),);
+ ::testing::ValuesIn(to_pixels_no_offset_list));
INSTANTIATE_TEST_CASE_P(WithOffset, GeomFormatToPixelsTest,
- ::testing::ValuesIn(to_pixels_with_offset_list),);
+ ::testing::ValuesIn(to_pixels_with_offset_list));
TEST_P(GeomFormatToPixelsTest, correctness) {
double exp = GetParam().first;
diff --git a/tests/unit_tests/components/builder.cpp b/tests/unit_tests/components/builder.cpp
index 3e95cac1..f3d67f10 100644
--- a/tests/unit_tests/components/builder.cpp
+++ b/tests/unit_tests/components/builder.cpp
@@ -52,7 +52,7 @@ vector>> get_label_text_list = {
};
INSTANTIATE_TEST_CASE_P(Inst, GetLabelTextTest,
- ::testing::ValuesIn(get_label_text_list),);
+ ::testing::ValuesIn(get_label_text_list));
TEST_P(GetLabelTextTest, correctness) {
label_t m_label = factory_util::shared