[Libreoffice-commits] core.git: Branch 'feature/ui-test' - 9 commits - desktop/source include/sal include/vcl sc/source sd/source sw/source vcl/source
Markus Mohrhard
markus.mohrhard at googlemail.com
Sat Jun 18 14:18:04 UTC 2016
desktop/source/app/app.cxx | 1 -
include/sal/log-areas.dox | 2 ++
include/vcl/dialog.hxx | 2 +-
include/vcl/uitest/uitest.hxx | 4 ++--
sc/source/ui/uitest/uiobject.cxx | 2 +-
sd/source/ui/uitest/uiobject.cxx | 2 +-
sw/source/uibase/uitest/uiobject.cxx | 16 ++++++++--------
vcl/source/uitest/uno/uitest_uno.cxx | 4 ++--
8 files changed, 17 insertions(+), 16 deletions(-)
New commits:
commit 38b9ade98fd9bb6bc1034578579364586fcfa0be
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Jun 18 16:03:04 2016 +0200
uitest: loplugin:stringconstant
Change-Id: I863615af7a942b91513511ba515b82f3523c6aa5
diff --git a/sd/source/ui/uitest/uiobject.cxx b/sd/source/ui/uitest/uiobject.cxx
index a8c0227..03b1538 100644
--- a/sd/source/ui/uitest/uiobject.cxx
+++ b/sd/source/ui/uitest/uiobject.cxx
@@ -76,7 +76,7 @@ namespace {
OUString getObjectName(SdrObject* pObject)
{
if (pObject->GetName().isEmpty())
- return OUString("Unnamed Drawinglayer object ") + OUString::number(pObject->GetOrdNum());
+ return "Unnamed Drawinglayer object " + OUString::number(pObject->GetOrdNum());
else
return pObject->GetName();
}
commit 42d6697f9e072539511243668aa79492772c6f2f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Jun 18 16:01:48 2016 +0200
uitest: loplugin:staticcall
Change-Id: I0e8fd138689e73cd0b320d0898e0410baa2bcfa9
diff --git a/vcl/source/uitest/uno/uitest_uno.cxx b/vcl/source/uitest/uno/uitest_uno.cxx
index 10b7f12..5270089 100644
--- a/vcl/source/uitest/uno/uitest_uno.cxx
+++ b/vcl/source/uitest/uno/uitest_uno.cxx
@@ -69,13 +69,13 @@ void SAL_CALL UITestUnoObj::executeCommand(const OUString& rCommand)
throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- mpUITest->executeCommand(rCommand);
+ UITest::executeCommand(rCommand);
}
css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UITestUnoObj::getTopFocusWindow()
throw (css::uno::RuntimeException, std::exception)
{
- std::unique_ptr<UIObject> pObj = mpUITest->getFocusTopWindow();
+ std::unique_ptr<UIObject> pObj = UITest::getFocusTopWindow();
return new UIObjectUnoObj(std::move(pObj));
}
commit ababf44a68ad1872ca4f51f614a9e16f16192d5e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Jun 18 16:00:38 2016 +0200
loplugin:unusedvariablecheck
Change-Id: I8bd6447915942c1869ec186d8ca01e5ac43b3e8a
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 696d858..b9e5737 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1027,7 +1027,6 @@ bool crashReportInfoExists()
if (sep >= 0)
{
std::string key = line.substr(0, sep);
- std::string value = line.substr(sep + 1);
if (key == "DumpFile")
return true;
}
commit 0b8a38cba40384f353e35aa4346b0345f18d2b25
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Jun 18 15:59:50 2016 +0200
uitest: loplugin:sallogareas
Change-Id: Ieb01166fbb0b07d1218072ae8bb953a36582361c
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 3a28b7c..dd32631 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -135,6 +135,7 @@ certain functionality.
@li @c sc.orcus.table
@li @c sc.qa
@li @c sc.ui - Calc UI
+ at li @c sc.uitest - Calc UI Test part
@li @c sc.viewdata
@section desktop
commit 321c2554890a9381d3e9eb7f5d9a45ec26b1e5c7
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Jun 18 15:58:52 2016 +0200
uitest: loplugin:stringconstant
Change-Id: Ib63a978bd488f41602d982789699ba3f3ca2dcf0
diff --git a/sc/source/ui/uitest/uiobject.cxx b/sc/source/ui/uitest/uiobject.cxx
index f46ce5b..298acf0 100644
--- a/sc/source/ui/uitest/uiobject.cxx
+++ b/sc/source/ui/uitest/uiobject.cxx
@@ -91,7 +91,7 @@ void ScGridWinUIObject::execute(const OUString& rAction,
if (rParameters.find("EXTEND") != rParameters.end())
{
auto itr = rParameters.find("EXTEND");
- if (itr->second.equalsIgnoreAsciiCaseAscii("true") || itr->second == "1")
+ if (itr->second.equalsIgnoreAsciiCase("true") || itr->second == "1")
bExtend = true;
}
commit 62e4ef00a194bf3afa07ac554aa4e5a116f9cf78
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Jun 18 15:57:34 2016 +0200
uitest: loplugin:implicitboolconversion
Change-Id: Id852960cdfd49331251e89306a6a32eb9e45a666
diff --git a/sw/source/uibase/uitest/uiobject.cxx b/sw/source/uibase/uitest/uiobject.cxx
index 9f4529d..8759705 100644
--- a/sw/source/uibase/uitest/uiobject.cxx
+++ b/sw/source/uibase/uitest/uiobject.cxx
@@ -44,14 +44,14 @@ StringMap SwEditWinUIObject::get_state()
sal_uInt16 nPages = rWrtShell.GetPageCnt();
aMap["Pages"] = OUString::number(nPages);
- aMap["StartWord"] = OUString::number(rWrtShell.IsStartWord());
- aMap["EndWord"] = OUString::number(rWrtShell.IsEndWord());
- aMap["StartSentence"] = OUString::number(rWrtShell.IsStartSentence());
- aMap["EndSentence"] = OUString::number(rWrtShell.IsEndSentence());
- aMap["StartPara"] = OUString::number(rWrtShell.IsSttPara());
- aMap["EndPara"] = OUString::number(rWrtShell.IsEndPara());
- aMap["StartDoc"] = OUString::number(rWrtShell.IsStartOfDoc());
- aMap["EndDoc"] = OUString::number(rWrtShell.IsEndOfDoc());
+ aMap["StartWord"] = OUString::boolean(rWrtShell.IsStartWord());
+ aMap["EndWord"] = OUString::boolean(rWrtShell.IsEndWord());
+ aMap["StartSentence"] = OUString::boolean(rWrtShell.IsStartSentence());
+ aMap["EndSentence"] = OUString::boolean(rWrtShell.IsEndSentence());
+ aMap["StartPara"] = OUString::boolean(rWrtShell.IsSttPara());
+ aMap["EndPara"] = OUString::boolean(rWrtShell.IsEndPara());
+ aMap["StartDoc"] = OUString::boolean(rWrtShell.IsStartOfDoc());
+ aMap["EndDoc"] = OUString::boolean(rWrtShell.IsEndOfDoc());
return aMap;
}
commit f17df8cff90bd7d0263b2335d471679ac342df09
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Jun 18 14:06:08 2016 +0200
uitest: loplugin:staticmethods
Change-Id: I741a41ea12fe0ee70a73e144d4601c8aafe30ac8
diff --git a/include/vcl/uitest/uitest.hxx b/include/vcl/uitest/uitest.hxx
index 38966a0..9f226b8 100644
--- a/include/vcl/uitest/uitest.hxx
+++ b/include/vcl/uitest/uitest.hxx
@@ -19,9 +19,9 @@ class UITEST_DLLPUBLIC UITest
{
public:
- void executeCommand(const OUString& rCommand);
+ static void executeCommand(const OUString& rCommand);
- std::unique_ptr<UIObject> getFocusTopWindow();
+ static std::unique_ptr<UIObject> getFocusTopWindow();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 8fb4435bd40ad0e1f450ae1f67db48eed2ccf5bc
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Jun 18 14:05:43 2016 +0200
uitest: plugin:sallogareas
Change-Id: Ib0ebd774542129f8a7c68e276f1f03cc46f32fb8
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 25588df..3a28b7c 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -446,6 +446,7 @@ certain functionality.
@li @c vcl.screensaverinhibitor
@li @c vcl.scrollbar - Scroll Bars
@li @c vcl.sm - Session Manager
+ at li @c vcl.uitest - The UI testing framework code
@li @c vcl.unity
@li @c vcl.unx.print
@li @c vcl.unx.dtrans
commit f88add0a170c7e5feede67566d88f6e5d7d2e80e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Jun 18 14:03:46 2016 +0200
uitest: loplugin:override
Change-Id: I014e036c803ef7eeba265eb36782781c3a62672c
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index afa8c2e..ecf086d8 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -96,7 +96,7 @@ public:
virtual short Execute();
bool IsInExecute() const { return mbInExecute; }
- virtual FactoryFunction GetUITestFactory() const;
+ virtual FactoryFunction GetUITestFactory() const override;
// Dialog::Execute replacement API
public:
More information about the Libreoffice-commits
mailing list