diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2020-10-16 14:27:27 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-10-16 16:26:32 +0200 |
| commit | 60eefb146e4ad3fdac896400393b4e1cfaef7767 (patch) | |
| tree | 34a534bd76ad68c004f675bc5e5cd20e513a791a | |
| parent | 800c0aebe7dffb88eb5c1d96fd47eb99032fdfe9 (diff) | |
uitest: Rename the "SET" to "TYPE" for Edit boxes + implement the real "SET".
To be consistent with the other controls: "TYPE" actually enters the
characters one by one, while "SET" sets it as a whole.
Also I believe Modify() should be called, not UpdateData()...
Change-Id: I967dc270b1d92fe76107732a511cc3e70d3d65c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104435
Tested-by: Andras Timar <andras.timar@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | uitest/writer_tests/customizeDialog.py | 2 | ||||
| -rw-r--r-- | vcl/source/uitest/uiobject.cxx | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/uitest/writer_tests/customizeDialog.py b/uitest/writer_tests/customizeDialog.py index e6fef69cb50e..2eeb61a37aab 100644 --- a/uitest/writer_tests/customizeDialog.py +++ b/uitest/writer_tests/customizeDialog.py @@ -34,7 +34,7 @@ class ConfigureDialog(UITestCase): initialEntryCount = get_state_as_dict(xfunc)["Children"] self.assertTrue(initialEntryCount is not 0) - xSearch.executeAction("SET", mkPropertyValues({"TEXT":"format"})) + xSearch.executeAction("TYPE", mkPropertyValues({"TEXT":"format"})) # Wait for the search/filter op to be completed time.sleep(1) diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx index 77f4014eea7c..d7c6462783d7 100644 --- a/vcl/source/uitest/uiobject.cxx +++ b/vcl/source/uitest/uiobject.cxx @@ -667,7 +667,7 @@ void EditUIObject::execute(const OUString& rAction, const StringMap& rParameters) { bool bHandled = true; - if (rAction == "SET") + if (rAction == "TYPE") { if (rParameters.find("TEXT") != rParameters.end()) { @@ -690,6 +690,17 @@ void EditUIObject::execute(const OUString& rAction, bHandled = false; } } + else if (rAction == "SET") + { + auto it = rParameters.find("TEXT"); + if (it != rParameters.end()) + { + mxEdit->SetText(it->second); + mxEdit->Modify(); + } + else + bHandled = false; + } else if (rAction == "SELECT") { if (rParameters.find("FROM") != rParameters.end() && @@ -704,7 +715,7 @@ void EditUIObject::execute(const OUString& rAction, else if (rAction == "CLEAR") { mxEdit->SetText(""); - mxEdit->UpdateData(); + mxEdit->Modify(); bHandled = true; } else |