diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-23 10:10:28 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-23 10:10:28 +0000 |
| commit | c3e6bd2fb2223973f26325d11c28b32b8685cfbd (patch) | |
| tree | da46aa45ad59a45a9fbbc5ea8610cb3878411436 /services/surfaceflinger/tests/unittests/DisplayIdentificationTest.cpp | |
| parent | fa715fbb081b1c548160bbf9b3b483f2e532960c (diff) | |
| parent | 169d2b5244b662e05dee2595acaef912fa553c38 (diff) | |
Snap for 8343869 from 169d2b5244b662e05dee2595acaef912fa553c38 to s-keystone-qcom-release
Change-Id: I3a2a1c3b8551e1c6af02b7c5426bffa4d5835511
Diffstat (limited to 'services/surfaceflinger/tests/unittests/DisplayIdentificationTest.cpp')
| -rw-r--r-- | services/surfaceflinger/tests/unittests/DisplayIdentificationTest.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/services/surfaceflinger/tests/unittests/DisplayIdentificationTest.cpp b/services/surfaceflinger/tests/unittests/DisplayIdentificationTest.cpp index dc04b6d91d..cd4a5c961d 100644 --- a/services/surfaceflinger/tests/unittests/DisplayIdentificationTest.cpp +++ b/services/surfaceflinger/tests/unittests/DisplayIdentificationTest.cpp @@ -25,6 +25,7 @@ #include <gtest/gtest.h> #include "DisplayHardware/DisplayIdentification.h" +#include "DisplayHardware/Hash.h" using ::testing::ElementsAre; @@ -134,7 +135,7 @@ DisplayIdentificationData asDisplayIdentificationData(const unsigned char (&byte } uint32_t hash(const char* str) { - return static_cast<uint32_t>(std::hash<std::string_view>()(str)); + return static_cast<uint32_t>(cityHash64Len0To16(str)); } } // namespace @@ -309,9 +310,9 @@ TEST(DisplayIdentificationTest, parseDisplayIdentificationData) { ASSERT_TRUE(tertiaryInfo); // Display IDs should be unique. - EXPECT_NE(primaryInfo->id, secondaryInfo->id); - EXPECT_NE(primaryInfo->id, tertiaryInfo->id); - EXPECT_NE(secondaryInfo->id, tertiaryInfo->id); + EXPECT_EQ(4633257497453176576, primaryInfo->id.value); + EXPECT_EQ(4621520285560261121, secondaryInfo->id.value); + EXPECT_EQ(4633127902230889474, tertiaryInfo->id.value); } TEST(DisplayIdentificationTest, deviceProductInfo) { |