@@ -122,23 +122,23 @@ TEST(time_utils_test, timestamp_to_string_to_timestamp)
122122 std::string old_time_str = timestamp_to_string (old_time);
123123
124124 std::ostringstream expected_string_os;
125- #if _EPROSIMA_WINDOWS_PLATFORM
125+ #if _EPROSIMA_WINDOWS_PLATFORM
126126 expected_string_os
127127 << 1970
128128 << " -" << " 01"
129129 << " -" << " 01"
130130 << " _" << " 00"
131131 << " -" << " 00"
132132 << " -" << " 00" ;
133- #else
133+ #else
134134 expected_string_os
135135 << 1959
136136 << " -" << " 07"
137137 << " -" << 20
138138 << " _" << " 06"
139139 << " -" << 39
140140 << " -" << 42 ;
141- #endif // _EPROSIMA_WINDOWS_PLATFORM
141+ #endif // _EPROSIMA_WINDOWS_PLATFORM
142142
143143 // Test timestamp_to_string
144144 ASSERT_EQ (old_time_str, expected_string_os.str ());
@@ -155,23 +155,23 @@ TEST(time_utils_test, timestamp_to_string_to_timestamp)
155155 std::string beginning_time_str = timestamp_to_string (beginning_time);
156156
157157 std::ostringstream expected_string_os;
158- #if _EPROSIMA_WINDOWS_PLATFORM
158+ #if _EPROSIMA_WINDOWS_PLATFORM
159159 expected_string_os
160160 << 1970
161161 << " -" << " 01"
162162 << " -" << " 01"
163163 << " _" << " 00"
164164 << " -" << " 00"
165165 << " -" << " 00" ;
166- #else // 1677-09-21_00-12-44
166+ #else // 1677-09-21_00-12-44
167167 expected_string_os
168168 << 1677
169169 << " -" << " 09"
170170 << " -" << " 21"
171171 << " _" << " 00"
172172 << " -" << " 12"
173173 << " -" << " 44" ;
174- #endif // _EPROSIMA_WINDOWS_PLATFORM
174+ #endif // _EPROSIMA_WINDOWS_PLATFORM
175175
176176
177177 // Test timestamp_to_string
@@ -212,23 +212,23 @@ TEST(time_utils_test, timestamp_to_string_to_timestamp)
212212 std::string future_time_str = timestamp_to_string (future_time);
213213
214214 std::ostringstream expected_string_os;
215- #if _EPROSIMA_WINDOWS_PLATFORM
215+ #if _EPROSIMA_WINDOWS_PLATFORM && PLATFORM_32BIT
216216 expected_string_os
217217 << 2038
218218 << " -" << " 01"
219219 << " -" << 19
220220 << " _" << " 03"
221221 << " -" << " 14"
222222 << " -" << " 07" ;
223- #else
223+ #else
224224 expected_string_os
225225 << 2049
226226 << " -" << " 05"
227227 << " -" << 22
228228 << " _" << " 00"
229229 << " -" << " 00"
230230 << " -" << " 00" ;
231- #endif // _EPROSIMA_WINDOWS_PLATFORM
231+ #endif // _EPROSIMA_WINDOWS_PLATFORM
232232
233233 // Test timestamp_to_string
234234 ASSERT_EQ (future_time_str, expected_string_os.str ());
@@ -245,23 +245,31 @@ TEST(time_utils_test, timestamp_to_string_to_timestamp)
245245 std::string end_time_str = timestamp_to_string (end_time);
246246
247247 std::ostringstream expected_string_os;
248- #if _EPROSIMA_WINDOWS_PLATFORM
248+ #if _EPROSIMA_WINDOWS_PLATFORM && _PLATFORM_32BIT
249249 expected_string_os
250250 << 2038
251251 << " -" << " 01"
252252 << " -" << 19
253253 << " _" << " 03"
254254 << " -" << " 14"
255255 << " -" << " 07" ;
256- #else // 2262-04-11 23:47:16
256+ #elif _EPROSIMA_WINDOWS_PLATFORM && _PLATFORM_64BIT
257+ expected_string_os
258+ << 3000
259+ << " -" << " 12"
260+ << " -" << 31
261+ << " _" << " 23"
262+ << " -" << " 59"
263+ << " -" << " 59" ;
264+ #else // 2262-04-11 23:47:16
257265 expected_string_os
258266 << 2262
259267 << " -" << " 04"
260268 << " -" << 11
261269 << " _" << " 23"
262270 << " -" << " 47"
263271 << " -" << " 16" ;
264- #endif // _EPROSIMA_WINDOWS_PLATFORM
272+ #endif // _EPROSIMA_WINDOWS_PLATFORM
265273
266274
267275 // Test timestamp_to_string
0 commit comments