diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:45:30 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:45:30 +0200 |
commit | e959581b2d44bff812ffddd34b750e4f9f29e187 (patch) | |
tree | 257c72d3fd2bc409f391bc26892f5653241455bc /unoxml | |
parent | 33df62ab4a0f3c4eca1abe981c942ff53477961a (diff) | |
parent | 256c9ce014a463b7486c8a32e7119d3f4a2c9aa4 (diff) |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
filter/source/graphicfilter/epict/epict.cxx
filter/source/svg/svgexport.cxx
filter/source/svg/svgfontexport.cxx
filter/source/svg/svgwriter.cxx
lotuswordpro/source/filter/lwpchartstreamtools.cxx
lotuswordpro/source/filter/lwpfrib.cxx
lotuswordpro/source/filter/lwpgrfobj.cxx
lotuswordpro/source/filter/lwpidxmgr.cxx
lotuswordpro/source/filter/lwpobjid.cxx
lotuswordpro/source/filter/lwpparaproperty.cxx
lotuswordpro/util/makefile.mk
oox/prj/d.lst
oox/source/drawingml/chart/chartdrawingfragment.cxx
oox/source/drawingml/makefile.mk
oox/source/drawingml/shape.cxx
oox/source/ppt/slidepersist.cxx
oox/source/token/namespaces.hxx.tail
oox/source/xls/drawingfragment.cxx
oox/source/xls/excelfilter.cxx
oox/source/xls/makefile.mk
oox/source/xls/workbookhelper.cxx
writerfilter/source/ooxml/makefile.mk
writerfilter/source/resourcemodel/makefile.mk
Diffstat (limited to 'unoxml')
-rw-r--r-- | unoxml/qa/complex/unoxml/RDFRepositoryTest.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java index 0e51ca927dd1..7944a0edc064 100644 --- a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java +++ b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java @@ -172,14 +172,14 @@ public class RDFRepositoryTest try { xRep.createGraph(foo); - assertFalse("creating duplicate graph was allowed", false); + fail("creating duplicate graph was allowed"); } catch (ElementExistException e) { // ignore } try { xRep.createGraph(null); - assertFalse("invalid graph name was allowed", false); + fail("invalid graph name was allowed"); } catch (IllegalArgumentException e) { // ignore } @@ -296,7 +296,7 @@ public class RDFRepositoryTest xFooIn = new StreamSimulator(tempDir + "foo.rdf", true, param); try { xRep.importGraph(FileFormat.RDF_XML, xFooIn, bar, base); - assertFalse("importing existing graph did not fail", false); + fail("importing existing graph did not fail"); } catch (ElementExistException e) { // ignore } @@ -328,28 +328,28 @@ public class RDFRepositoryTest try { xBazGraph.clear(); - assertFalse("deleted graph not invalid (clear)", false); + fail("deleted graph not invalid (clear)"); } catch (NoSuchElementException e) { // ignore } try { xBazGraph.addStatement(foo, foo, foo); - assertFalse("deleted graph not invalid (add)", false); + fail("deleted graph not invalid (add)"); } catch (NoSuchElementException e) { // ignore } try { xBazGraph.removeStatements(null, null, null); - assertFalse("deleted graph not invalid (remove)", false); + fail("deleted graph not invalid (remove)"); } catch (NoSuchElementException e) { // ignore } try { xBazGraph.getStatements(null, null, null); - assertFalse("deleted graph not invalid (get)", false); + fail("deleted graph not invalid (get)"); } catch (NoSuchElementException e) { // ignore } @@ -474,14 +474,14 @@ public class RDFRepositoryTest try { xRep.setStatementRDFa(foo, new XURI[] {}, xM, "", null); - assertFalse("RDFa: set: no predicate", false); + fail("RDFa: set: no predicate"); } catch (IllegalArgumentException e) { // ignore } try { xRep.setStatementRDFa(foo, new XURI[] {bar}, null, "", null); - assertFalse("RDFa: set: null", false); + fail("RDFa: set: null"); } catch (IllegalArgumentException e) { // ignore } |