diff options
| author | Justin DeMartino <jjdemartino@google.com> | 2020-10-14 19:39:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 19:39:53 +0000 |
| commit | 0d11af03e43f110b0bb160f7e20436d0043e3038 (patch) | |
| tree | 48f8bcca856276ec73a86dd3fb26143d3ca64578 /libutils/SystemClock_test.cpp | |
| parent | 075666ebd0dee8d0c4a2efa54f7c324a3f67ee2a (diff) | |
| parent | a6c01e4e98d2b343dcecfc99611e2e6250c730db (diff) | |
Merge changes from topic "SP1A.200921.001" into s-keystone-qcom-dev
* changes:
fs_mgr: adb-remount-test.sh: filter out more administrivia mounts.
Merge SP1A.200921.001 Change-Id: I90b97c4e9fb10b1f45e74def404823eed5b1aaa8
Diffstat (limited to 'libutils/SystemClock_test.cpp')
| -rw-r--r-- | libutils/SystemClock_test.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/libutils/SystemClock_test.cpp b/libutils/SystemClock_test.cpp index 5ad060b04..7449dad77 100644 --- a/libutils/SystemClock_test.cpp +++ b/libutils/SystemClock_test.cpp @@ -29,16 +29,24 @@ static const int64_t SLACK_NS = SLACK_MS * MS_IN_NS; TEST(SystemClock, SystemClock) { auto startUptimeMs = android::uptimeMillis(); + auto startUptimeNs = android::uptimeNanos(); auto startRealtimeMs = android::elapsedRealtime(); auto startRealtimeNs = android::elapsedRealtimeNano(); ASSERT_GT(startUptimeMs, 0) << "uptimeMillis() reported an impossible uptime"; + ASSERT_GT(startUptimeNs, 0) + << "uptimeNanos() reported an impossible uptime"; ASSERT_GE(startRealtimeMs, startUptimeMs) << "elapsedRealtime() thinks we've suspended for negative time"; - ASSERT_GE(startRealtimeNs, startUptimeMs * MS_IN_NS) + ASSERT_GE(startRealtimeNs, startUptimeNs) << "elapsedRealtimeNano() thinks we've suspended for negative time"; + ASSERT_GE(startUptimeNs, startUptimeMs * MS_IN_NS) + << "uptimeMillis() and uptimeNanos() are inconsistent"; + ASSERT_LT(startUptimeNs, (startUptimeMs + SLACK_MS) * MS_IN_NS) + << "uptimeMillis() and uptimeNanos() are inconsistent"; + ASSERT_GE(startRealtimeNs, startRealtimeMs * MS_IN_NS) << "elapsedRealtime() and elapsedRealtimeNano() are inconsistent"; ASSERT_LT(startRealtimeNs, (startRealtimeMs + SLACK_MS) * MS_IN_NS) @@ -51,6 +59,7 @@ TEST(SystemClock, SystemClock) { ASSERT_EQ(nanosleepErr, 0) << "nanosleep() failed: " << strerror(errno); auto endUptimeMs = android::uptimeMillis(); + auto endUptimeNs = android::uptimeNanos(); auto endRealtimeMs = android::elapsedRealtime(); auto endRealtimeNs = android::elapsedRealtimeNano(); @@ -58,6 +67,10 @@ TEST(SystemClock, SystemClock) { << "uptimeMillis() advanced too little after nanosleep()"; EXPECT_LT(endUptimeMs - startUptimeMs, SLEEP_MS + SLACK_MS) << "uptimeMillis() advanced too much after nanosleep()"; + EXPECT_GE(endUptimeNs - startUptimeNs, SLEEP_NS) + << "uptimeNanos() advanced too little after nanosleep()"; + EXPECT_LT(endUptimeNs - startUptimeNs, SLEEP_NS + SLACK_NS) + << "uptimeNanos() advanced too much after nanosleep()"; EXPECT_GE(endRealtimeMs - startRealtimeMs, SLEEP_MS) << "elapsedRealtime() advanced too little after nanosleep()"; EXPECT_LT(endRealtimeMs - startRealtimeMs, SLEEP_MS + SLACK_MS) @@ -67,6 +80,11 @@ TEST(SystemClock, SystemClock) { EXPECT_LT(endRealtimeNs - startRealtimeNs, SLEEP_NS + SLACK_NS) << "elapsedRealtimeNano() advanced too much after nanosleep()"; + EXPECT_GE(endUptimeNs, endUptimeMs * MS_IN_NS) + << "uptimeMillis() and uptimeNanos() are inconsistent after nanosleep()"; + EXPECT_LT(endUptimeNs, (endUptimeMs + SLACK_MS) * MS_IN_NS) + << "uptimeMillis() and uptimeNanos() are inconsistent after nanosleep()"; + EXPECT_GE(endRealtimeNs, endRealtimeMs * MS_IN_NS) << "elapsedRealtime() and elapsedRealtimeNano() are inconsistent after nanosleep()"; EXPECT_LT(endRealtimeNs, (endRealtimeMs + SLACK_MS) * MS_IN_NS) |