Merge branch 'catchify'

Switch from CppUnit to Catch for the unit tests.

Closes https://github.com/wxWidgets/wxWidgets/pull/577

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "3rdparty/catch"]
+	path = 3rdparty/catch
+	url = https://github.com/wxWidgets/Catch.git

.travis.yml

@@ -48,7 +48,7 @@ script:
     - make -C tests
     - echo -en 'travis_fold:end:script.tests\\r'
     - echo 'Testing...' && echo -en 'travis_fold:start:script.testing\\r'
-    - pushd tests && ./test -t && popd
+    - pushd tests && ./test && popd
     - echo -en 'travis_fold:end:script.testing\\r'
     - echo 'Building samples...' && echo -en 'travis_fold:start:script.samples\\r'
     - (test "$wxSKIP_SAMPLES" && echo 'SKIPPED') || make samples

3rdparty/catch

@@ -0,0 +1 @@
+Subproject commit 2d91035404884089d1faf038300e437963e0c2a4

build/aclocal/cppunit.m4

@@ -1,81 +0,0 @@
-dnl
-dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl
-AC_DEFUN([AM_PATH_CPPUNIT],
-[
-
-AC_ARG_WITH(cppunit-prefix,[  --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)],
-            cppunit_config_prefix="$withval", cppunit_config_prefix="")
-AC_ARG_WITH(cppunit-exec-prefix,[  --with-cppunit-exec-prefix=PFX  Exec prefix where CppUnit is installed (optional)],
-            cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
-
-  if test x$cppunit_config_exec_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
-     fi
-  fi
-  if test x$cppunit_config_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
-     fi
-  fi
-
-  AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
-  cppunit_version_min=$1
-
-  AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
-  no_cppunit=""
-  if test "$CPPUNIT_CONFIG" = "no" ; then
-    AC_MSG_RESULT(no)
-    no_cppunit=yes
-  else
-    CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
-    CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
-    cppunit_version=`$CPPUNIT_CONFIG --version`
-
-    cppunit_major_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    cppunit_minor_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    cppunit_micro_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-    cppunit_major_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    cppunit_minor_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    cppunit_micro_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-    cppunit_version_proper=`expr \
-        $cppunit_major_version \> $cppunit_major_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \> $cppunit_minor_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \= $cppunit_minor_min \& \
-        $cppunit_micro_version \>= $cppunit_micro_min `
-
-    if test "$cppunit_version_proper" = "1" ; then
-      AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
-    else
-      AC_MSG_RESULT(no)
-      no_cppunit=yes
-    fi
-  fi
-
-  if test "x$no_cppunit" = x ; then
-     ifelse([$2], , :, [$2])     
-  else
-     CPPUNIT_CFLAGS=""
-     CPPUNIT_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-
-  AC_SUBST(CPPUNIT_CFLAGS)
-  AC_SUBST(CPPUNIT_LIBS)
-])
-
-
-

build/bakefiles/config.bkl

@@ -374,24 +374,6 @@ compiled .lib files and setup.h under the lib/ toplevel directory.
         </description>
     </option>
 
-    <!-- unit tests support: -->
-    <option name="CPPUNIT_CFLAGS">
-        <default-value></default-value>
-        <description>
-Compiler flags needed to compile test suite in tests directory. If you want
-to run the tests, set it so that the compiler can find CppUnit headers.
-        </description>
-    </option>
-
-    <option name="CPPUNIT_LIBS">
-        <default-value></default-value>
-        <description>
-Linker flags needed to link test suite in tests directory. If you want
-to run the tests, include CppUnit library here.
-        </description>
-    </option>
-
-
     <!-- ================================================================== -->
     <!--                             Autoconf                               -->
     <!-- ================================================================== -->

build/buildbot/config/include/csleobuild.xml

@@ -28,7 +28,7 @@
             <command>
                 export DYLD_LIBRARY_PATH=../lib
                 cd tests &amp;&amp;
-                ./test -t &amp;&amp;
+                ./test &amp;&amp;
                 open ./test_gui.app
             </command>
         </copy-with-defaults>

build/msw/config.bcc

@@ -196,18 +196,6 @@ WX_LIB_FLAVOUR =
 CFG = 
 !endif
 
-# Compiler flags needed to compile test suite in tests directory. If you want
-# to run the tests, set it so that the compiler can find CppUnit headers. 
-!ifndef CPPUNIT_CFLAGS
-CPPUNIT_CFLAGS = 
-!endif
-
-# Linker flags needed to link test suite in tests directory. If you want
-# to run the tests, include CppUnit library here. 
-!ifndef CPPUNIT_LIBS
-CPPUNIT_LIBS = 
-!endif
-
 # Version of C runtime library to use. You can change this to
 # static if SHARED=0, but it is highly recommended to not do
 # it if SHARED=1 unless you know what you are doing. [dynamic,static]

build/msw/config.gcc

@@ -130,14 +130,6 @@ WX_LIB_FLAVOUR ?=
 # compiled .lib files and setup.h under the lib/ toplevel directory. 
 CFG ?= 
 
-# Compiler flags needed to compile test suite in tests directory. If you want
-# to run the tests, set it so that the compiler can find CppUnit headers. 
-CPPUNIT_CFLAGS ?= 
-
-# Linker flags needed to link test suite in tests directory. If you want
-# to run the tests, include CppUnit library here. 
-CPPUNIT_LIBS ?= 
-
 # Version of C runtime library to use. You can change this to
 # static if SHARED=0, but it is highly recommended to not do
 # it if SHARED=1 unless you know what you are doing. [dynamic,static]

build/msw/config.vc

@@ -138,14 +138,6 @@ WX_LIB_FLAVOUR =
 # compiled .lib files and setup.h under the lib/ toplevel directory. 
 CFG = 
 
-# Compiler flags needed to compile test suite in tests directory. If you want
-# to run the tests, set it so that the compiler can find CppUnit headers. 
-CPPUNIT_CFLAGS = 
-
-# Linker flags needed to link test suite in tests directory. If you want
-# to run the tests, include CppUnit library here. 
-CPPUNIT_LIBS = 
-
 # Version of C runtime library to use. You can change this to
 # static if SHARED=0, but it is highly recommended to not do
 # it if SHARED=1 unless you know what you are doing. [dynamic,static]

build/msw/makefile.bcc

@@ -36,8 +36,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 	-DUSE_THREADS="$(USE_THREADS)" -DUSE_CAIRO="$(USE_CAIRO)" \
 	-DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
 	-DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
-	-DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
+	-DCFG="$(CFG)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
-	-DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
 WX_RELEASE_NODOT = 31
 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
 COMPILER_PREFIX = bcc

build/msw/makefile.gcc

@@ -28,7 +28,6 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
 	USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
 	OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
 	WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
-	CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
 	RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" \
 	WINDRES="$(WINDRES)"
 CPPDEPS = -MT$@ -MF$@.d -MD -MP

build/msw/makefile.vc

@@ -27,7 +27,6 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 	USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
 	OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
 	WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
-	CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
 	RUNTIME_LIBS="$(RUNTIME_LIBS)"
 WX_RELEASE_NODOT = 31
 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1

configure

@@ -626,7 +626,6 @@ enable_option_checking=no
 enable_option_checking=fatal
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-CPPUNIT_CONFIG
 RESCOMP
 DLLTOOL
 GCC
@@ -891,8 +890,6 @@ INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
 RANLIB
-CPPUNIT_LIBS
-CPPUNIT_CFLAGS
 HOST_SUFFIX
 HEADER_PAD_OPTION
 SAMPLES_CXXFLAGS
@@ -1355,8 +1352,6 @@ with_sdl_exec_prefix
 enable_sdltest
 enable_dependency_tracking
 enable_precomp_headers
-with_cppunit_prefix
-with_cppunit_exec_prefix
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1409,9 +1404,7 @@ WEBKIT_LIBS
 CAIRO_CFLAGS
 CAIRO_LIBS
 GST_CFLAGS
-GST_LIBS
+GST_LIBS'
-CPPUNIT_CFLAGS
-CPPUNIT_LIBS'
 ac_subdirs_all='src/tiff
 src/expat'
 
@@ -2342,8 +2335,6 @@ Optional Packages:
   --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib
   --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)
   --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)
-  --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)
-  --with-cppunit-exec-prefix=PFX  Exec prefix where CppUnit is installed (optional)
 
 Some influential environment variables:
   CC          C compiler command
@@ -2417,10 +2408,6 @@ Some influential environment variables:
   CAIRO_LIBS  linker flags for CAIRO, overriding pkg-config
   GST_CFLAGS  C compiler flags for GST, overriding pkg-config
   GST_LIBS    linker flags for GST, overriding pkg-config
-  CPPUNIT_CFLAGS
-              C compiler flags for CPPUNIT, overriding pkg-config
-  CPPUNIT_LIBS
-              linker flags for CPPUNIT, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -35891,8 +35878,6 @@ TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'`
 
 
 
-
-
 case "$TOOLKIT" in
     GTK)
         TOOLKIT_DESC="GTK+"
@@ -38524,211 +38509,7 @@ if test "$wxUSE_GUI" = "yes"; then
 else
             SUBDIRS="samples utils"
 fi
-
+SUBDIRS="$SUBDIRS tests"
-
-
-# Check whether --with-cppunit-prefix was given.
-if test "${with_cppunit_prefix+set}" = set; then :
-  withval=$with_cppunit_prefix; cppunit_config_prefix="$withval"
-else
-  cppunit_config_prefix=""
-fi
-
-
-# Check whether --with-cppunit-exec-prefix was given.
-if test "${with_cppunit_exec_prefix+set}" = set; then :
-  withval=$with_cppunit_exec_prefix; cppunit_config_exec_prefix="$withval"
-else
-  cppunit_config_exec_prefix=""
-fi
-
-
-  if test x$cppunit_config_exec_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
-     fi
-  fi
-  if test x$cppunit_config_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
-     fi
-  fi
-
-  # Extract the first word of "cppunit-config", so it can be a program name with args.
-set dummy cppunit-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CPPUNIT_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CPPUNIT_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CPPUNIT_CONFIG="$CPPUNIT_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CPPUNIT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_CPPUNIT_CONFIG" && ac_cv_path_CPPUNIT_CONFIG="no"
-  ;;
-esac
-fi
-CPPUNIT_CONFIG=$ac_cv_path_CPPUNIT_CONFIG
-if test -n "$CPPUNIT_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_CONFIG" >&5
-$as_echo "$CPPUNIT_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  cppunit_version_min=1.8.0
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cppunit - version >= $cppunit_version_min" >&5
-$as_echo_n "checking for Cppunit - version >= $cppunit_version_min... " >&6; }
-  no_cppunit=""
-  if test "$CPPUNIT_CONFIG" = "no" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    no_cppunit=yes
-  else
-    CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
-    CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
-    cppunit_version=`$CPPUNIT_CONFIG --version`
-
-    cppunit_major_version=`echo $cppunit_version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-    cppunit_minor_version=`echo $cppunit_version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-    cppunit_micro_version=`echo $cppunit_version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-
-    cppunit_major_min=`echo $cppunit_version_min | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-    cppunit_minor_min=`echo $cppunit_version_min | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-    cppunit_micro_min=`echo $cppunit_version_min | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-
-    cppunit_version_proper=`expr \
-        $cppunit_major_version \> $cppunit_major_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \> $cppunit_minor_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \= $cppunit_minor_min \& \
-        $cppunit_micro_version \>= $cppunit_micro_min `
-
-    if test "$cppunit_version_proper" = "1" ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5
-$as_echo "$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      no_cppunit=yes
-    fi
-  fi
-
-  if test "x$no_cppunit" = x ; then
-     SUBDIRS="$SUBDIRS tests"
-  else
-     CPPUNIT_CFLAGS=""
-     CPPUNIT_LIBS=""
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPPUNIT" >&5
-$as_echo_n "checking for CPPUNIT... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$CPPUNIT_CFLAGS"; then
-        pkg_cv_CPPUNIT_CFLAGS="$CPPUNIT_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.8.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "cppunit >= 1.8.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags "cppunit >= 1.8.0" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$CPPUNIT_LIBS"; then
-        pkg_cv_CPPUNIT_LIBS="$CPPUNIT_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.8.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "cppunit >= 1.8.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_CPPUNIT_LIBS=`$PKG_CONFIG --libs "cppunit >= 1.8.0" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cppunit >= 1.8.0"`
-        else
-	        CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cppunit >= 1.8.0"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$CPPUNIT_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cppunit not found" >&5
-$as_echo "$as_me: WARNING: cppunit not found" >&2;}
-
-elif test $pkg_failed = untried; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cppunit not found" >&5
-$as_echo "$as_me: WARNING: cppunit not found" >&2;}
-
-else
-	CPPUNIT_CFLAGS=$pkg_cv_CPPUNIT_CFLAGS
-	CPPUNIT_LIBS=$pkg_cv_CPPUNIT_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	SUBDIRS="$SUBDIRS tests"
-fi
-
-
-  fi
-
-
-
-
 
 for subdir in $SUBDIRS; do
     if test -d ${srcdir}/${subdir} ; then

configure.in

@@ -7903,8 +7903,6 @@ AC_SUBST(SAMPLES_RPATH_FLAG)
 AC_SUBST(SAMPLES_CXXFLAGS)
 AC_SUBST(HEADER_PAD_OPTION)
 AC_SUBST(HOST_SUFFIX)
-AC_SUBST(CPPUNIT_CFLAGS)
-AC_SUBST(CPPUNIT_LIBS)
 
 case "$TOOLKIT" in
     GTK)
@@ -8189,16 +8187,7 @@ else
     dnl there are no wxBase programs in demos
     SUBDIRS="samples utils"
 fi
-dnl Add tests to the list of subdirs if cppunit 1.8.0+ is detected
+SUBDIRS="$SUBDIRS tests"
-AM_PATH_CPPUNIT(1.8.0,
-    [SUBDIRS="$SUBDIRS tests"],
-    [
-        PKG_CHECK_MODULES(CPPUNIT, [cppunit >= 1.8.0],
-            [SUBDIRS="$SUBDIRS tests"],
-            [AC_MSG_WARN([cppunit not found])]
-        )
-    ]
-)
 
 for subdir in $SUBDIRS; do
     if test -d ${srcdir}/${subdir} ; then

demos/makefile.bcc

@@ -36,8 +36,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 	-DUSE_THREADS="$(USE_THREADS)" -DUSE_CAIRO="$(USE_CAIRO)" \
 	-DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
 	-DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
-	-DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
+	-DCFG="$(CFG)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
-	-DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 ### Conditionally set variables: ###
 

demos/makefile.gcc

@@ -28,7 +28,6 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
 	USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
 	OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
 	WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
-	CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
 	RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" \
 	WINDRES="$(WINDRES)"
 

demos/makefile.vc

@@ -27,7 +27,6 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 	USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
 	OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
 	WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
-	CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
 	RUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 ### Conditionally set variables: ###

docs/contributing/how-to-write-unit-tests.md

@@ -1,144 +1,94 @@
 How to write unit tests for wxWidgets
 =====================================
 
-Unit tests for wxWidgets are written using small cppunit framework. To compile
+wxWidgets unit tests use [Catch](http://catch-lib.net/) framework. It is
-(but not to run) them you need to have it installed. Hence the first part of
+included in wxWidgets as a submodule, so you will need to run
-this note explains how to do it while the second one explains how to write the
-test.
 
-I. CppUnit Installation
+    $ git submodule update --init 3rdparty/catch
------------------------
 
-1. Get it from http://www.sourceforge.net/projects/cppunit
+to get it before the first use. Catch is header-only and doesn't need to be
-   (latest version as of the time of this writing is 1.10.2)
+compiled.
 
-2. Build the library:
+Testing with Catch
- - Under Windows using VC++:
+------------------
-    - build everything in CppUnitLibraries.dsw work space
-    - add include and lib subdirectories of the directory
-      where you installed cppunit to the compiler search path
-      using "Tools|Options" menu in VC IDE
 
- - Under Unix: run `configure && make && make install` as usual
+**WARNING**: Most of the existing tests are currently still written in the
+CppUnit style, please do _not_ follow them when writing new tests, the old
+style is too complex and unnecessary.
+
+Writing tests with Catch is almost embarrassingly simple: you need to just
+add a new test case and use Catch assertion macros inside it, e.g.
+
+    TEST_CASE("MyNewTest", "[my][new][another-tag]")
+    {
+        wxString s("Hello, world!");
+        CHECK( s.BeforeFirst(",") == "Hello" );
+        CHECK( s.AfterLast(" ") == "world!" );
+    }
+
+This is all, the new test will be automatically run when you run the full test
+suite or you can run just it using
+
+    $ ./test MyNewTest
+
+(see below for more about running tests).
+
+See [Catch tutorial](https://github.com/philsquared/Catch/blob/v1.11.0/docs/tutorial.md)
+for more information.
 
 
-II. Writing tests with CppUnit
+Tests physical structure
-------------------------------
+------------------------
 
-1. Create a new directory tests/foo
+All (i.e. both GUI and non-GUI) unit tests are under `tests` subdirectory. When
+adding a new test, try to find an existing file to add it to. If there are no
+applicable files, try to add a new file to an existing directory. If there is
+no applicable directory neither, create a new one and put the new file there
+(i.e. do _not_ put new files directly under `tests`). If your test is small,
+consider adding it to `tests/misc/misctests.cpp`.
 
-2. Write a cpp file for the test copying, if you want,
+If you add a new file, you need to update `tests/test.bkl` and add a
-   from one of the existing tests. The things to look for:
+`<sources>` tag for your new file.bkl. Make sure it's in the correct section:
+the one starting `<exe id="test_gui"` for a gui test, the one starting `<exe
+id="test" template="wx_sample_console` otherwise. After modifying this file,
+rerun bakefile to regenerate the tests make- and project files:
 
- a) #include "wx/cppunit.h" instead of directly including CppUnit headers
+    $ cd build/bakefiles
-
+    $ bakefile_gen -b ../../tests/test.bkl
- b) don't put too many things in one test case nor in one method of a test
-    case as it makes understanding what exactly failed harder later
-
- c) 'register' your tests as follows so that the test program will find and
-    execute them:
-
-    // register in the unnamed registry so that these tests are run by default
-    CPPUNIT_TEST_SUITE_REGISTRATION(MBConvTestCase);
-
-    // also include in its own registry so that these tests can be run alone
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(MBConvTestCase, "MBConvTestCase");
-
-    Read CppUnit documentation for more.
-
- d) wxUIActionSimulator can be used when user input is required, for example
-    clicking buttons or typing text. A simple example of this can be found
-    in controls/buttontest.cpp. After simulating some user input always
-    wxYield to allow event processing. When writing a test using
-    wxUIActionSimulator always add the test using WXUISIM_TEST rather than
-    CPPUNIT_TEST as then it won't run on unsupported platforms. The test itself
-    must also be wrapped in a #if wxUSE_UIACTIONSIMULATOR block.
-
- e) There are a number of classes that are available to help with testing GUI
-    elements. Firstly throughout the test run there is a frame of type
-    wxTestableFrame that you can access through `wxTheApp->GetTopWindow()`. This
-    class adds two new functions, GetEventCount, which takes an optional
-    wxEventType. It then returns the number of events of that type that it has
-    received since the last call. Passing nothing returns the total number of
-    event received since the last call. Also there is OnEvent, which counts the
-    events based on type that are passed to it. To make it easy to count events
-    there is also a new class called EventCounter which takes a window and event
-    type and connects the window to the top level wxTestableFrame with the specific
-    event type. It disconnects again once it is out of scope. It simply reduces
-    the amount of typing required to count events.
-
-3. add a `<sources>` tag for your source file to tests/test.bkl. Make sure it's
-   in the correct section: the one starting `<exe id="test_gui"` for a gui test,
-   the one starting `<exe id="test" template="wx_sample_console` otherwise.
 
 
-III. Running the tests
+Writing GUI-specific tests
-----------------------
+--------------------------
 
-1. Regenerate the make/project files from test.bkl using bakefile_gen, e.g.:
+`wxUIActionSimulator` can be used when user input is required, for example
-        cd build/bakefiles
+clicking buttons or typing text. A simple example of this can be found in
-        bakefile_gen -b ../../tests/test.bkl
+`tests/controls/buttontest.cpp`. After simulating some user input always
-   and if you're on a unix system re-run configure.
+call `wxYield()` to allow event processing. When writing a test using
+`wxUIActionSimulator` wrap it in `#if wxUSE_UIACTIONSIMULATOR` block.
 
