Kaydet (Commit) 1fa55878 authored tarafından Caolán McNamara's avatar Caolán McNamara

restore cppunit test, Sequence ctor from sal_Int32 is now explicit

üst f86c6a06
...@@ -11,4 +11,4 @@ cu cppu\source\AffineBridge nmake - all cu_AffineBridge cu_inc NULL ...@@ -11,4 +11,4 @@ cu cppu\source\AffineBridge nmake - all cu_AffineBridge cu_inc NULL
cu cppu\source\LogBridge nmake - all cu_LogBridge cu_inc NULL cu cppu\source\LogBridge nmake - all cu_LogBridge cu_inc NULL
cu cppu\util nmake - all cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge cu_LogBridge NULL cu cppu\util nmake - all cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge cu_LogBridge NULL
cu cppu\qa nmake - all cu_qa_cppunit cu_util NULL cu cppu\qa nmake - all cu_qa_cppunit cu_util NULL
#cu cppu\qa\cppumaker nmake - all cu_qa_cppumaker cu_util NULL cu cppu\qa\cppumaker nmake - all cu_qa_cppumaker cu_util NULL
...@@ -479,9 +479,13 @@ void Test::testPolyStruct() { ...@@ -479,9 +479,13 @@ void Test::testPolyStruct() {
(com::sun::star::uno::makeAny( (com::sun::star::uno::makeAny(
test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()). test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()).
getValueType().getTypeName())); getValueType().getTypeName()));
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >
aEmptySequence;
CPPUNIT_ASSERT_EQUAL( CPPUNIT_ASSERT_EQUAL(
(test::codemaker::cppumaker::make_Struct< sal_uInt32, sal_Bool >(5, 0). (test::codemaker::cppumaker::make_Struct< sal_uInt32, sal_Bool >(5,
member1), aEmptySequence).member1),
static_cast< sal_uInt32 >(5)); static_cast< sal_uInt32 >(5));
} }
...@@ -505,11 +509,14 @@ std::ostream & operator <<( ...@@ -505,11 +509,14 @@ std::ostream & operator <<(
} }
void Test::testExceptions() { void Test::testExceptions() {
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >
aEmptySequence;
test::codemaker::cppumaker::TestException1 e11( test::codemaker::cppumaker::TestException1 e11(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1,
com::sun::star::uno::makeAny(123.0), com::sun::star::uno::makeAny(123.0),
test::codemaker::cppumaker::HelperEnum_ONE, test::codemaker::cppumaker::HelperEnum_ONE,
test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, 0), 2); test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
test::codemaker::cppumaker::TestException1 e12(e11); test::codemaker::cppumaker::TestException1 e12(e11);
CPPUNIT_ASSERT_EQUAL(e11, e12); CPPUNIT_ASSERT_EQUAL(e11, e12);
test::codemaker::cppumaker::TestException1 e13; test::codemaker::cppumaker::TestException1 e13;
...@@ -519,7 +526,7 @@ void Test::testExceptions() { ...@@ -519,7 +526,7 @@ void Test::testExceptions() {
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1,
com::sun::star::uno::makeAny(123.0), com::sun::star::uno::makeAny(123.0),
test::codemaker::cppumaker::HelperEnum_ONE, test::codemaker::cppumaker::HelperEnum_ONE,
test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, 0), 2); test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
test::codemaker::cppumaker::TestException2 e22(e21); test::codemaker::cppumaker::TestException2 e22(e21);
CPPUNIT_ASSERT_EQUAL(e21, e22); CPPUNIT_ASSERT_EQUAL(e21, e22);
test::codemaker::cppumaker::TestException2 e23; test::codemaker::cppumaker::TestException2 e23;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment