[Positioning] TestUtil: clean set_up(), add Result list
TestUtil: - Split set_up() into several functions. - Add a list of Result, which will be useful very soon.
This commit is contained in:
parent
3a9498a0b5
commit
5f0bb90d45
|
@ -2,6 +2,7 @@
|
|||
#include <cxxtest/TestSuite.h>
|
||||
|
||||
#include "calibrationrequest.hh"
|
||||
#include "realposition.hh"
|
||||
|
||||
#include <fstream>
|
||||
#include <sstream>
|
||||
|
@ -13,6 +14,7 @@ using std::tr1::unordered_map ;
|
|||
vector<AccessPoint> TestUtil::aps ;
|
||||
vector<Mobile> TestUtil::mobiles ;
|
||||
vector<Request*> TestUtil::requests ;
|
||||
vector<Result> TestUtil::results ;
|
||||
vector<ReferencePoint> TestUtil::reference_points ;
|
||||
|
||||
|
||||
|
@ -20,27 +22,37 @@ void TestUtil::tear_down()
|
|||
{
|
||||
aps.clear() ;
|
||||
mobiles.clear() ;
|
||||
reference_points.clear() ;
|
||||
|
||||
for (vector<Request*>::const_iterator i = requests.begin() ;
|
||||
i != requests.end() ; ++i)
|
||||
delete *i ;
|
||||
requests.clear() ;
|
||||
|
||||
results.clear() ;
|
||||
reference_points.clear() ;
|
||||
}
|
||||
|
||||
|
||||
void TestUtil::set_up()
|
||||
{
|
||||
tear_down() ;
|
||||
create_mobile_list() ;
|
||||
create_ap_list() ;
|
||||
create_request_list() ;
|
||||
create_result_list() ;
|
||||
}
|
||||
|
||||
// Create mobile list
|
||||
void TestUtil::create_mobile_list()
|
||||
{
|
||||
Mobile mobile1 ;
|
||||
mobile1.set_mac_addr("aa:bb:cc:dd:ee:ff") ;
|
||||
mobiles.push_back(mobile1) ;
|
||||
mobile1.set_mac_addr("aa:bb:cc:dd:ee:77") ;
|
||||
mobiles.push_back(mobile1) ;
|
||||
}
|
||||
|
||||
// Create AP list
|
||||
void TestUtil::create_ap_list()
|
||||
{
|
||||
AccessPoint ap1 ;
|
||||
ap1.set_mac_addr("11:22:33:44:55:01") ;
|
||||
aps.push_back(ap1) ;
|
||||
|
@ -48,8 +60,11 @@ void TestUtil::set_up()
|
|||
aps.push_back(ap1) ;
|
||||
ap1.set_mac_addr("11:22:33:44:55:03") ;
|
||||
aps.push_back(ap1) ;
|
||||
}
|
||||
|
||||
// Create request list
|
||||
void TestUtil::create_request_list()
|
||||
{
|
||||
// Create measurement list
|
||||
vector < unordered_map<string,Measurement> > measurements(3) ;
|
||||
Measurement measurement1 ;
|
||||
|
||||
|
@ -122,6 +137,24 @@ void TestUtil::set_up()
|
|||
measurements[2])) ;
|
||||
}
|
||||
|
||||
void TestUtil::create_result_list()
|
||||
{
|
||||
RealPosition algo ;
|
||||
|
||||
for (vector<Request*>::const_iterator i = requests.begin() ;
|
||||
i != requests.end() ; ++i)
|
||||
{
|
||||
CalibrationRequest *calibration_request =
|
||||
dynamic_cast<CalibrationRequest*>(*i) ;
|
||||
Result result ;
|
||||
if (calibration_request != NULL)
|
||||
result = algo.compute(*calibration_request) ;
|
||||
else
|
||||
result = algo.compute(**i) ;
|
||||
results.push_back(result) ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Create the file output_file_name and fill it with the contents of
|
||||
// output_lines
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
#include "request.hh"
|
||||
#include "measurement.hh"
|
||||
#include "referencepoint.hh"
|
||||
#include "result.hh"
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
@ -13,10 +14,17 @@
|
|||
|
||||
class TestUtil
|
||||
{
|
||||
private:
|
||||
static void create_mobile_list(void) ;
|
||||
static void create_ap_list(void) ;
|
||||
static void create_request_list(void) ;
|
||||
static void create_result_list(void) ;
|
||||
|
||||
public:
|
||||
static std::vector<AccessPoint> aps ;
|
||||
static std::vector<Mobile> mobiles ;
|
||||
static std::vector<Request*> requests ;
|
||||
static std::vector<Result> results ;
|
||||
static std::vector<ReferencePoint> reference_points ;
|
||||
|
||||
static void set_up(void) ;
|
||||
|
|
Loading…
Reference in New Issue