-2. Build the test program using one of the make/project files in the tests
+There are a number of classes that are available to help with testing GUI
-   subdirectory.
+elements. Firstly throughout the test run there is a frame of type
-
+`wxTestableFrame` that you can access through `wxTheApp->GetTopWindow()`. This
-3. Run the test program by using the command 'test' for the console tests,
+class adds two new functions, `GetEventCount()`, which takes an optional
-   'test_gui' for the gui ones. With no arguments, all the default set of tests
+`wxEventType`. It then returns the number of events of that type that it has
-   (all those registered with CPPUNIT_TEST_SUITE_REGISTRATION) are run.
+received since the last call. Passing nothing returns the total number of event
-   Or to list the test suites without running them:
+received since the last call. Also there is `OnEvent()`, which counts the events
-      test -l   or   test_gui -l
+based on type that are passed to it. To make it easy to count events there is
-
+also a new class called `EventCounter` which takes a window and event type and
-4. Tests that have been registered under a name using
+connects the window to the top level `wxTestableFrame` with the specific event
-   CPPUNIT_TEST_SUITE_NAMED_REGISTRATION can also be run separately. For
+type. It disconnects again once it is out of scope. It simply reduces the
-   example:
+amount of typing required to count events.
-      test_gui ButtonTestCase
-   or to list the tests done by a particular testcase:
-      test -L MBConvTestCase
-
-5. Fault navigation.
-   VC++ users can run the programs as a post build step (Projects/Settings/
-   Post-build step) to see the test results in an IDE window. This allows
-   errors to be jumped to in the same way as for compiler errors, for
-   example by pressing F4 or highlighting the error and pressing return.
-   
-   Similarly for makefile users: makefiles can be modified to execute the
-   test programs as a final step. Then you can navigate to any errors in the
-   same way as for compiler errors, if your editor supports that.
-
-   Another alternative is to run the tests manually, redirecting the output
-   to a file. Then use your editor to jump to any failures. Using Vim, for
-   example, ':cf test.log' would take you to the first error in test.log, and
-   ':cn' to the next.
-
-   If you would like to set a breakpoint on a failing test using a debugger,
-   put the breakpoint on the function 'CppUnit::Asserter::fail()'. This will
-   stop on each failing test.
 
 
-IV. Notes
+Running the tests
----------
+-----------------
 
-1. You can register your tests (or a subset of them) just under a name, and not
+Run the main test suite by using the command `test` for the console tests,
-   in the unnamed registry if you don't want them to be executed by default.
+or `test_gui` for the GUI ones. With no arguments, all the default set of tests
+(all those registered without `[hide]` tag) are run.
 
-2. If you are going to register your tests both in the unnamed registry
+To list the test suites without running them use `-l` command-line option.
-   and under a name, then use the name that the tests have in the 'test -l'
-   listing.
 
-3. Tests which fail can be temporarily registered under "fixme" while the
+To run a particular test case, use `./test NameTestCase`. To run all tests
-   problems they expose are fixed, instead of the unnamed registry. That
+using the specified tag, use `./test [tag_name]` (the square brackets may need
-   way they can easily be run, but they do not make regression testing with
+to be escaped from your shell).
-   the default suite more difficult. E.g.:
-
-    // register in the unnamed registry so that these tests are run by default
-    //CPPUNIT_TEST_SUITE_REGISTRATION(wxRegExTestCase);
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(wxRegExTestCase, "fixme");
-
-    // also include in its own registry so that these tests can be run alone
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(wxRegExTestCase, "wxRegExTestCase");
-
-4. Tests which take a long time to execute can be registered under "advanced"
-   instead of the unnamed registry. The default suite should execute reasonably
-   quickly. To run the default and advanced tests together:
-    test "" advanced

include/wx/catch_cppunit.h

@@ -0,0 +1,259 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/catch_cppunit.h
+// Purpose:     Reimplementation of CppUnit macros in terms of CATCH
+// Author:      Vadim Zeitlin
+// Created:     2017-10-30
+// Copyright:   (c) 2017 Vadim Zeitlin <vadim@wxwidgets.org>
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_CATCH_CPPUNIT_H_
+#define _WX_CATCH_CPPUNIT_H_
+
+#include "catch.hpp"
+
+// CppUnit-compatible macros.
+
+// CPPUNIT_ASSERTs are mapped to REQUIRE(), not CHECK(), as this is how CppUnit
+// works but in many cases they really should be CHECK()s instead, i.e. the
+// test should continue to run even if one assert failed. Unfortunately there
+// is no automatic way to know it, so the existing code will need to be
+// reviewed and CHECK() used explicitly where appropriate.
+//
+// Also notice that we don't use parentheses around x and y macro arguments in
+// the macro expansion, as usual. This is because these parentheses would then
+// appear in CATCH error messages if the assertion fails, making them much less
+// readable and omitting should be fine here, exceptionally, as the arguments
+// of these macros are usually just simple expressions.
+#define CPPUNIT_ASSERT(cond) REQUIRE(cond)
+#define CPPUNIT_ASSERT_EQUAL(x, y) REQUIRE(x == y)
+
+// Using INFO() disallows putting more than one of these macros on the same
+// line but this can happen if they're used inside another macro, so wrap it
+// inside a scope.
+#define CPPUNIT_ASSERT_MESSAGE(msg, cond) \
+    do { INFO(msg); REQUIRE(cond); } while (Catch::alwaysFalse())
+
+#define CPPUNIT_ASSERT_EQUAL_MESSAGE(msg, x, y) \
+    do { INFO(msg); REQUIRE(x == y); } while (Catch::alwaysFalse())
+
+// CATCH Approx class uses the upper bound of "epsilon*(scale + max(|x|, |y|))"
+// for |x - y| which is not really compatible with our fixed delta, so we can't
+// use it here.
+#define CPPUNIT_ASSERT_DOUBLES_EQUAL(x, y, delta) \
+    REQUIRE(std::abs(x - y) < delta)
+
+#define CPPUNIT_FAIL(msg) FAIL(msg)
+
+#define CPPUNIT_ASSERT_THROW(expr, exception)         \
+    try                                               \
+    {                                                 \
+        expr;                                         \
+        FAIL("Expected exception of type " #exception \
+                   " not thrown by " #expr);          \
+    }                                                 \
+    catch ( exception& ) {}
+
+// Define conversions to strings for some common wxWidgets types.
+namespace Catch
+{
+    template <>
+    struct StringMaker<wxUniChar>
+    {
+        static std::string convert(wxUniChar uc)
+        {
+            return wxString(uc).ToStdString(wxConvUTF8);
+        }
+    };
+
+    template <>
+    struct StringMaker<wxUniCharRef>
+    {
+        static std::string convert(wxUniCharRef ucr)
+        {
+            return wxString(ucr).ToStdString(wxConvUTF8);
+        }
+    };
+}
+
+// Use a different namespace for our mock ups of the real declarations in
+// CppUnit namespace to avoid clashes if we end up being linked with the real
+// CppUnit library, but bring it into scope with a using directive below to
+// make it possible to compile the original code using CppUnit unmodified.
+namespace CatchCppUnit
+{
+
+namespace CppUnit
+{
+
+// These classes don't really correspond to the real CppUnit ones, but contain
+// just the minimum we need to make CPPUNIT_TEST() macro and our mock up of
+// TestSuite class work.
+
+class Test
+{
+public:
+    // Name argument exists only for compatibility with the real CppUnit but is
+    // not used here.
+    explicit Test(const std::string& name = std::string()) : m_name(name) { }
+
+    virtual ~Test() { }
+
+    virtual void runTest() = 0;
+
+    const std::string& getName() const { return m_name; }
+
+private:
+    std::string m_name;
+};
+
+class TestCase : public Test
+{
+public:
+    explicit TestCase(const std::string& name = std::string()) : Test(name) { }
+
+    virtual void setUp() {}
+    virtual void tearDown() {}
+};
+
+class TestSuite : public Test
+{
+public:
+    explicit TestSuite(const std::string& name = std::string()) : Test(name) { }
+
+    ~TestSuite()
+    {
+        for ( size_t n = 0; n < m_tests.size(); ++n )
+        {
+            delete m_tests[n];
+        }
+    }
+
+    void addTest(Test* test) { m_tests.push_back(test); }
+    size_t getChildTestCount() const { return m_tests.size(); }
+
+    void runTest() wxOVERRIDE
+    {
+        for ( size_t n = 0; n < m_tests.size(); ++n )
+        {
+            m_tests[n]->runTest();
+        }
+    }
+
+private:
+    std::vector<Test*> m_tests;
+
+    wxDECLARE_NO_COPY_CLASS(TestSuite);
+};
+
+} // namespace CppUnit
+
+} // namespace CatchCppUnit
+
+using namespace CatchCppUnit;
+
+// Helpers used in the implementation of the macros below.
+namespace wxPrivate
+{
+
+// An object which resets a string to its old value when going out of scope.
+class TempStringAssign
+{
+public:
+    explicit TempStringAssign(std::string& str, const char* value)
+        : m_str(str),
+          m_orig(str)
+    {
+        str = value;
+    }
+
+    ~TempStringAssign()
+    {
+        m_str = m_orig;
+    }
+
+private:
+    std::string& m_str;
+    const std::string m_orig;
+
+    wxDECLARE_NO_COPY_CLASS(TempStringAssign);
+};
+
+// These two strings are used to implement wxGetCurrentTestName() and must be
+// defined in the test driver.
+extern std::string wxTheCurrentTestClass, wxTheCurrentTestMethod;
+
+} // namespace wxPrivate
+
+inline std::string wxGetCurrentTestName()
+{
+    std::string s = wxPrivate::wxTheCurrentTestClass;
+    if ( !s.empty() && !wxPrivate::wxTheCurrentTestMethod.empty() )
+        s += "::";
+    s += wxPrivate::wxTheCurrentTestMethod;
+
+    return s;
+}
+
+// Notice that the use of this macro unconditionally changes the protection for
+// everything that follows it to "public". This is necessary to allow taking
+// the address of the runTest() method in CPPUNIT_TEST_SUITE_REGISTRATION()
+// below and there just doesn't seem to be any way around it.
+#define CPPUNIT_TEST_SUITE(testclass)   \
+    public:                             \
+    void runTest() wxOVERRIDE           \
+    {                                   \
+        struct EatNextSemicolon
+
+#define CPPUNIT_TEST(testname)          \
+        SECTION(#testname " test")      \
+        {                               \
+            setUp();                    \
+            try                         \
+            {                           \
+                testname();             \
+            }                           \
+            catch ( ... )               \
+            {                           \
+                tearDown();             \
+                throw;                  \
+            }                           \
+            tearDown();                 \
+        }
+
+#define CPPUNIT_TEST_SUITE_END()        \
+    }                                   \
+    struct EatNextSemicolon
+
+#define wxREGISTER_UNIT_TEST_WITH_TAGS(testclass, tags)       \
+    METHOD_AS_TEST_CASE(testclass::runTest, #testclass, tags) \
+    struct EatNextSemicolon
+
+#define CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(testclass, suitename) \
+    wxREGISTER_UNIT_TEST_WITH_TAGS(testclass, "[" suitename "]")
+
+// Existings tests always use both this macro and the named registration one
+// above, but we can't register the same test case twice with CATCH, so simply
+// ignore this one.
+#define CPPUNIT_TEST_SUITE_REGISTRATION(testclass) \
+    struct EatNextSemicolon
+
+// ----------------------------------------------------------------------------
+// wxWidgets-specific macros
+// ----------------------------------------------------------------------------
+
+// Convenient variant of INFO() which uses wxString::Format() internally.
+#define wxINFO_FMT_HELPER(fmt, ...) \
+    wxString::Format(fmt, __VA_ARGS__).ToStdString(wxConvUTF8)
+
+#define wxINFO_FMT(...) INFO(wxINFO_FMT_HELPER(__VA_ARGS__))
+
+// Use this macro to assert with the given formatted message (it should contain
+// the format string and arguments in a separate pair of parentheses)
+#define WX_ASSERT_MESSAGE(msg, cond) \
+    CPPUNIT_ASSERT_MESSAGE(std::string(wxString::Format msg .mb_str()), (cond))
+
+#define WX_ASSERT_EQUAL_MESSAGE(msg, expected, actual) \
+    CPPUNIT_ASSERT_EQUAL_MESSAGE(std::string(wxString::Format msg .mb_str()), \
+                                 (expected), (actual))
+
+#endif // _WX_CATCH_CPPUNIT_H_

include/wx/cppunit.h

@@ -1,260 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cppunit.h
-// Purpose:     wrapper header for CppUnit headers
-// Author:      Vadim Zeitlin
-// Created:     15.02.04
-// Copyright:   (c) 2004 Vadim Zeitlin
-// Licence:     wxWindows Licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CPPUNIT_H_
-#define _WX_CPPUNIT_H_
-
-///////////////////////////////////////////////////////////////////////////////
-// using CPPUNIT_TEST() macro results in this warning, disable it as there is
-// no other way to get rid of it and it's not very useful anyhow
-#ifdef __VISUALC__
-    // typedef-name 'foo' used as synonym for class-name 'bar'
-    #pragma warning(disable:4097)
-
-    // unreachable code: we don't care about warnings in CppUnit headers
-    #pragma warning(disable:4702)
-
-    // 'id': identifier was truncated to 'num' characters in the debug info
-    #pragma warning(disable:4786)
-#endif // __VISUALC__
-
-#ifdef __BORLANDC__
-    #pragma warn -8022
-#endif
-
-#ifndef CPPUNIT_STD_NEED_ALLOCATOR
-    #define CPPUNIT_STD_NEED_ALLOCATOR 0
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// Set the default format for the errors, which can be used by an IDE to jump
-// to the error location. This default gets overridden by the cppunit headers
-// for some compilers (e.g. VC++).
-
-#ifndef CPPUNIT_COMPILER_LOCATION_FORMAT
-    #define CPPUNIT_COMPILER_LOCATION_FORMAT "%p:%l:"
-#endif
-
-
-///////////////////////////////////////////////////////////////////////////////
-// Include all needed cppunit headers.
-//
-
-#include "wx/beforestd.h"
-#ifdef __VISUALC__
-    #pragma warning(push)
-
-    // with cppunit 1.12 we get many bogus warnings 4701 (local variable may be
-    // used without having been initialized) in TestAssert.h
-    #pragma warning(disable:4701)
-
-    // and also 4100 (unreferenced formal parameter) in extensions/
-    // ExceptionTestCaseDecorator.h
-    #pragma warning(disable:4100)
-#endif
-
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/ui/text/TestRunner.h>
-#include <cppunit/TestCase.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/CompilerOutputter.h>
-
-#ifdef __VISUALC__
-    #pragma warning(pop)
-#endif
-#include "wx/afterstd.h"
-
-#include "wx/string.h"
-
-
-///////////////////////////////////////////////////////////////////////////////
-// Set of helpful test macros.
-//
-
-// Base macro for wrapping CPPUNIT_TEST macros and so making them conditional
-// tests, meaning that the test only get registered and thus run when a given
-// runtime condition is true.
-// In case the condition is evaluated as false a skip message is logged
-// (the message will only be shown in verbose mode).
-#define WXTEST_ANY_WITH_CONDITION(suiteName, Condition, testMethod, anyTest) \
-    if (Condition) \
-        { anyTest; } \
-    else \
-        wxLogInfo(wxString::Format(wxT("skipping: %s.%s\n  reason: %s equals false\n"), \
-                                    wxString(suiteName, wxConvUTF8).c_str(), \
-                                    wxString(#testMethod, wxConvUTF8).c_str(), \
-                                    wxString(#Condition, wxConvUTF8).c_str()))
-
-// Conditional CPPUNIT_TEST macro.
-#define WXTEST_WITH_CONDITION(suiteName, Condition, testMethod) \
-    WXTEST_ANY_WITH_CONDITION(suiteName, Condition, testMethod, CPPUNIT_TEST(testMethod))
-// Conditional CPPUNIT_TEST_FAIL macro.
-#define WXTEST_FAIL_WITH_CONDITION(suiteName, Condition, testMethod) \
-    WXTEST_ANY_WITH_CONDITION(suiteName, Condition, testMethod, CPPUNIT_TEST_FAIL(testMethod))
-
-CPPUNIT_NS_BEGIN
-
-// provide an overload of cppunit assertEquals(T, T) which can be used to
-// compare wxStrings directly with C strings
-inline void
-assertEquals(const char *expected,
-             const char *actual,
-             CppUnit::SourceLine sourceLine,
-             const std::string& message)
-{
-    assertEquals(wxString(expected), wxString(actual), sourceLine, message);
-}
-
-inline void
-assertEquals(const char *expected,
-             const wxString& actual,
-             CppUnit::SourceLine sourceLine,
-             const std::string& message)
-{
-    assertEquals(wxString(expected), actual, sourceLine, message);
-}
-
-inline void
-assertEquals(const wxString& expected,
-             const char *actual,
-             CppUnit::SourceLine sourceLine,
-             const std::string& message)
-{
-    assertEquals(expected, wxString(actual), sourceLine, message);
-}
-
-inline void
-assertEquals(const wchar_t *expected,
-             const wxString& actual,
-             CppUnit::SourceLine sourceLine,
-             const std::string& message)
-{
-    assertEquals(wxString(expected), actual, sourceLine, message);
-}
-
-inline void
-assertEquals(const wxString& expected,
-             const wchar_t *actual,
-             CppUnit::SourceLine sourceLine,
-             const std::string& message)
-{
-    assertEquals(expected, wxString(actual), sourceLine, message);
-}
-
-CPPUNIT_NS_END
-
-// define an assertEquals() overload for the given types, this is a helper used
-// by WX_CPPUNIT_ALLOW_EQUALS_TO_INT() below
-#define WX_CPPUNIT_ASSERT_EQUALS(T1, T2)                                      \
-    inline void                                                               \
-    assertEquals(T1 expected,                                                 \
-                 T2 actual,                                                   \
-                 CppUnit::SourceLine sourceLine,                              \
-                 const std::string& message)                                  \
-    {                                                                         \
-        if ( !assertion_traits<T1>::equal(expected,actual) )                  \
-        {                                                                     \
-            Asserter::failNotEqual( assertion_traits<T1>::toString(expected), \
-                                    assertion_traits<T2>::toString(actual),   \
-                                    sourceLine,                               \
-                                    message );                                \
-        }                                                                     \
-    }
-
-// this macro allows us to specify (usually literal) ints as expected values
-// for functions returning integral types different from "int"
-#define WX_CPPUNIT_ALLOW_EQUALS_TO_INT(T) \
-    CPPUNIT_NS_BEGIN \
-        WX_CPPUNIT_ASSERT_EQUALS(int, T) \
-        WX_CPPUNIT_ASSERT_EQUALS(T, int) \
-    CPPUNIT_NS_END
-
-WX_CPPUNIT_ALLOW_EQUALS_TO_INT(long)
-WX_CPPUNIT_ALLOW_EQUALS_TO_INT(short)
-WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned)
-WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned long)
-
-#if defined( __VMS ) && defined( __ia64 )
-WX_CPPUNIT_ALLOW_EQUALS_TO_INT(std::basic_streambuf<char>::pos_type);
-#endif
-
-#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
-WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxLongLong_t)
-WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned wxLongLong_t)
-#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
-
-// Use this macro to compare a wxArrayString with the pipe-separated elements
-// of the given string
-//
-// NB: it's a macro and not a function to have the correct line numbers in the
-//     test failure messages
-#define WX_ASSERT_STRARRAY_EQUAL(s, a)                                        \
-    {                                                                         \
-        wxArrayString expected(wxSplit(s, '|', '\0'));                        \
-                                                                              \
-        CPPUNIT_ASSERT_EQUAL( expected.size(), a.size() );                    \
-                                                                              \
-        for ( size_t n = 0; n < a.size(); n++ )                               \
-        {                                                                     \
-            CPPUNIT_ASSERT_EQUAL( expected[n], a[n] );                        \
-        }                                                                     \
-    }
-
-// Use this macro to assert with the given formatted message (it should contain
-// the format string and arguments in a separate pair of parentheses)
-#define WX_ASSERT_MESSAGE(msg, cond) \
-    CPPUNIT_ASSERT_MESSAGE(std::string(wxString::Format msg .mb_str()), (cond))
-
-#define WX_ASSERT_EQUAL_MESSAGE(msg, expected, actual) \
-    CPPUNIT_ASSERT_EQUAL_MESSAGE(std::string(wxString::Format msg .mb_str()), \
-                                 (expected), (actual))
-
-///////////////////////////////////////////////////////////////////////////////
-// define stream inserter for wxString if it's not defined in the main library,
-// we need it to output the test failures involving wxString
-#if !wxUSE_STD_IOSTREAM
-
-#include "wx/string.h"
-
-#include <iostream>
-
-inline std::ostream& operator<<(std::ostream& o, const wxString& s)
-{
-#if wxUSE_UNICODE
-    return o << (const char *)wxSafeConvertWX2MB(s.wc_str());
-#else
-    return o << s.c_str();
-#endif
-}
-
-#endif // !wxUSE_STD_IOSTREAM
-
-///////////////////////////////////////////////////////////////////////////////
-// Some more compiler warning tweaking and auto linking.
-//
-
-#ifdef __BORLANDC__
-    #pragma warn .8022
-#endif
-
-#ifdef _MSC_VER
-  #pragma warning(default:4702)
-#endif // _MSC_VER
-
-// for VC++ automatically link in cppunit library
-#ifdef __VISUALC__
-  #ifdef NDEBUG
-    #pragma comment(lib, "cppunit.lib")
-  #else // Debug
-    #pragma comment(lib, "cppunitd.lib")
-  #endif // Release/Debug
-#endif
-
-#endif // _WX_CPPUNIT_H_
-

samples/html/makefile.bcc

@@ -36,8 +36,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 	-DUSE_THREADS="$(USE_THREADS)" -DUSE_CAIRO="$(USE_CAIRO)" \
 	-DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
 	-DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
-	-DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
+	-DCFG="$(CFG)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
-	-DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 ### Conditionally set variables: ###
 

samples/html/makefile.gcc

@@ -28,7 +28,6 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
 	USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
 	OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
 	WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
-	CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
 	RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" \
 	WINDRES="$(WINDRES)"
 

samples/html/makefile.vc

@@ -27,7 +27,6 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 	USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
 	OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
 	WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
-	CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
 	RUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 ### Conditionally set variables: ###

samples/makefile.bcc

@@ -36,8 +36,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 	-DUSE_THREADS="$(USE_THREADS)" -DUSE_CAIRO="$(USE_CAIRO)" \
 	-DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
 	-DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
-	-DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
+	-DCFG="$(CFG)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
-	-DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 ### Conditionally set variables: ###
 

samples/makefile.gcc

@@ -28,7 +28,6 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
 	USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
 	OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
 	WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
-	CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
 	RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" \
 	WINDRES="$(WINDRES)"
 

samples/makefile.vc

@@ -27,7 +27,6 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 	USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
 	OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
 	WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
-	CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
 	RUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 ### Conditionally set variables: ###

samples/opengl/makefile.bcc

@@ -36,8 +36,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 	-DUSE_THREADS="$(USE_THREADS)" -DUSE_CAIRO="$(USE_CAIRO)" \
 	-DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
 	-DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
-	-DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
+	-DCFG="$(CFG)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
-	-DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 ### Conditionally set variables: ###
 

samples/opengl/makefile.gcc

@@ -28,7 +28,6 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
 	USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
 	OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
 	WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
-	CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
 	RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" \
 	WINDRES="$(WINDRES)"
 

samples/opengl/makefile.vc

@@ -27,7 +27,6 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 	USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
 	OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
 	WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
-	CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
 	RUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 ### Conditionally set variables: ###

tests/Makefile.in

@@ -28,8 +28,6 @@ CXXFLAGS = @CXXFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
-CPPUNIT_LIBS = @CPPUNIT_LIBS@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
@@ -55,7 +53,8 @@ LIBDIRNAME = $(wx_top_builddir)/lib
 TEST_CXXFLAGS = $(__test_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 \
-	$(CPPUNIT_CFLAGS) $(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+	-I$(top_srcdir)/3rdparty/catch/include $(CXXWARNINGS) $(SAMPLES_CXXFLAGS) \
+	$(CPPFLAGS) $(CXXFLAGS)
 TEST_OBJECTS =  \
 	test_test.o \
 	test_anytest.o \
@@ -115,7 +114,6 @@ TEST_OBJECTS =  \
 	test_crt.o \
 	test_vsnprintf.o \
 	test_hexconv.o \
-	test_bstream.o \
 	test_datastreamtest.o \
 	test_ffilestream.o \
 	test_fileback.o \
@@ -146,8 +144,8 @@ TEST_ODEP =  $(_____pch_testprec_test_testprec_h_gch___depname)
 TEST_DRAWING_CXXFLAGS = $(__test_drawing_PCH_INC) -D__WX$(TOOLKIT)__ \
 	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
 	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
-	-DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(CXXWARNINGS) $(SAMPLES_CXXFLAGS) \
+	-DwxUSE_GUI=0 -I$(top_srcdir)/3rdparty/catch/include $(CXXWARNINGS) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 TEST_DRAWING_OBJECTS =  \
 	test_drawing_test.o \
 	test_drawing_drawing.o \
@@ -165,8 +163,8 @@ TEST_DRAWINGPLUGIN_OBJECTS =  \
 TEST_GUI_CXXFLAGS = $(__test_gui_PCH_INC) -D__WX$(TOOLKIT)__ \
 	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
 	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
-	-I$(srcdir)/../samples $(CPPUNIT_CFLAGS) $(CXXWARNINGS) $(SAMPLES_CXXFLAGS) \
+	-I$(srcdir)/../samples -I$(top_srcdir)/3rdparty/catch/include \
-	$(CPPFLAGS) $(CXXFLAGS)
+	$(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 TEST_GUI_OBJECTS =  \
 	$(__test_gui___win32rc) \
 	test_gui_asserthelper.o \
@@ -303,7 +301,6 @@ TEST_GUI_ODEP =  $(_____pch_testprec_test_gui_testprec_h_gch___depname)
 @COND_SHARED_1@__DLLFLAG_p_6 = --define WXUSINGDLL
 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__test_gui___win32rc = test_gui_sample_rc.o
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@__test_gui_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	= test_gui.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@__test_gui_bundle___depname \
@@ -318,6 +315,7 @@ TEST_GUI_ODEP =  $(_____pch_testprec_test_gui_testprec_h_gch___depname)
 @COND_TOOLKIT_OSX_IPHONE@	= $(__test_gui_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____test_gui_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@	$(__test_gui_app_Contents_PkgInfo___depname)
+@COND_PLATFORM_WIN32_1@__test_gui___win32rc = test_gui_sample_rc.o
 @COND_GCC_PCH_1@__test_gui_PCH_INC = -I./.pch/testprec_test_gui
 @COND_ICC_PCH_1@__test_gui_PCH_INC = $(ICC_PCH_USE_SWITCH) \
 @COND_ICC_PCH_1@	./.pch/testprec_test_gui/testprec.h.gch
@@ -405,13 +403,13 @@ distclean: clean
 	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 test$(EXEEXT): $(TEST_OBJECTS)
-	$(CXX) -o $@ $(TEST_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(CXX) -o $@ $(TEST_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 
 @COND_USE_PCH_1@./.pch/testprec_test/testprec.h.gch: 
 @COND_USE_PCH_1@	$(BK_MAKE_PCH) ./.pch/testprec_test/testprec.h.gch testprec.h $(CXX) $(TEST_CXXFLAGS)
 
 @COND_USE_GUI_1@test_drawing$(EXEEXT): $(TEST_DRAWING_OBJECTS)
-@COND_USE_GUI_1@	$(CXX) -o $@ $(TEST_DRAWING_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_USE_GUI_1@	$(CXX) -o $@ $(TEST_DRAWING_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 
 @COND_USE_PCH_1@./.pch/testprec_test_drawing/testprec.h.gch: 
 @COND_USE_PCH_1@	$(BK_MAKE_PCH) ./.pch/testprec_test_drawing/testprec.h.gch testprec.h $(CXX) $(TEST_DRAWING_CXXFLAGS)
@@ -420,7 +418,7 @@ test$(EXEEXT): $(TEST_OBJECTS)
 @COND_SHARED_1_USE_GUI_1@	$(SHARED_LD_MODULE_CXX) $@ $(TEST_DRAWINGPLUGIN_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 
 @COND_USE_GUI_1@test_gui$(EXEEXT): $(TEST_GUI_OBJECTS) $(__test_gui___win32rc)
-@COND_USE_GUI_1@	$(CXX) -o $@ $(TEST_GUI_OBJECTS)    -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS)  $(LDFLAGS)  $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_XRC_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_USE_GUI_1@	$(CXX) -o $@ $(TEST_GUI_OBJECTS)    -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG)  $(LDFLAGS)  $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_XRC_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p test_gui.app/Contents
@@ -669,9 +667,6 @@ test_vsnprintf.o: $(srcdir)/strings/vsnprintf.cpp $(TEST_ODEP)
 test_hexconv.o: $(srcdir)/strings/hexconv.cpp $(TEST_ODEP)
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/hexconv.cpp
 
-test_bstream.o: $(srcdir)/streams/bstream.cpp $(TEST_ODEP)
-	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/bstream.cpp
-
 test_datastreamtest.o: $(srcdir)/streams/datastreamtest.cpp $(TEST_ODEP)
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/datastreamtest.cpp
 
@@ -769,7 +764,7 @@ test_drawingplugin_pluginsample.o: $(srcdir)/drawing/pluginsample.cpp
 	$(CXXC) -c -o $@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) $(srcdir)/drawing/pluginsample.cpp
 
 test_gui_sample_rc.o: $(srcdir)/../samples/sample.rc $(TEST_GUI_ODEP)
-	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) $(__DEBUG_DEFINE_p_6)  $(__EXCEPTIONS_DEFINE_p_6) $(__RTTI_DEFINE_p_6) $(__THREAD_DEFINE_p_6)  --include-dir $(srcdir) $(__DLLFLAG_p_6) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) $(__DEBUG_DEFINE_p_6)  $(__EXCEPTIONS_DEFINE_p_6) $(__RTTI_DEFINE_p_6) $(__THREAD_DEFINE_p_6)  --include-dir $(srcdir) $(__DLLFLAG_p_6) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/3rdparty/catch/include
 
 test_gui_asserthelper.o: $(srcdir)/asserthelper.cpp $(TEST_GUI_ODEP)
 	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/asserthelper.cpp

tests/any/anytest.cpp

@@ -21,6 +21,18 @@
 
 #include <math.h>
 
+namespace Catch
+{
+    template <>
+    struct StringMaker<wxVariant>
+    {
+        static std::string convert(const wxVariant& v)
+        {
+            return v.MakeString().ToStdString(wxConvUTF8);
+        }
+    };
+}
+
 // ----------------------------------------------------------------------------
 // test class
 // ----------------------------------------------------------------------------

tests/archive/archivetest.cpp

@@ -808,8 +808,8 @@ void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in)
         // non-seekable entries are allowed to have GetSize == wxInvalidOffset
         // until the end of the entry's data has been read past
         CPPUNIT_ASSERT_MESSAGE("entry size check" + error_context,
-            testEntry.GetLength() == entry->GetSize() ||
+            (testEntry.GetLength() == entry->GetSize() ||
-            ((m_options & PipeIn) != 0 && entry->GetSize() == wxInvalidOffset));
+            ((m_options & PipeIn) != 0 && entry->GetSize() == wxInvalidOffset)));
         CPPUNIT_ASSERT_MESSAGE(
             "arc->GetLength() == entry->GetSize()" + error_context,
             arc->GetLength() == entry->GetSize());

tests/archive/archivetest.h

@@ -14,6 +14,8 @@
 #include "wx/archive.h"
 #include "wx/wfstream.h"
 
+#include <map>
+#include <memory>
 
 ///////////////////////////////////////////////////////////////////////////////
 // Bit flags for options for the tests

tests/archive/tartest.cpp

@@ -70,7 +70,6 @@ CppUnit::Test *tartest::makeTest(
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(tartest);
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(tartest, "archive");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(tartest, "archive/tar");
 
 #endif // wxUSE_STREAMS

tests/archive/ziptest.cpp

@@ -124,9 +124,11 @@ void ZipTestCase::OnEntryExtracted(wxZipEntry& entry,
     CPPUNIT_ASSERT_MESSAGE("IsText" + error_context,
                            entry.IsText() == testEntry.IsText());
 
-    CPPUNIT_ASSERT_MESSAGE("Extra/LocalExtra mismatch for entry" + error_entry,
+    INFO("Extra/LocalExtra mismatch for entry" + error_entry);
-        (entry.GetExtraLen() != 0 && entry.GetLocalExtraLen() != 0) ||
+    if ( entry.GetExtraLen() )
-        (entry.GetExtraLen() == 0 && entry.GetLocalExtraLen() == 0));
+        CHECK( entry.GetLocalExtraLen() != 0 );
+    else
+        CHECK( entry.GetLocalExtraLen() == 0 );
 }
 
 // check the notifier mechanism by using it to fold the entry comments to
@@ -267,7 +269,6 @@ CppUnit::Test *ziptest::makeTest(
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ziptest);
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(ziptest, "archive");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(ziptest, "archive/zip");
 
 #endif // wxUSE_STREAMS && wxUSE_ZIPSTREAM

tests/arrays/arrays.cpp

@@ -65,8 +65,8 @@
     COMPARE_VALUE( array , 9 , p9 )
 
 #define COMPARE_COUNT( array , n ) \
-    ( array.GetCount() == n ) && \
+    (( array.GetCount() == n ) && \
-    ( array.Last() == array.Item( n - 1 ) )
+     ( array.Last() == array.Item( n - 1 ) ))
 
 // ----------------------------------------------------------------------------
 // helpers for testing wxObjArray
@@ -209,97 +209,97 @@ void ArraysTestCase::wxStringArrayTest()
     a1.Add(wxT("human"));
     a1.Add(wxT("alligator"));
 
-    CPPUNIT_ASSERT( COMPARE_8_VALUES( a1 , wxT("thermit") ,
+    CPPUNIT_ASSERT((COMPARE_8_VALUES( a1 , wxT("thermit") ,
                                            wxT("condor") ,
                                            wxT("lion") ,
                                            wxT("lion") ,
                                            wxT("lion") ,
                                            wxT("dog") ,
                                            wxT("human") ,
-                                           wxT("alligator") ) );
+                                           wxT("alligator") )));
     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 8 ) );
 
     wxArrayString a2(a1);
 
-    CPPUNIT_ASSERT( COMPARE_8_VALUES( a2 , wxT("thermit") ,
+    CPPUNIT_ASSERT((COMPARE_8_VALUES( a2 , wxT("thermit") ,
                                            wxT("condor") ,
                                            wxT("lion") ,
                                            wxT("lion") ,
                                            wxT("lion") ,
                                            wxT("dog") ,
                                            wxT("human") ,
-                                           wxT("alligator") ) );
+                                           wxT("alligator") )));
     CPPUNIT_ASSERT( COMPARE_COUNT( a2 , 8 ) );
 
     wxSortedArrayString a3(a1);
 
-    CPPUNIT_ASSERT( COMPARE_8_VALUES( a3 , wxT("alligator") ,
+    CPPUNIT_ASSERT((COMPARE_8_VALUES( a3 , wxT("alligator") ,
                                            wxT("condor") ,
                                            wxT("dog") ,
                                            wxT("human") ,
                                            wxT("lion") ,
                                            wxT("lion") ,
                                            wxT("lion") ,
-                                           wxT("thermit") ) );
+                                           wxT("thermit") )));
     CPPUNIT_ASSERT( COMPARE_COUNT( a3 , 8 ) );
 
     wxSortedArrayString a4;
     for (wxArrayString::iterator it = a1.begin(), en = a1.end(); it != en; ++it)
         a4.Add(*it);
 
-    CPPUNIT_ASSERT( COMPARE_8_VALUES( a4 , wxT("alligator") ,
+    CPPUNIT_ASSERT((COMPARE_8_VALUES( a4 , wxT("alligator") ,
                                            wxT("condor") ,
                                            wxT("dog") ,
                                            wxT("human") ,
                                            wxT("lion") ,
                                            wxT("lion") ,
                                            wxT("lion") ,
-                                           wxT("thermit") ) );
+                                           wxT("thermit") )));
     CPPUNIT_ASSERT( COMPARE_COUNT( a4 , 8 ) );
 
     a1.RemoveAt(2,3);
 
-    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , wxT("thermit") ,
+    CPPUNIT_ASSERT((COMPARE_5_VALUES( a1 , wxT("thermit") ,
                                            wxT("condor") ,
                                            wxT("dog") ,
                                            wxT("human") ,
-                                           wxT("alligator") ) );
+                                           wxT("alligator") )));
     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );
 
     a2 = a1;
 
-    CPPUNIT_ASSERT( COMPARE_5_VALUES( a2 , wxT("thermit") ,
+    CPPUNIT_ASSERT((COMPARE_5_VALUES( a2 , wxT("thermit") ,
                                            wxT("condor") ,
                                            wxT("dog") ,
                                            wxT("human") ,
-                                           wxT("alligator") ) );
+                                           wxT("alligator") )));
     CPPUNIT_ASSERT( COMPARE_COUNT( a2 , 5 ) );
 
     a1.Sort(false);
 
-    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , wxT("alligator") ,
+    CPPUNIT_ASSERT((COMPARE_5_VALUES( a1 , wxT("alligator") ,
                                            wxT("condor") ,
                                            wxT("dog") ,
                                            wxT("human") ,
-                                           wxT("thermit") ) );
+                                           wxT("thermit") )));
     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );
 
     a1.Sort(true);
 
