|
From: <fbe...@us...> - 2014-09-22 09:29:11
|
Revision: 21148
http://sourceforge.net/p/sbml/code/21148
Author: fbergmann
Date: 2014-09-22 09:29:04 +0000 (Mon, 22 Sep 2014)
Log Message:
-----------
- fix broken test
Modified Paths:
--------------
trunk/libsbml/src/sbml/packages/comp/util/test/TestCompFlatteningConverter.cpp
trunk/libsbml/src/sbml/packages/comp/util/test/TestURIResolvers.cpp
Modified: trunk/libsbml/src/sbml/packages/comp/util/test/TestCompFlatteningConverter.cpp
===================================================================
--- trunk/libsbml/src/sbml/packages/comp/util/test/TestCompFlatteningConverter.cpp 2014-09-22 08:52:31 UTC (rev 21147)
+++ trunk/libsbml/src/sbml/packages/comp/util/test/TestCompFlatteningConverter.cpp 2014-09-22 09:29:04 UTC (rev 21148)
@@ -2009,8 +2009,11 @@
ffile = filename + "layout_invalid_removed_flat.xml";
fail_unless(result == LIBSBML_OPERATION_SUCCESS);
- fail_unless(doc->getNumErrors() == 0);
+ if (SBMLExtensionRegistry::isPackageEnabled("layout") == true)
+ fail_unless(doc->getNumErrors() == 0);
+
+
SBMLDocument* fdoc = readSBMLFromFile(ffile.c_str());
string flatModel = writeSBMLToStringSafe(fdoc);
fail_unless(flatModel == newModel);
Modified: trunk/libsbml/src/sbml/packages/comp/util/test/TestURIResolvers.cpp
===================================================================
--- trunk/libsbml/src/sbml/packages/comp/util/test/TestURIResolvers.cpp 2014-09-22 08:52:31 UTC (rev 21147)
+++ trunk/libsbml/src/sbml/packages/comp/util/test/TestURIResolvers.cpp 2014-09-22 09:29:04 UTC (rev 21148)
@@ -293,7 +293,7 @@
SBMLDocument* doc = readSBMLFromFile(filename.c_str());
fail_unless(doc->getLocationURI() == "file:" + filename);
delete doc;
- SBMLDocument* doc2 = registry.resolve("enzyme_model.xml", doc->getLocationURI());
+ SBMLDocument* doc2 = registry.resolve("enzyme_model.xml", "file:" + filename);
fail_unless(doc2 != NULL);
fail_unless(doc2->getModel() != NULL);
delete doc2;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|