Revise haltests

Change-Id: I99afd0a85c363575a7991b4ec5e8dad3a4673ba6
Signed-off-by: Jaehyun Kim <jeik01.kim@samsung.com>

diff --git a/haltests/CMakeLists.txt b/haltests/CMakeLists.txt
index 30b5be8..a78a169 100755 (executable)
--- a/haltests/CMakeLists.txt
+++ b/haltests/CMakeLists.txt
@@ -33,6 +33,6 @@ FOREACH(src ${sources})
     MESSAGE("${src_name}")
     ADD_EXECUTABLE(${src_name} ${src})
     TARGET_LINK_LIBRARIES(${src_name} ${GTEST_TEST_LDFLAGS} ${GTEST_TEST_PKG_LDFLAGS} -ldl -lgcov)
-    INSTALL(TARGETS ${src_name} RUNTIME DESTINATION ${BIN_DIR})
+    INSTALL(TARGETS ${src_name} RUNTIME DESTINATION ${BIN_DIR}/hal)
 ENDFOREACH()
 

diff --git a/haltests/haltests.h b/haltests/haltests.h
index f114a4f..3e3144f 100755 (executable)
--- a/haltests/haltests.h
+++ b/haltests/haltests.h
@@ -31,10 +31,11 @@ extern "C" {
 #define FEATURE_WIFIDIRECT "http://tizen.org/feature/network.wifi.direct"
 #define FEATURE_SOFTAP     "http://tizen.org/feature/network.wifi.softap"
 
-#define WIFI_ADDRESS_PATH    "/sys/class/net/wlan0/address"
-#define WIFI_P2P_PATH        "/sys/class/net/p2p0/address"
-#define WIFI_P2P_CONFIG_PATH "/etc/wifi-direct/wifi-direct-manager.conf"
-#define WFD_CONF_GROUP_NAME  "wfd-manager"
+#define WIFI_ADDRESS_PATH         "/sys/class/net/wlan0/address"
+#define WIFI_ADDRESS_PATH_PREFIX  "/sys/class/net/"
+#define WIFI_P2P_PATH             "/sys/class/net/p2p0/address"
+#define WIFI_P2P_CONFIG_PATH      "/etc/wifi-direct/wifi-direct-manager.conf"
+#define WFD_CONF_GROUP_NAME       "wfd-manager"
 
 GMainLoop *g_pMainLoop;
 guint g_nTimeoutId;

diff --git a/haltests/net-config-haltests.cpp b/haltests/wifi-haltests.cpp
similarity index 92%
rename from haltests/net-config-haltests.cpp
rename to haltests/wifi-haltests.cpp
index 6fa1c03..508fb76 100755 (executable)
--- a/haltests/net-config-haltests.cpp
+++ b/haltests/wifi-haltests.cpp
@@ -143,7 +143,7 @@ static bool __found_ap_callback(wifi_manager_ap_h ap, void *user_data)
        return true;
 }
 
-TEST(Hal_wifi, Init_p)
+TEST(WifiHaltest, WifiInit_p)
 {
        g_bFeatureWifi = __check_feature_supported((char*)FEATURE_WIFI);
        SKIP_NOT_SUPPORTED(g_bFeatureWifi);
@@ -152,12 +152,14 @@ TEST(Hal_wifi, Init_p)
        EXPECT_EQ(WIFI_MANAGER_ERROR_NONE, rv) << "Initialization failure";
 }
 
-TEST(Hal_wifi, Activate_p)
+TEST(WifiHaltest, WifiActivate_p)
 {
        SKIP_NOT_SUPPORTED(g_bFeatureWifi);
 
        int rv;
        bool activated;
+       char *ifname = NULL;
+       char path_buff[MAX_PATH_LENGTH];
 
        rv = wifi_manager_is_activated(wifi, &activated);
        ASSERT_EQ(WIFI_MANAGER_ERROR_NONE, rv) << "Failed to get Wi-Fi device state";
@@ -174,11 +176,17 @@ TEST(Hal_wifi, Activate_p)
        rst = WIFI_MANAGER_ERROR_NOT_SUPPORTED;
 
 done:
-       rv = access(WIFI_ADDRESS_PATH, F_OK);
+       rv = wifi_manager_get_network_interface_name(wifi, &ifname);
+       ASSERT_EQ(WIFI_MANAGER_ERROR_NONE, rv) << "Failed to get wifi interface name";
+
+       g_snprintf(path_buff, MAX_PATH_LENGTH, "/sys/class/net/%s/address", ifname);
+       g_free(ifname);
+
+       rv = access(path_buff, F_OK);
        EXPECT_EQ(0, rv) << "Could not access " << WIFI_ADDRESS_PATH;
 }
 
-TEST(Hal_wifi, Scan_p)
+TEST(WifiHaltest, WifiScan_p)
 {
        SKIP_NOT_SUPPORTED(g_bFeatureWifi);
 
@@ -191,7 +199,7 @@ TEST(Hal_wifi, Scan_p)
        rst = WIFI_MANAGER_ERROR_NOT_SUPPORTED;
 }
 
-TEST(Hal_wifi, Connect_p)
+TEST(WifiHaltest, WifiConnect_p)
 {
        SKIP_NOT_SUPPORTED(g_bFeatureWifi);
 
@@ -220,7 +228,7 @@ TEST(Hal_wifi, Connect_p)
        rst = WIFI_MANAGER_ERROR_NOT_SUPPORTED;
 }
 
