Skip to content

C
core
Kaydet (Commit) 96e4cc87 authored tarafından Zolnai Tamás's avatar Zolnai Tamás
Dosyalara gözat
Seçenekler

Fix expected and actual order in odf export test 

Change-Id: Ib8168112e297571cc99b39fbf365d888e2247da5
üst d21dd288
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
sw/qa/extras/odfexport/odfexport.cxx
Dosyayı görüntüle @ 96e4cc87
...@@ -198,10 +198,10 @@ void Test::testCharacterBorder() ...@@ -198,10 +198,10 @@ void Test::testCharacterBorder()
// Shadow // Shadow
const table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(xSet,"ParaShadowFormat"); const table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(xSet,"ParaShadowFormat");
CPPUNIT_ASSERT_EQUAL(aShadow.Color, sal_Int32(0)); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aShadow.Color);
CPPUNIT_ASSERT_EQUAL((bool)aShadow.IsTransparent, false); CPPUNIT_ASSERT_EQUAL(false, (bool)aShadow.IsTransparent);
CPPUNIT_ASSERT_EQUAL(aShadow.Location, table::ShadowLocation(0)); CPPUNIT_ASSERT_EQUAL(table::ShadowLocation(0), aShadow.Location);
CPPUNIT_ASSERT_EQUAL(aShadow.ShadowWidth, sal_Int16(0)); CPPUNIT_ASSERT_EQUAL(sal_Int16(0), aShadow.ShadowWidth);
} }
// Character border for first paragraph // Character border for first paragraph
...@@ -228,16 +228,16 @@ void Test::testCharacterBorder() ...@@ -228,16 +228,16 @@ void Test::testCharacterBorder()
// Shadow // Shadow
const table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(xSet,"CharShadowFormat"); const table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(xSet,"CharShadowFormat");
CPPUNIT_ASSERT_EQUAL(aShadow.Color, sal_Int32(16724787)); CPPUNIT_ASSERT_EQUAL(sal_Int32(16724787), aShadow.Color);
CPPUNIT_ASSERT_EQUAL((bool)aShadow.IsTransparent, false); CPPUNIT_ASSERT_EQUAL(false, (bool)aShadow.IsTransparent);
CPPUNIT_ASSERT_EQUAL(aShadow.Location, table::ShadowLocation(2)); CPPUNIT_ASSERT_EQUAL(table::ShadowLocation(2), aShadow.Location);
CPPUNIT_ASSERT_EQUAL(aShadow.ShadowWidth, sal_Int16(280)); CPPUNIT_ASSERT_EQUAL(sal_Int16(280), aShadow.ShadowWidth);
// Check autostyle // Check autostyle
{ {
uno::Reference< style::XAutoStyleFamily > xAutoStyleFamily(getAutoStyles("ParagraphStyles")); uno::Reference< style::XAutoStyleFamily > xAutoStyleFamily(getAutoStyles("ParagraphStyles"));
uno::Reference < container::XEnumeration > xAutoStylesEnum( xAutoStyleFamily->createEnumeration() ); uno::Reference < container::XEnumeration > xAutoStylesEnum( xAutoStyleFamily->createEnumeration() );
CPPUNIT_ASSERT_EQUAL((bool)xAutoStylesEnum->hasMoreElements(), true); CPPUNIT_ASSERT_EQUAL(true, (bool)xAutoStylesEnum->hasMoreElements());
// First paragraph autostyle // First paragraph autostyle
uno::Reference < beans::XPropertySet > xPSet( xAutoStylesEnum->nextElement(), uno::UNO_QUERY ); uno::Reference < beans::XPropertySet > xPSet( xAutoStylesEnum->nextElement(), uno::UNO_QUERY );
...@@ -295,10 +295,10 @@ void Test::testCharacterBorder() ...@@ -295,10 +295,10 @@ void Test::testCharacterBorder()
// Shadow // Shadow
const table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(xSet,"CharShadowFormat"); const table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(xSet,"CharShadowFormat");
CPPUNIT_ASSERT_EQUAL(aShadow.Color, sal_Int32(0)); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aShadow.Color);
CPPUNIT_ASSERT_EQUAL((bool)aShadow.IsTransparent, false); CPPUNIT_ASSERT_EQUAL(false, (bool)aShadow.IsTransparent);
CPPUNIT_ASSERT_EQUAL(aShadow.Location, table::ShadowLocation(3)); CPPUNIT_ASSERT_EQUAL(table::ShadowLocation(3), aShadow.Location);
CPPUNIT_ASSERT_EQUAL(aShadow.ShadowWidth, sal_Int16(79)); CPPUNIT_ASSERT_EQUAL(sal_Int16(79), aShadow.ShadowWidth);
// Check character style // Check character style
{ {
......
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