fixtures and test are now executed following the xml order

robotology · Sep 27, 2017 · a80cda2 · a80cda2
1 parent 6c7763a
commit a80cda2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/rtf/include/rtf/TestSuit.h b/src/rtf/include/rtf/TestSuit.h
@@ -16,7 +16,7 @@
 #include <rtf/TestResult.h>
 #include <rtf/TestMessage.h>
 #include <rtf/FixtureManager.h>
-#include <set>
+#include <vector>
 
 namespace RTF {
     class TestSuit;
@@ -43,10 +43,10 @@ namespace RTF {
  */
 class RTF_API RTF::TestSuit : public RTF::Test, public RTF::FixtureEvents {
 
-    typedef std::set<RTF::Test*> TestContainer;
-    typedef std::set<RTF::Test*>::iterator TestIterator;
-    typedef std::set<RTF::FixtureManager*> FixtureContainer;
-    typedef std::set<RTF::FixtureManager*>::iterator FixtureIterator;
+    typedef std::vector<RTF::Test*> TestContainer;
+    typedef std::vector<RTF::Test*>::iterator TestIterator;
+    typedef std::vector<RTF::FixtureManager*> FixtureContainer;
+    typedef std::vector<RTF::FixtureManager*>::iterator FixtureIterator;
 
 public:
 

diff --git a/src/rtf/src/TestSuit.cpp b/src/rtf/src/TestSuit.cpp
@@ -26,12 +26,16 @@ TestSuit::~TestSuit() {
 }
 
 void TestSuit::addTest(RTF::Test* test) {
-    tests.insert(test);
+    tests.push_back(test);
 }
 
 
 void TestSuit::removeTest(RTF::Test* test) {
-    tests.erase(test);
+    for (int i = 0; i < tests.size(); i++)
+    {
+        if(tests[i] == test) tests.erase(tests.begin()+i);
+    }
+
 }
 
 void TestSuit::reset() {
@@ -166,7 +170,7 @@ void TestSuit::run(TestResult &rsl) {
 
 void TestSuit::addFixtureManager(RTF::FixtureManager* manager) {
     manager->setDispatcher(this);
-    fixtureManagers.insert(manager);
+    fixtureManagers.push_back(manager);
 }
 
 void TestSuit::fixtureCollapsed(RTF::TestMessage reason) {