commit c9638618731aef83f38194c99aa1a7c7b8dcfa05
author Ben Chan <benchan@chromium.org> Thu Sep 13 16:20:46 2012 -0700
committer Gerrit <chrome-bot@google.com> Thu Sep 13 19:40:49 2012 -0700
tree b08150bbd7708811dc370266e8b43bdee3008f16
parent 539c423105d5ee8f8c40b9025265f6d5c0386381

shill: Make KeyFileStoreTest compatible with glib 2.30 and 2.32

BUG=chromium-os:34103
TEST=Unit tests pass with glib 2.30.2 and 2.32.4

Change-Id: I845c87d66869c0b1883a580f6efd28e479d0fad3
Reviewed-on: https://gerrit.chromium.org/gerrit/33240
Commit-Ready: Ben Chan <benchan@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>

key_file_store_unittest.cc

diff --git a/key_file_store_unittest.cc b/key_file_store_unittest.cc
index bd0c166..77edb26 100644
--- a/key_file_store_unittest.cc
+++ b/key_file_store_unittest.cc
@@ -17,6 +17,13 @@
 using std::vector;
 using testing::Test;
 
+// TODO(benchan): Remove this workaround after finishing glib 2.32 migration.
+#ifdef GLIB_VERSION_2_32
+#define KEY_FILE_EXTRA_NEW_LINE
+#else
+#define KEY_FILE_EXTRA_NEW_LINE "\n"
+#endif
+
 namespace shill {
 
 namespace {
@@ -194,7 +201,7 @@
   EXPECT_TRUE(store_.DeleteKey(kGroup, "random-key"));
   EXPECT_FALSE(store_.DeleteKey("random-group", kKeyAlive));
   ASSERT_TRUE(store_.Close());
-  EXPECT_EQ(base::StringPrintf("\n"
+  EXPECT_EQ(base::StringPrintf(KEY_FILE_EXTRA_NEW_LINE
                                "[%s]\n"
                                "%s=%d\n",
                                kGroup, kKeyAlive, kValueAlive),
@@ -214,7 +221,7 @@
   EXPECT_TRUE(store_.DeleteGroup(kGroupB));
   EXPECT_TRUE(store_.DeleteGroup("group-d"));
   ASSERT_TRUE(store_.Close());
-  EXPECT_EQ(base::StringPrintf("\n"
+  EXPECT_EQ(base::StringPrintf(KEY_FILE_EXTRA_NEW_LINE
                                "[%s]\n"
                                "\n"
                                "[%s]\n",
@@ -249,7 +256,7 @@
   ASSERT_TRUE(store_.SetString(kGroup, kKey1, kValue1));
   ASSERT_TRUE(store_.SetString(kGroup, kKey2, kValue2));
   ASSERT_TRUE(store_.Close());
-  EXPECT_EQ(base::StringPrintf("\n"
+  EXPECT_EQ(base::StringPrintf(KEY_FILE_EXTRA_NEW_LINE
                                "[%s]\n"
                                "%s=%s\n"
                                "%s=%s\n",
@@ -296,7 +303,7 @@
   ASSERT_TRUE(store_.SetBool(kGroup, kKeyTrue, true));
   ASSERT_TRUE(store_.SetBool(kGroup, kKeyFalse, false));
   ASSERT_TRUE(store_.Close());
-  EXPECT_EQ(base::StringPrintf("\n"
+  EXPECT_EQ(base::StringPrintf(KEY_FILE_EXTRA_NEW_LINE
                                "[%s]\n"
                                "%s=true\n"
                                "%s=false\n",
@@ -351,7 +358,7 @@
   ASSERT_TRUE(store_.SetInt(kGroup, kKey1, kValue1));
   ASSERT_TRUE(store_.SetInt(kGroup, kKey2, kValue2));
   ASSERT_TRUE(store_.Close());
-  EXPECT_EQ(base::StringPrintf("\n"
+  EXPECT_EQ(base::StringPrintf(KEY_FILE_EXTRA_NEW_LINE
                                "[%s]\n"
                                "%s=%d\n"
                                "%s=%d\n",
@@ -398,7 +405,7 @@
   ASSERT_TRUE(store_.Open());
   ASSERT_TRUE(store_.SetUint64(kGroup, kKey, kValue));
   ASSERT_TRUE(store_.Close());
-  EXPECT_EQ(base::StringPrintf("\n"
+  EXPECT_EQ(base::StringPrintf(KEY_FILE_EXTRA_NEW_LINE
                                "[%s]\n"
                                "%s=%s\n",
                                kGroup, kKey,
@@ -505,7 +512,7 @@
     ASSERT_TRUE(store_.SetStringList(kGroup, kKeyValues, value));
   }
   ASSERT_TRUE(store_.Close());
-  EXPECT_EQ(base::StringPrintf("\n"
+  EXPECT_EQ(base::StringPrintf(KEY_FILE_EXTRA_NEW_LINE
                                "[%s]\n"
                                "%s=\n"
                                "%s=;%s;\n"
@@ -543,7 +550,7 @@
   ASSERT_TRUE(store_.Open());
   ASSERT_TRUE(store_.SetCryptedString(kGroup, kKey, kPlainText));
   ASSERT_TRUE(store_.Close());
-  EXPECT_EQ(base::StringPrintf("\n"
+  EXPECT_EQ(base::StringPrintf(KEY_FILE_EXTRA_NEW_LINE
                                "[%s]\n"
                                "%s=%s\n",
                                kGroup, kKey, kROT47Text),
@@ -763,7 +770,7 @@
   }
 
   ASSERT_TRUE(store_.Close());
-  EXPECT_EQ(base::StringPrintf("\n"
+  EXPECT_EQ(base::StringPrintf(KEY_FILE_EXTRA_NEW_LINE
                                "[%s]\n"
                                "%s=%s;\n"
                                "%s=%d\n"