Remove HAL TC 47/187147/1 accepted/tizen/unified/20180821.091016 submit/tizen/20180820.085416 submit/tizen/20180820.100957 submit/tizen/20180821.043148
authorsaerome.kim <saerome.kim@samsung.com>
Mon, 20 Aug 2018 08:23:27 +0000 (17:23 +0900)
committersaerome.kim <saerome.kim@samsung.com>
Mon, 20 Aug 2018 08:23:27 +0000 (17:23 +0900)
We added HAL TC package to nfc-manager instead of CAPI.
So we remove HAL TC package.

Change-Id: I5a6971c8f57a3b22450ad8f96c5e026c81c0e33b
Signed-off-by: saerome.kim <saerome.kim@samsung.com>
CMakeLists.txt
haltest/CMakeLists.txt [deleted file]
haltest/capi-network-nfc-haltests.cpp [deleted file]
haltest/unittest.h [deleted file]
packaging/capi-network-nfc.spec

index 8650303..36b7ac2 100644 (file)
@@ -92,7 +92,6 @@ CONFIGURE_FILE(
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIBDIR}/pkgconfig)
 
 ADD_SUBDIRECTORY(test)
-ADD_SUBDIRECTORY(haltest)
 
 IF(UNIX)
 
diff --git a/haltest/CMakeLists.txt b/haltest/CMakeLists.txt
deleted file mode 100644 (file)
index 6a3553e..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(gtest-nfc-manager C CXX)
-
-SET(GTEST_TEST "gtest-nfc-manager")
-ADD_DEFINITIONS("-DUSE_DLOG")
-
-SET(dependents "glib-2.0 gio-2.0 gmock dlog capi-system-info")
-
-INCLUDE(FindPkgConfig)
-PKG_CHECK_MODULES(GTEST_TEST_PKG REQUIRED ${dependents})
-
-FOREACH(flag ${GTEST_TEST_PKG_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -Wall -fPIE")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS}")
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
-
-aux_source_directory(. sources)
-FOREACH(src ${sources})
-    GET_FILENAME_COMPONENT(src_name ${src} NAME_WE)
-    MESSAGE("${src_name}")
-    ADD_EXECUTABLE(${src_name} ${src})
-    TARGET_LINK_LIBRARIES(${src_name} ${fw_name} ${${fw_test}_LDFLAGS} ${GTEST_TEST_PKG_LDFLAGS})
-    INSTALL(TARGETS ${src_name} RUNTIME DESTINATION bin)
-ENDFOREACH()
-
diff --git a/haltest/capi-network-nfc-haltests.cpp b/haltest/capi-network-nfc-haltests.cpp
deleted file mode 100644 (file)
index 15595e7..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * 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.
- */
-
-#include <iostream>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-#include <nfc.h>
-#include <system_info.h>
-#include "unittest.h"
-
-using ::testing::InitGoogleTest;
-using ::testing::Test;
-using ::testing::TestCase;
-
-void __activated(bool activated, void *user_data) {
-       std::cout<< (activated ? "activated" : "deactivated") << std::endl;
-}
-
-static bool __check_feature_supported(char *key)
-{
-       bool value = false;
-       int ret = system_info_get_platform_bool(key, &value);
-
-       EXPECT_EQ(SYSTEM_INFO_ERROR_NONE, ret) << "system_info_get_platform_bool failed";
-       EXPECT_EQ(true, value) << key << " feature is not supported";
-
-       return value;
-}
-
-/*
-@testcase      Init_p
-@since_tizen   5.0
-@author                SRID(abhishek.s94)
-@reviewer      HQ(jh8801.jung)
-@type          auto
-@description   Positive, Initialize NFC manager
-@apicovered    nfc_manager_initialize
-@passcase      when nfc_manager_initialize returns NFC_ERROR_NONE
-@failcase      when nfc_manager_initialize does not return NFC_ERROR_NONE
-@precondition  __check_feature_supported must return true for nfc feature
-@postcondition None
-*/
-TEST(Hal_nfc, Init_p)
-{
-       g_bFeatureNfc = __check_feature_supported((char*)FEATURE_NFC);
-       ASSERT_EQ(true, g_bFeatureNfc) << FEATURE_NFC << " feature is not supported";
-
-       nfc_manager_set_activation_changed_cb(__activated, NULL);
-       int rv = nfc_manager_initialize();
-       EXPECT_EQ(NFC_ERROR_NONE, rv) << "Initialization failure";
-
-}
-
-/*
-@testcase      Set_Activation_true_p
-@since_tizen   5.0
-@author                SRID(abhishek.s94)
-@reviewer      HQ(jh8801.jung)
-@type          auto
-@description   Positive, Activate NFC manager
-@apicovered    nfc_manager_set_activation
-@passcase      when nfc_manager_set_activation returns NFC_ERROR_NONE or NFC_ERROR_ALREADY_ACTIVATED
-@failcase      when nfc_manager_set_activation does not return NFC_ERROR_NONE or NFC_ERROR_ALREADY_ACTIVATED
-@precondition  __check_feature_supported must return true for nfc feature
-@postcondition None
-*/
-TEST(Hal_nfc, Set_Activation_true_p)
-{
-       g_bFeatureNfc = __check_feature_supported((char*)FEATURE_NFC);
-       ASSERT_EQ(true, g_bFeatureNfc) << FEATURE_NFC << " feature is not supported";
-
-       int rv = nfc_manager_set_activation(true, NULL, NULL);
-       sleep(5);
-       EXPECT_EQ(rv == NFC_ERROR_NONE || rv == NFC_ERROR_ALREADY_ACTIVATED, true)
-               << "Activation failure";
-}
-
-/*
-@testcase      Set_Activation_false_p
-@since_tizen   5.0
-@author                SRID(abhishek.s94)
-@reviewer      HQ(jh8801.jung)
-@type          auto
-@description   Positive, Deactivate NFC manager
-@apicovered    nfc_manager_set_activation
-@passcase      when nfc_manager_set_activation returns NFC_ERROR_NONE
-@failcase      when nfc_manager_set_activation does not return NFC_ERROR_NONE
-@precondition  __check_feature_supported must return true for nfc feature
-@postcondition None
-*/
-TEST(Hal_nfc, Set_Activation_false_p)
-{
-       g_bFeatureNfc = __check_feature_supported((char*)FEATURE_NFC);
-       ASSERT_EQ(true, g_bFeatureNfc) << FEATURE_NFC << " feature is not supported";
-
-       int rv = nfc_manager_set_activation(false, NULL, NULL);
-       EXPECT_EQ(NFC_ERROR_NONE, rv) << "Deactivation failure";
-}
-
-/*
-@testcase      Deinit_p
-@since_tizen   5.0
-@author                SRID(abhishek.s94)
-@reviewer      HQ(jh8801.jung)
-@type          auto
-@description   Positive, Deinitialize NFC manager
-@apicovered    nfc_manager_deinitialize
-@passcase      when nfc_manager_deinitialize returns NFC_ERROR_NONE
-@failcase      when nfc_manager_deinitialize does not return NFC_ERROR_NONE
-@precondition  __check_feature_supported must return true for nfc feature
-@postcondition None
-*/
-TEST(Hal_nfc, Deinit_p)
-{
-       g_bFeatureNfc = __check_feature_supported((char*)FEATURE_NFC);
-       ASSERT_EQ(true, g_bFeatureNfc) << FEATURE_NFC << " feature is not supported";
-
-       int rv = nfc_manager_deinitialize();
-       EXPECT_EQ(NFC_ERROR_NONE, rv) << "De-initialization failure";
-}
-
-int main(int argc, char **argv)
-{
-       int ret = 0;
-       try {
-               testing::InitGoogleTest(&argc, argv);
-       } catch (const ::testing::internal::GoogleTestFailureException& ex) {
-               std::cerr << "Caught: GoogleTestFailureException& " << ex.what() << std::endl;
-       } catch (...) {
-               std::cerr << "Caught: unknown exception" << std::endl;
-       }
-
-       try {
-               ret = RUN_ALL_TESTS();
-       } catch (const ::testing::internal::GoogleTestFailureException& ex) {
-               std::cerr << "Caught: GoogleTestFailureException& " << ex.what() << std::endl;
-       } catch (...) {
-               std::cerr << "Caught: unknown exception" << std::endl;
-       }
-       return ret;
-}
diff --git a/haltest/unittest.h b/haltest/unittest.h
deleted file mode 100644 (file)
index f93a99d..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * 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.
- */
-#ifndef __NFC_MANAGER_H__
-#define __NFC_MANAGER_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define FEATURE_NFC       "http://tizen.org/feature/network.nfc"
-#define FEATURE_NFC_TAG   "http://tizen.org/feature/network.nfc.tag"
-
-bool g_bFeatureNfc;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NFC_MANAGER_H__ */
index 5c59ba0..f8cfb6e 100644 (file)
@@ -22,14 +22,6 @@ Requires(postun): /sbin/ldconfig
 %description
 A library for Tizen NFC Native API.
 
-%package haltests
-Summary:        nfc-manager extension for HAL test
-BuildRequires: pkgconfig(gmock)
-BuildRequires: pkgconfig(capi-system-info)
-Requires:       %{name} = %{version}-%{release}
-%description haltests
-TIZEN nfc-manager extension for HAL test.
-
 %package devel
 Summary:  A NFC library in Native API (Development)
 Group:    Network & Connectivity/Development
@@ -79,6 +71,3 @@ rm -rf %{buildroot}
 %{_libdir}/libcapi-network-nfc.so
 %{_bindir}/nfc_unit_test
 
-%files haltests
-%manifest %{name}.manifest
-%{_bindir}/*haltests