From 304c8b08214d2facbdb80f001c4177b841e22bc9 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Thu, 5 Aug 2021 08:41:07 +0200
Subject: [PATCH] Fix test, deprecation warnings
---
.../client/ExampleMemoryClient/ExampleMemoryClient.cpp | 6 +++---
.../armem/server/ExampleMemory/test/ExampleMemoryTest.cpp | 2 +-
source/RobotAPI/libraries/armem/test/ArMemLTMTest.cpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp b/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
index 8ae42e00b..3820d198d 100644
--- a/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
+++ b/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
@@ -262,16 +262,16 @@ namespace armarx
{
armem::wm::Memory& memory = qResult.memory;
- ARMARX_CHECK_EQUAL(memory.coreSegments().size(), 1);
+ ARMARX_CHECK_EQUAL(memory.size(), 1);
armem::wm::CoreSegment& coreSeg = memory.coreSegments().begin()->second;
ARMARX_CHECK_EQUAL(coreSeg.providerSegments().size(), 1);
armem::wm::ProviderSegment& provSeg = coreSeg.providerSegments().begin()->second;
- ARMARX_CHECK_EQUAL(provSeg.entities().size(), 1);
+ ARMARX_CHECK_EQUAL(provSeg.size(), 1);
armem::wm::Entity& entity = provSeg.entities().begin()->second;
- ARMARX_CHECK_GREATER_EQUAL(entity.history().size(), 1);
+ ARMARX_CHECK_GREATER_EQUAL(entity.size(), 1);
armem::wm::EntitySnapshot& snapshot = entity.history().begin()->second;
ARMARX_INFO << "Result: "
diff --git a/source/RobotAPI/components/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp b/source/RobotAPI/components/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp
index c5ba35a13..56c9d08f4 100644
--- a/source/RobotAPI/components/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp
+++ b/source/RobotAPI/components/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp
@@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE(test_ExampleData_type)
{
armarx::aron::typenavigator::ObjectNavigatorPtr type = ExampleData::toAronType();
- BOOST_CHECK_EQUAL(type->childrenSize(), 15);
+ BOOST_CHECK_EQUAL(type->childrenSize(), 16);
armem::wm::Memory memory;
armem::wm::CoreSegment& core = memory.addCoreSegment("ExampleData", type);
diff --git a/source/RobotAPI/libraries/armem/test/ArMemLTMTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemLTMTest.cpp
index 24c0a2220..01b3756af 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemLTMTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemLTMTest.cpp
@@ -122,7 +122,7 @@ namespace ArMemLTMTest
update.instancesData = q;
update.timeCreated = armem::Time::now();
BOOST_CHECK_NO_THROW(providerSegment.update(update));
- BOOST_CHECK_EQUAL(providerSegment.entities().size(), 1);
+ BOOST_CHECK_EQUAL(providerSegment.size(), 1);
}
BOOST_CHECK(providerSegment.hasEntity("TestEntity"));
--
GitLab