-    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , wxT("thermit") ,
+    CPPUNIT_ASSERT((COMPARE_5_VALUES( a1 , wxT("thermit") ,
                                            wxT("human") ,
                                            wxT("dog") ,
                                            wxT("condor") ,
-                                           wxT("alligator") ) );
+                                           wxT("alligator") )));
     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );
 
     a1.Sort(&StringLenCompare);
 
-    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , wxT("dog") ,
+    CPPUNIT_ASSERT((COMPARE_5_VALUES( a1 , wxT("dog") ,
                                            wxT("human") ,
                                            wxT("condor") ,
                                            wxT("thermit") ,
-                                           wxT("alligator") ) );
+                                           wxT("alligator") )));
     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );
     CPPUNIT_ASSERT( a1.Index( wxT("dog") ) == 0 );
     CPPUNIT_ASSERT( a1.Index( wxT("human") ) == 1 );
@@ -320,10 +320,10 @@ void ArraysTestCase::wxStringArrayTest()
     CPPUNIT_ASSERT( a5.Add( wxT("x"), 1 ) == 0 );
     CPPUNIT_ASSERT( a5.Add( wxT("a"), 3 ) == 1 );
 
-    CPPUNIT_ASSERT( COMPARE_4_VALUES( a5, wxT("x") ,
+    CPPUNIT_ASSERT((COMPARE_4_VALUES( a5, wxT("x") ,
                                           wxT("a") ,
                                           wxT("a") ,
-                                          wxT("a") ) );
+                                          wxT("a") )));
 
     a5.assign(a1.end(), a1.end());
     CPPUNIT_ASSERT( a5.empty() );
@@ -334,7 +334,7 @@ void ArraysTestCase::wxStringArrayTest()
     const wxString months[] = { "Jan", "Feb", "Mar" };
     a5.assign(months, months + WXSIZEOF(months));
     CPPUNIT_ASSERT_EQUAL( WXSIZEOF(months), a5.size() );
-    CPPUNIT_ASSERT( COMPARE_3_VALUES(a5, "Jan", "Feb", "Mar") );
+    CPPUNIT_ASSERT((COMPARE_3_VALUES(a5, "Jan", "Feb", "Mar")));
 
     a5.clear();
     CPPUNIT_ASSERT_EQUAL( 0, a5.size() );
@@ -577,17 +577,17 @@ void ArraysTestCase::wxArray ## name ## Test()                                \
     a.Add(5,3);                                                               \
     a.Add(3,4);                                                               \
                                                                               \
