include/test/a11y/accessibletestbase.hxx | 1 +
test/source/a11y/accessibletestbase.cxx | 11 +++++++++--
toolkit/qa/cppunit/a11y/AccessibleStatusBarTest.cxx | 16 +++++++---------
vcl/qa/cppunit/a11y/atspi2/atspi2.cxx | 3 +--
4 files changed, 18 insertions(+), 13 deletions(-)
New commits:
commit e76a027177602e88d902d24017949719fe8aa7c8
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed May 21 11:47:40 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu May 22 05:50:10 2025 +0200
gtk a11y tests: Don't rely on XWindow being XAccessible
See commit messsage of
Change-Id: Id81ab5f90955ecc600e179164b5f9c7a771182d1
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Wed May 21 11:03:56 2025 +0200
sw a11y test: Don't rely on XWindow being XAccessible
for more background.
Extract a new helper from the existing
test::AccessibleTestBase::getWindowAccessibleContext
that returns only the XAccessible and use that one
to avoid duplication.
Change-Id: I0f3db88a4754f3ce8de5b02e0a0e41ac9cac9ac2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185602
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/include/test/a11y/accessibletestbase.hxx
b/include/test/a11y/accessibletestbase.hxx
index 6bd574f25941..e4d01084fa2a 100644
--- a/include/test/a11y/accessibletestbase.hxx
+++ b/include/test/a11y/accessibletestbase.hxx
@@ -51,6 +51,7 @@ protected:
virtual void load(const rtl::OUString& sURL);
virtual void loadFromSrc(const rtl::OUString& sSrcPath);
void close();
+ css::uno::Reference<css::accessibility::XAccessible> getWindowAccessible();
css::uno::Reference<css::accessibility::XAccessibleContext>
getWindowAccessibleContext();
virtual css::uno::Reference<css::accessibility::XAccessibleContext>
getDocumentAccessibleContext();
diff --git a/test/source/a11y/accessibletestbase.cxx
b/test/source/a11y/accessibletestbase.cxx
index dbbdc71e44f6..1e2f3f615190 100644
--- a/test/source/a11y/accessibletestbase.cxx
+++ b/test/source/a11y/accessibletestbase.cxx
@@ -81,12 +81,19 @@ void test::AccessibleTestBase::loadFromSrc(const
rtl::OUString& sSrcPath)
load(m_directories.getURLFromSrc(sSrcPath));
}
-uno::Reference<accessibility::XAccessibleContext>
-test::AccessibleTestBase::getWindowAccessibleContext()
+uno::Reference<accessibility::XAccessible>
test::AccessibleTestBase::getWindowAccessible()
{
vcl::Window* pWindow = VCLUnoHelper::GetWindow(mxWindow);
assert(pWindow);
css::uno::Reference<css::accessibility::XAccessible> xAccessible =
pWindow->GetAccessible();
+
+ return xAccessible;
+}
+
+uno::Reference<accessibility::XAccessibleContext>
+test::AccessibleTestBase::getWindowAccessibleContext()
+{
+ css::uno::Reference<css::accessibility::XAccessible> xAccessible =
getWindowAccessible();
assert(xAccessible.is());
return xAccessible->getAccessibleContext();
diff --git a/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
b/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
index 643d7813d4b1..b510d3243067 100644
--- a/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
+++ b/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
@@ -493,8 +493,7 @@ CPPUNIT_TEST_FIXTURE(Atspi2TestTree, Test1)
auto xAtspiPane = getDescendentAtPath(xAtspiWindow, 0, ATSPI_ROLE_PANEL,
1, ATSPI_ROLE_PANEL, 0,
ATSPI_ROLE_ROOT_PANE);
- compareTrees(uno::Reference<accessibility::XAccessible>(mxWindow,
uno::UNO_QUERY_THROW),
- xAtspiPane);
+ compareTrees(getWindowAccessible(), xAtspiPane);
}
CPPUNIT_PLUGIN_IMPLEMENT();
commit 1ebb7ce2e8b0ed518fe6c6adea175a58890c3d7d
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed May 21 11:36:25 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu May 22 05:50:04 2025 +0200
toolkit a11y test: Don't rely on XWindow being XAccessible
Reuse the existing
test::AccessibleTestBase::getWindowAccessibleContext
to get the accessible context.
See commit messsage of
Change-Id: Id81ab5f90955ecc600e179164b5f9c7a771182d1
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Wed May 21 11:03:56 2025 +0200
sw a11y test: Don't rely on XWindow being XAccessible
for more background.
Change-Id: Ic75f0ecb317d174655a0c73c6bed534884c214a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185601
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/toolkit/qa/cppunit/a11y/AccessibleStatusBarTest.cxx
b/toolkit/qa/cppunit/a11y/AccessibleStatusBarTest.cxx
index ae7a16536d45..f01798c46097 100644
--- a/toolkit/qa/cppunit/a11y/AccessibleStatusBarTest.cxx
+++ b/toolkit/qa/cppunit/a11y/AccessibleStatusBarTest.cxx
@@ -46,8 +46,7 @@ namespace
class AccessibleStatusBarTest : public test::AccessibleTestBase
{
private:
- uno::Reference<accessibility::XAccessibleContext>
- getTestObject(const uno::Reference<awt::XWindow>& xWindow);
+ uno::Reference<accessibility::XAccessibleContext> getTestObject();
void runAllTests();
void testDocument(std::string_view sKind);
@@ -67,15 +66,14 @@ public:
CPPUNIT_TEST_SUITE_END();
};
-uno::Reference<accessibility::XAccessibleContext>
-AccessibleStatusBarTest::getTestObject(const uno::Reference<awt::XWindow>&
xWindow)
+uno::Reference<accessibility::XAccessibleContext>
AccessibleStatusBarTest::getTestObject()
{
- uno::Reference<accessibility::XAccessible> xAccessible(xWindow,
uno::UNO_QUERY_THROW);
- std::cout << "got accessible: " << xAccessible << std::endl;
- std::cout << "accessible name: " <<
AccessibilityTools::debugString(xAccessible) << std::endl;
+ uno::Reference<accessibility::XAccessibleContext> xWinContext =
getWindowAccessibleContext();
+ std::cout << "got accessible: " << xWinContext << std::endl;
+ std::cout << "accessible name: " <<
AccessibilityTools::debugString(xWinContext) << std::endl;
auto xContext = AccessibilityTools::getAccessibleObjectForRole(
- xAccessible, accessibility::AccessibleRole::STATUS_BAR);
+ xWinContext, accessibility::AccessibleRole::STATUS_BAR);
std::cout << "got context: " << xContext << std::endl;
std::cout << "context name: " << AccessibilityTools::debugString(xContext)
<< std::endl;
@@ -93,7 +91,7 @@ AccessibleStatusBarTest::getTestObject(const
uno::Reference<awt::XWindow>& xWind
void AccessibleStatusBarTest::runAllTests()
{
- auto xContext = getTestObject(mxWindow);
+ auto xContext = getTestObject();
uno::Reference<accessibility::XAccessibleComponent>
xAccessibleComponent(xContext,
uno::UNO_QUERY_THROW);
