unotest/source/embindtest/embindtest.cxx | 94 +++++++++++++++---------------- 1 file changed, 47 insertions(+), 47 deletions(-)
New commits: commit 6b5d527c33fd201dbeecce0d4376c81f85959dca Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Dec 10 19:12:09 2025 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Thu Dec 11 17:21:06 2025 +0100 Reorder code blocks in doExecuteTest ...so that they match org.libreoffice.embindtest.XTest Change-Id: I479af0607fc379be9b5f3ca477dd09bb943713b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195425 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/unotest/source/embindtest/embindtest.cxx b/unotest/source/embindtest/embindtest.cxx index 51c28d7e801c..b24022e60ee5 100644 --- a/unotest/source/embindtest/embindtest.cxx +++ b/unotest/source/embindtest/embindtest.cxx @@ -291,6 +291,53 @@ void doExecuteTest(css::uno::Reference<org::libreoffice::embindtest::XTest> cons bool const ok = test->isType(val); verify(ok); } + { + auto const val = test->getEnum(); + verify(val == org::libreoffice::embindtest::Enum_E_2); + bool const ok = test->isEnum(val); + verify(ok); + } + { + auto const val = test->getStruct(); + verify( + val + == org::libreoffice::embindtest::Struct{ true, + -12, + -1234, + 54321, + -123456, + 3456789012, + -123456789, + 9876543210, + -10.25, + 100.5, + u'Ö', + u"hä"_ustr, + cppu::UnoType<sal_Int32>::get(), + css::uno::Any(sal_Int32(-123456)), + { u"foo"_ustr, u"barr"_ustr, u"bazzz"_ustr }, + org::libreoffice::embindtest::Enum_E_2, + { -123456 }, + { { u"foo"_ustr }, + -123456, + css::uno::Any(sal_Int32(-123456)), + { u"barr"_ustr } }, + test }); + bool const ok = test->isStruct(val); + verify(ok); + } + { + auto const val = test->getStructLong(); + verify(val == org::libreoffice::embindtest::StructLong{ -123456 }); + bool const ok = test->isStructLong(val); + verify(ok); + } + { + auto const val = test->getStructString(); + verify(val == org::libreoffice::embindtest::StructString{ u"hä"_ustr }); + bool const ok = test->isStructString(val); + verify(ok); + } { auto const val = test->getAnyVoid(); verify(checkAnyVoid(val)); @@ -409,53 +456,6 @@ void doExecuteTest(css::uno::Reference<org::libreoffice::embindtest::XTest> cons verify(ok); } } - { - auto const val = test->getEnum(); - verify(val == org::libreoffice::embindtest::Enum_E_2); - bool const ok = test->isEnum(val); - verify(ok); - } - { - auto const val = test->getStruct(); - verify( - val - == org::libreoffice::embindtest::Struct{ true, - -12, - -1234, - 54321, - -123456, - 3456789012, - -123456789, - 9876543210, - -10.25, - 100.5, - u'Ö', - u"hä"_ustr, - cppu::UnoType<sal_Int32>::get(), - css::uno::Any(sal_Int32(-123456)), - { u"foo"_ustr, u"barr"_ustr, u"bazzz"_ustr }, - org::libreoffice::embindtest::Enum_E_2, - { -123456 }, - { { u"foo"_ustr }, - -123456, - css::uno::Any(sal_Int32(-123456)), - { u"barr"_ustr } }, - test }); - bool const ok = test->isStruct(val); - verify(ok); - } - { - auto const val = test->getStructLong(); - verify(val == org::libreoffice::embindtest::StructLong{ -123456 }); - bool const ok = test->isStructLong(val); - verify(ok); - } - { - auto const val = test->getStructString(); - verify(val == org::libreoffice::embindtest::StructString{ u"hä"_ustr }); - bool const ok = test->isStructString(val); - verify(ok); - } { auto const val = test->getSequenceBoolean(); verify(val == css::uno::Sequence<sal_Bool>{ true, true, false });