-    CPPUNIT_ASSERT( COMPARE_10_VALUES(a,1,17,17,5,5,5,3,3,3,3) );             \
+    CPPUNIT_ASSERT((COMPARE_10_VALUES(a,1,17,17,5,5,5,3,3,3,3)));             \
     CPPUNIT_ASSERT( COMPARE_COUNT( a , 10 ) );                                \
                                                                               \
     a.Sort(name ## Compare);                                                  \
                                                                               \
-    CPPUNIT_ASSERT( COMPARE_10_VALUES(a,1,3,3,3,3,5,5,5,17,17) );             \
+    CPPUNIT_ASSERT((COMPARE_10_VALUES(a,1,3,3,3,3,5,5,5,17,17)));             \
     CPPUNIT_ASSERT( COMPARE_COUNT( a , 10 ) );                                \
                                                                               \
     a.Sort(name ## RevCompare);                                               \
                                                                               \
-    CPPUNIT_ASSERT( COMPARE_10_VALUES(a,17,17,5,5,5,3,3,3,3,1) );             \
+    CPPUNIT_ASSERT((COMPARE_10_VALUES(a,17,17,5,5,5,3,3,3,3,1)));             \
     CPPUNIT_ASSERT( COMPARE_COUNT( a , 10 ) );                                \
                                                                               \
     wxSortedArray##name b;                                                    \
@@ -597,7 +597,7 @@ void ArraysTestCase::wxArray ## name ## Test()                                \
     b.Add(5);                                                                 \
     b.Add(3);                                                                 \
                                                                               \
-    CPPUNIT_ASSERT( COMPARE_4_VALUES(b,1,3,5,17) );                           \
+    CPPUNIT_ASSERT((COMPARE_4_VALUES(b,1,3,5,17)));                           \
     CPPUNIT_ASSERT( COMPARE_COUNT( b , 4 ) );                                 \
     CPPUNIT_ASSERT( b.Index( 0 ) == wxNOT_FOUND );                            \
     CPPUNIT_ASSERT( b.Index( 1 ) == 0 );                                      \
@@ -651,7 +651,8 @@ void DoTestSwap(T v1, T v2, T v3)
 {
     A a1, a2;
     a1.swap(a2);
-    CPPUNIT_ASSERT( a1.empty() && a2.empty() );
+    CPPUNIT_ASSERT( a1.empty() );
+    CPPUNIT_ASSERT( a2.empty() );
 
     a1.push_back(v1);
     a1.swap(a2);
@@ -711,15 +712,16 @@ void ArraysTestCase::TestSTL()
 
     CPPUNIT_ASSERT_EQUAL( 0, i );
 
-    CPPUNIT_ASSERT( *list1.rbegin() == *(list1.end()-1) &&
+    CPPUNIT_ASSERT( *list1.rbegin() == *(list1.end()-1) );
-                    *list1.begin() == *(list1.rend()-1) );
+    CPPUNIT_ASSERT( *list1.begin() == *(list1.rend()-1) );
 
     it = list1.begin()+1;
     rit = list1.rbegin()+1;
-    CPPUNIT_ASSERT( *list1.begin() == *(it-1) &&
+    CPPUNIT_ASSERT( *list1.begin() == *(it-1) );
-                    *list1.rbegin() == *(rit-1) );
+    CPPUNIT_ASSERT( *list1.rbegin() == *(rit-1) );
 
-    CPPUNIT_ASSERT( ( list1.front() == 0 ) && ( list1.back() == COUNT - 1 ) );
+    CPPUNIT_ASSERT( list1.front() == 0 );
+    CPPUNIT_ASSERT( list1.back() == COUNT - 1 );
 
     list1.erase(list1.begin());
     list1.erase(list1.end()-1);

tests/cmdline/cmdlinetest.cpp

@@ -58,6 +58,23 @@ CPPUNIT_TEST_SUITE_REGISTRATION( CmdLineTestCase );
 // also include in its own registry so that these tests can be run alone
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( CmdLineTestCase, "CmdLineTestCase" );
 
+// Use this macro to compare a wxArrayString with the pipe-separated elements
+// of the given string
+//
+// NB: it's a macro and not a function to have the correct line numbers in the
+//     test failure messages
+#define WX_ASSERT_STRARRAY_EQUAL(s, a)                                        \
+    {                                                                         \
+        wxArrayString expected(wxSplit(s, '|', '\0'));                        \
+                                                                              \
+        CPPUNIT_ASSERT_EQUAL( expected.size(), a.size() );                    \
+                                                                              \
+        for ( size_t n = 0; n < a.size(); n++ )                               \
+        {                                                                     \
+            CPPUNIT_ASSERT_EQUAL( expected[n], a[n] );                        \
+        }                                                                     \
+    }
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -322,7 +339,7 @@ void CmdLineTestCase::Usage()
         Line_Max
     };
 
-    CPPUNIT_ASSERT_EQUAL(Line_Max, usageLines.size());
+    CPPUNIT_ASSERT_EQUAL((size_t)Line_Max, usageLines.size());
     CPPUNIT_ASSERT_EQUAL("Verbosity options", usageLines[Line_Text_Verbosity]);
     CPPUNIT_ASSERT_EQUAL("", usageLines[Line_Text_Dummy1]);
     CPPUNIT_ASSERT_EQUAL("Even more usage text", usageLines[Line_Text_Dummy2]);

tests/config/config.cpp

@@ -49,7 +49,7 @@ private:
     void RecordingDefaultsTest();
 
     // return the number of values we (attempted to) read
-    int ReadValues(wxConfig *config, bool has_values);
+    size_t ReadValues(wxConfig *config, bool has_values);
 
     wxDECLARE_NO_COPY_CLASS(ConfigTestCase);
 };
@@ -135,9 +135,9 @@ void ConfigTestCase::ReadWriteLocalTest()
     delete config;
 }
 
-int ConfigTestCase::ReadValues(wxConfig *config, bool has_values)
+size_t ConfigTestCase::ReadValues(wxConfig *config, bool has_values)
 {
-    int read = 0;
+    size_t read = 0;
     bool r;
 
     wxString string1 = config->Read(wxT("string1"), wxT("abc"));
@@ -202,7 +202,7 @@ void ConfigTestCase::RecordingDefaultsTest()
     ReadValues(config, false);
     CPPUNIT_ASSERT_EQUAL( 0, config->GetNumberOfEntries() );
     config->SetRecordDefaults(true);
-    int read = ReadValues(config, false);
+    size_t read = ReadValues(config, false);
     CPPUNIT_ASSERT_EQUAL( read, config->GetNumberOfEntries() );
     ReadValues(config, true);
     config->DeleteAll();

tests/controls/markuptest.cpp

@@ -105,8 +105,8 @@ void MarkupTestCase::RoundTrip()
 
                 case wxMarkupSpanAttributes::Size_Symbolic:
                     {
-                        CPPUNIT_ASSERT( attrs.m_fontSize >= -3 &&
+                        CPPUNIT_ASSERT( attrs.m_fontSize >= -3 );
-                                            attrs.m_fontSize <= 3 );
+                        CPPUNIT_ASSERT( attrs.m_fontSize <= 3 );
                         static const char *cssSizes[] =
                         {
                             "xx-small", "x-small", "small",

tests/datetime/datetimetest.cpp

@@ -822,7 +822,7 @@ void DateTimeTestCase::TestTimeFormat()
         }
     }
 
-    CPPUNIT_ASSERT(wxDateTime::Now().Format("%") == "%");
+    CPPUNIT_ASSERT(wxDateTime::Now().Format("%%") == "%");
 
     wxDateTime dt;
 

tests/events/propagation.cpp

@@ -436,24 +436,14 @@ wxMenu* CreateTestMenu(wxFrame* frame)
 // Helper for checking that the menu event processing resulted in the expected
 // output from the handlers.
 //
-// Notice that this is supposed to be used with ASSERT_MENU_EVENT_RESULT()
+// Note that we trigger the menu event by sending it directly as this is more
-// macro to make the file name and line number of the caller appear in the
+// reliable than using wxUIActionSimulator and currently works in all ports as
-// failure messages.
+// they all call wxMenuBase::SendEvent() from their respective menu event
-void
+// handlers.
-CheckMenuEvent(wxMenu* menu, const char* result, CppUnit::SourceLine sourceLine)
-{
-    g_str.clear();
-
-    // Trigger the menu event: this is more reliable than using
-    // wxUIActionSimulator and currently works in all ports as they all call
-    // wxMenuBase::SendEvent() from their respective menu event handlers.
-    menu->SendEvent(wxID_APPLY);
-
-    CPPUNIT_NS::assertEquals( result, g_str, sourceLine, "" );
-}
-
 #define ASSERT_MENU_EVENT_RESULT(menu, result) \
-    CheckMenuEvent((menu), (result), CPPUNIT_SOURCELINE())
+    g_str.clear();                             \
+    menu->SendEvent(wxID_APPLY);               \
+    CHECK( g_str == result )
 
 void EventPropagationTestCase::MenuEvent()
 {

tests/events/stopwatch.cpp

@@ -134,7 +134,8 @@ void StopWatchTestCase::BackwardsClockBug()
 
         for ( size_t m = 0; m < 10000; m++ )
         {
-            CPPUNIT_ASSERT ( sw.Time() >= 0 && sw2.Time() >= 0 );
+            CPPUNIT_ASSERT( sw.Time() >= 0 );
+            CPPUNIT_ASSERT( sw2.Time() >= 0 );
         }
     }
 }

tests/exec/exec.cpp

@@ -185,13 +185,15 @@ void ExecTestCase::TestExecute()
                                           ASYNC_COMMAND, wxEXEC_ASYNC);
     CPPUNIT_ASSERT( pid != 0 );
 
-    // NOTE: under Windows the first wxKill() invocation with wxSIGTERM
+    // Give the system some time to launch the child.
-    //       may fail if the system is fast and the ASYNC_COMMAND app
+    wxMilliSleep(200);
-    //       doesn't manage to create its HWND before our wxKill() is
+
-    //       executed; in that case we "fall back" to the second invocation
+    // Try to terminate it gently first, but fall back to killing it
-    //       with wxSIGKILL (which should always succeed)
+    // unconditionally if this fails.
-    CPPUNIT_ASSERT( wxKill(pid, wxSIGTERM) == 0 ||
+    const int rc = wxKill(pid, wxSIGTERM);
-                    wxKill(pid, wxSIGKILL) == 0 );
+    CHECK( rc == 0 );
+    if ( rc != 0 )
+        CHECK( wxKill(pid, wxSIGKILL) == 0 );
 
     int useNoeventsFlag;
 
@@ -249,13 +251,19 @@ void ExecTestCase::TestProcess()
     long pid = asyncInEventLoop.DoExecute(AsyncExec_ExitLoop, // Force exit of event loop right
                                                 // after the call to wxExecute()
                                           ASYNC_COMMAND, wxEXEC_ASYNC, proc);
-    CPPUNIT_ASSERT( proc->GetPid() == pid && pid != 0 );
+    CPPUNIT_ASSERT( proc->GetPid() == pid );
+    CPPUNIT_ASSERT( pid != 0 );
+
+    // As above, give the system time to launch the process.
+    wxMilliSleep(200);
 
     // we're not going to process the wxEVT_END_PROCESS event,
     // so the proc instance will auto-delete itself after we kill
     // the asynch process:
-    CPPUNIT_ASSERT( wxKill(pid, wxSIGTERM) == 0 ||
+    const int rc = wxKill(pid, wxSIGTERM);
-                    wxKill(pid, wxSIGKILL) == 0 );
+    CHECK( rc == 0 );
+    if ( rc != 0 )
+        CHECK( wxKill(pid, wxSIGKILL) == 0 );
 
 
     // test wxExecute with wxProcess and REDIRECTION

tests/file/filefn.cpp

@@ -162,13 +162,16 @@ void FileFunctionsTestCase::CopyFile()
     wxFFile f1(filename1, wxT("rb")),
             f2(filename2, wxT("rb"));
 
-    CPPUNIT_ASSERT_MESSAGE( msg, f1.IsOpened() && f2.IsOpened() );
+    CPPUNIT_ASSERT_MESSAGE( msg, f1.IsOpened() );
+    CPPUNIT_ASSERT_MESSAGE( msg, f2.IsOpened() );
 
     wxString s1, s2;
-    CPPUNIT_ASSERT_MESSAGE( msg, f1.ReadAll(&s1) && f2.ReadAll(&s2) );
+    CPPUNIT_ASSERT_MESSAGE( msg, f1.ReadAll(&s1) );
+    CPPUNIT_ASSERT_MESSAGE( msg, f2.ReadAll(&s2) );
     CPPUNIT_ASSERT_MESSAGE( msg, s1 == s2 );
 
-    CPPUNIT_ASSERT_MESSAGE( msg, f1.Close() && f2.Close() );
+    CPPUNIT_ASSERT_MESSAGE( msg, f1.Close() );
+    CPPUNIT_ASSERT_MESSAGE( msg, f2.Close() );
     CPPUNIT_ASSERT_MESSAGE( msg, wxRemoveFile(filename2) );
 }
 
@@ -394,14 +397,16 @@ void FileFunctionsTestCase::DoConcatFile(const wxString& filePath1,
     // Prepare source data
     wxFFile f1(filePath1, wxT("wb")),
             f2(filePath2, wxT("wb"));
-    CPPUNIT_ASSERT_MESSAGE( msg, f1.IsOpened() && f2.IsOpened() );
+    CPPUNIT_ASSERT_MESSAGE( msg, f1.IsOpened() );
+    CPPUNIT_ASSERT_MESSAGE( msg, f2.IsOpened() );
 
     wxString s1(wxT("1234567890"));
     wxString s2(wxT("abcdefghij"));
     CPPUNIT_ASSERT_MESSAGE( msg, f1.Write(s1) );
     CPPUNIT_ASSERT_MESSAGE( msg, f2.Write(s2) );
 
-    CPPUNIT_ASSERT_MESSAGE( msg, f1.Close() && f2.Close() );
+    CPPUNIT_ASSERT_MESSAGE( msg, f1.Close() );
+    CPPUNIT_ASSERT_MESSAGE( msg, f2.Close() );
 
     // Concatenate source files
     CPPUNIT_ASSERT_MESSAGE( msg, wxConcatFiles(filePath1, filePath2, destFilePath) );
@@ -412,8 +417,8 @@ void FileFunctionsTestCase::DoConcatFile(const wxString& filePath1,
     wxString s3;
     wxFFile f3(destFilePath, wxT("rb"));
     CPPUNIT_ASSERT_MESSAGE( msg, f3.ReadAll(&s3) );
-    CPPUNIT_ASSERT_MESSAGE( msg, (sSrc.length() == s3.length()) &&
+    CPPUNIT_ASSERT_MESSAGE( msg, sSrc.length() == s3.length() );
-                    (memcmp(sSrc.c_str(), s3.c_str(), sSrc.length()) == 0) );
+    CPPUNIT_ASSERT_MESSAGE( msg, memcmp(sSrc.c_str(), s3.c_str(), sSrc.length()) == 0 );
     CPPUNIT_ASSERT_MESSAGE( msg, f3.Close() );
 
     CPPUNIT_ASSERT_MESSAGE( msg, wxRemoveFile(filePath1) );
@@ -515,8 +520,8 @@ void FileFunctionsTestCase::PathOnly()
     CPPUNIT_ASSERT( filename.MakeAbsolute() );
 
     wxString pathOnly = wxPathOnly(filename.GetFullPath());
-    const std::string msg = wxString::Format("Path: %s", pathOnly).ToStdString();
+    if ( !wxDirExists(pathOnly) )
-    CPPUNIT_ASSERT_MESSAGE( msg, wxDirExists(pathOnly) || pathOnly.empty() );
+        CPPUNIT_ASSERT( pathOnly == wxString() );
 }
 
 // Unit tests for Mkdir and Rmdir doesn't cover non-ASCII directory names.

tests/file/filetest.cpp

@@ -123,7 +123,8 @@ void FileTestCase::DoRoundTripTest(const wxMBConv& conv)
 void FileTestCase::TempFile()
 {
     wxTempFile tmpFile;
-    CPPUNIT_ASSERT( tmpFile.Open(wxT("test2")) && tmpFile.Write(wxT("the answer is 42")) );
+    CPPUNIT_ASSERT( tmpFile.Open(wxT("test2")) );
+    CPPUNIT_ASSERT( tmpFile.Write(wxT("the answer is 42")) );
     CPPUNIT_ASSERT( tmpFile.Commit() );
     CPPUNIT_ASSERT( wxRemoveFile(wxT("test2")) );
 }

tests/font/fonttest.cpp

@@ -204,12 +204,11 @@ void FontTestCase::GetSet()
         test.SetStyle(wxFONTSTYLE_SLANT);
         CPPUNIT_ASSERT( test.IsOk() );
 #ifdef __WXMSW__
-        // on wxMSW wxFONTSTYLE_SLANT==wxFONTSTYLE_ITALIC
+        // on wxMSW wxFONTSTYLE_SLANT==wxFONTSTYLE_ITALIC, so accept the latter
-        CPPUNIT_ASSERT( wxFONTSTYLE_SLANT == test.GetStyle() ||
+        // as a valid value too.
-                        wxFONTSTYLE_ITALIC == test.GetStyle() );
+        if ( test.GetStyle() != wxFONTSTYLE_ITALIC )
-#else
-        CPPUNIT_ASSERT_EQUAL( wxFONTSTYLE_SLANT, test.GetStyle() );
 #endif
+        CPPUNIT_ASSERT_EQUAL( wxFONTSTYLE_SLANT, test.GetStyle() );
 
         // test Get/SetUnderlined()
 

tests/fswatcher/fswatchertest.cpp

@@ -831,7 +831,7 @@ void FileSystemWatcherTestCase::TestTrees()
         {
             CPPUNIT_ASSERT(m_watcher);
 
-            size_t treeitems = 1; // the trunk
+            int treeitems = 1; // the trunk
 #if !defined(__WINDOWS__) && !defined(wxHAVE_FSEVENTS_FILE_NOTIFICATIONS)
             // When there's no file mask, wxMSW and wxOSX set a single watch
             // on the trunk which is implemented recursively.
@@ -862,7 +862,7 @@ void FileSystemWatcherTestCase::TestTrees()
             // as it was the first time, despite also adding 'child' separately
             // Except that in wxMSW this isn't true: each watch will be a
             // single, recursive dir; so fudge the count
-            size_t fudge = 0;
+            int fudge = 0;
 #if defined(__WINDOWS__) || defined(wxHAVE_FSEVENTS_FILE_NOTIFICATIONS)
             fudge = 1;
 #endif // __WINDOWS__ || wxHAVE_FSEVENTS_FILE_NOTIFICATIONS
@@ -903,9 +903,9 @@ void FileSystemWatcherTestCase::TestTrees()
             // and another +1 for "child").
             // On OS X, if we use FSEvents then we still only have 1 watch.
 #ifdef wxHAVE_FSEVENTS_FILE_NOTIFICATIONS
-            const size_t treeitems = 1;
+            const int treeitems = 1;
 #else
-            const size_t treeitems = subdirs + 2;
+            const int treeitems = subdirs + 2;
 #endif
             m_watcher->AddTree(dir, wxFSW_EVENT_ALL, "*.txt");
 

tests/geometry/point.cpp

@@ -72,8 +72,10 @@ void PointTestCase::Operators()
     wxPoint p4(5,1);
     wxPoint p5 = p2 + p1;
     wxPoint p6 = p2 - p1;
-    CPPUNIT_ASSERT( p3.x == p5.x && p3.y == p5.y );
+    CPPUNIT_ASSERT( p3.x == p5.x );
-    CPPUNIT_ASSERT( p4.x == p6.x && p4.y == p6.y );
+    CPPUNIT_ASSERT( p3.y == p5.y );
+    CPPUNIT_ASSERT( p4.x == p6.x );
+    CPPUNIT_ASSERT( p4.y == p6.y );
     CPPUNIT_ASSERT( p3 == p5 );
     CPPUNIT_ASSERT( p4 == p6 );
     CPPUNIT_ASSERT( p3 != p4 );
@@ -110,6 +112,8 @@ void RealPointTestCase::Operators()
     CPPUNIT_ASSERT( p4 == p6 );
     CPPUNIT_ASSERT( p3 != p4 );
     */
-    CPPUNIT_ASSERT( fabs( p3.x - p5.x ) < EPSILON && fabs( p3.y - p5.y ) < EPSILON );
+    CPPUNIT_ASSERT( fabs( p3.x - p5.x ) < EPSILON );
-    CPPUNIT_ASSERT( fabs( p4.x - p6.x ) < EPSILON && fabs( p4.y - p6.y ) < EPSILON );
+    CPPUNIT_ASSERT( fabs( p3.y - p5.y ) < EPSILON );
+    CPPUNIT_ASSERT( fabs( p4.x - p6.x ) < EPSILON );
+    CPPUNIT_ASSERT( fabs( p4.y - p6.y ) < EPSILON );
 }

tests/geometry/size.cpp

@@ -52,26 +52,33 @@ void SizeTestCase::Operators()
     wxSize s3;
 
     s3 = s1 + s2;
-    CPPUNIT_ASSERT( s3.GetWidth()==4 && s3.GetHeight()==6 );
+    CPPUNIT_ASSERT( s3.GetWidth()==4 );
+    CPPUNIT_ASSERT( s3.GetHeight()==6 );
     s3 = s2 - s1;
-    CPPUNIT_ASSERT( s3.GetWidth()==2 && s3.GetHeight()==2 );
+    CPPUNIT_ASSERT( s3.GetWidth()==2 );
+    CPPUNIT_ASSERT( s3.GetHeight()==2 );
     s3 = s1 * 2;
-    CPPUNIT_ASSERT( s3.GetWidth()==2 && s3.GetHeight()==4 );
+    CPPUNIT_ASSERT( s3.GetWidth()==2 );
+    CPPUNIT_ASSERT( s3.GetHeight()==4 );
     s3 = 2 * s1;
-    CPPUNIT_ASSERT( s3.GetWidth()==2 && s3.GetHeight()==4 );
+    CPPUNIT_ASSERT( s3.GetWidth()==2 );
+    CPPUNIT_ASSERT( s3.GetHeight()==4 );
     s3 = s3 / 2;
-    CPPUNIT_ASSERT( s3.GetWidth()==1 && s3.GetHeight()==2 );
+    CPPUNIT_ASSERT( s3.GetWidth()==1 );
+    CPPUNIT_ASSERT( s3.GetHeight()==2 );
 
     s3 = s2;
     CPPUNIT_ASSERT( s3 != s1 );
     s3 = s1;
     CPPUNIT_ASSERT( s3 == s1 );
     s3 += s2;
-    CPPUNIT_ASSERT( s3.GetWidth()==4 && s3.GetHeight()==6 );
+    CPPUNIT_ASSERT( s3.GetWidth()==4 );
+    CPPUNIT_ASSERT( s3.GetHeight()==6 );
     s3 -= s2;
     CPPUNIT_ASSERT( s3 == s1 );
     s3 *= 2;
-    CPPUNIT_ASSERT( s3.GetWidth()==2 && s3.GetHeight()==4 );
+    CPPUNIT_ASSERT( s3.GetWidth()==2 );
+    CPPUNIT_ASSERT( s3.GetHeight()==4 );
     s3 /= 2;
     CPPUNIT_ASSERT( s3 == s1 );
 }

