Update FilterExpression_test.cpp

Author: sdottaka

Testing/GoogleTest/FilterEngine/FilterExpression_test.cpp

@@ -1635,11 +1635,11 @@ TEST_P(FilterExpressionTest, ReplaceWithList)
 		EXPECT_TRUE(file.OpenCreateUtf8(replaceListPath));
 		file.WriteBom();
 		file.WriteString(L"# Comment line\n");
-		file.WriteString(L"apple\tりんご\n");
-		file.WriteString(L"orange\tオレンジ\n");
-		file.WriteString(L"banana\tバナナ\n");
+		file.WriteString(L"apple\t\u308a\u3093\u3054\n"); // りんご
+		file.WriteString(L"orange\t\u30aa\u30ec\u30f3\u30b8\n"); // オレンジ
+		file.WriteString(L"banana\t\u30d0\u30ca\u30ca\n"); // バナナ
 		file.WriteString(L"# Another comment\n");
-		file.WriteString(L"grape\tぶどう\n");
+		file.WriteString(L"grape\t\u3076\u3069\u3046\n"); // ぶどう
 		file.Close();
 	}
 
@@ -1658,45 +1658,45 @@ TEST_P(FilterExpressionTest, ReplaceWithList)
 	GetOptionsMgr()->InitOption(OPT_CP_DETECT, 0);
 
 	// Test replaceWithList function
-	EXPECT_TRUE(fe.Parse("replaceWithList(\"I like apple and orange\", \"" + ucr::toUTF8(replaceListPath) + "\") == \"I like りんご and オレンジ\""));
+	EXPECT_TRUE(fe.Parse(u8"replaceWithList(\"I like apple and orange\", \"" + ucr::toUTF8(replaceListPath) + u8"\") == \"I like りんご and オレンジ\""));
 	EXPECT_TRUE(fe.Evaluate(di));
 
-	EXPECT_TRUE(fe.Parse("replaceWithList(\"banana is yellow\", \"" + ucr::toUTF8(replaceListPath) + "\") == \"バナナ is yellow\""));
+	EXPECT_TRUE(fe.Parse(u8"replaceWithList(\"banana is yellow\", \"" + ucr::toUTF8(replaceListPath) + u8"\") == \"バナナ is yellow\""));
 	EXPECT_TRUE(fe.Evaluate(di));
 
-	EXPECT_TRUE(fe.Parse("replaceWithList(\"grape juice\", \"" + ucr::toUTF8(replaceListPath) + "\") == \"ぶどう juice\""));
+	EXPECT_TRUE(fe.Parse("replaceWithList(\"grape juice\", \"" + ucr::toUTF8(replaceListPath) + u8"\") == \"ぶどう juice\""));
 	EXPECT_TRUE(fe.Evaluate(di));
 
 	// Multiple replacements in one string
-	EXPECT_TRUE(fe.Parse("replaceWithList(\"apple orange banana\", \"" + ucr::toUTF8(replaceListPath) + "\") == \"りんご オレンジ バナナ\""));
+	EXPECT_TRUE(fe.Parse("replaceWithList(\"apple orange banana\", \"" + ucr::toUTF8(replaceListPath) + u8"\") == \"りんご オレンジ バナナ\""));
 	EXPECT_TRUE(fe.Evaluate(di));
 
 	// No match
-	EXPECT_TRUE(fe.Parse("replaceWithList(\"watermelon\", \"" + ucr::toUTF8(replaceListPath) + "\") == \"watermelon\""));
+	EXPECT_TRUE(fe.Parse("replaceWithList(\"watermelon\", \"" + ucr::toUTF8(replaceListPath) + u8"\") == \"watermelon\""));
 	EXPECT_TRUE(fe.Evaluate(di));
 
 	// Empty string
-	EXPECT_TRUE(fe.Parse("replaceWithList(\"\", \"" + ucr::toUTF8(replaceListPath) + "\") == \"\""));
+	EXPECT_TRUE(fe.Parse("replaceWithList(\"\", \"" + ucr::toUTF8(replaceListPath) + u8"\") == \"\""));
 	EXPECT_TRUE(fe.Evaluate(di));
 
 	// Array of strings
-	EXPECT_TRUE(fe.Parse("replaceWithList(array(\"apple\", \"banana\"), \"" + ucr::toUTF8(replaceListPath) + "\") == array(\"りんご\", \"バナナ\")"));
+	EXPECT_TRUE(fe.Parse(u8"replaceWithList(array(\"apple\", \"banana\"), \"" + ucr::toUTF8(replaceListPath) + u8"\") == array(\"りんご\", \"バナナ\")"));
 	EXPECT_TRUE(fe.Evaluate(di));
 
 	// Case-insensitive: uppercase input matches lowercase pattern
