Add a test for IdleTimerController.
Bug: 28362720
Test: bullhead builds,boots
Test: netd_{unit,integration}_test pass
Change-Id: I0e3c2462676969b26a4cbee7aa6552078fde90f5
diff --git a/server/Android.mk b/server/Android.mk
index d924c84..c902e9e 100644
--- a/server/Android.mk
+++ b/server/Android.mk
@@ -167,7 +167,7 @@
IptablesRestoreController.cpp IptablesRestoreControllerTest.cpp \
BandwidthController.cpp BandwidthControllerTest.cpp \
FirewallControllerTest.cpp FirewallController.cpp \
- IdletimerController.cpp \
+ IdletimerController.cpp IdletimerControllerTest.cpp \
NatControllerTest.cpp NatController.cpp \
NetlinkCommands.cpp NetlinkManager.cpp \
RouteController.cpp RouteControllerTest.cpp \
diff --git a/server/IdletimerController.cpp b/server/IdletimerController.cpp
index e6306fd..224dec6 100644
--- a/server/IdletimerController.cpp
+++ b/server/IdletimerController.cpp
@@ -95,6 +95,7 @@
#define LOG_NDEBUG 0
+#include <stdint.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/socket.h>
@@ -116,6 +117,8 @@
const char* IdletimerController::LOCAL_RAW_PREROUTING = "idletimer_raw_PREROUTING";
const char* IdletimerController::LOCAL_MANGLE_POSTROUTING = "idletimer_mangle_POSTROUTING";
+auto IdletimerController::execFunction = android_fork_execvp;
+
IdletimerController::IdletimerController() {
}
@@ -127,11 +130,11 @@
// Running for IPv4
argv[0] = IPTABLES_PATH;
- resIpv4 = android_fork_execvp(argc, (char **)argv, NULL, false, false);
+ resIpv4 = execFunction(argc, (char **)argv, NULL, false, false);
// Running for IPv6
argv[0] = IP6TABLES_PATH;
- resIpv6 = android_fork_execvp(argc, (char **)argv, NULL, false, false);
+ resIpv6 = execFunction(argc, (char **)argv, NULL, false, false);
#if !LOG_NDEBUG
std::string full_cmd = argv[0];
diff --git a/server/IdletimerController.h b/server/IdletimerController.h
index 98a312e..33abdb6 100644
--- a/server/IdletimerController.h
+++ b/server/IdletimerController.h
@@ -16,6 +16,8 @@
#ifndef _IDLETIMER_CONTROLLER_H
#define _IDLETIMER_CONTROLLER_H
+#include <stdint.h>
+
class IdletimerController {
public:
@@ -39,6 +41,9 @@
int runIpxtablesCmd(int argc, const char **cmd);
int modifyInterfaceIdletimer(IptOp op, const char *iface, uint32_t timeout,
const char *classLabel);
+
+ friend class IdletimerControllerTest;
+ static int (*execFunction)(int, char **, int *, bool, bool);
};
#endif
diff --git a/server/IdletimerControllerTest.cpp b/server/IdletimerControllerTest.cpp
new file mode 100644
index 0000000..51f19e3
--- /dev/null
+++ b/server/IdletimerControllerTest.cpp
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * IdletimerControllerTest.cpp - unit tests for IdletimerController.cpp
+ */
+
+#include <gtest/gtest.h>
+
+#include <android-base/strings.h>
+#include <android-base/stringprintf.h>
+
+#include "IdletimerController.h"
+#include "IptablesBaseTest.h"
+
+using android::base::StringPrintf;
+
+class IdletimerControllerTest : public IptablesBaseTest {
+protected:
+ IdletimerControllerTest() {
+ IdletimerController::execFunction = fake_android_fork_exec;
+ }
+ IdletimerController mIt;
+};
+
+TEST_F(IdletimerControllerTest, TestSetupIptablesHooks) {
+ mIt.setupIptablesHooks();
+ expectIptablesCommands(ExpectedIptablesCommands{});
+ expectIptablesRestoreCommands(ExpectedIptablesCommands{});
+}
+
+TEST_F(IdletimerControllerTest, TestEnableDisable) {
+ std::vector<std::string> expected = {
+ "-t raw -F idletimer_raw_PREROUTING",
+ "-t mangle -F idletimer_mangle_POSTROUTING",
+ };
+
+ mIt.enableIdletimerControl();
+ expectIptablesCommands(expected);
+
+ mIt.enableIdletimerControl();
+ expectIptablesCommands(expected);
+
+ mIt.disableIdletimerControl();
+ expectIptablesCommands(expected);
+
+ mIt.disableIdletimerControl();
+ expectIptablesCommands(expected);
+}
+
+const std::vector<std::string> makeAddRemoveCommands(bool add) {
+ const char *op = add ? "-A" : "-D";
+ return {
+ StringPrintf("-t raw %s idletimer_raw_PREROUTING -i wlan0 -j IDLETIMER"
+ " --timeout 12345 --label hello --send_nl_msg 1", op),
+ StringPrintf("-t mangle %s idletimer_mangle_POSTROUTING -o wlan0 -j IDLETIMER"
+ " --timeout 12345 --label hello --send_nl_msg 1", op),
+ };
+}
+
+TEST_F(IdletimerControllerTest, TestAddRemove) {
+ auto expected = makeAddRemoveCommands(true);
+ mIt.addInterfaceIdletimer("wlan0", 12345, "hello");
+ expectIptablesCommands(expected);
+
+ mIt.addInterfaceIdletimer("wlan0", 12345, "hello");
+ expectIptablesCommands(expected);
+
+ expected = makeAddRemoveCommands(false);
+ mIt.removeInterfaceIdletimer("wlan0", 12345, "hello");
+ expectIptablesCommands(expected);
+
+ mIt.removeInterfaceIdletimer("wlan0", 12345, "hello");
+ expectIptablesCommands(expected);
+}