[Libreoffice-commits] core.git: sw/JunitTest_sw_complex.mk sw/qa

[Michael Stahl]

 sw/JunitTest_sw_complex.mk             |    1 -
 sw/qa/python/check_cross_references.py |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit bcf7ab3e13ac276ef42fa96af0755795c5f88c4a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Dec 18 13:51:44 2015 +0100

    fix some issues with 214b0c8356ab88e75cb4bbc2ad3109ee536dcd70
    
    Change-Id: Icd3cf90bf617c9c77dcf9cbda705bf348f980fb3

diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index ae96c28..688ef19 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\
     complex.accessibility.AccessibleRelationSet \
     complex.checkColor.CheckChangeColor \
     complex.writer.CheckBookmarks \
-    complex.writer.CheckCrossReferences \
     complex.writer.CheckTable \
     complex.writer.CheckIndexedPropertyValues \
     complex.writer.CheckNamedPropertyValues \
diff --git a/sw/qa/python/check_cross_references.py b/sw/qa/python/check_cross_references.py
index da6006e..5ec1bc8 100644
--- a/sw/qa/python/check_cross_references.py
+++ b/sw/qa/python/check_cross_references.py
@@ -75,7 +75,7 @@ class CheckCrossReferences(unittest.TestCase):
 
     def getFieldProps(self,xField):
         xProps = xField
-        self.assertTrue("Cannot retrieve field properties.", xProps)
+        self.assertTrue(xProps, "Cannot retrieve field properties.")
         return xProps
 
     def checkField(self, xField , xProps, nFormat, aExpectedFieldResult ):
@@ -222,7 +222,7 @@ class CheckCrossReferences(unittest.TestCase):
 
         #check inserted reference field
         xField = xNewField
-        self.assertTrue("J", xField.getPresentation(False)) #inserted reference field doesn't has correct field result
+        self.assertEqual("J", xField.getPresentation(False)) #inserted reference field doesn't has correct field result
 
         xParaTextRange.getStart().setString( "Hallo new bookmark: ")
         self.xFieldsRefresh.refresh()