Update unittest expectations for Android

We're using different user/group and file path on Android, so update
these expectations in unittest for Android.

While there, rename apmanager_unittest to apmanager_test, which seems
to be the convention for unittest target name on Android.

Bug: 24707201
TEST=Run unittest on dragonboard
TEST=Run unittest for Chrome OS

Change-Id: Ibd6880a713117578b68c814edc7e1cefe9170c75

5 files changed, 27 insertions, 6 deletions

diff --git a/Android.mk b/Android.mk
index c84dd5f..dc8c107 100644
--- a/Android.mk
+++ b/Android.mk
@@ -95,9 +95,12 @@ LOCAL_C_INCLUDES += external/gtest/include
 $(eval $(apmanager_common))
 include $(BUILD_EXECUTABLE)
 
-# === unittest ===
+# === apmanager_test ===
 include $(CLEAR_VARS)
-LOCAL_MODULE := apmanager_unittest
+LOCAL_MODULE := apmanager_test
+ifdef BRILLO
+  LOCAL_MODULE_TAGS := debug
+endif # BRILLO
 LOCAL_SRC_FILES := \
     config_unittest.cc \
     device_info_unittest.cc \
diff --git a/config_unittest.cc b/config_unittest.cc
index bb25c54..6c98d41 100644
--- a/config_unittest.cc
+++ b/config_unittest.cc
@@ -76,7 +76,11 @@ const char kExpected80211gCtrlIfaceConfigContent[] =
     "interface=uap0\n"
     "hw_mode=g\n"
     "ctrl_interface=/var/run/apmanager/hostapd/ctrl_iface\n"
+#if !defined(__ANDROID__)
     "ctrl_interface_group=apmanager\n"
+#else
+    "ctrl_interface_group=system\n"
+#endif  // __ANDROID__
     "driver=nl80211\n"
     "fragm_threshold=2346\n"
     "rts_threshold=2347\n";
diff --git a/dhcp_server.cc b/dhcp_server.cc
index 5531f0d..ab7b634 100644
--- a/dhcp_server.cc
+++ b/dhcp_server.cc
@@ -138,12 +138,12 @@ string DHCPServer::GenerateConfigFile() {
   // terminated. Configure dnsmasq to run in "foreground" so no extra process
   // will be spawned.
   config += "keep-in-foreground\n";
-  // Explicitly set the user to apmanager. If not set, dnsmasq will default to
-  // run as "nobody".
-  base::StringAppendF(&config, "user=%s\n", Daemon::kAPManagerUserName);
   base::StringAppendF(
       &config, "dhcp-range=%s,%s\n", address_low.c_str(), address_high.c_str());
   base::StringAppendF(&config, "interface=%s\n", interface_name_.c_str());
+  // Explicitly set the user to apmanager. If not set, dnsmasq will default to
+  // run as "nobody".
+  base::StringAppendF(&config, "user=%s\n", Daemon::kAPManagerUserName);
   base::StringAppendF(&config, "dhcp-leasefile=%s\n", lease_file_path.c_str());
   return config;
 }
diff --git a/dhcp_server_unittest.cc b/dhcp_server_unittest.cc
index c647de0..5829d8a 100644
--- a/dhcp_server_unittest.cc
+++ b/dhcp_server_unittest.cc
@@ -45,12 +45,22 @@ namespace {
       "bind-interfaces\n"
       "log-dhcp\n"
       "keep-in-foreground\n"
-      "user=apmanager\n"
       "dhcp-range=192.168.1.1,192.168.1.128\n"
       "interface=test_interface\n"
+#if !defined(__ANDROID__)
+      "user=apmanager\n"
       "dhcp-leasefile=/var/run/apmanager/dnsmasq/dhcpd-1.leases\n";
+#else
+      "user=system\n"
+      "dhcp-leasefile=/data/misc/apmanager/dnsmasq/dhcpd-1.leases\n";
+#endif  // __ANDROID__
+
   const char kDnsmasqConfigFilePath[] =
+#if !defined(__ANDROID__)
       "/var/run/apmanager/dnsmasq/dhcpd-1.conf";
+#else
+      "/data/misc/apmanager/dnsmasq/dhcpd-1.conf";
+#endif  // __ANDROID__
 }  // namespace
 
 namespace apmanager {
diff --git a/service_unittest.cc b/service_unittest.cc
index db13d80..509b9a0 100644
--- a/service_unittest.cc
+++ b/service_unittest.cc
@@ -49,7 +49,11 @@ namespace {
   const char kHostapdConfig[] = "ssid=test\n";
   const char kBinSleep[] = "/bin/sleep";
   const char kHostapdConfigFilePath[] =
+#if !defined(__ANDROID__)
       "/var/run/apmanager/hostapd/hostapd-1.conf";
+#else
+      "/data/misc/apmanager/hostapd/hostapd-1.conf";
+#endif  // __ANDROID__
 }  // namespace
 
 namespace apmanager {