|
@@ -7,6 +7,7 @@
|
|
|
#include "director.h"
|
|
|
#include "galaxy.h"
|
|
|
#include "gtest/gtest.h"
|
|
|
+#include "utils.h"
|
|
|
|
|
|
/*
|
|
|
|
|
@@ -169,20 +170,21 @@ TEST(director, director_parsing_density) {
|
|
|
sector_data[711]["known"] = true;
|
|
|
|
|
|
for (auto sector : sectors) {
|
|
|
+ std::string sector_text = std::to_string(sector);
|
|
|
// GTEST_COUT << "Testing Sector " << sector << std::endl;
|
|
|
- EXPECT_EQ((int)dir.galaxy.meta["density"][sector]["density"],
|
|
|
- (int)sector_data[sector]["density"])
|
|
|
+ EXPECT_EQ(json_int(dir.galaxy.meta["density"][sector_text]["density"]),
|
|
|
+ sector_data[sector]["density"])
|
|
|
<< "Sector " << sector << " density";
|
|
|
- EXPECT_EQ((int)dir.galaxy.meta["density"][sector]["warps"],
|
|
|
- (int)sector_data[sector]["warps"])
|
|
|
+ EXPECT_EQ(json_int(dir.galaxy.meta["density"][sector_text]["warps"]),
|
|
|
+ sector_data[sector]["warps"])
|
|
|
<< "Sector " << sector << " warps";
|
|
|
- EXPECT_EQ((int)dir.galaxy.meta["density"][sector]["navhaz"],
|
|
|
+ EXPECT_EQ(json_int(dir.galaxy.meta["density"][sector_text]["navhaz"]),
|
|
|
(int)sector_data[sector]["navhaz"])
|
|
|
<< "Sector " << sector << " navhaz";
|
|
|
- EXPECT_EQ((bool)dir.galaxy.meta["density"][sector]["anom"],
|
|
|
+ EXPECT_EQ(dir.galaxy.meta["density"][sector_text]["anom"],
|
|
|
(bool)sector_data[sector]["anom"])
|
|
|
<< "Sector " << sector << " anom";
|
|
|
- EXPECT_EQ((bool)dir.galaxy.meta["density"][sector]["known"],
|
|
|
+ EXPECT_EQ(dir.galaxy.meta["density"][sector_text]["known"],
|
|
|
(bool)sector_data[sector]["known"])
|
|
|
<< "Sector " << sector << " known";
|
|
|
}
|