[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/cppunit/a11y/AccessibleStatusBarTest.cxx | 67 +++- 1 file changed, 11 insertions(+), 56 deletions(-) New commits: commit c75e975a20258650baa6c906ac8cc1bc4e8f6244 Author: Colomban Wendling AuthorDate: Tue Feb 14 11:45:29 2023 +0100 Commit: Michael Weghorn CommitDate: Wed Feb 22 16:53:41 2023 + toolkit: Port AccessibleStatusBarTest to test::AccessibleTestBase Now we have test::AccessibleTestBase we can use it instead of performing some setup operations manually. The only actual change is that we don't pass OpenFlags=S when creating an Impress document, but it never seemed useful (it was only ported from Java out of zeal), and I can't even find what the S option is for. In all cases, this doesn't affect the tests themselves. Change-Id: Ic8d56dd9bc3ec957891868b23bb241ba3bf33049 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147003 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/toolkit/qa/cppunit/a11y/AccessibleStatusBarTest.cxx b/toolkit/qa/cppunit/a11y/AccessibleStatusBarTest.cxx index 20d8b42f8c0c..5bf522fb2e2e 100644 --- a/toolkit/qa/cppunit/a11y/AccessibleStatusBarTest.cxx +++ b/toolkit/qa/cppunit/a11y/AccessibleStatusBarTest.cxx @@ -24,18 +24,13 @@ #include #include #include -#include -#include #include #include -#include #include #include -#include -#include #include -#include +#include #include #include @@ -48,15 +43,12 @@ using namespace css; namespace { -class AccessibleStatusBarTest : public test::BootstrapFixture +class AccessibleStatusBarTest : public test::AccessibleTestBase { private: -uno::Reference mxDesktop; - uno::Reference getTestObject(const uno::Reference& xWindow); -void runAllTests(const uno::Reference& xWindow); -uno::Reference openDocument(std::string_view sKind); +void runAllTests(); void testDocument(std::string_view sKind); void testWriterDoc() { testDocument("swriter"); } @@ -66,8 +58,6 @@ private: void testCalcDoc() { testDocument("scalc"); } public: -virtual void setUp() override; - CPPUNIT_TEST_SUITE(AccessibleStatusBarTest); CPPUNIT_TEST(testWriterDoc); CPPUNIT_TEST(testMathDoc); @@ -77,13 +67,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -void AccessibleStatusBarTest::setUp() -{ -test::BootstrapFixture::setUp(); - -mxDesktop = frame::Desktop::create(mxComponentContext); -} - uno::Reference AccessibleStatusBarTest::getTestObject(const uno::Reference& xWindow) { @@ -108,9 +91,9 @@ AccessibleStatusBarTest::getTestObject(const uno::Reference& xWind return xContext; } -void AccessibleStatusBarTest::runAllTests(const uno::Reference& xWindow) +void AccessibleStatusBarTest::runAllTests() { -auto xContext = getTestObject(xWindow); +auto xContext = getTestObject(mxWindow); uno::Reference xAccessibleComponent(xContext, uno::UNO_QUERY_THROW); @@ -127,53 +110,25 @@ void AccessibleStatusBarTest::runAllTests(const uno::Reference& xW uno::Reference xAccessibleEventBroadcaster( xContext, uno::UNO_QUERY_THROW); -XAccessibleEventBroadcasterTester eventBroadcasterTester(xAccessibleEventBroadcaster, xWindow); +XAccessibleEventBroadcasterTester eventBroadcasterTester(xAccessibleEventBroadcaster, mxWindow); eventBroadcasterTester.testAll(); } -uno::Reference AccessibleStatusBarTest::openDocument(std::string_view sKind) +void AccessibleStatusBarTest::testDocument(std::string_view sKind) { -/* not sure what's that about, but from SOfficeFactory.java:openDoc() */ -// that noargs thing for load attributes -std::vector aArgs; -if (sKind == "simpress") -{ -beans::PropertyValue aValue; -aValue.Name = "OpenFlags"; -aValue.Handle = -1; -aValue.Value <<= OUString("S"); -aValue.State = beans::PropertyState_DIRECT_VALUE; -aArgs.push_back(aValue); -} - rtl::OUStringBuffer sURL("private:factory/"); sURL.appendAscii(sKind.data(), sKind.length()); -return mxDesktop->loadComponentFromURL(sURL.makeStringAndClear(), "_blank", 40, - comphelper::containerToSequence(aArgs)); -} +load(sURL.makeStringAndClear()); -void AccessibleStatusBarTest::testDocument(std::string_view sKind) -{ -auto xDoc = openDocument(sKind); -std::cout << "got document: " << xDoc << std::endl; -CPPUNIT_ASSERT(xDoc.is()); -uno::Reference xModel(xDoc, uno::UNO_QUERY_THROW); -std::cout << "got model: " << xModel << std::endl; -uno::Reference xWindow( -xModel->getCurrentController()->getFrame()->getContainerWindow()); -std::cout << "got window: " << xWindow << std::endl; -uno::Reference xTopWindow(xWindow, uno::UNO_QUERY_THROW); -std::cout << "got top window: " << xTopWindow << std::endl;
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx |8 toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx | 10 +- 2 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 69c964bbd56ff49324d1ca649739fae354dd4c16 Author: Rene Engelhard AuthorDate: Fri Jun 10 21:35:43 2022 +0200 Commit: René Engelhard CommitDate: Sat Jun 11 09:07:44 2022 +0200 fix 32bit build in new a11y cppunit tests /<>/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx: In member function ‘void XAccessibleComponentTester::testBounds()’: /<>/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx:51:5: error: no matching function for call to ‘assertGreaterEqual(int, sal_Int32&, CppUnit::SourceLine, const char [1])’ 51 | CPPUNIT_ASSERT_GREATEREQUAL(0, bounds.X); | ^ /usr/include/cppunit/TestAssert.h:251:6: note: candidate: ‘template void CppUnit::assertGreaterEqual(const T&, const T&, CppUnit::SourceLine, const string&)’ 251 | void assertGreaterEqual( const T& expected, | ^~ /usr/include/cppunit/TestAssert.h:251:6: note: template argument deduction/substitution failed: /<>/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx:51:5: note: deduced conflicting types for parameter ‘const T’ (‘int’ and ‘sal_Int32’ {aka ‘long int’}) 51 | CPPUNIT_ASSERT_GREATEREQUAL(0, bounds.X); | ^ etc. Regression from d2a5b4bc0b8c8d1dd82133719a3ef5cc01b0cbbe Change-Id: I123894e5ed6d6f3bcf46b1c5b37f1f49cb5f9f99 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135630 Tested-by: Jenkins Tested-by: René Engelhard Reviewed-by: René Engelhard diff --git a/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx b/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx index 5613724786b9..ea46ff778575 100644 --- a/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx +++ b/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx @@ -48,10 +48,10 @@ void XAccessibleComponentTester::testBounds() auto bounds = mxComponent->getBounds(); std::cout << "bounds: " << bounds.Width << "x" << bounds.Height << std::showpos << bounds.X << bounds.Y << std::noshowpos << std::endl; -CPPUNIT_ASSERT_GREATEREQUAL(0, bounds.X); -CPPUNIT_ASSERT_GREATEREQUAL(0, bounds.Y); -CPPUNIT_ASSERT_GREATER(0, bounds.Width); -CPPUNIT_ASSERT_GREATER(0, bounds.Height); +CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), bounds.X); +CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), bounds.Y); +CPPUNIT_ASSERT_GREATER(static_cast(0), bounds.Width); +CPPUNIT_ASSERT_GREATER(static_cast(0), bounds.Height); } /** diff --git a/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx b/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx index 3a7eb70e9dd5..b8c7898f963f 100644 --- a/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx +++ b/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx @@ -57,7 +57,7 @@ void XAccessibleContextTester::testGetAccessibleChildCount() { auto childCount = mxContext->getAccessibleChildCount(); std::cout << childCount << " children found." << std::endl; -CPPUNIT_ASSERT_GREATEREQUAL(0, childCount); +CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), childCount); } /** @@ -130,10 +130,10 @@ void XAccessibleContextTester::testGetAccessibleRelationSet() */ void XAccessibleContextTester::testGetAccessibleRole() { -sal_Int16 role = mxContext->getAccessibleRole(); +sal_Int32 role = mxContext->getAccessibleRole(); std::cout << "The role is " << role << " (" << AccessibilityTools::getRoleName(role) << ")" << std::endl; -CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), role); +CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), role); } /** @@ -157,8 +157,8 @@ void XAccessibleContextTester::testGetLocale() { auto loc = mxContext->getLocale(); std::cout << "The locale is " << loc.Language << "," << loc.Country << std::endl; -CPPUNIT_ASSERT_GREATER(0, loc.Language.getLength()); -CPPUNIT_ASSERT_GREATER(0, loc.Country.getLength()); +CPPUNIT_ASSERT_GREATER(static_cast(0), loc.Language.getLength()); +CPPUNIT_ASSERT_GREATER(static_cast(0), loc.Country.getLength()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 19a67603c7a800d3433e9f41143a9b9ed6300b8d Author: Andrea Gelmini AuthorDate: Wed Jun 8 21:05:19 2022 +0200 Commit: Julien Nabet CommitDate: Wed Jun 8 21:18:11 2022 +0200 Fix typo Change-Id: Id5517254be4e108c4aeedbd067f9bf3097f89452 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135515 Tested-by: Julien Nabet Reviewed-by: Julien Nabet diff --git a/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx b/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx index 13da4a2c765f..5613724786b9 100644 --- a/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx +++ b/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx @@ -214,7 +214,7 @@ void XAccessibleComponentTester::testAccessibleAtPoint() } /** - * @brief Tests reults of XAccessibleComponent::getLocation() + * @brief Tests results of XAccessibleComponent::getLocation() * * Succeeds if the location is the same as location of boundary obtained by * the getBounds() method.
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 33f88380fba0202d03577da80f7370ac8e583fb1 Author: Andrea Gelmini AuthorDate: Wed Jun 8 21:05:24 2022 +0200 Commit: Julien Nabet CommitDate: Wed Jun 8 21:17:44 2022 +0200 Fix typo Change-Id: I278a23c9dc7a20f293e8167ee3c0492679e81f8d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135516 Tested-by: Julien Nabet Reviewed-by: Julien Nabet diff --git a/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx b/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx index fddd7feab2be..3a7eb70e9dd5 100644 --- a/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx +++ b/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx @@ -124,7 +124,7 @@ void XAccessibleContextTester::testGetAccessibleRelationSet() } /** - * @breif Get the accessible role of component. + * @brief Get the accessible role of component. * * Checks that the role is a non-negative number. */
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/cppunit/Dialog.cxx |1 + toolkit/qa/cppunit/EventContainer.cxx |2 ++ 2 files changed, 3 insertions(+) New commits: commit aba5d639c4b674d7fd1771bf553518913cec4499 Author: Noel Grandin AuthorDate: Tue May 25 12:51:47 2021 +0200 Commit: Noel Grandin CommitDate: Tue May 25 14:11:08 2021 +0200 fix leak in toolkit test Change-Id: I6d3aa0fca6f48145c9c3b4e7d41a486fae026f06 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116099 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/toolkit/qa/cppunit/Dialog.cxx b/toolkit/qa/cppunit/Dialog.cxx index 5f02c58bee61..6ddf3f725840 100644 --- a/toolkit/qa/cppunit/Dialog.cxx +++ b/toolkit/qa/cppunit/Dialog.cxx @@ -66,6 +66,7 @@ CPPUNIT_TEST_FIXTURE(DialogTest, testDialogSizeable) xDialog->endExecute(); css::uno::Reference(xDialog, css::uno::UNO_QUERY_THROW)->dispose(); +css::uno::Reference(xControlModel, css::uno::UNO_QUERY_THROW)->dispose(); } } diff --git a/toolkit/qa/cppunit/EventContainer.cxx b/toolkit/qa/cppunit/EventContainer.cxx index 97a125c60824..e5921f2fe404 100644 --- a/toolkit/qa/cppunit/EventContainer.cxx +++ b/toolkit/qa/cppunit/EventContainer.cxx @@ -76,6 +76,8 @@ CPPUNIT_TEST_FIXTURE(EventContainerTest, testInsertOrder) CPPUNIT_ASSERT_EQUAL(OUString("a"), aEventNames[1]); CPPUNIT_ASSERT_EQUAL(OUString("1"), aEventNames[2]); CPPUNIT_ASSERT_EQUAL(OUString("A"), aEventNames[3]); + +css::uno::Reference(xControlModel, css::uno::UNO_QUERY_THROW)->dispose(); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/complex/toolkit/GridControl.java |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 02caeb507cb9e0d7ea6f6f789498d7a438ced4a2 Author: Andrea Gelmini AuthorDate: Fri Sep 25 12:26:30 2020 +0200 Commit: Julien Nabet CommitDate: Sat Sep 26 09:44:26 2020 +0200 Fix typo in code It passed "make check" on Linux Change-Id: I9114b844b014d561464317ad6f54b54fe5a81d72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103454 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/toolkit/qa/complex/toolkit/GridControl.java b/toolkit/qa/complex/toolkit/GridControl.java index 8b1bcea411b2..b2338ee68f93 100644 --- a/toolkit/qa/complex/toolkit/GridControl.java +++ b/toolkit/qa/complex/toolkit/GridControl.java @@ -643,9 +643,9 @@ public class GridControl } -public T createInstance( Class i_interfaceClass, final String i_serviceIndentifer ) throws Exception +public T createInstance( Class i_interfaceClass, final String i_serviceIndentifier ) throws Exception { -return UnoRuntime.queryInterface( i_interfaceClass, createInstance( i_serviceIndentifer ) ); +return UnoRuntime.queryInterface( i_interfaceClass, createInstance( i_serviceIndentifier ) ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/cppunit/EventContainer.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fa0d576378cafab396a3fb75b1dbe1905d5df9ce Author: Samuel Mehrbrodt AuthorDate: Mon May 11 07:48:23 2020 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon May 11 08:34:20 2020 +0200 Fix 32bit linux build Change-Id: I4faf3fb20c632163f98264d162bbf85f80b3603d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93797 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/toolkit/qa/cppunit/EventContainer.cxx b/toolkit/qa/cppunit/EventContainer.cxx index 300c8e5adb74..97a125c60824 100644 --- a/toolkit/qa/cppunit/EventContainer.cxx +++ b/toolkit/qa/cppunit/EventContainer.cxx @@ -70,7 +70,7 @@ CPPUNIT_TEST_FIXTURE(EventContainerTest, testInsertOrder) Sequence aEventNames(xEvents->getElementNames()); sal_Int32 nEventCount = aEventNames.getLength(); -CPPUNIT_ASSERT_EQUAL(4, nEventCount); +CPPUNIT_ASSERT_EQUAL(static_cast(4), nEventCount); CPPUNIT_ASSERT_EQUAL(OUString("b"), aEventNames[0]); CPPUNIT_ASSERT_EQUAL(OUString("a"), aEventNames[1]); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/cppunit/Dialog.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 1be7a056ff843e8e9cb80890ecf7d3aa852557e9 Author: Stephan Bergmann AuthorDate: Fri Mar 20 13:19:57 2020 +0100 Commit: Stephan Bergmann CommitDate: Fri Mar 20 17:18:43 2020 +0100 Dispose dialog created during test I experienced crashes during shutdown of CppunitTest_toolkit at least with --enable-lto, [...] > OK (2) > warn:vcl:109889:109889:vcl/source/app/svmain.cxx:460: DeInitVCL: some top Windows are still alive > text = "" type = "N7toolkit16ScrollableDialogE", ptr = 0x216b740 > > warn:fwk.desktop:109889:109889:framework/source/services/desktop.cxx:1065: Desktop disposed before terminating it > warn:fwk.desktop:109889:109889:framework/source/services/desktop.cxx:179: Desktop not terminated before being destructed > warn:unotools.config:109889:109889:unotools/source/config/configmgr.cxx:140: ConfigManager not empty > cppunittester: /home/sbergman/lo2/core/include/vcl/vclptr.hxx:106: VclPtr::~VclPtr() [with reference_type = vcl::Window]: Assertion `m_rInnerRef.get() == nullptr || vclmain::isAlive()' failed. Change-Id: I419b7ef8e23c94a906e3de6b3a55b63e13650abe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90790 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/toolkit/qa/cppunit/Dialog.cxx b/toolkit/qa/cppunit/Dialog.cxx index c58b9b4768ca..5f02c58bee61 100644 --- a/toolkit/qa/cppunit/Dialog.cxx +++ b/toolkit/qa/cppunit/Dialog.cxx @@ -65,6 +65,7 @@ CPPUNIT_TEST_FIXTURE(DialogTest, testDialogSizeable) CPPUNIT_ASSERT(pWindow->GetStyle() & WB_SIZEABLE); xDialog->endExecute(); +css::uno::Reference(xDialog, css::uno::UNO_QUERY_THROW)->dispose(); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/qa unotest/source
toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java |4 ++-- unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 22a34b3b7a5938bb25b0c6b94097483a4b857ef1 Author: Andrea GelminiDate: Sun Apr 29 23:38:46 2018 +0200 Fix typos Change-Id: I156afb90e159b6e13cf304ac8f6ff9274cb2c7ec Reviewed-on: https://gerrit.libreoffice.org/53641 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java b/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java index a2af0bac4bcd..1623af8b68f2 100644 --- a/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java +++ b/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java @@ -119,7 +119,7 @@ public class TMutableGridDataModel : ( row == insertionPos ) ? inbetweenRow : m_rowValues[ row - 1 ]; -assertArrayEquals( "row number " + row + " has wrong content content after inserting a row", +assertArrayEquals( "row number " + row + " has wrong content after inserting a row", expectedRowData, actualRowData ); final Object actualHeading = m_dataModel.getRowHeading(row); @@ -188,7 +188,7 @@ public class TMutableGridDataModel : ( row >= insertionPos ) && ( row < insertionPos + insertedRowCount ) ? rowData[ row - insertionPos ] : m_rowValues[ row - insertedRowCount ]; -assertArrayEquals( "row number " + row + " has wrong content content after inserting multiple rows", +assertArrayEquals( "row number " + row + " has wrong content after inserting multiple rows", expectedRowData, actualRowData ); final Object actualHeading = m_dataModel.getRowHeading(row); diff --git a/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx b/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx index 9aee5f52bf63..2603f1607791 100644 --- a/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx +++ b/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx @@ -47,7 +47,7 @@ using namespace com::sun::star; //cppunit calls instantiates a new TextFixture for each test and calls setUp //and tearDown on that for every test in a fixture -//We basically need to call dispose on our root component context context to +//We basically need to call dispose on our root component context to //shut down cleanly in the right order. //But we can't setup and tear down the root component context for ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/cppunit/UnitConversion.cxx | 22 ++ 1 file changed, 22 insertions(+) New commits: commit 64f1d7ad58f7281c757411b7e890e220485a09bf Author: Michael StahlDate: Thu Jan 4 23:27:08 2018 +0100 toolkit: disable UnitConversion test for non-default resolution on WNT Apparently this fails currently for unknown reasons, see report by Luke Benes at https://lists.freedesktop.org/archives/libreoffice/2017-December/079196.html Change-Id: Ib4c79fbc6a4353ab51612836f51196bc37a90ae1 Reviewed-on: https://gerrit.libreoffice.org/47444 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/toolkit/qa/cppunit/UnitConversion.cxx b/toolkit/qa/cppunit/UnitConversion.cxx index 3178e38ff159..62fe284e8d5a 100644 --- a/toolkit/qa/cppunit/UnitConversion.cxx +++ b/toolkit/qa/cppunit/UnitConversion.cxx @@ -28,6 +28,10 @@ #include #include +#ifdef _WIN32 +#include +#endif + using namespace ::com::sun::star; namespace @@ -96,6 +100,24 @@ void checkSize(uno::Reference const& xConv, awt::Size cons */ void ToolkitTest::testXUnitConversion() { +#ifdef _WIN32 +HKEY hkey; +DWORD type; +DWORD data; +DWORD size(sizeof(data)); +LONG ret = ::RegOpenKeyW(HKEY_CURRENT_USER, L"Control Panel\\Desktop", ); +if (ret == ERROR_SUCCESS) +{ +ret = ::RegQueryValueExW(hkey, L"LogPixels", nullptr, , + reinterpret_cast(), ); +if (ret == ERROR_SUCCESS && type == REG_DWORD && data != 96) +{ +std::cerr << "non-default resolution, skipping textXUnitConversion\n"; +return; +} +} +#endif + // create a window sal_Int32 x = 100; sal_Int32 y = 100; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/complex/toolkit/UnitConversion.java |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit dfaceb70ec2f6feda6a73b8be00a7f168dfe075b Author: Johnny_MDate: Sat Sep 2 13:40:47 2017 +0200 Translate one German variable name No functional change is intended. Change-Id: I47312070bea07b0c4994da4f99aa99684cfd850e Reviewed-on: https://gerrit.libreoffice.org/41832 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/toolkit/qa/complex/toolkit/UnitConversion.java b/toolkit/qa/complex/toolkit/UnitConversion.java index 15b67fc61b21..72fcef7cba29 100644 --- a/toolkit/qa/complex/toolkit/UnitConversion.java +++ b/toolkit/qa/complex/toolkit/UnitConversion.java @@ -70,14 +70,14 @@ public class UnitConversion * only a simple test call to convertSizeToLogic(...) with different parameters * @param _aSize * @param _aMeasureUnit - * @param _sEinheit + * @param _sUnit */ -private void checkSize(com.sun.star.awt.Size _aSize, short _aMeasureUnit, String _sEinheit) +private void checkSize(com.sun.star.awt.Size _aSize, short _aMeasureUnit, String _sUnit) { com.sun.star.awt.Size aSizeIn = m_xConversion.convertSizeToLogic(_aSize, _aMeasureUnit); System.out.println("Window size:"); -System.out.println("Width:" + aSizeIn.Width + " " + _sEinheit); -System.out.println("Height:" + aSizeIn.Height + " " + _sEinheit); +System.out.println("Width:" + aSizeIn.Width + " " + _sUnit); +System.out.println("Height:" + aSizeIn.Height + " " + _sUnit); System.out.println(""); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/qa tools/source ucb/source udkapi/com unotest/source unotools/source
toolkit/qa/complex/toolkit/GridControl.java |2 +- tools/source/generic/config.cxx |2 +- ucb/source/ucp/file/filtask.hxx |2 +- ucb/source/ucp/webdav-neon/webdavcontent.cxx |2 +- udkapi/com/sun/star/bridge/XBridgeSupplier2.idl |2 +- udkapi/com/sun/star/io/XInputStream.idl |8 udkapi/com/sun/star/modules.idl |2 +- udkapi/com/sun/star/script/XDefaultProperty.idl |2 +- udkapi/com/sun/star/task/XInteractionAbort.idl |2 +- udkapi/com/sun/star/task/XInteractionRetry.idl |2 +- unotest/source/python/org/libreoffice/unotest.py |2 +- unotools/source/config/dynamicmenuoptions.cxx|2 +- unotools/source/misc/fontdefs.cxx|2 +- 13 files changed, 16 insertions(+), 16 deletions(-) New commits: commit 446568bfad252daf1861ea7e0c53fe4c72a31a53 Author: Andrea GelminiDate: Thu Mar 2 09:42:30 2017 +0100 Fix typos Change-Id: I139e6948e92a7bcdce5a2197b9d3754cb9549a33 Reviewed-on: https://gerrit.libreoffice.org/34781 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/toolkit/qa/complex/toolkit/GridControl.java b/toolkit/qa/complex/toolkit/GridControl.java index bde63aa..ab836cc 100644 --- a/toolkit/qa/complex/toolkit/GridControl.java +++ b/toolkit/qa/complex/toolkit/GridControl.java @@ -122,7 +122,7 @@ public class GridControl // TODO: check all those generic properties for equality // the data model and the column model should have been cloned, too -// in particular, the clone should not share the sub models with the orignal +// in particular, the clone should not share the sub models with the original final XMutableGridDataModel originalDataModel = UnoRuntime.queryInterface( XMutableGridDataModel.class, m_gridControlModel.getPropertyValue( "GridDataModel" ) ); final XMutableGridDataModel clonedDataModel = UnoRuntime.queryInterface( XMutableGridDataModel.class, diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx index fc680c9..5b15a97 100644 --- a/tools/source/generic/config.cxx +++ b/tools/source/generic/config.cxx @@ -642,7 +642,7 @@ ImplGroupData* Config::ImplGetGroup() const mpData->mpFirstGroup = pGroup; } -// Always inherit group names and upate cache members +// Always inherit group names and update cache members pGroup->maGroupName = maGroupName; const_cast (this)->mnDataUpdateId = mpData->mnDataUpdateId; const_cast (this)->mpActGroup = pGroup; diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index e924f19..5371869 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -637,7 +637,7 @@ namespace fileaccess // Helper function for mkfil,mkdir and write // Creates whole path // returns success of the operation -// The calle determines the errorCode, which should be used to install +// The call determines the errorCode, which should be used to install // any error bool SAL_CALL diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index 255a1cd..3427623 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -4232,7 +4232,7 @@ bool Content::isResourceAvailable( const css::uno::Reference< css::ucb::XCommand { // To check for the physical URL resource availability, first // try using a simple HEAD command -// if HEAD is successfull, set element found, +// if HEAD is successful, set element found, rResAccess->HEAD( aHeaderNames, aResource, xEnv ); rDAVOptions.setHttpResponseStatusCode( 0 ); OUString aNoText; diff --git a/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl b/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl index d393083..01930ca 100644 --- a/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl +++ b/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl @@ -43,7 +43,7 @@ bridging code involved when those types are being used. -Sometimes a bridge cannot be created, depending on whether a programm uses +Sometimes a bridge cannot be created, depending on whether a program uses the XBridgeSupplier2 interface remotely. Assuming one wants to bridge an OLE Automation object to UNO by calling createBridge on a proxy, then the UNO remote bridge would not recognise that the Any argument contains an IDispatch interface. diff --git a/udkapi/com/sun/star/io/XInputStream.idl b/udkapi/com/sun/star/io/XInputStream.idl index 0b3cb9b..11d4031 100644 --- a/udkapi/com/sun/star/io/XInputStream.idl +++
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/unoapi/knownissues.xcl |1 + 1 file changed, 1 insertion(+) New commits: commit 20ff8cc5c3534d149b18b9776ab964324e70fdfd Author: Miklos VajnaDate: Mon Dec 21 09:19:40 2015 +0100 toolkit: mark AccessibleScrollBar:XAccessibleEventBroadcaster as a known issue JunitTest_toolkit_unoapi_1 started to fail for me recently in toolkit.AccessibleScrollBar, though only when ran via 'make check' or 'make toolkit.subsequentcheck', not via 'make JunitTest_toolkit_unoapi_1' when other junit tests of toolkit are not running. Provided that, it's quite hard to debug the exact problem, but it seems VCLXAccessibleScrollBar doesn't implement XAccessibleEventBroadcaster itself, but via comphelper::OAccessibleContextHelper, which perhaps explains why 4 other components have their XAccessibleEventBroadcaster interface tests disabled already. In any case, disable the XAccessibleEventBroadcaster test for AccessibleScrollBar till it's clear if it's the test that is poor or if there is a real problem here. Change-Id: I2de618c11e445e4e6111c7ae0d1d8feef11fd9d3 diff --git a/toolkit/qa/unoapi/knownissues.xcl b/toolkit/qa/unoapi/knownissues.xcl index c6a1aa6..7a2f955 100644 --- a/toolkit/qa/unoapi/knownissues.xcl +++ b/toolkit/qa/unoapi/knownissues.xcl @@ -250,6 +250,7 @@ toolkit.AccessibleMenu::com::sun::star::accessibility::XAccessibleSelection ### i114636 ### toolkit.AccessibleScrollBar::com::sun::star::accessibility::XAccessibleAction toolkit.AccessibleScrollBar::com::sun::star::accessibility::XAccessibleContext +toolkit.AccessibleScrollBar::com::sun::star::accessibility::XAccessibleEventBroadcaster ### fd#35666 ### toolkit.UnoControlDialogModel::com::sun::star::io::XPersistObject ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java | 15 -- 1 file changed, 6 insertions(+), 9 deletions(-) New commits: commit 68a18a6249dc9d8842a72413f3cd6f39ecf416e3 Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Thu Oct 9 20:10:09 2014 +0200 accessibility: The if statement is redundant Change-Id: I70dd50d8d588c71d391936195bb13ccb767470be Reviewed-on: https://gerrit.libreoffice.org/11890 Reviewed-by: David Ostrovsky da...@ostrovsky.org Reviewed-by: Noel Grandin noelgran...@gmail.com Tested-by: Noel Grandin noelgran...@gmail.com diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java index c46115b..18ee618 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java @@ -23,6 +23,7 @@ import com.sun.star.awt.Rectangle; import com.sun.star.awt.PosSize; import com.sun.star.awt.XWindow; import com.sun.star.accessibility.AccessibleEventObject; +import com.sun.star.accessibility.AccessibleStateType; import com.sun.star.accessibility.XAccessible; import com.sun.star.accessibility.XAccessibleEventBroadcaster; import com.sun.star.accessibility.XAccessibleEventListener; @@ -172,15 +173,11 @@ public class _XAccessibleEventBroadcaster { private static boolean chkTransient(Object Testcase) { XAccessibleContext accCon = UnoRuntime.queryInterface(XAccessibleContext.class, Testcase); -if (accCon.getAccessibleStateSet().contains( -com.sun.star.accessibility.AccessibleStateType.TRANSIENT)){ -if (!accCon.getAccessibleParent().getAccessibleContext().getAccessibleStateSet().contains( - com.sun.star.accessibility.AccessibleStateType.MANAGES_DESCENDANTS)) { -return false; -} -return true; -} -return false; +return accCon.getAccessibleStateSet().contains( +AccessibleStateType.TRANSIENT) + accCon.getAccessibleParent().getAccessibleContext() +.getAccessibleStateSet().contains( +AccessibleStateType.MANAGES_DESCENDANTS); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 22248b89c07533e28026dea66c5cb73d023293c6 Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Wed Oct 8 22:27:34 2014 +0200 complex: Use 'import com.sun.star.beans.UnknownPropertyException;' Change-Id: Ib42baf6f18fd407a879313c042efd74c8f724aa4 Reviewed-on: https://gerrit.libreoffice.org/11864 Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java index 4d54ef1..56d072c 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java @@ -236,7 +236,7 @@ public class _XAccessibleText { } catch(com.sun.star.lang.IndexOutOfBoundsException e) { System.out.println(Expected exception); res = true; -} catch(com.sun.star.beans.UnknownPropertyException e) { +} catch(UnknownPropertyException e) { System.out.println(unexpected exception = FAILED); res = false; } @@ -249,7 +249,7 @@ public class _XAccessibleText { } catch(com.sun.star.lang.IndexOutOfBoundsException e) { System.out.println(Expected exception); res = true; -} catch(com.sun.star.beans.UnknownPropertyException e) { +} catch(UnknownPropertyException e) { System.out.println(unexpected exception = FAILED); res = false; } @@ -264,7 +264,7 @@ public class _XAccessibleText { System.out.println(Unexpected exception); e.printStackTrace(); res = false; -} catch(com.sun.star.beans.UnknownPropertyException e) { +} catch(UnknownPropertyException e) { System.out.println(unexpected exception = FAILED); res = false; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cc5eb804fc66e0bc7f0029b2665656a73f85be48 Author: rbuj robert@gmail.com Date: Tue Sep 9 19:26:28 2014 +0200 toolkit: use String.length()==0 instead of String.equals(empty string) Change-Id: Id38f28e7138460493fde982cc1ebc75c3cb0b386 Reviewed-on: https://gerrit.libreoffice.org/11365 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java index c3c176e..b18a405 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java @@ -629,7 +629,7 @@ public class _XAccessibleText { System.out.println(getTextRange(0, 0): ); txtRange = oObj.getTextRange(0, 0); System.out.println(txtRange); -locRes = txtRange.equals(); +locRes = txtRange.length() == 0; res = locRes; if (!locRes) { System.out.println(Empty string was expected); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java | 6 +++--- toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 91853c8264ee32e8d3741495a02ce077a61b4add Author: rbuj robert@gmail.com Date: Mon Sep 1 21:46:26 2014 +0200 toolkit: fix javadoc errors Change-Id: I6d2268786d22f967be2d5e0dbcda14a074af4475 Reviewed-on: https://gerrit.libreoffice.org/11248 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java index 13382ea..c46115b 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java @@ -37,15 +37,15 @@ import com.sun.star.uno.UnoRuntime; * ul * licode addAccessibleEventListener()/code/li * licode removeAccessibleEventListener()/code/li - * /ul p + * /ul * - * This test needs the following object relations : + * pThis test needs the following object relations :/p * ul * li code'EventProducer'/code (of type * codeifc.accessibility._XAccessibleEventBroadcaster.EventProducer/code): * this must be an implementation of the interface which could perform * some actions for generating any kind of codeAccessibleEvent/code/li - * ul p + * /ul * * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java index 9f6b60f..c3c176e 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java @@ -50,8 +50,8 @@ import com.sun.star.uno.UnoRuntime; * licode getTextBeforeIndex()/code/li * licode getTextBehindIndex()/code/li * licode copyText()/code/li - * /ul p - * This test needs the following object relations : + * /ul + * pThis test needs the following object relations :/p * ul * li code'XAccessibleText.Text'/code (of type codeString/code) * b optional /b : @@ -59,7 +59,7 @@ import com.sun.star.uno.UnoRuntime; * is not specified, then text from method codegetText()/code * is used. * /li - * /ul p + * /ul * @see com.sun.star.accessibility.XAccessibleText */ public class _XAccessibleText { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java | 10 ++ 1 file changed, 10 insertions(+) New commits: commit cc4f4e2054ba1c5676ebb1890e85d0f9b0b19262 Author: Caolán McNamara caol...@redhat.com Date: Sun Aug 17 19:20:55 2014 +0100 catch UnknownPropertyException Change-Id: I3134c574a124a2359c40b139eb5b41198b0e4611 diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java index 61f1bd4..9f6b60f 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java @@ -25,6 +25,7 @@ import com.sun.star.awt.Point; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.accessibility.AccessibleTextType; import com.sun.star.accessibility.TextSegment; +import com.sun.star.beans.UnknownPropertyException; import com.sun.star.uno.XInterface; import com.sun.star.uno.UnoRuntime; @@ -235,6 +236,9 @@ public class _XAccessibleText { } catch(com.sun.star.lang.IndexOutOfBoundsException e) { System.out.println(Expected exception); res = true; +} catch(com.sun.star.beans.UnknownPropertyException e) { +System.out.println(unexpected exception = FAILED); +res = false; } try { @@ -245,6 +249,9 @@ public class _XAccessibleText { } catch(com.sun.star.lang.IndexOutOfBoundsException e) { System.out.println(Expected exception); res = true; +} catch(com.sun.star.beans.UnknownPropertyException e) { +System.out.println(unexpected exception = FAILED); +res = false; } try { @@ -257,6 +264,9 @@ public class _XAccessibleText { System.out.println(Unexpected exception); e.printStackTrace(); res = false; +} catch(com.sun.star.beans.UnknownPropertyException e) { +System.out.println(unexpected exception = FAILED); +res = false; } return res; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits