From 0ff7d980c5430be317aca0405477dec74ab0390c Mon Sep 17 00:00:00 2001
From: Jesse Wilson <jesse@swank.ca>
Date: Mon, 21 Nov 2011 06:26:30 +0000
Subject: [PATCH] Adjust LruCacheTest to use the Map API

---
 .../java/com/google/gson/LruCacheTest.java    | 70 +++++++++----------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/LruCacheTest.java b/gson/src/test/java/com/google/gson/LruCacheTest.java
index 337aec49..56611268 100644
--- a/gson/src/test/java/com/google/gson/LruCacheTest.java
+++ b/gson/src/test/java/com/google/gson/LruCacheTest.java
@@ -28,56 +28,56 @@ import junit.framework.TestCase;
 public class LruCacheTest extends TestCase {
 
   public void testCacheHitAndMiss() throws Exception {
-    Cache<String, Integer> cache = new LruCache<String, Integer>(3);
+    LruCache<String, Integer> cache = new LruCache<String, Integer>(3);
 
     String key = "key1";
-    assertNull(cache.getElement(key));
-    cache.addElement(key, 1);
-    assertEquals(1, cache.getElement(key).intValue());
+    assertNull(cache.get(key));
+    cache.put(key, 1);
+    assertEquals(1, cache.get(key).intValue());
 
     String key2 = "key2";
-    cache.addElement(key2, 2);
-    assertEquals(1, cache.getElement(key).intValue());
-    assertEquals(2, cache.getElement(key2).intValue());
+    cache.put(key2, 2);
+    assertEquals(1, cache.get(key).intValue());
+    assertEquals(2, cache.get(key2).intValue());
   }
 
   public void testCacheKeyOverwrite() throws Exception {
-    Cache<String, Integer> cache = new LruCache<String, Integer>(3);
+    LruCache<String, Integer> cache = new LruCache<String, Integer>(3);
 
     String key = "key1";
-    assertNull(cache.getElement(key));
-    cache.addElement(key, 1);
-    assertEquals(1, cache.getElement(key).intValue());
+    assertNull(cache.get(key));
+    cache.put(key, 1);
+    assertEquals(1, cache.get(key).intValue());
 
-    cache.addElement(key, 5);
-    assertEquals(5, cache.getElement(key).intValue());
+    cache.put(key, 5);
+    assertEquals(5, cache.get(key).intValue());
   }
 
   public void testCacheEviction() throws Exception {
-    Cache<String, Integer> cache = new LruCache<String, Integer>(5);
+    LruCache<String, Integer> cache = new LruCache<String, Integer>(5);
 
-    cache.addElement("key1", 1);
-    cache.addElement("key2", 2);
-    cache.addElement("key3", 3);
-    cache.addElement("key4", 4);
-    cache.addElement("key5", 5);
-    assertEquals(1, cache.getElement("key1").intValue());
-    assertEquals(2, cache.getElement("key2").intValue());
-    assertEquals(3, cache.getElement("key3").intValue());
-    assertEquals(4, cache.getElement("key4").intValue());
-    assertEquals(5, cache.getElement("key5").intValue());
+    cache.put("key1", 1);
+    cache.put("key2", 2);
+    cache.put("key3", 3);
+    cache.put("key4", 4);
+    cache.put("key5", 5);
+    assertEquals(1, cache.get("key1").intValue());
+    assertEquals(2, cache.get("key2").intValue());
+    assertEquals(3, cache.get("key3").intValue());
+    assertEquals(4, cache.get("key4").intValue());
+    assertEquals(5, cache.get("key5").intValue());
 
     // Access key1 to show key2 will be evicted (shows not a FIFO cache)
-    cache.getElement("key1");
-    cache.getElement("key3");
-    cache.addElement("key6", 6);
-    cache.addElement("key7", 7);
-    assertEquals(1, cache.getElement("key1").intValue());
-    assertNull(cache.getElement("key2"));
-    assertEquals(3, cache.getElement("key3").intValue());
-    assertNull(cache.getElement("key4"));
-    assertEquals(5, cache.getElement("key5").intValue());
-    assertEquals(6, cache.getElement("key6").intValue());
-    assertEquals(7, cache.getElement("key7").intValue());
+    cache.get("key1");
+    cache.get("key3");
+    cache.put("key6", 6);
+    cache.put("key7", 7);
+    assertEquals(1, cache.get("key1").intValue());
+    assertNull(cache.get("key2"));
+    assertEquals(3, cache.get("key3").intValue());
+    assertNull(cache.get("key4"));
+    assertEquals(5, cache.get("key5").intValue());
+    assertEquals(6, cache.get("key6").intValue());
+    assertEquals(7, cache.get("key7").intValue());
   }
 }