From 9420b3fe53c4e4e69488c8851b06932e90af6570 Mon Sep 17 00:00:00 2001
From: Iliyan Malchev <malchev@google.com>
Date: Tue, 14 Aug 2012 12:24:25 -0700
Subject: [PATCH] Revert "CTS for timestamp in ScanResult"

This accompanies:
https://googleplex-android-review.googlesource.com/217002

This reverts commit e9adc27111e8f78c0281cddfd31708048326473e

Change-Id: Ib37b72c59aad34fe9fd4461979c5f51af1218e37
---
 .../android/net/wifi/cts/ScanResultTest.java  | 74 ++-----------------
 1 file changed, 8 insertions(+), 66 deletions(-)

diff --git a/tests/cts/net/src/android/net/wifi/cts/ScanResultTest.java b/tests/cts/net/src/android/net/wifi/cts/ScanResultTest.java
index c9b82eecc7..26cfff83fd 100644
--- a/tests/cts/net/src/android/net/wifi/cts/ScanResultTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/ScanResultTest.java
@@ -26,7 +26,6 @@ import android.net.wifi.ScanResult;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiManager.WifiLock;
 import android.test.AndroidTestCase;
-import android.util.Log;
 
 public class ScanResultTest extends AndroidTestCase {
     private static class MySync {
@@ -40,14 +39,11 @@ public class ScanResultTest extends AndroidTestCase {
     private static final int STATE_NULL = 0;
     private static final int STATE_WIFI_CHANGING = 1;
     private static final int STATE_WIFI_CHANGED = 2;
-    private static final int STATE_START_SCAN = 3;
-    private static final int STATE_SCAN_RESULTS_AVAILABLE = 4;
 
     private static final String TAG = "WifiInfoTest";
     private static final int TIMEOUT_MSEC = 6000;
     private static final int WAIT_MSEC = 60;
-    private static final int ENABLE_WAIT_MSEC = 10000;
-    private static final int SCAN_WAIT_MSEC = 10000;
+    private static final int DURATION = 10000;
     private IntentFilter mIntentFilter;
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
@@ -58,11 +54,6 @@ public class ScanResultTest extends AndroidTestCase {
                     mMySync.expectedState = STATE_WIFI_CHANGED;
                     mMySync.notify();
                 }
-            } else if (action.equals(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)) {
-                synchronized (mMySync) {
-                    mMySync.expectedState = STATE_SCAN_RESULTS_AVAILABLE;
-                    mMySync.notify();
-                }
             }
         }
     };
@@ -92,7 +83,7 @@ public class ScanResultTest extends AndroidTestCase {
         mWifiLock.acquire();
         if (!mWifiManager.isWifiEnabled())
             setWifiEnabled(true);
-        Thread.sleep(ENABLE_WAIT_MSEC);
+        Thread.sleep(DURATION);
         assertTrue(mWifiManager.isWifiEnabled());
         mMySync.expectedState = STATE_NULL;
     }
@@ -108,7 +99,7 @@ public class ScanResultTest extends AndroidTestCase {
         mContext.unregisterReceiver(mReceiver);
         if (!mWifiManager.isWifiEnabled())
             setWifiEnabled(true);
-        Thread.sleep(ENABLE_WAIT_MSEC);
+        Thread.sleep(DURATION);
         super.tearDown();
     }
 
@@ -116,15 +107,11 @@ public class ScanResultTest extends AndroidTestCase {
         synchronized (mMySync) {
             mMySync.expectedState = STATE_WIFI_CHANGING;
             assertTrue(mWifiManager.setWifiEnabled(enable));
-            waitForBroadcast(TIMEOUT_MSEC, STATE_WIFI_CHANGED);
-       }
-    }
-
-    private void waitForBroadcast(long timeout, int expectedState) throws Exception {
-        long waitTime = System.currentTimeMillis() + timeout;
-        while (System.currentTimeMillis() < waitTime
-                && mMySync.expectedState != expectedState)
-            mMySync.wait(WAIT_MSEC);
+            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
+            while (System.currentTimeMillis() < timeout
+                    && mMySync.expectedState == STATE_WIFI_CHANGING)
+                mMySync.wait(WAIT_MSEC);
+        }
     }
 
     public void testScanResultProperties() {
@@ -140,49 +127,4 @@ public class ScanResultTest extends AndroidTestCase {
         }
     }
 
-    private void scanAndWait() throws Exception {
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_START_SCAN;
-            mWifiManager.startScan();
-            waitForBroadcast(SCAN_WAIT_MSEC, STATE_SCAN_RESULTS_AVAILABLE);
-        }
-   }
-
-    public void testScanResultTimeStamp() throws Exception {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-
-        long timestamp = 0;
-        String BSSID = null;
-
-        /* Multiple scans to ensure bssid is updated */
-        scanAndWait();
-        scanAndWait();
-        scanAndWait();
-
-        List<ScanResult> scanResults = mWifiManager.getScanResults();
-        for (ScanResult result : scanResults) {
-            BSSID = result.BSSID;
-            timestamp = result.timestamp;
-            assertTrue(timestamp != 0);
-            break;
-        }
-
-        scanAndWait();
-        scanAndWait();
-        scanAndWait();
-
-        scanResults = mWifiManager.getScanResults();
-        for (ScanResult result : scanResults) {
-            if (result.BSSID.equals(BSSID)) {
-                long timeDiff = (result.timestamp - timestamp) / 1000;
-                assertTrue (timeDiff > 0);
-                assertTrue (timeDiff < 6 * SCAN_WAIT_MSEC);
-            }
-        }
-
-    }
-
 }