summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Lorenz <jlorenz@de.adit-jv.com>2018-03-27 15:45:35 +0200
committerJens Lorenz <jlorenz@de.adit-jv.com>2018-04-09 16:58:45 +0200
commit583713d6cefbb8f3486b98d41c481e8208e2db52 (patch)
tree83ce0283da4edc7022d488e28c6a5fc6a3ec7430
parent97737f9acc2c04ea6d81b8a9fcbcc0571b697483 (diff)
downloadaudiomanager-583713d6cefbb8f3486b98d41c481e8208e2db52.tar.gz
AMUtil: Test: Fix mExpected value range for 32-bit
The duration calculation for mExpected is not working. The playWithTimers oneshot test reported all times warnings. Signed-off-by: Jens Lorenz <jlorenz@de.adit-jv.com>
-rw-r--r--AudioManagerUtilities/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp2
-rw-r--r--AudioManagerUtilities/test/AmSocketHandlerTest/CAmSocketHandlerTest.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/AudioManagerUtilities/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp b/AudioManagerUtilities/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp
index ecd38fe..2d21193 100644
--- a/AudioManagerUtilities/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp
+++ b/AudioManagerUtilities/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp
@@ -168,7 +168,7 @@ void am::CAmTimerMeasurment::timerCallback(sh_timerHandle_t handle, void* userDa
std::chrono::time_point<std::chrono::high_resolution_clock> t_end = std::chrono::high_resolution_clock::now();
if (TP_ZERO != mLastInvocationTime)
{
- auto durationLast = t_end - mLastInvocationTime;
+ std::chrono::duration<double, std::milli> durationLast = t_end - mLastInvocationTime;
double diff = (std::chrono::duration<double, std::milli>(mExpected - durationLast).count());
#ifdef ENABLED_TIMERS_TEST_OUTPUT
diff --git a/AudioManagerUtilities/test/AmSocketHandlerTest/CAmSocketHandlerTest.h b/AudioManagerUtilities/test/AmSocketHandlerTest/CAmSocketHandlerTest.h
index ba2bf51..a274605 100644
--- a/AudioManagerUtilities/test/AmSocketHandlerTest/CAmSocketHandlerTest.h
+++ b/AudioManagerUtilities/test/AmSocketHandlerTest/CAmSocketHandlerTest.h
@@ -168,7 +168,7 @@ namespace am
timespec mUpdateTimeout;
std::chrono::time_point<std::chrono::high_resolution_clock> mUpdateTimePoint;
std::chrono::time_point<std::chrono::high_resolution_clock> mLastInvocationTime;
- std::chrono::duration<long, std::ratio<1l, 1000000000l>> mExpected;
+ std::chrono::duration<uint64_t, std::nano> mExpected;
int32_t mRepeats;
void * mpUserData;
std::string mDebugText;