Commit Graph

25 Commits

Author SHA1 Message Date
Vadim Zeitlin
e70fc11ef1 Replace CppUnit with Catch for unit tests
Drop the legacy CppUnit testing framework used for the unit tests.
Replacing it with Catch has the advantage of not requiring CppUnit
libraries to be installed on the system in order to be able to run
tests (Catch is header-only and a copy of it is now included in the
main repository itself) and, in the future, of being able to write
the tests in a much more natural way.

For now, however, avoid changing the existing tests code as much as
[reasonably] possible to avoid introducing bugs in them and provide
the CppUnit compatibility macros in the new wx/catch_cppunit.h header
which allow to preserve the 99% of the existing code unchanged. Some
of the required changes are:

 - Decompose asserts using "a && b" conditions into multiple asserts
   checking "a" and "b" independently. This would have been better
   even with CppUnit (to know which part of condition exactly failed)
   and is required with Catch.

 - Use extra parentheses around such conditions when they can't be
   easily decomposed in the arrays test, due to the use of macros.
   This is not ideal from the point of view of messages given when
   the tests fail but will do for now.

 - Rewrite asserts using "a || b" as a combination of condition
   checks and assert macros. Again, this is better anyhow, and is
   required with Catch. Incidentally, this allowed to fix a bug in
   the "exec" unit test which didn't leave enough time for the new
   process to be launched before trying to kill it.

 - Remove multiple CPPUNIT_TEST_SUITE_NAMED_REGISTRATION() macros,
   our emulation of this macro can be used only once.

 - Provide string conversions using Catch-specific StringMaker for
   a couple of types.

 - Replace custom wxImage comparison with a Catch-specific matcher
   class.

 - Remove most of test running logic from test.cpp, in particular don't
   parse command line ourselves any longer but use Catch built-in
   command line parser. This is a source of a minor regression:
   previously, both "Foo" and "FooTestCase" could be used as the name of
   the test to run, but now only the latter is accepted.
2017-11-02 01:53:16 +01:00
Vadim Zeitlin
c54b611093 Replace few uses of CPPUNIT_TEST_FAIL with just CPPUNIT_TEST
Use positive tests really checking for whatever we want to check (that
the stream is not seekable in this particular case) instead of just
checking that the test fails, for whatever reason -- which might not be
at all the reason for which we expect it to fail.
2017-10-31 22:04:12 +01:00
Vadim Zeitlin
ba5a0a3878 Fix more typos in comments and wxFAIL messages
Closes https://github.com/wxWidgets/wxWidgets/pull/270
2016-04-14 16:08:28 +02:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Dimitri Schoolwerth
d13b34d3f2 No code changes, fixed various typos.
Applied patch by snowleopard2 fixing typos in interface/. Extended the fixes throughout trunk.

Closes #13076.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-03 20:31:32 +00:00
Dimitri Schoolwerth
4c51a665c6 Fixed various typos.
Applied patch by snowleopard2 fixing a bunch of typos such as misspellings and double words in the documentation. Combined the patch with some local queued typos waiting to be committed as well as adding new typo fixes inspired by the patch.

Function names with American spelling were not changed nor was third-party code touched. The only code changes involve some changes in strings that are translated ("Can not" -> "Cannot").

Closes #13063 (again).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 14:17:38 +00:00
Vadim Zeitlin
526954c596 Globally use "wxWindows licence" consistently.
Use "wxWindows licence" and not "wxWidgets licence" (the latter doesn't
exist) and consistently spell "licence" using British spelling.

See #12165.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-13 13:29:13 +00:00
Michael Wetherell
c896c76129 Repair the stream tests.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-30 17:39:47 +00:00
Vadim Zeitlin
9a83f86094 Globally replace _T() with wxT().
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-23 20:30:22 +00:00
Vadim Zeitlin
4e42fe49f2 removed the now unnecessary WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxFileOffset)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-03 11:36:04 +00:00
Vadim Zeitlin
68888eeaa8 compilation fixes for 64 bit platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-16 17:41:25 +00:00
Vadim Zeitlin
b2eabfe866 abstract VC6 workaround inside a WX_CPPUNIT_ALLOW_EQUALS_TO_INT() macro
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-04 16:04:22 +00:00
Vadim Zeitlin
9540df9c2e use correct type for file offset
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-04 15:49:24 +00:00
Vadim Zeitlin
a54b285e7c allow using CPPUNIT_ASSERT_EQUAL(int, wxFileOffset) too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-04 00:47:10 +00:00
Vadim Zeitlin
3e98ba4589 trying to fix buildbot VC6 build error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-03 19:29:46 +00:00
Vadim Zeitlin
91bde3ec3e more CPPUNIT_ASSERT replacements with CPPUNIT_ASSERT_EQUAL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-27 11:22:59 +00:00
Vadim Zeitlin
bf451723ca check that the stream raises no error other than EOF when it's supposed to be at EOF
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-12 02:30:06 +00:00
Vadim Zeitlin
8bd966d3cd skip calls of TellI/TellO() if the stream is not seekable; more const-correctness
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-09 02:16:27 +00:00
Vadim Zeitlin
2d76b6d8c3 implemented wxMemoryInputStream::CanRead() and added tests for CanRead() to all stream tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-17 15:38:09 +00:00
Ryan Norton
8f0ff17851 [ 1070686 ] wxOutputStream::Close()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 14:26:10 +00:00
Włodzimierz Skiba
3e5f6c1c4f Patch 1053127 - Test fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 21:29:08 +00:00
Vadim Zeitlin
30984deafc new set of fixes for problems due to huge files support: drop wxFileSize_t, use wxFileOffset only, make wxInvalidOffset an int (main part of the patch 1063498)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 21:02:58 +00:00
Václav Slavík
7735998c2a applied rest of streams test suite patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-18 19:26:20 +00:00
Václav Slavík
08776b0914 stream tests improvements (patch 924438)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-11 20:59:33 +00:00
Václav Slavík
e3f810a21b forgot to add header file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-01 12:22:44 +00:00