diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2013-09-03 19:14:28 +0200 |
|---|---|---|
| committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2013-09-08 11:23:44 +0200 |
| commit | 96e4cc87513c170c73121b4cdd8365bf56b8a3af (patch) | |
| tree | f7812cf9ee8fb49820351e57c3ff989a54ba710e /sw | |
| parent | d21dd2889199030f3500ce2142182ebb8eb5f18f (diff) | |
Fix expected and actual order in odf export test
Change-Id: Ib8168112e297571cc99b39fbf365d888e2247da5
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/odfexport/odfexport.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index efd49dfd1682..300594b1d0ac 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -198,10 +198,10 @@ void Test::testCharacterBorder() // Shadow const table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(xSet,"ParaShadowFormat"); - CPPUNIT_ASSERT_EQUAL(aShadow.Color, sal_Int32(0)); - CPPUNIT_ASSERT_EQUAL((bool)aShadow.IsTransparent, false); - CPPUNIT_ASSERT_EQUAL(aShadow.Location, table::ShadowLocation(0)); - CPPUNIT_ASSERT_EQUAL(aShadow.ShadowWidth, sal_Int16(0)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aShadow.Color); + CPPUNIT_ASSERT_EQUAL(false, (bool)aShadow.IsTransparent); + CPPUNIT_ASSERT_EQUAL(table::ShadowLocation(0), aShadow.Location); + CPPUNIT_ASSERT_EQUAL(sal_Int16(0), aShadow.ShadowWidth); } // Character border for first paragraph @@ -228,16 +228,16 @@ void Test::testCharacterBorder() // Shadow const table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(xSet,"CharShadowFormat"); - CPPUNIT_ASSERT_EQUAL(aShadow.Color, sal_Int32(16724787)); - CPPUNIT_ASSERT_EQUAL((bool)aShadow.IsTransparent, false); - CPPUNIT_ASSERT_EQUAL(aShadow.Location, table::ShadowLocation(2)); - CPPUNIT_ASSERT_EQUAL(aShadow.ShadowWidth, sal_Int16(280)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(16724787), aShadow.Color); + CPPUNIT_ASSERT_EQUAL(false, (bool)aShadow.IsTransparent); + CPPUNIT_ASSERT_EQUAL(table::ShadowLocation(2), aShadow.Location); + CPPUNIT_ASSERT_EQUAL(sal_Int16(280), aShadow.ShadowWidth); // Check autostyle { uno::Reference< style::XAutoStyleFamily > xAutoStyleFamily(getAutoStyles("ParagraphStyles")); uno::Reference < container::XEnumeration > xAutoStylesEnum( xAutoStyleFamily->createEnumeration() ); - CPPUNIT_ASSERT_EQUAL((bool)xAutoStylesEnum->hasMoreElements(), true); + CPPUNIT_ASSERT_EQUAL(true, (bool)xAutoStylesEnum->hasMoreElements()); // First paragraph autostyle uno::Reference < beans::XPropertySet > xPSet( xAutoStylesEnum->nextElement(), uno::UNO_QUERY ); @@ -295,10 +295,10 @@ void Test::testCharacterBorder() // Shadow const table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(xSet,"CharShadowFormat"); - CPPUNIT_ASSERT_EQUAL(aShadow.Color, sal_Int32(0)); - CPPUNIT_ASSERT_EQUAL((bool)aShadow.IsTransparent, false); - CPPUNIT_ASSERT_EQUAL(aShadow.Location, table::ShadowLocation(3)); - CPPUNIT_ASSERT_EQUAL(aShadow.ShadowWidth, sal_Int16(79)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aShadow.Color); + CPPUNIT_ASSERT_EQUAL(false, (bool)aShadow.IsTransparent); + CPPUNIT_ASSERT_EQUAL(table::ShadowLocation(3), aShadow.Location); + CPPUNIT_ASSERT_EQUAL(sal_Int16(79), aShadow.ShadowWidth); // Check character style { |