-TEST(Hal_wifi, Disconnect_p)
+TEST(WifiHaltest, WifiDisconnect_p)
 {
        SKIP_NOT_SUPPORTED(g_bFeatureWifi);
 
@@ -244,7 +252,7 @@ TEST(Hal_wifi, Disconnect_p)
        EXPECT_EQ(WIFI_MANAGER_ERROR_NONE, ret) << "Failed to forget AP";
 }
 
-TEST(Hal_wifi, Deactivate_p)
+TEST(WifiHaltest, WifiDeactivate_p)
 {
        SKIP_NOT_SUPPORTED(g_bFeatureWifi);
 
@@ -257,7 +265,7 @@ TEST(Hal_wifi, Deactivate_p)
        rst = WIFI_MANAGER_ERROR_NOT_SUPPORTED;
 }
 
-TEST(Hal_wifi, Deinit_p)
+TEST(WifiHaltest, WifiDeinit_p)
 {
        SKIP_NOT_SUPPORTED(g_bFeatureWifi);
 
@@ -265,7 +273,7 @@ TEST(Hal_wifi, Deinit_p)
        EXPECT_EQ(WIFI_MANAGER_ERROR_NONE, rv) << "Deinitialization failure";
 }
 
-TEST(Hal_wifi_direct, Init_p)
+TEST(WifiHaltest, WifiDirectInit_p)
 {
        g_bFeatureP2P = __check_feature_supported((char*)FEATURE_WIFIDIRECT);
        SKIP_NOT_SUPPORTED(g_bFeatureP2P);
@@ -274,7 +282,7 @@ TEST(Hal_wifi_direct, Init_p)
        EXPECT_EQ(WIFI_DIRECT_ERROR_NONE, rv) << "Initialization failure";
 }
 
-TEST(Hal_wifi_direct, Activate_p)
+TEST(WifiHaltest, WifiDirectActivate_p)
 {
        SKIP_NOT_SUPPORTED(g_bFeatureP2P);
 
@@ -310,7 +318,7 @@ done:
        EXPECT_EQ(0, rv) << "Could not access " << WIFI_ADDRESS_PATH;
 }
 
-TEST(Hal_wifi_direct, Deactivate_p)
+TEST(WifiHaltest, WifiDirectDeactivate_p)
 {
        SKIP_NOT_SUPPORTED(g_bFeatureP2P);
 
@@ -334,7 +342,7 @@ TEST(Hal_wifi_direct, Deactivate_p)
        EXPECT_EQ(WIFI_DIRECT_ERROR_NONE, rv) << "Failed to unset activation callback";
 }
 
-TEST(Hal_wifi_direct, Deinit_p)
+TEST(WifiHaltest, WifiDirectDeinit_p)
 {
        SKIP_NOT_SUPPORTED(g_bFeatureP2P);
 
@@ -342,7 +350,7 @@ TEST(Hal_wifi_direct, Deinit_p)
        EXPECT_EQ(WIFI_DIRECT_ERROR_NONE, rv) << "Deinitialization failure";
 }
 
-TEST(Hal_softap, Init_p)
+TEST(WifiHaltest, SoftapInit_p)
 {
        g_bFeatureSoftap = __check_feature_supported((char*)FEATURE_SOFTAP);
        SKIP_NOT_SUPPORTED(g_bFeatureSoftap);
@@ -359,7 +367,7 @@ TEST(Hal_softap, Init_p)
        EXPECT_EQ(SOFTAP_ERROR_NONE, ret) << "Fail to set disabled callback!!";
 }
 
-TEST(Hal_softap, Activate_p)
+TEST(WifiHaltest, SoftapActivate_p)
 {
        SKIP_NOT_SUPPORTED(g_bFeatureSoftap);
 
@@ -385,7 +393,7 @@ done:
        EXPECT_EQ(0, ret) << "Could not access " << WIFI_ADDRESS_PATH;
 }
 
-TEST(Hal_softap, Deactivate_p)
+TEST(WifiHaltest, SoftapDeactivate_p)
 {
        SKIP_NOT_SUPPORTED(g_bFeatureSoftap);
 
@@ -399,7 +407,7 @@ TEST(Hal_softap, Deactivate_p)
        EXPECT_EQ(SOFTAP_ERROR_NONE, g_error) << "Failed to disable SoftAP" << g_code;
 }
 
-TEST(Hal_softap, Deinit_p)
+TEST(WifiHaltest, SoftapDeinit_p)
 {
        SKIP_NOT_SUPPORTED(g_bFeatureSoftap);
 

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index 3b966e2..4f8059e 100755 (executable)
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -1,7 +1,7 @@
 Name:          net-config
 Summary:       TIZEN Network Configuration service
-Version:       1.2.7
-Release:       4
+Version:       1.2.8
+Release:       1
 Group:         System/Network
 License:       Apache-2.0
 Source0:       %{name}-%{version}.tar.gz
@@ -252,5 +252,5 @@ mv net-config.wearable net-config
 
 %files haltests
 %manifest net-config.manifest
-%{_bindir}/*haltests
+%{_bindir}/hal/*haltests