diff --git a/.github/workflows/reusable-ci.yml b/.github/workflows/reusable-ci.yml index b506332b..acf29707 100644 --- a/.github/workflows/reusable-ci.yml +++ b/.github/workflows/reusable-ci.yml @@ -70,10 +70,16 @@ jobs: strict-bool: - false - true + disable-wstrings: + - false + include: + - cmake-build-type: 'RelWithDebInfo' + strict-bool: false + disable-wstrings: true steps: - name: Add ci-pending label if PR - if: ${{ github.event_name == 'pull_request' && inputs.add-label == true && matrix.strict-bool == false }} + if: ${{ github.event_name == 'pull_request' && inputs.add-label == true && matrix.strict-bool == false && matrix.disable-wstrings == false }} uses: eProsima/eProsima-CI/external/add_labels@v0 with: labels: ci-pending @@ -131,7 +137,7 @@ jobs: colcon_meta_file: ${{ github.workspace }}/src/fastcdr/.github/workflows/config/build.meta colcon_build_args: ${{ inputs.colcon-args }} colcon_build_args_default: --event-handlers=console_direct+ - cmake_args: ${{ inputs.cmake-args }} ${{ matrix.strict-bool == true && '-DSTRICT_BOOL=ON' || '' }} + cmake_args: ${{ inputs.cmake-args }} ${{ matrix.strict-bool == true && '-DSTRICT_BOOL=ON' || '' }} ${{ matrix.disable-wstrings == true && '-DFASTCDR_DISABLE_WSTRINGS=ON' || '' }} cmake_args_default: ${{ env.colcon-build-default-cmake-args }} ${{ env.toolset }} cmake_build_type: ${{ matrix.cmake-build-type }} workspace: ${{ github.workspace }} @@ -146,7 +152,7 @@ jobs: ctest_args: ${{ inputs.ctest-args }} packages_names: fastcdr workspace: ${{ github.workspace }} - test_report_artifact: ${{ inputs.label }}${{ matrix.strict-bool == true && '-strict-bool' || '' }} + test_report_artifact: ${{ inputs.label }}${{ matrix.strict-bool == true && '-strict-bool' || '' }}${{ matrix.disable-wstrings == true && '-disable-wstrings' || '' }} - name: Fast CDR Test summary uses: eProsima/eProsima-CI/multiplatform/junit_summary@v0 @@ -162,5 +168,5 @@ jobs: if: ${{ !cancelled() && inputs.run-build == true && inputs.run-tests == true }} uses: eProsima/eProsima-CI/external/upload-artifact@v0 with: - name: test-results-${{ inputs.label }}${{ matrix.strict-bool == true && '-strict-bool' || '' }} + name: test-results-${{ inputs.label }}${{ matrix.strict-bool == true && '-strict-bool' || '' }}${{ matrix.disable-wstrings == true && '-disable-wstrings' || '' }} path: log/latest_test/fastcdr diff --git a/.github/workflows/ubuntu-ci.yml b/.github/workflows/ubuntu-ci.yml index 1727dbab..f71c9687 100644 --- a/.github/workflows/ubuntu-ci.yml +++ b/.github/workflows/ubuntu-ci.yml @@ -89,7 +89,7 @@ jobs: ref: ${{ inputs.fastcdr-branch || github.ref }} - name: Configure Fast CDR - run: cmake -S src/fastcdr -B build/fastcdr + run: cmake -S src/fastcdr -B build/fastcdr -DFASTCDR_DISABLE_WSTRINGS=ON - name: FACE check (C++11 General Purpose capability set) run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index a7c02d86..4f853c7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,6 +68,11 @@ option(BUILD_SHARED_LIBS "Create shared libraries by default" ON) ############################################################################### option(STRICT_BOOL "Enforce bool values to 0/1 during serialization" OFF) +############################################################################### +# Wide characters and strings +############################################################################### +option(FASTCDR_DISABLE_WSTRINGS "Leave out the API for wide characters and strings (wchar_t, std::wstring)" OFF) + ############################################################################### # Test system configuration ############################################################################### diff --git a/include/fastcdr/Cdr.h b/include/fastcdr/Cdr.h index 9a49cd46..acd55599 100644 --- a/include/fastcdr/Cdr.h +++ b/include/fastcdr/Cdr.h @@ -634,6 +634,7 @@ class Cdr Cdr_DllAPI Cdr& serialize( const std::int32_t long_t); +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function serializes a wide-char. * @param wchar The value of the wide-char that will be serialized in the buffer. @@ -642,6 +643,7 @@ class Cdr */ Cdr_DllAPI Cdr& serialize( const wchar_t wchar); +#endif // if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function serializes an unsigned long long. @@ -716,6 +718,7 @@ class Cdr Cdr_DllAPI Cdr& serialize( const char* string_t); +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function serializes a wstring. * @param string_t The pointer to the wstring that will be serialized in the buffer. @@ -724,6 +727,7 @@ class Cdr */ Cdr_DllAPI Cdr& serialize( const wchar_t* string_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function serializes a std::string. @@ -747,6 +751,7 @@ class Cdr return serialize_sequence(c_str, str_len + 1); } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function serializes a std::wstring. * @param string_t The wstring that will be serialized in the buffer. @@ -760,6 +765,8 @@ class Cdr return serialize(string_t.c_str()); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + /*! * @brief Encodes a eprosima::fastcdr::fixed_string in the buffer. * @param[in] value A reference to the fixed string which will be encoded in the buffer. @@ -1126,6 +1133,7 @@ class Cdr const std::int32_t* long_t, std::size_t num_elements); +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function serializes an array of wide-chars. * @param wchar The array of wide-chars that will be serialized in the buffer. @@ -1136,6 +1144,7 @@ class Cdr Cdr_DllAPI Cdr& serialize_array( const wchar_t* wchar, std::size_t num_elements); +#endif // if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function serializes an array of unsigned long longs. @@ -1227,6 +1236,7 @@ class Cdr return *this; } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function serializes an array of wide-strings. * @param string_t The array of wide-strings that will be serialized in the buffer. @@ -1246,6 +1256,8 @@ class Cdr return *this; } +#endif // if !FASTCDR_DISABLE_WSTRINGS + /*! * @brief Encodes an array of fixed strings. * @param[in] value Array of fixed strings which will be encoded in the buffer. @@ -1698,6 +1710,7 @@ class Cdr Cdr_DllAPI Cdr& deserialize( std::int32_t& long_t); +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function deserializes a wide-char. * @param wchar The variable that will store the wide-char read from the buffer. @@ -1714,6 +1727,8 @@ class Cdr return *this; } +#endif // if !FASTCDR_DISABLE_WSTRINGS + /*! * @brief This function deserializes an unsigned long long. * @param ulonglong_t The variable that will store the unsigned long long read from the buffer. @@ -1814,6 +1829,7 @@ class Cdr CdrTryConstructFlag consistency_flag, std::uint32_t max_length); +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function deserializes a wide-string. * This function allocates memory to store the wide string. The user pointer will be set to point this allocated memory. @@ -1853,6 +1869,7 @@ class Cdr wchar_t*& string_t, CdrTryConstructFlag consistency_flag, std::uint32_t max_length); +#endif // if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function deserializes a std::string. @@ -1902,6 +1919,7 @@ class Cdr return *this; } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function deserializes a std::wstring. * @param string_t The variable that will store the string read from the buffer. @@ -1948,6 +1966,8 @@ class Cdr return *this; } +#endif // if !FASTCDR_DISABLE_WSTRINGS + /*! * @brief Decodes a fixed string. * @param[out] value Reference to the variable where the fixed string will be stored after decoding from the buffer. @@ -3078,6 +3098,7 @@ class Cdr std::int32_t* long_t, std::size_t num_elements); +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function deserializes an array of wide-chars. * @param wchar The variable that will store the array of wide-chars read from the buffer. @@ -3088,6 +3109,7 @@ class Cdr Cdr_DllAPI Cdr& deserialize_array( wchar_t* wchar, std::size_t num_elements); +#endif // if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function deserializes an array of unsigned long longs. @@ -3482,6 +3504,7 @@ class Cdr return deserialize_string_sequence(sequence_t, num_elements); } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function template deserializes a wide-string sequence. * This function allocates memory to store the sequence. The user pointer will be set to point this allocated memory. @@ -3499,6 +3522,8 @@ class Cdr return deserialize_wstring_sequence(sequence_t, num_elements); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /// XCDR extensions //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -4212,9 +4237,11 @@ class Cdr std::string*& sequence_t, std::size_t& num_elements); +#if !FASTCDR_DISABLE_WSTRINGS Cdr_DllAPI Cdr& deserialize_wstring_sequence( std::wstring*& sequence_t, std::size_t& num_elements); +#endif // if !FASTCDR_DISABLE_WSTRINGS /*! * @brief Serializes the canonical @c uint8_t representation of @p bool_t. @@ -4353,15 +4380,19 @@ class Cdr Cdr_DllAPI const char* read_string( std::uint32_t& length); +#if !FASTCDR_DISABLE_WSTRINGS Cdr_DllAPI const std::wstring read_wstring( std::uint32_t& length); +#endif // if !FASTCDR_DISABLE_WSTRINGS Cdr_DllAPI const char* read_string( std::uint32_t& length, CdrTryConstructFlag consistency_flag); +#if !FASTCDR_DISABLE_WSTRINGS Cdr_DllAPI const std::wstring read_wstring( std::uint32_t& length, CdrTryConstructFlag consistency_flag); +#endif // if !FASTCDR_DISABLE_WSTRINGS //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /// XCDR extensions diff --git a/include/fastcdr/CdrSizeCalculator.hpp b/include/fastcdr/CdrSizeCalculator.hpp index dfa09c6c..4caf6a9f 100644 --- a/include/fastcdr/CdrSizeCalculator.hpp +++ b/include/fastcdr/CdrSizeCalculator.hpp @@ -299,6 +299,7 @@ class CdrSizeCalculator return 1; } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief Specific template which calculates the encoded size of an instance of a wchar. * @param[in] data Reference to the instance. @@ -316,6 +317,8 @@ class CdrSizeCalculator return calculated_size; } +#endif // if !FASTCDR_DISABLE_WSTRINGS + /*! * @brief Specific template which calculates the encoded size of an instance of a int16_t. * @param[in] data Reference to the instance. @@ -487,6 +490,7 @@ class CdrSizeCalculator return calculated_size; } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief Specific template which calculates the encoded size of an instance of a std::wstring. * @param[in] data Reference to the instance. @@ -504,6 +508,8 @@ class CdrSizeCalculator return calculated_size; } +#endif // if !FASTCDR_DISABLE_WSTRINGS + /*! * @brief Specific template which calculates the encoded size of an instance of a fixed_string. * @param[in] data Reference to the instance. @@ -892,6 +898,7 @@ class CdrSizeCalculator return num_elements; } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief Specific template which calculates the encoded size of an instance of an array of wchar. * @param[in] data Reference to the array's instance. @@ -911,6 +918,8 @@ class CdrSizeCalculator return calculated_size; } +#endif // if !FASTCDR_DISABLE_WSTRINGS + /*! * @brief Specific template which calculates the encoded size of an instance of an array of int16_t. * @param[in] data Reference to the array's instance. diff --git a/include/fastcdr/FastCdr.h b/include/fastcdr/FastCdr.h index dd566cbd..4368efa0 100644 --- a/include/fastcdr/FastCdr.h +++ b/include/fastcdr/FastCdr.h @@ -202,6 +202,7 @@ class Cdr_DllAPI FastCdr return serialize(long_t); } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This operator serializes a wide-char. * @param wchar The value of the wide-char that will be serialized in the buffer. @@ -214,6 +215,8 @@ class Cdr_DllAPI FastCdr return serialize(wchar); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + /*! * @brief This operator serializes an unsigned long long. * @param ulonglong_t The value of the unsigned long long that will be serialized in the buffer. @@ -298,6 +301,7 @@ class Cdr_DllAPI FastCdr return serialize(string_t); } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This operator serializes a null-terminated wide-string. * @param string_t The value of the wide-string that will be serialized in the buffer. @@ -310,6 +314,8 @@ class Cdr_DllAPI FastCdr return serialize(string_t); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + /*! * @brief This operator serializes a string. * @param string_t The string that will be serialized in the buffer. @@ -322,6 +328,7 @@ class Cdr_DllAPI FastCdr return serialize(string_t); } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This operator serializes a wstring. * @param string_t The wstring that will be serialized in the buffer. @@ -334,6 +341,8 @@ class Cdr_DllAPI FastCdr return serialize(string_t); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + /*! * @brief This operator template is used to serialize arrays. * @param array_t The array that will be serialized in the buffer. @@ -458,6 +467,7 @@ class Cdr_DllAPI FastCdr return deserialize(long_t); } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This operator deserializes a wide-char. * @param wchar The variable that will store the wide-char read from the buffer. @@ -470,6 +480,8 @@ class Cdr_DllAPI FastCdr return deserialize(wchar); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + /*! * @brief This operator deserializes an unsigned long long. * @param ulonglong_t The variable that will store the unsigned long long read from the buffer. @@ -570,6 +582,7 @@ class Cdr_DllAPI FastCdr return deserialize(string_t); } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This operator deserializes a wstring. * @param string_t The variable that will store the wstring read from the buffer. @@ -582,6 +595,8 @@ class Cdr_DllAPI FastCdr return deserialize(string_t); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + /*! * @brief This operator template is used to deserialize arrays. * @param array_t The variable that will store the array read from the buffer. @@ -738,6 +753,7 @@ class Cdr_DllAPI FastCdr exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT); } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function serializes a wide-char. * @param wchar The value of the wide-char that will be serialized in the buffer. @@ -751,6 +767,8 @@ class Cdr_DllAPI FastCdr return serialize(static_cast(wchar)); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + /*! * @brief This function serializes an unsigned long long. * @param ulonglong_t The value of the unsigned long long that will be serialized in the buffer. @@ -874,6 +892,7 @@ class Cdr_DllAPI FastCdr FastCdr& serialize( const char* string_t); +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function serializes a wstring. * @param string_t The pointer to the wstring that will be serialized in the buffer. @@ -882,6 +901,7 @@ class Cdr_DllAPI FastCdr */ FastCdr& serialize( const wchar_t* string_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function serializes a std::string. @@ -905,6 +925,7 @@ class Cdr_DllAPI FastCdr return serialize(c_str); } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function serializes a std::wstring. * @param string_t The wstring that will be serialized in the buffer. @@ -918,6 +939,8 @@ class Cdr_DllAPI FastCdr return serialize(string_t.c_str()); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + /*! * @brief This function template serializes an array. * @param array_t The array that will be serialized in the buffer. @@ -1094,6 +1117,7 @@ class Cdr_DllAPI FastCdr const std::int32_t* long_t, std::size_t num_elements); +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function serializes an array of wide-chars. * @param wchar The array of wide-chars that will be serialized in the buffer. @@ -1104,6 +1128,7 @@ class Cdr_DllAPI FastCdr FastCdr& serialize_array( const wchar_t* wchar, std::size_t num_elements); +#endif // if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function serializes an array of unsigned long longs. @@ -1194,6 +1219,7 @@ class Cdr_DllAPI FastCdr return *this; } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function serializes an array of wstrings. * @param string_t The array of wstrings that will be serialized in the buffer. @@ -1213,6 +1239,8 @@ class Cdr_DllAPI FastCdr return *this; } +#endif // if !FASTCDR_DISABLE_WSTRINGS + /*! * @brief This function template serializes an array of sequences. * @param vector_t The array of sequences that will be serialized in the buffer. @@ -1396,6 +1424,7 @@ class Cdr_DllAPI FastCdr exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT); } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function deserializes a wide-char. * @param wchar The variable that will store the wide-char read from the buffer. @@ -1412,6 +1441,8 @@ class Cdr_DllAPI FastCdr return *this; } +#endif // if !FASTCDR_DISABLE_WSTRINGS + /*! * @brief This function deserializes an unsigned long long. * @param ulonglong_t The variable that will store the unsigned long long read from the buffer. @@ -1538,6 +1569,7 @@ class Cdr_DllAPI FastCdr FastCdr& deserialize( char*& string_t); +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function deserializes a wide string. * This function allocates memory to store the wide string. The user pointer will be set to point this allocated memory. @@ -1549,6 +1581,7 @@ class Cdr_DllAPI FastCdr */ FastCdr& deserialize( wchar_t*& string_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function deserializes a std::string. @@ -1566,6 +1599,7 @@ class Cdr_DllAPI FastCdr return *this; } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function deserializes a std::wstring. * @param string_t The variable that will store the wstring read from the buffer. @@ -1581,6 +1615,8 @@ class Cdr_DllAPI FastCdr return *this; } +#endif // if !FASTCDR_DISABLE_WSTRINGS + /*! * @brief This function template deserializes an array. * @param array_t The variable that will store the array read from the buffer. @@ -1759,6 +1795,7 @@ class Cdr_DllAPI FastCdr std::int32_t* long_t, std::size_t num_elements); +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function deserializes an array of wide-chars. * @param wchar The variable that will store the array of wide-chars read from the buffer. @@ -1769,6 +1806,7 @@ class Cdr_DllAPI FastCdr FastCdr& deserialize_array( wchar_t* wchar, std::size_t num_elements); +#endif // if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function deserializes an array of unsigned long longs. @@ -1859,6 +1897,7 @@ class Cdr_DllAPI FastCdr return *this; } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function deserializes an array of wide-strings. * @param string_t The variable that will store the array of strings read from the buffer. @@ -1878,6 +1917,8 @@ class Cdr_DllAPI FastCdr return *this; } +#endif // if !FASTCDR_DISABLE_WSTRINGS + /*! * @brief This function template deserializes an array of sequences. * @param vector_t The variable that will store the array of sequences read from the buffer. @@ -1933,6 +1974,7 @@ class Cdr_DllAPI FastCdr return deserialize_string_sequence(sequence_t, num_elements); } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function template deserializes a wide-string sequence. * This function allocates memory to store the sequence. The user pointer will be set to point this allocated memory. @@ -1950,6 +1992,8 @@ class Cdr_DllAPI FastCdr return deserialize_wstring_sequence(sequence_t, num_elements); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + /*! * @brief This function template deserializes a raw sequence. * This function allocates memory to store the sequence. The user pointer will be set to point this allocated memory. @@ -2004,6 +2048,7 @@ class Cdr_DllAPI FastCdr return deserialize_string_sequence(sequence_t, num_elements); } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function template deserializes a wide-string sequence. * This function allocates memory to store the sequence. The user pointer will be set to point this allocated memory. @@ -2021,6 +2066,8 @@ class Cdr_DllAPI FastCdr return deserialize_wstring_sequence(sequence_t, num_elements); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + #endif // ifdef _MSC_VER private: @@ -2051,9 +2098,11 @@ class Cdr_DllAPI FastCdr std::string*& sequence_t, std::size_t& num_elements); +#if !FASTCDR_DISABLE_WSTRINGS FastCdr& deserialize_wstring_sequence( std::wstring*& sequence_t, std::size_t& num_elements); +#endif // if !FASTCDR_DISABLE_WSTRINGS /*! * @brief This function template detects the content type of the STD container array and serializes the array. @@ -2099,8 +2148,10 @@ class Cdr_DllAPI FastCdr const char* read_string( std::uint32_t& length); +#if !FASTCDR_DISABLE_WSTRINGS std::wstring read_wstring( std::uint32_t& length); +#endif // if !FASTCDR_DISABLE_WSTRINGS //! @brief Reference to the buffer that will be serialized/deserialized. FastBuffer& cdr_buffer_; diff --git a/include/fastcdr/config.h.in b/include/fastcdr/config.h.in index 83126de9..25225ea5 100644 --- a/include/fastcdr/config.h.in +++ b/include/fastcdr/config.h.in @@ -38,6 +38,9 @@ #define FASTCDR_SIZEOF_LONG_DOUBLE @FASTCDR_SIZEOF_LONG_DOUBLE@ #endif // ifndef FASTCDR_SIZEOF_LONG_DOUBLE +// Wide characters and strings (wchar_t, std::wstring) left out of the API +#cmakedefine01 FASTCDR_DISABLE_WSTRINGS + #if defined(__ARM_ARCH) && __ARM_ARCH <= 7 #define FASTCDR_ARM32 #endif // if defined(__ARM_ARCH) && __ARM_ARCH <= 7 diff --git a/src/cpp/Cdr.cpp b/src/cpp/Cdr.cpp index 97c6222b..6a648b3f 100644 --- a/src/cpp/Cdr.cpp +++ b/src/cpp/Cdr.cpp @@ -13,7 +13,6 @@ // limitations under the License. #include -#include #include #include @@ -21,6 +20,10 @@ #include #include "helpers/memory_helpers.hpp" +#if !FASTCDR_DISABLE_WSTRINGS +#include +#endif // if !FASTCDR_DISABLE_WSTRINGS + namespace eprosima { namespace fastcdr { @@ -627,12 +630,15 @@ Cdr& Cdr::serialize( throw NotEnoughMemoryException(NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT); } +#if !FASTCDR_DISABLE_WSTRINGS Cdr& Cdr::serialize( const wchar_t wchar) { return serialize(static_cast(wchar)); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + Cdr& Cdr::serialize( const std::uint64_t ulonglong_t) { @@ -894,6 +900,7 @@ Cdr& Cdr::serialize( return *this; } +#if !FASTCDR_DISABLE_WSTRINGS Cdr& Cdr::serialize( const wchar_t* string_t) { @@ -929,6 +936,8 @@ Cdr& Cdr::serialize( return *this; } +#endif // if !FASTCDR_DISABLE_WSTRINGS + Cdr& Cdr::serialize_array( const bool* bool_t, std::size_t num_elements) @@ -1056,6 +1065,7 @@ Cdr& Cdr::serialize_array( throw NotEnoughMemoryException(NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT); } +#if !FASTCDR_DISABLE_WSTRINGS Cdr& Cdr::serialize_array( const wchar_t* wchar, std::size_t num_elements) @@ -1072,6 +1082,8 @@ Cdr& Cdr::serialize_array( return *this; } +#endif // if !FASTCDR_DISABLE_WSTRINGS + Cdr& Cdr::serialize_array( const std::int64_t* longlong_t, std::size_t num_elements) @@ -1725,6 +1737,7 @@ Cdr& Cdr::deserialize( throw NotEnoughMemoryException(NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT); } +#if !FASTCDR_DISABLE_WSTRINGS Cdr& Cdr::deserialize( wchar_t*& string_t) { @@ -1762,6 +1775,8 @@ Cdr& Cdr::deserialize( throw NotEnoughMemoryException(NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + Cdr& Cdr::deserialize( char*& string_t, CdrTryConstructFlag consistency_flag, @@ -1828,6 +1843,7 @@ Cdr& Cdr::deserialize( throw NotEnoughMemoryException(NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT); } +#if !FASTCDR_DISABLE_WSTRINGS Cdr& Cdr::deserialize( wchar_t*& string_t, CdrTryConstructFlag consistency_flag, @@ -1891,6 +1907,8 @@ Cdr& Cdr::deserialize( throw NotEnoughMemoryException(NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + const char* Cdr::read_string( std::uint32_t& length) { @@ -1898,6 +1916,7 @@ const char* Cdr::read_string( return read_string(length, CdrTryConstructFlag::FAIL); } +#if !FASTCDR_DISABLE_WSTRINGS const std::wstring Cdr::read_wstring( std::uint32_t& length) { @@ -1905,6 +1924,8 @@ const std::wstring Cdr::read_wstring( return read_wstring(length, CdrTryConstructFlag::FAIL); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + const char* Cdr::read_string( std::uint32_t& length, CdrTryConstructFlag consistency_flag) @@ -1972,6 +1993,7 @@ const char* Cdr::read_string( exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT); } +#if !FASTCDR_DISABLE_WSTRINGS const std::wstring Cdr::read_wstring( std::uint32_t& length, CdrTryConstructFlag consistency_flag) @@ -2041,6 +2063,8 @@ const std::wstring Cdr::read_wstring( exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + Cdr& Cdr::deserialize_array( bool* bool_t, std::size_t num_elements) @@ -2202,6 +2226,7 @@ Cdr& Cdr::deserialize_array( throw NotEnoughMemoryException(NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT); } +#if !FASTCDR_DISABLE_WSTRINGS Cdr& Cdr::deserialize_array( wchar_t* wchar, std::size_t num_elements) @@ -2220,6 +2245,8 @@ Cdr& Cdr::deserialize_array( return *this; } +#endif // if !FASTCDR_DISABLE_WSTRINGS + Cdr& Cdr::deserialize_array( std::int64_t* longlong_t, std::size_t num_elements) @@ -2777,6 +2804,7 @@ Cdr& Cdr::deserialize_string_sequence( return *this; } +#if !FASTCDR_DISABLE_WSTRINGS Cdr& Cdr::deserialize_wstring_sequence( std::wstring*& sequence_t, std::size_t& num_elements) @@ -2839,6 +2867,8 @@ Cdr& Cdr::deserialize_wstring_sequence( return *this; } +#endif // if !FASTCDR_DISABLE_WSTRINGS + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /// XCDR extensions //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/cpp/FastCdr.cpp b/src/cpp/FastCdr.cpp index 0fc9c27f..6f678c98 100644 --- a/src/cpp/FastCdr.cpp +++ b/src/cpp/FastCdr.cpp @@ -15,7 +15,9 @@ #include #include #include +#if !FASTCDR_DISABLE_WSTRINGS #include +#endif // if !FASTCDR_DISABLE_WSTRINGS #include "helpers/memory_helpers.hpp" using namespace eprosima::fastcdr; @@ -136,6 +138,7 @@ FastCdr& FastCdr::serialize( return *this; } +#if !FASTCDR_DISABLE_WSTRINGS FastCdr& FastCdr::serialize( const wchar_t* string_t) { @@ -176,6 +179,8 @@ FastCdr& FastCdr::serialize( return *this; } +#endif // if !FASTCDR_DISABLE_WSTRINGS + FastCdr& FastCdr::serialize_array( const bool* bool_t, std::size_t num_elements) @@ -245,6 +250,7 @@ FastCdr& FastCdr::serialize_array( throw NotEnoughMemoryException(NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT); } +#if !FASTCDR_DISABLE_WSTRINGS FastCdr& FastCdr::serialize_array( const wchar_t* wchar, std::size_t num_elements) @@ -256,6 +262,8 @@ FastCdr& FastCdr::serialize_array( return *this; } +#endif // if !FASTCDR_DISABLE_WSTRINGS + FastCdr& FastCdr::serialize_array( const std::int64_t* longlong_t, std::size_t num_elements) @@ -401,6 +409,7 @@ FastCdr& FastCdr::deserialize( throw NotEnoughMemoryException(NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT); } +#if !FASTCDR_DISABLE_WSTRINGS FastCdr& FastCdr::deserialize( wchar_t*& string_t) { @@ -439,6 +448,8 @@ FastCdr& FastCdr::deserialize( throw NotEnoughMemoryException(NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + const char* FastCdr::read_string( std::uint32_t& length) { @@ -467,6 +478,7 @@ const char* FastCdr::read_string( eprosima::fastcdr::exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT); } +#if !FASTCDR_DISABLE_WSTRINGS std::wstring FastCdr::read_wstring( std::uint32_t& length) { @@ -498,6 +510,8 @@ std::wstring FastCdr::read_wstring( eprosima::fastcdr::exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + FastCdr& FastCdr::deserialize_array( bool* bool_t, std::size_t num_elements) @@ -577,6 +591,7 @@ FastCdr& FastCdr::deserialize_array( throw NotEnoughMemoryException(NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT); } +#if !FASTCDR_DISABLE_WSTRINGS FastCdr& FastCdr::deserialize_array( wchar_t* wchar, std::size_t num_elements) @@ -590,6 +605,8 @@ FastCdr& FastCdr::deserialize_array( return *this; } +#endif // if !FASTCDR_DISABLE_WSTRINGS + FastCdr& FastCdr::deserialize_array( std::int64_t* longlong_t, std::size_t num_elements) @@ -779,6 +796,7 @@ FastCdr& FastCdr::deserialize_string_sequence( return *this; } +#if !FASTCDR_DISABLE_WSTRINGS FastCdr& FastCdr::deserialize_wstring_sequence( std::wstring*& sequence_t, std::size_t& num_elements) @@ -804,3 +822,5 @@ FastCdr& FastCdr::deserialize_wstring_sequence( num_elements = sequence_length; return *this; } + +#endif // if !FASTCDR_DISABLE_WSTRINGS diff --git a/test/cdr/ResizeTest.cpp b/test/cdr/ResizeTest.cpp index 559e948c..2ed11808 100644 --- a/test/cdr/ResizeTest.cpp +++ b/test/cdr/ResizeTest.cpp @@ -27,7 +27,9 @@ using namespace ::exception; static const uint8_t octet_t = 32; static const char char_t = 'Z'; +#if !FASTCDR_DISABLE_WSTRINGS static const wchar_t wchar = 'Z'; +#endif // if !FASTCDR_DISABLE_WSTRINGS static const int8_t int8 = 64; static const uint16_t ushort_t = 65500; static const int16_t short_t = -32700; @@ -40,13 +42,19 @@ static const double double_tt = std::numeric_limits::min(); static const long double ldouble_tt = std::numeric_limits::min(); static const bool bool_t = true; static const std::string string_t = "Hola a todos, esto es un test"; +#if !FASTCDR_DISABLE_WSTRINGS static const std::wstring wstring_t = L"Hola a todos, esto es un test con wide string"; +#endif // if !FASTCDR_DISABLE_WSTRINGS static const std::array octet_array_t = {{1, 2, 3, 4, 5}}; static const uint8_t octet_array_2_t[5] = {5, 4, 3, 2, 1}; static const std::array char_array_t = {{'A', 'B', 'C', 'D', 'E'}}; +#if !FASTCDR_DISABLE_WSTRINGS static const std::array wchar_array_t = {{'A', 'B', 'C', 'D', 'E'}}; +#endif // if !FASTCDR_DISABLE_WSTRINGS static const char char_array_2_t[5] = {'E', 'D', 'C', 'B', 'A'}; +#if !FASTCDR_DISABLE_WSTRINGS static const wchar_t wchar_array_2_t[5] = {'E', 'D', 'C', 'B', 'A'}; +#endif // if !FASTCDR_DISABLE_WSTRINGS static const std::array int8_array_t = {{6, 7, 8, 9, 10}}; static const int8_t int8_array_2_t[5] = {10, 9, 8, 7, 6}; static const std::array ushort_array_t = {{65500, 65501, 65502, 65503, 65504}}; @@ -80,14 +88,20 @@ static const long double ldouble_array_2_t[5] = static const std::array bool_array_t = {{true, false, true, false, true}}; static const bool bool_array_2_t[5] = {false, true, false, true, false}; static const std::array string_array_t = {{"HOLA", "ADIOS", "HELLO", "BYE", "GOODBYE"}}; +#if !FASTCDR_DISABLE_WSTRINGS static const std::array wstring_array_t = {{L"HOLA", L"ADIOS", L"HELLO", L"BYE", L"GOODBYE"}}; +#endif // if !FASTCDR_DISABLE_WSTRINGS static const std::string string_array_2_t[5] = {"HOLA", "ADIOS", "HELLO", "BYE", "GOODBYE"}; +#if !FASTCDR_DISABLE_WSTRINGS static const std::wstring wstring_array_2_t[5] = {L"HOLA", L"ADIOS", L"HELLO", L"BYE", L"GOODBYE"}; +#endif // if !FASTCDR_DISABLE_WSTRINGS static const std::vector octet_vector_t(octet_array_2_t, octet_array_2_t + sizeof(octet_array_2_t) / sizeof(uint8_t)); static const std::vector char_vector_t(char_array_2_t, char_array_2_t + sizeof(char_array_2_t) / sizeof(char)); +#if !FASTCDR_DISABLE_WSTRINGS static const std::vector wchar_vector_t(wchar_array_2_t, wchar_array_2_t + sizeof(wchar_array_2_t) / sizeof(wchar_t)); +#endif // if !FASTCDR_DISABLE_WSTRINGS static const std::vector int8_vector_t(int8_array_2_t, int8_array_2_t + sizeof(int8_array_2_t) / sizeof(int8_t)); static const std::vector ushort_vector_t(ushort_array_2_t, @@ -114,15 +128,19 @@ static const std::vector bool_vector_t(bool_array_2_t, bool_array_2_t + si static const std::vector string_vector_t(string_array_2_t, string_array_2_t + sizeof(string_array_2_t) / sizeof(std::string)); +#if !FASTCDR_DISABLE_WSTRINGS static const std::vector wstring_vector_t(wstring_array_2_t, wstring_array_2_t + sizeof(wstring_array_2_t) / sizeof(std::wstring)); +#endif // if !FASTCDR_DISABLE_WSTRINGS static const std::array, 2>, 2> triple_ulong_array_t = {{ {{ {{1, 2, 3}}, {{4, 5, 6}} }}, {{ {{7, 8, 9}}, {{10, 11, 12}} }} }}; // Added because error 336. static const uint8_t octet_seq_t[5] = {5, 4, 3, 2, 1}; static const char char_seq_t[5] = {'E', 'D', 'C', 'B', 'A'}; +#if !FASTCDR_DISABLE_WSTRINGS static const wchar_t wchar_seq_t[5] = {'E', 'D', 'C', 'B', 'A'}; +#endif // if !FASTCDR_DISABLE_WSTRINGS static const int8_t int8_seq_t[5] = {10, 9, 8, 7, 6}; static const uint16_t ushort_seq_t[5] = {65504, 65503, 65502, 65501, 65500}; static const int16_t short_seq_t[5] = {-32704, -32703, -32702, -32701, -32700}; @@ -139,10 +157,14 @@ static const long double ldouble_seq_t[5] = {ldouble_tt + 4, ldouble_tt + 3, ldouble_tt + 2, ldouble_tt + 1, ldouble_tt}; static const bool bool_seq_t[5] = {true, true, false, false, true}; static const std::string string_seq_t[5] = {"HELLO", "BYE", "GOODBYE", "HOLA", "ADIOS"}; +#if !FASTCDR_DISABLE_WSTRINGS static const std::wstring wstring_seq_t[5] = {L"HELLO", L"BYE", L"GOODBYE", L"HOLA", L"ADIOS"}; +#endif // if !FASTCDR_DISABLE_WSTRINGS // Added because error 337 static const char* c_string_t = "HOLA"; +#if !FASTCDR_DISABLE_WSTRINGS static const wchar_t* c_wstring_t = L"HOLA"; +#endif // if !FASTCDR_DISABLE_WSTRINGS template void EXPECT_ARRAY_EQ( @@ -236,9 +258,9 @@ TEST(CDRResizeTests, Octet) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << octet_t; - }); + { + cdr_ser << octet_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -246,9 +268,9 @@ TEST(CDRResizeTests, Octet) uint8_t octet_value = 0; EXPECT_NO_THROW( - { - cdr_des >> octet_value; - }); + { + cdr_des >> octet_value; + }); EXPECT_EQ(octet_value, octet_t); } @@ -260,9 +282,9 @@ TEST(CDRResizeTests, Char) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << char_t; - }); + { + cdr_ser << char_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -270,13 +292,14 @@ TEST(CDRResizeTests, Char) char char_value = 0; EXPECT_NO_THROW( - { - cdr_des >> char_value; - }); + { + cdr_des >> char_value; + }); EXPECT_EQ(char_value, char_t); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRResizeTests, WChar) { // Serialization. @@ -284,9 +307,9 @@ TEST(CDRResizeTests, WChar) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << wchar; - }); + { + cdr_ser << wchar; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -294,13 +317,15 @@ TEST(CDRResizeTests, WChar) wchar_t char_value = 0; EXPECT_NO_THROW( - { - cdr_des >> char_value; - }); + { + cdr_des >> char_value; + }); EXPECT_EQ(char_value, wchar); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(CDRResizeTests, Int8) { // Serialization. @@ -308,9 +333,9 @@ TEST(CDRResizeTests, Int8) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << int8; - }); + { + cdr_ser << int8; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -318,9 +343,9 @@ TEST(CDRResizeTests, Int8) uint8_t int8_value = 0; EXPECT_NO_THROW( - { - cdr_des >> int8_value; - }); + { + cdr_des >> int8_value; + }); EXPECT_EQ(int8_value, int8); } @@ -332,9 +357,9 @@ TEST(CDRResizeTests, UnsignedShort) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ushort_t; - }); + { + cdr_ser << ushort_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -342,9 +367,9 @@ TEST(CDRResizeTests, UnsignedShort) uint16_t ushort_value = 0; EXPECT_NO_THROW( - { - cdr_des >> ushort_value; - }); + { + cdr_des >> ushort_value; + }); EXPECT_EQ(ushort_value, ushort_t); } @@ -356,9 +381,9 @@ TEST(CDRResizeTests, Short) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << short_t; - }); + { + cdr_ser << short_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -366,9 +391,9 @@ TEST(CDRResizeTests, Short) int16_t short_value = 0; EXPECT_NO_THROW( - { - cdr_des >> short_value; - }); + { + cdr_des >> short_value; + }); EXPECT_EQ(short_value, short_t); } @@ -380,9 +405,9 @@ TEST(CDRResizeTests, UnsignedLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ulong_t; - }); + { + cdr_ser << ulong_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -390,9 +415,9 @@ TEST(CDRResizeTests, UnsignedLong) uint32_t ulong_value = 0; EXPECT_NO_THROW( - { - cdr_des >> ulong_value; - }); + { + cdr_des >> ulong_value; + }); EXPECT_EQ(ulong_value, ulong_t); } @@ -404,9 +429,9 @@ TEST(CDRResizeTests, Long) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << long_t; - }); + { + cdr_ser << long_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -414,9 +439,9 @@ TEST(CDRResizeTests, Long) int32_t long_value = 0; EXPECT_NO_THROW( - { - cdr_des >> long_value; - }); + { + cdr_des >> long_value; + }); EXPECT_EQ(long_value, long_t); } @@ -428,9 +453,9 @@ TEST(CDRResizeTests, UnsignedLongLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ulonglong_t; - }); + { + cdr_ser << ulonglong_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -438,9 +463,9 @@ TEST(CDRResizeTests, UnsignedLongLong) uint64_t ulonglong_value = 0; EXPECT_NO_THROW( - { - cdr_des >> ulonglong_value; - }); + { + cdr_des >> ulonglong_value; + }); EXPECT_EQ(ulonglong_value, ulonglong_t); } @@ -452,9 +477,9 @@ TEST(CDRResizeTests, LongLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << longlong_t; - }); + { + cdr_ser << longlong_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -462,9 +487,9 @@ TEST(CDRResizeTests, LongLong) int64_t longlong_value = 0; EXPECT_NO_THROW( - { - cdr_des >> longlong_value; - }); + { + cdr_des >> longlong_value; + }); EXPECT_EQ(longlong_value, longlong_t); } @@ -476,9 +501,9 @@ TEST(CDRResizeTests, Float) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << float_tt; - }); + { + cdr_ser << float_tt; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -486,9 +511,9 @@ TEST(CDRResizeTests, Float) float float_value = 0; EXPECT_NO_THROW( - { - cdr_des >> float_value; - }); + { + cdr_des >> float_value; + }); EXPECT_FLOAT_EQ(float_value, float_tt); } @@ -500,9 +525,9 @@ TEST(CDRResizeTests, Double) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << double_tt; - }); + { + cdr_ser << double_tt; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -510,9 +535,9 @@ TEST(CDRResizeTests, Double) double double_value = 0; EXPECT_NO_THROW( - { - cdr_des >> double_value; - }); + { + cdr_des >> double_value; + }); EXPECT_DOUBLE_EQ(double_value, double_tt); } @@ -524,9 +549,9 @@ TEST(CDRResizeTests, LongDouble) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ldouble_tt; - }); + { + cdr_ser << ldouble_tt; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -534,9 +559,9 @@ TEST(CDRResizeTests, LongDouble) long double ldouble_value = 0; EXPECT_NO_THROW( - { - cdr_des >> ldouble_value; - }); + { + cdr_des >> ldouble_value; + }); EXPECT_LONG_DOUBLE_EQ(ldouble_value, ldouble_tt); } @@ -548,9 +573,9 @@ TEST(CDRResizeTests, Boolean) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << bool_t; - }); + { + cdr_ser << bool_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -558,9 +583,9 @@ TEST(CDRResizeTests, Boolean) bool bool_value = false; EXPECT_NO_THROW( - { - cdr_des >> bool_value; - }); + { + cdr_des >> bool_value; + }); EXPECT_EQ(bool_value, bool_t); } @@ -572,9 +597,9 @@ TEST(CDRResizeTests, String) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << string_t; - }); + { + cdr_ser << string_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -582,13 +607,14 @@ TEST(CDRResizeTests, String) std::string string_value; EXPECT_NO_THROW( - { - cdr_des >> string_value; - }); + { + cdr_des >> string_value; + }); EXPECT_EQ(string_value, string_t); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRResizeTests, WString) { // Serialization. @@ -596,9 +622,9 @@ TEST(CDRResizeTests, WString) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << wstring_t; - }); + { + cdr_ser << wstring_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -606,13 +632,15 @@ TEST(CDRResizeTests, WString) std::wstring string_value; EXPECT_NO_THROW( - { - cdr_des >> string_value; - }); + { + cdr_des >> string_value; + }); EXPECT_EQ(string_value, wstring_t); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(CDRResizeTests, STDArrayOctet) { // Serialization. @@ -620,9 +648,9 @@ TEST(CDRResizeTests, STDArrayOctet) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << octet_array_t; - }); + { + cdr_ser << octet_array_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -630,9 +658,9 @@ TEST(CDRResizeTests, STDArrayOctet) std::array octet_array_value; EXPECT_NO_THROW( - { - cdr_des >> octet_array_value; - }); + { + cdr_des >> octet_array_value; + }); EXPECT_EQ(octet_array_value, octet_array_t); } @@ -644,9 +672,9 @@ TEST(CDRResizeTests, STDArrayChar) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << char_array_t; - }); + { + cdr_ser << char_array_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -654,13 +682,14 @@ TEST(CDRResizeTests, STDArrayChar) std::array char_array_value; EXPECT_NO_THROW( - { - cdr_des >> char_array_value; - }); + { + cdr_des >> char_array_value; + }); EXPECT_EQ(char_array_value, char_array_t); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRResizeTests, STDArrayWChar) { // Serialization. @@ -668,9 +697,9 @@ TEST(CDRResizeTests, STDArrayWChar) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << wchar_array_t; - }); + { + cdr_ser << wchar_array_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -678,13 +707,15 @@ TEST(CDRResizeTests, STDArrayWChar) std::array char_array_value; EXPECT_NO_THROW( - { - cdr_des >> char_array_value; - }); + { + cdr_des >> char_array_value; + }); EXPECT_EQ(char_array_value, wchar_array_t); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(CDRResizeTests, STDArrayInt8) { // Serialization. @@ -692,9 +723,9 @@ TEST(CDRResizeTests, STDArrayInt8) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << int8_array_t; - }); + { + cdr_ser << int8_array_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -702,9 +733,9 @@ TEST(CDRResizeTests, STDArrayInt8) std::array int8_array_value; EXPECT_NO_THROW( - { - cdr_des >> int8_array_value; - }); + { + cdr_des >> int8_array_value; + }); EXPECT_EQ(int8_array_value, int8_array_t); } @@ -716,9 +747,9 @@ TEST(CDRResizeTests, STDArrayUnsignedShort) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ushort_array_t; - }); + { + cdr_ser << ushort_array_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -726,9 +757,9 @@ TEST(CDRResizeTests, STDArrayUnsignedShort) std::array ushort_array_value; EXPECT_NO_THROW( - { - cdr_des >> ushort_array_value; - }); + { + cdr_des >> ushort_array_value; + }); EXPECT_EQ(ushort_array_value, ushort_array_t); } @@ -740,9 +771,9 @@ TEST(CDRResizeTests, STDArrayShort) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << short_array_t; - }); + { + cdr_ser << short_array_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -750,9 +781,9 @@ TEST(CDRResizeTests, STDArrayShort) std::array short_array_value; EXPECT_NO_THROW( - { - cdr_des >> short_array_value; - }); + { + cdr_des >> short_array_value; + }); EXPECT_EQ(short_array_value, short_array_t); } @@ -764,9 +795,9 @@ TEST(CDRResizeTests, STDArrayUnsignedLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ulong_array_t; - }); + { + cdr_ser << ulong_array_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -774,9 +805,9 @@ TEST(CDRResizeTests, STDArrayUnsignedLong) std::array ulong_array_value; EXPECT_NO_THROW( - { - cdr_des >> ulong_array_value; - }); + { + cdr_des >> ulong_array_value; + }); EXPECT_EQ(ulong_array_value, ulong_array_t); } @@ -788,9 +819,9 @@ TEST(CDRResizeTests, STDArrayLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << long_array_t; - }); + { + cdr_ser << long_array_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -798,9 +829,9 @@ TEST(CDRResizeTests, STDArrayLong) std::array long_array_value; EXPECT_NO_THROW( - { - cdr_des >> long_array_value; - }); + { + cdr_des >> long_array_value; + }); EXPECT_EQ(long_array_value, long_array_t); } @@ -812,9 +843,9 @@ TEST(CDRResizeTests, STDArrayUnsignedLongLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ulonglong_array_t; - }); + { + cdr_ser << ulonglong_array_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -822,9 +853,9 @@ TEST(CDRResizeTests, STDArrayUnsignedLongLong) std::array ulonglong_array_value; EXPECT_NO_THROW( - { - cdr_des >> ulonglong_array_value; - }); + { + cdr_des >> ulonglong_array_value; + }); EXPECT_EQ(ulonglong_array_value, ulonglong_array_t); } @@ -836,9 +867,9 @@ TEST(CDRResizeTests, STDArrayLongLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << longlong_array_t; - }); + { + cdr_ser << longlong_array_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -846,9 +877,9 @@ TEST(CDRResizeTests, STDArrayLongLong) std::array longlong_array_value; EXPECT_NO_THROW( - { - cdr_des >> longlong_array_value; - }); + { + cdr_des >> longlong_array_value; + }); EXPECT_EQ(longlong_array_value, longlong_array_t); } @@ -860,9 +891,9 @@ TEST(CDRResizeTests, STDArrayFloat) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << float_array_t; - }); + { + cdr_ser << float_array_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -870,9 +901,9 @@ TEST(CDRResizeTests, STDArrayFloat) std::array float_array_value; EXPECT_NO_THROW( - { - cdr_des >> float_array_value; - }); + { + cdr_des >> float_array_value; + }); EXPECT_EQ(float_array_value, float_array_t); } @@ -884,9 +915,9 @@ TEST(CDRResizeTests, STDArrayDouble) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << double_array_t; - }); + { + cdr_ser << double_array_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -894,9 +925,9 @@ TEST(CDRResizeTests, STDArrayDouble) std::array double_array_value; EXPECT_NO_THROW( - { - cdr_des >> double_array_value; - }); + { + cdr_des >> double_array_value; + }); EXPECT_EQ(double_array_value, double_array_t); } @@ -908,9 +939,9 @@ TEST(CDRResizeTests, STDArrayLongDouble) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ldouble_array_t; - }); + { + cdr_ser << ldouble_array_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -918,9 +949,9 @@ TEST(CDRResizeTests, STDArrayLongDouble) std::array ldouble_array_value; EXPECT_NO_THROW( - { - cdr_des >> ldouble_array_value; - }); + { + cdr_des >> ldouble_array_value; + }); EXPECT_EQ(ldouble_array_value, ldouble_array_t); } @@ -932,9 +963,9 @@ TEST(CDRResizeTests, STDArrayBoolean) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << bool_array_t; - }); + { + cdr_ser << bool_array_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -942,9 +973,9 @@ TEST(CDRResizeTests, STDArrayBoolean) std::array bool_array_value; EXPECT_NO_THROW( - { - cdr_des >> bool_array_value; - }); + { + cdr_des >> bool_array_value; + }); EXPECT_EQ(bool_array_value, bool_array_t); } @@ -956,9 +987,9 @@ TEST(CDRResizeTests, STDArrayString) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << string_array_t; - }); + { + cdr_ser << string_array_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -966,13 +997,14 @@ TEST(CDRResizeTests, STDArrayString) std::array string_array_value; EXPECT_NO_THROW( - { - cdr_des >> string_array_value; - }); + { + cdr_des >> string_array_value; + }); EXPECT_EQ(string_array_value, string_array_t); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRResizeTests, STDArrayWString) { // Serialization. @@ -980,9 +1012,9 @@ TEST(CDRResizeTests, STDArrayWString) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << wstring_array_t; - }); + { + cdr_ser << wstring_array_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -990,13 +1022,15 @@ TEST(CDRResizeTests, STDArrayWString) std::array string_array_value; EXPECT_NO_THROW( - { - cdr_des >> string_array_value; - }); + { + cdr_des >> string_array_value; + }); EXPECT_EQ(string_array_value, wstring_array_t); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(CDRResizeTests, ArrayOctet) { // Serialization. @@ -1004,9 +1038,9 @@ TEST(CDRResizeTests, ArrayOctet) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(octet_array_2_t, 5); - }); + { + cdr_ser.serialize_array(octet_array_2_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1014,9 +1048,9 @@ TEST(CDRResizeTests, ArrayOctet) uint8_t octet_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(octet_array_2_value, 5); - }); + { + cdr_des.deserialize_array(octet_array_2_value, 5); + }); EXPECT_ARRAY_EQ(octet_array_2_value, octet_array_2_t, 5); } @@ -1028,9 +1062,9 @@ TEST(CDRResizeTests, ArrayChar) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(char_array_2_t, 5); - }); + { + cdr_ser.serialize_array(char_array_2_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1038,13 +1072,14 @@ TEST(CDRResizeTests, ArrayChar) char char_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(char_array_2_value, 5); - }); + { + cdr_des.deserialize_array(char_array_2_value, 5); + }); EXPECT_ARRAY_EQ(char_array_2_value, char_array_2_t, 5); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRResizeTests, ArrayWChar) { // Serialization. @@ -1052,9 +1087,9 @@ TEST(CDRResizeTests, ArrayWChar) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(wchar_array_2_t, 5); - }); + { + cdr_ser.serialize_array(wchar_array_2_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1062,13 +1097,15 @@ TEST(CDRResizeTests, ArrayWChar) wchar_t char_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(char_array_2_value, 5); - }); + { + cdr_des.deserialize_array(char_array_2_value, 5); + }); EXPECT_ARRAY_EQ(char_array_2_value, wchar_array_2_t, 5); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(CDRResizeTests, ArrayInt8) { // Serialization. @@ -1076,9 +1113,9 @@ TEST(CDRResizeTests, ArrayInt8) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(int8_array_2_t, 5); - }); + { + cdr_ser.serialize_array(int8_array_2_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1086,9 +1123,9 @@ TEST(CDRResizeTests, ArrayInt8) int8_t int8_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(int8_array_2_value, 5); - }); + { + cdr_des.deserialize_array(int8_array_2_value, 5); + }); EXPECT_ARRAY_EQ(int8_array_2_value, int8_array_2_t, 5); } @@ -1100,9 +1137,9 @@ TEST(CDRResizeTests, ArrayUnsignedShort) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(ushort_array_2_t, 5); - }); + { + cdr_ser.serialize_array(ushort_array_2_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1110,9 +1147,9 @@ TEST(CDRResizeTests, ArrayUnsignedShort) uint16_t ushort_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(ushort_array_2_value, 5); - }); + { + cdr_des.deserialize_array(ushort_array_2_value, 5); + }); EXPECT_ARRAY_EQ(ushort_array_2_value, ushort_array_2_t, 5); } @@ -1124,9 +1161,9 @@ TEST(CDRResizeTests, ArrayShort) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(short_array_2_t, 5); - }); + { + cdr_ser.serialize_array(short_array_2_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1134,9 +1171,9 @@ TEST(CDRResizeTests, ArrayShort) int16_t short_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(short_array_2_value, 5); - }); + { + cdr_des.deserialize_array(short_array_2_value, 5); + }); EXPECT_ARRAY_EQ(short_array_2_value, short_array_2_t, 5); } @@ -1148,9 +1185,9 @@ TEST(CDRResizeTests, ArrayUnsignedLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(ulong_array_2_t, 5); - }); + { + cdr_ser.serialize_array(ulong_array_2_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1158,9 +1195,9 @@ TEST(CDRResizeTests, ArrayUnsignedLong) uint32_t ulong_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(ulong_array_2_value, 5); - }); + { + cdr_des.deserialize_array(ulong_array_2_value, 5); + }); EXPECT_ARRAY_EQ(ulong_array_2_value, ulong_array_2_t, 5); } @@ -1172,9 +1209,9 @@ TEST(CDRResizeTests, ArrayLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(long_array_2_t, 5); - }); + { + cdr_ser.serialize_array(long_array_2_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1182,9 +1219,9 @@ TEST(CDRResizeTests, ArrayLong) int32_t long_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(long_array_2_value, 5); - }); + { + cdr_des.deserialize_array(long_array_2_value, 5); + }); EXPECT_ARRAY_EQ(long_array_2_value, long_array_2_t, 5); } @@ -1196,9 +1233,9 @@ TEST(CDRResizeTests, ArrayUnsignedLongLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(ulonglong_array_2_t, 5); - }); + { + cdr_ser.serialize_array(ulonglong_array_2_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1206,9 +1243,9 @@ TEST(CDRResizeTests, ArrayUnsignedLongLong) uint64_t ulonglong_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(ulonglong_array_2_value, 5); - }); + { + cdr_des.deserialize_array(ulonglong_array_2_value, 5); + }); EXPECT_ARRAY_EQ(ulonglong_array_2_value, ulonglong_array_2_t, 5); } @@ -1220,9 +1257,9 @@ TEST(CDRResizeTests, ArrayLongLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(longlong_array_2_t, 5); - }); + { + cdr_ser.serialize_array(longlong_array_2_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1230,9 +1267,9 @@ TEST(CDRResizeTests, ArrayLongLong) int64_t longlong_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(longlong_array_2_value, 5); - }); + { + cdr_des.deserialize_array(longlong_array_2_value, 5); + }); EXPECT_ARRAY_EQ(longlong_array_2_value, longlong_array_2_t, 5); } @@ -1244,9 +1281,9 @@ TEST(CDRResizeTests, ArrayFloat) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(float_array_2_t, 5); - }); + { + cdr_ser.serialize_array(float_array_2_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1254,9 +1291,9 @@ TEST(CDRResizeTests, ArrayFloat) float float_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(float_array_2_value, 5); - }); + { + cdr_des.deserialize_array(float_array_2_value, 5); + }); EXPECT_ARRAY_FLOAT_EQ(float_array_2_value, float_array_2_t, 5); } @@ -1268,9 +1305,9 @@ TEST(CDRResizeTests, ArrayDouble) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(double_array_2_t, 5); - }); + { + cdr_ser.serialize_array(double_array_2_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1278,9 +1315,9 @@ TEST(CDRResizeTests, ArrayDouble) double double_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(double_array_2_value, 5); - }); + { + cdr_des.deserialize_array(double_array_2_value, 5); + }); EXPECT_ARRAY_DOUBLE_EQ(double_array_2_value, double_array_2_t, 5); } @@ -1292,9 +1329,9 @@ TEST(CDRResizeTests, ArrayLongDouble) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(ldouble_array_2_t, 5); - }); + { + cdr_ser.serialize_array(ldouble_array_2_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1302,9 +1339,9 @@ TEST(CDRResizeTests, ArrayLongDouble) long double ldouble_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(ldouble_array_2_value, 5); - }); + { + cdr_des.deserialize_array(ldouble_array_2_value, 5); + }); EXPECT_ARRAY_LONG_DOUBLE_EQ(ldouble_array_2_value, ldouble_array_2_t, 5); } @@ -1316,9 +1353,9 @@ TEST(CDRResizeTests, ArrayBoolean) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(bool_array_2_t, 5); - }); + { + cdr_ser.serialize_array(bool_array_2_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1326,9 +1363,9 @@ TEST(CDRResizeTests, ArrayBoolean) bool bool_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(bool_array_2_value, 5); - }); + { + cdr_des.deserialize_array(bool_array_2_value, 5); + }); EXPECT_ARRAY_EQ(bool_array_2_value, bool_array_2_t, 5); } @@ -1340,9 +1377,9 @@ TEST(CDRResizeTests, ArrayString) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(string_array_2_t, 5); - }); + { + cdr_ser.serialize_array(string_array_2_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1350,13 +1387,14 @@ TEST(CDRResizeTests, ArrayString) std::string string_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(string_array_2_value, 5); - }); + { + cdr_des.deserialize_array(string_array_2_value, 5); + }); EXPECT_ARRAY_EQ(string_array_2_value, string_array_2_t, 5); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRResizeTests, ArrayWString) { // Serialization. @@ -1364,9 +1402,9 @@ TEST(CDRResizeTests, ArrayWString) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(wstring_array_2_t, 5); - }); + { + cdr_ser.serialize_array(wstring_array_2_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1374,13 +1412,15 @@ TEST(CDRResizeTests, ArrayWString) std::wstring string_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(string_array_2_value, 5); - }); + { + cdr_des.deserialize_array(string_array_2_value, 5); + }); EXPECT_ARRAY_EQ(string_array_2_value, wstring_array_2_t, 5); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(CDRResizeTests, STDVectorOctet) { // Serialization. @@ -1388,9 +1428,9 @@ TEST(CDRResizeTests, STDVectorOctet) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << octet_vector_t; - }); + { + cdr_ser << octet_vector_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1398,9 +1438,9 @@ TEST(CDRResizeTests, STDVectorOctet) std::vector octet_vector_value; EXPECT_NO_THROW( - { - cdr_des >> octet_vector_value; - }); + { + cdr_des >> octet_vector_value; + }); EXPECT_EQ(octet_vector_value, octet_vector_t); } @@ -1412,9 +1452,9 @@ TEST(CDRResizeTests, STDVectorChar) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << char_vector_t; - }); + { + cdr_ser << char_vector_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1422,13 +1462,14 @@ TEST(CDRResizeTests, STDVectorChar) std::vector char_vector_value; EXPECT_NO_THROW( - { - cdr_des >> char_vector_value; - }); + { + cdr_des >> char_vector_value; + }); EXPECT_EQ(char_vector_value, char_vector_t); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRResizeTests, STDVectorWChar) { // Serialization. @@ -1436,9 +1477,9 @@ TEST(CDRResizeTests, STDVectorWChar) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << wchar_vector_t; - }); + { + cdr_ser << wchar_vector_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1446,13 +1487,15 @@ TEST(CDRResizeTests, STDVectorWChar) std::vector char_vector_value; EXPECT_NO_THROW( - { - cdr_des >> char_vector_value; - }); + { + cdr_des >> char_vector_value; + }); EXPECT_EQ(char_vector_value, wchar_vector_t); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(CDRResizeTests, STDVectorInt8) { // Serialization. @@ -1460,9 +1503,9 @@ TEST(CDRResizeTests, STDVectorInt8) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << int8_vector_t; - }); + { + cdr_ser << int8_vector_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1470,9 +1513,9 @@ TEST(CDRResizeTests, STDVectorInt8) std::vector int8_vector_value; EXPECT_NO_THROW( - { - cdr_des >> int8_vector_value; - }); + { + cdr_des >> int8_vector_value; + }); EXPECT_EQ(int8_vector_value, int8_vector_t); } @@ -1484,9 +1527,9 @@ TEST(CDRResizeTests, STDVectorUnsignedShort) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ushort_vector_t; - }); + { + cdr_ser << ushort_vector_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1494,9 +1537,9 @@ TEST(CDRResizeTests, STDVectorUnsignedShort) std::vector ushort_vector_value; EXPECT_NO_THROW( - { - cdr_des >> ushort_vector_value; - }); + { + cdr_des >> ushort_vector_value; + }); EXPECT_EQ(ushort_vector_value, ushort_vector_t); } @@ -1508,9 +1551,9 @@ TEST(CDRResizeTests, STDVectorShort) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << short_vector_t; - }); + { + cdr_ser << short_vector_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1518,9 +1561,9 @@ TEST(CDRResizeTests, STDVectorShort) std::vector short_vector_value; EXPECT_NO_THROW( - { - cdr_des >> short_vector_value; - }); + { + cdr_des >> short_vector_value; + }); EXPECT_EQ(short_vector_value, short_vector_t); } @@ -1532,9 +1575,9 @@ TEST(CDRResizeTests, STDVectorUnsignedLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ulong_vector_t; - }); + { + cdr_ser << ulong_vector_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1542,9 +1585,9 @@ TEST(CDRResizeTests, STDVectorUnsignedLong) std::vector ulong_vector_value; EXPECT_NO_THROW( - { - cdr_des >> ulong_vector_value; - }); + { + cdr_des >> ulong_vector_value; + }); EXPECT_EQ(ulong_vector_value, ulong_vector_t); } @@ -1556,9 +1599,9 @@ TEST(CDRResizeTests, STDVectorLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << long_vector_t; - }); + { + cdr_ser << long_vector_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1566,9 +1609,9 @@ TEST(CDRResizeTests, STDVectorLong) std::vector long_vector_value; EXPECT_NO_THROW( - { - cdr_des >> long_vector_value; - }); + { + cdr_des >> long_vector_value; + }); EXPECT_EQ(long_vector_value, long_vector_t); } @@ -1580,9 +1623,9 @@ TEST(CDRResizeTests, STDVectorUnsignedLongLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ulonglong_vector_t; - }); + { + cdr_ser << ulonglong_vector_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1590,9 +1633,9 @@ TEST(CDRResizeTests, STDVectorUnsignedLongLong) std::vector ulonglong_vector_value; EXPECT_NO_THROW( - { - cdr_des >> ulonglong_vector_value; - }); + { + cdr_des >> ulonglong_vector_value; + }); EXPECT_EQ(ulonglong_vector_value, ulonglong_vector_t); } @@ -1604,9 +1647,9 @@ TEST(CDRResizeTests, STDVectorLongLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << longlong_vector_t; - }); + { + cdr_ser << longlong_vector_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1614,9 +1657,9 @@ TEST(CDRResizeTests, STDVectorLongLong) std::vector longlong_vector_value; EXPECT_NO_THROW( - { - cdr_des >> longlong_vector_value; - }); + { + cdr_des >> longlong_vector_value; + }); EXPECT_EQ(longlong_vector_value, longlong_vector_t); } @@ -1628,9 +1671,9 @@ TEST(CDRResizeTests, STDVectorFloat) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << float_vector_t; - }); + { + cdr_ser << float_vector_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1638,9 +1681,9 @@ TEST(CDRResizeTests, STDVectorFloat) std::vector float_vector_value; EXPECT_NO_THROW( - { - cdr_des >> float_vector_value; - }); + { + cdr_des >> float_vector_value; + }); EXPECT_EQ(float_vector_value, float_vector_t); } @@ -1652,9 +1695,9 @@ TEST(CDRResizeTests, STDVectorDouble) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << double_vector_t; - }); + { + cdr_ser << double_vector_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1662,9 +1705,9 @@ TEST(CDRResizeTests, STDVectorDouble) std::vector double_vector_value; EXPECT_NO_THROW( - { - cdr_des >> double_vector_value; - }); + { + cdr_des >> double_vector_value; + }); EXPECT_EQ(double_vector_value, double_vector_t); } @@ -1676,9 +1719,9 @@ TEST(CDRResizeTests, STDVectorLongDouble) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ldouble_vector_t; - }); + { + cdr_ser << ldouble_vector_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1686,9 +1729,9 @@ TEST(CDRResizeTests, STDVectorLongDouble) std::vector ldouble_vector_value; EXPECT_NO_THROW( - { - cdr_des >> ldouble_vector_value; - }); + { + cdr_des >> ldouble_vector_value; + }); EXPECT_EQ(ldouble_vector_value, ldouble_vector_t); } @@ -1700,9 +1743,9 @@ TEST(CDRResizeTests, STDVectorBoolean) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << bool_vector_t; - }); + { + cdr_ser << bool_vector_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1710,9 +1753,9 @@ TEST(CDRResizeTests, STDVectorBoolean) std::vector bool_vector_value; EXPECT_NO_THROW( - { - cdr_des >> bool_vector_value; - }); + { + cdr_des >> bool_vector_value; + }); EXPECT_EQ(bool_vector_value, bool_vector_t); } @@ -1724,9 +1767,9 @@ TEST(CDRResizeTests, STDVectorString) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << string_vector_t; - }); + { + cdr_ser << string_vector_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1734,13 +1777,14 @@ TEST(CDRResizeTests, STDVectorString) std::vector string_vector_value; EXPECT_NO_THROW( - { - cdr_des >> string_vector_value; - }); + { + cdr_des >> string_vector_value; + }); EXPECT_EQ(string_vector_value, string_vector_t); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRResizeTests, STDVectorWString) { // Serialization. @@ -1748,9 +1792,9 @@ TEST(CDRResizeTests, STDVectorWString) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << wstring_vector_t; - }); + { + cdr_ser << wstring_vector_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1758,13 +1802,15 @@ TEST(CDRResizeTests, STDVectorWString) std::vector string_vector_value; EXPECT_NO_THROW( - { - cdr_des >> string_vector_value; - }); + { + cdr_des >> string_vector_value; + }); EXPECT_EQ(string_vector_value, wstring_vector_t); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(CDRResizeTests, STDTripleArrayUnsignedLong) { // Serialization. @@ -1772,9 +1818,9 @@ TEST(CDRResizeTests, STDTripleArrayUnsignedLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << triple_ulong_array_t; - }); + { + cdr_ser << triple_ulong_array_t; + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1782,9 +1828,9 @@ TEST(CDRResizeTests, STDTripleArrayUnsignedLong) std::array, 2>, 2> triple_ulong_array_value; EXPECT_NO_THROW( - { - cdr_des >> triple_ulong_array_value; - }); + { + cdr_des >> triple_ulong_array_value; + }); EXPECT_EQ(triple_ulong_array_value, triple_ulong_array_t); } @@ -1796,9 +1842,9 @@ TEST(CDRResizeTests, SequenceOctet) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(octet_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(octet_seq_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1806,9 +1852,9 @@ TEST(CDRResizeTests, SequenceOctet) uint8_t* octet_seq_value = NULL; size_t octet_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(octet_seq_value, octet_seq_len); - }); + { + cdr_des.deserialize_sequence(octet_seq_value, octet_seq_len); + }); EXPECT_EQ(octet_seq_len, 5u); EXPECT_ARRAY_EQ(octet_seq_value, octet_seq_t, octet_seq_len); @@ -1823,9 +1869,9 @@ TEST(CDRResizeTests, SequenceChar) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(char_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(char_seq_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1833,9 +1879,9 @@ TEST(CDRResizeTests, SequenceChar) char* char_seq_value = NULL; size_t char_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(char_seq_value, char_seq_len); - }); + { + cdr_des.deserialize_sequence(char_seq_value, char_seq_len); + }); EXPECT_EQ(char_seq_len, 5u); EXPECT_ARRAY_EQ(char_seq_value, char_seq_t, char_seq_len); @@ -1843,6 +1889,7 @@ TEST(CDRResizeTests, SequenceChar) free(char_seq_value); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRResizeTests, SequenceWChar) { // Serialization. @@ -1850,9 +1897,9 @@ TEST(CDRResizeTests, SequenceWChar) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(wchar_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(wchar_seq_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1860,9 +1907,9 @@ TEST(CDRResizeTests, SequenceWChar) wchar_t* char_seq_value = NULL; size_t char_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(char_seq_value, char_seq_len); - }); + { + cdr_des.deserialize_sequence(char_seq_value, char_seq_len); + }); EXPECT_EQ(char_seq_len, 5u); EXPECT_ARRAY_EQ(char_seq_value, wchar_seq_t, char_seq_len); @@ -1870,6 +1917,8 @@ TEST(CDRResizeTests, SequenceWChar) free(char_seq_value); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(CDRResizeTests, SequenceInt8) { // Serialization. @@ -1877,9 +1926,9 @@ TEST(CDRResizeTests, SequenceInt8) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(int8_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(int8_seq_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1887,9 +1936,9 @@ TEST(CDRResizeTests, SequenceInt8) int8_t* int8_seq_value = NULL; size_t int8_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(int8_seq_value, int8_seq_len); - }); + { + cdr_des.deserialize_sequence(int8_seq_value, int8_seq_len); + }); EXPECT_EQ(int8_seq_len, 5u); EXPECT_ARRAY_EQ(int8_seq_value, int8_seq_t, int8_seq_len); @@ -1904,9 +1953,9 @@ TEST(CDRResizeTests, SequenceUnsignedShort) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(ushort_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(ushort_seq_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1914,9 +1963,9 @@ TEST(CDRResizeTests, SequenceUnsignedShort) uint16_t* ushort_seq_value = NULL; size_t ushort_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(ushort_seq_value, ushort_seq_len); - }); + { + cdr_des.deserialize_sequence(ushort_seq_value, ushort_seq_len); + }); EXPECT_EQ(ushort_seq_len, 5u); EXPECT_ARRAY_EQ(ushort_seq_value, ushort_seq_t, ushort_seq_len); @@ -1931,9 +1980,9 @@ TEST(CDRResizeTests, SequenceShort) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(short_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(short_seq_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1941,9 +1990,9 @@ TEST(CDRResizeTests, SequenceShort) int16_t* short_seq_value = NULL; size_t short_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(short_seq_value, short_seq_len); - }); + { + cdr_des.deserialize_sequence(short_seq_value, short_seq_len); + }); EXPECT_EQ(short_seq_len, 5u); EXPECT_ARRAY_EQ(short_seq_value, short_seq_t, short_seq_len); @@ -1958,9 +2007,9 @@ TEST(CDRResizeTests, SequenceUnsignedLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(ulong_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(ulong_seq_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1968,9 +2017,9 @@ TEST(CDRResizeTests, SequenceUnsignedLong) uint32_t* ulong_seq_value = NULL; size_t ulong_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(ulong_seq_value, ulong_seq_len); - }); + { + cdr_des.deserialize_sequence(ulong_seq_value, ulong_seq_len); + }); EXPECT_EQ(ulong_seq_len, 5u); EXPECT_ARRAY_EQ(ulong_seq_value, ulong_seq_t, ulong_seq_len); @@ -1985,9 +2034,9 @@ TEST(CDRResizeTests, SequenceLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(long_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(long_seq_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -1995,9 +2044,9 @@ TEST(CDRResizeTests, SequenceLong) int32_t* long_seq_value = NULL; size_t long_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(long_seq_value, long_seq_len); - }); + { + cdr_des.deserialize_sequence(long_seq_value, long_seq_len); + }); EXPECT_EQ(long_seq_len, 5u); EXPECT_ARRAY_EQ(long_seq_value, long_seq_t, long_seq_len); @@ -2012,9 +2061,9 @@ TEST(CDRResizeTests, SequenceUnsignedLongLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(ulonglong_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(ulonglong_seq_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -2022,9 +2071,9 @@ TEST(CDRResizeTests, SequenceUnsignedLongLong) uint64_t* ulonglong_seq_value = NULL; size_t ulonglong_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(ulonglong_seq_value, ulonglong_seq_len); - }); + { + cdr_des.deserialize_sequence(ulonglong_seq_value, ulonglong_seq_len); + }); EXPECT_EQ(ulonglong_seq_len, 5u); EXPECT_ARRAY_EQ(ulonglong_seq_value, ulonglong_seq_t, ulonglong_seq_len); @@ -2039,9 +2088,9 @@ TEST(CDRResizeTests, SequenceLongLong) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(longlong_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(longlong_seq_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -2049,9 +2098,9 @@ TEST(CDRResizeTests, SequenceLongLong) int64_t* longlong_seq_value = NULL; size_t longlong_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(longlong_seq_value, longlong_seq_len); - }); + { + cdr_des.deserialize_sequence(longlong_seq_value, longlong_seq_len); + }); EXPECT_EQ(longlong_seq_len, 5u); EXPECT_ARRAY_EQ(longlong_seq_value, longlong_seq_t, longlong_seq_len); @@ -2066,9 +2115,9 @@ TEST(CDRResizeTests, SequenceFloat) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(float_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(float_seq_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -2076,9 +2125,9 @@ TEST(CDRResizeTests, SequenceFloat) float* float_seq_value = NULL; size_t float_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(float_seq_value, float_seq_len); - }); + { + cdr_des.deserialize_sequence(float_seq_value, float_seq_len); + }); EXPECT_EQ(float_seq_len, 5u); EXPECT_ARRAY_FLOAT_EQ(float_seq_value, float_seq_t, float_seq_len); @@ -2093,9 +2142,9 @@ TEST(CDRResizeTests, SequenceDouble) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(double_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(double_seq_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -2103,9 +2152,9 @@ TEST(CDRResizeTests, SequenceDouble) double* double_seq_value = NULL; size_t double_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(double_seq_value, double_seq_len); - }); + { + cdr_des.deserialize_sequence(double_seq_value, double_seq_len); + }); EXPECT_EQ(double_seq_len, 5u); EXPECT_ARRAY_DOUBLE_EQ(double_seq_value, double_seq_t, double_seq_len); @@ -2120,9 +2169,9 @@ TEST(CDRResizeTests, SequenceLongDouble) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(ldouble_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(ldouble_seq_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -2130,9 +2179,9 @@ TEST(CDRResizeTests, SequenceLongDouble) long double* ldouble_seq_value = NULL; size_t ldouble_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(ldouble_seq_value, ldouble_seq_len); - }); + { + cdr_des.deserialize_sequence(ldouble_seq_value, ldouble_seq_len); + }); EXPECT_EQ(ldouble_seq_len, 5u); EXPECT_ARRAY_LONG_DOUBLE_EQ(ldouble_seq_value, ldouble_seq_t, ldouble_seq_len); @@ -2147,9 +2196,9 @@ TEST(CDRResizeTests, SequenceBoolean) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(bool_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(bool_seq_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -2157,9 +2206,9 @@ TEST(CDRResizeTests, SequenceBoolean) bool* bool_seq_value = NULL; size_t bool_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(bool_seq_value, bool_seq_len); - }); + { + cdr_des.deserialize_sequence(bool_seq_value, bool_seq_len); + }); EXPECT_EQ(bool_seq_len, 5u); EXPECT_ARRAY_EQ(bool_seq_value, bool_seq_t, bool_seq_len); @@ -2174,9 +2223,9 @@ TEST(CDRResizeTests, SequenceString) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(string_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(string_seq_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -2184,9 +2233,9 @@ TEST(CDRResizeTests, SequenceString) std::string* string_seq_value = NULL; size_t string_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(string_seq_value, string_seq_len); - }); + { + cdr_des.deserialize_sequence(string_seq_value, string_seq_len); + }); EXPECT_EQ(string_seq_len, 5u); EXPECT_ARRAY_EQ(string_seq_value, string_seq_t, string_seq_len); @@ -2194,6 +2243,7 @@ TEST(CDRResizeTests, SequenceString) delete[] string_seq_value; } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRResizeTests, SequenceWString) { // Serialization. @@ -2201,9 +2251,9 @@ TEST(CDRResizeTests, SequenceWString) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(wstring_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(wstring_seq_t, 5); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -2211,9 +2261,9 @@ TEST(CDRResizeTests, SequenceWString) std::wstring* string_seq_value = NULL; size_t string_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(string_seq_value, string_seq_len); - }); + { + cdr_des.deserialize_sequence(string_seq_value, string_seq_len); + }); EXPECT_EQ(string_seq_len, 5u); EXPECT_ARRAY_EQ(string_seq_value, wstring_seq_t, string_seq_len); @@ -2221,6 +2271,8 @@ TEST(CDRResizeTests, SequenceWString) delete[] string_seq_value; } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(CDRResizeTests, CString) { // Serialization. @@ -2228,9 +2280,9 @@ TEST(CDRResizeTests, CString) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize(c_string_t); - }); + { + cdr_ser.serialize(c_string_t); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -2238,15 +2290,16 @@ TEST(CDRResizeTests, CString) char* c_string_value = NULL; EXPECT_NO_THROW( - { - cdr_des.deserialize(c_string_value); - }); + { + cdr_des.deserialize(c_string_value); + }); EXPECT_EQ(strcmp(c_string_value, c_string_t), 0); free(c_string_value); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRResizeTests, CWString) { // Serialization. @@ -2254,9 +2307,9 @@ TEST(CDRResizeTests, CWString) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize(c_wstring_t); - }); + { + cdr_ser.serialize(c_wstring_t); + }); // Deserialization. Cdr cdr_des(cdrbuffer); @@ -2264,15 +2317,17 @@ TEST(CDRResizeTests, CWString) wchar_t* c_string_value = NULL; EXPECT_NO_THROW( - { - cdr_des.deserialize(c_string_value); - }); + { + cdr_des.deserialize(c_string_value); + }); EXPECT_EQ(wcscmp(c_string_value, c_wstring_t), 0); free(c_string_value); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(CDRResizeTests, Complete) { // Serialization. @@ -2280,49 +2335,63 @@ TEST(CDRResizeTests, Complete) Cdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << octet_t << char_t << int8 << ushort_t << short_t << ulong_t << long_t << ulonglong_t << longlong_t << - float_tt << double_tt << ldouble_tt << bool_t << string_t; - cdr_ser << octet_array_t << char_array_t << int8_array_t << ushort_array_t << short_array_t << ulong_array_t << - long_array_t << ulonglong_array_t << longlong_array_t << float_array_t << double_array_t << ldouble_array_t << bool_array_t; - cdr_ser.serialize_array(octet_array_2_t, - 5).serialize_array(char_array_2_t, 5).serialize_array(int8_array_2_t, 5). - serialize_array(ushort_array_2_t, 5).serialize_array(short_array_2_t, - 5).serialize_array(ulong_array_2_t, 5). - serialize_array(long_array_2_t, 5).serialize_array(ulonglong_array_2_t, - 5).serialize_array(longlong_array_2_t, 5). - serialize_array(float_array_2_t, 5).serialize_array(double_array_2_t, - 5).serialize_array(ldouble_array_2_t, - 5).serialize_array( - bool_array_2_t, + { + cdr_ser << octet_t << char_t << int8 << ushort_t << short_t << ulong_t << long_t << ulonglong_t + << longlong_t + << float_tt << double_tt << ldouble_tt << bool_t << string_t; + cdr_ser << octet_array_t << char_array_t << int8_array_t << ushort_array_t << short_array_t << ulong_array_t + << long_array_t << ulonglong_array_t << longlong_array_t << float_array_t << double_array_t + << ldouble_array_t << bool_array_t; + cdr_ser.serialize_array(octet_array_2_t, + 5).serialize_array(char_array_2_t, 5).serialize_array(int8_array_2_t, 5). + serialize_array(ushort_array_2_t, 5).serialize_array(short_array_2_t, + 5).serialize_array(ulong_array_2_t, 5). + serialize_array(long_array_2_t, 5).serialize_array(ulonglong_array_2_t, + 5).serialize_array(longlong_array_2_t, 5). + serialize_array(float_array_2_t, 5).serialize_array(double_array_2_t, + 5).serialize_array(ldouble_array_2_t, + 5).serialize_array( + bool_array_2_t, + 5); + cdr_ser << octet_vector_t << char_vector_t << int8_vector_t << ushort_vector_t << short_vector_t + << ulong_vector_t + << long_vector_t << ulonglong_vector_t << longlong_vector_t << float_vector_t << double_vector_t + << ldouble_vector_t << bool_vector_t; + cdr_ser << triple_ulong_array_t; + cdr_ser.serialize_sequence(octet_seq_t, 5).serialize_sequence(char_seq_t, 5).serialize_sequence(int8_seq_t, + 5). + serialize_sequence(ushort_seq_t, 5).serialize_sequence(short_seq_t, + 5).serialize_sequence(ulong_seq_t, + 5). + serialize_sequence(long_seq_t, 5).serialize_sequence(ulonglong_seq_t, + 5).serialize_sequence(longlong_seq_t, + 5). + serialize_sequence(float_seq_t, 5).serialize_sequence(double_seq_t, + 5).serialize_sequence(ldouble_seq_t, 5); - cdr_ser << octet_vector_t << char_vector_t << int8_vector_t << ushort_vector_t << short_vector_t << ulong_vector_t << - long_vector_t << ulonglong_vector_t << longlong_vector_t << float_vector_t << double_vector_t << ldouble_vector_t << bool_vector_t; - cdr_ser << triple_ulong_array_t; - cdr_ser.serialize_sequence(octet_seq_t, 5).serialize_sequence(char_seq_t, 5).serialize_sequence(int8_seq_t, 5). - serialize_sequence(ushort_seq_t, 5).serialize_sequence(short_seq_t, 5).serialize_sequence(ulong_seq_t, - 5). - serialize_sequence(long_seq_t, 5).serialize_sequence(ulonglong_seq_t, - 5).serialize_sequence(longlong_seq_t, - 5). - serialize_sequence(float_seq_t, 5).serialize_sequence(double_seq_t, 5).serialize_sequence(ldouble_seq_t, - 5); - cdr_ser.serialize(c_string_t); - // Wstring and wchar - cdr_ser << wchar << wstring_t; - cdr_ser.serialize_array(wchar_array_2_t, 5).serialize_array(wstring_array_2_t, 5); - cdr_ser << wchar_array_t << wstring_array_t; - cdr_ser << wchar_vector_t << wstring_vector_t; - cdr_ser.serialize_sequence(wchar_seq_t, 5).serialize_sequence(wstring_seq_t, 5); - cdr_ser.serialize(c_wstring_t); - }); + cdr_ser.serialize(c_string_t); + }); +#if !FASTCDR_DISABLE_WSTRINGS + EXPECT_NO_THROW( + { + // Wstring and wchar + cdr_ser << wchar << wstring_t; + cdr_ser.serialize_array(wchar_array_2_t, 5).serialize_array(wstring_array_2_t, 5); + cdr_ser << wchar_array_t << wstring_array_t; + cdr_ser << wchar_vector_t << wstring_vector_t; + cdr_ser.serialize_sequence(wchar_seq_t, 5).serialize_sequence(wstring_seq_t, 5); + cdr_ser.serialize(c_wstring_t); + }); +#endif // if !FASTCDR_DISABLE_WSTRINGS // Deserialization. Cdr cdr_des(cdrbuffer); uint8_t octet_value = 0; char char_value = 0; +#if !FASTCDR_DISABLE_WSTRINGS wchar_t wchar_value = 0; +#endif // if !FASTCDR_DISABLE_WSTRINGS int8_t int8_value = 0; uint16_t ushort_value = 0; int16_t short_value = 0; @@ -2335,13 +2404,19 @@ TEST(CDRResizeTests, Complete) long double ldouble_value = 0; bool bool_value = false; std::string string_value = ""; +#if !FASTCDR_DISABLE_WSTRINGS std::wstring wstring_value = L""; +#endif // if !FASTCDR_DISABLE_WSTRINGS std::array octet_array_value; uint8_t octet_array_2_value[5]; std::array char_array_value; +#if !FASTCDR_DISABLE_WSTRINGS std::array wchar_array_value; +#endif // if !FASTCDR_DISABLE_WSTRINGS char char_array_2_value[5]; +#if !FASTCDR_DISABLE_WSTRINGS wchar_t wchar_array_2_value[5]; +#endif // if !FASTCDR_DISABLE_WSTRINGS std::array int8_array_value; int8_t int8_array_2_value[5]; std::array ushort_array_value; @@ -2366,7 +2441,9 @@ TEST(CDRResizeTests, Complete) bool bool_array_2_value[5]; std::vector octet_vector_value; std::vector char_vector_value; +#if !FASTCDR_DISABLE_WSTRINGS std::vector wchar_vector_value; +#endif // if !FASTCDR_DISABLE_WSTRINGS std::vector int8_vector_value; std::vector ushort_vector_value; std::vector short_vector_value; @@ -2381,7 +2458,9 @@ TEST(CDRResizeTests, Complete) std::array, 2>, 2> triple_ulong_array_value; uint8_t* octet_seq_value = NULL; size_t octet_seq_len; char* char_seq_value = NULL; size_t char_seq_len; +#if !FASTCDR_DISABLE_WSTRINGS wchar_t* wchar_seq_value = NULL; size_t wchar_seq_len; +#endif // if !FASTCDR_DISABLE_WSTRINGS int8_t* int8_seq_value = NULL; size_t int8_seq_len; uint16_t* ushort_seq_value = NULL; size_t ushort_seq_len; int16_t* short_seq_value = NULL; size_t short_seq_len; @@ -2393,58 +2472,74 @@ TEST(CDRResizeTests, Complete) double* double_seq_value = NULL; size_t double_seq_len; long double* ldouble_seq_value = NULL; size_t ldouble_seq_len; char* c_string_value = NULL; +#if !FASTCDR_DISABLE_WSTRINGS wchar_t* c_wstring_value = NULL; std::array wstring_array_value; std::wstring wstring_array_2_value[5]; std::vector wstring_vector_value; std::wstring* wstring_seq_value = NULL; size_t wstring_seq_len; - - EXPECT_NO_THROW( - { - cdr_des >> octet_value >> char_value >> int8_value >> ushort_value >> short_value >> ulong_value >> long_value >> - ulonglong_value >> longlong_value >> float_value >> double_value >> ldouble_value >> bool_value >> string_value; - cdr_des >> octet_array_value >> char_array_value >> int8_array_value >> ushort_array_value >> short_array_value >> - ulong_array_value >> long_array_value >> ulonglong_array_value >> longlong_array_value >> float_array_value >> - double_array_value >> ldouble_array_value >> bool_array_value; - cdr_des.deserialize_array(octet_array_2_value, - 5).deserialize_array(char_array_2_value, 5).deserialize_array(int8_array_2_value, 5). - deserialize_array(ushort_array_2_value, 5).deserialize_array(short_array_2_value, - 5).deserialize_array(ulong_array_2_value, 5). - deserialize_array(long_array_2_value, 5).deserialize_array(ulonglong_array_2_value, - 5).deserialize_array(longlong_array_2_value, 5). - deserialize_array(float_array_2_value, 5).deserialize_array(double_array_2_value, - 5).deserialize_array(ldouble_array_2_value, 5). - deserialize_array(bool_array_2_value, - 5); - cdr_des >> octet_vector_value >> char_vector_value >> int8_vector_value >> ushort_vector_value >> short_vector_value >> - ulong_vector_value >> long_vector_value >> ulonglong_vector_value >> longlong_vector_value >> float_vector_value >> - double_vector_value >> ldouble_vector_value >> bool_vector_value; - cdr_des >> triple_ulong_array_value; - cdr_des.deserialize_sequence(octet_seq_value, octet_seq_len).deserialize_sequence(char_seq_value, char_seq_len). - deserialize_sequence(int8_seq_value, int8_seq_len).deserialize_sequence(ushort_seq_value, - ushort_seq_len). - deserialize_sequence(short_seq_value, short_seq_len).deserialize_sequence(ulong_seq_value, - ulong_seq_len). - deserialize_sequence(long_seq_value, long_seq_len).deserialize_sequence(ulonglong_seq_value, - ulonglong_seq_len). - deserialize_sequence(longlong_seq_value, longlong_seq_len).deserialize_sequence(float_seq_value, - float_seq_len). - deserialize_sequence(double_seq_value, double_seq_len).deserialize_sequence(ldouble_seq_value, - ldouble_seq_len); - cdr_des.deserialize(c_string_value); - // WString and wchar_t - cdr_des >> wchar_value >> wstring_value; - cdr_des.deserialize_array(wchar_array_2_value, 5).deserialize_array(wstring_array_2_value, 5); - cdr_des >> wchar_array_value >> wstring_array_value; - cdr_des >> wchar_vector_value >> wstring_vector_value; - cdr_des.deserialize_sequence(wchar_seq_value, wchar_seq_len).deserialize_sequence(wstring_seq_value, - wstring_seq_len); - cdr_des.deserialize(c_wstring_value); - }); +#endif // if !FASTCDR_DISABLE_WSTRINGS + + EXPECT_NO_THROW( + { + cdr_des >> octet_value >> char_value >> int8_value >> ushort_value >> short_value >> ulong_value + >> long_value + >> ulonglong_value >> longlong_value >> float_value >> double_value >> ldouble_value >> bool_value + >> string_value; + cdr_des >> octet_array_value >> char_array_value >> int8_array_value >> ushort_array_value + >> short_array_value + >> ulong_array_value >> long_array_value >> ulonglong_array_value >> longlong_array_value + >> float_array_value + >> double_array_value >> ldouble_array_value >> bool_array_value; + cdr_des.deserialize_array(octet_array_2_value, + 5).deserialize_array(char_array_2_value, 5).deserialize_array(int8_array_2_value, 5). + deserialize_array(ushort_array_2_value, 5).deserialize_array(short_array_2_value, + 5).deserialize_array(ulong_array_2_value, 5). + deserialize_array(long_array_2_value, 5).deserialize_array(ulonglong_array_2_value, + 5).deserialize_array(longlong_array_2_value, 5). + deserialize_array(float_array_2_value, 5).deserialize_array(double_array_2_value, + 5).deserialize_array(ldouble_array_2_value, 5). + deserialize_array(bool_array_2_value, + 5); + cdr_des >> octet_vector_value >> char_vector_value >> int8_vector_value >> ushort_vector_value + >> short_vector_value + >> ulong_vector_value >> long_vector_value >> ulonglong_vector_value >> longlong_vector_value + >> float_vector_value + >> double_vector_value >> ldouble_vector_value >> bool_vector_value; + cdr_des >> triple_ulong_array_value; + cdr_des.deserialize_sequence(octet_seq_value, octet_seq_len).deserialize_sequence(char_seq_value, + char_seq_len). + deserialize_sequence(int8_seq_value, int8_seq_len).deserialize_sequence(ushort_seq_value, + ushort_seq_len). + deserialize_sequence(short_seq_value, short_seq_len).deserialize_sequence(ulong_seq_value, + ulong_seq_len). + deserialize_sequence(long_seq_value, long_seq_len).deserialize_sequence(ulonglong_seq_value, + ulonglong_seq_len). + deserialize_sequence(longlong_seq_value, longlong_seq_len).deserialize_sequence(float_seq_value, + float_seq_len). + deserialize_sequence(double_seq_value, double_seq_len).deserialize_sequence(ldouble_seq_value, + ldouble_seq_len); + cdr_des.deserialize(c_string_value); + }); +#if !FASTCDR_DISABLE_WSTRINGS + EXPECT_NO_THROW( + { + // WString and wchar_t + cdr_des >> wchar_value >> wstring_value; + cdr_des.deserialize_array(wchar_array_2_value, 5).deserialize_array(wstring_array_2_value, 5); + cdr_des >> wchar_array_value >> wstring_array_value; + cdr_des >> wchar_vector_value >> wstring_vector_value; + cdr_des.deserialize_sequence(wchar_seq_value, wchar_seq_len).deserialize_sequence(wstring_seq_value, + wstring_seq_len); + cdr_des.deserialize(c_wstring_value); + }); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(octet_value, octet_t); EXPECT_EQ(char_value, char_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wchar_value, wchar); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(int8_value, int8); EXPECT_EQ(ushort_value, ushort_t); EXPECT_EQ(short_value, short_t); @@ -2457,11 +2552,15 @@ TEST(CDRResizeTests, Complete) EXPECT_LONG_DOUBLE_EQ(ldouble_value, ldouble_tt); EXPECT_EQ(bool_value, bool_t); EXPECT_EQ(string_value, string_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wstring_value, wstring_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(octet_array_value, octet_array_t); EXPECT_EQ(char_array_value, char_array_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wchar_array_value, wchar_array_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(int8_array_value, int8_array_t); EXPECT_EQ(ushort_array_value, ushort_array_t); EXPECT_EQ(short_array_value, short_array_t); @@ -2473,11 +2572,15 @@ TEST(CDRResizeTests, Complete) EXPECT_EQ(double_array_value, double_array_t); EXPECT_EQ(ldouble_array_value, ldouble_array_t); EXPECT_EQ(bool_array_value, bool_array_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wstring_array_value, wstring_array_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_ARRAY_EQ(octet_array_2_value, octet_array_2_t, 5); EXPECT_ARRAY_EQ(char_array_2_value, char_array_2_t, 5); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_ARRAY_EQ(wchar_array_2_value, wchar_array_2_t, 5); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_ARRAY_EQ(int8_array_2_value, int8_array_2_t, 5); EXPECT_ARRAY_EQ(ushort_array_2_value, ushort_array_2_t, 5); EXPECT_ARRAY_EQ(short_array_2_value, short_array_2_t, 5); @@ -2489,11 +2592,15 @@ TEST(CDRResizeTests, Complete) EXPECT_ARRAY_DOUBLE_EQ(double_array_2_value, double_array_2_t, 5); EXPECT_ARRAY_LONG_DOUBLE_EQ(ldouble_array_2_value, ldouble_array_2_t, 5); EXPECT_ARRAY_EQ(bool_array_2_value, bool_array_2_t, 5); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_ARRAY_EQ(wstring_array_2_value, wstring_array_2_t, 5); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(octet_vector_value, octet_vector_t); EXPECT_EQ(char_vector_value, char_vector_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wchar_vector_value, wchar_vector_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(int8_vector_value, int8_vector_t); EXPECT_EQ(ushort_vector_value, ushort_vector_t); EXPECT_EQ(short_vector_value, short_vector_t); @@ -2505,15 +2612,19 @@ TEST(CDRResizeTests, Complete) EXPECT_EQ(double_vector_value, double_vector_t); EXPECT_EQ(ldouble_vector_value, ldouble_vector_t); EXPECT_EQ(bool_vector_value, bool_vector_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wstring_vector_value, wstring_vector_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(triple_ulong_array_t, triple_ulong_array_value); EXPECT_EQ(octet_seq_len, 5u); EXPECT_ARRAY_EQ(octet_seq_value, octet_seq_t, 5); EXPECT_EQ(char_seq_len, 5u); EXPECT_ARRAY_EQ(char_seq_value, char_seq_t, 5); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wchar_seq_len, 5u); EXPECT_ARRAY_EQ(wchar_seq_value, wchar_seq_t, 5); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(int8_seq_len, 5u); EXPECT_ARRAY_EQ(int8_seq_value, int8_seq_t, 5); EXPECT_EQ(ushort_seq_len, 5u); @@ -2534,17 +2645,25 @@ TEST(CDRResizeTests, Complete) EXPECT_ARRAY_DOUBLE_EQ(double_seq_value, double_seq_t, 5); EXPECT_EQ(ldouble_seq_len, 5u); EXPECT_ARRAY_LONG_DOUBLE_EQ(ldouble_seq_value, ldouble_seq_t, 5); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wstring_seq_len, 5u); EXPECT_ARRAY_EQ(wstring_seq_value, wstring_seq_t, 5); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(strcmp(c_string_t, c_string_value), 0); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wcscmp(c_wstring_t, c_wstring_value), 0); +#endif // if !FASTCDR_DISABLE_WSTRINGS +#if !FASTCDR_DISABLE_WSTRINGS delete[] wstring_seq_value; +#endif // if !FASTCDR_DISABLE_WSTRINGS free(octet_seq_value); free(char_seq_value); +#if !FASTCDR_DISABLE_WSTRINGS free(wchar_seq_value); +#endif // if !FASTCDR_DISABLE_WSTRINGS free(int8_seq_value); free(ushort_seq_value); free(short_seq_value); @@ -2556,7 +2675,9 @@ TEST(CDRResizeTests, Complete) free(double_seq_value); free(ldouble_seq_value); free(c_string_value); +#if !FASTCDR_DISABLE_WSTRINGS free(c_wstring_value); +#endif // if !FASTCDR_DISABLE_WSTRINGS } TEST(FastCDRResizeTests, Octet) @@ -2566,9 +2687,9 @@ TEST(FastCDRResizeTests, Octet) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << octet_t; - }); + { + cdr_ser << octet_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -2576,9 +2697,9 @@ TEST(FastCDRResizeTests, Octet) uint8_t octet_value = 0; EXPECT_NO_THROW( - { - cdr_des >> octet_value; - }); + { + cdr_des >> octet_value; + }); EXPECT_EQ(octet_value, octet_t); } @@ -2590,9 +2711,9 @@ TEST(FastCDRResizeTests, Char) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << char_t; - }); + { + cdr_ser << char_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -2600,13 +2721,14 @@ TEST(FastCDRResizeTests, Char) char char_value = 0; EXPECT_NO_THROW( - { - cdr_des >> char_value; - }); + { + cdr_des >> char_value; + }); EXPECT_EQ(char_value, char_t); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRResizeTests, WChar) { // Serialization. @@ -2614,9 +2736,9 @@ TEST(FastCDRResizeTests, WChar) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << wchar; - }); + { + cdr_ser << wchar; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -2624,13 +2746,15 @@ TEST(FastCDRResizeTests, WChar) wchar_t char_value = 0; EXPECT_NO_THROW( - { - cdr_des >> char_value; - }); + { + cdr_des >> char_value; + }); EXPECT_EQ(char_value, wchar); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(FastCDRResizeTests, Int8) { // Serialization. @@ -2638,9 +2762,9 @@ TEST(FastCDRResizeTests, Int8) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << int8; - }); + { + cdr_ser << int8; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -2648,9 +2772,9 @@ TEST(FastCDRResizeTests, Int8) int8_t int8_value = 0; EXPECT_NO_THROW( - { - cdr_des >> int8_value; - }); + { + cdr_des >> int8_value; + }); EXPECT_EQ(int8_value, int8); } @@ -2662,9 +2786,9 @@ TEST(FastCDRResizeTests, UnsignedShort) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ushort_t; - }); + { + cdr_ser << ushort_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -2672,9 +2796,9 @@ TEST(FastCDRResizeTests, UnsignedShort) uint16_t ushort_value = 0; EXPECT_NO_THROW( - { - cdr_des >> ushort_value; - }); + { + cdr_des >> ushort_value; + }); EXPECT_EQ(ushort_value, ushort_t); } @@ -2686,9 +2810,9 @@ TEST(FastCDRResizeTests, Short) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << short_t; - }); + { + cdr_ser << short_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -2696,9 +2820,9 @@ TEST(FastCDRResizeTests, Short) int16_t short_value = 0; EXPECT_NO_THROW( - { - cdr_des >> short_value; - }); + { + cdr_des >> short_value; + }); EXPECT_EQ(short_value, short_t); } @@ -2710,9 +2834,9 @@ TEST(FastCDRResizeTests, UnsignedLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ulong_t; - }); + { + cdr_ser << ulong_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -2720,9 +2844,9 @@ TEST(FastCDRResizeTests, UnsignedLong) uint32_t ulong_value = 0; EXPECT_NO_THROW( - { - cdr_des >> ulong_value; - }); + { + cdr_des >> ulong_value; + }); EXPECT_EQ(ulong_value, ulong_t); } @@ -2734,9 +2858,9 @@ TEST(FastCDRResizeTests, Long) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << long_t; - }); + { + cdr_ser << long_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -2744,9 +2868,9 @@ TEST(FastCDRResizeTests, Long) int32_t long_value = 0; EXPECT_NO_THROW( - { - cdr_des >> long_value; - }); + { + cdr_des >> long_value; + }); EXPECT_EQ(long_value, long_t); } @@ -2758,9 +2882,9 @@ TEST(FastCDRResizeTests, UnsignedLongLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ulonglong_t; - }); + { + cdr_ser << ulonglong_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -2768,9 +2892,9 @@ TEST(FastCDRResizeTests, UnsignedLongLong) uint64_t ulonglong_value = 0; EXPECT_NO_THROW( - { - cdr_des >> ulonglong_value; - }); + { + cdr_des >> ulonglong_value; + }); EXPECT_EQ(ulonglong_value, ulonglong_t); } @@ -2782,9 +2906,9 @@ TEST(FastCDRResizeTests, LongLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << longlong_t; - }); + { + cdr_ser << longlong_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -2792,9 +2916,9 @@ TEST(FastCDRResizeTests, LongLong) int64_t longlong_value = 0; EXPECT_NO_THROW( - { - cdr_des >> longlong_value; - }); + { + cdr_des >> longlong_value; + }); EXPECT_EQ(longlong_value, longlong_t); } @@ -2806,9 +2930,9 @@ TEST(FastCDRResizeTests, Float) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << float_tt; - }); + { + cdr_ser << float_tt; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -2816,9 +2940,9 @@ TEST(FastCDRResizeTests, Float) float float_value = 0; EXPECT_NO_THROW( - { - cdr_des >> float_value; - }); + { + cdr_des >> float_value; + }); EXPECT_FLOAT_EQ(float_value, float_tt); } @@ -2830,9 +2954,9 @@ TEST(FastCDRResizeTests, Double) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << double_tt; - }); + { + cdr_ser << double_tt; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -2840,9 +2964,9 @@ TEST(FastCDRResizeTests, Double) double double_value = 0; EXPECT_NO_THROW( - { - cdr_des >> double_value; - }); + { + cdr_des >> double_value; + }); EXPECT_DOUBLE_EQ(double_value, double_tt); } @@ -2854,9 +2978,9 @@ TEST(FastCDRResizeTests, LongDouble) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ldouble_tt; - }); + { + cdr_ser << ldouble_tt; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -2864,9 +2988,9 @@ TEST(FastCDRResizeTests, LongDouble) long double ldouble_value = 0; EXPECT_NO_THROW( - { - cdr_des >> ldouble_value; - }); + { + cdr_des >> ldouble_value; + }); EXPECT_LONG_DOUBLE_EQ(ldouble_value, ldouble_tt); } @@ -2878,9 +3002,9 @@ TEST(FastCDRResizeTests, Boolean) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << bool_t; - }); + { + cdr_ser << bool_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -2888,9 +3012,9 @@ TEST(FastCDRResizeTests, Boolean) bool bool_value = false; EXPECT_NO_THROW( - { - cdr_des >> bool_value; - }); + { + cdr_des >> bool_value; + }); EXPECT_EQ(bool_value, bool_t); } @@ -2902,9 +3026,9 @@ TEST(FastCDRResizeTests, String) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << string_t; - }); + { + cdr_ser << string_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -2912,13 +3036,14 @@ TEST(FastCDRResizeTests, String) std::string string_value; EXPECT_NO_THROW( - { - cdr_des >> string_value; - }); + { + cdr_des >> string_value; + }); EXPECT_EQ(string_value, string_t); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRResizeTests, WString) { // Serialization. @@ -2926,9 +3051,9 @@ TEST(FastCDRResizeTests, WString) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << wstring_t; - }); + { + cdr_ser << wstring_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -2936,13 +3061,15 @@ TEST(FastCDRResizeTests, WString) std::wstring string_value; EXPECT_NO_THROW( - { - cdr_des >> string_value; - }); + { + cdr_des >> string_value; + }); EXPECT_EQ(string_value, wstring_t); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(FastCDRResizeTests, STDArrayOctet) { // Serialization. @@ -2950,9 +3077,9 @@ TEST(FastCDRResizeTests, STDArrayOctet) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << octet_array_t; - }); + { + cdr_ser << octet_array_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -2960,9 +3087,9 @@ TEST(FastCDRResizeTests, STDArrayOctet) std::array octet_array_value; EXPECT_NO_THROW( - { - cdr_des >> octet_array_value; - }); + { + cdr_des >> octet_array_value; + }); EXPECT_EQ(octet_array_value, octet_array_t); } @@ -2974,9 +3101,9 @@ TEST(FastCDRResizeTests, STDArrayChar) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << char_array_t; - }); + { + cdr_ser << char_array_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -2984,13 +3111,14 @@ TEST(FastCDRResizeTests, STDArrayChar) std::array char_array_value; EXPECT_NO_THROW( - { - cdr_des >> char_array_value; - }); + { + cdr_des >> char_array_value; + }); EXPECT_EQ(char_array_value, char_array_t); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRResizeTests, STDArrayWChar) { // Serialization. @@ -2998,9 +3126,9 @@ TEST(FastCDRResizeTests, STDArrayWChar) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << wchar_array_t; - }); + { + cdr_ser << wchar_array_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3008,13 +3136,15 @@ TEST(FastCDRResizeTests, STDArrayWChar) std::array char_array_value; EXPECT_NO_THROW( - { - cdr_des >> char_array_value; - }); + { + cdr_des >> char_array_value; + }); EXPECT_EQ(char_array_value, wchar_array_t); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(FastCDRResizeTests, STDArrayInt8) { // Serialization. @@ -3022,9 +3152,9 @@ TEST(FastCDRResizeTests, STDArrayInt8) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << int8_array_t; - }); + { + cdr_ser << int8_array_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3032,9 +3162,9 @@ TEST(FastCDRResizeTests, STDArrayInt8) std::array int8_array_value; EXPECT_NO_THROW( - { - cdr_des >> int8_array_value; - }); + { + cdr_des >> int8_array_value; + }); EXPECT_EQ(int8_array_value, int8_array_t); } @@ -3046,9 +3176,9 @@ TEST(FastCDRResizeTests, STDArrayUnsignedShort) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ushort_array_t; - }); + { + cdr_ser << ushort_array_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3056,9 +3186,9 @@ TEST(FastCDRResizeTests, STDArrayUnsignedShort) std::array ushort_array_value; EXPECT_NO_THROW( - { - cdr_des >> ushort_array_value; - }); + { + cdr_des >> ushort_array_value; + }); EXPECT_EQ(ushort_array_value, ushort_array_t); } @@ -3070,9 +3200,9 @@ TEST(FastCDRResizeTests, STDArrayShort) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << short_array_t; - }); + { + cdr_ser << short_array_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3080,9 +3210,9 @@ TEST(FastCDRResizeTests, STDArrayShort) std::array short_array_value; EXPECT_NO_THROW( - { - cdr_des >> short_array_value; - }); + { + cdr_des >> short_array_value; + }); EXPECT_EQ(short_array_value, short_array_t); } @@ -3094,9 +3224,9 @@ TEST(FastCDRResizeTests, STDArrayUnsignedLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ulong_array_t; - }); + { + cdr_ser << ulong_array_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3104,9 +3234,9 @@ TEST(FastCDRResizeTests, STDArrayUnsignedLong) std::array ulong_array_value; EXPECT_NO_THROW( - { - cdr_des >> ulong_array_value; - }); + { + cdr_des >> ulong_array_value; + }); EXPECT_EQ(ulong_array_value, ulong_array_t); } @@ -3118,9 +3248,9 @@ TEST(FastCDRResizeTests, STDArrayLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << long_array_t; - }); + { + cdr_ser << long_array_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3128,9 +3258,9 @@ TEST(FastCDRResizeTests, STDArrayLong) std::array long_array_value; EXPECT_NO_THROW( - { - cdr_des >> long_array_value; - }); + { + cdr_des >> long_array_value; + }); EXPECT_EQ(long_array_value, long_array_t); } @@ -3142,9 +3272,9 @@ TEST(FastCDRResizeTests, STDArrayUnsignedLongLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ulonglong_array_t; - }); + { + cdr_ser << ulonglong_array_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3152,9 +3282,9 @@ TEST(FastCDRResizeTests, STDArrayUnsignedLongLong) std::array ulonglong_array_value; EXPECT_NO_THROW( - { - cdr_des >> ulonglong_array_value; - }); + { + cdr_des >> ulonglong_array_value; + }); EXPECT_EQ(ulonglong_array_value, ulonglong_array_t); } @@ -3166,9 +3296,9 @@ TEST(FastCDRResizeTests, STDArrayLongLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << longlong_array_t; - }); + { + cdr_ser << longlong_array_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3176,9 +3306,9 @@ TEST(FastCDRResizeTests, STDArrayLongLong) std::array longlong_array_value; EXPECT_NO_THROW( - { - cdr_des >> longlong_array_value; - }); + { + cdr_des >> longlong_array_value; + }); EXPECT_EQ(longlong_array_value, longlong_array_t); } @@ -3190,9 +3320,9 @@ TEST(FastCDRResizeTests, STDArrayFloat) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << float_array_t; - }); + { + cdr_ser << float_array_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3200,9 +3330,9 @@ TEST(FastCDRResizeTests, STDArrayFloat) std::array float_array_value; EXPECT_NO_THROW( - { - cdr_des >> float_array_value; - }); + { + cdr_des >> float_array_value; + }); EXPECT_EQ(float_array_value, float_array_t); } @@ -3214,9 +3344,9 @@ TEST(FastCDRResizeTests, STDArrayDouble) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << double_array_t; - }); + { + cdr_ser << double_array_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3224,9 +3354,9 @@ TEST(FastCDRResizeTests, STDArrayDouble) std::array double_array_value; EXPECT_NO_THROW( - { - cdr_des >> double_array_value; - }); + { + cdr_des >> double_array_value; + }); EXPECT_EQ(double_array_value, double_array_t); } @@ -3238,9 +3368,9 @@ TEST(FastCDRResizeTests, STDArrayLongDouble) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ldouble_array_t; - }); + { + cdr_ser << ldouble_array_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3248,9 +3378,9 @@ TEST(FastCDRResizeTests, STDArrayLongDouble) std::array ldouble_array_value; EXPECT_NO_THROW( - { - cdr_des >> ldouble_array_value; - }); + { + cdr_des >> ldouble_array_value; + }); EXPECT_EQ(ldouble_array_value, ldouble_array_t); } @@ -3262,9 +3392,9 @@ TEST(FastCDRResizeTests, STDArrayBoolean) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << bool_array_t; - }); + { + cdr_ser << bool_array_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3272,9 +3402,9 @@ TEST(FastCDRResizeTests, STDArrayBoolean) std::array bool_array_value; EXPECT_NO_THROW( - { - cdr_des >> bool_array_value; - }); + { + cdr_des >> bool_array_value; + }); EXPECT_EQ(bool_array_value, bool_array_t); } @@ -3286,9 +3416,9 @@ TEST(FastCDRResizeTests, STDArrayString) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << string_array_t; - }); + { + cdr_ser << string_array_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3296,13 +3426,14 @@ TEST(FastCDRResizeTests, STDArrayString) std::array string_array_value; EXPECT_NO_THROW( - { - cdr_des >> string_array_value; - }); + { + cdr_des >> string_array_value; + }); EXPECT_EQ(string_array_value, string_array_t); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRResizeTests, STDArrayWString) { // Serialization. @@ -3310,9 +3441,9 @@ TEST(FastCDRResizeTests, STDArrayWString) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << wstring_array_t; - }); + { + cdr_ser << wstring_array_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3320,13 +3451,15 @@ TEST(FastCDRResizeTests, STDArrayWString) std::array string_array_value; EXPECT_NO_THROW( - { - cdr_des >> string_array_value; - }); + { + cdr_des >> string_array_value; + }); EXPECT_EQ(string_array_value, wstring_array_t); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(FastCDRResizeTests, ArrayOctet) { // Serialization. @@ -3334,9 +3467,9 @@ TEST(FastCDRResizeTests, ArrayOctet) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(octet_array_2_t, 5); - }); + { + cdr_ser.serialize_array(octet_array_2_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3344,9 +3477,9 @@ TEST(FastCDRResizeTests, ArrayOctet) uint8_t octet_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(octet_array_2_value, 5); - }); + { + cdr_des.deserialize_array(octet_array_2_value, 5); + }); EXPECT_ARRAY_EQ(octet_array_2_value, octet_array_2_t, 5); } @@ -3358,9 +3491,9 @@ TEST(FastCDRResizeTests, ArrayChar) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(char_array_2_t, 5); - }); + { + cdr_ser.serialize_array(char_array_2_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3368,13 +3501,14 @@ TEST(FastCDRResizeTests, ArrayChar) char char_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(char_array_2_value, 5); - }); + { + cdr_des.deserialize_array(char_array_2_value, 5); + }); EXPECT_ARRAY_EQ(char_array_2_value, char_array_2_t, 5); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRResizeTests, ArrayWChar) { // Serialization. @@ -3382,9 +3516,9 @@ TEST(FastCDRResizeTests, ArrayWChar) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(wchar_array_2_t, 5); - }); + { + cdr_ser.serialize_array(wchar_array_2_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3392,13 +3526,15 @@ TEST(FastCDRResizeTests, ArrayWChar) wchar_t char_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(char_array_2_value, 5); - }); + { + cdr_des.deserialize_array(char_array_2_value, 5); + }); EXPECT_ARRAY_EQ(char_array_2_value, wchar_array_2_t, 5); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(FastCDRResizeTests, ArrayInt8) { // Serialization. @@ -3406,9 +3542,9 @@ TEST(FastCDRResizeTests, ArrayInt8) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(int8_array_2_t, 5); - }); + { + cdr_ser.serialize_array(int8_array_2_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3416,9 +3552,9 @@ TEST(FastCDRResizeTests, ArrayInt8) int8_t int8_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(int8_array_2_value, 5); - }); + { + cdr_des.deserialize_array(int8_array_2_value, 5); + }); EXPECT_ARRAY_EQ(int8_array_2_value, int8_array_2_t, 5); } @@ -3430,9 +3566,9 @@ TEST(FastCDRResizeTests, ArrayUnsignedShort) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(ushort_array_2_t, 5); - }); + { + cdr_ser.serialize_array(ushort_array_2_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3440,9 +3576,9 @@ TEST(FastCDRResizeTests, ArrayUnsignedShort) uint16_t ushort_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(ushort_array_2_value, 5); - }); + { + cdr_des.deserialize_array(ushort_array_2_value, 5); + }); EXPECT_ARRAY_EQ(ushort_array_2_value, ushort_array_2_t, 5); } @@ -3454,9 +3590,9 @@ TEST(FastCDRResizeTests, ArrayShort) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(short_array_2_t, 5); - }); + { + cdr_ser.serialize_array(short_array_2_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3464,9 +3600,9 @@ TEST(FastCDRResizeTests, ArrayShort) int16_t short_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(short_array_2_value, 5); - }); + { + cdr_des.deserialize_array(short_array_2_value, 5); + }); EXPECT_ARRAY_EQ(short_array_2_value, short_array_2_t, 5); } @@ -3478,9 +3614,9 @@ TEST(FastCDRResizeTests, ArrayUnsignedLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(ulong_array_2_t, 5); - }); + { + cdr_ser.serialize_array(ulong_array_2_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3488,9 +3624,9 @@ TEST(FastCDRResizeTests, ArrayUnsignedLong) uint32_t ulong_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(ulong_array_2_value, 5); - }); + { + cdr_des.deserialize_array(ulong_array_2_value, 5); + }); EXPECT_ARRAY_EQ(ulong_array_2_value, ulong_array_2_t, 5); } @@ -3502,9 +3638,9 @@ TEST(FastCDRResizeTests, ArrayLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(long_array_2_t, 5); - }); + { + cdr_ser.serialize_array(long_array_2_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3512,9 +3648,9 @@ TEST(FastCDRResizeTests, ArrayLong) int32_t long_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(long_array_2_value, 5); - }); + { + cdr_des.deserialize_array(long_array_2_value, 5); + }); EXPECT_ARRAY_EQ(long_array_2_value, long_array_2_t, 5); } @@ -3526,9 +3662,9 @@ TEST(FastCDRResizeTests, ArrayUnsignedLongLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(ulonglong_array_2_t, 5); - }); + { + cdr_ser.serialize_array(ulonglong_array_2_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3536,9 +3672,9 @@ TEST(FastCDRResizeTests, ArrayUnsignedLongLong) uint64_t ulonglong_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(ulonglong_array_2_value, 5); - }); + { + cdr_des.deserialize_array(ulonglong_array_2_value, 5); + }); EXPECT_ARRAY_EQ(ulonglong_array_2_value, ulonglong_array_2_t, 5); } @@ -3550,9 +3686,9 @@ TEST(FastCDRResizeTests, ArrayLongLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(longlong_array_2_t, 5); - }); + { + cdr_ser.serialize_array(longlong_array_2_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3560,9 +3696,9 @@ TEST(FastCDRResizeTests, ArrayLongLong) int64_t longlong_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(longlong_array_2_value, 5); - }); + { + cdr_des.deserialize_array(longlong_array_2_value, 5); + }); EXPECT_ARRAY_EQ(longlong_array_2_value, longlong_array_2_t, 5); } @@ -3574,9 +3710,9 @@ TEST(FastCDRResizeTests, ArrayFloat) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(float_array_2_t, 5); - }); + { + cdr_ser.serialize_array(float_array_2_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3584,9 +3720,9 @@ TEST(FastCDRResizeTests, ArrayFloat) float float_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(float_array_2_value, 5); - }); + { + cdr_des.deserialize_array(float_array_2_value, 5); + }); EXPECT_ARRAY_FLOAT_EQ(float_array_2_value, float_array_2_t, 5); } @@ -3598,9 +3734,9 @@ TEST(FastCDRResizeTests, ArrayDouble) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(double_array_2_t, 5); - }); + { + cdr_ser.serialize_array(double_array_2_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3608,9 +3744,9 @@ TEST(FastCDRResizeTests, ArrayDouble) double double_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(double_array_2_value, 5); - }); + { + cdr_des.deserialize_array(double_array_2_value, 5); + }); EXPECT_ARRAY_DOUBLE_EQ(double_array_2_value, double_array_2_t, 5); } @@ -3622,9 +3758,9 @@ TEST(FastCDRResizeTests, ArrayLongDouble) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(ldouble_array_2_t, 5); - }); + { + cdr_ser.serialize_array(ldouble_array_2_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3632,9 +3768,9 @@ TEST(FastCDRResizeTests, ArrayLongDouble) long double ldouble_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(ldouble_array_2_value, 5); - }); + { + cdr_des.deserialize_array(ldouble_array_2_value, 5); + }); EXPECT_ARRAY_LONG_DOUBLE_EQ(ldouble_array_2_value, ldouble_array_2_t, 5); } @@ -3646,9 +3782,9 @@ TEST(FastCDRResizeTests, ArrayBoolean) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(bool_array_2_t, 5); - }); + { + cdr_ser.serialize_array(bool_array_2_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3656,9 +3792,9 @@ TEST(FastCDRResizeTests, ArrayBoolean) bool bool_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(bool_array_2_value, 5); - }); + { + cdr_des.deserialize_array(bool_array_2_value, 5); + }); EXPECT_ARRAY_EQ(bool_array_2_value, bool_array_2_t, 5); } @@ -3670,9 +3806,9 @@ TEST(FastCDRResizeTests, ArrayString) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(string_array_2_t, 5); - }); + { + cdr_ser.serialize_array(string_array_2_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3680,13 +3816,14 @@ TEST(FastCDRResizeTests, ArrayString) std::string string_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(string_array_2_value, 5); - }); + { + cdr_des.deserialize_array(string_array_2_value, 5); + }); EXPECT_ARRAY_EQ(string_array_2_value, string_array_2_t, 5); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRResizeTests, ArrayWString) { // Serialization. @@ -3694,9 +3831,9 @@ TEST(FastCDRResizeTests, ArrayWString) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_array(wstring_array_2_t, 5); - }); + { + cdr_ser.serialize_array(wstring_array_2_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3704,13 +3841,15 @@ TEST(FastCDRResizeTests, ArrayWString) std::wstring string_array_2_value[5]; EXPECT_NO_THROW( - { - cdr_des.deserialize_array(string_array_2_value, 5); - }); + { + cdr_des.deserialize_array(string_array_2_value, 5); + }); EXPECT_ARRAY_EQ(string_array_2_value, wstring_array_2_t, 5); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(FastCDRResizeTests, STDVectorOctet) { // Serialization. @@ -3718,9 +3857,9 @@ TEST(FastCDRResizeTests, STDVectorOctet) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << octet_vector_t; - }); + { + cdr_ser << octet_vector_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3728,9 +3867,9 @@ TEST(FastCDRResizeTests, STDVectorOctet) std::vector octet_vector_value; EXPECT_NO_THROW( - { - cdr_des >> octet_vector_value; - }); + { + cdr_des >> octet_vector_value; + }); EXPECT_EQ(octet_vector_value, octet_vector_t); } @@ -3742,9 +3881,9 @@ TEST(FastCDRResizeTests, STDVectorChar) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << char_vector_t; - }); + { + cdr_ser << char_vector_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3752,13 +3891,14 @@ TEST(FastCDRResizeTests, STDVectorChar) std::vector char_vector_value; EXPECT_NO_THROW( - { - cdr_des >> char_vector_value; - }); + { + cdr_des >> char_vector_value; + }); EXPECT_EQ(char_vector_value, char_vector_t); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRResizeTests, STDVectorWChar) { // Serialization. @@ -3766,9 +3906,9 @@ TEST(FastCDRResizeTests, STDVectorWChar) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << wchar_vector_t; - }); + { + cdr_ser << wchar_vector_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3776,13 +3916,15 @@ TEST(FastCDRResizeTests, STDVectorWChar) std::vector char_vector_value; EXPECT_NO_THROW( - { - cdr_des >> char_vector_value; - }); + { + cdr_des >> char_vector_value; + }); EXPECT_EQ(char_vector_value, wchar_vector_t); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(FastCDRResizeTests, STDVectorInt8) { // Serialization. @@ -3790,9 +3932,9 @@ TEST(FastCDRResizeTests, STDVectorInt8) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << int8_vector_t; - }); + { + cdr_ser << int8_vector_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3800,9 +3942,9 @@ TEST(FastCDRResizeTests, STDVectorInt8) std::vector int8_vector_value; EXPECT_NO_THROW( - { - cdr_des >> int8_vector_value; - }); + { + cdr_des >> int8_vector_value; + }); EXPECT_EQ(int8_vector_value, int8_vector_t); } @@ -3814,9 +3956,9 @@ TEST(FastCDRResizeTests, STDVectorUnsignedShort) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ushort_vector_t; - }); + { + cdr_ser << ushort_vector_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3824,9 +3966,9 @@ TEST(FastCDRResizeTests, STDVectorUnsignedShort) std::vector ushort_vector_value; EXPECT_NO_THROW( - { - cdr_des >> ushort_vector_value; - }); + { + cdr_des >> ushort_vector_value; + }); EXPECT_EQ(ushort_vector_value, ushort_vector_t); } @@ -3838,9 +3980,9 @@ TEST(FastCDRResizeTests, STDVectorShort) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << short_vector_t; - }); + { + cdr_ser << short_vector_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3848,9 +3990,9 @@ TEST(FastCDRResizeTests, STDVectorShort) std::vector short_vector_value; EXPECT_NO_THROW( - { - cdr_des >> short_vector_value; - }); + { + cdr_des >> short_vector_value; + }); EXPECT_EQ(short_vector_value, short_vector_t); } @@ -3862,9 +4004,9 @@ TEST(FastCDRResizeTests, STDVectorUnsignedLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ulong_vector_t; - }); + { + cdr_ser << ulong_vector_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3872,9 +4014,9 @@ TEST(FastCDRResizeTests, STDVectorUnsignedLong) std::vector ulong_vector_value; EXPECT_NO_THROW( - { - cdr_des >> ulong_vector_value; - }); + { + cdr_des >> ulong_vector_value; + }); EXPECT_EQ(ulong_vector_value, ulong_vector_t); } @@ -3886,9 +4028,9 @@ TEST(FastCDRResizeTests, STDVectorLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << long_vector_t; - }); + { + cdr_ser << long_vector_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3896,9 +4038,9 @@ TEST(FastCDRResizeTests, STDVectorLong) std::vector long_vector_value; EXPECT_NO_THROW( - { - cdr_des >> long_vector_value; - }); + { + cdr_des >> long_vector_value; + }); EXPECT_EQ(long_vector_value, long_vector_t); } @@ -3910,9 +4052,9 @@ TEST(FastCDRResizeTests, STDVectorUnsignedLongLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ulonglong_vector_t; - }); + { + cdr_ser << ulonglong_vector_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3920,9 +4062,9 @@ TEST(FastCDRResizeTests, STDVectorUnsignedLongLong) std::vector ulonglong_vector_value; EXPECT_NO_THROW( - { - cdr_des >> ulonglong_vector_value; - }); + { + cdr_des >> ulonglong_vector_value; + }); EXPECT_EQ(ulonglong_vector_value, ulonglong_vector_t); } @@ -3934,9 +4076,9 @@ TEST(FastCDRResizeTests, STDVectorLongLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << longlong_vector_t; - }); + { + cdr_ser << longlong_vector_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3944,9 +4086,9 @@ TEST(FastCDRResizeTests, STDVectorLongLong) std::vector longlong_vector_value; EXPECT_NO_THROW( - { - cdr_des >> longlong_vector_value; - }); + { + cdr_des >> longlong_vector_value; + }); EXPECT_EQ(longlong_vector_value, longlong_vector_t); } @@ -3958,9 +4100,9 @@ TEST(FastCDRResizeTests, STDVectorFloat) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << float_vector_t; - }); + { + cdr_ser << float_vector_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3968,9 +4110,9 @@ TEST(FastCDRResizeTests, STDVectorFloat) std::vector float_vector_value; EXPECT_NO_THROW( - { - cdr_des >> float_vector_value; - }); + { + cdr_des >> float_vector_value; + }); EXPECT_EQ(float_vector_value, float_vector_t); } @@ -3982,9 +4124,9 @@ TEST(FastCDRResizeTests, STDVectorDouble) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << double_vector_t; - }); + { + cdr_ser << double_vector_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -3992,9 +4134,9 @@ TEST(FastCDRResizeTests, STDVectorDouble) std::vector double_vector_value; EXPECT_NO_THROW( - { - cdr_des >> double_vector_value; - }); + { + cdr_des >> double_vector_value; + }); EXPECT_EQ(double_vector_value, double_vector_t); } @@ -4006,9 +4148,9 @@ TEST(FastCDRResizeTests, STDVectorLongDouble) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << ldouble_vector_t; - }); + { + cdr_ser << ldouble_vector_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4016,9 +4158,9 @@ TEST(FastCDRResizeTests, STDVectorLongDouble) std::vector ldouble_vector_value; EXPECT_NO_THROW( - { - cdr_des >> ldouble_vector_value; - }); + { + cdr_des >> ldouble_vector_value; + }); EXPECT_EQ(ldouble_vector_value, ldouble_vector_t); } @@ -4030,9 +4172,9 @@ TEST(FastCDRResizeTests, STDVectorBoolean) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << bool_vector_t; - }); + { + cdr_ser << bool_vector_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4040,9 +4182,9 @@ TEST(FastCDRResizeTests, STDVectorBoolean) std::vector bool_vector_value; EXPECT_NO_THROW( - { - cdr_des >> bool_vector_value; - }); + { + cdr_des >> bool_vector_value; + }); EXPECT_EQ(bool_vector_value, bool_vector_t); } @@ -4054,9 +4196,9 @@ TEST(FastCDRResizeTests, STDVectorString) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << string_vector_t; - }); + { + cdr_ser << string_vector_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4064,13 +4206,14 @@ TEST(FastCDRResizeTests, STDVectorString) std::vector string_vector_value; EXPECT_NO_THROW( - { - cdr_des >> string_vector_value; - }); + { + cdr_des >> string_vector_value; + }); EXPECT_EQ(string_vector_value, string_vector_t); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRResizeTests, STDVectorWString) { // Serialization. @@ -4078,9 +4221,9 @@ TEST(FastCDRResizeTests, STDVectorWString) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << wstring_vector_t; - }); + { + cdr_ser << wstring_vector_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4088,13 +4231,15 @@ TEST(FastCDRResizeTests, STDVectorWString) std::vector string_vector_value; EXPECT_NO_THROW( - { - cdr_des >> string_vector_value; - }); + { + cdr_des >> string_vector_value; + }); EXPECT_EQ(string_vector_value, wstring_vector_t); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(FastCDRResizeTests, STDTripleArrayUnsignedLong) { // Serialization. @@ -4102,9 +4247,9 @@ TEST(FastCDRResizeTests, STDTripleArrayUnsignedLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << triple_ulong_array_t; - }); + { + cdr_ser << triple_ulong_array_t; + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4112,9 +4257,9 @@ TEST(FastCDRResizeTests, STDTripleArrayUnsignedLong) std::array, 2>, 2> triple_ulong_array_value; EXPECT_NO_THROW( - { - cdr_des >> triple_ulong_array_value; - }); + { + cdr_des >> triple_ulong_array_value; + }); EXPECT_EQ(triple_ulong_array_value, triple_ulong_array_t); } @@ -4126,9 +4271,9 @@ TEST(FastCDRResizeTests, SequenceOctet) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(octet_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(octet_seq_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4136,9 +4281,9 @@ TEST(FastCDRResizeTests, SequenceOctet) uint8_t* octet_seq_value = NULL; size_t octet_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(octet_seq_value, octet_seq_len); - }); + { + cdr_des.deserialize_sequence(octet_seq_value, octet_seq_len); + }); EXPECT_EQ(octet_seq_len, 5u); EXPECT_ARRAY_EQ(octet_seq_value, octet_seq_t, octet_seq_len); @@ -4153,9 +4298,9 @@ TEST(FastCDRResizeTests, SequenceChar) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(char_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(char_seq_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4163,9 +4308,9 @@ TEST(FastCDRResizeTests, SequenceChar) char* char_seq_value = NULL; size_t char_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(char_seq_value, char_seq_len); - }); + { + cdr_des.deserialize_sequence(char_seq_value, char_seq_len); + }); EXPECT_EQ(char_seq_len, 5u); EXPECT_ARRAY_EQ(char_seq_value, char_seq_t, char_seq_len); @@ -4173,6 +4318,7 @@ TEST(FastCDRResizeTests, SequenceChar) free(char_seq_value); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRResizeTests, SequenceWChar) { // Serialization. @@ -4180,9 +4326,9 @@ TEST(FastCDRResizeTests, SequenceWChar) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(wchar_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(wchar_seq_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4190,9 +4336,9 @@ TEST(FastCDRResizeTests, SequenceWChar) wchar_t* char_seq_value = NULL; size_t char_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(char_seq_value, char_seq_len); - }); + { + cdr_des.deserialize_sequence(char_seq_value, char_seq_len); + }); EXPECT_EQ(char_seq_len, 5u); EXPECT_ARRAY_EQ(char_seq_value, wchar_seq_t, char_seq_len); @@ -4200,6 +4346,8 @@ TEST(FastCDRResizeTests, SequenceWChar) free(char_seq_value); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(FastCDRResizeTests, SequenceInt8) { // Serialization. @@ -4207,9 +4355,9 @@ TEST(FastCDRResizeTests, SequenceInt8) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(int8_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(int8_seq_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4217,9 +4365,9 @@ TEST(FastCDRResizeTests, SequenceInt8) int8_t* int8_seq_value = NULL; size_t int8_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(int8_seq_value, int8_seq_len); - }); + { + cdr_des.deserialize_sequence(int8_seq_value, int8_seq_len); + }); EXPECT_EQ(int8_seq_len, 5u); EXPECT_ARRAY_EQ(int8_seq_value, int8_seq_t, int8_seq_len); @@ -4234,9 +4382,9 @@ TEST(FastCDRResizeTests, SequenceUnsignedShort) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(ushort_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(ushort_seq_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4244,9 +4392,9 @@ TEST(FastCDRResizeTests, SequenceUnsignedShort) uint16_t* ushort_seq_value = NULL; size_t ushort_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(ushort_seq_value, ushort_seq_len); - }); + { + cdr_des.deserialize_sequence(ushort_seq_value, ushort_seq_len); + }); EXPECT_EQ(ushort_seq_len, 5u); EXPECT_ARRAY_EQ(ushort_seq_value, ushort_seq_t, ushort_seq_len); @@ -4261,9 +4409,9 @@ TEST(FastCDRResizeTests, SequenceShort) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(short_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(short_seq_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4271,9 +4419,9 @@ TEST(FastCDRResizeTests, SequenceShort) int16_t* short_seq_value = NULL; size_t short_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(short_seq_value, short_seq_len); - }); + { + cdr_des.deserialize_sequence(short_seq_value, short_seq_len); + }); EXPECT_EQ(short_seq_len, 5u); EXPECT_ARRAY_EQ(short_seq_value, short_seq_t, short_seq_len); @@ -4288,9 +4436,9 @@ TEST(FastCDRResizeTests, SequenceUnsignedLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(ulong_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(ulong_seq_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4298,9 +4446,9 @@ TEST(FastCDRResizeTests, SequenceUnsignedLong) uint32_t* ulong_seq_value = NULL; size_t ulong_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(ulong_seq_value, ulong_seq_len); - }); + { + cdr_des.deserialize_sequence(ulong_seq_value, ulong_seq_len); + }); EXPECT_EQ(ulong_seq_len, 5u); EXPECT_ARRAY_EQ(ulong_seq_value, ulong_seq_t, ulong_seq_len); @@ -4315,9 +4463,9 @@ TEST(FastCDRResizeTests, SequenceLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(long_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(long_seq_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4325,9 +4473,9 @@ TEST(FastCDRResizeTests, SequenceLong) int32_t* long_seq_value = NULL; size_t long_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(long_seq_value, long_seq_len); - }); + { + cdr_des.deserialize_sequence(long_seq_value, long_seq_len); + }); EXPECT_EQ(long_seq_len, 5u); EXPECT_ARRAY_EQ(long_seq_value, long_seq_t, long_seq_len); @@ -4342,9 +4490,9 @@ TEST(FastCDRResizeTests, SequenceUnsignedLongLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(ulonglong_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(ulonglong_seq_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4352,9 +4500,9 @@ TEST(FastCDRResizeTests, SequenceUnsignedLongLong) uint64_t* ulonglong_seq_value = NULL; size_t ulonglong_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(ulonglong_seq_value, ulonglong_seq_len); - }); + { + cdr_des.deserialize_sequence(ulonglong_seq_value, ulonglong_seq_len); + }); EXPECT_EQ(ulonglong_seq_len, 5u); EXPECT_ARRAY_EQ(ulonglong_seq_value, ulonglong_seq_t, ulonglong_seq_len); @@ -4369,9 +4517,9 @@ TEST(FastCDRResizeTests, SequenceLongLong) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(longlong_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(longlong_seq_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4379,9 +4527,9 @@ TEST(FastCDRResizeTests, SequenceLongLong) int64_t* longlong_seq_value = NULL; size_t longlong_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(longlong_seq_value, longlong_seq_len); - }); + { + cdr_des.deserialize_sequence(longlong_seq_value, longlong_seq_len); + }); EXPECT_EQ(longlong_seq_len, 5u); EXPECT_ARRAY_EQ(longlong_seq_value, longlong_seq_t, longlong_seq_len); @@ -4396,9 +4544,9 @@ TEST(FastCDRResizeTests, SequenceFloat) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(float_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(float_seq_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4406,9 +4554,9 @@ TEST(FastCDRResizeTests, SequenceFloat) float* float_seq_value = NULL; size_t float_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(float_seq_value, float_seq_len); - }); + { + cdr_des.deserialize_sequence(float_seq_value, float_seq_len); + }); EXPECT_EQ(float_seq_len, 5u); EXPECT_ARRAY_FLOAT_EQ(float_seq_value, float_seq_t, float_seq_len); @@ -4423,9 +4571,9 @@ TEST(FastCDRResizeTests, SequenceDouble) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(double_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(double_seq_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4433,9 +4581,9 @@ TEST(FastCDRResizeTests, SequenceDouble) double* double_seq_value = NULL; size_t double_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(double_seq_value, double_seq_len); - }); + { + cdr_des.deserialize_sequence(double_seq_value, double_seq_len); + }); EXPECT_EQ(double_seq_len, 5u); EXPECT_ARRAY_DOUBLE_EQ(double_seq_value, double_seq_t, double_seq_len); @@ -4450,9 +4598,9 @@ TEST(FastCDRResizeTests, SequenceLongDouble) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(ldouble_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(ldouble_seq_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4460,9 +4608,9 @@ TEST(FastCDRResizeTests, SequenceLongDouble) long double* ldouble_seq_value = NULL; size_t ldouble_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(ldouble_seq_value, ldouble_seq_len); - }); + { + cdr_des.deserialize_sequence(ldouble_seq_value, ldouble_seq_len); + }); EXPECT_EQ(ldouble_seq_len, 5u); EXPECT_ARRAY_LONG_DOUBLE_EQ(ldouble_seq_value, ldouble_seq_t, ldouble_seq_len); @@ -4477,9 +4625,9 @@ TEST(FastCDRResizeTests, SequenceBoolean) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(bool_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(bool_seq_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4487,9 +4635,9 @@ TEST(FastCDRResizeTests, SequenceBoolean) bool* bool_seq_value = NULL; size_t bool_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(bool_seq_value, bool_seq_len); - }); + { + cdr_des.deserialize_sequence(bool_seq_value, bool_seq_len); + }); EXPECT_EQ(bool_seq_len, 5u); EXPECT_ARRAY_EQ(bool_seq_value, bool_seq_t, bool_seq_len); @@ -4504,9 +4652,9 @@ TEST(FastCDRResizeTests, SequenceString) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(string_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(string_seq_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4514,9 +4662,9 @@ TEST(FastCDRResizeTests, SequenceString) std::string* string_seq_value = NULL; size_t string_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(string_seq_value, string_seq_len); - }); + { + cdr_des.deserialize_sequence(string_seq_value, string_seq_len); + }); EXPECT_EQ(string_seq_len, 5u); EXPECT_ARRAY_EQ(string_seq_value, string_seq_t, string_seq_len); @@ -4524,6 +4672,7 @@ TEST(FastCDRResizeTests, SequenceString) delete[] string_seq_value; } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRResizeTests, SequenceWString) { // Serialization. @@ -4531,9 +4680,9 @@ TEST(FastCDRResizeTests, SequenceWString) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize_sequence(wstring_seq_t, 5); - }); + { + cdr_ser.serialize_sequence(wstring_seq_t, 5); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4541,9 +4690,9 @@ TEST(FastCDRResizeTests, SequenceWString) std::wstring* string_seq_value = NULL; size_t string_seq_len = 0; EXPECT_NO_THROW( - { - cdr_des.deserialize_sequence(string_seq_value, string_seq_len); - }); + { + cdr_des.deserialize_sequence(string_seq_value, string_seq_len); + }); EXPECT_EQ(string_seq_len, 5u); EXPECT_ARRAY_EQ(string_seq_value, wstring_seq_t, string_seq_len); @@ -4551,6 +4700,8 @@ TEST(FastCDRResizeTests, SequenceWString) delete[] string_seq_value; } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(FastCDRResizeTests, CString) { // Serialization. @@ -4558,9 +4709,9 @@ TEST(FastCDRResizeTests, CString) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize(c_string_t); - }); + { + cdr_ser.serialize(c_string_t); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4568,15 +4719,16 @@ TEST(FastCDRResizeTests, CString) char* c_string_value = NULL; EXPECT_NO_THROW( - { - cdr_des.deserialize(c_string_value); - }); + { + cdr_des.deserialize(c_string_value); + }); EXPECT_EQ(strcmp(c_string_value, c_string_t), 0); free(c_string_value); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRResizeTests, CWString) { // Serialization. @@ -4584,9 +4736,9 @@ TEST(FastCDRResizeTests, CWString) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser.serialize(c_wstring_t); - }); + { + cdr_ser.serialize(c_wstring_t); + }); // Deserialization. FastCdr cdr_des(cdrbuffer); @@ -4594,15 +4746,17 @@ TEST(FastCDRResizeTests, CWString) wchar_t* c_string_value = NULL; EXPECT_NO_THROW( - { - cdr_des.deserialize(c_string_value); - }); + { + cdr_des.deserialize(c_string_value); + }); EXPECT_EQ(wcscmp(c_string_value, c_wstring_t), 0); free(c_string_value); } +#endif // if !FASTCDR_DISABLE_WSTRINGS + TEST(FastCDRResizeTests, Complete) { @@ -4611,49 +4765,62 @@ TEST(FastCDRResizeTests, Complete) FastCdr cdr_ser(cdrbuffer); EXPECT_NO_THROW( - { - cdr_ser << octet_t << char_t << int8 << ushort_t << short_t << ulong_t << long_t << ulonglong_t << longlong_t << - float_tt << double_tt << ldouble_tt << bool_t << string_t; - cdr_ser << octet_array_t << char_array_t << int8_array_t << ushort_array_t << short_array_t << ulong_array_t << - long_array_t << ulonglong_array_t << longlong_array_t << float_array_t << double_array_t << ldouble_array_t << bool_array_t; - cdr_ser.serialize_array(octet_array_2_t, - 5).serialize_array(char_array_2_t, 5).serialize_array(int8_array_2_t, 5). - serialize_array(ushort_array_2_t, 5).serialize_array(short_array_2_t, - 5).serialize_array(ulong_array_2_t, 5). - serialize_array(long_array_2_t, 5).serialize_array(ulonglong_array_2_t, - 5).serialize_array(longlong_array_2_t, 5). - serialize_array(float_array_2_t, 5).serialize_array(double_array_2_t, - 5).serialize_array(ldouble_array_2_t, 5). - serialize_array(bool_array_2_t, - 5); - cdr_ser << octet_vector_t << char_vector_t << int8_vector_t << ushort_vector_t << short_vector_t << ulong_vector_t << - long_vector_t << ulonglong_vector_t << longlong_vector_t << float_vector_t << double_vector_t << - ldouble_vector_t << bool_vector_t; - cdr_ser << triple_ulong_array_t; - cdr_ser.serialize_sequence(octet_seq_t, 5).serialize_sequence(char_seq_t, 5).serialize_sequence(int8_seq_t, 5). - serialize_sequence(ushort_seq_t, 5).serialize_sequence(short_seq_t, 5).serialize_sequence(ulong_seq_t, - 5). - serialize_sequence(long_seq_t, 5).serialize_sequence(ulonglong_seq_t, - 5).serialize_sequence(longlong_seq_t, - 5). - serialize_sequence(float_seq_t, 5).serialize_sequence(double_seq_t, 5).serialize_sequence(ldouble_seq_t, - 5); - cdr_ser.serialize(c_string_t); - // Wstring and wchar - cdr_ser << wchar << wstring_t; - cdr_ser.serialize_array(wchar_array_2_t, 5).serialize_array(wstring_array_2_t, 5); - cdr_ser << wchar_array_t << wstring_array_t; - cdr_ser << wchar_vector_t << wstring_vector_t; - cdr_ser.serialize_sequence(wchar_seq_t, 5).serialize_sequence(wstring_seq_t, 5); - cdr_ser.serialize(c_wstring_t); - }); + { + cdr_ser << octet_t << char_t << int8 << ushort_t << short_t << ulong_t << long_t << ulonglong_t + << longlong_t + << float_tt << double_tt << ldouble_tt << bool_t << string_t; + cdr_ser << octet_array_t << char_array_t << int8_array_t << ushort_array_t << short_array_t << ulong_array_t + << long_array_t << ulonglong_array_t << longlong_array_t << float_array_t << double_array_t + << ldouble_array_t << bool_array_t; + cdr_ser.serialize_array(octet_array_2_t, + 5).serialize_array(char_array_2_t, 5).serialize_array(int8_array_2_t, 5). + serialize_array(ushort_array_2_t, 5).serialize_array(short_array_2_t, + 5).serialize_array(ulong_array_2_t, 5). + serialize_array(long_array_2_t, 5).serialize_array(ulonglong_array_2_t, + 5).serialize_array(longlong_array_2_t, 5). + serialize_array(float_array_2_t, 5).serialize_array(double_array_2_t, + 5).serialize_array(ldouble_array_2_t, 5). + serialize_array(bool_array_2_t, + 5); + cdr_ser << octet_vector_t << char_vector_t << int8_vector_t << ushort_vector_t << short_vector_t + << ulong_vector_t + << long_vector_t << ulonglong_vector_t << longlong_vector_t << float_vector_t << double_vector_t + << ldouble_vector_t << bool_vector_t; + cdr_ser << triple_ulong_array_t; + cdr_ser.serialize_sequence(octet_seq_t, 5).serialize_sequence(char_seq_t, 5).serialize_sequence(int8_seq_t, + 5). + serialize_sequence(ushort_seq_t, 5).serialize_sequence(short_seq_t, + 5).serialize_sequence(ulong_seq_t, + 5). + serialize_sequence(long_seq_t, 5).serialize_sequence(ulonglong_seq_t, + 5).serialize_sequence(longlong_seq_t, + 5). + serialize_sequence(float_seq_t, 5).serialize_sequence(double_seq_t, + 5).serialize_sequence(ldouble_seq_t, + 5); + cdr_ser.serialize(c_string_t); + }); +#if !FASTCDR_DISABLE_WSTRINGS + EXPECT_NO_THROW( + { + // Wstring and wchar + cdr_ser << wchar << wstring_t; + cdr_ser.serialize_array(wchar_array_2_t, 5).serialize_array(wstring_array_2_t, 5); + cdr_ser << wchar_array_t << wstring_array_t; + cdr_ser << wchar_vector_t << wstring_vector_t; + cdr_ser.serialize_sequence(wchar_seq_t, 5).serialize_sequence(wstring_seq_t, 5); + cdr_ser.serialize(c_wstring_t); + }); +#endif // if !FASTCDR_DISABLE_WSTRINGS // Deserialization. FastCdr cdr_des(cdrbuffer); uint8_t octet_value = 0; char char_value = 0; +#if !FASTCDR_DISABLE_WSTRINGS wchar_t wchar_value = 0; +#endif // if !FASTCDR_DISABLE_WSTRINGS int8_t int8_value = 0; uint16_t ushort_value = 0; int16_t short_value = 0; @@ -4666,13 +4833,19 @@ TEST(FastCDRResizeTests, Complete) long double ldouble_value = 0; bool bool_value = false; std::string string_value = ""; +#if !FASTCDR_DISABLE_WSTRINGS std::wstring wstring_value = L""; +#endif // if !FASTCDR_DISABLE_WSTRINGS std::array octet_array_value; uint8_t octet_array_2_value[5]; std::array char_array_value; +#if !FASTCDR_DISABLE_WSTRINGS std::array wchar_array_value; +#endif // if !FASTCDR_DISABLE_WSTRINGS char char_array_2_value[5]; +#if !FASTCDR_DISABLE_WSTRINGS wchar_t wchar_array_2_value[5]; +#endif // if !FASTCDR_DISABLE_WSTRINGS std::array int8_array_value; int8_t int8_array_2_value[5]; std::array ushort_array_value; @@ -4697,7 +4870,9 @@ TEST(FastCDRResizeTests, Complete) bool bool_array_2_value[5]; std::vector octet_vector_value; std::vector char_vector_value; +#if !FASTCDR_DISABLE_WSTRINGS std::vector wchar_vector_value; +#endif // if !FASTCDR_DISABLE_WSTRINGS std::vector int8_vector_value; std::vector ushort_vector_value; std::vector short_vector_value; @@ -4712,7 +4887,9 @@ TEST(FastCDRResizeTests, Complete) std::array, 2>, 2> triple_ulong_array_value; uint8_t* octet_seq_value = NULL; size_t octet_seq_len; char* char_seq_value = NULL; size_t char_seq_len; +#if !FASTCDR_DISABLE_WSTRINGS wchar_t* wchar_seq_value = NULL; size_t wchar_seq_len; +#endif // if !FASTCDR_DISABLE_WSTRINGS int8_t* int8_seq_value = NULL; size_t int8_seq_len; uint16_t* ushort_seq_value = NULL; size_t ushort_seq_len; int16_t* short_seq_value = NULL; size_t short_seq_len; @@ -4724,57 +4901,73 @@ TEST(FastCDRResizeTests, Complete) double* double_seq_value = NULL; size_t double_seq_len; long double* ldouble_seq_value = NULL; size_t ldouble_seq_len; char* c_string_value = NULL; +#if !FASTCDR_DISABLE_WSTRINGS wchar_t* c_wstring_value = NULL; std::array wstring_array_value; std::wstring wstring_array_2_value[5]; std::vector wstring_vector_value; std::wstring* wstring_seq_value = NULL; size_t wstring_seq_len; - - EXPECT_NO_THROW( - { - cdr_des >> octet_value >> char_value >> int8_value >> ushort_value >> short_value >> ulong_value >> long_value >> - ulonglong_value >> longlong_value >> float_value >> double_value >> ldouble_value >> bool_value >> string_value; - cdr_des >> octet_array_value >> char_array_value >> int8_array_value >> ushort_array_value >> short_array_value >> - ulong_array_value >> long_array_value >> ulonglong_array_value >> longlong_array_value >> float_array_value >> - double_array_value >> ldouble_array_value >> bool_array_value; - cdr_des.deserialize_array(octet_array_2_value, - 5).deserialize_array(char_array_2_value, 5).deserialize_array(int8_array_2_value, 5). - deserialize_array(ushort_array_2_value, 5).deserialize_array(short_array_2_value, - 5).deserialize_array(ulong_array_2_value, 5). - deserialize_array(long_array_2_value, 5).deserialize_array(ulonglong_array_2_value, - 5).deserialize_array(longlong_array_2_value, 5). - deserialize_array(float_array_2_value, 5).deserialize_array(double_array_2_value, - 5).deserialize_array(ldouble_array_2_value, 5).deserialize_array(bool_array_2_value, - 5); - cdr_des >> octet_vector_value >> char_vector_value >> int8_vector_value >> ushort_vector_value >> short_vector_value >> - ulong_vector_value >> long_vector_value >> ulonglong_vector_value >> longlong_vector_value >> float_vector_value >> - double_vector_value >> ldouble_vector_value >> bool_vector_value; - cdr_des >> triple_ulong_array_value; - cdr_des.deserialize_sequence(octet_seq_value, octet_seq_len).deserialize_sequence(char_seq_value, char_seq_len). - deserialize_sequence(int8_seq_value, int8_seq_len).deserialize_sequence(ushort_seq_value, - ushort_seq_len). - deserialize_sequence(short_seq_value, short_seq_len).deserialize_sequence(ulong_seq_value, - ulong_seq_len). - deserialize_sequence(long_seq_value, long_seq_len).deserialize_sequence(ulonglong_seq_value, - ulonglong_seq_len). - deserialize_sequence(longlong_seq_value, longlong_seq_len).deserialize_sequence(float_seq_value, - float_seq_len). - deserialize_sequence(double_seq_value, double_seq_len).deserialize_sequence(ldouble_seq_value, - ldouble_seq_len); - cdr_des.deserialize(c_string_value); - // WString and wchar_t - cdr_des >> wchar_value >> wstring_value; - cdr_des.deserialize_array(wchar_array_2_value, 5).deserialize_array(wstring_array_2_value, 5); - cdr_des >> wchar_array_value >> wstring_array_value; - cdr_des >> wchar_vector_value >> wstring_vector_value; - cdr_des.deserialize_sequence(wchar_seq_value, wchar_seq_len).deserialize_sequence(wstring_seq_value, - wstring_seq_len); - cdr_des.deserialize(c_wstring_value); - }); +#endif // if !FASTCDR_DISABLE_WSTRINGS + + EXPECT_NO_THROW( + { + cdr_des >> octet_value >> char_value >> int8_value >> ushort_value >> short_value >> ulong_value + >> long_value + >> ulonglong_value >> longlong_value >> float_value >> double_value >> ldouble_value >> bool_value + >> string_value; + cdr_des >> octet_array_value >> char_array_value >> int8_array_value >> ushort_array_value + >> short_array_value + >> ulong_array_value >> long_array_value >> ulonglong_array_value >> longlong_array_value + >> float_array_value + >> double_array_value >> ldouble_array_value >> bool_array_value; + cdr_des.deserialize_array(octet_array_2_value, + 5).deserialize_array(char_array_2_value, 5).deserialize_array(int8_array_2_value, 5). + deserialize_array(ushort_array_2_value, 5).deserialize_array(short_array_2_value, + 5).deserialize_array(ulong_array_2_value, 5). + deserialize_array(long_array_2_value, 5).deserialize_array(ulonglong_array_2_value, + 5).deserialize_array(longlong_array_2_value, 5). + deserialize_array(float_array_2_value, 5).deserialize_array(double_array_2_value, + 5).deserialize_array(ldouble_array_2_value, 5).deserialize_array(bool_array_2_value, + 5); + cdr_des >> octet_vector_value >> char_vector_value >> int8_vector_value >> ushort_vector_value + >> short_vector_value + >> ulong_vector_value >> long_vector_value >> ulonglong_vector_value >> longlong_vector_value + >> float_vector_value + >> double_vector_value >> ldouble_vector_value >> bool_vector_value; + cdr_des >> triple_ulong_array_value; + cdr_des.deserialize_sequence(octet_seq_value, octet_seq_len).deserialize_sequence(char_seq_value, + char_seq_len). + deserialize_sequence(int8_seq_value, int8_seq_len).deserialize_sequence(ushort_seq_value, + ushort_seq_len). + deserialize_sequence(short_seq_value, short_seq_len).deserialize_sequence(ulong_seq_value, + ulong_seq_len). + deserialize_sequence(long_seq_value, long_seq_len).deserialize_sequence(ulonglong_seq_value, + ulonglong_seq_len). + deserialize_sequence(longlong_seq_value, longlong_seq_len).deserialize_sequence(float_seq_value, + float_seq_len). + deserialize_sequence(double_seq_value, double_seq_len).deserialize_sequence(ldouble_seq_value, + ldouble_seq_len); + cdr_des.deserialize(c_string_value); + }); +#if !FASTCDR_DISABLE_WSTRINGS + EXPECT_NO_THROW( + { + // WString and wchar_t + cdr_des >> wchar_value >> wstring_value; + cdr_des.deserialize_array(wchar_array_2_value, 5).deserialize_array(wstring_array_2_value, 5); + cdr_des >> wchar_array_value >> wstring_array_value; + cdr_des >> wchar_vector_value >> wstring_vector_value; + cdr_des.deserialize_sequence(wchar_seq_value, wchar_seq_len).deserialize_sequence(wstring_seq_value, + wstring_seq_len); + cdr_des.deserialize(c_wstring_value); + }); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(octet_value, octet_t); EXPECT_EQ(char_value, char_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wchar_value, wchar); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(int8_value, int8); EXPECT_EQ(ushort_value, ushort_t); EXPECT_EQ(short_value, short_t); @@ -4787,11 +4980,15 @@ TEST(FastCDRResizeTests, Complete) EXPECT_LONG_DOUBLE_EQ(ldouble_value, ldouble_tt); EXPECT_EQ(bool_value, bool_t); EXPECT_EQ(string_value, string_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wstring_value, wstring_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(octet_array_value, octet_array_t); EXPECT_EQ(char_array_value, char_array_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wchar_array_value, wchar_array_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(int8_array_value, int8_array_t); EXPECT_EQ(ushort_array_value, ushort_array_t); EXPECT_EQ(short_array_value, short_array_t); @@ -4803,11 +5000,15 @@ TEST(FastCDRResizeTests, Complete) EXPECT_EQ(double_array_value, double_array_t); EXPECT_EQ(ldouble_array_value, ldouble_array_t); EXPECT_EQ(bool_array_value, bool_array_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wstring_array_value, wstring_array_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_ARRAY_EQ(octet_array_2_value, octet_array_2_t, 5); EXPECT_ARRAY_EQ(char_array_2_value, char_array_2_t, 5); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_ARRAY_EQ(wchar_array_2_value, wchar_array_2_t, 5); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_ARRAY_EQ(int8_array_2_value, int8_array_2_t, 5); EXPECT_ARRAY_EQ(ushort_array_2_value, ushort_array_2_t, 5); EXPECT_ARRAY_EQ(short_array_2_value, short_array_2_t, 5); @@ -4819,11 +5020,15 @@ TEST(FastCDRResizeTests, Complete) EXPECT_ARRAY_DOUBLE_EQ(double_array_2_value, double_array_2_t, 5); EXPECT_ARRAY_LONG_DOUBLE_EQ(ldouble_array_2_value, ldouble_array_2_t, 5); EXPECT_ARRAY_EQ(bool_array_2_value, bool_array_2_t, 5); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_ARRAY_EQ(wstring_array_2_value, wstring_array_2_t, 5); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(octet_vector_value, octet_vector_t); EXPECT_EQ(char_vector_value, char_vector_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wchar_vector_value, wchar_vector_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(int8_vector_value, int8_vector_t); EXPECT_EQ(ushort_vector_value, ushort_vector_t); EXPECT_EQ(short_vector_value, short_vector_t); @@ -4835,15 +5040,19 @@ TEST(FastCDRResizeTests, Complete) EXPECT_EQ(double_vector_value, double_vector_t); EXPECT_EQ(ldouble_vector_value, ldouble_vector_t); EXPECT_EQ(bool_vector_value, bool_vector_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wstring_vector_value, wstring_vector_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(triple_ulong_array_t, triple_ulong_array_value); EXPECT_EQ(octet_seq_len, 5u); EXPECT_ARRAY_EQ(octet_seq_value, octet_seq_t, 5); EXPECT_EQ(char_seq_len, 5u); EXPECT_ARRAY_EQ(char_seq_value, char_seq_t, 5); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wchar_seq_len, 5u); EXPECT_ARRAY_EQ(wchar_seq_value, wchar_seq_t, 5); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(int8_seq_len, 5u); EXPECT_ARRAY_EQ(int8_seq_value, int8_seq_t, 5); EXPECT_EQ(ushort_seq_len, 5u); @@ -4864,17 +5073,25 @@ TEST(FastCDRResizeTests, Complete) EXPECT_ARRAY_DOUBLE_EQ(double_seq_value, double_seq_t, 5); EXPECT_EQ(ldouble_seq_len, 5u); EXPECT_ARRAY_LONG_DOUBLE_EQ(ldouble_seq_value, ldouble_seq_t, 5); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wstring_seq_len, 5u); EXPECT_ARRAY_EQ(wstring_seq_value, wstring_seq_t, 5); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(strcmp(c_string_t, c_string_value), 0); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wcscmp(c_wstring_t, c_wstring_value), 0); +#endif // if !FASTCDR_DISABLE_WSTRINGS +#if !FASTCDR_DISABLE_WSTRINGS delete[] wstring_seq_value; +#endif // if !FASTCDR_DISABLE_WSTRINGS free(octet_seq_value); free(char_seq_value); +#if !FASTCDR_DISABLE_WSTRINGS free(wchar_seq_value); +#endif // if !FASTCDR_DISABLE_WSTRINGS free(int8_seq_value); free(ushort_seq_value); free(short_seq_value); @@ -4886,7 +5103,9 @@ TEST(FastCDRResizeTests, Complete) free(double_seq_value); free(ldouble_seq_value); free(c_string_value); +#if !FASTCDR_DISABLE_WSTRINGS free(c_wstring_value); +#endif // if !FASTCDR_DISABLE_WSTRINGS } TEST(CDRResizeTests, ReserveBuffer) diff --git a/test/cdr/SimpleTest.cpp b/test/cdr/SimpleTest.cpp index 5f75cab6..f75ed446 100644 --- a/test/cdr/SimpleTest.cpp +++ b/test/cdr/SimpleTest.cpp @@ -33,7 +33,9 @@ using namespace ::exception; static const uint8_t octet_t = 32; static const char char_t = 'Z'; +#if !FASTCDR_DISABLE_WSTRINGS static const wchar_t wchar = 'Z'; +#endif // if !FASTCDR_DISABLE_WSTRINGS static const int8_t int8 = 64; static const uint16_t ushort_t = 65500; static const int16_t short_t = -32700; @@ -47,14 +49,20 @@ static const long double ldouble_tt = std::numeric_limits::min(); static const bool bool_t = true; static const std::string string_t = "Hola a todos, esto es un test"; static const std::string emptystring_t = ""; +#if !FASTCDR_DISABLE_WSTRINGS static const std::wstring wstring_t = L"Hola a todos, esto es un test con widestring"; static const std::wstring emptywstring_t = L""; +#endif // if !FASTCDR_DISABLE_WSTRINGS static const std::array octet_array_t = {{1, 2, 3, 4, 5}}; static const uint8_t octet_array_2_t[N_ARR_ELEMENTS] = {5, 4, 3, 2, 1}; static const std::array char_array_t = {{'A', 'B', 'C', 'D', 'E'}}; +#if !FASTCDR_DISABLE_WSTRINGS static const std::array wchar_array_t = {{'A', 'B', 'C', 'D', 'E'}}; +#endif // if !FASTCDR_DISABLE_WSTRINGS static const char char_array_2_t[N_ARR_ELEMENTS] = {'E', 'D', 'C', 'B', 'A'}; +#if !FASTCDR_DISABLE_WSTRINGS static const wchar_t wchar_array_2_t[N_ARR_ELEMENTS] = {'E', 'D', 'C', 'B', 'A'}; +#endif // if !FASTCDR_DISABLE_WSTRINGS static const std::array int8_array_t = {{6, 7, 8, 9, 10}}; static const int8_t int8_array_2_t[N_ARR_ELEMENTS] = {10, 9, 8, 7, 6}; static const std::array ushort_array_t = {{65500, 65501, 65502, 65503, 65504}}; @@ -92,15 +100,21 @@ static const long double ldouble_array_2_t[N_ARR_ELEMENTS] = static const std::array bool_array_t = {{true, false, true, false, true}}; static const bool bool_array_2_t[N_ARR_ELEMENTS] = {false, true, false, true, false}; static const std::array string_array_t = {{"HOLA", "ADIOS", "HELLO", "BYE", "GOODBYE"}}; +#if !FASTCDR_DISABLE_WSTRINGS static const std::array wstring_array_t = {{L"HOLA", L"ADIOS", L"HELLO", L"BYE", L"GOODBYE"}}; +#endif // if !FASTCDR_DISABLE_WSTRINGS static const std::string string_array_2_t[N_ARR_ELEMENTS] = {"HOLA", "ADIOS", "HELLO", "BYE", "GOODBYE"}; +#if !FASTCDR_DISABLE_WSTRINGS static const std::wstring wstring_array_2_t[N_ARR_ELEMENTS] = {L"HOLA", L"ADIOS", L"HELLO", L"BYE", L"GOODBYE"}; +#endif // if !FASTCDR_DISABLE_WSTRINGS static const std::vector octet_vector_t(octet_array_2_t, octet_array_2_t + sizeof(octet_array_2_t) / sizeof(uint8_t)); static const std::vector char_vector_t(char_array_2_t, char_array_2_t + sizeof(char_array_2_t) / sizeof(char)); +#if !FASTCDR_DISABLE_WSTRINGS static const std::vector wchar_vector_t(wchar_array_2_t, wchar_array_2_t + sizeof(wchar_array_2_t) / sizeof(wchar_t)); +#endif // if !FASTCDR_DISABLE_WSTRINGS static const std::vector int8_vector_t(int8_array_2_t, int8_array_2_t + sizeof(int8_array_2_t) / sizeof(int8_t)); static const std::vector ushort_vector_t(ushort_array_2_t, @@ -127,15 +141,19 @@ static const std::vector bool_vector_t(bool_array_2_t, bool_array_2_t + si static const std::vector string_vector_t(string_array_2_t, string_array_2_t + sizeof(string_array_2_t) / sizeof(std::string)); +#if !FASTCDR_DISABLE_WSTRINGS static const std::vector wstring_vector_t(wstring_array_2_t, wstring_array_2_t + sizeof(wstring_array_2_t) / sizeof(std::wstring)); +#endif // if !FASTCDR_DISABLE_WSTRINGS static const std::array, 2>, 2> triple_ulong_array_t = {{ {{ {{1, 2, 3}}, {{4, 5, 6}} }}, {{ {{7, 8, 9}}, {{10, 11, 12}} }} }}; // Added because error 336. static const uint8_t octet_seq_t[N_ARR_ELEMENTS] = {5, 4, 3, 2, 1}; static const char char_seq_t[N_ARR_ELEMENTS] = {'E', 'D', 'C', 'B', 'A'}; +#if !FASTCDR_DISABLE_WSTRINGS static const wchar_t wchar_seq_t[N_ARR_ELEMENTS] = {'E', 'D', 'C', 'B', 'A'}; +#endif // if !FASTCDR_DISABLE_WSTRINGS static const int8_t int8_seq_t[N_ARR_ELEMENTS] = {10, 9, 8, 7, 6}; static const uint16_t ushort_seq_t[N_ARR_ELEMENTS] = {65504, 65503, 65502, 65501, 65500}; static const int16_t short_seq_t[N_ARR_ELEMENTS] = {-32704, -32703, -32702, -32701, -32700}; @@ -153,10 +171,14 @@ static const long double ldouble_seq_t[N_ARR_ELEMENTS] = {ldouble_tt + 4, ldouble_tt + 3, ldouble_tt + 2, ldouble_tt + 1, ldouble_tt}; static const bool bool_seq_t[N_ARR_ELEMENTS] = {true, true, false, false, true}; static const std::string string_seq_t[N_ARR_ELEMENTS] = {"HELLO", "BYE", "GOODBYE", "HOLA", "ADIOS"}; +#if !FASTCDR_DISABLE_WSTRINGS static const std::wstring wstring_seq_t[N_ARR_ELEMENTS] = {L"HELLO", L"BYE", L"GOODBYE", L"HOLA", L"ADIOS"}; +#endif // if !FASTCDR_DISABLE_WSTRINGS // Added because error 337 static const char* c_string_t = "HOLA"; +#if !FASTCDR_DISABLE_WSTRINGS static const wchar_t* c_wstring_t = L"HOLA"; +#endif // if !FASTCDR_DISABLE_WSTRINGS template void EXPECT_ARRAY_EQ( @@ -340,6 +362,7 @@ static void check_no_space( } } +#if !FASTCDR_DISABLE_WSTRINGS static void check_no_space( const wchar_t& input_value, size_t buf_size = 1) @@ -364,6 +387,9 @@ static void check_no_space( } } +#endif // if !FASTCDR_DISABLE_WSTRINGS + +#if !FASTCDR_DISABLE_WSTRINGS template static void check_no_space( const std::array& input_value, @@ -389,6 +415,8 @@ static void check_no_space( } } +#endif // if !FASTCDR_DISABLE_WSTRINGS + template static void check_good_case_array( const T* input_value) @@ -580,11 +608,13 @@ TEST(CDRTests, Char) check_no_space(char_t); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, WChar) { check_good_case(wchar); check_no_space(wchar); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, Int8) { @@ -659,12 +689,14 @@ TEST(CDRTests, String) check_bad_length_deserialization(string_t, false); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, WString) { check_good_case(wstring_t); check_no_space(wstring_t, 1); check_bad_length_deserialization(wstring_t, true); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, EmptyString) { @@ -672,11 +704,13 @@ TEST(CDRTests, EmptyString) check_no_space(emptystring_t, 1); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, EmptyWString) { check_good_case(emptywstring_t); check_no_space(emptywstring_t, 1); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, STDArrayOctet) { @@ -690,11 +724,13 @@ TEST(CDRTests, STDArrayChar) check_no_space(char_array_t); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, STDArrayWChar) { check_good_case(wchar_array_t); check_no_space(wchar_array_t); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, STDArrayInt8) { @@ -768,11 +804,13 @@ TEST(CDRTests, STDArrayString) check_no_space(string_array_t, 1); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, STDArrayWString) { check_good_case(wstring_array_t); check_no_space(wstring_array_t, 1); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, ArrayOctet) { @@ -786,11 +824,13 @@ TEST(CDRTests, ArrayChar) check_no_space_array(char_array_2_t); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, ArrayWChar) { check_good_case_array(wchar_array_2_t); check_no_space_array(wchar_array_2_t); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, ArrayInt8) { @@ -864,11 +904,13 @@ TEST(CDRTests, ArrayString) check_no_space_array(string_array_2_t, 1); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, ArrayWString) { check_good_case_array(wstring_array_2_t); check_no_space_array(wstring_array_2_t, 1); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, STDVectorOctet) { @@ -884,12 +926,14 @@ TEST(CDRTests, STDVectorChar) check_bad_length_deserialization(char_vector_t, false); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, STDVectorWChar) { check_good_case(wchar_vector_t); check_no_space(wchar_vector_t, 1); check_bad_length_deserialization(wchar_vector_t, false); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, STDVectorInt8) { @@ -975,12 +1019,14 @@ TEST(CDRTests, STDVectorString) check_bad_length_deserialization(string_vector_t, true); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, STDVectorWString) { check_good_case(wstring_vector_t); check_no_space(wstring_vector_t, 1); check_bad_length_deserialization(wstring_vector_t, true); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, STDTripleArrayUnsignedLong) { @@ -1135,6 +1181,7 @@ TEST(CDRTests, SequenceChar) NotEnoughMemoryException); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, SequenceWChar) { // Check good case. @@ -1186,6 +1233,7 @@ TEST(CDRTests, SequenceWChar) }, NotEnoughMemoryException); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, SequenceInt8) { @@ -1811,6 +1859,7 @@ TEST(CDRTests, SequenceString) NotEnoughMemoryException); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, SequenceWString) { // Check good case. @@ -1862,6 +1911,7 @@ TEST(CDRTests, SequenceWString) }, NotEnoughMemoryException); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, CString) { @@ -1914,6 +1964,7 @@ TEST(CDRTests, CString) NotEnoughMemoryException); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, CWString) { // Check good case. @@ -1990,6 +2041,7 @@ TEST(CDRTests, CWString) }, NotEnoughMemoryException); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(CDRTests, Complete) { @@ -2036,6 +2088,11 @@ TEST(CDRTests, Complete) 5).serialize_sequence(ldouble_seq_t, 5); cdr_ser.serialize(c_string_t); + cdr_ser.serialize_sequence(string_seq_t, 5); + }); +#if !FASTCDR_DISABLE_WSTRINGS + EXPECT_NO_THROW( + { // Wstring and wchar cdr_ser << wchar << wstring_t; cdr_ser.serialize_array(wchar_array_2_t, 5).serialize_array(wstring_array_2_t, 5); @@ -2043,16 +2100,18 @@ TEST(CDRTests, Complete) cdr_ser << wchar_vector_t << wstring_vector_t; cdr_ser.serialize_sequence(wchar_seq_t, 5); cdr_ser.serialize_sequence(wstring_seq_t, 5); - cdr_ser.serialize_sequence(string_seq_t, 5); cdr_ser.serialize(c_wstring_t); }); +#endif // if !FASTCDR_DISABLE_WSTRINGS // Deserialization. Cdr cdr_des(cdrbuffer); uint8_t octet_value = 0; char char_value = 0; +#if !FASTCDR_DISABLE_WSTRINGS wchar_t wchar_value = 0; +#endif // if !FASTCDR_DISABLE_WSTRINGS int8_t int8_value = 0; uint16_t ushort_value = 0; int16_t short_value = 0; @@ -2065,13 +2124,19 @@ TEST(CDRTests, Complete) long double ldouble_value = 0; bool bool_value = false; std::string string_value = ""; +#if !FASTCDR_DISABLE_WSTRINGS std::wstring wstring_value = L""; +#endif // if !FASTCDR_DISABLE_WSTRINGS std::array octet_array_value; uint8_t octet_array_2_value[N_ARR_ELEMENTS]; std::array char_array_value; +#if !FASTCDR_DISABLE_WSTRINGS std::array wchar_array_value; +#endif // if !FASTCDR_DISABLE_WSTRINGS char char_array_2_value[N_ARR_ELEMENTS]; +#if !FASTCDR_DISABLE_WSTRINGS wchar_t wchar_array_2_value[N_ARR_ELEMENTS]; +#endif // if !FASTCDR_DISABLE_WSTRINGS std::array int8_array_value; int8_t int8_array_2_value[N_ARR_ELEMENTS]; std::array ushort_array_value; @@ -2096,7 +2161,9 @@ TEST(CDRTests, Complete) bool bool_array_2_value[N_ARR_ELEMENTS]; std::vector octet_vector_value; std::vector char_vector_value; +#if !FASTCDR_DISABLE_WSTRINGS std::vector wchar_vector_value; +#endif // if !FASTCDR_DISABLE_WSTRINGS std::vector int8_vector_value; std::vector ushort_vector_value; std::vector short_vector_value; @@ -2111,7 +2178,9 @@ TEST(CDRTests, Complete) std::array, 2>, 2> triple_ulong_array_value; uint8_t* octet_seq_value = NULL; size_t octet_seq_len; char* char_seq_value = NULL; size_t char_seq_len; +#if !FASTCDR_DISABLE_WSTRINGS wchar_t* wchar_seq_value = NULL; size_t wchar_seq_len; +#endif // if !FASTCDR_DISABLE_WSTRINGS int8_t* int8_seq_value = NULL; size_t int8_seq_len; uint16_t* ushort_seq_value = NULL; size_t ushort_seq_len; int16_t* short_seq_value = NULL; size_t short_seq_len; @@ -2123,11 +2192,13 @@ TEST(CDRTests, Complete) double* double_seq_value = NULL; size_t double_seq_len; long double* ldouble_seq_value = NULL; size_t ldouble_seq_len; char* c_string_value = NULL; +#if !FASTCDR_DISABLE_WSTRINGS wchar_t* c_wstring_value = NULL; std::array wstring_array_value; std::wstring wstring_array_2_value[N_ARR_ELEMENTS]; std::vector wstring_vector_value; std::wstring* wstring_seq_value = NULL; size_t wstring_seq_len; +#endif // if !FASTCDR_DISABLE_WSTRINGS std::string* string_seq_value = NULL; size_t string_seq_len; EXPECT_NO_THROW( @@ -2170,6 +2241,11 @@ TEST(CDRTests, Complete) deserialize_sequence(double_seq_value, double_seq_len).deserialize_sequence(ldouble_seq_value, ldouble_seq_len); cdr_des.deserialize(c_string_value); + cdr_des.deserialize_sequence(string_seq_value, string_seq_len); + }); +#if !FASTCDR_DISABLE_WSTRINGS + EXPECT_NO_THROW( + { // WString and wchar_t cdr_des >> wchar_value >> wstring_value; cdr_des.deserialize_array(wchar_array_2_value, 5).deserialize_array(wstring_array_2_value, 5); @@ -2177,13 +2253,15 @@ TEST(CDRTests, Complete) cdr_des >> wchar_vector_value >> wstring_vector_value; cdr_des.deserialize_sequence(wchar_seq_value, wchar_seq_len); cdr_des.deserialize_sequence(wstring_seq_value, wstring_seq_len); - cdr_des.deserialize_sequence(string_seq_value, string_seq_len); cdr_des.deserialize(c_wstring_value); }); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(octet_value, octet_t); EXPECT_EQ(char_value, char_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wchar_value, wchar); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(int8_value, int8); EXPECT_EQ(ushort_value, ushort_t); EXPECT_EQ(short_value, short_t); @@ -2196,11 +2274,15 @@ TEST(CDRTests, Complete) EXPECT_LONG_DOUBLE_EQ(ldouble_value, ldouble_tt); EXPECT_EQ(bool_value, bool_t); EXPECT_EQ(string_value, string_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wstring_value, wstring_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(octet_array_value, octet_array_t); EXPECT_EQ(char_array_value, char_array_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wchar_array_value, wchar_array_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(int8_array_value, int8_array_t); EXPECT_EQ(ushort_array_value, ushort_array_t); EXPECT_EQ(short_array_value, short_array_t); @@ -2212,11 +2294,15 @@ TEST(CDRTests, Complete) EXPECT_EQ(double_array_value, double_array_t); EXPECT_EQ(ldouble_array_value, ldouble_array_t); EXPECT_EQ(bool_array_value, bool_array_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wstring_array_value, wstring_array_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_ARRAY_EQ(octet_array_2_value, octet_array_2_t, 5); EXPECT_ARRAY_EQ(char_array_2_value, char_array_2_t, 5); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_ARRAY_EQ(wchar_array_2_value, wchar_array_2_t, 5); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_ARRAY_EQ(int8_array_2_value, int8_array_2_t, 5); EXPECT_ARRAY_EQ(ushort_array_2_value, ushort_array_2_t, 5); EXPECT_ARRAY_EQ(short_array_2_value, short_array_2_t, 5); @@ -2228,11 +2314,15 @@ TEST(CDRTests, Complete) EXPECT_ARRAY_DOUBLE_EQ(double_array_2_value, double_array_2_t, 5); EXPECT_ARRAY_LONG_DOUBLE_EQ(ldouble_array_2_value, ldouble_array_2_t, 5); EXPECT_ARRAY_EQ(bool_array_2_value, bool_array_2_t, 5); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_ARRAY_EQ(wstring_array_2_value, wstring_array_2_t, 5); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(octet_vector_value, octet_vector_t); EXPECT_EQ(char_vector_value, char_vector_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wchar_vector_value, wchar_vector_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(int8_vector_value, int8_vector_t); EXPECT_EQ(ushort_vector_value, ushort_vector_t); EXPECT_EQ(short_vector_value, short_vector_t); @@ -2244,15 +2334,19 @@ TEST(CDRTests, Complete) EXPECT_EQ(double_vector_value, double_vector_t); EXPECT_EQ(ldouble_vector_value, ldouble_vector_t); EXPECT_EQ(bool_vector_value, bool_vector_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wstring_vector_value, wstring_vector_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(triple_ulong_array_t, triple_ulong_array_value); EXPECT_EQ(octet_seq_len, 5u); EXPECT_ARRAY_EQ(octet_seq_value, octet_seq_t, 5); EXPECT_EQ(char_seq_len, 5u); EXPECT_ARRAY_EQ(char_seq_value, char_seq_t, 5); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wchar_seq_len, 5u); EXPECT_ARRAY_EQ(wchar_seq_value, wchar_seq_t, 5); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(int8_seq_len, 5u); EXPECT_ARRAY_EQ(int8_seq_value, int8_seq_t, 5); EXPECT_EQ(ushort_seq_len, 5u); @@ -2273,21 +2367,29 @@ TEST(CDRTests, Complete) EXPECT_ARRAY_DOUBLE_EQ(double_seq_value, double_seq_t, 5); EXPECT_EQ(ldouble_seq_len, 5u); EXPECT_ARRAY_LONG_DOUBLE_EQ(ldouble_seq_value, ldouble_seq_t, 5); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wstring_seq_len, 5u); EXPECT_ARRAY_EQ(wstring_seq_value, wstring_seq_t, 5); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(string_seq_len, 5u); EXPECT_ARRAY_EQ(string_seq_value, string_seq_t, 5); EXPECT_EQ(strcmp(c_string_t, c_string_value), 0); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wcscmp(c_wstring_t, c_wstring_value), 0); +#endif // if !FASTCDR_DISABLE_WSTRINGS +#if !FASTCDR_DISABLE_WSTRINGS delete[] wstring_seq_value; +#endif // if !FASTCDR_DISABLE_WSTRINGS delete[] string_seq_value; free(octet_seq_value); free(char_seq_value); +#if !FASTCDR_DISABLE_WSTRINGS free(wchar_seq_value); +#endif // if !FASTCDR_DISABLE_WSTRINGS free(int8_seq_value); free(ushort_seq_value); free(short_seq_value); @@ -2299,7 +2401,9 @@ TEST(CDRTests, Complete) free(double_seq_value); free(ldouble_seq_value); free(c_string_value); +#if !FASTCDR_DISABLE_WSTRINGS free(c_wstring_value); +#endif // if !FASTCDR_DISABLE_WSTRINGS } // Regression test for Fast DDS issue #5136 @@ -2553,6 +2657,7 @@ TEST(FastCDRTests, Char) EXPECT_EQ(char_value, char_t); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, WChar) { // Check good case. @@ -2579,6 +2684,7 @@ TEST(FastCDRTests, WChar) EXPECT_EQ(char_value, wchar); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, Int8) { @@ -3124,6 +3230,7 @@ TEST(FastCDRTests, String) NotEnoughMemoryException); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, WString) { // Check good case. @@ -3172,6 +3279,7 @@ TEST(FastCDRTests, WString) }, NotEnoughMemoryException); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, EmptyString) { @@ -3222,6 +3330,7 @@ TEST(FastCDRTests, EmptyString) NotEnoughMemoryException); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, EmptyWString) { // Check good case. @@ -3270,6 +3379,7 @@ TEST(FastCDRTests, EmptyWString) }, NotEnoughMemoryException); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, STDArrayOctet) { @@ -3369,6 +3479,7 @@ TEST(FastCDRTests, STDArrayChar) NotEnoughMemoryException); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, STDArrayWChar) { // Check good case. @@ -3417,6 +3528,7 @@ TEST(FastCDRTests, STDArrayWChar) }, NotEnoughMemoryException); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, STDArrayInt8) { @@ -4006,6 +4118,7 @@ TEST(FastCDRTests, STDArrayString) NotEnoughMemoryException); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, STDArrayWString) { // Check good case. @@ -4054,6 +4167,7 @@ TEST(FastCDRTests, STDArrayWString) }, NotEnoughMemoryException); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, ArrayOctet) { @@ -4153,6 +4267,7 @@ TEST(FastCDRTests, ArrayChar) NotEnoughMemoryException); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, ArrayWChar) { // Check good case. @@ -4201,6 +4316,7 @@ TEST(FastCDRTests, ArrayWChar) }, NotEnoughMemoryException); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, ArrayInt8) { @@ -4790,6 +4906,7 @@ TEST(FastCDRTests, ArrayString) NotEnoughMemoryException); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, ArrayWString) { // Check good case. @@ -4838,6 +4955,7 @@ TEST(FastCDRTests, ArrayWString) }, NotEnoughMemoryException); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, STDVectorOctet) { @@ -4937,6 +5055,7 @@ TEST(FastCDRTests, STDVectorChar) NotEnoughMemoryException); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, STDVectorWChar) { // Check good case. @@ -4985,6 +5104,7 @@ TEST(FastCDRTests, STDVectorWChar) }, NotEnoughMemoryException); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, STDVectorInt8) { @@ -5574,6 +5694,7 @@ TEST(FastCDRTests, STDVectorString) NotEnoughMemoryException); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, STDVectorWString) { // Check good case. @@ -5622,6 +5743,7 @@ TEST(FastCDRTests, STDVectorWString) }, NotEnoughMemoryException); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, STDTripleArrayUnsignedLong) { @@ -5776,6 +5898,7 @@ TEST(FastCDRTests, SequenceChar) NotEnoughMemoryException); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, SequenceWChar) { // Check good case. @@ -5827,6 +5950,7 @@ TEST(FastCDRTests, SequenceWChar) }, NotEnoughMemoryException); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, SequenceInt8) { @@ -6452,6 +6576,7 @@ TEST(FastCDRTests, SequenceString) NotEnoughMemoryException); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, SequenceWString) { // Check good case. @@ -6503,6 +6628,7 @@ TEST(FastCDRTests, SequenceWString) }, NotEnoughMemoryException); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, CString) { @@ -6555,6 +6681,7 @@ TEST(FastCDRTests, CString) NotEnoughMemoryException); } +#if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, CWString) { // Check good case. @@ -6605,6 +6732,7 @@ TEST(FastCDRTests, CWString) }, NotEnoughMemoryException); } +#endif // if !FASTCDR_DISABLE_WSTRINGS TEST(FastCDRTests, Complete) @@ -6652,6 +6780,10 @@ TEST(FastCDRTests, Complete) 5).serialize_sequence(ldouble_seq_t, 5); cdr_ser.serialize(c_string_t); + }); +#if !FASTCDR_DISABLE_WSTRINGS + EXPECT_NO_THROW( + { // Wstring and wchar cdr_ser << wchar << wstring_t; cdr_ser.serialize_array(wchar_array_2_t, 5).serialize_array(wstring_array_2_t, 5); @@ -6660,13 +6792,16 @@ TEST(FastCDRTests, Complete) cdr_ser.serialize_sequence(wchar_seq_t, 5).serialize_sequence(wstring_seq_t, 5); cdr_ser.serialize(c_wstring_t); }); +#endif // if !FASTCDR_DISABLE_WSTRINGS // Deserialization. FastCdr cdr_des(cdrbuffer); uint8_t octet_value = 0; char char_value = 0; +#if !FASTCDR_DISABLE_WSTRINGS wchar_t wchar_value = 0; +#endif // if !FASTCDR_DISABLE_WSTRINGS int8_t int8_value = 0; uint16_t ushort_value = 0; int16_t short_value = 0; @@ -6679,13 +6814,19 @@ TEST(FastCDRTests, Complete) long double ldouble_value = 0; bool bool_value = false; std::string string_value = ""; +#if !FASTCDR_DISABLE_WSTRINGS std::wstring wstring_value = L""; +#endif // if !FASTCDR_DISABLE_WSTRINGS std::array octet_array_value; uint8_t octet_array_2_value[N_ARR_ELEMENTS]; std::array char_array_value; +#if !FASTCDR_DISABLE_WSTRINGS std::array wchar_array_value; +#endif // if !FASTCDR_DISABLE_WSTRINGS char char_array_2_value[N_ARR_ELEMENTS]; +#if !FASTCDR_DISABLE_WSTRINGS wchar_t wchar_array_2_value[N_ARR_ELEMENTS]; +#endif // if !FASTCDR_DISABLE_WSTRINGS std::array int8_array_value; int8_t int8_array_2_value[N_ARR_ELEMENTS]; std::array ushort_array_value; @@ -6710,7 +6851,9 @@ TEST(FastCDRTests, Complete) bool bool_array_2_value[N_ARR_ELEMENTS]; std::vector octet_vector_value; std::vector char_vector_value; +#if !FASTCDR_DISABLE_WSTRINGS std::vector wchar_vector_value; +#endif // if !FASTCDR_DISABLE_WSTRINGS std::vector int8_vector_value; std::vector ushort_vector_value; std::vector short_vector_value; @@ -6725,7 +6868,9 @@ TEST(FastCDRTests, Complete) std::array, 2>, 2> triple_ulong_array_value; uint8_t* octet_seq_value = NULL; size_t octet_seq_len; char* char_seq_value = NULL; size_t char_seq_len; +#if !FASTCDR_DISABLE_WSTRINGS wchar_t* wchar_seq_value = NULL; size_t wchar_seq_len; +#endif // if !FASTCDR_DISABLE_WSTRINGS int8_t* int8_seq_value = NULL; size_t int8_seq_len; uint16_t* ushort_seq_value = NULL; size_t ushort_seq_len; int16_t* short_seq_value = NULL; size_t short_seq_len; @@ -6737,11 +6882,13 @@ TEST(FastCDRTests, Complete) double* double_seq_value = NULL; size_t double_seq_len; long double* ldouble_seq_value = NULL; size_t ldouble_seq_len; char* c_string_value = NULL; +#if !FASTCDR_DISABLE_WSTRINGS wchar_t* c_wstring_value = NULL; std::array wstring_array_value; std::wstring wstring_array_2_value[N_ARR_ELEMENTS]; std::vector wstring_vector_value; std::wstring* wstring_seq_value = NULL; size_t wstring_seq_len; +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_NO_THROW( { @@ -6782,6 +6929,10 @@ TEST(FastCDRTests, Complete) deserialize_sequence(double_seq_value, double_seq_len).deserialize_sequence(ldouble_seq_value, ldouble_seq_len); cdr_des.deserialize(c_string_value); + }); +#if !FASTCDR_DISABLE_WSTRINGS + EXPECT_NO_THROW( + { // WString and wchar_t cdr_des >> wchar_value >> wstring_value; cdr_des.deserialize_array(wchar_array_2_value, 5).deserialize_array(wstring_array_2_value, 5); @@ -6791,10 +6942,13 @@ TEST(FastCDRTests, Complete) wstring_seq_len); cdr_des.deserialize(c_wstring_value); }); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(octet_value, octet_t); EXPECT_EQ(char_value, char_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wchar_value, wchar); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(int8_value, int8); EXPECT_EQ(ushort_value, ushort_t); EXPECT_EQ(short_value, short_t); @@ -6807,11 +6961,15 @@ TEST(FastCDRTests, Complete) EXPECT_LONG_DOUBLE_EQ(ldouble_value, ldouble_tt); EXPECT_EQ(bool_value, bool_t); EXPECT_EQ(string_value, string_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wstring_value, wstring_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(octet_array_value, octet_array_t); EXPECT_EQ(char_array_value, char_array_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wchar_array_value, wchar_array_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(int8_array_value, int8_array_t); EXPECT_EQ(ushort_array_value, ushort_array_t); EXPECT_EQ(short_array_value, short_array_t); @@ -6823,11 +6981,15 @@ TEST(FastCDRTests, Complete) EXPECT_EQ(double_array_value, double_array_t); EXPECT_EQ(ldouble_array_value, ldouble_array_t); EXPECT_EQ(bool_array_value, bool_array_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wstring_array_value, wstring_array_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_ARRAY_EQ(octet_array_2_value, octet_array_2_t, 5); EXPECT_ARRAY_EQ(char_array_2_value, char_array_2_t, 5); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_ARRAY_EQ(wchar_array_2_value, wchar_array_2_t, 5); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_ARRAY_EQ(int8_array_2_value, int8_array_2_t, 5); EXPECT_ARRAY_EQ(ushort_array_2_value, ushort_array_2_t, 5); EXPECT_ARRAY_EQ(short_array_2_value, short_array_2_t, 5); @@ -6839,11 +7001,15 @@ TEST(FastCDRTests, Complete) EXPECT_ARRAY_DOUBLE_EQ(double_array_2_value, double_array_2_t, 5); EXPECT_ARRAY_LONG_DOUBLE_EQ(ldouble_array_2_value, ldouble_array_2_t, 5); EXPECT_ARRAY_EQ(bool_array_2_value, bool_array_2_t, 5); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_ARRAY_EQ(wstring_array_2_value, wstring_array_2_t, 5); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(octet_vector_value, octet_vector_t); EXPECT_EQ(char_vector_value, char_vector_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wchar_vector_value, wchar_vector_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(int8_vector_value, int8_vector_t); EXPECT_EQ(ushort_vector_value, ushort_vector_t); EXPECT_EQ(short_vector_value, short_vector_t); @@ -6855,15 +7021,19 @@ TEST(FastCDRTests, Complete) EXPECT_EQ(double_vector_value, double_vector_t); EXPECT_EQ(ldouble_vector_value, ldouble_vector_t); EXPECT_EQ(bool_vector_value, bool_vector_t); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wstring_vector_value, wstring_vector_t); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(triple_ulong_array_t, triple_ulong_array_value); EXPECT_EQ(octet_seq_len, 5u); EXPECT_ARRAY_EQ(octet_seq_value, octet_seq_t, 5); EXPECT_EQ(char_seq_len, 5u); EXPECT_ARRAY_EQ(char_seq_value, char_seq_t, 5); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wchar_seq_len, 5u); EXPECT_ARRAY_EQ(wchar_seq_value, wchar_seq_t, 5); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(int8_seq_len, 5u); EXPECT_ARRAY_EQ(int8_seq_value, int8_seq_t, 5); EXPECT_EQ(ushort_seq_len, 5u); @@ -6884,17 +7054,25 @@ TEST(FastCDRTests, Complete) EXPECT_ARRAY_DOUBLE_EQ(double_seq_value, double_seq_t, 5); EXPECT_EQ(ldouble_seq_len, 5u); EXPECT_ARRAY_LONG_DOUBLE_EQ(ldouble_seq_value, ldouble_seq_t, 5); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wstring_seq_len, 5u); EXPECT_ARRAY_EQ(wstring_seq_value, wstring_seq_t, 5); +#endif // if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(strcmp(c_string_t, c_string_value), 0); +#if !FASTCDR_DISABLE_WSTRINGS EXPECT_EQ(wcscmp(c_wstring_t, c_wstring_value), 0); +#endif // if !FASTCDR_DISABLE_WSTRINGS +#if !FASTCDR_DISABLE_WSTRINGS delete[] wstring_seq_value; +#endif // if !FASTCDR_DISABLE_WSTRINGS free(octet_seq_value); free(char_seq_value); +#if !FASTCDR_DISABLE_WSTRINGS free(wchar_seq_value); +#endif // if !FASTCDR_DISABLE_WSTRINGS free(int8_seq_value); free(ushort_seq_value); free(short_seq_value); @@ -6906,7 +7084,9 @@ TEST(FastCDRTests, Complete) free(double_seq_value); free(ldouble_seq_value); free(c_string_value); +#if !FASTCDR_DISABLE_WSTRINGS free(c_wstring_value); +#endif // if !FASTCDR_DISABLE_WSTRINGS } // Regression test diff --git a/test/xcdr/basic_types.cpp b/test/xcdr/basic_types.cpp index 2f589047..06072090 100644 --- a/test/xcdr/basic_types.cpp +++ b/test/xcdr/basic_types.cpp @@ -48,7 +48,7 @@ enum Enum8 : uint8_t ENUM8_VAL_2 = 1 }; -class XCdrBasicTypesTest : public ::testing::TestWithParam< std::tuple> +class XCdrBasicTypesTest : public ::testing::TestWithParam> { }; @@ -1771,6 +1771,7 @@ TEST_P(XCdrBasicTypesTest, char) serialize(expected_streams, encoding, endianness, char_value, false); } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with a field of wchar type. * @code{.idl} @@ -1859,6 +1860,7 @@ TEST_P(XCdrBasicTypesTest, wchar) serialize(expected_streams, encoding, endianness, wchar_value, false); } +#endif // if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with a field of string type. @@ -1959,6 +1961,7 @@ TEST_P(XCdrBasicTypesTest, string) serialize(expected_streams, encoding, endianness, string_value, false); } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with a field of wstring type. * @code{.idl} @@ -2065,6 +2068,7 @@ TEST_P(XCdrBasicTypesTest, wstring) serialize(expected_streams, encoding, endianness, string_value, false); } +#endif // if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with a field of fixed string type. @@ -8712,6 +8716,7 @@ TEST_P(XCdrBasicTypesTest, char_align_4) align_serialize(expected_streams, encoding, endianness, align_value, char_value, false); } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with a field of octet type and another of wchar type. * @code{.idl} @@ -8826,7 +8831,9 @@ TEST_P(XCdrBasicTypesTest, wchar_align_1) align_serialize(expected_streams, encoding, endianness, align_value, wchar_value, false); } +#endif // if !FASTCDR_DISABLE_WSTRINGS +#if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with a field of unsigned short type and another of wchar type. * @code{.idl} @@ -8937,7 +8944,9 @@ TEST_P(XCdrBasicTypesTest, wchar_align_2) align_serialize(expected_streams, encoding, endianness, align_value, wchar_value, false); } +#endif // if !FASTCDR_DISABLE_WSTRINGS +#if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with a field of unsigned long type and another of wchar type. * @code{.idl} @@ -9044,6 +9053,7 @@ TEST_P(XCdrBasicTypesTest, wchar_align_4) align_serialize(expected_streams, encoding, endianness, align_value, wchar_value, false); } +#endif // if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with a field of octet type and another of string type. @@ -9414,6 +9424,7 @@ TEST_P(XCdrBasicTypesTest, string_align_4) align_serialize(expected_streams, encoding, endianness, align_value, string_value, false); } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with a field of octet type and another of wstring type. * @code{.idl} @@ -9546,7 +9557,9 @@ TEST_P(XCdrBasicTypesTest, wstring_align_1) align_serialize(expected_streams, encoding, endianness, align_value, wstring_value, false); } +#endif // if !FASTCDR_DISABLE_WSTRINGS +#if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with a field of unsigned short type and another of wstring type. * @code{.idl} @@ -9681,7 +9694,9 @@ TEST_P(XCdrBasicTypesTest, wstring_align_2) align_serialize(expected_streams, encoding, endianness, align_value, wstring_value, false); } +#endif // if !FASTCDR_DISABLE_WSTRINGS +#if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with a field of unsigned long type and another of wstring type. * @code{.idl} @@ -9806,6 +9821,7 @@ TEST_P(XCdrBasicTypesTest, wstring_align_4) align_serialize(expected_streams, encoding, endianness, align_value, wstring_value, false); } +#endif // if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with a field of octet type and another of enum 32bits type. @@ -10836,6 +10852,7 @@ TEST_P(XCdrBasicTypesTest, enum8_align_4) align_serialize(expected_streams, encoding, endianness, align_value, enum_value, false); } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with strings * @code{.idl} @@ -11291,6 +11308,7 @@ TEST_P(XCdrBasicTypesTest, struct_with_strings) //} } } +#endif // if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with two fields of struct type. diff --git a/test/xcdr/optional.cpp b/test/xcdr/optional.cpp index 558acefa..34acf033 100644 --- a/test/xcdr/optional.cpp +++ b/test/xcdr/optional.cpp @@ -2094,6 +2094,7 @@ TEST_P(XCdrOptionalTest, char_optional) serialize_optional(expected_streams, encoding, endianness, char_value, false); } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with an optional field of wchar type. * @code{.idl} @@ -2193,6 +2194,7 @@ TEST_P(XCdrOptionalTest, wchar_optional) serialize_optional(expected_streams, encoding, endianness, wchar_value, false); } +#endif // if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with a field of octet type and an empty optional field of octet type. @@ -6911,6 +6913,7 @@ TEST_P(XCdrOptionalTest, char_align_4_optional) align_serialize_optional(expected_streams, encoding, endianness, align_value, char_value, false); } +#if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with a field of octet type and an optional of wchar type. * @code{.idl} @@ -7028,7 +7031,9 @@ TEST_P(XCdrOptionalTest, wchar_align_1_optional) align_serialize_optional(expected_streams, encoding, endianness, align_value, wchar_value, false); } +#endif // if !FASTCDR_DISABLE_WSTRINGS +#if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with a field of unsigned short type and an optional of wchar type. * @code{.idl} @@ -7152,7 +7157,9 @@ TEST_P(XCdrOptionalTest, wchar_align_2_optional) align_serialize_optional(expected_streams, encoding, endianness, align_value, wchar_value, false); } +#endif // if !FASTCDR_DISABLE_WSTRINGS +#if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with a field of unsigned long type and an optional of wchar type. * @code{.idl} @@ -7270,6 +7277,7 @@ TEST_P(XCdrOptionalTest, wchar_align_4_optional) align_serialize_optional(expected_streams, encoding, endianness, align_value, wchar_value, false); } +#endif // if !FASTCDR_DISABLE_WSTRINGS /*! * @test Test a structure with two fields of optional struct type where inner optionals are null. diff --git a/test/xcdr/type_consistency.cpp b/test/xcdr/type_consistency.cpp index 9b63b5c1..842e3dd8 100644 --- a/test/xcdr/type_consistency.cpp +++ b/test/xcdr/type_consistency.cpp @@ -653,6 +653,7 @@ TEST_P(XCdrTypeConsistencyTest, StdString_Trim) } +#if !FASTCDR_DISABLE_WSTRINGS // ===================================================================================== // std::wstring // ===================================================================================== @@ -802,6 +803,7 @@ TEST_P(XCdrTypeConsistencyTest, StdWstring_Trim) ASSERT_NO_THROW(cdr_des.deserialize(output, CdrTryConstructFlag::TRIM, 5)); EXPECT_EQ(output, std::wstring(L"hello")); } +#endif // if !FASTCDR_DISABLE_WSTRINGS // ===================================================================================== @@ -970,6 +972,7 @@ TEST_P(XCdrTypeConsistencyTest, CharPtr_Trim) } +#if !FASTCDR_DISABLE_WSTRINGS // ===================================================================================== // wchar_t*& // ===================================================================================== @@ -1133,6 +1136,7 @@ TEST_P(XCdrTypeConsistencyTest, WcharPtr_Trim) EXPECT_EQ(std::wcscmp(output, L"hello"), 0); free(output); } +#endif // if !FASTCDR_DISABLE_WSTRINGS // ===================================================================================== diff --git a/versions.md b/versions.md index 9e989bb8..09fe605b 100644 --- a/versions.md +++ b/versions.md @@ -1,5 +1,7 @@ # v2.5.0 +* Add FASTCDR_DISABLE_WSTRINGS CMake option to leave out the wide character and string API + # v2.4.0 * Add STRICT_BOOL CMake option to enforce canonical bool serialization