tests/graphics/affinematrix.cpp

@@ -407,8 +407,8 @@ void TransformMatrixTestCaseDCBase::VMirrorAndTranslate()
     m_dc->DrawBitmap(m_bmpOrig, 0, 0);
     FlushDC();
 
-    CPPUNIT_ASSERT_EQUAL( m_bmpUsingMatrix.ConvertToImage(),
+    CHECK_THAT( m_bmpUsingMatrix.ConvertToImage(),
-                          m_imgOrig.Mirror(false) );
+                RGBSameAs(m_imgOrig.Mirror(false)) );
 }
 
 void TransformMatrixTestCaseDCBase::Rotate90Clockwise()
@@ -424,8 +424,8 @@ void TransformMatrixTestCaseDCBase::Rotate90Clockwise()
     m_dc->DrawBitmap(m_bmpOrig, 0, 0);
     FlushDC();
 
-    CPPUNIT_ASSERT_EQUAL( m_bmpUsingMatrix.ConvertToImage(),
+    CHECK_THAT( m_bmpUsingMatrix.ConvertToImage(),
-                          m_imgOrig.Rotate90(true) );
+                RGBSameAs(m_imgOrig.Rotate90(true)) );
 }
 
 #if wxUSE_GRAPHICS_CONTEXT
@@ -528,8 +528,8 @@ void TransformMatrixTestCaseDCBase::CompareToGraphicsContext()
     }
 
 
-    CPPUNIT_ASSERT_EQUAL( bmpUsingMatrixA1.ConvertToImage(),
+    CHECK_THAT( bmpUsingMatrixA1.ConvertToImage(),
-                          bmpUsingMatrixAG.ConvertToImage() );
+                RGBSameAs(bmpUsingMatrixAG.ConvertToImage()) );
 
     // Save the images to check that something _is_ inside the visible area.
     //bmpUsingMatrixA1.SaveFile("matrixA1.jpg", wxBITMAP_TYPE_JPEG);

tests/image/image.cpp

@@ -835,14 +835,9 @@ void ImageTestCase::SizeImage()
        //actual.SaveFile(wxString::Format("imagetest-%02d-actual.png", i), wxBITMAP_TYPE_PNG);
        //expected.SaveFile(wxString::Format("imagetest-%02d-exp.png", i), wxBITMAP_TYPE_PNG);
 
-       CPPUNIT_ASSERT_EQUAL( actual.GetSize().x, expected.GetSize().x );
+       wxINFO_FMT("Resize test #%u: (%d, %d), (%d, %d)",
-       CPPUNIT_ASSERT_EQUAL( actual.GetSize().y, expected.GetSize().y );
+                   i, st.w, st.h, st.dx, st.dy);
-
+       CHECK_THAT( actual, RGBSameAs(expected) );
-       WX_ASSERT_EQUAL_MESSAGE
-       (
-         ("Resize test #%u: (%d, %d), (%d, %d)", i, st.w, st.h, st.dx, st.dy),
-         expected, actual
-       );
    }
 }
 
@@ -870,12 +865,10 @@ void ImageTestCase::CompareLoadedImage()
         }
 
 
-        WX_ASSERT_EQUAL_MESSAGE
+        wxINFO_FMT("Compare test '%s' for loading", g_testfiles[i].file);
-        (
+        CHECK_THAT( actual,
-            ("Compare test '%s' for loading failed", g_testfiles[i].file),
+                    RGBSameAs(g_testfiles[i].bitDepth == 8 ? expected8
-            g_testfiles[i].bitDepth == 8 ? expected8 : expected24,
+                                                           : expected24) );
-            actual
-        );
     }
 
 }
@@ -936,16 +929,11 @@ void CompareImage(const wxImageHandler& handler, const wxImage& image,
     CPPUNIT_ASSERT(actual.IsOk());
 
     const wxImage *expected = compareTo ? compareTo : ℑ
-    CPPUNIT_ASSERT( actual.GetSize() == expected->GetSize() );
 
     unsigned bitsPerPixel = testPalette ? 8 : (testAlpha ? 32 : 24);
-    WX_ASSERT_EQUAL_MESSAGE
+    wxINFO_FMT("Compare test '%s (%d-bit)' for saving",
-    (
+               handler.GetExtension(), bitsPerPixel);
-        ("Compare test '%s (%d-bit)' for saving failed",
+    CHECK_THAT(actual, RGBSameAs(*expected));
-            handler.GetExtension(), bitsPerPixel),
-        *expected,
-        actual
-    );
 
 #if wxUSE_PALETTE
     CPPUNIT_ASSERT(actual.HasPalette()
@@ -959,12 +947,8 @@ void CompareImage(const wxImageHandler& handler, const wxImage& image,
         return;
     }
 
-    WX_ASSERT_EQUAL_MESSAGE
+    wxINFO_FMT("Compare alpha test '%s' for saving", handler.GetExtension());
-    (
+    CHECK_THAT(actual, RGBSameAs(*expected));
-        ("Compare alpha test '%s' for saving failed", handler.GetExtension()),
-        *expected,
-        actual
-    );
 }
 
 static void SetAlpha(wxImage *image)
@@ -1180,12 +1164,8 @@ void ImageTestCase::SaveAnimatedGIF()
         CPPUNIT_ASSERT( handler.LoadFile(&image, memIn, true, i) );
         memIn.SeekI(pos);
 
-        WX_ASSERT_EQUAL_MESSAGE
+        wxINFO_FMT("Compare test for GIF frame number %d failed", i);
-        (
+        CHECK_THAT(image, RGBSameAs(images[i]));
-            ("Compare test for GIF frame number %d failed", i),
-            images[i],
-            image
-        );
     }
 #endif // #if wxUSE_PALETTE
 }
@@ -1386,7 +1366,7 @@ CompareApprox(const wxImage& i1, const wxImage& i2)
         CPPUNIT_ASSERT_MESSAGE( "Failed to load " file, imageFromFile.IsOk() ); \
         CPPUNIT_ASSERT_MESSAGE \
         ( \
-            "Wrong scaled " + CppUnit::assertion_traits<wxImage>::toString(image), \
+            "Wrong scaled " + Catch::toString(image), \
             CompareApprox(imageFromFile, image) \
         ); \
     }

tests/interactive/input.cpp

@@ -67,10 +67,9 @@ private:
 // CppUnit macros
 // ----------------------------------------------------------------------------
 
-//CPPUNIT_TEST_SUITE_REGISTRATION( InteractiveInputTestCase );
+// Register this test case as hidden, it shouldn't be run by default.
-    // do not run this test by default!
+wxREGISTER_UNIT_TEST_WITH_TAGS(InteractiveInputTestCase,
-
+                               "[!hide][interactive][input]");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( InteractiveInputTestCase, "InteractiveInputTestCase" );
 
 // ============================================================================
 // implementation

tests/interactive/output.cpp

@@ -76,10 +76,8 @@ private:
 // CppUnit macros
 // ----------------------------------------------------------------------------
 
-//CPPUNIT_TEST_SUITE_REGISTRATION( InteractiveOutputTestCase );
+wxREGISTER_UNIT_TEST_WITH_TAGS(InteractiveOutputTestCase,
-    // do not run this test by default!
+                               "[!hide][interactive][output]");
-
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( InteractiveOutputTestCase, "InteractiveOutputTestCase" );
 
 // ============================================================================
 // implementation

tests/lists/lists.cpp

@@ -132,12 +132,13 @@ void ListsTestCase::wxStdListTest()
         CPPUNIT_ASSERT( *rit == i + &i );
     }
 
-    CPPUNIT_ASSERT( *list1.rbegin() == *--list1.end() &&
+    CPPUNIT_ASSERT( *list1.rbegin() == *--list1.end() );
-                    *list1.begin() == *--list1.rend() );
+    CPPUNIT_ASSERT( *list1.begin() == *--list1.rend() );
-    CPPUNIT_ASSERT( *list1.begin() == *--++list1.begin() &&
+    CPPUNIT_ASSERT( *list1.begin() == *--++list1.begin() );
-                    *list1.rbegin() == *--++list1.rbegin() );
+    CPPUNIT_ASSERT( *list1.rbegin() == *--++list1.rbegin() );
 
-    CPPUNIT_ASSERT( list1.front() == &i && list1.back() == &i + 4 );
+    CPPUNIT_ASSERT( list1.front() == &i );
+    CPPUNIT_ASSERT( list1.back() == &i + 4 );
 
     list1.erase(list1.begin());
     list1.erase(--list1.end());

tests/log/logtest.cpp

@@ -248,7 +248,7 @@ void LogTestCase::Null()
 void LogTestCase::Component()
 {
     wxLogMessage("Message");
-    CPPUNIT_ASSERT_EQUAL( wxLOG_COMPONENT,
+    CPPUNIT_ASSERT_EQUAL( std::string(wxLOG_COMPONENT),
                           m_log->GetInfo(wxLOG_Message).component );
 
     // completely disable logging for this component

tests/makefile.bcc

@@ -34,7 +34,7 @@ TEST_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
 	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
 	-I$(SETUPHDIR) -I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -I. \
-	$(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) -Hu \
+	$(__DLLFLAG_p) -DwxUSE_GUI=0 -I.\..\3rdparty\catch\include -Hu \
 	-H=$(OBJS)\testprec_test.csm $(CPPFLAGS) $(CXXFLAGS)
 TEST_OBJECTS =  \
 	$(OBJS)\test_dummy.obj \
@@ -96,7 +96,6 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_crt.obj \
 	$(OBJS)\test_vsnprintf.obj \
 	$(OBJS)\test_hexconv.obj \
-	$(OBJS)\test_bstream.obj \
 	$(OBJS)\test_datastreamtest.obj \
 	$(OBJS)\test_ffilestream.obj \
 	$(OBJS)\test_fileback.obj \
@@ -128,7 +127,7 @@ TEST_DRAWING_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
 	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
 	-I$(SETUPHDIR) -I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -I. \
-	$(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) -Hu \
+	$(__DLLFLAG_p) -DwxUSE_GUI=0 -I.\..\3rdparty\catch\include -Hu \
 	-H=$(OBJS)\testprec_test_drawing.csm $(CPPFLAGS) $(CXXFLAGS)
 TEST_DRAWING_OBJECTS =  \
 	$(OBJS)\test_drawing_dummy.obj \
@@ -150,7 +149,7 @@ TEST_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
 	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
 	-I$(SETUPHDIR) -I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -I. \
-	$(__DLLFLAG_p) -I.\..\samples -DNOPCH $(CPPUNIT_CFLAGS) -Hu \
+	$(__DLLFLAG_p) -I.\..\samples -DNOPCH -I.\..\3rdparty\catch\include -Hu \
 	-H=$(OBJS)\testprec_test_gui.csm $(CPPFLAGS) $(CXXFLAGS)
 TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_dummy.obj \
@@ -497,13 +496,13 @@ clean:
 	-if exist $(OBJS)\test_gui.ils del $(OBJS)\test_gui.ils
 
 $(OBJS)\test.exe: $(OBJS)\test_dummy.obj  $(TEST_OBJECTS)
-	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
+	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
 	c0x32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
 |
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\test_drawing.exe: $(OBJS)\test_drawing_dummy.obj  $(TEST_DRAWING_OBJECTS)
-	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
+	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
 	c0x32.obj $(TEST_DRAWING_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
 |
 !endif
@@ -517,7 +516,7 @@ $(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS)
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj  $(TEST_GUI_OBJECTS)  $(OBJS)\test_gui_sample.res
-	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(CPPUNIT_LIBS) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
+	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
 	c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\test_gui_sample.res
 |
 !endif
@@ -715,9 +714,6 @@ $(OBJS)\test_vsnprintf.obj: .\strings\vsnprintf.cpp
 $(OBJS)\test_hexconv.obj: .\strings\hexconv.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\hexconv.cpp
 
-$(OBJS)\test_bstream.obj: .\streams\bstream.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\bstream.cpp
-
 $(OBJS)\test_datastreamtest.obj: .\streams\datastreamtest.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\datastreamtest.cpp
 
@@ -818,7 +814,7 @@ $(OBJS)\test_drawingplugin_pluginsample.obj: .\drawing\pluginsample.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) .\drawing\pluginsample.cpp
 
 $(OBJS)\test_gui_sample.res: .\..\samples\sample.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_7) $(__DEBUG_DEFINE_p_7) $(__NDEBUG_DEFINE_p_7) $(__EXCEPTIONS_DEFINE_p_7) $(__RTTI_DEFINE_p_7) $(__THREAD_DEFINE_p_7) $(__UNICODE_DEFINE_p_7) -i$(SETUPHDIR) -i.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_7_p) -i. $(__DLLFLAG_p_7) -i.\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\..\samples\sample.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_7) $(__DEBUG_DEFINE_p_7) $(__NDEBUG_DEFINE_p_7) $(__EXCEPTIONS_DEFINE_p_7) $(__RTTI_DEFINE_p_7) $(__THREAD_DEFINE_p_7) $(__UNICODE_DEFINE_p_7) -i$(SETUPHDIR) -i.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_7_p) -i. $(__DLLFLAG_p_7) -i.\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH -i.\..\3rdparty\catch\include .\..\samples\sample.rc
 
 $(OBJS)\test_gui_dummy.obj: .\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) -H .\dummy.cpp

tests/makefile.gcc

