Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 877cd361 authored by Florian Mayer's avatar Florian Mayer Committed by Automerger Merge Worker
Browse files

Merge "Make callback outlive LruCache." am: 6948bbf6 am: 9e67f930 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2052189



Change-Id: I7f8d7d19157528b4b8962bcf0bc9807089236b79
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2f9831b4 9e67f930

libutils/LruCache_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -298,8 +298,8 @@ TEST_F(LruCacheTest, ClearReuseOk) { 
}



TEST_F(LruCacheTest, Callback) {

    LruCache<SimpleKey, StringValue> cache(100);

    EntryRemovedCallback callback;

    LruCache<SimpleKey, StringValue> cache(100);

    cache.setOnEntryRemovedListener(&callback);



    cache.put(1, "one");
@@ -313,8 +313,8 @@ TEST_F(LruCacheTest, Callback) { 
}



TEST_F(LruCacheTest, CallbackOnClear) {

    LruCache<SimpleKey, StringValue> cache(100);

    EntryRemovedCallback callback;

    LruCache<SimpleKey, StringValue> cache(100);

    cache.setOnEntryRemovedListener(&callback);



    cache.put(1, "one");
@@ -326,8 +326,8 @@ TEST_F(LruCacheTest, CallbackOnClear) { 
}



TEST_F(LruCacheTest, CallbackRemovesKeyWorksOK) {

    LruCache<KeyWithPointer, StringValue> cache(1);

    InvalidateKeyCallback callback;

    LruCache<KeyWithPointer, StringValue> cache(1);

    cache.setOnEntryRemovedListener(&callback);

    KeyWithPointer key1;

    key1.ptr = new int(1);