Store device addresses in UrlInfo

chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/UrlManagerTest.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.physicalweb;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
@@ skipping 245 matching lines @@
         mUrlManager.removeUrl(urlInfo1);
         mUrlManager.addUrl(urlInfo2);
         mUrlManager.removeUrl(urlInfo2);
 
         // Make sure only URL2 is still in the cache.
         assertFalse(mUrlManager.containsInAnyCache(URL1));
         assertTrue(mUrlManager.containsInAnyCache(URL2));
     }
 
     @SmallTest
+    public void testAddUrlUpdatesCache() throws Exception {
+        addEmptyPwsResult();
+        addEmptyPwsResult();
+
+        UrlInfo urlInfo = new UrlInfo(URL1);
+        mUrlManager.addUrl(urlInfo);
+        List<UrlInfo> urls = mUrlManager.getUrls(true);
+        assertEquals(1, urls.size());
+        assertEquals(urlInfo.getDistance(), urls.get(0).getDistance());
+        assertEquals(urlInfo.getDeviceAddress(), urls.get(0).getDeviceAddress());
+        assertEquals(urlInfo.getScanTimestamp(), urls.get(0).getScanTimestamp());
+
+        urlInfo = new UrlInfo(URL1)
+                .setDistance(100.0)
+                .setDeviceAddress("00:11:22:33:AA:BB");
+        mUrlManager.addUrl(urlInfo);
+        urls = mUrlManager.getUrls(true);
+        assertEquals(1, urls.size());
+        assertEquals(urlInfo.getDistance(), urls.get(0).getDistance());
+        assertEquals(urlInfo.getDeviceAddress(), urls.get(0).getDeviceAddress());
+        assertEquals(urlInfo.getScanTimestamp(), urls.get(0).getScanTimestamp());
+    }
+
+    @SmallTest
     @RetryOnFailure
     public void testAddUrlTwiceWorks() throws Exception {
         // Add and remove an old URL twice and add new URL twice before removing.
         // This should cover several issues involved with updating the cache queue.
         addEmptyPwsResult();
         addEmptyPwsResult();
         addEmptyPwsResult();
         addEmptyPwsResult();
         UrlInfo urlInfo1 = new UrlInfo(URL1, -1.0, 0);
         UrlInfo urlInfo2 = new UrlInfo(URL2, -1.0, System.currentTimeMillis());
@@ skipping 186 matching lines @@
             public boolean isSatisfied() {
                 return mSharedPreferences.contains(UrlManager.getVersionKey())
                         && !mSharedPreferences.contains("physicalweb_resolved_urls");
             }
         }, 5000, CriteriaHelper.DEFAULT_POLLING_INTERVAL);
 
         assertEquals(UrlManager.getVersion(),
                 mSharedPreferences.getInt(UrlManager.getVersionKey(), 0));
     }
 }