@@ -26,8 +26,8 @@ TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
 	$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \
 	$(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
-	$(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \
+	-I.\..\3rdparty\catch\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	$(CPPFLAGS) $(CXXFLAGS)
+	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 TEST_OBJECTS =  \
 	$(OBJS)\test_dummy.o \
 	$(OBJS)\test_test.o \
@@ -88,7 +88,6 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_crt.o \
 	$(OBJS)\test_vsnprintf.o \
 	$(OBJS)\test_hexconv.o \
-	$(OBJS)\test_bstream.o \
 	$(OBJS)\test_datastreamtest.o \
 	$(OBJS)\test_ffilestream.o \
 	$(OBJS)\test_fileback.o \
@@ -120,7 +119,7 @@ TEST_DRAWING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
 	$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
 	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
 	-I$(SETUPHDIR) -I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -I. \
-	$(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(__RTTIFLAG) \
+	$(__DLLFLAG_p) -DwxUSE_GUI=0 -I.\..\3rdparty\catch\include $(__RTTIFLAG) \
 	$(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 TEST_DRAWING_OBJECTS =  \
 	$(OBJS)\test_drawing_dummy.o \
@@ -143,8 +142,9 @@ TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
 	$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
 	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
 	-I$(SETUPHDIR) -I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -I. \
-	$(__DLLFLAG_p) -I.\..\samples -DNOPCH $(CPPUNIT_CFLAGS) $(__RTTIFLAG) \
+	$(__DLLFLAG_p) -I.\..\samples -DNOPCH -I.\..\3rdparty\catch\include \
-	$(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
+	$(CXXFLAGS)
 TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_sample_rc.o \
 	$(OBJS)\test_gui_dummy.o \
@@ -479,11 +479,11 @@ clean:
 	-if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
 
 $(OBJS)\test.exe: $(TEST_OBJECTS)
-	$(CXX) -o $@ $(TEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(TEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
 
 ifeq ($(USE_GUI),1)
 $(OBJS)\test_drawing.exe: $(TEST_DRAWING_OBJECTS)
-	$(CXX) -o $@ $(TEST_DRAWING_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(TEST_DRAWING_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
 endif
 
 ifeq ($(SHARED),1)
@@ -495,7 +495,7 @@ endif
 
 ifeq ($(USE_GUI),1)
 $(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o
-	$(CXX) -o $@ $(TEST_GUI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(TEST_GUI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
 endif
 
 data: 
@@ -691,9 +691,6 @@ $(OBJS)\test_vsnprintf.o: ./strings/vsnprintf.cpp
 $(OBJS)\test_hexconv.o: ./strings/hexconv.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\test_bstream.o: ./streams/bstream.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\test_datastreamtest.o: ./streams/datastreamtest.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
@@ -794,7 +791,7 @@ $(OBJS)\test_drawingplugin_pluginsample.o: ./drawing/pluginsample.cpp
 	$(CXX) -c -o $@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_gui_sample_rc.o: ./../samples/sample.rc
-	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_6) $(__DEBUG_DEFINE_p_6) $(__NDEBUG_DEFINE_p_6) $(__EXCEPTIONS_DEFINE_p_6) $(__RTTI_DEFINE_p_6) $(__THREAD_DEFINE_p_6) $(__UNICODE_DEFINE_p_6) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p_2) --include-dir . $(__DLLFLAG_p_6) --include-dir ./../samples --define NOPCH
+	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_6) $(__DEBUG_DEFINE_p_6) $(__NDEBUG_DEFINE_p_6) $(__EXCEPTIONS_DEFINE_p_6) $(__RTTI_DEFINE_p_6) $(__THREAD_DEFINE_p_6) $(__UNICODE_DEFINE_p_6) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p_2) --include-dir . $(__DLLFLAG_p_6) --include-dir ./../samples --define NOPCH --include-dir ./../3rdparty/catch/include
 
 $(OBJS)\test_gui_dummy.o: ./dummy.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<

tests/makefile.vc

@@ -28,8 +28,9 @@ TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	$(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\include \
 	$(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \
-	/DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+	/DwxUSE_GUI=0 /I.\..\3rdparty\catch\include $(__RTTIFLAG) \
-	/Yu"testprec.h" /Fp"$(OBJS)\testprec_test.pch" $(CPPFLAGS) $(CXXFLAGS)
+	$(__EXCEPTIONSFLAG) /Yu"testprec.h" /Fp"$(OBJS)\testprec_test.pch" \
+	$(CPPFLAGS) $(CXXFLAGS)
 TEST_OBJECTS =  \
 	$(OBJS)\test_dummy.obj \
 	$(OBJS)\test_test.obj \
@@ -90,7 +91,6 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_crt.obj \
 	$(OBJS)\test_vsnprintf.obj \
 	$(OBJS)\test_hexconv.obj \
-	$(OBJS)\test_bstream.obj \
 	$(OBJS)\test_datastreamtest.obj \
 	$(OBJS)\test_ffilestream.obj \
 	$(OBJS)\test_fileback.obj \
@@ -125,9 +125,9 @@ TEST_DRAWING_CXXFLAGS = /M$(__RUNTIME_LIBS_27)$(__DEBUGRUNTIME) /DWIN32 \
 	$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\include \
 	$(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \
-	/DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+	/DwxUSE_GUI=0 /I.\..\3rdparty\catch\include $(__RTTIFLAG) \
-	/Yu"testprec.h" /Fp"$(OBJS)\testprec_test_drawing.pch" $(CPPFLAGS) \
+	$(__EXCEPTIONSFLAG) /Yu"testprec.h" /Fp"$(OBJS)\testprec_test_drawing.pch" \
-	$(CXXFLAGS)
+	$(CPPFLAGS) $(CXXFLAGS)
 TEST_DRAWING_OBJECTS =  \
 	$(OBJS)\test_drawing_dummy.obj \
 	$(OBJS)\test_drawing_test.obj \
@@ -154,8 +154,9 @@ TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_59)$(__DEBUGRUNTIME) /DWIN32 \
 	$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\include \
 	$(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. $(__DLLFLAG_p) /I.\..\samples \
-	/DNOPCH $(CPPUNIT_CFLAGS) /D_CONSOLE $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+	/DNOPCH /I.\..\3rdparty\catch\include /D_CONSOLE $(__RTTIFLAG) \
-	/Yu"testprec.h" /Fp"$(OBJS)\testprec_test_gui.pch" $(CPPFLAGS) $(CXXFLAGS)
+	$(__EXCEPTIONSFLAG) /Yu"testprec.h" /Fp"$(OBJS)\testprec_test_gui.pch" \
+	$(CPPFLAGS) $(CXXFLAGS)
 TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_dummy.obj \
 	$(OBJS)\test_gui_asserthelper.obj \
@@ -674,13 +675,13 @@ clean:
 	-if exist $(OBJS)\test_gui.pdb del $(OBJS)\test_gui.pdb
 
 $(OBJS)\test.exe: $(OBJS)\test_dummy.obj  $(TEST_OBJECTS)
-	link /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(OBJS)\test.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+	link /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(OBJS)\test.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
 	$(TEST_OBJECTS)   $(__WXLIB_NET_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
 <<
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\test_drawing.exe: $(OBJS)\test_drawing_dummy.obj  $(TEST_DRAWING_OBJECTS)
-	link /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_drawing.pdb" $(__DEBUGINFO_19)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+	link /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_drawing.pdb" $(__DEBUGINFO_19)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
 	$(TEST_DRAWING_OBJECTS)   $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
 <<
 !endif
@@ -694,7 +695,7 @@ $(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS)
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj  $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
-	link /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_gui.pdb" $(__DEBUGINFO_51)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
+	link /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_gui.pdb" $(__DEBUGINFO_51)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
 	$(TEST_GUI_OBJECTS) $(TEST_GUI_RESOURCES)  $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
 <<
 !endif
@@ -892,9 +893,6 @@ $(OBJS)\test_vsnprintf.obj: .\strings\vsnprintf.cpp
 $(OBJS)\test_hexconv.obj: .\strings\hexconv.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\hexconv.cpp
 
-$(OBJS)\test_bstream.obj: .\streams\bstream.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\bstream.cpp
-
 $(OBJS)\test_datastreamtest.obj: .\streams\datastreamtest.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\datastreamtest.cpp
 
@@ -998,7 +996,7 @@ $(OBJS)\test_gui_dummy.obj: .\dummy.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) /Yctestprec.h .\dummy.cpp
 
 $(OBJS)\test_gui_sample.res: .\..\samples\sample.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_52_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_7)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_7) $(__DEBUG_DEFINE_p_7) $(__NDEBUG_DEFINE_p_7) $(__EXCEPTIONS_DEFINE_p_7) $(__RTTI_DEFINE_p_7) $(__THREAD_DEFINE_p_7) $(__UNICODE_DEFINE_p_7) /i $(SETUPHDIR) /i .\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_7_p) /i . $(__DLLFLAG_p_7) /i .\..\samples /d NOPCH /d _CONSOLE .\..\samples\sample.rc
+	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_52_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_7)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_7) $(__DEBUG_DEFINE_p_7) $(__NDEBUG_DEFINE_p_7) $(__EXCEPTIONS_DEFINE_p_7) $(__RTTI_DEFINE_p_7) $(__THREAD_DEFINE_p_7) $(__UNICODE_DEFINE_p_7) /i $(SETUPHDIR) /i .\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_7_p) /i . $(__DLLFLAG_p_7) /i .\..\samples /d NOPCH /i .\..\3rdparty\catch\include /d _CONSOLE .\..\samples\sample.rc
 
 $(OBJS)\test_gui_asserthelper.obj: .\asserthelper.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\asserthelper.cpp

tests/mbconv/mbconvtest.cpp

@@ -225,7 +225,6 @@ private:
 CPPUNIT_TEST_SUITE_REGISTRATION( MBConvTestCase );
 
 // also include in its own registry so that these tests can be run alone
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( MBConvTestCase, "MBConvTestCase" );
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( MBConvTestCase, "MBConv" );
 
 void MBConvTestCase::WC2CP1250()

tests/misc/guifuncs.cpp

@@ -84,7 +84,8 @@ void MiscGUIFuncsTestCase::DisplaySize()
 
     // test that display PPI is something reasonable
     sz = wxGetDisplayPPI();
-    CPPUNIT_ASSERT( sz.x < 1000 && sz.y < 1000 );
+    CPPUNIT_ASSERT( sz.x < 1000 );
+    CPPUNIT_ASSERT( sz.y < 1000 );
 }
 
 void MiscGUIFuncsTestCase::URLDataObject()

tests/misc/module.cpp

@@ -116,5 +116,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ModuleTestCase, "ModuleTestCase" );
 void ModuleTestCase::LoadOrder()
 {
     // module D is the only one with no dependencies and so should load as first (and so on):
-    CPPUNIT_ASSERT_EQUAL( "ModuleDModuleCModuleBModuleA", g_strLoadOrder );
+    CPPUNIT_ASSERT_EQUAL( std::string("ModuleDModuleCModuleBModuleA"),
+                          g_strLoadOrder );
 }

tests/misc/settings.cpp

@@ -81,8 +81,8 @@ void SettingsTestCase::GetFont()
     for (unsigned int i=0; i < WXSIZEOF(ids); i++)
     {
         const wxFont& font = wxSystemSettings::GetFont(ids[i]);
-        CPPUNIT_ASSERT( font.IsOk() && 
+        CPPUNIT_ASSERT( font.IsOk() );
-                        wxFontEnumerator::IsValidFacename(font.GetFaceName()) );
+        CPPUNIT_ASSERT( wxFontEnumerator::IsValidFacename(font.GetFaceName()) );
     }
 }
 

tests/regex/regextest.cpp

@@ -55,7 +55,6 @@
 using CppUnit::Test;
 using CppUnit::TestCase;
 using CppUnit::TestSuite;
-using CppUnit::Exception;
 
 using std::string;
 using std::vector;
@@ -375,15 +374,8 @@ void RegExTestSuite::add(
 
     va_end(ap);
 
-    try {
+    addTest(new RegExTestCase(
-        addTest(new RegExTestCase(
+        name, mode, id, flags, pattern, data, expected_results));
-            name, mode, id, flags, pattern, data, expected_results));
-    }
-    catch (Exception& e) {
-        wxLogInfo(wxString::Format(wxT("skipping: %s\n %s\n"),
-            wxString(name.c_str(), wxConvUTF8).c_str(),
-            wxString(e.what(), wxConvUTF8).c_str()));
-    }
 }
 
 

tests/runtests.bat

@@ -24,7 +24,7 @@ for /d %%x in (*) do @(
         echo Running non-GUI unit test
         echo ========================================================================
         echo.
-        %%x\test.exe -t >tmp
+        %%x\test.exe >tmp
         
         REM show the output of the test in the buildbot log:
         type tmp
@@ -48,7 +48,7 @@ for /d %%x in (*) do @(
         echo Running GUI unit test
         echo ========================================================================
         echo.
-        %%x\test_gui.exe -t >tmp
+        %%x\test_gui.exe >tmp
         
         REM show the output of the test in the buildbot log:
         type tmp

tests/streams/bstream.cpp

@@ -1,73 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        tests/streams/bstream.cpp
-// Purpose:     House the base stream test suite.
-// Author:      Hans Van Leemputten
-// Copyright:   (c) 2004 Hans Van Leemputten
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-// and "wx/cppunit.h"
-#include "testprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-#include "bstream.h"
-
-using CppUnit::TestSuite;
-using CppUnit::Test;
-
-///////////////////////////////////////////////////////////////////////////////
-// Streams main test suite, it houses all stream test suites.
-//
-
-class StreamCase : public TestSuite
-{
-public:
-    StreamCase()
-        :TestSuite(STREAM_TEST_NAME)
-    { /* Nothing extra */ }
-    static Test *suite();
-};
-
-Test *StreamCase::suite()
-{
-    TestSuite *suite = new StreamCase;
-
-    /*
-     * Register all sub stream test suites.
-     */
-
-    STREAM_REGISTER_SUB_SUITE(memStream);
-    STREAM_REGISTER_SUB_SUITE(strStream);
-    STREAM_REGISTER_SUB_SUITE(fileStream);
-    STREAM_REGISTER_SUB_SUITE(ffileStream);
-    STREAM_REGISTER_SUB_SUITE(tempStream);
-    STREAM_REGISTER_SUB_SUITE(zlibStream);
-    STREAM_REGISTER_SUB_SUITE(backStream);
-    STREAM_REGISTER_SUB_SUITE(socketStream);
-
-    extern CppUnit::Test* GetlargeFileSuite();
-    Test *lfs = GetlargeFileSuite();
-    if (lfs)
-        suite->addTest(lfs);
-
-    /*
-    ** Add more stream subtests here
-    */
-
-    return suite;
-}
-
-// register in the unnamed registry so that these tests are run by default
-CPPUNIT_TEST_SUITE_REGISTRATION(StreamCase);
-// also include in its own registry so that these tests can be run alone
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(StreamCase, STREAM_TEST_NAME);
-

tests/streams/bstream.h

@@ -9,8 +9,6 @@
 #ifndef _WX_TESTBSTREAM_H__
 #define _WX_TESTBSTREAM_H__
 
-#include "wx/cppunit.h"
-
 ///////////////////////////////////////////////////////////////////////////////
 // Some macros preventing us from typing too much ;-)
 //
@@ -18,14 +16,8 @@
 #define STREAM_TEST_NAME "Streams"
 #define COMPOSE_TEST_NAME(Name) \
     STREAM_TEST_NAME "." #Name
-#define STREAM_REGISTER_SUB_SUITE(Name) \
-    extern CppUnit::Test* Get##Name##Suite(); \
-    suite->addTest(Get##Name##Suite())
-#define STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE(Name) \
-    CppUnit::Test* Get##Name##Suite() { return Name::suite(); }
 #define STREAM_TEST_SUBSUITE_NAMED_REGISTRATION(Name) \
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( Name, COMPOSE_TEST_NAME(Name) ); \
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( Name, COMPOSE_TEST_NAME(Name) );
-    STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE( Name )
 
 ///////////////////////////////////////////////////////////////////////////////
 // Template class that implements a test for all base stream functions.
@@ -81,11 +73,18 @@ protected:
         CPPUNIT_ASSERT(!stream_in.Eof());
 
         // Size should be greater than zero.
-        // Note: streams not supporting this should register this test
-        //       with CPPUNIT_TEST_FAIL instead of CPPUNIT_TEST.
         CPPUNIT_ASSERT(stream_in.GetSize() != 0);
     }
 
+    // The variant for non-seekable streams.
+    void Input_GetSizeFail()
+    {
+        CleanupHelper cleanup(this);
+        const TStreamIn &stream_in = CreateInStream();
+
+        CPPUNIT_ASSERT(stream_in.GetSize() == 0);
+    }
+
     // Just try to perform a GetC() on the input stream.
     void Input_GetC()
     {
@@ -199,8 +198,6 @@ protected:
         CPPUNIT_ASSERT(!stream_in.Eof());
 
         // Try to Seek in the stream...
-        // Note: streams not supporting this should register this test
-        //       with CPPUNIT_TEST_FAIL instead of CPPUNIT_TEST.
         CPPUNIT_ASSERT_EQUAL(2, stream_in.SeekI(2, wxFromStart));
         CPPUNIT_ASSERT_EQUAL(4, stream_in.SeekI(2, wxFromCurrent));
         // Not sure the following line is correct, so test it differently.
@@ -210,6 +207,14 @@ protected:
         CPPUNIT_ASSERT((stream_in.SeekI(10, wxFromCurrent) == wxInvalidOffset) == m_bSeekInvalidBeyondEnd);
     }
 
+    void Input_SeekIFail()
+    {
+        CleanupHelper cleanup(this);
+        TStreamIn &stream_in = CreateInStream();
+
+        CPPUNIT_ASSERT( !stream_in.IsSeekable() );
+    }
+
     // Just try to perform a TellI() on the input stream.
     void Input_TellI()
     {
@@ -340,8 +345,6 @@ protected:
         (void)stream_out.Write(buf, 10);
 
         // Try to Seek in the stream...
-        // Note: streams not supporting this should register this test
-        //       with CPPUNIT_TEST_FAIL instead of CPPUNIT_TEST.
         CPPUNIT_ASSERT_EQUAL(2, stream_out.SeekO(2, wxFromStart));
         CPPUNIT_ASSERT_EQUAL(4, stream_out.SeekO(2, wxFromCurrent));
         // Not sure the following line is correct, so test it differently.
@@ -351,6 +354,14 @@ protected:
         CPPUNIT_ASSERT((stream_out.SeekO(10, wxFromCurrent) == wxInvalidOffset) == m_bSeekInvalidBeyondEnd);
     }
 
+    void Output_SeekOFail()
+    {
+        CleanupHelper cleanup(this);
+        TStreamOut &stream_out = CreateOutStream();
+
+        CPPUNIT_ASSERT( !stream_out.IsSeekable() );
+    }
+
     // Just try to perform a TellO() on the output stream.
     void Output_TellO()
     {

tests/streams/ffilestream.cpp

@@ -37,7 +37,6 @@ class ffileStream : public BaseStreamTestCase<wxFFileInputStream, wxFFileOutputS
 {
 public:
     ffileStream();
-    virtual ~ffileStream();
 
     CPPUNIT_TEST_SUITE(ffileStream);
         // Base class stream tests the ffileStream supports.
@@ -80,13 +79,6 @@ ffileStream::ffileStream()
     m_bEofAtLastRead = false;
 }
 
-ffileStream::~ffileStream()
-{
-    // Remove the temp test file...
-    ::wxRemoveFile(FILENAME_FFILEINSTREAM);
-    ::wxRemoveFile(FILENAME_FFILEOUTSTREAM);
-}
-
 wxFFileInputStream *ffileStream::DoCreateInStream()
 {
     wxFFileInputStream *pFileInStream = new wxFFileInputStream(GetInFileName());
@@ -107,12 +99,37 @@ void ffileStream::DoDeleteOutStream()
 
 wxString ffileStream::GetInFileName() const
 {
-    static bool bFileCreated = false;
+    class AutoRemoveFile
-    if (!bFileCreated)
     {
-        // Create the file only once
+    public:
-        bFileCreated = true;
+        AutoRemoveFile()
+        {
+            m_created = false;
+        }
 
+        ~AutoRemoveFile()
+        {
+            if ( m_created )
+                wxRemoveFile(FILENAME_FFILEINSTREAM);
+        }
+
+        bool ShouldCreate()
+        {
+            if ( m_created )
+                return false;
+
+            m_created = true;
+
+            return true;
+        }
+
+    private:
+        bool m_created;
+    };
+
+    static AutoRemoveFile autoFile;
+    if ( autoFile.ShouldCreate() )
+    {
         // Make sure we have a input file...
         char buf[DATABUFFER_SIZE];
         wxFFileOutputStream out(FILENAME_FFILEINSTREAM);

tests/streams/filestream.cpp

@@ -37,7 +37,6 @@ class fileStream : public BaseStreamTestCase<wxFileInputStream, wxFileOutputStre
 {
 public:
     fileStream();
-    virtual ~fileStream();
 
     CPPUNIT_TEST_SUITE(fileStream);
         // Base class stream tests the fileStream supports.
@@ -79,13 +78,6 @@ fileStream::fileStream()
     m_bSeekInvalidBeyondEnd = false;
 }
 
-fileStream::~fileStream()
-{
-    // Remove the temp test file...
-    ::wxRemoveFile(FILENAME_FILEINSTREAM);
-    ::wxRemoveFile(FILENAME_FILEOUTSTREAM);
-}
-
 wxFileInputStream *fileStream::DoCreateInStream()
 {
     wxFileInputStream *pFileInStream = new wxFileInputStream(GetInFileName());
@@ -106,12 +98,37 @@ void fileStream::DoDeleteOutStream()
 
 wxString fileStream::GetInFileName() const
 {
-    static bool bFileCreated = false;
+    class AutoRemoveFile
-    if (!bFileCreated)
     {
-        // Create the file only once
+    public:
-        bFileCreated = true;
+        AutoRemoveFile()
+        {
+            m_created = false;
+        }
 
+        ~AutoRemoveFile()
+        {
+            if ( m_created )
+                wxRemoveFile(FILENAME_FILEINSTREAM);
+        }
+
+        bool ShouldCreate()
+        {
+            if ( m_created )
+                return false;
+
+            m_created = true;
+
+            return true;
+        }
+
+    private:
+        bool m_created;
+    };
+
+    static AutoRemoveFile autoFile;
+    if ( autoFile.ShouldCreate() )
+    {
         // Make sure we have a input file...
         char buf[DATABUFFER_SIZE];
         wxFileOutputStream out(FILENAME_FILEINSTREAM);

tests/streams/largefile.cpp

@@ -32,6 +32,7 @@
 #endif
 
 #include "wx/filename.h"
+#include "wx/scopedptr.h"
 #include "wx/wfstream.h"
 
 #ifdef __WINDOWS__
@@ -51,8 +52,6 @@
     #define fileno _fileno
 #endif
 
-using std::auto_ptr;
-
 
 ///////////////////////////////////////////////////////////////////////////////
 // Helpers
@@ -120,7 +119,7 @@ void LargeFileTest::runTest()
 
     // write a large file
     {
-        auto_ptr<wxOutputStream> out(MakeOutStream(tmpfile.m_name));
+        wxScopedPtr<wxOutputStream> out(MakeOutStream(tmpfile.m_name));
 
         // write 'A's at [ 0x7fffffbf, 0x7fffffff [
         pos = 0x7fffffff - size;
@@ -154,7 +153,7 @@ void LargeFileTest::runTest()
 
     // read the large file back
     {
-        auto_ptr<wxInputStream> in(MakeInStream(tmpfile.m_name));
+        wxScopedPtr<wxInputStream> in(MakeInStream(tmpfile.m_name));
         char buf[size];
 
         if (haveLFS) {
@@ -218,7 +217,7 @@ protected:
 
 wxInputStream *LargeFileTest_wxFile::MakeInStream(const wxString& name) const
 {
-    auto_ptr<wxFileInputStream> in(new wxFileInputStream(name));
+    wxScopedPtr<wxFileInputStream> in(new wxFileInputStream(name));
     CPPUNIT_ASSERT(in->IsOk());
     return in.release();
 }
@@ -250,7 +249,7 @@ protected:
 
 wxInputStream *LargeFileTest_wxFFile::MakeInStream(const wxString& name) const
 {
-    auto_ptr<wxFFileInputStream> in(new wxFFileInputStream(name));
+    wxScopedPtr<wxFFileInputStream> in(new wxFFileInputStream(name));
     CPPUNIT_ASSERT(in->IsOk());
     return in.release();
 }
@@ -437,5 +436,4 @@ CppUnit::Test* GetlargeFileSuite()
 
 #endif // __WINDOWS__
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(largeFile, "largeFile");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(largeFile, "Streams.largeFile");

tests/streams/zlibstream.cpp

@@ -29,9 +29,6 @@
 
 using std::string;
 
-#define WXTEST_WITH_GZIP_CONDITION(testMethod) \
-    WXTEST_WITH_CONDITION( COMPOSE_TEST_NAME(zlibStream), wxZlibInputStream::CanHandleGZip() && wxZlibOutputStream::CanHandleGZip(), testMethod )
-
 #define DATABUFFER_SIZE 1024
 
 static const wxString FILENAME_GZ = wxT("zlibtest.gz");
@@ -49,13 +46,13 @@ public:
 
     CPPUNIT_TEST_SUITE(zlibStream);
         // Base class stream tests the zlibstream supports.
-        CPPUNIT_TEST_FAIL(Input_GetSize);
+        CPPUNIT_TEST(Input_GetSizeFail);
         CPPUNIT_TEST(Input_GetC);
         CPPUNIT_TEST(Input_Read);
         CPPUNIT_TEST(Input_Eof);
         CPPUNIT_TEST(Input_LastRead);
         CPPUNIT_TEST(Input_CanRead);
-        CPPUNIT_TEST_FAIL(Input_SeekI);
+        CPPUNIT_TEST(Input_SeekIFail);
         CPPUNIT_TEST(Input_TellI);
         CPPUNIT_TEST(Input_Peek);
         CPPUNIT_TEST(Input_Ungetch);
@@ -63,7 +60,7 @@ public:
         CPPUNIT_TEST(Output_PutC);
         CPPUNIT_TEST(Output_Write);
         CPPUNIT_TEST(Output_LastWrite);
-        CPPUNIT_TEST_FAIL(Output_SeekO);
+        CPPUNIT_TEST(Output_SeekOFail);
         CPPUNIT_TEST(Output_TellO);
 
         // Other test specific for zlib stream test case.
@@ -76,16 +73,16 @@ public:
         CPPUNIT_TEST(TestStream_ZLib_NoComp);
         CPPUNIT_TEST(TestStream_ZLib_SpeedComp);
         CPPUNIT_TEST(TestStream_ZLib_BestComp);
-        WXTEST_WITH_GZIP_CONDITION(TestStream_GZip_Default);
+        CPPUNIT_TEST(TestStream_GZip_Default);
-        WXTEST_WITH_GZIP_CONDITION(TestStream_GZip_NoComp);
+        CPPUNIT_TEST(TestStream_GZip_NoComp);
-        WXTEST_WITH_GZIP_CONDITION(TestStream_GZip_SpeedComp);
+        CPPUNIT_TEST(TestStream_GZip_SpeedComp);
-        WXTEST_WITH_GZIP_CONDITION(TestStream_GZip_BestComp);
+        CPPUNIT_TEST(TestStream_GZip_BestComp);
-        WXTEST_WITH_GZIP_CONDITION(TestStream_GZip_Dictionary);
+        CPPUNIT_TEST(TestStream_GZip_Dictionary);
-        WXTEST_WITH_GZIP_CONDITION(TestStream_ZLibGZip);
+        CPPUNIT_TEST(TestStream_ZLibGZip);
         CPPUNIT_TEST(Decompress_BadData);
         CPPUNIT_TEST(Decompress_wx251_zlib114_Data_NoHeader);
         CPPUNIT_TEST(Decompress_wx251_zlib114_Data_ZLib);
-        WXTEST_WITH_GZIP_CONDITION(Decompress_gzip135Data);
+        CPPUNIT_TEST(Decompress_gzip135Data);
     CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -475,8 +472,8 @@ void zlibStream::doDecompress_ExternalData(const unsigned char *data, const char
         }
     }
 
-    CPPUNIT_ASSERT_MESSAGE("Could not decompress the compressed data, original and restored value did not match.",
+    CPPUNIT_ASSERT_EQUAL( i, value_size );
-                           i == value_size && bValueEq);
+    CPPUNIT_ASSERT( bValueEq );
 }
 
 wxZlibInputStream *zlibStream::DoCreateInStream()

tests/strings/strings.cpp

@@ -1124,11 +1124,11 @@ void StringTestCase::ScopedBuffers()
     // but assigning it to wxCharBuffer makes a full copy
     wxCharBuffer buf(sbuf);
     CPPUNIT_ASSERT( buf.data() != literal );
-    CPPUNIT_ASSERT_EQUAL( literal, buf.data() );
+    CPPUNIT_ASSERT_EQUAL( std::string(literal), buf.data() );
 
     wxCharBuffer buf2 = sbuf;
     CPPUNIT_ASSERT( buf2.data() != literal );
-    CPPUNIT_ASSERT_EQUAL( literal, buf.data() );
+    CPPUNIT_ASSERT_EQUAL( std::string(literal), buf.data() );
 
     // Check that extending the buffer keeps it NUL-terminated.
     size_t len = 10;

tests/test.bkl

@@ -10,8 +10,7 @@
     <include file="../build/bakefiles/common_samples.bkl"/>
 
     <template id="wx_test">
-        <cppflags>$(CPPUNIT_CFLAGS)</cppflags>
+        <include>$(TOP_SRCDIR)3rdparty/catch/include</include>
-        <ldflags>$(CPPUNIT_LIBS)</ldflags>
 
         <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
             <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
@@ -85,7 +84,6 @@
             strings/crt.cpp
             strings/vsnprintf.cpp
             strings/hexconv.cpp
-            streams/bstream.cpp
             streams/datastreamtest.cpp
             streams/ffilestream.cpp
             streams/fileback.cpp

tests/test.cpp

@@ -11,35 +11,41 @@
 // ----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h"
-// and "wx/cppunit.h"
+// and "catch.hpp"
 #include "testprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
+// Suppress some warnings in catch_impl.hpp.
+wxCLANG_WARNING_SUPPRESS(missing-braces)
+wxCLANG_WARNING_SUPPRESS(logical-op-parentheses)
+
+// This file needs to get the CATCH definitions in addition to the usual
+// assertion macros declarations from catch.hpp included by testprec.h.
+// Including an internal file like this is ugly, but there doesn't seem to be
+// any better way, see https://github.com/philsquared/Catch/issues/1061
+#include "internal/catch_impl.hpp"
+
+wxCLANG_WARNING_RESTORE(missing-braces)
+wxCLANG_WARNING_RESTORE(logical-op-parentheses)
+
+// This probably could be done by predefining CLARA_CONFIG_MAIN, but at the
+// point where we are, just define this global variable manually.
+namespace Catch { namespace Clara { UnpositionalTag _; } }
+
+// Also define our own global variables.
+namespace wxPrivate
+{
+std::string wxTheCurrentTestClass, wxTheCurrentTestMethod;
+}
+
 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
 
-#include "wx/beforestd.h"
-#ifdef __VISUALC__
-    #pragma warning(disable:4100)
-#endif
-
-#include <cppunit/TestListener.h>
-#include <cppunit/Protector.h>
-#include <cppunit/Test.h>
-#include <cppunit/TestResult.h>
-#include <cppunit/TestFailure.h>
-#include <cppunit/TestResultCollector.h>
-
-#ifdef __VISUALC__
-    #pragma warning(default:4100)
-#endif
-#include "wx/afterstd.h"
-
 #include "wx/cmdline.h"
 #include <exception>
 #include <iostream>
@@ -65,11 +71,6 @@
 
 using namespace std;
 
-using CppUnit::Test;
-using CppUnit::TestSuite;
-using CppUnit::TestFactoryRegistry;
-
-
 // ----------------------------------------------------------------------------
 // helper classes
 // ----------------------------------------------------------------------------
@@ -86,6 +87,11 @@ struct CrtAssertFailure
     wxDECLARE_NO_ASSIGN_CLASS(CrtAssertFailure);
 };
 
+CATCH_TRANSLATE_EXCEPTION(CrtAssertFailure& e)
+{
+    return "CRT assert failure: " + e.m_msg.ToStdString(wxConvUTF8);
+}
+
 #endif // wxUSE_VC_CRTDBG
 
 #if wxDEBUG_LEVEL
@@ -156,160 +162,12 @@ static void TestAssertHandler(const wxString& file,
     _exit(-1);
 }
 
-#endif // wxDEBUG_LEVEL
+CATCH_TRANSLATE_EXCEPTION(TestAssertFailure& e)
-
-// this function should only be called from a catch clause
-static string GetExceptionMessage()
 {
-    wxString msg;
+    return e.m_msg.ToStdString(wxConvUTF8);
-
-    try
-    {
-        throw;
-    }
-#if wxDEBUG_LEVEL
-    catch ( TestAssertFailure& )
-    {
-        msg = s_lastAssertMessage;
-        s_lastAssertMessage.clear();
-    }
-#endif // wxDEBUG_LEVEL
-#ifdef wxUSE_VC_CRTDBG
-    catch ( CrtAssertFailure& e )
-    {
-        msg << "CRT assert failure: " << e.m_msg;
-    }
-#endif // wxUSE_VC_CRTDBG
-    catch ( std::exception& e )
-    {
-        msg << "std::exception: " << e.what();
-    }
-    catch ( ... )
-    {
-        msg = "Unknown exception caught.";
-    }
-
-    return string(msg.mb_str());
 }
 
-// Protector adding handling of wx-specific (this includes MSVC debug CRT in
+#endif // wxDEBUG_LEVEL
-// this context) exceptions
-class wxUnitTestProtector : public CppUnit::Protector
-{
-public:
-    virtual bool protect(const CppUnit::Functor &functor,
-                         const CppUnit::ProtectorContext& context)
-    {
-        try
-        {
-            return functor();
-        }
-        catch ( std::exception& )
-        {
-            // cppunit deals with the standard exceptions itself, let it do as
-            // it output more details (especially for std::exception-derived
-            // CppUnit::Exception) than we do
-            throw;
-        }
-        catch ( ... )
-        {
-            reportError(context, CppUnit::Message("Uncaught exception",
-                                                  GetExceptionMessage()));
-        }
-
-        return false;
-    }
-};
-
-// Displays the test name before starting to execute it: this helps with
-// diagnosing where exactly does a test crash or hang when/if it does.
-class DetailListener : public CppUnit::TestListener
-{
-public:
-    DetailListener() :
-        CppUnit::TestListener(),
-        m_verboseLogging(false),
-        m_timing(false)
-    {
-    }
-
-    void EnableVerboseLog(bool withTimings)
-    {
-        m_verboseLogging = true;
-        m_timing = withTimings;
-    }
-
-    // May return empty string if not running any tests currently.
-    static const char* GetCurrentTest() { return ms_currentTest.c_str(); }
-
-    virtual void startTest(CppUnit::Test *test)
-    {
-        ms_currentTest = test->getName();
-
-        if ( m_verboseLogging )
-        {
-            printf("  %-60s  ", ms_currentTest.c_str());
-            m_result = RESULT_OK;
-
-            if ( m_timing )
-                m_watch.Start();
-        }
-    }
-
-    virtual void addFailure(const CppUnit::TestFailure& failure)
-    {
-        m_result = failure.isError() ? RESULT_ERROR : RESULT_FAIL;
-    }
-
-    virtual void endTest(CppUnit::Test * WXUNUSED(test))
-    {
-        if ( m_verboseLogging )
-        {
-            if ( m_timing )
-                m_watch.Pause();
-            printf("%s", GetResultStr(m_result));
-            if (m_timing)
-                printf("  %6ld ms", m_watch.Time());
-            printf("\n");
-        }
-
-        ms_currentTest.clear();
-    }
-
-protected :
-    enum ResultType
-    {
-        RESULT_OK = 0,
-        RESULT_FAIL,
-        RESULT_ERROR,
-        RESULT_MAX
-    };
-
-    const char* GetResultStr(ResultType type) const
-    {
-        static const char *resultTypeNames[] =
-        {
-            "  OK",
-            "FAIL",
-            " ERR"
-        };
-
-        wxCOMPILE_TIME_ASSERT( WXSIZEOF(resultTypeNames) == RESULT_MAX,
-                               ResultTypeNamesMismatch );
-
-        return resultTypeNames[type];
-    }
-
-    bool m_verboseLogging;
-    bool m_timing;
-    wxStopWatch m_watch;
-    ResultType m_result;
-
-private:
-    static string ms_currentTest;
-};
-
-string DetailListener::ms_currentTest;
 
 #if wxUSE_GUI
     typedef wxApp TestAppBase;
@@ -325,8 +183,6 @@ public:
     TestApp();
 
     // standard overrides
-    virtual void OnInitCmdLine(wxCmdLineParser& parser);
-    virtual bool OnCmdLineParsed(wxCmdLineParser& parser);
     virtual bool OnInit();
     virtual int  OnExit();
 
@@ -385,30 +241,11 @@ public:
 #endif // wxUSE_GUI/!wxUSE_GUI
 
 private:
-    void List(Test *test, const string& parent = "") const;
-
-    // call List() if m_list or runner.addTest() otherwise
-    void AddTest(CppUnit::TestRunner& runner, Test *test)
-    {
-        if (m_list)
-            List(test);
-        else
-            runner.addTest(test);
-    }
-
     int RunTests();
 
     // flag telling us whether we should run tests from our EVT_IDLE handler
     bool m_runTests;
 
-    // command lines options/parameters
-    bool m_list;
-    bool m_longlist;
-    bool m_detail;
-    bool m_timing;
-    wxArrayString m_registries;
-    wxLocale *m_locale;
-
     // event handling hooks
     FilterEventFunc m_filterEventFunc;
     ProcessEventFunc m_processEventFunc;
@@ -452,16 +289,7 @@ int main(int argc, char **argv)
     _CrtSetReportHook(TestCrtReportHook);
 #endif // wxUSE_VC_CRTDBG
 
-    try
+    return wxEntry(argc, argv);
-    {
-        return wxEntry(argc, argv);
-    }
-    catch ( ... )
-    {
-        cerr << "\n" << GetExceptionMessage() << endl;
-    }
-
-    return -1;
 }
 
 extern void SetFilterEventFunc(FilterEventFunc func)
@@ -530,26 +358,6 @@ extern bool IsAutomaticTest()
     return s_isAutomatic == 1;
 }
 
-// helper of RunTests(): gets the test with the given name, returning NULL (and
-// not an empty test suite) if there is no such test
-static Test *GetTestByName(const wxString& name)
-{
-    Test *
-      test = TestFactoryRegistry::getRegistry(string(name.mb_str())).makeTest();
-    if ( test )
-    {
-        TestSuite * const suite = dynamic_cast<TestSuite *>(test);
-        if ( !suite || !suite->countTestCases() )
-        {
-            // it's a bogus test, don't use it
-            delete test;
-            test = NULL;
-        }
-    }
-
-    return test;
-}
-
 #if wxUSE_GUI
 
 void DeleteTestWindow(wxWindow* win)
@@ -578,7 +386,7 @@ wxTestGLogHandler(const gchar* domain,
                   gpointer data)
 {
     fprintf(stderr, "** GTK log message while running %s(): ",
-            DetailListener::GetCurrentTest());
+            wxGetCurrentTestName().c_str());
 
     g_log_default_handler(domain, level, message, data);
 }
@@ -592,16 +400,12 @@ wxTestGLogHandler(const gchar* domain,
 // ----------------------------------------------------------------------------
 
 TestApp::TestApp()
-  : m_list(false),
-    m_longlist(false)
 {
     m_runTests = true;
 
     m_filterEventFunc = NULL;
     m_processEventFunc = NULL;
 
-    m_locale = NULL;
-
 #if wxUSE_GUI
     m_exitcode = EXIT_SUCCESS;
 #endif // wxUSE_GUI
@@ -611,8 +415,7 @@ TestApp::TestApp()
 //
 bool TestApp::OnInit()
 {
-    if ( !TestAppBase::OnInit() )
+    // Hack: don't call TestAppBase::OnInit() to let CATCH handle command line.
-        return false;
 
     // Output some important information about the test environment.
 #if wxUSE_GUI
@@ -622,14 +425,9 @@ bool TestApp::OnInit()
 #endif
          << "build: " << WX_BUILD_OPTIONS_SIGNATURE << "\n"
          << "running under " << wxGetOsDescription()
-         << " as " << wxGetUserId();
+         << " as " << wxGetUserId()
-
+         << ", locale is " << setlocale(LC_ALL, NULL)
-    if ( m_detail )
+         << std::endl;
-    {
-        cout << ", locale is " << setlocale(LC_ALL, NULL);
-    }
-
-    cout << std::endl;
 
 #if wxUSE_GUI
     // create a parent window to be used as parent for the GUI controls
@@ -646,72 +444,6 @@ bool TestApp::OnInit()
     return true;
 }
 
-// The table of command line options
-//
-void TestApp::OnInitCmdLine(wxCmdLineParser& parser)
-{
-    TestAppBase::OnInitCmdLine(parser);
-
-    static const wxCmdLineEntryDesc cmdLineDesc[] = {
-        { wxCMD_LINE_SWITCH, "l", "list",
-            "list the test suites, do not run them",
-            wxCMD_LINE_VAL_NONE, 0 },
-        { wxCMD_LINE_SWITCH, "L", "longlist",
-            "list the test cases, do not run them",
-            wxCMD_LINE_VAL_NONE, 0 },
-        { wxCMD_LINE_SWITCH, "d", "detail",
-            "print the test case names, run them",
-            wxCMD_LINE_VAL_NONE, 0 },
-        { wxCMD_LINE_SWITCH, "t", "timing",
-            "print names and measure running time of individual test, run them",
-            wxCMD_LINE_VAL_NONE, 0 },
-        { wxCMD_LINE_OPTION, "", "locale",
-            "locale to use when running the program",
-            wxCMD_LINE_VAL_STRING, 0 },
-        { wxCMD_LINE_PARAM, NULL, NULL, "REGISTRY", wxCMD_LINE_VAL_STRING,
-            wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },
-        wxCMD_LINE_DESC_END
-    };
-
-    parser.SetDesc(cmdLineDesc);
-}
-
-// Handle command line options
-//
-bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser)
-{
-    if (parser.GetParamCount())
-    {
-        for (size_t i = 0; i < parser.GetParamCount(); i++)
-            m_registries.push_back(parser.GetParam(i));
-    }
-
-    m_longlist = parser.Found("longlist");
-    m_list = m_longlist || parser.Found("list");
-    m_timing = parser.Found("timing");
-    m_detail = !m_timing && parser.Found("detail");
-
-    wxString loc;
-    if ( parser.Found("locale", &loc) )
-    {
-        const wxLanguageInfo * const info = wxLocale::FindLanguageInfo(loc);
-        if ( !info )
-        {
-            cerr << "Locale \"" << string(loc.mb_str()) << "\" is unknown.\n";
-            return false;
-        }
-
-        m_locale = new wxLocale(info->Language);
-        if ( !m_locale->IsOk() )
-        {
-            cerr << "Using locale \"" << string(loc.mb_str()) << "\" failed.\n";
-            return false;
-        }
-    }
-
-    return TestAppBase::OnCmdLineParsed(parser);
-}
-
 // Event handling
 int TestApp::FilterEvent(wxEvent& event)
 {
@@ -741,118 +473,17 @@ int TestApp::RunTests()
     bool verbose = false;
 #endif
 
-    CppUnit::TextTestRunner runner;
+    // Cast is needed under MSW where Catch also provides an overload taking
-
+    // wchar_t, but as it simply converts arguments to char internally anyhow,
-    if ( m_registries.empty() )
+    // we can just as well always use the char version.
-    {
+    return Catch::Session().run(argc, static_cast<char**>(argv));
-        // run or list all tests which use the CPPUNIT_TEST_SUITE_REGISTRATION() macro
-        // (i.e. those registered in the "All tests" registry); if there are other
-        // tests not registered with the CPPUNIT_TEST_SUITE_REGISTRATION() macro
-        // then they won't be listed/run!
-        AddTest(runner, TestFactoryRegistry::getRegistry().makeTest());
-
-        if (m_list)
-        {
-            cout << "\nNote that the list above is not complete as it doesn't include the \n";
-            cout << "tests disabled by default.\n";
-        }
-    }
-    else // run only the selected tests
-    {
-        for (size_t i = 0; i < m_registries.size(); i++)
-        {
-            const wxString reg = m_registries[i];
-            Test *test = GetTestByName(reg);
-
-            if ( !test && !reg.EndsWith("TestCase") )
-            {
-                test = GetTestByName(reg + "TestCase");
-            }
-
-            if ( !test )
-            {
-                cerr << "No such test suite: " << string(reg.mb_str()) << endl;
-                return 2;
-            }
-
-            AddTest(runner, test);
-        }
-    }
-
-    if ( m_list )
-        return EXIT_SUCCESS;
-
-    runner.setOutputter(new CppUnit::CompilerOutputter(&runner.result(), cout));
-
-    // there is a bug
-    // (http://sf.net/tracker/index.php?func=detail&aid=1649369&group_id=11795&atid=111795)
-    // in some versions of cppunit: they write progress dots to cout (and not
-    // cerr) and don't flush it so all the dots appear at once at the end which
-    // is not very useful so unbuffer cout to work around this
-    cout.setf(ios::unitbuf);
-
-    // add detail listener if needed
-    DetailListener detailListener;
-    if ( m_detail || m_timing )
-        detailListener.EnableVerboseLog(m_timing);
-    runner.eventManager().addListener(&detailListener);
-
-    // finally ensure that we report our own exceptions nicely instead of
-    // giving "uncaught exception of unknown type" messages
-    runner.eventManager().pushProtector(new wxUnitTestProtector);
-
-    bool printProgress = !(verbose || m_detail || m_timing);
-    runner.run("", false, true, printProgress);
-
-    return runner.result().testFailures() == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
 int TestApp::OnExit()
 {
-    delete m_locale;
-
 #if wxUSE_GUI
     delete GetTopWindow();
 #endif // wxUSE_GUI
 
     return TestAppBase::OnExit();
 }
-
-// List the tests
-//
-void TestApp::List(Test *test, const string& parent /*=""*/) const
-{
-    TestSuite *suite = dynamic_cast<TestSuite*>(test);
-    string name;
-
-    if (suite) {
-        // take the last component of the name and append to the parent
-        name = test->getName();
-        string::size_type i = name.find_last_of(".:");
-        if (i != string::npos)
-            name = name.substr(i + 1);
-        name = parent + "." + name;
-
-        // drop the 1st component from the display and indent
-        if (parent != "") {
-            string::size_type j = i = name.find('.', 1);
-            while ((j = name.find('.', j + 1)) != string::npos)
-                cout << "  ";
-            cout << "  " << name.substr(i + 1) << "\n";
-        }
-
-        typedef vector<Test*> Tests;
-        typedef Tests::const_iterator Iter;
-
-        const Tests& tests = suite->getTests();
-
-        for (Iter it = tests.begin(); it != tests.end(); ++it)
-            List(*it, name);
-    }
-    else if (m_longlist) {
-        string::size_type i = 0;
-        while ((i = parent.find('.', i + 1)) != string::npos)
-            cout << "  ";
-        cout << "  " << test->getName() << "\n";
-    }
-}

tests/test.vcxproj

@@ -129,12 +129,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wxbase$(wxShortVersionString)ud_net.lib;wxbase$(wxShortVersionString)ud_xml.lib;wxbase$(wxShortVersionString)ud.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -170,12 +170,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -191,7 +191,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wxbase$(wxShortVersionString)u_net.lib;wxbase$(wxShortVersionString)u_xml.lib;wxbase$(wxShortVersionString)u.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -211,12 +211,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
     <Midl>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -234,7 +234,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wxbase$(wxShortVersionString)ud_net.lib;wxbase$(wxShortVersionString)ud_xml.lib;wxbase$(wxShortVersionString)ud.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -252,12 +252,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
     <Midl>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -273,7 +273,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wxbase$(wxShortVersionString)u_net.lib;wxbase$(wxShortVersionString)u_xml.lib;wxbase$(wxShortVersionString)u.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -293,12 +293,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -316,7 +316,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wxbase$(wxShortVersionString)ud_net.lib;wxbase$(wxShortVersionString)ud_xml.lib;wxbase$(wxShortVersionString)ud.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -334,12 +334,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -355,7 +355,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wxbase$(wxShortVersionString)u_net.lib;wxbase$(wxShortVersionString)u_xml.lib;wxbase$(wxShortVersionString)u.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -375,12 +375,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
     <Midl>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -398,7 +398,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wxbase$(wxShortVersionString)ud_net.lib;wxbase$(wxShortVersionString)ud_xml.lib;wxbase$(wxShortVersionString)ud.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -416,12 +416,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
     <Midl>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -437,7 +437,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wxbase$(wxShortVersionString)u_net.lib;wxbase$(wxShortVersionString)u_xml.lib;wxbase$(wxShortVersionString)u.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -511,7 +511,6 @@
     <ClCompile Include="regex\regextest.cpp" />
     <ClCompile Include="regex\wxregextest.cpp" />
     <ClCompile Include="scopeguard\scopeguardtest.cpp" />
-    <ClCompile Include="streams\bstream.cpp" />
     <ClCompile Include="streams\datastreamtest.cpp" />
     <ClCompile Include="streams\ffilestream.cpp" />
     <ClCompile Include="streams\fileback.cpp" />
@@ -554,4 +553,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

tests/test.vcxproj.filters

@@ -22,9 +22,6 @@
     <ClCompile Include="base64\base64.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="streams\bstream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="cmdline\cmdlinetest.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -266,4 +263,4 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
+</Project>

tests/test_gui.vcxproj

@@ -128,12 +128,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -151,7 +151,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wxmsw$(wxShortVersionString)ud_webview.lib;wxmsw$(wxShortVersionString)ud_richtext.lib;wxmsw$(wxShortVersionString)ud_media.lib;wxmsw$(wxShortVersionString)ud_xrc.lib;wxbase$(wxShortVersionString)ud_xml.lib;wxmsw$(wxShortVersionString)ud_adv.lib;wxmsw$(wxShortVersionString)ud_html.lib;wxmsw$(wxShortVersionString)ud_core.lib;wxbase$(wxShortVersionString)ud_net.lib;wxbase$(wxShortVersionString)ud.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -169,12 +169,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -190,7 +190,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wxmsw$(wxShortVersionString)u_webview.lib;wxmsw$(wxShortVersionString)u_richtext.lib;wxmsw$(wxShortVersionString)u_media.lib;wxmsw$(wxShortVersionString)u_xrc.lib;wxbase$(wxShortVersionString)u_xml.lib;wxmsw$(wxShortVersionString)u_adv.lib;wxmsw$(wxShortVersionString)u_html.lib;wxmsw$(wxShortVersionString)u_core.lib;wxbase$(wxShortVersionString)u_net.lib;wxbase$(wxShortVersionString)u.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -210,12 +210,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
     <Midl>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -233,7 +233,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wxmsw$(wxShortVersionString)ud_webview.lib;wxmsw$(wxShortVersionString)ud_richtext.lib;wxmsw$(wxShortVersionString)ud_media.lib;wxmsw$(wxShortVersionString)ud_xrc.lib;wxbase$(wxShortVersionString)ud_xml.lib;wxmsw$(wxShortVersionString)ud_adv.lib;wxmsw$(wxShortVersionString)ud_html.lib;wxmsw$(wxShortVersionString)ud_core.lib;wxbase$(wxShortVersionString)ud_net.lib;wxbase$(wxShortVersionString)ud.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -251,12 +251,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
     <Midl>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -272,7 +272,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wxmsw$(wxShortVersionString)u_webview.lib;wxmsw$(wxShortVersionString)u_richtext.lib;wxmsw$(wxShortVersionString)u_media.lib;wxmsw$(wxShortVersionString)u_xrc.lib;wxbase$(wxShortVersionString)u_xml.lib;wxmsw$(wxShortVersionString)u_adv.lib;wxmsw$(wxShortVersionString)u_html.lib;wxmsw$(wxShortVersionString)u_core.lib;wxbase$(wxShortVersionString)u_net.lib;wxbase$(wxShortVersionString)u.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -292,12 +292,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -315,7 +315,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wxmsw$(wxShortVersionString)ud_webview.lib;wxmsw$(wxShortVersionString)ud_richtext.lib;wxmsw$(wxShortVersionString)ud_media.lib;wxmsw$(wxShortVersionString)ud_xrc.lib;wxbase$(wxShortVersionString)ud_xml.lib;wxmsw$(wxShortVersionString)ud_adv.lib;wxmsw$(wxShortVersionString)ud_html.lib;wxmsw$(wxShortVersionString)ud_core.lib;wxbase$(wxShortVersionString)ud_net.lib;wxbase$(wxShortVersionString)ud.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -333,12 +333,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -354,7 +354,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wxmsw$(wxShortVersionString)u_webview.lib;wxmsw$(wxShortVersionString)u_richtext.lib;wxmsw$(wxShortVersionString)u_media.lib;wxmsw$(wxShortVersionString)u_xrc.lib;wxbase$(wxShortVersionString)u_xml.lib;wxmsw$(wxShortVersionString)u_adv.lib;wxmsw$(wxShortVersionString)u_html.lib;wxmsw$(wxShortVersionString)u_core.lib;wxbase$(wxShortVersionString)u_net.lib;wxbase$(wxShortVersionString)u.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -374,12 +374,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
     <Midl>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -397,7 +397,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wxmsw$(wxShortVersionString)ud_webview.lib;wxmsw$(wxShortVersionString)ud_richtext.lib;wxmsw$(wxShortVersionString)ud_media.lib;wxmsw$(wxShortVersionString)ud_xrc.lib;wxbase$(wxShortVersionString)ud_xml.lib;wxmsw$(wxShortVersionString)ud_adv.lib;wxmsw$(wxShortVersionString)ud_html.lib;wxmsw$(wxShortVersionString)ud_core.lib;wxbase$(wxShortVersionString)ud_net.lib;wxbase$(wxShortVersionString)ud.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -415,12 +415,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
     <Midl>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </Midl>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -436,7 +436,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wxmsw$(wxShortVersionString)u_webview.lib;wxmsw$(wxShortVersionString)u_richtext.lib;wxmsw$(wxShortVersionString)u_media.lib;wxmsw$(wxShortVersionString)u_xrc.lib;wxbase$(wxShortVersionString)u_xml.lib;wxmsw$(wxShortVersionString)u_adv.lib;wxmsw$(wxShortVersionString)u_html.lib;wxmsw$(wxShortVersionString)u_core.lib;wxbase$(wxShortVersionString)u_net.lib;wxbase$(wxShortVersionString)u.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -562,4 +562,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

tests/test_vc7_test.vcproj

@@ -27,7 +27,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
@@ -61,7 +61,7 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -72,7 +72,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -95,7 +95,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
@@ -128,7 +128,7 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -139,7 +139,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -162,7 +162,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
@@ -196,7 +196,7 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -207,7 +207,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -230,7 +230,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
@@ -263,7 +263,7 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -274,7 +274,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -310,9 +310,6 @@
 			<File
 				RelativePath=".\base64\base64.cpp">
 			</File>
-			<File
-				RelativePath=".\streams\bstream.cpp">
-			</File>
 			<File
 				RelativePath=".\cmdline\cmdlinetest.cpp">
 			</File>

tests/test_vc7_test_drawing.vcproj

@@ -27,7 +27,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
@@ -61,7 +61,7 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -72,7 +72,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -95,7 +95,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
@@ -128,7 +128,7 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -139,7 +139,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -162,7 +162,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
@@ -196,7 +196,7 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -207,7 +207,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -230,7 +230,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
@@ -263,7 +263,7 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -274,7 +274,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool

tests/test_vc7_test_gui.vcproj

@@ -27,7 +27,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
@@ -61,7 +61,7 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"/>
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -72,7 +72,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"/>
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -95,7 +95,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
@@ -128,7 +128,7 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"/>
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -139,7 +139,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"/>
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -162,7 +162,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
@@ -196,7 +196,7 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"/>
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -207,7 +207,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"/>
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -230,7 +230,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
@@ -263,7 +263,7 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"/>
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -274,7 +274,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"/>
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool

tests/test_vc8_test.vcproj

@@ -48,12 +48,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -78,7 +78,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -148,12 +148,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -175,7 +175,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -247,12 +247,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -277,7 +277,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -347,12 +347,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -374,7 +374,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -446,12 +446,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -476,7 +476,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -546,12 +546,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -573,7 +573,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -645,12 +645,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -675,7 +675,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -745,12 +745,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -772,7 +772,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -850,10 +850,6 @@
 				RelativePath=".\base64\base64.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\streams\bstream.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\cmdline\cmdlinetest.cpp"
 				>

tests/test_vc8_test_drawing.vcproj

@@ -48,12 +48,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -78,7 +78,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -148,12 +148,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -175,7 +175,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -247,12 +247,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -277,7 +277,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -347,12 +347,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -374,7 +374,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -446,12 +446,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -476,7 +476,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -546,12 +546,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -573,7 +573,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -645,12 +645,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -675,7 +675,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -745,12 +745,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -772,7 +772,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"

tests/test_vc8_test_gui.vcproj

@@ -48,12 +48,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -78,7 +78,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -148,12 +148,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -175,7 +175,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -247,12 +247,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -277,7 +277,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -347,12 +347,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -374,7 +374,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -446,12 +446,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -476,7 +476,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -546,12 +546,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -573,7 +573,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -645,12 +645,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -675,7 +675,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -745,12 +745,12 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -772,7 +772,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"

tests/test_vc9_test.vcproj

@@ -48,13 +48,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -77,7 +77,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -144,13 +144,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -171,7 +171,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -240,13 +240,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -269,7 +269,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -336,13 +336,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -363,7 +363,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -432,13 +432,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -461,7 +461,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -528,13 +528,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -555,7 +555,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -624,13 +624,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -653,7 +653,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -720,13 +720,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -747,7 +747,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -822,10 +822,6 @@
 				RelativePath=".\base64\base64.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\streams\bstream.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\cmdline\cmdlinetest.cpp"
 				>

tests/test_vc9_test_drawing.vcproj

@@ -48,13 +48,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -77,7 +77,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -144,13 +144,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -171,7 +171,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -240,13 +240,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -269,7 +269,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -336,13 +336,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -363,7 +363,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -432,13 +432,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -461,7 +461,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -528,13 +528,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -555,7 +555,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -624,13 +624,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -653,7 +653,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -720,13 +720,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -747,7 +747,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;."
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"

tests/test_vc9_test_gui.vcproj

@@ -48,13 +48,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -77,7 +77,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -144,13 +144,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -171,7 +171,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -240,13 +240,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -269,7 +269,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -336,13 +336,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -363,7 +363,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -432,13 +432,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -461,7 +461,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -528,13 +528,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -555,7 +555,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_lib\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -624,13 +624,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -653,7 +653,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswud;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -720,13 +720,13 @@
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -747,7 +747,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\samples"
+				AdditionalIncludeDirectories=".\..\lib\vc_x64_dll\mswu;.\..\include;.;.\..\samples;.\..\3rdparty\catch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"

tests/testdate.h

@@ -41,6 +41,5 @@ inline std::ostream& operator<<(std::ostream& ostr, const wxTimeSpan& span)
 
     return ostr;
 }
-WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxDateTime::wxDateTime_t)
 
 #endif // _WX_TESTS_TESTDATE_H_

tests/testimage.h

@@ -11,33 +11,54 @@
 
 #include "wx/image.h"
 
-CPPUNIT_NS_BEGIN
+namespace Catch
-
-template <>
-struct assertion_traits<wxImage>
 {
-    static bool equal(const wxImage& i1, const wxImage& i2)
+    template <>
+    struct StringMaker<wxImage>
     {
-        if ( i1.GetWidth() != i2.GetWidth() )
+        static std::string convert(const wxImage& image)
-            return false;
+        {
+            return wxString::Format("image of size %d*%d with%s alpha",
+                                    image.GetWidth(),
+                                    image.GetHeight(),
+                                    image.HasAlpha() ? "" : "out")
+                    .ToStdString();
+        }
+    };
+}
 
-        if ( i1.GetHeight() != i2.GetHeight() )
+class ImageRGBMatcher : public Catch::MatcherBase<wxImage>
-            return false;
+{
-
+public:
-        return memcmp(i1.GetData(), i2.GetData(),
+    ImageRGBMatcher(const wxImage& image)
-                      i1.GetWidth()*i1.GetHeight()*3) == 0;
+        : m_image(image)
+    {
     }
 
-    static std::string toString(const wxImage& image)
+    bool match(const wxImage& other) const wxOVERRIDE
     {
-        return wxString::Format("image of size %d*%d with%s alpha",
+        if ( other.GetWidth() != m_image.GetWidth() )
-                                image.GetWidth(),
+            return false;
-                                image.GetHeight(),
+
-                                image.HasAlpha() ? "" : "out")
+        if ( other.GetHeight() != m_image.GetHeight() )
-                .ToStdString();
+            return false;
+
+        return memcmp(other.GetData(), m_image.GetData(),
+                      other.GetWidth()*other.GetHeight()*3) == 0;
     }
+
+    std::string describe() const wxOVERRIDE
+    {
+        return "has same RGB data as " + Catch::toString(m_image);
+    }
+
+private:
+    const wxImage m_image;
 };
 
-CPPUNIT_NS_END
+inline ImageRGBMatcher RGBSameAs(const wxImage& image)
+{
+    return ImageRGBMatcher(image);
+}
 
 #endif // _WX_TESTS_TESTIMAGE_H_

tests/testprec.h

@@ -4,7 +4,7 @@
 #include "wx/wxprec.h"
 #include "wx/stopwatch.h"
 #include "wx/evtloop.h"
-#include "wx/cppunit.h"
+#include "wx/catch_cppunit.h"
 
 // Custom test macro that is only defined when wxUIActionSimulator is available
 // this allows the tests that do not rely on it to run on platforms that don't
@@ -173,21 +173,9 @@ void DeleteTestWindow(wxWindow* win);
 
 #endif // wxUSE_GUI
 
-// Macro that can be used to register the test with the given name in both the
+// Convenience macro which registers a test case using just its "base" name,
-// global unnamed registry so that it is ran by default and a registry with the
+// i.e. without the common "TestCase" suffix, as its tag.
-// same name as this test to allow running just this test individually.
+#define wxREGISTER_UNIT_TEST(testclass) \
-//
+    wxREGISTER_UNIT_TEST_WITH_TAGS(testclass ## TestCase, "[" #testclass "]")
-// Notice that the name shouldn't include the "TestCase" suffix, it's added
-// automatically by this macro.
-//
-// Implementation note: CPPUNIT_TEST_SUITE_[NAMED_]REGISTRATION macros can't be
-// used here because they both declare the variable with the same name (as the
-// "unique" name they generate is based on the line number which is the same
-// for both calls inside the macro), so we need to do it manually.
-#define wxREGISTER_UNIT_TEST(name) \
-    static CPPUNIT_NS::AutoRegisterSuite< name##TestCase > \
-        CPPUNIT_MAKE_UNIQUE_NAME( autoRegisterRegistry__ ); \
-    static CPPUNIT_NS::AutoRegisterSuite< name##TestCase > \
-        CPPUNIT_MAKE_UNIQUE_NAME( autoRegisterNamedRegistry__ )(#name "TestCase")
 
 #endif

tests/thread/queue.cpp

@@ -195,20 +195,22 @@ void *QueueTestCase::MyThread::Entry()
                 if ( res == wxMSGQUEUE_MISC_ERROR )
                     return (wxThread::ExitCode)wxMSGQUEUE_MISC_ERROR;
 
-                CPPUNIT_ASSERT_EQUAL( wxMSGQUEUE_NO_ERROR, res );
+                // We can't use Catch asserts outside of the main thread
+                // currently, unfortunately.
+                wxASSERT( res == wxMSGQUEUE_NO_ERROR );
             }
             ++messagesReceived;
             continue;
         }
 
-        CPPUNIT_ASSERT_EQUAL ( result, wxMSGQUEUE_TIMEOUT );
+        wxASSERT( result == wxMSGQUEUE_TIMEOUT );
 
         break;
     }
 
     if ( messagesReceived != m_maxMsgCount )
     {
-        CPPUNIT_ASSERT_EQUAL( m_type, WaitWithTimeout );
+        wxASSERT( m_type == WaitWithTimeout );
 
         return (wxThread::ExitCode)wxMSGQUEUE_TIMEOUT;
     }

tests/thread/tls.cpp

@@ -22,6 +22,8 @@
 #include "wx/thread.h"
 #include "wx/tls.h"
 
+#include <string>
+
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
@@ -61,8 +63,10 @@ public:
         gs_threadData.name = "worker";
         gs_threadData.number = 2;
 
-        CPPUNIT_ASSERT_EQUAL( "worker", gs_threadData.name );
+        // We can't use Catch asserts outside of the main thread,
-        CPPUNIT_ASSERT_EQUAL( 2, gs_threadData.number );
+        // unfortunately.
+        wxASSERT( gs_threadData.name == std::string("worker") );
+        wxASSERT( gs_threadData.number == 2 );
 
         return NULL;
     }
@@ -111,7 +115,7 @@ void TLSTestCase::TestInt()
 
 void TLSTestCase::TestStruct()
 {
-    CPPUNIT_ASSERT_EQUAL( "", gs_threadData.name );
+    CPPUNIT_ASSERT_EQUAL( NULL, gs_threadData.name );
     CPPUNIT_ASSERT_EQUAL( 0, gs_threadData.number );
 
     gs_threadData.name = "main";
@@ -121,7 +125,7 @@ void TLSTestCase::TestStruct()
 
     TLSTestThread().Wait();
 
-    CPPUNIT_ASSERT_EQUAL( "main", gs_threadData.name );
+    CPPUNIT_ASSERT_EQUAL( std::string("main"), gs_threadData.name );
     CPPUNIT_ASSERT_EQUAL( 1, gs_threadData.number );
 }
 

tests/uris/url.cpp

@@ -74,7 +74,8 @@ void URLTestCase::GetInputStream()
     CPPUNIT_ASSERT_EQUAL(wxURL_NOERR, url.GetError());
 
     wxInputStream *in_stream = url.GetInputStream();
-    CPPUNIT_ASSERT(in_stream && in_stream->IsOk());
+    CPPUNIT_ASSERT(in_stream);
+    CPPUNIT_ASSERT(in_stream->IsOk());
 
     wxMemoryOutputStream ostream;
     CPPUNIT_ASSERT(in_stream->Read(ostream).GetLastError() == wxSTREAM_EOF);

tests/xml/xmltest.cpp

@@ -442,7 +442,8 @@ void XmlTestCase::SetRoot()
     // Test for the problem of https://trac.wxwidgets.org/ticket/13135
     doc.SetRoot( root );
     wxXmlNode *docNode = doc.GetDocumentNode();
-    CPPUNIT_ASSERT( docNode && root == docNode->GetChildren() );
+    CPPUNIT_ASSERT( docNode );
+    CPPUNIT_ASSERT( root == docNode->GetChildren() );
     CPPUNIT_ASSERT( doc.IsOk() );
 
     // Other tests.

utils/makefile.bcc

@@ -36,8 +36,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 	-DUSE_THREADS="$(USE_THREADS)" -DUSE_CAIRO="$(USE_CAIRO)" \
 	-DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
 	-DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
-	-DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
+	-DCFG="$(CFG)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
-	-DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 ### Conditionally set variables: ###
 

utils/makefile.gcc

@@ -28,7 +28,6 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
 	USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
 	OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
 	WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
-	CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
 	RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" \
 	WINDRES="$(WINDRES)"
 

utils/makefile.vc

@@ -27,7 +27,6 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 	USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
 	OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
 	WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
-	CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
 	RUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 ### Conditionally set variables: ###