diff --git a/wpiutil/src/test/native/cpp/json/unit-cbor.cpp b/wpiutil/src/test/native/cpp/json/unit-cbor.cpp index f96ff522ac8..f39302c0580 100644 --- a/wpiutil/src/test/native/cpp/json/unit-cbor.cpp +++ b/wpiutil/src/test/native/cpp/json/unit-cbor.cpp @@ -1699,5 +1699,8 @@ static const internal::CborRoundtripTestParam rfc7049_appendix_a_objects[] = { {"{\"Fun\": true, \"Amt\": -2}", {0xbf,0x63,0x46,0x75,0x6e,0xf5,0x63,0x41,0x6d,0x74,0x21,0xff}, false}, }; -INSTANTIATE_TEST_SUITE_P(CborRfc7049AppendixAObjectTests, CborRoundtripTest, +// Disabled because serialization order isn't guaranteed by the underlying map +// container +INSTANTIATE_TEST_SUITE_P(DISABLED_CborRfc7049AppendixAObjectTests, + CborRoundtripTest, ::testing::ValuesIn(rfc7049_appendix_a_objects)); diff --git a/wpiutil/src/test/native/cpp/json/unit-comparison.cpp b/wpiutil/src/test/native/cpp/json/unit-comparison.cpp index be1c90215a4..041a8d0f595 100644 --- a/wpiutil/src/test/native/cpp/json/unit-comparison.cpp +++ b/wpiutil/src/test/native/cpp/json/unit-comparison.cpp @@ -164,7 +164,9 @@ TEST_F(JsonComparisonValuesTest, NotEqual) EXPECT_EQ(nullptr != j_null, !(nullptr == j_null)); } -TEST_F(JsonComparisonValuesTest, Less) +// Disabled because serialization order isn't guaranteed by the underlying map +// container +TEST_F(JsonComparisonValuesTest, DISABLED_Less) { static const std::vector> expected = { diff --git a/wpiutil/src/test/native/cpp/json/unit-element_access2.cpp b/wpiutil/src/test/native/cpp/json/unit-element_access2.cpp index 495e855e10d..24065a1bbbc 100644 --- a/wpiutil/src/test/native/cpp/json/unit-element_access2.cpp +++ b/wpiutil/src/test/native/cpp/json/unit-element_access2.cpp @@ -568,14 +568,18 @@ TEST_F(JsonElementObjectRemoveTest, Key) } // erase(begin()) -TEST_F(JsonElementObjectRemoveTest, Begin) +// Disabled because iteration order isn't guaranteed by the underlying map +// container +TEST_F(JsonElementObjectRemoveTest, DISABLED_Begin) { json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}}; jobject.erase(jobject.begin()); EXPECT_EQ(jobject, json({{"b", 1}, {"c", 17u}})); } -TEST_F(JsonElementObjectRemoveTest, BeginConst) +// Disabled because iteration order isn't guaranteed by the underlying map +// container +TEST_F(JsonElementObjectRemoveTest, DISABLED_BeginConst) { json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}}; jobject.erase(jobject.cbegin()); diff --git a/wpiutil/src/test/native/cpp/json/unit-iterators1.cpp b/wpiutil/src/test/native/cpp/json/unit-iterators1.cpp index dda884fa569..c6924a39fa8 100644 --- a/wpiutil/src/test/native/cpp/json/unit-iterators1.cpp +++ b/wpiutil/src/test/native/cpp/json/unit-iterators1.cpp @@ -662,7 +662,9 @@ class JsonIteratorObjectTest : public ::testing::Test { json j_const; }; -TEST_F(JsonIteratorObjectTest, BeginEnd) +// Disabled because iteration order isn't guaranteed by the underlying map +// container +TEST_F(JsonIteratorObjectTest, DISABLED_BeginEnd) { json::iterator it_begin = j.begin(); json::iterator it_end = j.end(); @@ -686,7 +688,9 @@ TEST_F(JsonIteratorObjectTest, BeginEnd) EXPECT_EQ(it, it_end); } -TEST_F(JsonIteratorObjectTest, ConstBeginEnd) +// Disabled because iteration order isn't guaranteed by the underlying map +// container +TEST_F(JsonIteratorObjectTest, DISABLED_ConstBeginEnd) { json::const_iterator it_begin = j_const.begin(); json::const_iterator it_end = j_const.end(); @@ -710,7 +714,9 @@ TEST_F(JsonIteratorObjectTest, ConstBeginEnd) EXPECT_EQ(it, it_end); } -TEST_F(JsonIteratorObjectTest, CBeginEnd) +// Disabled because iteration order isn't guaranteed by the underlying map +// container +TEST_F(JsonIteratorObjectTest, DISABLED_CBeginEnd) { json::const_iterator it_begin = j.cbegin(); json::const_iterator it_end = j.cend(); @@ -734,7 +740,9 @@ TEST_F(JsonIteratorObjectTest, CBeginEnd) EXPECT_EQ(it, it_end); } -TEST_F(JsonIteratorObjectTest, ConstCBeginEnd) +// Disabled because iteration order isn't guaranteed by the underlying map +// container +TEST_F(JsonIteratorObjectTest, DISABLED_ConstCBeginEnd) { json::const_iterator it_begin = j_const.cbegin(); json::const_iterator it_end = j_const.cend(); @@ -831,7 +839,9 @@ TEST_F(JsonIteratorObjectTest, ConstCRBeginEnd) } #endif -TEST_F(JsonIteratorObjectTest, KeyValue) +// Disabled because iteration order isn't guaranteed by the underlying map +// container +TEST_F(JsonIteratorObjectTest, DISABLED_KeyValue) { auto it = j.begin(); auto cit = j_const.cbegin();