unotest/source/embindtest/embindtest.cxx |    4 ++--
 unotest/source/embindtest/embindtest.js  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b0d9f3c417315eb704dc9ab906e9c24f59571942
Author:     Stephan Bergmann <[email protected]>
AuthorDate: Fri Mar 1 10:29:59 2024 +0100
Commit:     Stephan Bergmann <[email protected]>
CommitDate: Sat Mar 2 22:08:35 2024 +0100

    Some minor embindtest clean up
    
    Change-Id: I4dd65567900658c23637a6a10823b67e93bad768
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164182
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <[email protected]>

diff --git a/unotest/source/embindtest/embindtest.cxx 
b/unotest/source/embindtest/embindtest.cxx
index 8b131cd9f376..07558a5ed1b7 100644
--- a/unotest/source/embindtest/embindtest.cxx
+++ b/unotest/source/embindtest/embindtest.cxx
@@ -14,6 +14,7 @@
 #include <cppu/unotype.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weak.hxx>
+#include <org/libreoffice/embindtest/Enum.hpp>
 #include <org/libreoffice/embindtest/Struct.hpp>
 #include <org/libreoffice/embindtest/XTest.hpp>
 #include <rtl/ustring.hxx>
@@ -29,7 +30,6 @@ namespace
 {
 class Test : public cppu::WeakImplHelper<org::libreoffice::embindtest::XTest>
 {
-public:
     sal_Bool SAL_CALL getBoolean() override { return true; }
 
     sal_Bool SAL_CALL isBoolean(sal_Bool value) override { return value; }
@@ -102,7 +102,7 @@ public:
 
     sal_Bool SAL_CALL isStruct(org::libreoffice::embindtest::Struct const& 
value) override
     {
-        return value.m1 == -123456 && value.m2 == 100.5 && value.m3 == u"hä";
+        return value == org::libreoffice::embindtest::Struct{ -123456, 100.5, 
u"hä"_ustr };
     }
 
     css::uno::Sequence<sal_Bool> SAL_CALL getSequenceBoolean() override
diff --git a/unotest/source/embindtest/embindtest.js 
b/unotest/source/embindtest/embindtest.js
index 422c1c1a421f..6f88a9f543d0 100644
--- a/unotest/source/embindtest/embindtest.js
+++ b/unotest/source/embindtest/embindtest.js
@@ -98,7 +98,7 @@ Module.addOnPostRun(function() {
     }
     {
         let v = test.getStruct();
-        console.log(v.m1 + ', ' + v.m2 + ', ' + v.m3);
+        console.log(v);
         console.assert(v.m1 === -123456);
         console.assert(v.m2 === 100.5);
         console.assert(v.m3 === 'hä');

Reply via email to