Zorba

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

  1. pjl-misc
  2. Merge into trunk
Proposed by Paul J. Lucas
Status: Merged
Approved by: Matthias Brantner
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 Approve
Paul J. Lucas Approve
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.
Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-01-10T20-29-00.352Z/log.html

Revision history for this message
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!

Revision history for this message
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.

Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-01-10T21-55-48.301Z/log.html

Revision history for this message
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
=== modified file 'src/util/icu_streambuf.h'
--- src/util/icu_streambuf.h 2012-12-27 18:50:25 +0000
+++ src/util/icu_streambuf.h 2013-01-09 05:16:20 +0000
@@ -46,12 +46,12 @@
46 * try {46 * try {
47 * os.ios::rdbuf( &xbuf );47 * os.ios::rdbuf( &xbuf );
48 * // ...48 * // ...
49 * os.ios::rdbuf( xbuf.original() );
49 * }50 * }
50 * catch ( ... ) {51 * catch ( ... ) {
51 * os.ios::rdbuf( xbuf.original() );52 * os.ios::rdbuf( xbuf.original() );
52 * throw;53 * throw;
53 * }54 * }
54 * os.ios::rdbuf( xbuf.original() );
55 * }55 * }
56 * \endcode56 * \endcode
57 *57 *
5858
=== modified file 'test/unit/CMakeLists.txt'
--- test/unit/CMakeLists.txt 2012-09-19 21:16:15 +0000
+++ test/unit/CMakeLists.txt 2013-01-09 05:16:20 +0000
@@ -137,21 +137,32 @@
137ZORBA_GENERATE_EXE(LibUnitTest lib_unit_test.cpp "" "" "")137ZORBA_GENERATE_EXE(LibUnitTest lib_unit_test.cpp "" "" "")
138138
139# ADD NEW UNIT TESTS HERE139# ADD NEW UNIT TESTS HERE
140ZORBA_ADD_TEST("test/libunit/base64" LibUnitTest base64)
141ZORBA_ADD_TEST("test/libunit/base64_streambuf" LibUnitTest base64_streambuf)
140IF (NOT WIN32)142IF (NOT WIN32)
141 # disabled because of bug lp:867271143 # disabled because of bug lp:867271
142 ZORBA_ADD_TEST("test/libunit/string" LibUnitTest string)144 ZORBA_ADD_TEST("test/libunit/string" LibUnitTest string)
143ENDIF (NOT WIN32)145ENDIF (NOT WIN32)
144ZORBA_ADD_TEST("test/libunit/uri" LibUnitTest uri)146ZORBA_ADD_TEST("test/libunit/uri" LibUnitTest uri)
145EXPECTED_FAILURE(test/libunit/uri 3118348)147EXPECTED_FAILURE(test/libunit/uri 3118348)
148IF (NOT ZORBA_NO_ICU)
149 ZORBA_ADD_TEST("test/libunit/icu_streambuf" LibUnitTest icu_streambuf)
150ENDIF (NOT ZORBA_NO_ICU)
146ZORBA_ADD_TEST("test/libunit/json_parser" LibUnitTest json_parser)151ZORBA_ADD_TEST("test/libunit/json_parser" LibUnitTest json_parser)
147#ZORBA_ADD_TEST("test/libunit/memory_manager" LibUnitTest memory_manager)152#ZORBA_ADD_TEST("test/libunit/memory_manager" LibUnitTest memory_manager)
148IF (NOT ZORBA_HAVE_UNIQUE_PTR)
149 ZORBA_ADD_TEST("test/libunit/unique_ptr" LibUnitTest unique_ptr)
150ENDIF (NOT ZORBA_HAVE_UNIQUE_PTR)
151IF (NOT ZORBA_NO_FULL_TEXT)153IF (NOT ZORBA_NO_FULL_TEXT)
152 ZORBA_ADD_TEST("test/libunit/stemmer" LibUnitTest stemmer)154 ZORBA_ADD_TEST("test/libunit/stemmer" LibUnitTest stemmer)
153 ZORBA_ADD_TEST("test/libunit/thesaurus" LibUnitTest thesaurus)155 ZORBA_ADD_TEST("test/libunit/thesaurus" LibUnitTest thesaurus)
154 ZORBA_ADD_TEST("test/libunit/tokenizer" LibUnitTest tokenizer)156 ZORBA_ADD_TEST("test/libunit/tokenizer" LibUnitTest tokenizer)
155ENDIF (NOT ZORBA_NO_FULL_TEXT)157ENDIF (NOT ZORBA_NO_FULL_TEXT)
158IF (NOT ZORBA_HAVE_UNIQUE_PTR)
159 ZORBA_ADD_TEST("test/libunit/unique_ptr" LibUnitTest unique_ptr)
160ENDIF (NOT ZORBA_HAVE_UNIQUE_PTR)
161IF (NOT ZORBA_HAVE_UNORDERED_MAP)
162 ZORBA_ADD_TEST("test/libunit/unordered_map" LibUnitTest unordered_map)
163ENDIF (NOT ZORBA_HAVE_UNORDERED_MAP)
164IF (NOT ZORBA_HAVE_UNORDERED_SET)
165 ZORBA_ADD_TEST("test/libunit/unordered_set" LibUnitTest unordered_set)
166ENDIF (NOT ZORBA_HAVE_UNORDERED_SET)
156167
157# vim:set et sw=2 ts=2:168# vim:set et sw=2 ts=2:

Subscribers

People subscribed via source and target branches