Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

Proposed by Paul J. Lucas on 2013-01-09
Status: Merged
Approved by: Matthias Brantner on 2013-01-10
Approved revision: 11027
Merged at revision: 11175
Proposed branch: lp:~paul-lucas/zorba/pjl-misc
Merge into: lp:zorba
Diff against target: 57 lines (+15/-4)
2 files modified
src/util/icu_streambuf.h (+1/-1)
test/unit/CMakeLists.txt (+14/-3)
To merge this branch: bzr merge lp:~paul-lucas/zorba/pjl-misc
Reviewer Review Type Date Requested Status
Matthias Brantner 2013-01-09 Approve on 2013-01-10
Paul J. Lucas Approve on 2013-01-09
Review via email: mp+142438@code.launchpad.net

Commit message

Added missing unit tests.

Description of the change

Added missing unit tests.

To post a comment you must log in.
Paul J. Lucas (paul-lucas) :
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job pjl-misc-2013-01-10T20-29-00.352Z is finished. The final status was:

All tests succeeded!

Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending.

review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job pjl-misc-2013-01-10T21-55-48.301Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/util/icu_streambuf.h'
2--- src/util/icu_streambuf.h 2012-12-27 18:50:25 +0000
3+++ src/util/icu_streambuf.h 2013-01-09 05:16:20 +0000
4@@ -46,12 +46,12 @@
5 * try {
6 * os.ios::rdbuf( &xbuf );
7 * // ...
8+ * os.ios::rdbuf( xbuf.original() );
9 * }
10 * catch ( ... ) {
11 * os.ios::rdbuf( xbuf.original() );
12 * throw;
13 * }
14- * os.ios::rdbuf( xbuf.original() );
15 * }
16 * \endcode
17 *
18
19=== modified file 'test/unit/CMakeLists.txt'
20--- test/unit/CMakeLists.txt 2012-09-19 21:16:15 +0000
21+++ test/unit/CMakeLists.txt 2013-01-09 05:16:20 +0000
22@@ -137,21 +137,32 @@
23 ZORBA_GENERATE_EXE(LibUnitTest lib_unit_test.cpp "" "" "")
24
25 # ADD NEW UNIT TESTS HERE
26+ZORBA_ADD_TEST("test/libunit/base64" LibUnitTest base64)
27+ZORBA_ADD_TEST("test/libunit/base64_streambuf" LibUnitTest base64_streambuf)
28 IF (NOT WIN32)
29 # disabled because of bug lp:867271
30 ZORBA_ADD_TEST("test/libunit/string" LibUnitTest string)
31 ENDIF (NOT WIN32)
32 ZORBA_ADD_TEST("test/libunit/uri" LibUnitTest uri)
33 EXPECTED_FAILURE(test/libunit/uri 3118348)
34+IF (NOT ZORBA_NO_ICU)
35+ ZORBA_ADD_TEST("test/libunit/icu_streambuf" LibUnitTest icu_streambuf)
36+ENDIF (NOT ZORBA_NO_ICU)
37 ZORBA_ADD_TEST("test/libunit/json_parser" LibUnitTest json_parser)
38 #ZORBA_ADD_TEST("test/libunit/memory_manager" LibUnitTest memory_manager)
39-IF (NOT ZORBA_HAVE_UNIQUE_PTR)
40- ZORBA_ADD_TEST("test/libunit/unique_ptr" LibUnitTest unique_ptr)
41-ENDIF (NOT ZORBA_HAVE_UNIQUE_PTR)
42 IF (NOT ZORBA_NO_FULL_TEXT)
43 ZORBA_ADD_TEST("test/libunit/stemmer" LibUnitTest stemmer)
44 ZORBA_ADD_TEST("test/libunit/thesaurus" LibUnitTest thesaurus)
45 ZORBA_ADD_TEST("test/libunit/tokenizer" LibUnitTest tokenizer)
46 ENDIF (NOT ZORBA_NO_FULL_TEXT)
47+IF (NOT ZORBA_HAVE_UNIQUE_PTR)
48+ ZORBA_ADD_TEST("test/libunit/unique_ptr" LibUnitTest unique_ptr)
49+ENDIF (NOT ZORBA_HAVE_UNIQUE_PTR)
50+IF (NOT ZORBA_HAVE_UNORDERED_MAP)
51+ ZORBA_ADD_TEST("test/libunit/unordered_map" LibUnitTest unordered_map)
52+ENDIF (NOT ZORBA_HAVE_UNORDERED_MAP)
53+IF (NOT ZORBA_HAVE_UNORDERED_SET)
54+ ZORBA_ADD_TEST("test/libunit/unordered_set" LibUnitTest unordered_set)
55+ENDIF (NOT ZORBA_HAVE_UNORDERED_SET)
56
57 # vim:set et sw=2 ts=2:

Subscribers

People subscribed via source and target branches