From a80cda217bb57e59b1c4170bbd9d62346c427bf7 Mon Sep 17 00:00:00 2001
From: Andrea Ruzzenenti <andrea.ruzzenenti@iit.it>
Date: Wed, 27 Sep 2017 15:22:04 +0200
Subject: [PATCH] fixtures and test are now executed following the xml order

---
 src/rtf/include/rtf/TestSuit.h | 10 +++++-----
 src/rtf/src/TestSuit.cpp       | 10 +++++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/rtf/include/rtf/TestSuit.h b/src/rtf/include/rtf/TestSuit.h
index f097595c..ae8400aa 100644
--- 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
index 395a7c47..eb29a26e 100644
--- 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) {