1 files changed, 10 insertions, 136 deletions
diff --git a/chrome/browser/geolocation/wifi_data_provider_unittest_win.cc b/chrome/browser/geolocation/wifi_data_provider_unittest_win.cc
index 90a7e36..e2dd891 100644
--- a/chrome/browser/geolocation/wifi_data_provider_unittest_win.cc
+++ b/chrome/browser/geolocation/wifi_data_provider_unittest_win.cc
@@ -2,145 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/geolocation/wifi_data_provider_win.h"
+// Most logic for the platform wifi provider is now factored into
+// WifiDataProviderCommon and covered by it's unit tests.
 
-#include <vector>
+#include "chrome/browser/geolocation/wifi_data_provider_win.h"
 
-#include "base/scoped_ptr.h"
-#include "base/string_util.h"
-#include "chrome/browser/geolocation/wifi_data_provider_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace {
-class MockWlanApi : public Win32WifiDataProvider::WlanApiInterface {
- public:
-  MockWlanApi() : calls_(0), bool_return_(true) {
-  }
-  virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data) {
-    ++calls_;
-    *data = data_out_;
-    return bool_return_;
-  }
-  int calls_;
-  bool bool_return_;
-  WifiData::AccessPointDataSet data_out_;
-};
-
-class MockPollingPolicy : public PollingPolicyInterface {
- public:
-  virtual void UpdatePollingInterval(bool scan_results_differ) {
-    results_differed_.push_back(scan_results_differ);
-  }
-  virtual int PollingInterval() { return 1; }
-  std::vector<bool> results_differed_;
-};
-
-// Stops the specified (nested) message loop when the listener is called back.
-class MessageLoopQuitListener
-    : public Win32WifiDataProvider::ListenerInterface {
- public:
-  explicit MessageLoopQuitListener(MessageLoop* message_loop)
-      : message_loop_to_quit_(message_loop) {
-    CHECK(message_loop_to_quit_ != NULL);
-  }
-  // ListenerInterface
-  virtual void DeviceDataUpdateAvailable(
-      DeviceDataProvider<WifiData>* provider) {
-    // Provider should call back on client's thread.
-    EXPECT_EQ(MessageLoop::current(), message_loop_to_quit_);
-    provider_ = provider;
-    message_loop_to_quit_->Quit();
-  }
-  MessageLoop* message_loop_to_quit_;
-  DeviceDataProvider<WifiData>* provider_;
-};
-
-Win32WifiDataProvider* CreateWin32WifiDataProvider(MockWlanApi** wlan_api_out) {
-  Win32WifiDataProvider* provider = new Win32WifiDataProvider;
-  *wlan_api_out = new MockWlanApi;
-  provider->inject_mock_wlan_api(*wlan_api_out);  // Takes ownership.
-  provider->inject_mock_polling_policy(new MockPollingPolicy);  // ditto
-  return provider;
-}
-
-WifiDataProviderImplBase* CreateWin32WifiDataProvider() {
-  MockWlanApi* wlan_api;
-  return CreateWin32WifiDataProvider(&wlan_api);
-}
-}  // namespace
-
-// Main test fixture
-class GeolocationWin32WifiDataProviderTest : public testing::Test {
- public:
-  virtual void SetUp() {
-    provider_ = CreateWin32WifiDataProvider(&wlan_api_);
-  }
-  virtual void TearDown() {
-    provider_->StopDataProvider();
-    provider_ = NULL;
-  }
-
- protected:
-  MessageLoop main_message_loop_;
-  scoped_refptr<Win32WifiDataProvider> provider_;
-  MockWlanApi* wlan_api_;
-};
-
-TEST_F(GeolocationWin32WifiDataProviderTest, CreateDestroy) {
-  // Test fixture members were SetUp correctly.
-  EXPECT_EQ(&main_message_loop_, MessageLoop::current());
-  EXPECT_TRUE(NULL != provider_.get());
-  EXPECT_TRUE(NULL != wlan_api_);
-}
-
-TEST_F(GeolocationWin32WifiDataProviderTest, StartThread) {
-  EXPECT_TRUE(provider_->StartDataProvider());
-  provider_->StopDataProvider();
+TEST(GeolocationWin32WifiDataProviderTest, CreateDestroy) {
+  // WifiDataProviderCommon requires the client to have a message loop.
+  MessageLoop dummy_loop;
+  scoped_refptr<Win32WifiDataProvider> instance(new Win32WifiDataProvider);
+  instance = NULL;
   SUCCEED();
-}
-
-TEST_F(GeolocationWin32WifiDataProviderTest, DoAnEmptyScan) {
-  MessageLoopQuitListener quit_listener(&main_message_loop_);
-  provider_->AddListener(&quit_listener);
-  EXPECT_TRUE(provider_->StartDataProvider());
-  main_message_loop_.Run();
-  // Check we had at least one call. The worker thread may have raced ahead
-  // and made multiple calls.
-  EXPECT_GT(wlan_api_->calls_, 0);
-  WifiData data;
-  EXPECT_TRUE(provider_->GetData(&data));
-  EXPECT_EQ(0, data.access_point_data.size());
-  provider_->RemoveListener(&quit_listener);
-}
-
-TEST_F(GeolocationWin32WifiDataProviderTest, DoScanWithResults) {
-  MessageLoopQuitListener quit_listener(&main_message_loop_);
-  provider_->AddListener(&quit_listener);
-  AccessPointData single_access_point;
-  single_access_point.age = 1;
-  single_access_point.channel = 2;
-  single_access_point.mac_address = 3;
-  single_access_point.radio_signal_strength = 4;
-  single_access_point.signal_to_noise = 5;
-  single_access_point.ssid = L"foossid";
-  wlan_api_->data_out_.insert(single_access_point);
-
-  EXPECT_TRUE(provider_->StartDataProvider());
-  main_message_loop_.Run();
-  EXPECT_GT(wlan_api_->calls_, 0);
-  WifiData data;
-  EXPECT_TRUE(provider_->GetData(&data));
-  EXPECT_EQ(1, data.access_point_data.size());
-  EXPECT_EQ(single_access_point.age, data.access_point_data.begin()->age);
-  EXPECT_EQ(single_access_point.ssid, data.access_point_data.begin()->ssid);
-  provider_->RemoveListener(&quit_listener);
-}
-
-TEST_F(GeolocationWin32WifiDataProviderTest, StartThreadViaDeviceDataProvider) {
-  MessageLoopQuitListener quit_listener(&main_message_loop_);
-  WifiDataProvider::SetFactory(CreateWin32WifiDataProvider);
-  DeviceDataProvider<WifiData>::Register(&quit_listener);
-  main_message_loop_.Run();
-  DeviceDataProvider<WifiData>::Unregister(&quit_listener);
-  DeviceDataProvider<WifiData>::ResetFactory();
+  // Can't actually call start provider on the Win32WifiDataProvider without
+  // it accessing hardware and so risking making the test flaky.
 }