Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2578)

Unified Diff: chrome/browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc

Issue 843483004: sync: add more integration tests for wifi_sync (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@submit-4.3-syncable-service
Patch Set: rebase, and resolve (trivial) conflict Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc b/chrome/browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc
index db170202d3a06153abec77884ec94a18eea90889..0d74a0ed195424371ca49d866e39c3a82c6eafda 100644
--- a/chrome/browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc
@@ -4,20 +4,40 @@
#include "base/command_line.h"
#include "base/macros.h"
+#include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
#include "chrome/browser/sync/test/integration/sync_test.h"
#include "chrome/browser/sync/test/integration/wifi_credentials_helper.h"
#include "chrome/common/chrome_switches.h"
+#include "components/wifi_sync/wifi_credential.h"
+#include "components/wifi_sync/wifi_security_class.h"
+
+using wifi_sync::WifiCredential;
+
+using WifiCredentialSet = wifi_sync::WifiCredential::CredentialSet;
class TwoClientWifiCredentialsSyncTest : public SyncTest {
public:
TwoClientWifiCredentialsSyncTest() : SyncTest(TWO_CLIENT) {}
~TwoClientWifiCredentialsSyncTest() override {}
+ // SyncTest implementation.
+ void SetUp() override {
+ wifi_credentials_helper::SetUp();
+ SyncTest::SetUp();
+ }
+
void SetUpCommandLine(base::CommandLine* command_line) override {
SyncTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kEnableWifiCredentialSync);
}
+ bool SetupClients() override {
+ if (!SyncTest::SetupClients())
+ return false;
+ wifi_credentials_helper::SetupClients();
+ return true;
+ }
+
private:
DISALLOW_COPY_AND_ASSIGN(TwoClientWifiCredentialsSyncTest);
};
@@ -27,3 +47,29 @@ IN_PROC_BROWSER_TEST_F(TwoClientWifiCredentialsSyncTest, NoCredentials) {
ASSERT_TRUE(wifi_credentials_helper::VerifierIsEmpty());
ASSERT_TRUE(wifi_credentials_helper::AllProfilesMatch());
}
+
+IN_PROC_BROWSER_TEST_F(TwoClientWifiCredentialsSyncTest, SingleCredential) {
+ ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+
+ const char ssid[] = "fake-ssid";
+ scoped_ptr<WifiCredential> credential =
+ wifi_credentials_helper::MakeWifiCredential(
+ ssid, wifi_sync::SECURITY_CLASS_PSK, "fake_passphrase");
+ ASSERT_TRUE(credential);
+
+ const size_t profile_a_index = 0;
+ wifi_credentials_helper::AddWifiCredential(
+ profile_a_index, "fake_id", *credential);
+
+ const WifiCredentialSet verifier_credentials =
+ wifi_credentials_helper::GetWifiCredentialsForProfile(verifier());
+ EXPECT_EQ(1U, verifier_credentials.size());
+ EXPECT_EQ(WifiCredential::MakeSsidBytesForTest(ssid),
+ verifier_credentials.begin()->ssid());
+
+ const size_t profile_b_index = 1;
+ ASSERT_TRUE(GetClient(profile_a_index)->AwaitMutualSyncCycleCompletion(
+ GetClient(profile_b_index)));
+ EXPECT_FALSE(wifi_credentials_helper::VerifierIsEmpty());
+ EXPECT_TRUE(wifi_credentials_helper::AllProfilesMatch());
+}

Powered by Google App Engine
This is Rietveld 408576698