From b9cd2f4531ca670c196b0b14b1359d0f375103c2 Mon Sep 17 00:00:00 2001 From: Howard Trickey Date: Mon, 8 Mar 2021 06:45:45 -0500 Subject: Revert "Fix modernize-raw-string-literal complaints from clang-tidy." This reverts commit 7a34bd7c2886dfc812345c0b1649d63a9ee4666f. Broke windows build. Can apparently fix with /Zc:preprocessor flag for windows but need a Windows dev to make that fix. --- .../blender/blenkernel/intern/cryptomatte_test.cc | 30 ++++++++++++---------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/intern/cryptomatte_test.cc b/source/blender/blenkernel/intern/cryptomatte_test.cc index 13e29cecf0a..d9be252d654 100644 --- a/source/blender/blenkernel/intern/cryptomatte_test.cc +++ b/source/blender/blenkernel/intern/cryptomatte_test.cc @@ -53,17 +53,17 @@ TEST(cryptomatte, layer) ASSERT_EQ("{}", layer.manifest()); layer.add_hash("Object", 123); - ASSERT_EQ(R"({"Object":"0000007b"})", layer.manifest()); + ASSERT_EQ("{\"Object\":\"0000007b\"}", layer.manifest()); layer.add_hash("Object2", 123245678); - ASSERT_EQ(R"({"Object":"0000007b","Object2":"0758946e"})", layer.manifest()); + ASSERT_EQ("{\"Object\":\"0000007b\",\"Object2\":\"0758946e\"}", layer.manifest()); } TEST(cryptomatte, layer_quoted) { blender::bke::cryptomatte::CryptomatteLayer layer; - layer.add_hash(R"("Object")", 123); - ASSERT_EQ(R"({"\"Object\"":"0000007b"})", layer.manifest()); + layer.add_hash("\"Object\"", 123); + ASSERT_EQ("{\"\\\"Object\\\"\":\"0000007b\"}", layer.manifest()); } static void test_cryptomatte_manifest(std::string expected, std::string manifest) @@ -75,15 +75,17 @@ static void test_cryptomatte_manifest(std::string expected, std::string manifest TEST(cryptomatte, layer_from_manifest) { test_cryptomatte_manifest("{}", "{}"); - test_cryptomatte_manifest(R"({"Object":"12345678"})", R"({"Object": "12345678"})"); - test_cryptomatte_manifest(R"({"Object":"12345678","Object2":"87654321"})", - R"({"Object":"12345678","Object2":"87654321"})"); - test_cryptomatte_manifest(R"({"Object":"12345678","Object2":"87654321"})", - R"( { "Object" : "12345678" , "Object2" : "87654321" } )"); - test_cryptomatte_manifest(R"({"Object\"01\"":"12345678"})", R"({"Object\"01\"": "12345678"})"); + test_cryptomatte_manifest("{\"Object\":\"12345678\"}", "{\"Object\": \"12345678\"}"); + test_cryptomatte_manifest("{\"Object\":\"12345678\",\"Object2\":\"87654321\"}", + "{\"Object\":\"12345678\",\"Object2\":\"87654321\"}"); test_cryptomatte_manifest( - R"({"Object\"01\"":"12345678","Object":"12345678","Object2":"87654321"})", - R"({"Object\"01\"":"12345678","Object":"12345678", "Object2":"87654321"})"); + "{\"Object\":\"12345678\",\"Object2\":\"87654321\"}", + " { \"Object\" : \"12345678\" , \"Object2\" : \"87654321\" } "); + test_cryptomatte_manifest("{\"Object\\\"01\\\"\":\"12345678\"}", + "{\"Object\\\"01\\\"\": \"12345678\"}"); + test_cryptomatte_manifest( + "{\"Object\\\"01\\\"\":\"12345678\",\"Object\":\"12345678\",\"Object2\":\"87654321\"}", + "{\"Object\\\"01\\\"\":\"12345678\",\"Object\":\"12345678\", \"Object2\":\"87654321\"}"); } TEST(cryptomatte, extract_layer_hash_from_metadata_key) @@ -151,10 +153,10 @@ TEST(cryptomatte, session_from_stamp_data) MEM_callocN(sizeof(RenderResult), __func__)); BKE_render_result_stamp_data(render_result, "cryptomatte/qwerty/name", "layer1"); BKE_render_result_stamp_data( - render_result, "cryptomatte/qwerty/manifest", R"({"Object":"12345678"})"); + render_result, "cryptomatte/qwerty/manifest", "{\"Object\":\"12345678\"}"); BKE_render_result_stamp_data(render_result, "cryptomatte/uiop/name", "layer2"); BKE_render_result_stamp_data( - render_result, "cryptomatte/uiop/manifest", R"({"Object2":"87654321"})"); + render_result, "cryptomatte/uiop/manifest", "{\"Object2\":\"87654321\"}"); CryptomatteSession *session = BKE_cryptomatte_init_from_render_result(render_result); EXPECT_NE(session, nullptr); RE_FreeRenderResult(render_result); -- cgit v1.2.3