### netd unit tests.
###
include $(CLEAR_VARS)
-LOCAL_MODULE := FirewallControllerTest
+LOCAL_MODULE := netd_unit_test
LOCAL_CFLAGS := -Wall -Werror -Wunused-parameter
LOCAL_C_INCLUDES := system/netd/server
-LOCAL_SRC_FILES := FirewallControllerTest.cpp FirewallController.cpp
+LOCAL_SRC_FILES := FirewallControllerTest.cpp FirewallController.cpp SockDiagTest.cpp SockDiag.cpp
LOCAL_MODULE_TAGS := tests
LOCAL_SHARED_LIBRARIES := liblog libbase
include $(BUILD_NATIVE_TEST)
-# Unit tests for SockDiag.cpp.
-include $(CLEAR_VARS)
-LOCAL_MODULE := SockDiagTest
-LOCAL_CFLAGS := -Wall -Werror -Wunused-parameter
-LOCAL_C_INCLUDES := system/netd/server
-LOCAL_SRC_FILES := SockDiagTest.cpp SockDiag.cpp
-LOCAL_MODULE_TAGS := tests
-LOCAL_SHARED_LIBRARIES := liblog
-include $(BUILD_NATIVE_TEST)
TEST_F(SockDiagTest, TestDump) {
int v4socket = socket(AF_INET, SOCK_STREAM, 0);
+ ASSERT_NE(-1, v4socket) << "Failed to open IPv4 socket: " << strerror(errno);
int v6socket = socket(AF_INET6, SOCK_STREAM, 0);
+ ASSERT_NE(-1, v6socket) << "Failed to open IPv6 socket: " << strerror(errno);
int listensocket = socket(AF_INET6, SOCK_STREAM, 0);
- ASSERT_NE(-1, v4socket) << "Failed to open IPv4 socket";
- ASSERT_NE(-1, v6socket) << "Failed to open IPv6 socket";
- ASSERT_NE(-1, listensocket) << "Failed to open listen socket";
+ ASSERT_NE(-1, listensocket) << "Failed to open listen socket: " << strerror(errno);
uint16_t port = bindAndListen(listensocket);
ASSERT_NE(0, port) << "Can't bind to server port";
#
LOCAL_PATH := $(call my-dir)
-# DNS responder tests.
+# APCT build target
include $(CLEAR_VARS)
-LOCAL_MODULE := netd_test
+LOCAL_MODULE := netd_integration_test
+LOCAL_CFLAGS := -Wall -Werror -Wunused-parameter
EXTRA_LDLIBS := -lpthread
-LOCAL_SHARED_LIBRARIES += libcutils libutils liblog libnetd_client
+LOCAL_SHARED_LIBRARIES += libbase libbinder libcutils liblog liblogwrap libnetdaidl libnetd_client \
+ libutils
LOCAL_STATIC_LIBRARIES += libtestUtil
-LOCAL_C_INCLUDES += system/netd/include system/extras/tests/include
-LOCAL_SRC_FILES := netd_test.cpp dns_responder.cpp
+LOCAL_AIDL_INCLUDES := system/netd/server/binder
+LOCAL_C_INCLUDES += system/netd/include system/extras/tests/include system/netd/binder/include \
+ system/netd/server system/core/logwrapper/include
+LOCAL_SRC_FILES := netd_test.cpp dns_responder.cpp binder_test.cpp ../server/NetdConstants.cpp
LOCAL_MODULE_TAGS := eng tests
include $(BUILD_NATIVE_TEST)
-# netd binder interface tests.
-include $(CLEAR_VARS)
-LOCAL_MODULE := netd_binder_test
-LOCAL_SHARED_LIBRARIES += libbase libbinder liblogwrap libutils libnetdaidl
-LOCAL_C_INCLUDES += system/netd/include system/netd/binder/include system/netd/server system/core/logwrapper/include
-LOCAL_AIDL_INCLUDES := system/netd/server/binder
-LOCAL_SRC_FILES := binder_test.cpp ../server/NetdConstants.cpp
-LOCAL_MODULE_TAGS := tests
-include $(BUILD_NATIVE_TEST)
++found;
}
}
- EXPECT_EQ(1, found);
+ EXPECT_EQ(1U, found);
ASSERT_FALSE(result == nullptr);
ASSERT_EQ(4, result->h_length);
ASSERT_FALSE(result->h_addr_list[0] == nullptr);
++found;
}
}
- EXPECT_LE(1, found);
+ EXPECT_LE(1U, found);
// Could be A or AAAA
std::string result_str = ToString(result);
EXPECT_TRUE(result_str == "1.2.3.4" || result_str == "::1.2.3.4");
++found;
}
}
- EXPECT_LE(1, found);
+ EXPECT_LE(1U, found);
// Could be A or AAAA
result_str = ToString(result);
EXPECT_TRUE(result_str == "1.2.3.44" || result_str == "::1.2.3.44");
++found;
}
}
- EXPECT_LE(1, found);
+ EXPECT_LE(1U, found);
EXPECT_EQ("1.2.3.5", ToString(result));
if (result) freeaddrinfo(result);
}