diff options
| author | Herasym Oleh <oolleehh@gmail.com> | 2016-06-02 17:46:47 +0300 |
|---|---|---|
| committer | Herasym <OHerasym@kiev.luxoft.com> | 2016-06-03 15:38:16 +0300 |
| commit | 1e165f22ecea5d4a793403eb8ac4644b01877b4e (patch) | |
| tree | f6fcac8adbc8a4983853003f8f1fef1821c6972b | |
| parent | b9d4e7ccdf8914cf5670c0543c800e57795ad3e2 (diff) | |
| download | sdl_core-1e165f22ecea5d4a793403eb8ac4644b01877b4e.tar.gz | |
Enable transport_manager tests after thread qt fix
related: APPLINK-23755
Related-issues: APPLINK-22713, APPLINK-22716
| -rw-r--r-- | src/components/protocol_handler/test/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/components/rpc_base/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/components/rpc_base/test/rpc_base_test.cc | 13 | ||||
| -rw-r--r-- | src/components/transport_manager/test/CMakeLists.txt | 5 |
4 files changed, 6 insertions, 15 deletions
diff --git a/src/components/protocol_handler/test/CMakeLists.txt b/src/components/protocol_handler/test/CMakeLists.txt index d719c8c2c2..7fe286c088 100644 --- a/src/components/protocol_handler/test/CMakeLists.txt +++ b/src/components/protocol_handler/test/CMakeLists.txt @@ -50,7 +50,6 @@ set (LIBRARIES set (SOURCES incoming_data_handler_test.cc protocol_header_validator_test.cc - #TODO(OHerasym) : test don't finish executing protocol_handler_tm_test.cc protocol_packet_test.cc protocol_payload_test.cc diff --git a/src/components/rpc_base/test/CMakeLists.txt b/src/components/rpc_base/test/CMakeLists.txt index 75d36829f8..e17d1485ab 100644 --- a/src/components/rpc_base/test/CMakeLists.txt +++ b/src/components/rpc_base/test/CMakeLists.txt @@ -31,6 +31,7 @@ include_directories ( ${COMPONENTS_DIR}/dbus/include ${COMPONENTS_DIR}/rpc_base/include + ${COMPONENTS_DIR}/formatters/test/include ${DBUS_INCLUDE_DIRS} ${GMOCK_INCLUDE_DIRECTORY} ${JSONCPP_INCLUDE_DIRECTORY} @@ -46,6 +47,7 @@ set(SOURCES ${COMPONENTS_DIR}/rpc_base/test/rpc_base_json_test.cc ${COMPONENTS_DIR}/rpc_base/test/rpc_base_test.cc ${COMPONENTS_DIR}/rpc_base/test/validation_report_test.cc + ${COMPONENTS_DIR}/formatters/test/src/FormattersJsonHelper.cc ) if (${HMI_DBUS_API}) diff --git a/src/components/rpc_base/test/rpc_base_test.cc b/src/components/rpc_base/test/rpc_base_test.cc index e5901e091f..43ad444478 100644 --- a/src/components/rpc_base/test/rpc_base_test.cc +++ b/src/components/rpc_base/test/rpc_base_test.cc @@ -36,6 +36,7 @@ #include "rpc_base/rpc_base.h" #include <json/writer.h> #include <json/reader.h> +#include "FormattersJsonHelper.h" namespace test { namespace components { @@ -44,6 +45,7 @@ using namespace rpc; using utils::json::JsonValue; using utils::json::JsonValueRef; +using test::components::formatters::CompactJson; namespace { @@ -53,17 +55,6 @@ bool IsValidEnum(TestEnum val) { return val == kValue0 || val == kValue1; } -void CompactJson(std::string& str) { - Json::Value root; - Json::Reader reader; - reader.parse(str, root); - Json::FastWriter writer; - str = writer.write(root); - if (str[str.size() - 1] == '\n') { - str.erase(str.size() - 1, 1); - } -} - } // namespace TEST(ValidatedTypes, TestBooleanDefaultConstructor) { diff --git a/src/components/transport_manager/test/CMakeLists.txt b/src/components/transport_manager/test/CMakeLists.txt index 25be5fe2c8..61c2b6e923 100644 --- a/src/components/transport_manager/test/CMakeLists.txt +++ b/src/components/transport_manager/test/CMakeLists.txt @@ -68,9 +68,8 @@ endif() set(SOURCES ${TM_TEST_DIR}/transport_manager_default_test.cc - #TODO(OHerasym) : last_state assert fails -# ${TM_TEST_DIR}/transport_manager_impl_test.cc -# ${TM_TEST_DIR}/transport_adapter_test.cc + ${TM_TEST_DIR}/transport_manager_impl_test.cc + ${TM_TEST_DIR}/transport_adapter_test.cc ${TM_TEST_DIR}/transport_adapter_listener_test.cc ${TM_TEST_DIR}/tcp_transport_adapter_test.cc ${TM_TEST_DIR}/tcp_device_test.cc |