diff options
| author | Dan Goodliffe <randomdan@akira.random.lan> | 2014-11-29 15:50:46 +0000 |
|---|---|---|
| committer | Dan Goodliffe <randomdan@akira.random.lan> | 2014-11-29 15:50:46 +0000 |
| commit | 0bc01ecd92399b68944b6e2a7c77209128c6a5ef (patch) | |
| tree | 88e9c8419a58354488d0a0becec97c0810d5dcb1 | |
| parent | Merge remote-tracking branch 'origin/slicer' (diff) | |
| download | project2-0bc01ecd92399b68944b6e2a7c77209128c6a5ef.tar.bz2 project2-0bc01ecd92399b68944b6e2a7c77209128c6a5ef.tar.xz project2-0bc01ecd92399b68944b6e2a7c77209128c6a5ef.zip | |
Remove dependency on xml lib (functionality tested separately)
| -rw-r--r-- | project2/ice/unittests/Jamfile.jam | 1 | ||||
| -rw-r--r-- | project2/ice/unittests/testClientCompile.cpp | 6 | ||||
| -rw-r--r-- | project2/ice/unittests/testDaemonCompile.cpp | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/project2/ice/unittests/Jamfile.jam b/project2/ice/unittests/Jamfile.jam index b23579d..239f856 100644 --- a/project2/ice/unittests/Jamfile.jam +++ b/project2/ice/unittests/Jamfile.jam @@ -36,7 +36,6 @@ unit-test testClientCompile : <dependency>unittestr <library>..//p2iceclient <library>../../ut//p2ut - <library>../../xml//p2xml <library>../../basics//p2basics <library>..//Ice <library>..//IceUtil diff --git a/project2/ice/unittests/testClientCompile.cpp b/project2/ice/unittests/testClientCompile.cpp index c86b826..0d225df 100644 --- a/project2/ice/unittests/testClientCompile.cpp +++ b/project2/ice/unittests/testClientCompile.cpp @@ -6,7 +6,6 @@ #include <task.h> #include <exceptions.h> #include <scripts.h> -#include <xmlScriptParser.h> #include <testScriptHost.h> #include <scopeObject.h> @@ -25,11 +24,6 @@ commonTests() BOOST_REQUIRE(ElementLoader::getFor("UnitTest-SimpleInterface-SomeTaskParams")); BOOST_REQUIRE(ElementLoader::getFor("UnitTest-SimpleInterface-SomeRows")); BOOST_REQUIRE(ElementLoader::getFor("UnitTest-SimpleInterface-SomeRowsParams")); - - BOOST_TEST_CHECKPOINT("Load test script"); - ScriptReaderPtr r = new XmlScriptParser(iceroot / "testClient.xml"); - BOOST_TEST_CHECKPOINT("Execute test script"); - boost::intrusive_ptr<TestScriptHost> sr = new TestScriptHost(r); } static diff --git a/project2/ice/unittests/testDaemonCompile.cpp b/project2/ice/unittests/testDaemonCompile.cpp index 7bda6dd..bc8052c 100644 --- a/project2/ice/unittests/testDaemonCompile.cpp +++ b/project2/ice/unittests/testDaemonCompile.cpp @@ -15,6 +15,7 @@ static void commonTests() { + BOOST_TEST_CHECKPOINT("Verify loaded"); BOOST_REQUIRE(IceDaemonAdapterHandlerLoader::getFor("UnitTest")); } @@ -22,6 +23,7 @@ static void unloadTests() { + BOOST_TEST_CHECKPOINT("Verify unloaded"); BOOST_REQUIRE_THROW(IceDaemonAdapterHandlerLoader::createNew("UnitTest"), NotSupported); } |