From 7cd15aa049107645f76afc5b0fe1354c5f0292f1 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Mon, 14 May 2018 23:09:46 -0700 Subject: [PATCH] Re-enable JsonIteratorObjectTest.KeyValue. --- wpiutil/src/test/native/cpp/json/unit-iterators1.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wpiutil/src/test/native/cpp/json/unit-iterators1.cpp b/wpiutil/src/test/native/cpp/json/unit-iterators1.cpp index 992a85e31e..bae38623e7 100644 --- a/wpiutil/src/test/native/cpp/json/unit-iterators1.cpp +++ b/wpiutil/src/test/native/cpp/json/unit-iterators1.cpp @@ -829,7 +829,7 @@ TEST_F(JsonIteratorObjectTest, ConstCRBeginEnd) EXPECT_EQ(it, it_end); } #endif -/* Disabled for ADL reasons + TEST_F(JsonIteratorObjectTest, KeyValue) { auto it = j.begin(); @@ -839,7 +839,6 @@ TEST_F(JsonIteratorObjectTest, KeyValue) EXPECT_EQ(cit.key(), "A"); EXPECT_EQ(cit.value(), json(1)); } -*/ class JsonIteratorIntegerTest : public ::testing::Test { public: