henry/SimCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ADD: added parent number to the ID

Browse Source
This commit is contained in:
Henry Winkel
2023-01-17 10:28:05 +01:00
parent 6c7b9aee04
commit f07a07b8d8
14 changed files with 218 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_IdentifierClass.cpp
View File

@@ -11,10 +11,10 @@ SCENARIO("Testing the SimCorePositionClass")
GIVEN("different position in different forms")
{
SimCore::Identifier ID1(100,SimCore::ObjectSource::EXTERNAL);
SimCore::Identifier ID2(100,SimCore::ObjectSource::EXTERNAL);
SimCore::Identifier ID3(100,SimCore::ObjectSource::INTERNAL);
SimCore::Identifier ID4(200,SimCore::ObjectSource::INTERNAL);
SimCore::Identifier ID1(0,100,SimCore::ObjectSource::EXTERNAL);
SimCore::Identifier ID2(0,100,SimCore::ObjectSource::EXTERNAL);
SimCore::Identifier ID3(1,100,SimCore::ObjectSource::INTERNAL);
SimCore::Identifier ID4(1,200,SimCore::ObjectSource::INTERNAL);
WHEN("constructing Position Object with data")
@@ -27,8 +27,8 @@ SCENARIO("Testing the SimCorePositionClass")
{
REQUIRE(ID1.getNumber() == 100);
REQUIRE(ID1.isExternal() == true);
REQUIRE(ID1.getPair().first == 100);
REQUIRE(ID1.getPair().second == true);
REQUIRE(ID1.getParentNumber() == 0);
REQUIRE(ID1.isExternal() == true);
REQUIRE(ID1 == ID2);
REQUIRE(ID1 != ID3);

10
tests/test_IdentifierList.cpp
View File

@@ -14,12 +14,12 @@ SCENARIO("Testing the SimCorePositionClass")
{
SimCore::IdentifierMaker IDList;
auto ID1 = IDList.getNewIdentifier(SimCore::EXTERNAL);
auto ID2 = IDList.getNewIdentifier(SimCore::EXTERNAL);
auto ID3 = IDList.getNewIdentifier(SimCore::EXTERNAL);
auto ID1 = IDList.getNewIdentifier(1,SimCore::EXTERNAL);
auto ID2 = IDList.getNewIdentifier(1,SimCore::EXTERNAL);
auto ID3 = IDList.getNewIdentifier(1,SimCore::EXTERNAL);
auto ID4 = IDList.getNewIdentifier(SimCore::INTERNAL);
auto ID5 = std::make_shared<SimCore::Identifier>(100, SimCore::EXTERNAL);
auto ID4 = IDList.getNewIdentifier(0,SimCore::INTERNAL);
auto ID5 = std::make_shared<SimCore::Identifier>(0,100, SimCore::EXTERNAL);
WHEN("constructing Position Object with data")
{

8
tests/test_RadarTrackClass.cpp
View File

@@ -23,7 +23,7 @@ SCENARIO("Testing the SimCore Track") {
SimCore::IdentifierMaker IDMaker;
std::shared_ptr<SimCore::Identifier> ID =
IDMaker.getNewIdentifier(SimCore::ObjectSource::INTERNAL);
IDMaker.getNewIdentifier(0,SimCore::ObjectSource::INTERNAL);
LOG_S(INFO)<<"ID: " << ID->getNumber();
std::shared_ptr<SimCore::RadarTrack> RadartrackPtr =
@@ -41,11 +41,11 @@ SCENARIO("Testing the SimCore Track") {
SimCore::RadarTrack radarTrack2(serializedMSG);
SimCore::Identifier ID1(radarTrack2.getIdentifier().getPair());
SimCore::Identifier ID1(radarTrack2.getIdentifier());
auto tr0 = *RadartrackPtr.get();
SimCore::Identifier ID2(tr0.getIdentifier().getPair());
SimCore::Identifier ID2(tr0.getIdentifier());
LOG_S(INFO)<<"ID2 source: " << ID2.getObjectSource();
LOG_S(INFO)<<"ID2 source: " << ID2.isExternal();
if (ID1 == ID2) {
isEqual = true;

2
tests/test_TrackClass.cpp
View File

@@ -31,7 +31,7 @@ SCENARIO("Testing the SimCore Track")
std::shared_ptr<SimCore::Track> trackPtr = NULL;
SimCore::IdentifierMaker IDMaker;
auto ID = IDMaker.getNewIdentifier(SimCore::ObjectSource::EXTERNAL);
auto ID = IDMaker.getNewIdentifier(1,SimCore::ObjectSource::EXTERNAL);
std::string serializedMSG;