From 38adfc184a53fbe472e48867acfc201ed940e8ee Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 25 Aug 2017 22:05:18 -0700 Subject: Implicitly create CFX_WideString() in form tests. Change-Id: I042c5e843dcf535b2d6676d41c0037e87c59c219 Reviewed-on: https://pdfium-review.googlesource.com/12050 Reviewed-by: Ryan Harrison Commit-Queue: Lei Zhang --- fpdfsdk/fpdfformfill_embeddertest.cpp | 204 ++++++++++++++-------------- fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp | 26 ++-- fpdfsdk/pwl/cpwl_edit_embeddertest.cpp | 48 +++---- 3 files changed, 139 insertions(+), 139 deletions(-) diff --git a/fpdfsdk/fpdfformfill_embeddertest.cpp b/fpdfsdk/fpdfformfill_embeddertest.cpp index 13d5f08d56..453a5cf6a1 100644 --- a/fpdfsdk/fpdfformfill_embeddertest.cpp +++ b/fpdfsdk/fpdfformfill_embeddertest.cpp @@ -81,7 +81,7 @@ class FPDFFormFillEmbeddertest : public EmbedderTest { FORM_OnLButtonUp(form_handle(), page, 0, end_x, y); } - void CheckSelection(FPDF_PAGE page, const CFX_WideString& expected_string) { + void CheckSelection(FPDF_PAGE page, const CFX_WideStringC& expected_string) { // Calculate expected length for selected text. int num_chars = expected_string.GetLength(); @@ -376,12 +376,12 @@ TEST_F(FPDFFormFillEmbeddertest, GetSelectedTextEmptyAndBasicKeyboard) { ASSERT_TRUE(page); // Test empty selection. - CheckSelection(page, CFX_WideString()); + CheckSelection(page, L""); // Test basic selection. TypeTextIntoTextField(page, 3, FPDF_FORMFIELD_TEXTFIELD, 120.0, 120.0); SelectTextWithKeyboard(page, 3, FWL_VKEY_Left, 123.0, 115.5); - CheckSelection(page, CFX_WideString(L"ABC")); + CheckSelection(page, L"ABC"); UnloadPage(page); } @@ -393,12 +393,12 @@ TEST_F(FPDFFormFillEmbeddertest, GetSelectedTextEmptyAndBasicMouse) { ASSERT_TRUE(page); // Test empty selection. - CheckSelection(page, CFX_WideString()); + CheckSelection(page, L""); // Test basic selection. TypeTextIntoTextField(page, 3, FPDF_FORMFIELD_TEXTFIELD, 120.0, 120.0); SelectTextWithMouse(page, 125.0, 102.0, 115.5); - CheckSelection(page, CFX_WideString(L"ABC")); + CheckSelection(page, L"ABC"); UnloadPage(page); } @@ -413,23 +413,23 @@ TEST_F(FPDFFormFillEmbeddertest, GetSelectedTextFragmentsKeyBoard) { // Test selecting first character in forward direction. SelectTextWithKeyboard(page, 1, FWL_VKEY_Right, 102.0, 115.5); - CheckSelection(page, CFX_WideString(L"A")); + CheckSelection(page, L"A"); // Test selecting entire long string in backwards direction. SelectTextWithKeyboard(page, 12, FWL_VKEY_Left, 191.0, 115.5); - CheckSelection(page, CFX_WideString(L"ABCDEFGHIJKL")); + CheckSelection(page, L"ABCDEFGHIJKL"); // Test selecting middle section in backwards direction. SelectTextWithKeyboard(page, 6, FWL_VKEY_Left, 170.0, 115.5); - CheckSelection(page, CFX_WideString(L"DEFGHI")); + CheckSelection(page, L"DEFGHI"); // Test selecting middle selection in forward direction. SelectTextWithKeyboard(page, 6, FWL_VKEY_Right, 125.0, 115.5); - CheckSelection(page, CFX_WideString(L"DEFGHI")); + CheckSelection(page, L"DEFGHI"); // Test selecting last character in backwards direction. SelectTextWithKeyboard(page, 1, FWL_VKEY_Left, 191.0, 115.5); - CheckSelection(page, CFX_WideString(L"L")); + CheckSelection(page, L"L"); UnloadPage(page); } @@ -444,23 +444,23 @@ TEST_F(FPDFFormFillEmbeddertest, GetSelectedTextFragmentsMouse) { // Test selecting first character in forward direction. SelectTextWithMouse(page, 102.0, 106.0, 115.5); - CheckSelection(page, CFX_WideString(L"A")); + CheckSelection(page, L"A"); // Test selecting entire long string in backwards direction. SelectTextWithMouse(page, 191.0, 102.0, 115.5); - CheckSelection(page, CFX_WideString(L"ABCDEFGHIJKL")); + CheckSelection(page, L"ABCDEFGHIJKL"); // Test selecting middle section in backwards direction. SelectTextWithMouse(page, 170.0, 125.0, 115.5); - CheckSelection(page, CFX_WideString(L"DEFGHI")); + CheckSelection(page, L"DEFGHI"); // Test selecting middle selection in forward direction. SelectTextWithMouse(page, 125.0, 170.0, 115.5); - CheckSelection(page, CFX_WideString(L"DEFGHI")); + CheckSelection(page, L"DEFGHI"); // Test selecting last character in backwards direction. SelectTextWithMouse(page, 191.0, 186.0, 115.5); - CheckSelection(page, CFX_WideString(L"L")); + CheckSelection(page, L"L"); UnloadPage(page); } @@ -472,7 +472,7 @@ TEST_F(FPDFFormFillEmbeddertest, GetSelectedTextEmptyAndBasicNormalComboBox) { ASSERT_TRUE(page); // Test empty selection. - CheckSelection(page, CFX_WideString()); + CheckSelection(page, L""); // Test basic selection of text within normal, non-editable combobox. // Click on normal combobox text field. @@ -481,11 +481,11 @@ TEST_F(FPDFFormFillEmbeddertest, GetSelectedTextEmptyAndBasicNormalComboBox) { // Non-editable comboboxes don't allow selection with keyboard. SelectTextWithMouse(page, 102.0, 142.0, 113.0); - CheckSelection(page, CFX_WideString(L"Banana")); + CheckSelection(page, L"Banana"); // Select other another provided option. SelectOption(page, 0, 192.0, 110.0); - CheckSelection(page, CFX_WideString(L"Apple")); + CheckSelection(page, L"Apple"); UnloadPage(page); } @@ -498,16 +498,16 @@ TEST_F(FPDFFormFillEmbeddertest, ASSERT_TRUE(page); // Test empty selection. - CheckSelection(page, CFX_WideString()); + CheckSelection(page, L""); // Test basic selection of text within user editable combobox using keyboard. TypeTextIntoTextField(page, 3, FPDF_FORMFIELD_COMBOBOX, 102.0, 62.0); SelectTextWithKeyboard(page, 3, FWL_VKEY_Left, 128.0, 62.0); - CheckSelection(page, CFX_WideString(L"ABC")); + CheckSelection(page, L"ABC"); // Select a provided option. SelectOption(page, 1, 192.0, 60.0); - CheckSelection(page, CFX_WideString(L"Bar")); + CheckSelection(page, L"Bar"); UnloadPage(page); } @@ -520,16 +520,16 @@ TEST_F(FPDFFormFillEmbeddertest, ASSERT_TRUE(page); // Test empty selection. - CheckSelection(page, CFX_WideString()); + CheckSelection(page, L""); // Test basic selection of text within user editable combobox using mouse. TypeTextIntoTextField(page, 3, FPDF_FORMFIELD_COMBOBOX, 102.0, 62.0); SelectTextWithMouse(page, 128.0, 103.0, 62.0); - CheckSelection(page, CFX_WideString(L"ABC")); + CheckSelection(page, L"ABC"); // Select a provided option. SelectOption(page, 2, 192.0, 60.0); - CheckSelection(page, CFX_WideString(L"Qux")); + CheckSelection(page, L"Qux"); UnloadPage(page); } @@ -546,29 +546,29 @@ TEST_F(FPDFFormFillEmbeddertest, GetSelectedTextFragmentsNormalComboBox) { // Test selecting first character in forward direction. SelectTextWithMouse(page, 102.0, 107.0, 113.0); - CheckSelection(page, CFX_WideString(L"B")); + CheckSelection(page, L"B"); // Test selecting entire string in backwards direction. SelectTextWithMouse(page, 142.0, 102.0, 113.0); - CheckSelection(page, CFX_WideString(L"Banana")); + CheckSelection(page, L"Banana"); // Test selecting middle section in backwards direction. SelectTextWithMouse(page, 135.0, 117.0, 113.0); - CheckSelection(page, CFX_WideString(L"nan")); + CheckSelection(page, L"nan"); // Test selecting middle section in forward direction. SelectTextWithMouse(page, 117.0, 135.0, 113.0); - CheckSelection(page, CFX_WideString(L"nan")); + CheckSelection(page, L"nan"); // Test selecting last character in backwards direction. SelectTextWithMouse(page, 142.0, 138.0, 113.0); - CheckSelection(page, CFX_WideString(L"a")); + CheckSelection(page, L"a"); // Select another option and then reset selection as first three chars. SelectOption(page, 2, 192.0, 110.0); - CheckSelection(page, CFX_WideString(L"Cherry")); + CheckSelection(page, L"Cherry"); SelectTextWithMouse(page, 102.0, 122.0, 113.0); - CheckSelection(page, CFX_WideString(L"Che")); + CheckSelection(page, L"Che"); UnloadPage(page); } @@ -584,29 +584,29 @@ TEST_F(FPDFFormFillEmbeddertest, // Test selecting first character in forward direction. SelectTextWithKeyboard(page, 1, FWL_VKEY_Right, 102.0, 62.0); - CheckSelection(page, CFX_WideString(L"A")); + CheckSelection(page, L"A"); // Test selecting entire long string in backwards direction. SelectTextWithKeyboard(page, 10, FWL_VKEY_Left, 178.0, 62.0); - CheckSelection(page, CFX_WideString(L"ABCDEFGHIJ")); + CheckSelection(page, L"ABCDEFGHIJ"); // Test selecting middle section in backwards direction. SelectTextWithKeyboard(page, 5, FWL_VKEY_Left, 168.0, 62.0); - CheckSelection(page, CFX_WideString(L"DEFGH")); + CheckSelection(page, L"DEFGH"); // Test selecting middle selection in forward direction. SelectTextWithKeyboard(page, 5, FWL_VKEY_Right, 127.0, 62.0); - CheckSelection(page, CFX_WideString(L"DEFGH")); + CheckSelection(page, L"DEFGH"); // Test selecting last character in backwards direction. SelectTextWithKeyboard(page, 1, FWL_VKEY_Left, 178.0, 62.0); - CheckSelection(page, CFX_WideString(L"J")); + CheckSelection(page, L"J"); // Select a provided option and then reset selection as first two chars. SelectOption(page, 0, 192.0, 60.0); - CheckSelection(page, CFX_WideString(L"Foo")); + CheckSelection(page, L"Foo"); SelectTextWithKeyboard(page, 2, FWL_VKEY_Right, 102.0, 62.0); - CheckSelection(page, CFX_WideString(L"Fo")); + CheckSelection(page, L"Fo"); UnloadPage(page); } @@ -622,23 +622,23 @@ TEST_F(FPDFFormFillEmbeddertest, // Test selecting first character in forward direction. SelectTextWithMouse(page, 102.0, 107.0, 62.0); - CheckSelection(page, CFX_WideString(L"A")); + CheckSelection(page, L"A"); // Test selecting entire long string in backwards direction. SelectTextWithMouse(page, 178.0, 102.0, 62.0); - CheckSelection(page, CFX_WideString(L"ABCDEFGHIJ")); + CheckSelection(page, L"ABCDEFGHIJ"); // Test selecting middle section in backwards direction. SelectTextWithMouse(page, 168.0, 127.0, 62.0); - CheckSelection(page, CFX_WideString(L"DEFGH")); + CheckSelection(page, L"DEFGH"); // Test selecting middle selection in forward direction. SelectTextWithMouse(page, 127.0, 168.0, 62.0); - CheckSelection(page, CFX_WideString(L"DEFGH")); + CheckSelection(page, L"DEFGH"); // Test selecting last character in backwards direction. SelectTextWithMouse(page, 178.0, 174.0, 62.0); - CheckSelection(page, CFX_WideString(L"J")); + CheckSelection(page, L"J"); UnloadPage(page); } @@ -652,14 +652,14 @@ TEST_F(FPDFFormFillEmbeddertest, DeleteTextFieldEntireSelection) { // Select entire contents of text field. TypeTextIntoTextField(page, 12, FPDF_FORMFIELD_TEXTFIELD, 120.0, 120.0); SelectTextWithMouse(page, 191.0, 102.0, 115.5); - CheckSelection(page, CFX_WideString(L"ABCDEFGHIJKL")); + CheckSelection(page, L"ABCDEFGHIJKL"); // Test deleting current text selection. Select what remains after deletion to // check that remaining text is as expected. FORM_ReplaceSelection(form_handle(), page, nullptr); SelectTextWithKeyboard(page, 12, FWL_VKEY_Left, 191.0, 115.5); - CheckSelection(page, CFX_WideString()); + CheckSelection(page, L""); UnloadPage(page); } @@ -673,13 +673,13 @@ TEST_F(FPDFFormFillEmbeddertest, DeleteTextFieldSelectionMiddle) { // Select middle section of text. TypeTextIntoTextField(page, 12, FPDF_FORMFIELD_TEXTFIELD, 120.0, 120.0); SelectTextWithMouse(page, 170.0, 125.0, 115.5); - CheckSelection(page, CFX_WideString(L"DEFGHI")); + CheckSelection(page, L"DEFGHI"); // Test deleting current text selection. Select what remains after deletion to // check that remaining text is as expected. FORM_ReplaceSelection(form_handle(), page, nullptr); SelectTextWithKeyboard(page, 12, FWL_VKEY_Left, 191.0, 115.5); - CheckSelection(page, CFX_WideString(L"ABCJKL")); + CheckSelection(page, L"ABCJKL"); UnloadPage(page); } @@ -693,13 +693,13 @@ TEST_F(FPDFFormFillEmbeddertest, DeleteTextFieldSelectionLeft) { // Select first few characters of text. TypeTextIntoTextField(page, 12, FPDF_FORMFIELD_TEXTFIELD, 120.0, 120.0); SelectTextWithMouse(page, 102.0, 132.0, 115.5); - CheckSelection(page, CFX_WideString(L"ABCD")); + CheckSelection(page, L"ABCD"); // Test deleting current text selection. Select what remains after deletion to // check that remaining text is as expected. FORM_ReplaceSelection(form_handle(), page, nullptr); SelectTextWithKeyboard(page, 12, FWL_VKEY_Left, 191.0, 115.5); - CheckSelection(page, CFX_WideString(L"EFGHIJKL")); + CheckSelection(page, L"EFGHIJKL"); UnloadPage(page); } @@ -713,13 +713,13 @@ TEST_F(FPDFFormFillEmbeddertest, DeleteTextFieldSelectionRight) { // Select last few characters of text. TypeTextIntoTextField(page, 12, FPDF_FORMFIELD_TEXTFIELD, 120.0, 120.0); SelectTextWithMouse(page, 191.0, 165.0, 115.5); - CheckSelection(page, CFX_WideString(L"IJKL")); + CheckSelection(page, L"IJKL"); // Test deleting current text selection. Select what remains after deletion to // check that remaining text is as expected. FORM_ReplaceSelection(form_handle(), page, nullptr); SelectTextWithKeyboard(page, 12, FWL_VKEY_Left, 191.0, 115.5); - CheckSelection(page, CFX_WideString(L"ABCDEFGH")); + CheckSelection(page, L"ABCDEFGH"); UnloadPage(page); } @@ -732,12 +732,12 @@ TEST_F(FPDFFormFillEmbeddertest, DeleteEmptyTextFieldSelection) { // Do not select text. TypeTextIntoTextField(page, 12, FPDF_FORMFIELD_TEXTFIELD, 120.0, 120.0); - CheckSelection(page, CFX_WideString()); + CheckSelection(page, L""); // Test that attempt to delete empty text selection has no effect. FORM_ReplaceSelection(form_handle(), page, nullptr); SelectTextWithKeyboard(page, 12, FWL_VKEY_Left, 191.0, 115.5); - CheckSelection(page, CFX_WideString(L"ABCDEFGHIJKL")); + CheckSelection(page, L"ABCDEFGHIJKL"); UnloadPage(page); } @@ -751,13 +751,13 @@ TEST_F(FPDFFormFillEmbeddertest, DeleteEditableComboBoxEntireSelection) { // Select entire contents of user-editable combobox text field. TypeTextIntoTextField(page, 10, FPDF_FORMFIELD_COMBOBOX, 102.0, 62.0); SelectTextWithMouse(page, 178.0, 102.0, 62.0); - CheckSelection(page, CFX_WideString(L"ABCDEFGHIJ")); + CheckSelection(page, L"ABCDEFGHIJ"); // Test deleting current text selection. Select what remains after deletion to // check that remaining text is as expected. FORM_ReplaceSelection(form_handle(), page, nullptr); SelectTextWithMouse(page, 178.0, 102.0, 62.0); - CheckSelection(page, CFX_WideString()); + CheckSelection(page, L""); UnloadPage(page); } @@ -771,13 +771,13 @@ TEST_F(FPDFFormFillEmbeddertest, DeleteEditableComboBoxSelectionMiddle) { // Select middle section of text. TypeTextIntoTextField(page, 10, FPDF_FORMFIELD_COMBOBOX, 102.0, 62.0); SelectTextWithMouse(page, 168.0, 127.0, 62.0); - CheckSelection(page, CFX_WideString(L"DEFGH")); + CheckSelection(page, L"DEFGH"); // Test deleting current text selection. Select what remains after deletion to // check that remaining text is as expected. FORM_ReplaceSelection(form_handle(), page, nullptr); SelectTextWithMouse(page, 178.0, 102.0, 62.0); - CheckSelection(page, CFX_WideString(L"ABCIJ")); + CheckSelection(page, L"ABCIJ"); UnloadPage(page); } @@ -791,13 +791,13 @@ TEST_F(FPDFFormFillEmbeddertest, DeleteEditableComboBoxSelectionLeft) { // Select first few characters of text. TypeTextIntoTextField(page, 10, FPDF_FORMFIELD_COMBOBOX, 102.0, 62.0); SelectTextWithMouse(page, 102.0, 132.0, 62.0); - CheckSelection(page, CFX_WideString(L"ABCD")); + CheckSelection(page, L"ABCD"); // Test deleting current text selection. Select what remains after deletion to // check that remaining text is as expected. FORM_ReplaceSelection(form_handle(), page, nullptr); SelectTextWithMouse(page, 178.0, 102.0, 62.0); - CheckSelection(page, CFX_WideString(L"EFGHIJ")); + CheckSelection(page, L"EFGHIJ"); UnloadPage(page); } @@ -811,13 +811,13 @@ TEST_F(FPDFFormFillEmbeddertest, DeleteEditableComboBoxSelectionRight) { // Select last few characters of text. TypeTextIntoTextField(page, 10, FPDF_FORMFIELD_COMBOBOX, 102.0, 62.0); SelectTextWithMouse(page, 178.0, 152.0, 62.0); - CheckSelection(page, CFX_WideString(L"GHIJ")); + CheckSelection(page, L"GHIJ"); // Test deleting current text selection. Select what remains after deletion to // check that remaining text is as expected. FORM_ReplaceSelection(form_handle(), page, nullptr); SelectTextWithMouse(page, 178.0, 102.0, 62.0); - CheckSelection(page, CFX_WideString(L"ABCDEF")); + CheckSelection(page, L"ABCDEF"); UnloadPage(page); } @@ -830,12 +830,12 @@ TEST_F(FPDFFormFillEmbeddertest, DeleteEmptyEditableComboBoxSelection) { // Do not select text. TypeTextIntoTextField(page, 10, FPDF_FORMFIELD_COMBOBOX, 102.0, 62.0); - CheckSelection(page, CFX_WideString()); + CheckSelection(page, L""); // Test that attempt to delete empty text selection has no effect. FORM_ReplaceSelection(form_handle(), page, nullptr); SelectTextWithMouse(page, 178.0, 102.0, 62.0); - CheckSelection(page, CFX_WideString(L"ABCDEFGHIJ")); + CheckSelection(page, L"ABCDEFGHIJ"); UnloadPage(page); } @@ -856,7 +856,7 @@ TEST_F(FPDFFormFillEmbeddertest, InsertTextInEmptyTextField) { // Select entire contents of text field to check that insertion worked // as expected. SelectTextWithMouse(page, 195.0, 102.0, 115.5); - CheckSelection(page, CFX_WideString(L"Hello")); + CheckSelection(page, L"Hello"); UnloadPage(page); } @@ -880,7 +880,7 @@ TEST_F(FPDFFormFillEmbeddertest, InsertTextInPopulatedTextFieldLeft) { // Select entire contents of text field to check that insertion worked // as expected. SelectTextWithMouse(page, 195.0, 102.0, 115.5); - CheckSelection(page, CFX_WideString(L"HelloABCDEFGH")); + CheckSelection(page, L"HelloABCDEFGH"); UnloadPage(page); } @@ -904,7 +904,7 @@ TEST_F(FPDFFormFillEmbeddertest, InsertTextInPopulatedTextFieldMiddle) { // Select entire contents of text field to check that insertion worked // as expected. SelectTextWithMouse(page, 195.0, 102.0, 115.5); - CheckSelection(page, CFX_WideString(L"ABCDHelloEFGH")); + CheckSelection(page, L"ABCDHelloEFGH"); UnloadPage(page); } @@ -928,7 +928,7 @@ TEST_F(FPDFFormFillEmbeddertest, InsertTextInPopulatedTextFieldRight) { // Select entire contents of text field to check that insertion worked // as expected. SelectTextWithMouse(page, 195.0, 102.0, 115.5); - CheckSelection(page, CFX_WideString(L"ABCDEFGHHello")); + CheckSelection(page, L"ABCDEFGHHello"); UnloadPage(page); } @@ -944,7 +944,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select entire string in text field. SelectTextWithKeyboard(page, 12, FWL_VKEY_Left, 195.0, 115.0); - CheckSelection(page, CFX_WideString(L"ABCDEFGHIJKL")); + CheckSelection(page, L"ABCDEFGHIJKL"); // Test replacing text selection with text to be inserted. std::unique_ptr text_to_insert = @@ -954,7 +954,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select entire contents of text field to check that insertion worked // as expected. SelectTextWithMouse(page, 195.0, 102.0, 115.5); - CheckSelection(page, CFX_WideString(L"Hello")); + CheckSelection(page, L"Hello"); UnloadPage(page); } @@ -970,7 +970,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select left portion of string in text field. SelectTextWithKeyboard(page, 6, FWL_VKEY_Left, 148.0, 115.0); - CheckSelection(page, CFX_WideString(L"ABCDEF")); + CheckSelection(page, L"ABCDEF"); // Test replacing text selection with text to be inserted. std::unique_ptr text_to_insert = @@ -980,7 +980,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select entire contents of text field to check that insertion worked // as expected. SelectTextWithMouse(page, 195.0, 102.0, 115.5); - CheckSelection(page, CFX_WideString(L"HelloGHIJKL")); + CheckSelection(page, L"HelloGHIJKL"); UnloadPage(page); } @@ -996,7 +996,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select middle portion of string in text field. SelectTextWithKeyboard(page, 6, FWL_VKEY_Left, 171.0, 115.0); - CheckSelection(page, CFX_WideString(L"DEFGHI")); + CheckSelection(page, L"DEFGHI"); // Test replacing text selection with text to be inserted. std::unique_ptr text_to_insert = @@ -1006,7 +1006,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select entire contents of text field to check that insertion worked // as expected. SelectTextWithMouse(page, 195.0, 102.0, 115.5); - CheckSelection(page, CFX_WideString(L"ABCHelloJKL")); + CheckSelection(page, L"ABCHelloJKL"); UnloadPage(page); } @@ -1022,7 +1022,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select right portion of string in text field. SelectTextWithKeyboard(page, 6, FWL_VKEY_Left, 195.0, 115.0); - CheckSelection(page, CFX_WideString(L"GHIJKL")); + CheckSelection(page, L"GHIJKL"); // Test replacing text selection with text to be inserted. std::unique_ptr text_to_insert = @@ -1032,7 +1032,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select entire contents of text field to check that insertion worked // as expected. SelectTextWithMouse(page, 195.0, 102.0, 115.5); - CheckSelection(page, CFX_WideString(L"ABCDEFHello")); + CheckSelection(page, L"ABCDEFHello"); UnloadPage(page); } @@ -1053,7 +1053,7 @@ TEST_F(FPDFFormFillEmbeddertest, InsertTextInEmptyEditableComboBox) { // Select entire contents of user-editable combobox text field to check that // insertion worked as expected. SelectTextWithMouse(page, 183.0, 102.0, 62.0); - CheckSelection(page, CFX_WideString(L"Hello")); + CheckSelection(page, L"Hello"); UnloadPage(page); } @@ -1077,7 +1077,7 @@ TEST_F(FPDFFormFillEmbeddertest, InsertTextInPopulatedEditableComboBoxLeft) { // Select entire contents of user-editable combobox text field to check that // insertion worked as expected. SelectTextWithMouse(page, 183.0, 102.0, 62.0); - CheckSelection(page, CFX_WideString(L"HelloABCDEF")); + CheckSelection(page, L"HelloABCDEF"); UnloadPage(page); } @@ -1102,7 +1102,7 @@ TEST_F(FPDFFormFillEmbeddertest, InsertTextInPopulatedEditableComboBoxMiddle) { // Select entire contents of user-editable combobox text field to check that // insertion worked as expected. SelectTextWithMouse(page, 183.0, 102.0, 62.0); - CheckSelection(page, CFX_WideString(L"ABCHelloDEF")); + CheckSelection(page, L"ABCHelloDEF"); UnloadPage(page); } @@ -1126,7 +1126,7 @@ TEST_F(FPDFFormFillEmbeddertest, InsertTextInPopulatedEditableComboBoxRight) { // Select entire contents of user-editable combobox text field to check that // insertion worked as expected. SelectTextWithMouse(page, 183.0, 102.0, 62.0); - CheckSelection(page, CFX_WideString(L"ABCDEFHello")); + CheckSelection(page, L"ABCDEFHello"); UnloadPage(page); } @@ -1142,7 +1142,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select entire string in user-editable combobox. SelectTextWithKeyboard(page, 10, FWL_VKEY_Left, 183.0, 62.0); - CheckSelection(page, CFX_WideString(L"ABCDEFGHIJ")); + CheckSelection(page, L"ABCDEFGHIJ"); // Test replacing text selection with text to be inserted. std::unique_ptr text_to_insert = @@ -1152,7 +1152,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select entire contents of user-editable combobox text field to check that // insertion worked as expected. SelectTextWithMouse(page, 183.0, 102.0, 62.0); - CheckSelection(page, CFX_WideString(L"Hello")); + CheckSelection(page, L"Hello"); UnloadPage(page); } @@ -1168,7 +1168,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select left portion of string in user-editable combobox. SelectTextWithKeyboard(page, 5, FWL_VKEY_Left, 142.0, 62.0); - CheckSelection(page, CFX_WideString(L"ABCDE")); + CheckSelection(page, L"ABCDE"); // Test replacing text selection with text to be inserted. std::unique_ptr text_to_insert = @@ -1178,7 +1178,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select entire contents of user-editable combobox text field to check that // insertion worked as expected. SelectTextWithMouse(page, 183.0, 102.0, 62.0); - CheckSelection(page, CFX_WideString(L"HelloFGHIJ")); + CheckSelection(page, L"HelloFGHIJ"); UnloadPage(page); } @@ -1194,7 +1194,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select middle portion of string in user-editable combobox. SelectTextWithKeyboard(page, 5, FWL_VKEY_Left, 167.0, 62.0); - CheckSelection(page, CFX_WideString(L"DEFGH")); + CheckSelection(page, L"DEFGH"); // Test replacing text selection with text to be inserted. std::unique_ptr text_to_insert = @@ -1204,7 +1204,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select entire contents of user-editable combobox text field to check that // insertion worked as expected. SelectTextWithMouse(page, 183.0, 102.0, 62.0); - CheckSelection(page, CFX_WideString(L"ABCHelloIJ")); + CheckSelection(page, L"ABCHelloIJ"); UnloadPage(page); } @@ -1220,7 +1220,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select right portion of string in user-editable combobox. SelectTextWithKeyboard(page, 5, FWL_VKEY_Left, 183.0, 62.0); - CheckSelection(page, CFX_WideString(L"FGHIJ")); + CheckSelection(page, L"FGHIJ"); // Test replacing text selection with text to be inserted. std::unique_ptr text_to_insert = @@ -1230,7 +1230,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select entire contents of user-editable combobox text field to check that // insertion worked as expected. SelectTextWithMouse(page, 183.0, 102.0, 62.0); - CheckSelection(page, CFX_WideString(L"ABCDEHello")); + CheckSelection(page, L"ABCDEHello"); UnloadPage(page); } @@ -1246,7 +1246,7 @@ TEST_F(FPDFFormFillEmbeddertest, InsertTextInEmptyCharLimitTextFieldOverflow) { // Delete pre-filled contents of text field with char limit. SelectTextWithMouse(page, 195.0, 102.0, 60.0); - CheckSelection(page, CFX_WideString(L"Elephant")); + CheckSelection(page, L"Elephant"); FORM_ReplaceSelection(form_handle(), page, nullptr); // Test inserting text into now empty text field so text to be inserted @@ -1258,7 +1258,7 @@ TEST_F(FPDFFormFillEmbeddertest, InsertTextInEmptyCharLimitTextFieldOverflow) { // Select entire contents of text field to check that insertion worked // as expected. SelectTextWithMouse(page, 195.0, 102.0, 60.0); - CheckSelection(page, CFX_WideString(L"Hippopotam")); + CheckSelection(page, L"Hippopotam"); UnloadPage(page); } @@ -1274,7 +1274,7 @@ TEST_F(FPDFFormFillEmbeddertest, InsertTextInEmptyCharLimitTextFieldFit) { // Delete pre-filled contents of text field with char limit. SelectTextWithMouse(page, 195.0, 102.0, 60.0); - CheckSelection(page, CFX_WideString(L"Elephant")); + CheckSelection(page, L"Elephant"); FORM_ReplaceSelection(form_handle(), page, nullptr); // Test inserting text into now empty text field so text to be inserted @@ -1286,7 +1286,7 @@ TEST_F(FPDFFormFillEmbeddertest, InsertTextInEmptyCharLimitTextFieldFit) { // Select entire contents of text field to check that insertion worked // as expected. SelectTextWithMouse(page, 195.0, 102.0, 60.0); - CheckSelection(page, CFX_WideString(L"Zebra")); + CheckSelection(page, L"Zebra"); UnloadPage(page); } @@ -1308,7 +1308,7 @@ TEST_F(FPDFFormFillEmbeddertest, InsertTextInPopulatedCharLimitTextFieldLeft) { // Select entire contents of text field to check that insertion worked // as expected. SelectTextWithMouse(page, 195.0, 102.0, 60.0); - CheckSelection(page, CFX_WideString(L"HiElephant")); + CheckSelection(page, L"HiElephant"); UnloadPage(page); } @@ -1333,7 +1333,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select entire contents of text field to check that insertion worked // as expected. SelectTextWithMouse(page, 195.0, 102.0, 60.0); - CheckSelection(page, CFX_WideString(L"ElephHiant")); + CheckSelection(page, L"ElephHiant"); UnloadPage(page); } @@ -1357,7 +1357,7 @@ TEST_F(FPDFFormFillEmbeddertest, InsertTextInPopulatedCharLimitTextFieldRight) { // Select entire contents of text field to check that insertion worked // as expected. SelectTextWithMouse(page, 195.0, 102.0, 60.0); - CheckSelection(page, CFX_WideString(L"ElephantHi")); + CheckSelection(page, L"ElephantHi"); UnloadPage(page); } @@ -1373,7 +1373,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select entire string in text field. SelectTextWithKeyboard(page, 12, FWL_VKEY_Left, 195.0, 60.0); - CheckSelection(page, CFX_WideString(L"Elephant")); + CheckSelection(page, L"Elephant"); // Test replacing text selection with text to be inserted. std::unique_ptr text_to_insert = @@ -1383,7 +1383,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select entire contents of text field to check that insertion worked // as expected. SelectTextWithMouse(page, 195.0, 102.0, 60.0); - CheckSelection(page, CFX_WideString(L"Hippopotam")); + CheckSelection(page, L"Hippopotam"); UnloadPage(page); } @@ -1399,7 +1399,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select left portion of string in text field. SelectTextWithKeyboard(page, 4, FWL_VKEY_Left, 122.0, 60.0); - CheckSelection(page, CFX_WideString(L"Elep")); + CheckSelection(page, L"Elep"); // Test replacing text selection with text to be inserted. std::unique_ptr text_to_insert = @@ -1409,7 +1409,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select entire contents of text field to check that insertion worked // as expected. SelectTextWithMouse(page, 195.0, 102.0, 60.0); - CheckSelection(page, CFX_WideString(L"Hippophant")); + CheckSelection(page, L"Hippophant"); UnloadPage(page); } @@ -1425,7 +1425,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select middle portion of string in text field. SelectTextWithKeyboard(page, 4, FWL_VKEY_Left, 136.0, 60.0); - CheckSelection(page, CFX_WideString(L"epha")); + CheckSelection(page, L"epha"); // Test replacing text selection with text to be inserted. std::unique_ptr text_to_insert = @@ -1435,7 +1435,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select entire contents of text field to check that insertion worked // as expected. SelectTextWithMouse(page, 195.0, 102.0, 60.0); - CheckSelection(page, CFX_WideString(L"ElHippopnt")); + CheckSelection(page, L"ElHippopnt"); UnloadPage(page); } @@ -1451,7 +1451,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select right portion of string in text field. SelectTextWithKeyboard(page, 4, FWL_VKEY_Left, 152.0, 60.0); - CheckSelection(page, CFX_WideString(L"hant")); + CheckSelection(page, L"hant"); // Test replacing text selection with text to be inserted. std::unique_ptr text_to_insert = @@ -1461,7 +1461,7 @@ TEST_F(FPDFFormFillEmbeddertest, // Select entire contents of text field to check that insertion worked // as expected. SelectTextWithMouse(page, 195.0, 102.0, 60.0); - CheckSelection(page, CFX_WideString(L"ElepHippop")); + CheckSelection(page, L"ElepHippop"); UnloadPage(page); } diff --git a/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp b/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp index 308ee4ac40..9fd8eec173 100644 --- a/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp +++ b/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp @@ -211,7 +211,7 @@ TEST_F(CPWLComboBoxEditEmbeddertest, DeleteEntireTextSelection) { EXPECT_STREQ(L"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqr", GetCPWLComboBox()->GetSelectedText().c_str()); - GetCPWLComboBox()->ReplaceSelection(CFX_WideString()); + GetCPWLComboBox()->ReplaceSelection(L""); EXPECT_TRUE(GetCPWLComboBox()->GetText().IsEmpty()); } @@ -222,7 +222,7 @@ TEST_F(CPWLComboBoxEditEmbeddertest, DeleteTextSelectionMiddle) { GetCPWLComboBox()->SetEditSelection(12, 23); EXPECT_STREQ(L"MNOPQRSTUVW", GetCPWLComboBox()->GetSelectedText().c_str()); - GetCPWLComboBox()->ReplaceSelection(CFX_WideString()); + GetCPWLComboBox()->ReplaceSelection(L""); EXPECT_STREQ(L"ABCDEFGHIJKLXYZ[\\]^_`abcdefghijklmnopqr", GetCPWLComboBox()->GetText().c_str()); } @@ -234,7 +234,7 @@ TEST_F(CPWLComboBoxEditEmbeddertest, DeleteTextSelectionLeft) { GetCPWLComboBox()->SetEditSelection(0, 5); EXPECT_STREQ(L"ABCDE", GetCPWLComboBox()->GetSelectedText().c_str()); - GetCPWLComboBox()->ReplaceSelection(CFX_WideString()); + GetCPWLComboBox()->ReplaceSelection(L""); EXPECT_STREQ(L"FGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqr", GetCPWLComboBox()->GetText().c_str()); } @@ -246,7 +246,7 @@ TEST_F(CPWLComboBoxEditEmbeddertest, DeleteTextSelectionRight) { GetCPWLComboBox()->SetEditSelection(45, 50); EXPECT_STREQ(L"nopqr", GetCPWLComboBox()->GetSelectedText().c_str()); - GetCPWLComboBox()->ReplaceSelection(CFX_WideString()); + GetCPWLComboBox()->ReplaceSelection(L""); EXPECT_STREQ(L"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklm", GetCPWLComboBox()->GetText().c_str()); } @@ -255,14 +255,14 @@ TEST_F(CPWLComboBoxEditEmbeddertest, DeleteEmptyTextSelection) { FormFillerAndWindowSetup(GetCPDFSDKAnnotUserEditable()); TypeTextIntoTextField(50); - GetCPWLComboBox()->ReplaceSelection(CFX_WideString()); + GetCPWLComboBox()->ReplaceSelection(L""); EXPECT_STREQ(L"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqr", GetCPWLComboBox()->GetText().c_str()); } TEST_F(CPWLComboBoxEditEmbeddertest, InsertTextInEmptyEditableComboBox) { FormFillerAndWindowSetup(GetCPDFSDKAnnotUserEditable()); - GetCPWLComboBox()->ReplaceSelection(CFX_WideString(L"Hello")); + GetCPWLComboBox()->ReplaceSelection(L"Hello"); EXPECT_STREQ(L"Hello", GetCPWLComboBox()->GetText().c_str()); } @@ -275,7 +275,7 @@ TEST_F(CPWLComboBoxEditEmbeddertest, EXPECT_TRUE(GetCFFLFormFiller()->OnKeyDown(GetCPDFSDKAnnotUserEditable(), FWL_VKEY_Home, 0)); - GetCPWLComboBox()->ReplaceSelection(CFX_WideString(L"Hello")); + GetCPWLComboBox()->ReplaceSelection(L"Hello"); EXPECT_STREQ(L"HelloABCDEFGHIJ", GetCPWLComboBox()->GetText().c_str()); } @@ -290,7 +290,7 @@ TEST_F(CPWLComboBoxEditEmbeddertest, FWL_VKEY_Left, 0)); } - GetCPWLComboBox()->ReplaceSelection(CFX_WideString(L"Hello")); + GetCPWLComboBox()->ReplaceSelection(L"Hello"); EXPECT_STREQ(L"ABCDEHelloFGHIJ", GetCPWLComboBox()->GetText().c_str()); } @@ -299,7 +299,7 @@ TEST_F(CPWLComboBoxEditEmbeddertest, FormFillerAndWindowSetup(GetCPDFSDKAnnotUserEditable()); TypeTextIntoTextField(10); - GetCPWLComboBox()->ReplaceSelection(CFX_WideString(L"Hello")); + GetCPWLComboBox()->ReplaceSelection(L"Hello"); EXPECT_STREQ(L"ABCDEFGHIJHello", GetCPWLComboBox()->GetText().c_str()); } @@ -310,7 +310,7 @@ TEST_F(CPWLComboBoxEditEmbeddertest, GetCPWLComboBox()->SetEditSelection(0, -1); EXPECT_STREQ(L"ABCDEFGHIJ", GetCPWLComboBox()->GetSelectedText().c_str()); - GetCPWLComboBox()->ReplaceSelection(CFX_WideString(L"Hello")); + GetCPWLComboBox()->ReplaceSelection(L"Hello"); EXPECT_STREQ(L"Hello", GetCPWLComboBox()->GetText().c_str()); } @@ -321,7 +321,7 @@ TEST_F(CPWLComboBoxEditEmbeddertest, GetCPWLComboBox()->SetEditSelection(0, 5); EXPECT_STREQ(L"ABCDE", GetCPWLComboBox()->GetSelectedText().c_str()); - GetCPWLComboBox()->ReplaceSelection(CFX_WideString(L"Hello")); + GetCPWLComboBox()->ReplaceSelection(L"Hello"); EXPECT_STREQ(L"HelloFGHIJ", GetCPWLComboBox()->GetText().c_str()); } @@ -332,7 +332,7 @@ TEST_F(CPWLComboBoxEditEmbeddertest, GetCPWLComboBox()->SetEditSelection(2, 7); EXPECT_STREQ(L"CDEFG", GetCPWLComboBox()->GetSelectedText().c_str()); - GetCPWLComboBox()->ReplaceSelection(CFX_WideString(L"Hello")); + GetCPWLComboBox()->ReplaceSelection(L"Hello"); EXPECT_STREQ(L"ABHelloHIJ", GetCPWLComboBox()->GetText().c_str()); } @@ -343,6 +343,6 @@ TEST_F(CPWLComboBoxEditEmbeddertest, GetCPWLComboBox()->SetEditSelection(5, 10); EXPECT_STREQ(L"FGHIJ", GetCPWLComboBox()->GetSelectedText().c_str()); - GetCPWLComboBox()->ReplaceSelection(CFX_WideString(L"Hello")); + GetCPWLComboBox()->ReplaceSelection(L"Hello"); EXPECT_STREQ(L"ABCDEHello", GetCPWLComboBox()->GetText().c_str()); } diff --git a/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp b/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp index 34569b2491..3574de9345 100644 --- a/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp +++ b/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp @@ -155,7 +155,7 @@ TEST_F(CPWLEditEmbeddertest, DeleteEntireTextSelection) { EXPECT_STREQ(L"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqr", GetCPWLEdit()->GetSelectedText().c_str()); - GetCPWLEdit()->ReplaceSelection(CFX_WideString()); + GetCPWLEdit()->ReplaceSelection(L""); EXPECT_TRUE(GetCPWLEdit()->GetText().IsEmpty()); } @@ -166,7 +166,7 @@ TEST_F(CPWLEditEmbeddertest, DeleteTextSelectionMiddle) { GetCPWLEdit()->SetSelection(12, 23); EXPECT_STREQ(L"MNOPQRSTUVW", GetCPWLEdit()->GetSelectedText().c_str()); - GetCPWLEdit()->ReplaceSelection(CFX_WideString()); + GetCPWLEdit()->ReplaceSelection(L""); EXPECT_STREQ(L"ABCDEFGHIJKLXYZ[\\]^_`abcdefghijklmnopqr", GetCPWLEdit()->GetText().c_str()); } @@ -178,7 +178,7 @@ TEST_F(CPWLEditEmbeddertest, DeleteTextSelectionLeft) { GetCPWLEdit()->SetSelection(0, 5); EXPECT_STREQ(L"ABCDE", GetCPWLEdit()->GetSelectedText().c_str()); - GetCPWLEdit()->ReplaceSelection(CFX_WideString()); + GetCPWLEdit()->ReplaceSelection(L""); EXPECT_STREQ(L"FGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqr", GetCPWLEdit()->GetText().c_str()); } @@ -190,7 +190,7 @@ TEST_F(CPWLEditEmbeddertest, DeleteTextSelectionRight) { GetCPWLEdit()->SetSelection(45, 50); EXPECT_STREQ(L"nopqr", GetCPWLEdit()->GetSelectedText().c_str()); - GetCPWLEdit()->ReplaceSelection(CFX_WideString()); + GetCPWLEdit()->ReplaceSelection(L""); EXPECT_STREQ(L"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklm", GetCPWLEdit()->GetText().c_str()); } @@ -199,14 +199,14 @@ TEST_F(CPWLEditEmbeddertest, DeleteEmptyTextSelection) { FormFillerAndWindowSetup(GetCPDFSDKAnnot()); TypeTextIntoTextField(50); - GetCPWLEdit()->ReplaceSelection(CFX_WideString()); + GetCPWLEdit()->ReplaceSelection(L""); EXPECT_STREQ(L"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqr", GetCPWLEdit()->GetText().c_str()); } TEST_F(CPWLEditEmbeddertest, InsertTextInEmptyTextField) { FormFillerAndWindowSetup(GetCPDFSDKAnnot()); - GetCPWLEdit()->ReplaceSelection(CFX_WideString(L"Hello")); + GetCPWLEdit()->ReplaceSelection(L"Hello"); EXPECT_STREQ(L"Hello", GetCPWLEdit()->GetText().c_str()); } @@ -218,7 +218,7 @@ TEST_F(CPWLEditEmbeddertest, InsertTextInPopulatedTextFieldLeft) { EXPECT_TRUE( GetCFFLFormFiller()->OnKeyDown(GetCPDFSDKAnnot(), FWL_VKEY_Home, 0)); - GetCPWLEdit()->ReplaceSelection(CFX_WideString(L"Hello")); + GetCPWLEdit()->ReplaceSelection(L"Hello"); EXPECT_STREQ(L"HelloABCDEFGHIJ", GetCPWLEdit()->GetText().c_str()); } @@ -232,7 +232,7 @@ TEST_F(CPWLEditEmbeddertest, InsertTextInPopulatedTextFieldMiddle) { GetCFFLFormFiller()->OnKeyDown(GetCPDFSDKAnnot(), FWL_VKEY_Left, 0)); } - GetCPWLEdit()->ReplaceSelection(CFX_WideString(L"Hello")); + GetCPWLEdit()->ReplaceSelection(L"Hello"); EXPECT_STREQ(L"ABCDEHelloFGHIJ", GetCPWLEdit()->GetText().c_str()); } @@ -240,7 +240,7 @@ TEST_F(CPWLEditEmbeddertest, InsertTextInPopulatedTextFieldRight) { FormFillerAndWindowSetup(GetCPDFSDKAnnot()); TypeTextIntoTextField(10); - GetCPWLEdit()->ReplaceSelection(CFX_WideString(L"Hello")); + GetCPWLEdit()->ReplaceSelection(L"Hello"); EXPECT_STREQ(L"ABCDEFGHIJHello", GetCPWLEdit()->GetText().c_str()); } @@ -251,7 +251,7 @@ TEST_F(CPWLEditEmbeddertest, GetCPWLEdit()->SetSelection(0, -1); EXPECT_STREQ(L"ABCDEFGHIJ", GetCPWLEdit()->GetSelectedText().c_str()); - GetCPWLEdit()->ReplaceSelection(CFX_WideString(L"Hello")); + GetCPWLEdit()->ReplaceSelection(L"Hello"); EXPECT_STREQ(L"Hello", GetCPWLEdit()->GetText().c_str()); } @@ -262,7 +262,7 @@ TEST_F(CPWLEditEmbeddertest, GetCPWLEdit()->SetSelection(0, 5); EXPECT_STREQ(L"ABCDE", GetCPWLEdit()->GetSelectedText().c_str()); - GetCPWLEdit()->ReplaceSelection(CFX_WideString(L"Hello")); + GetCPWLEdit()->ReplaceSelection(L"Hello"); EXPECT_STREQ(L"HelloFGHIJ", GetCPWLEdit()->GetText().c_str()); } @@ -273,7 +273,7 @@ TEST_F(CPWLEditEmbeddertest, GetCPWLEdit()->SetSelection(2, 7); EXPECT_STREQ(L"CDEFG", GetCPWLEdit()->GetSelectedText().c_str()); - GetCPWLEdit()->ReplaceSelection(CFX_WideString(L"Hello")); + GetCPWLEdit()->ReplaceSelection(L"Hello"); EXPECT_STREQ(L"ABHelloHIJ", GetCPWLEdit()->GetText().c_str()); } @@ -284,7 +284,7 @@ TEST_F(CPWLEditEmbeddertest, GetCPWLEdit()->SetSelection(5, 10); EXPECT_STREQ(L"FGHIJ", GetCPWLEdit()->GetSelectedText().c_str()); - GetCPWLEdit()->ReplaceSelection(CFX_WideString(L"Hello")); + GetCPWLEdit()->ReplaceSelection(L"Hello"); EXPECT_STREQ(L"ABCDEHello", GetCPWLEdit()->GetText().c_str()); } @@ -292,9 +292,9 @@ TEST_F(CPWLEditEmbeddertest, InsertTextInEmptyCharLimitTextFieldOverflow) { FormFillerAndWindowSetup(GetCPDFSDKAnnotCharLimit()); GetCPWLEdit()->SetSelection(0, -1); EXPECT_STREQ(L"Elephant", GetCPWLEdit()->GetSelectedText().c_str()); - GetCPWLEdit()->ReplaceSelection(CFX_WideString()); + GetCPWLEdit()->ReplaceSelection(L""); - GetCPWLEdit()->ReplaceSelection(CFX_WideString(L"Hippopotamus")); + GetCPWLEdit()->ReplaceSelection(L"Hippopotamus"); EXPECT_STREQ(L"Hippopotam", GetCPWLEdit()->GetText().c_str()); } @@ -302,15 +302,15 @@ TEST_F(CPWLEditEmbeddertest, InsertTextInEmptyCharLimitTextFieldFit) { FormFillerAndWindowSetup(GetCPDFSDKAnnotCharLimit()); GetCPWLEdit()->SetSelection(0, -1); EXPECT_STREQ(L"Elephant", GetCPWLEdit()->GetSelectedText().c_str()); - GetCPWLEdit()->ReplaceSelection(CFX_WideString()); + GetCPWLEdit()->ReplaceSelection(L""); - GetCPWLEdit()->ReplaceSelection(CFX_WideString(L"Zebra")); + GetCPWLEdit()->ReplaceSelection(L"Zebra"); EXPECT_STREQ(L"Zebra", GetCPWLEdit()->GetText().c_str()); } TEST_F(CPWLEditEmbeddertest, InsertTextInPopulatedCharLimitTextFieldLeft) { FormFillerAndWindowSetup(GetCPDFSDKAnnotCharLimit()); - GetCPWLEdit()->ReplaceSelection(CFX_WideString(L"Hippopotamus")); + GetCPWLEdit()->ReplaceSelection(L"Hippopotamus"); EXPECT_STREQ(L"HiElephant", GetCPWLEdit()->GetText().c_str()); } @@ -322,7 +322,7 @@ TEST_F(CPWLEditEmbeddertest, InsertTextInPopulatedCharLimitTextFieldMiddle) { FWL_VKEY_Right, 0)); } - GetCPWLEdit()->ReplaceSelection(CFX_WideString(L"Hippopotamus")); + GetCPWLEdit()->ReplaceSelection(L"Hippopotamus"); EXPECT_STREQ(L"ElephHiant", GetCPWLEdit()->GetText().c_str()); } @@ -332,7 +332,7 @@ TEST_F(CPWLEditEmbeddertest, InsertTextInPopulatedCharLimitTextFieldRight) { EXPECT_TRUE(GetCFFLFormFiller()->OnKeyDown(GetCPDFSDKAnnotCharLimit(), FWL_VKEY_End, 0)); - GetCPWLEdit()->ReplaceSelection(CFX_WideString(L"Hippopotamus")); + GetCPWLEdit()->ReplaceSelection(L"Hippopotamus"); EXPECT_STREQ(L"ElephantHi", GetCPWLEdit()->GetText().c_str()); } @@ -341,7 +341,7 @@ TEST_F(CPWLEditEmbeddertest, FormFillerAndWindowSetup(GetCPDFSDKAnnotCharLimit()); GetCPWLEdit()->SetSelection(0, -1); EXPECT_STREQ(L"Elephant", GetCPWLEdit()->GetSelectedText().c_str()); - GetCPWLEdit()->ReplaceSelection(CFX_WideString(L"Hippopotamus")); + GetCPWLEdit()->ReplaceSelection(L"Hippopotamus"); EXPECT_STREQ(L"Hippopotam", GetCPWLEdit()->GetText().c_str()); } @@ -350,7 +350,7 @@ TEST_F(CPWLEditEmbeddertest, FormFillerAndWindowSetup(GetCPDFSDKAnnotCharLimit()); GetCPWLEdit()->SetSelection(0, 4); EXPECT_STREQ(L"Elep", GetCPWLEdit()->GetSelectedText().c_str()); - GetCPWLEdit()->ReplaceSelection(CFX_WideString(L"Hippopotamus")); + GetCPWLEdit()->ReplaceSelection(L"Hippopotamus"); EXPECT_STREQ(L"Hippophant", GetCPWLEdit()->GetText().c_str()); } @@ -359,7 +359,7 @@ TEST_F(CPWLEditEmbeddertest, FormFillerAndWindowSetup(GetCPDFSDKAnnotCharLimit()); GetCPWLEdit()->SetSelection(2, 6); EXPECT_STREQ(L"epha", GetCPWLEdit()->GetSelectedText().c_str()); - GetCPWLEdit()->ReplaceSelection(CFX_WideString(L"Hippopotamus")); + GetCPWLEdit()->ReplaceSelection(L"Hippopotamus"); EXPECT_STREQ(L"ElHippopnt", GetCPWLEdit()->GetText().c_str()); } @@ -368,6 +368,6 @@ TEST_F(CPWLEditEmbeddertest, FormFillerAndWindowSetup(GetCPDFSDKAnnotCharLimit()); GetCPWLEdit()->SetSelection(4, 8); EXPECT_STREQ(L"hant", GetCPWLEdit()->GetSelectedText().c_str()); - GetCPWLEdit()->ReplaceSelection(CFX_WideString(L"Hippopotamus")); + GetCPWLEdit()->ReplaceSelection(L"Hippopotamus"); EXPECT_STREQ(L"ElepHippop", GetCPWLEdit()->GetText().c_str()); } -- cgit v1.2.3