NetworkState cleanup, pass properties to InitialPropertiesReceived

chromeos/network/network_state_unittest.cc

Index: chromeos/network/network_state_unittest.cc
diff --git a/chromeos/network/network_state_unittest.cc b/chromeos/network/network_state_unittest.cc
index 0ccdd198dbd1f0c7f944bf282109e68ee9d3490d..3eb8d5f5695b1817d4168efac35fc0dab3c412a8 100644
--- a/chromeos/network/network_state_unittest.cc
+++ b/chromeos/network/network_state_unittest.cc
@@ -15,38 +15,6 @@ namespace chromeos {
 
 namespace {
 
-class TestStringValue : public base::Value {

[pneubeck (no reviews), 2013/07/30 09:42:53]

As I guessed, this was for utf8 errors testing. Now
NetworkStateTest.SsidTruncateInvalid in debug is broken. Although I don't see
the sense in this test as the DBus interface would have to create invalid
base::Values and that shouldn't be handled in NetworkState.

- public:
-  explicit TestStringValue(const std::string& in_value)
-      : base::Value(TYPE_STRING),
-        value_(in_value) {
-  }
-
-  virtual ~TestStringValue() {
-  }
-
-  // Overridden from Value:
-  virtual bool GetAsString(std::string* out_value) const OVERRIDE {
-    if (out_value)
-      *out_value = value_;
-    return true;
-  }
-
-  virtual TestStringValue* DeepCopy() const OVERRIDE {
-    return new TestStringValue(value_);
-  }
-
-  virtual bool Equals(const Value* other) const OVERRIDE {
-    if (other->GetType() != GetType())
-      return false;
-    std::string lhs, rhs;
-    return GetAsString(&lhs) && other->GetAsString(&rhs) && lhs == rhs;
-  }
-
- private:
-  std::string value_;
-};
-
 class NetworkStateTest : public testing::Test {
  public:
   NetworkStateTest() : network_state_("test_path") {
@@ -54,15 +22,20 @@ class NetworkStateTest : public testing::Test {
 
  protected:
   bool SetStringProperty(const std::string& key, const std::string& value) {
-    if (!network_state_.PropertyChanged(key, TestStringValue(value)))
-      return false;
-    network_state_.InitialPropertiesReceived();
-    return true;
+    bool res = network_state_.PropertyChanged(key, StringValue(value));
+    properties_.SetStringWithoutPathExpansion(key, value);
+    return res;
+  }
+
+  bool SignalInitialPropertiesReceived() {
+    return network_state_.InitialPropertiesReceived(properties_);
   }
 
   NetworkState network_state_;
 
  private:
+  base::DictionaryValue properties_;
+
   DISALLOW_COPY_AND_ASSIGN(NetworkStateTest);
 };
 
@@ -97,6 +70,7 @@ TEST_F(NetworkStateTest, SsidTruncateInvalid) {
   std::string wifi_setname2 = "SSID TEST \x01\xff!";
   std::string wifi_setname2_result = "SSID TEST \xEF\xBF\xBD\xEF\xBF\xBD!";
   EXPECT_TRUE(SetStringProperty(flimflam::kNameProperty, wifi_setname2));
+  EXPECT_TRUE(SignalInitialPropertiesReceived());
   EXPECT_EQ(network_state_.name(), wifi_setname2_result);
 }
 
@@ -106,7 +80,8 @@ TEST_F(NetworkStateTest, SsidLatin) {
   std::string wifi_latin1_hex =
       base::HexEncode(wifi_latin1.c_str(), wifi_latin1.length());
   std::string wifi_latin1_result = "latin-1 \u00c0\u00cb\u00cc\u00d6\u00fb";
-  EXPECT_TRUE(SetStringProperty(flimflam::kWifiHexSsid, wifi_latin1_hex));
+  EXPECT_FALSE(SetStringProperty(flimflam::kWifiHexSsid, wifi_latin1_hex));
+  EXPECT_TRUE(SignalInitialPropertiesReceived());
   EXPECT_EQ(network_state_.name(), wifi_latin1_result);
 }
 
@@ -114,7 +89,8 @@ TEST_F(NetworkStateTest, SsidLatin) {
 TEST_F(NetworkStateTest, SsidHex) {
   std::string wifi_hex = "5468697320697320484558205353494421";
   std::string wifi_hex_result = "This is HEX SSID!";
-  SetStringProperty(flimflam::kWifiHexSsid, wifi_hex);
+  EXPECT_FALSE(SetStringProperty(flimflam::kWifiHexSsid, wifi_hex));
+  EXPECT_TRUE(SignalInitialPropertiesReceived());
   EXPECT_EQ(network_state_.name(), wifi_hex_result);
 }