From 3a28a5862fe08a39d1f08d71548f40ed818bc16e Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Tue, 22 Mar 2022 14:14:18 +0100
Subject: [PATCH] Update usage of time in armem tests
---
.../libraries/armem/test/ArMemForEachTest.cpp | 6 ++---
.../libraries/armem/test/ArMemGetFindTest.cpp | 26 +++++++++----------
.../armem/test/ArMemIceConversionsTest.cpp | 5 ++--
.../armem/test/ArMemMemoryIDTest.cpp | 5 ++--
.../armem/test/ArMemQueryBuilderTest.cpp | 12 ++++-----
5 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/source/RobotAPI/libraries/armem/test/ArMemForEachTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemForEachTest.cpp
index 9c29804eb..8cb721c4b 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemForEachTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemForEachTest.cpp
@@ -70,7 +70,7 @@ BOOST_AUTO_TEST_CASE(test_forEach)
eids.insert(eid);
for (size_t s = 0; s <= e; ++s)
{
- const MemoryID sid = eid.withTimestamp(Time::microSeconds(int(s)));
+ const MemoryID sid = eid.withTimestamp(Time(Duration::MicroSeconds(int(s))));
sids.insert(sid);
EntityUpdate update;
@@ -176,8 +176,8 @@ BOOST_AUTO_TEST_CASE(test_forEach_non_bool_func)
// Check whether this compiles + runs without break.
armem::wm::Entity entity;
- entity.addSnapshot(armem::Time::microSeconds(500));
- entity.addSnapshot(armem::Time::microSeconds(1500));
+ entity.addSnapshot(armem::Time(armem::Duration::MicroSeconds(500)));
+ entity.addSnapshot(armem::Time(armem::Duration::MicroSeconds(1500)));
int i = 0;
entity.forEachSnapshot([&i](const armem::wm::EntitySnapshot&) -> void
diff --git a/source/RobotAPI/libraries/armem/test/ArMemGetFindTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemGetFindTest.cpp
index 29c12884d..f03b02052 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemGetFindTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemGetFindTest.cpp
@@ -58,7 +58,7 @@ namespace ArMemGetFindTest
Fixture()
{
{
- snapshot.time() = armem::Time::microSeconds(1000);
+ snapshot.time() = armem::Time(armem::Duration::MicroSeconds(1000));
snapshot.addInstance();
}
{
@@ -123,14 +123,14 @@ namespace ArMemGetFindTest
{
BOOST_TEST_CONTEXT("Parent: " << armem::print(parent))
{
- BOOST_CHECK_EQUAL(parent.hasSnapshot(entityID.withTimestamp(armem::Time::microSeconds(1000))), true);
- BOOST_CHECK_EQUAL(parent.hasSnapshot(entityID.withTimestamp(armem::Time::microSeconds(2000))), false);
+ BOOST_CHECK_EQUAL(parent.hasSnapshot(entityID.withTimestamp(armem::Time(armem::Duration::MicroSeconds(1000)))), true);
+ BOOST_CHECK_EQUAL(parent.hasSnapshot(entityID.withTimestamp(armem::Time(armem::Duration::MicroSeconds(2000)))), false);
- BOOST_CHECK_NE(parent.findSnapshot(entityID.withTimestamp(armem::Time::microSeconds(1000))), nullptr);
- BOOST_CHECK_EQUAL(parent.findSnapshot(entityID.withTimestamp(armem::Time::microSeconds(2000))), nullptr);
+ BOOST_CHECK_NE(parent.findSnapshot(entityID.withTimestamp(armem::Time(armem::Duration::MicroSeconds(1000)))), nullptr);
+ BOOST_CHECK_EQUAL(parent.findSnapshot(entityID.withTimestamp(armem::Time(armem::Duration::MicroSeconds(2000)))), nullptr);
- BOOST_CHECK_NO_THROW(parent.getSnapshot(entityID.withTimestamp(armem::Time::microSeconds(1000))));
- BOOST_CHECK_THROW(parent.getSnapshot(entityID.withTimestamp(armem::Time::microSeconds(2000))), armem::error::MissingEntry);
+ BOOST_CHECK_NO_THROW(parent.getSnapshot(entityID.withTimestamp(armem::Time(armem::Duration::MicroSeconds(1000)))));
+ BOOST_CHECK_THROW(parent.getSnapshot(entityID.withTimestamp(armem::Time(armem::Duration::MicroSeconds(2000)))), armem::error::MissingEntry);
}
}
@@ -223,14 +223,14 @@ BOOST_AUTO_TEST_CASE(test_snapshot_get_find_instance_by_key)
BOOST_AUTO_TEST_CASE(test_entity_get_find_snapshot_by_key)
{
- BOOST_CHECK_EQUAL(entity.hasSnapshot(armem::Time::microSeconds(1000)), true);
- BOOST_CHECK_EQUAL(entity.hasSnapshot(armem::Time::microSeconds(2000)), false);
+ BOOST_CHECK_EQUAL(entity.hasSnapshot(armem::Time(armem::Duration::MicroSeconds(1000))), true);
+ BOOST_CHECK_EQUAL(entity.hasSnapshot(armem::Time(armem::Duration::MicroSeconds(2000))), false);
- BOOST_CHECK_NE(entity.findSnapshot(armem::Time::microSeconds(1000)), nullptr);
- BOOST_CHECK_EQUAL(entity.findSnapshot(armem::Time::microSeconds(2000)), nullptr);
+ BOOST_CHECK_NE(entity.findSnapshot(armem::Time(armem::Duration::MicroSeconds(1000))), nullptr);
+ BOOST_CHECK_EQUAL(entity.findSnapshot(armem::Time(armem::Duration::MicroSeconds(2000))), nullptr);
- BOOST_CHECK_NO_THROW(entity.getSnapshot(armem::Time::microSeconds(1000)));
- BOOST_CHECK_THROW(entity.getSnapshot(armem::Time::microSeconds(2000)), armem::error::MissingEntry);
+ BOOST_CHECK_NO_THROW(entity.getSnapshot(armem::Time(armem::Duration::MicroSeconds(1000))));
+ BOOST_CHECK_THROW(entity.getSnapshot(armem::Time(armem::Duration::MicroSeconds(2000))), armem::error::MissingEntry);
}
diff --git a/source/RobotAPI/libraries/armem/test/ArMemIceConversionsTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemIceConversionsTest.cpp
index 9fd00a4cf..a556ef11a 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemIceConversionsTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemIceConversionsTest.cpp
@@ -27,7 +27,6 @@
#include <RobotAPI/Test.h>
#include <RobotAPI/libraries/armem/core/wm/ice_conversions.h>
-
#include <iostream>
#include <SimoxUtility/algorithm/get_map_keys_values.h>
@@ -43,11 +42,11 @@ BOOST_AUTO_TEST_CASE(test_entity)
std::vector<armem::Time> expectedTimestamps;
armem::wm::EntitySnapshot snapshot;
- snapshot.time() = armem::Time::milliSeconds(100);
+ snapshot.time() = armem::Time(armem::Duration::MicroSeconds(100));
expectedTimestamps.push_back(snapshot.time());
entity.addSnapshot(snapshot);
- snapshot.time() = armem::Time::milliSeconds(300);
+ snapshot.time() = armem::Time(armem::Duration::MicroSeconds(300));
expectedTimestamps.push_back(snapshot.time());
entity.addSnapshot(snapshot);
diff --git a/source/RobotAPI/libraries/armem/test/ArMemMemoryIDTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemMemoryIDTest.cpp
index 72f09fb22..987cf20c9 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemMemoryIDTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemMemoryIDTest.cpp
@@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE(test_MemoryID_from_to_string)
BOOST_CHECK_EQUAL(idIn.coreSegmentName, "Core");
BOOST_CHECK_EQUAL(idIn.providerSegmentName, "Prov");
BOOST_CHECK_EQUAL(idIn.entityName, "entity");
- BOOST_CHECK_EQUAL(idIn.timestamp, IceUtil::Time::microSeconds(2810381));
+ BOOST_CHECK_EQUAL(idIn.timestamp, armem::Time(armem::Duration::MicroSeconds(2810381)));
BOOST_CHECK_EQUAL(idIn.instanceIndex, 2);
@@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE(test_MemoryID_from_to_string)
BOOST_CHECK_EQUAL(idIn.coreSegmentName, "AtTheEnd/");
BOOST_CHECK_EQUAL(idIn.providerSegmentName, "/AtTheStart");
BOOST_CHECK_EQUAL(idIn.entityName, "YCB/sugar/-1");
- BOOST_CHECK_EQUAL(idIn.timestamp, IceUtil::Time::microSeconds(-1));
+ BOOST_CHECK_EQUAL(idIn.timestamp, armem::Time::Invalid());
BOOST_CHECK_EQUAL(idIn.instanceIndex, 2);
BOOST_TEST_CONTEXT(VAROUT(idIn.str()))
@@ -134,7 +134,6 @@ BOOST_AUTO_TEST_CASE(test_MemoryID_from_to_string)
armem::MemoryID idOut(idIn.str());
BOOST_CHECK_EQUAL(idOut, idIn);
}
-
}
diff --git a/source/RobotAPI/libraries/armem/test/ArMemQueryBuilderTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemQueryBuilderTest.cpp
index 78d3077c0..959429170 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemQueryBuilderTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemQueryBuilderTest.cpp
@@ -97,9 +97,10 @@ BOOST_AUTO_TEST_CASE(test_mixed)
.entities(withName(entityNames.at(0)),
withName(entityNames.at(1)))
.snapshots(latest(),
- atTime(armem::Time::milliSeconds(3000)),
+ atTime(armem::Time(armem::Duration::MilliSeconds(3000))),
indexRange(5, -10),
- timeRange(armem::Time::milliSeconds(1000), armem::Time::milliSeconds(2000)))
+ timeRange(armem::Time(armem::Duration::MilliSeconds(1000)),
+ armem::Time(armem::Duration::MilliSeconds(2000))))
;
@@ -144,7 +145,7 @@ BOOST_AUTO_TEST_CASE(test_mixed)
{
auto atTime = query::entity::SinglePtr::dynamicCast(*it);
BOOST_REQUIRE(atTime);
- BOOST_CHECK_EQUAL(atTime->timestamp, armem::toIce<long>(armem::Time::milliSeconds(3000)));
+ BOOST_CHECK_EQUAL(atTime->timestamp, armem::toIce<long>(armem::Time(armem::Duration::MilliSeconds(3000))));
++it;
}
{
@@ -157,12 +158,11 @@ BOOST_AUTO_TEST_CASE(test_mixed)
{
auto timeRange = query::entity::TimeRangePtr::dynamicCast(*it);
BOOST_REQUIRE(timeRange);
- BOOST_CHECK_EQUAL(timeRange->minTimestamp, armem::toIce<long>(armem::Time::milliSeconds(1000)));
- BOOST_CHECK_EQUAL(timeRange->maxTimestamp, armem::toIce<long>(armem::Time::milliSeconds(2000)));
+ BOOST_CHECK_EQUAL(timeRange->minTimestamp, armem::toIce<long>(armem::Time(armem::Duration::MilliSeconds(1000))));
+ BOOST_CHECK_EQUAL(timeRange->maxTimestamp, armem::toIce<long>(armem::Time(armem::Duration::MilliSeconds(2000))));
++it;
}
}
-
}
--
GitLab