-	EXPECT_TRUE(fe.Parse("replaceWithList(\"APPLE\", \"" + ucr::toUTF8(replaceListPath) + "\") == \"りんご\""));
+	EXPECT_TRUE(fe.Parse(u8"replaceWithList(\"APPLE\", \"" + ucr::toUTF8(replaceListPath) + u8"\") == \"りんご\""));
 	EXPECT_TRUE(fe.Evaluate(di));
 
 	// Case-insensitive: mixed case input
-	EXPECT_TRUE(fe.Parse("replaceWithList(\"Apple is good\", \"" + ucr::toUTF8(replaceListPath) + "\") == \"りんご is good\""));
+	EXPECT_TRUE(fe.Parse(u8"replaceWithList(\"Apple is good\", \"" + ucr::toUTF8(replaceListPath) + u8"\") == \"りんご is good\""));
 	EXPECT_TRUE(fe.Evaluate(di));
 
 	// Case-insensitive: multiple mixed-case words
-	EXPECT_TRUE(fe.Parse("replaceWithList(\"ORANGE and Banana\", \"" + ucr::toUTF8(replaceListPath) + "\") == \"オレンジ and バナナ\""));
+	EXPECT_TRUE(fe.Parse(u8"replaceWithList(\"ORANGE and Banana\", \"" + ucr::toUTF8(replaceListPath) + u8"\") == \"オレンジ and バナナ\""));
 	EXPECT_TRUE(fe.Evaluate(di));
 
 	// Case-insensitive: array with mixed case
-	EXPECT_TRUE(fe.Parse("replaceWithList(array(\"APPLE\", \"GRAPE\"), \"" + ucr::toUTF8(replaceListPath) + "\") == array(\"りんご\", \"ぶどう\")"));
+	EXPECT_TRUE(fe.Parse(u8"replaceWithList(array(\"APPLE\", \"GRAPE\"), \"" + ucr::toUTF8(replaceListPath) + u8"\") == array(\"りんご\", \"ぶどう\")"));
 	EXPECT_TRUE(fe.Evaluate(di));
 
 	// Test regexReplaceWithList function
@@ -1761,7 +1761,7 @@ TEST_P(FilterExpressionTest, ReplaceWithListAdvanced)
 		EXPECT_TRUE(file.OpenCreateUtf8(replaceListPath));
 		file.WriteBom();
 		file.WriteString(L"# Test special characters\n");
-		file.WriteString(L"C++\tCプラプラ\n");
+		file.WriteString(L"C++\tC\u30d7\u30e9\u30d7\u30e9\n"); // Cプラプラ
 		file.WriteString(L"a\tb\tc\td\n"); // Extra tabs should be ignored
 		file.WriteString(L"\n"); // Empty line should be skipped
 		file.WriteString(L"test\t\n"); // Replace with empty string
@@ -1783,7 +1783,7 @@ TEST_P(FilterExpressionTest, ReplaceWithListAdvanced)
 	GetOptionsMgr()->InitOption(OPT_CP_DETECT, 0);
 
 	// Test special characters
-	EXPECT_TRUE(fe.Parse("replaceWithList(\"I love C++\", \"" + ucr::toUTF8(replaceListPath) + "\") == \"I love Cプラプラ\""));
+	EXPECT_TRUE(fe.Parse(u8"replaceWithList(\"I love C++\", \"" + ucr::toUTF8(replaceListPath) + u8"\") == \"I love Cプラプラ\""));
 	EXPECT_TRUE(fe.Evaluate(di));
 
 	// Test extra tabs (should only use first two fields)
@@ -1836,12 +1836,12 @@ TEST_P(FilterExpressionTest, ReplaceWithListEncoding)
 		UniStdioFile file;
 		EXPECT_TRUE(file.OpenCreateUtf8(replaceListPath));
 		file.WriteBom();
-		file.WriteString(L"# 日本語のテスト\n");
-		file.WriteString(L"こんにちは\thello\n");
-		file.WriteString(L"さようなら\tgoodbye\n");
-		file.WriteString(L"ありがとう\tthank you\n");
-		file.WriteString(L"犬\tdog\n");
-		file.WriteString(L"猫\tcat\n");
+		file.WriteString(L"# \u65e5\u672c\u8a9e\u306e\u30c6\u30b9\u30c8\n"); // 日本語のテスト
+		file.WriteString(L"\u3053\u3093\u306b\u3061\u306f\thello\n"); // こんにちは
+		file.WriteString(L"\u3055\u3088\u3046\u306a\u3089\tgoodbye\n"); // さようなら
+		file.WriteString(L"\u3042\u308a\u304c\u3068\u3046\tthank you\n"); // ありがとう
+		file.WriteString(L"\u72ac\tdog\n"); // 犬
+		file.WriteString(L"\u732b\tcat\n"); // 猫
 		file.Close();
 	}