diff --git a/conf/plans/test.plan b/conf/plans/test.plan index 666f0c1..53ab21b 100644 --- a/conf/plans/test.plan +++ b/conf/plans/test.plan @@ -1,6 +1,7 @@ { "plan": [ - { "name": "independent test", "dependencies": [ null ] }, - { "name": "dependent test", "dependencies": [ "independent test", null, null ] } + { "name": "independent test 1", "dependencies": [ null ] }, + { "name": "independent test 2", "dependencies": [ null ] }, + { "name": "dependent test", "dependencies": [ "independent test 1", null, null ] } ] } diff --git a/src/loaders/Suite.cpp b/src/loaders/Suite.cpp index dc27924..be6adc3 100644 --- a/src/loaders/Suite.cpp +++ b/src/loaders/Suite.cpp @@ -51,7 +51,7 @@ void Suite::load_units_file( std::string filename, bool verbose ) // append to this->units this->units.push_back( tmp_U ); if ( verbose ) { - std::cout << "Added unit " << tmp_U.get_name() << " to Suite." << std::endl; + std::cout << "Added unit \"" << tmp_U.get_name() << "\" to Suite." << std::endl; } } } diff --git a/src/loaders/Task.cpp b/src/loaders/Task.cpp index 09d64a9..c242ab1 100644 --- a/src/loaders/Task.cpp +++ b/src/loaders/Task.cpp @@ -11,8 +11,8 @@ Task::Task() {} /// Task::load_root() - loads json values to private members /// -/// \param loader_root -/// \return +/// \param loader_root - the Json::Value to populate from. +/// \param verbose - Whether to print verbose information to STDOUT. void Task::load_root(Json::Value loader_root, bool verbose ) { if ( loader_root.isMember("name") ) @@ -33,12 +33,10 @@ void Task::load_root(Json::Value loader_root, bool verbose ) { this->dependencies.push_back( des_dep_root[i].asString() ); if ( verbose ) { - std::cout << "Added dependency \"" << des_dep_root[i].asString() << "\" to Task \"" << this->get_name() << "\"." << std::endl; + std::cout << "Added dependency \"" << des_dep_root[i].asString() << "\" to task \"" << this->get_name() << "\"." << std::endl; } } } - - //this->has_succeeded = false; } std::string Task::get_name()