Attachment 348701 Details for Bug 175722 – Patch

[patch] Patch

bug-175722-20180831201145.patch (text/plain), 2.41 MB, created by Ross Kirsling on 2018-08-31 20:11:48 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Kirsling

Created: 2018-08-31 20:11:48 PDT

Size: 2.41 MB

patch

obsolete

>Subversion Revision: 235535
>diff --git a/Source/ThirdParty/ChangeLog b/Source/ThirdParty/ChangeLog
>index fb5114e03fc7e51f867f39abf8db20405ada9bba..66271324eb71338550c0b92e386e14c461978dfe 100644
>--- a/Source/ThirdParty/ChangeLog
>+++ b/Source/ThirdParty/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-08-30 Ross Kirsling <ross.kirsling@sony.com>
>+
>+ Update googletest
>+ https://bugs.webkit.org/show_bug.cgi?id=175722
>+
>+ Reviewed by NOBODY (OOPS!).
>+
>+ * gtest/:
>+ Update to latest (post-1.8.0).
>+
>+ * gtest/CMakeLists.txt:
>+ * gtest/xcode/:
>+ Keep our versions of these build files, making any necessary additive updates
>+ and removing WTF/JSC dependencies so that we stop forking third-party source.
>+
> 2018-07-17 Michael Catanzaro <mcatanzaro@igalia.com>
> 
> [WPE][GTK] Update xdgmime
>diff --git a/Source/ThirdParty/gtest/CHANGES b/Source/ThirdParty/gtest/CHANGES
>index e574415ee6ed81cf492be295346c444eeb10ce88..05521324212c91287d9244d44bab306db664badb 100644
>--- a/Source/ThirdParty/gtest/CHANGES
>+++ b/Source/ThirdParty/gtest/CHANGES
>@@ -1,3 +1,62 @@
>+Changes for 1.7.0:
>+
>+* New feature: death tests are supported on OpenBSD and in iOS
>+ simulator now.
>+* New feature: Google Test now implements a protocol to allow
>+ a test runner to detect that a test program has exited
>+ prematurely and report it as a failure (before it would be
>+ falsely reported as a success if the exit code is 0).
>+* New feature: Test::RecordProperty() can now be used outside of the
>+ lifespan of a test method, in which case it will be attributed to
>+ the current test case or the test program in the XML report.
>+* New feature (potentially breaking): --gtest_list_tests now prints
>+ the type parameters and value parameters for each test.
>+* Improvement: char pointers and char arrays are now escaped properly
>+ in failure messages.
>+* Improvement: failure summary in XML reports now includes file and
>+ line information.
>+* Improvement: the <testsuites> XML element now has a timestamp attribute.
>+* Improvement: When --gtest_filter is specified, XML report now doesn't
>+ contain information about tests that are filtered out.
>+* Fixed the bug where long --gtest_filter flag values are truncated in
>+ death tests.
>+* Potentially breaking change: RUN_ALL_TESTS() is now implemented as a
>+ function instead of a macro in order to work better with Clang.
>+* Compatibility fixes with C++ 11 and various platforms.
>+* Bug/warning fixes.
>+
>+Changes for 1.6.0:
>+
>+* New feature: ADD_FAILURE_AT() for reporting a test failure at the
>+ given source location -- useful for writing testing utilities.
>+* New feature: the universal value printer is moved from Google Mock
>+ to Google Test.
>+* New feature: type parameters and value parameters are reported in
>+ the XML report now.
>+* A gtest_disable_pthreads CMake option.
>+* Colored output works in GNU Screen sessions now.
>+* Parameters of value-parameterized tests are now printed in the
>+ textual output.
>+* Failures from ad hoc test assertions run before RUN_ALL_TESTS() are
>+ now correctly reported.
>+* Arguments of ASSERT_XY and EXPECT_XY no longer need to support << to
>+ ostream.
>+* More complete handling of exceptions.
>+* GTEST_ASSERT_XY can be used instead of ASSERT_XY in case the latter
>+ name is already used by another library.
>+* --gtest_catch_exceptions is now true by default, allowing a test
>+ program to continue after an exception is thrown.
>+* Value-parameterized test fixtures can now derive from Test and
>+ WithParamInterface<T> separately, easing conversion of legacy tests.
>+* Death test messages are clearly marked to make them more
>+ distinguishable from other messages.
>+* Compatibility fixes for Android, Google Native Client, MinGW, HP UX,
>+ PowerPC, Lucid autotools, libCStd, Sun C++, Borland C++ Builder (Code Gear),
>+ IBM XL C++ (Visual Age C++), and C++0x.
>+* Bug fixes and implementation clean-ups.
>+* Potentially incompatible changes: disables the harmful 'make install'
>+ command in autotools.
>+
> Changes for 1.5.0:
> 
> * New feature: assertions can be safely called in multiple threads
>diff --git a/Source/ThirdParty/gtest/CMakeLists.txt b/Source/ThirdParty/gtest/CMakeLists.txt
>index dd1005fe6e57c520be97f4f8052b426f0fe0568f..4307bc8b72fede6ab82f0f9537955ebbb1dd4d13 100755
>--- a/Source/ThirdParty/gtest/CMakeLists.txt
>+++ b/Source/ThirdParty/gtest/CMakeLists.txt
>@@ -1,14 +1,12 @@
> # This is an alternative CMakeLists.txt to the experimental one
> # shipped with the original package. It builds only the essential
>-# for our tests. The WebKit version of gtest needs access to some
>-# headers from WTF and JSC for configuration.
>+# for our tests.
> 
> set(GTEST_DIR "${THIRDPARTY_DIR}/gtest")
> 
> set(GTEST_INCLUDE_DIRECTORIES
> "${GTEST_DIR}"
> "${GTEST_DIR}/include"
>- "${FORWARDING_HEADERS_DIR}"
> )
> 
> set(GTEST_SOURCES
>@@ -17,6 +15,7 @@ set(GTEST_SOURCES
> ${GTEST_DIR}/src/gtest-filepath.cc
> ${GTEST_DIR}/src/gtest_main.cc
> ${GTEST_DIR}/src/gtest-port.cc
>+ ${GTEST_DIR}/src/gtest-printers.cc
> ${GTEST_DIR}/src/gtest-test-part.cc
> ${GTEST_DIR}/src/gtest-typed-test.cc
> )
>@@ -32,23 +31,11 @@ else ()
> endif ()
> 
> include_directories(${GTEST_INCLUDE_DIRECTORIES})
>-add_definitions(-DGTEST_HAS_RTTI=0)
> 
> WEBKIT_ADD_TARGET_CXX_FLAGS(gtest -Wno-undef
> -Wno-stringop-truncation
> -Wno-suggest-attribute=format)
> 
>-# FIXME: This works around compatibility problems in the old version of the third-pary
>-# googletest source code checkout. It should be removed once we upgrade to a newer version.
>-if (COMPILER_IS_CLANG)
>- add_definitions(-DGTEST_HAS_TR1_TUPLE=0)
>-endif ()
>-
>-target_link_libraries(gtest
>- WTF
>-)
>-add_dependencies(gtest JavaScriptCorePrivateForwardingHeaders)
>-
> if (CMAKE_USE_PTHREADS_INIT)
> target_link_libraries(gtest ${CMAKE_THREAD_LIBS_INIT})
> add_definitions(-DGTEST_HAS_PTHREAD=1)
>diff --git a/Source/ThirdParty/gtest/CONTRIBUTORS b/Source/ThirdParty/gtest/CONTRIBUTORS
>index 0934ae13059afcdc05df81247e61b9a84a2312e2..feae2fc04410dc308e464aa256fe1f2d31edc988 100644
>--- a/Source/ThirdParty/gtest/CONTRIBUTORS
>+++ b/Source/ThirdParty/gtest/CONTRIBUTORS
>@@ -21,6 +21,7 @@ Manuel Klimek <klimek@google.com>
> Markus Heule <markus.heule@gmail.com>
> Mika Raento <mikie@iki.fi>
> MiklÃ³s Fazekas <mfazekas@szemafor.com>
>+Pasi Valminen <pasi.valminen@gmail.com>
> Patrick Hanna <phanna@google.com>
> Patrick Riley <pfr@google.com>
> Peter Kaminski <piotrk@google.com>
>diff --git a/Source/ThirdParty/gtest/COPYING b/Source/ThirdParty/gtest/COPYING
>deleted file mode 100644
>index 1941a11f8ce94389160b458927a29ba217542818..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/COPYING
>+++ /dev/null
>@@ -1,28 +0,0 @@
>-Copyright 2008, Google Inc.
>-All rights reserved.
>-
>-Redistribution and use in source and binary forms, with or without
>-modification, are permitted provided that the following conditions are
>-met:
>-
>- * Redistributions of source code must retain the above copyright
>-notice, this list of conditions and the following disclaimer.
>- * Redistributions in binary form must reproduce the above
>-copyright notice, this list of conditions and the following disclaimer
>-in the documentation and/or other materials provided with the
>-distribution.
>- * Neither the name of Google Inc. nor the names of its
>-contributors may be used to endorse or promote products derived from
>-this software without specific prior written permission.
>-
>-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>diff --git a/Source/ThirdParty/gtest/LICENSE b/Source/ThirdParty/gtest/LICENSE
>new file mode 100644
>index 0000000000000000000000000000000000000000..1941a11f8ce94389160b458927a29ba217542818
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/LICENSE
>@@ -0,0 +1,28 @@
>+Copyright 2008, Google Inc.
>+All rights reserved.
>+
>+Redistribution and use in source and binary forms, with or without
>+modification, are permitted provided that the following conditions are
>+met:
>+
>+ * Redistributions of source code must retain the above copyright
>+notice, this list of conditions and the following disclaimer.
>+ * Redistributions in binary form must reproduce the above
>+copyright notice, this list of conditions and the following disclaimer
>+in the documentation and/or other materials provided with the
>+distribution.
>+ * Neither the name of Google Inc. nor the names of its
>+contributors may be used to endorse or promote products derived from
>+this software without specific prior written permission.
>+
>+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>diff --git a/Source/ThirdParty/gtest/Makefile.am b/Source/ThirdParty/gtest/Makefile.am
>index 8d75e32cc20cde83c174f4e078e2993a932a9d18..b44c8416ba080c2f016f166b18b42c0f73ece7be 100644
>--- a/Source/ThirdParty/gtest/Makefile.am
>+++ b/Source/ThirdParty/gtest/Makefile.am
>@@ -1,13 +1,16 @@
> # Automake file
> 
>+ACLOCAL_AMFLAGS = -I m4
>+
> # Nonstandard package files for distribution
> EXTRA_DIST = \
> CHANGES \
> CONTRIBUTORS \
>+ LICENSE \
> include/gtest/gtest-param-test.h.pump \
>+ include/gtest/internal/gtest-param-util-generated.h.pump \
> include/gtest/internal/gtest-tuple.h.pump \
> include/gtest/internal/gtest-type-util.h.pump \
>- include/gtest/internal/gtest-param-util-generated.h.pump \
> make/Makefile \
> scripts/fuse_gtest_files.py \
> scripts/gen_gtest_pred_impl.py \
>@@ -17,19 +20,21 @@ EXTRA_DIST = \
> # gtest source files that we don't compile directly. They are
> # #included by gtest-all.cc.
> GTEST_SRC = \
>- src/gtest.cc \
> src/gtest-death-test.cc \
> src/gtest-filepath.cc \
> src/gtest-internal-inl.h \
> src/gtest-port.cc \
>+ src/gtest-printers.cc \
> src/gtest-test-part.cc \
>- src/gtest-typed-test.cc
>+ src/gtest-typed-test.cc \
>+ src/gtest.cc
> 
> EXTRA_DIST += $(GTEST_SRC)
> 
> # Sample files that we don't compile.
> EXTRA_DIST += \
> samples/prime_tables.h \
>+ samples/sample1_unittest.cc \
> samples/sample2_unittest.cc \
> samples/sample3_unittest.cc \
> samples/sample4_unittest.cc \
>@@ -41,88 +46,91 @@ EXTRA_DIST += \
> 
> # C++ test files that we don't compile directly.
> EXTRA_DIST += \
>+ test/gtest-death-test_ex_test.cc \
> test/gtest-death-test_test.cc \
>- test/gtest_environment_test.cc \
> test/gtest-filepath_test.cc \
> test/gtest-linked_ptr_test.cc \
>+ test/gtest-listener_test.cc \
> test/gtest-message_test.cc \
>- test/gtest_no_test_unittest.cc \
> test/gtest-options_test.cc \
>- test/gtest-param-test_test.cc \
>- test/gtest-param-test2_test.cc \
>+ test/googletest-param-test2-test.cc \
>+ test/googletest-param-test2-test.cc \
>+ test/googletest-param-test-test.cc \
>+ test/googletest-param-test-test.cc \
> test/gtest-param-test_test.h \
> test/gtest-port_test.cc \
>+ test/gtest_premature_exit_test.cc \
>+ test/gtest-printers_test.cc \
>+ test/gtest-test-part_test.cc \
>+ test/googletest-tuple-test.cc \
>+ test/gtest-typed-test2_test.cc \
>+ test/gtest-typed-test_test.cc \
>+ test/gtest-typed-test_test.h \
>+ test/gtest-unittest-api_test.cc \
>+ test/googletest-break-on-failure-unittest_.cc \
>+ test/googletest-catch-exceptions-test_.cc \
>+ test/googletest-color-test_.cc \
>+ test/googletest-env-var-test_.cc \
>+ test/gtest_environment_test.cc \
>+ test/googletest-filter-unittest_.cc \
>+ test/gtest_help_test_.cc \
>+ test/googletest-list-tests-unittest_.cc \
>+ test/gtest_main_unittest.cc \
>+ test/gtest_no_test_unittest.cc \
>+ test/googletest-output-test_.cc \
> test/gtest_pred_impl_unittest.cc \
> test/gtest_prod_test.cc \
>- test/production.cc \
>- test/production.h \
> test/gtest_repeat_test.cc \
>+ test/googletest-shuffle-test_.cc \
> test/gtest_sole_header_test.cc \
> test/gtest_stress_test.cc \
>- test/gtest-test-part_test.cc \
> test/gtest_throw_on_failure_ex_test.cc \
>- test/gtest-typed-test_test.cc \
>- test/gtest-typed-test2_test.cc \
>- test/gtest-typed-test_test.h \
>+ test/googletest-throw-on-failure-test_.cc \
>+ test/googletest-uninitialized-test_.cc \
> test/gtest_unittest.cc \
>- test/gtest-unittest-api_test.cc \
>- test/gtest-listener_test.cc \
>- test/gtest_main_unittest.cc \
> test/gtest_unittest.cc \
>- test/gtest-tuple_test.cc \
>- test/gtest-param-test_test.cc \
>- test/gtest-param-test2_test.cc \
>- test/gtest_break_on_failure_unittest_.cc \
>- test/gtest_color_test_.cc \
>- test/gtest_env_var_test_.cc \
>- test/gtest_filter_unittest_.cc \
>- test/gtest_help_test_.cc \
>- test/gtest_list_tests_unittest_.cc \
>- test/gtest_output_test_.cc \
>- test/gtest_shuffle_test_.cc \
>- test/gtest_throw_on_failure_test_.cc \
>- test/gtest_uninitialized_test_.cc \
> test/gtest_xml_outfile1_test_.cc \
> test/gtest_xml_outfile2_test_.cc \
>- test/gtest_xml_output_unittest_.cc
>+ test/gtest_xml_output_unittest_.cc \
>+ test/production.cc \
>+ test/production.h
> 
> # Python tests that we don't run.
> EXTRA_DIST += \
>- test/gtest_test_utils.py \
>- test/gtest_xml_test_utils.py \
>- test/gtest_break_on_failure_unittest.py \
>- test/gtest_color_test.py \
>- test/gtest_env_var_test.py \
>- test/gtest_filter_unittest.py \
>+ test/googletest-break-on-failure-unittest.py \
>+ test/googletest-catch-exceptions-test.py \
>+ test/googletest-color-test.py \
>+ test/googletest-env-var-test.py \
>+ test/googletest-filter-unittest.py \
> test/gtest_help_test.py \
>- test/gtest_list_tests_unittest.py \
>- test/gtest_output_test.py \
>- test/gtest_output_test_golden_lin.txt \
>- test/gtest_output_test_golden_win.txt \
>- test/gtest_shuffle_test.py \
>- test/gtest_throw_on_failure_test.py \
>- test/gtest_uninitialized_test.py \
>+ test/googletest-list-tests-unittest.py \
>+ test/googletest-output-test.py \
>+ test/googletest-output-test_golden_lin.txt \
>+ test/googletest-shuffle-test.py \
>+ test/gtest_test_utils.py \
>+ test/googletest-throw-on-failure-test.py \
>+ test/googletest-uninitialized-test.py \
> test/gtest_xml_outfiles_test.py \
> test/gtest_xml_output_unittest.py \
>- test/run_tests_util.py \
>- test/run_tests_util_test.py
>+ test/gtest_xml_test_utils.py
> 
> # CMake script
> EXTRA_DIST += \
>- CMakeLists.txt
>+ CMakeLists.txt \
>+ cmake/internal_utils.cmake
> 
> # MSVC project files
> EXTRA_DIST += \
>- msvc/gtest-md.sln \
>- msvc/gtest.sln \
>- msvc/gtest-md.vcproj \
>- msvc/gtest.vcproj \
>- msvc/gtest_main-md.vcproj \
>- msvc/gtest_main.vcproj \
>- msvc/gtest_prod_test-md.vcproj \
>- msvc/gtest_prod_test.vcproj \
>- msvc/gtest_unittest-md.vcproj \
>- msvc/gtest_unittest.vcproj
>+ msvc/2010/gtest-md.sln \
>+ msvc/2010/gtest-md.vcxproj \
>+ msvc/2010/gtest.sln \
>+ msvc/2010/gtest.vcxproj \
>+ msvc/2010/gtest_main-md.vcxproj \
>+ msvc/2010/gtest_main.vcxproj \
>+ msvc/2010/gtest_prod_test-md.vcxproj \
>+ msvc/2010/gtest_prod_test.vcxproj \
>+ msvc/2010/gtest_unittest-md.vcxproj \
>+ msvc/2010/gtest_unittest.vcxproj
> 
> # xcode project files
> EXTRA_DIST += \
>@@ -133,31 +141,27 @@ EXTRA_DIST += \
> xcode/Config/StaticLibraryTarget.xcconfig \
> xcode/Config/TestTarget.xcconfig \
> xcode/Resources/Info.plist \
>- xcode/Scripts/versiongenerate.py \
> xcode/Scripts/runtests.sh \
>+ xcode/Scripts/versiongenerate.py \
> xcode/gtest.xcodeproj/project.pbxproj
> 
> # xcode sample files
> EXTRA_DIST += \
> xcode/Samples/FrameworkSample/Info.plist \
>+ xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj \
> xcode/Samples/FrameworkSample/runtests.sh \
>- xcode/Samples/FrameworkSample/widget_test.cc \
> xcode/Samples/FrameworkSample/widget.cc \
> xcode/Samples/FrameworkSample/widget.h \
>- xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
>+ xcode/Samples/FrameworkSample/widget_test.cc
> 
> # C++Builder project files
> EXTRA_DIST += \
>+ codegear/gtest.cbproj \
>+ codegear/gtest.groupproj \
> codegear/gtest_all.cc \
> codegear/gtest_link.cc \
>- codegear/gtest.cbproj \
> codegear/gtest_main.cbproj \
>- codegear/gtest_unittest.cbproj \
>- codegear/gtest.groupproj
>-
>-# Scripts and utilities
>-bin_SCRIPTS = scripts/gtest-config
>-CLEANFILES = $(bin_SCRIPTS)
>+ codegear/gtest_unittest.cbproj
> 
> # Distribute and install M4 macro
> m4datadir = $(datadir)/aclocal
>@@ -181,15 +185,17 @@ lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la
> 
> lib_libgtest_la_SOURCES = src/gtest-all.cc
> 
>-pkginclude_HEADERS = include/gtest/gtest.h \
>- include/gtest/gtest-death-test.h \
>- include/gtest/gtest-message.h \
>- include/gtest/gtest-param-test.h \
>- include/gtest/gtest_pred_impl.h \
>- include/gtest/gtest_prod.h \
>- include/gtest/gtest-spi.h \
>- include/gtest/gtest-test-part.h \
>- include/gtest/gtest-typed-test.h
>+pkginclude_HEADERS = \
>+ include/gtest/gtest-death-test.h \
>+ include/gtest/gtest-message.h \
>+ include/gtest/gtest-param-test.h \
>+ include/gtest/gtest-printers.h \
>+ include/gtest/gtest-spi.h \
>+ include/gtest/gtest-test-part.h \
>+ include/gtest/gtest-typed-test.h \
>+ include/gtest/gtest.h \
>+ include/gtest/gtest_pred_impl.h \
>+ include/gtest/gtest_prod.h
> 
> pkginclude_internaldir = $(pkgincludedir)/internal
> pkginclude_internal_HEADERS = \
>@@ -200,61 +206,97 @@ pkginclude_internal_HEADERS = \
> include/gtest/internal/gtest-param-util-generated.h \
> include/gtest/internal/gtest-param-util.h \
> include/gtest/internal/gtest-port.h \
>+ include/gtest/internal/gtest-port-arch.h \
> include/gtest/internal/gtest-string.h \
> include/gtest/internal/gtest-tuple.h \
>- include/gtest/internal/gtest-type-util.h
>+ include/gtest/internal/gtest-type-util.h \
>+ include/gtest/internal/custom/gtest.h \
>+ include/gtest/internal/custom/gtest-port.h \
>+ include/gtest/internal/custom/gtest-printers.h
> 
> lib_libgtest_main_la_SOURCES = src/gtest_main.cc
> lib_libgtest_main_la_LIBADD = lib/libgtest.la
> 
>-# Bulid rules for samples and tests. Automake's naming for some of
>+# Build rules for samples and tests. Automake's naming for some of
> # these variables isn't terribly obvious, so this is a brief
> # reference:
> #
> # TESTS -- Programs run automatically by "make check"
> # check_PROGRAMS -- Programs built by "make check" but not necessarily run
> 
>-noinst_LTLIBRARIES = samples/libsamples.la
>-
>-samples_libsamples_la_SOURCES = samples/sample1.cc \
>- samples/sample1.h \
>- samples/sample2.cc \
>- samples/sample2.h \
>- samples/sample3-inl.h \
>- samples/sample4.cc \
>- samples/sample4.h
>-
> TESTS=
> TESTS_ENVIRONMENT = GTEST_SOURCE_DIR="$(srcdir)/test" \
> GTEST_BUILD_DIR="$(top_builddir)/test"
> check_PROGRAMS=
> 
> # A simple sample on using gtest.
>-TESTS += samples/sample1_unittest
>-check_PROGRAMS += samples/sample1_unittest
>-samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc
>+TESTS += samples/sample1_unittest \
>+ samples/sample2_unittest \
>+ samples/sample3_unittest \
>+ samples/sample4_unittest \
>+ samples/sample5_unittest \
>+ samples/sample6_unittest \
>+ samples/sample7_unittest \
>+ samples/sample8_unittest \
>+ samples/sample9_unittest \
>+ samples/sample10_unittest
>+check_PROGRAMS += samples/sample1_unittest \
>+ samples/sample2_unittest \
>+ samples/sample3_unittest \
>+ samples/sample4_unittest \
>+ samples/sample5_unittest \
>+ samples/sample6_unittest \
>+ samples/sample7_unittest \
>+ samples/sample8_unittest \
>+ samples/sample9_unittest \
>+ samples/sample10_unittest
>+
>+samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc samples/sample1.cc
> samples_sample1_unittest_LDADD = lib/libgtest_main.la \
>- samples/libsamples.la
>-
>-# Another sample. It also verifies that libgtest works.
>-TESTS += samples/sample10_unittest
>-check_PROGRAMS += samples/sample10_unittest
>+ lib/libgtest.la
>+samples_sample2_unittest_SOURCES = samples/sample2_unittest.cc samples/sample2.cc
>+samples_sample2_unittest_LDADD = lib/libgtest_main.la \
>+ lib/libgtest.la
>+samples_sample3_unittest_SOURCES = samples/sample3_unittest.cc
>+samples_sample3_unittest_LDADD = lib/libgtest_main.la \
>+ lib/libgtest.la
>+samples_sample4_unittest_SOURCES = samples/sample4_unittest.cc samples/sample4.cc
>+samples_sample4_unittest_LDADD = lib/libgtest_main.la \
>+ lib/libgtest.la
>+samples_sample5_unittest_SOURCES = samples/sample5_unittest.cc samples/sample1.cc
>+samples_sample5_unittest_LDADD = lib/libgtest_main.la \
>+ lib/libgtest.la
>+samples_sample6_unittest_SOURCES = samples/sample6_unittest.cc
>+samples_sample6_unittest_LDADD = lib/libgtest_main.la \
>+ lib/libgtest.la
>+samples_sample7_unittest_SOURCES = samples/sample7_unittest.cc
>+samples_sample7_unittest_LDADD = lib/libgtest_main.la \
>+ lib/libgtest.la
>+samples_sample8_unittest_SOURCES = samples/sample8_unittest.cc
>+samples_sample8_unittest_LDADD = lib/libgtest_main.la \
>+ lib/libgtest.la
>+
>+# Also verify that libgtest works by itself.
>+samples_sample9_unittest_SOURCES = samples/sample9_unittest.cc
>+samples_sample9_unittest_LDADD = lib/libgtest.la
> samples_sample10_unittest_SOURCES = samples/sample10_unittest.cc
> samples_sample10_unittest_LDADD = lib/libgtest.la
> 
> # This tests most constructs of gtest and verifies that libgtest_main
>-# works.
>+# and libgtest work.
> TESTS += test/gtest_all_test
> check_PROGRAMS += test/gtest_all_test
> test_gtest_all_test_SOURCES = test/gtest_all_test.cc
>-test_gtest_all_test_LDADD = lib/libgtest_main.la
>+test_gtest_all_test_LDADD = lib/libgtest_main.la \
>+ lib/libgtest.la
> 
> # Tests that fused gtest files compile and work.
> FUSED_GTEST_SRC = \
> fused-src/gtest/gtest-all.cc \
>- fused-src/gtest/gtest_main.cc \
>- fused-src/gtest/gtest.h
>+ fused-src/gtest/gtest.h \
>+ fused-src/gtest/gtest_main.cc
> 
>+if HAVE_PYTHON
> TESTS += test/fused_gtest_test
> check_PROGRAMS += test/fused_gtest_test
> test_fused_gtest_test_SOURCES = $(FUSED_GTEST_SRC) \
>@@ -278,7 +320,20 @@ fused-gtest: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \
> 
> maintainer-clean-local:
> 	rm -rf "$(srcdir)/fused-src"
>+endif
> 
> # Death tests may produce core dumps in the build directory. In case
> # this happens, clean them to keep distcleancheck happy.
>-CLEANFILES += core
>+CLEANFILES = core
>+
>+# Disables 'make install' as installing a compiled version of Google
>+# Test can lead to undefined behavior due to violation of the
>+# One-Definition Rule.
>+
>+install-exec-local:
>+	echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system."
>+	false
>+
>+install-data-local:
>+	echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system."
>+	false
>diff --git a/Source/ThirdParty/gtest/README b/Source/ThirdParty/gtest/README
>deleted file mode 100644
>index ec6119002099150d715749a16e03c2f573686bb5..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/README
>+++ /dev/null
>@@ -1,417 +0,0 @@
>-Google C++ Testing Framework
>-============================
>-
>-http://code.google.com/p/googletest/
>-
>-Overview
>---------
>-
>-Google's framework for writing C++ tests on a variety of platforms
>-(Linux, Mac OS X, Windows, Windows CE, Symbian, etc). Based on the
>-xUnit architecture. Supports automatic test discovery, a rich set of
>-assertions, user-defined assertions, death tests, fatal and non-fatal
>-failures, various options for running the tests, and XML test report
>-generation.
>-
>-Please see the project page above for more information as well as the
>-mailing list for questions, discussions, and development. There is
>-also an IRC channel on OFTC (irc.oftc.net) #gtest available. Please
>-join us!
>-
>-Requirements for End Users
>---------------------------
>-
>-Google Test is designed to have fairly minimal requirements to build
>-and use with your projects, but there are some. Currently, we support
>-Linux, Windows, Mac OS X, and Cygwin. We will also make our best
>-effort to support other platforms (e.g. Solaris, AIX, and z/OS).
>-However, since core members of the Google Test project have no access
>-to these platforms, Google Test may have outstanding issues there. If
>-you notice any problems on your platform, please notify
>-googletestframework@googlegroups.com. Patches for fixing them are
>-even more welcome!
>-
>-### Linux Requirements ###
>-
>-These are the base requirements to build and use Google Test from a source
>-package (as described below):
>- * GNU-compatible Make or gmake
>- * POSIX-standard shell
>- * POSIX(-2) Regular Expressions (regex.h)
>- * A C++98-standard-compliant compiler
>-
>-### Windows Requirements ###
>-
>- * Microsoft Visual C++ 7.1 or newer
>-
>-### Cygwin Requirements ###
>-
>- * Cygwin 1.5.25-14 or newer
>-
>-### Mac OS X Requirements ###
>-
>- * Mac OS X 10.4 Tiger or newer
>- * Developer Tools Installed
>-
>-Also, you'll need CMake 2.6.4 or higher if you want to build the
>-samples using the provided CMake script, regardless of the platform.
>-
>-Requirements for Contributors
>------------------------------
>-
>-We welcome patches. If you plan to contribute a patch, you need to
>-build Google Test and its own tests from an SVN checkout (described
>-below), which has further requirements:
>-
>- * Python version 2.3 or newer (for running some of the tests and
>- re-generating certain source files from templates)
>- * CMake 2.6.4 or newer
>-
>-Getting the Source
>-------------------
>-
>-There are two primary ways of getting Google Test's source code: you
>-can download a stable source release in your preferred archive format,
>-or directly check out the source from our Subversion (SVN) repositary.
>-The SVN checkout requires a few extra steps and some extra software
>-packages on your system, but lets you track the latest development and
>-make patches much more easily, so we highly encourage it.
>-
>-### Source Package ###
>-
>-Google Test is released in versioned source packages which can be
>-downloaded from the download page [1]. Several different archive
>-formats are provided, but the only difference is the tools used to
>-manipulate them, and the size of the resulting file. Download
>-whichever you are most comfortable with.
>-
>- [1] http://code.google.com/p/googletest/downloads/list
>-
>-Once the package is downloaded, expand it using whichever tools you
>-prefer for that type. This will result in a new directory with the
>-name "gtest-X.Y.Z" which contains all of the source code. Here are
>-some examples on Linux:
>-
>- tar -xvzf gtest-X.Y.Z.tar.gz
>- tar -xvjf gtest-X.Y.Z.tar.bz2
>- unzip gtest-X.Y.Z.zip
>-
>-### SVN Checkout ###
>-
>-To check out the main branch (also known as the "trunk") of Google
>-Test, run the following Subversion command:
>-
>- svn checkout http://googletest.googlecode.com/svn/trunk/ gtest-svn
>-
>-Setting up the Build
>---------------------
>-
>-To build Google Test and your tests that use it, you need to tell your
>-build system where to find its headers and source files. The exact
>-way to do it depends on which build system you use, and is usually
>-straightforward.
>-
>-### Generic Build Instructions ###
>-
>-Suppose you put Google Test in directory ${GTEST_DIR}. To build it,
>-create a library build target (or a project as called by Visual Studio
>-and Xcode) to compile
>-
>- ${GTEST_DIR}/src/gtest-all.cc
>-
>-with
>-
>- ${GTEST_DIR}/include and ${GTEST_DIR}
>-
>-in the header search path. Assuming a Linux-like system and gcc,
>-something like the following will do:
>-
>- g++ -I${GTEST_DIR}/include -I${GTEST_DIR} -c ${GTEST_DIR}/src/gtest-all.cc
>- ar -rv libgtest.a gtest-all.o
>-
>-Next, you should compile your test source file with
>-${GTEST_DIR}/include in the header search path, and link it with gtest
>-and any other necessary libraries:
>-
>- g++ -I${GTEST_DIR}/include path/to/your_test.cc libgtest.a -o your_test
>-
>-As an example, the make/ directory contains a Makefile that you can
>-use to build Google Test on systems where GNU make is available
>-(e.g. Linux, Mac OS X, and Cygwin). It doesn't try to build Google
>-Test's own tests. Instead, it just builds the Google Test library and
>-a sample test. You can use it as a starting point for your own build
>-script.
>-
>-If the default settings are correct for your environment, the
>-following commands should succeed:
>-
>- cd ${GTEST_DIR}/make
>- make
>- ./sample1_unittest
>-
>-If you see errors, try to tweak the contents of make/Makefile to make
>-them go away. There are instructions in make/Makefile on how to do
>-it.
>-
>-### Using CMake ###
>-
>-Google Test comes with a CMake build script (CMakeLists.txt) that can
>-be used on a wide range of platforms ("C" stands for cross-platofrm.).
>-If you don't have CMake installed already, you can download it for
>-free from http://www.cmake.org/.
>-
>-CMake works by generating native makefiles or build projects that can
>-be used in the compiler environment of your choice. The typical
>-workflow starts with:
>-
>- mkdir mybuild # Create a directory to hold the build output.
>- cd mybuild
>- cmake ${GTEST_DIR} # Generate native build scripts.
>-
>-If you want to build Google Test's samples, you should replace the
>-last command with
>-
>- cmake -Dbuild_gtest_samples=ON ${GTEST_DIR}
>-
>-If you are on a *nix system, you should now see a Makefile in the
>-current directory. Just type 'make' to build gtest.
>-
>-If you use Windows and have Vistual Studio installed, a gtest.sln file
>-and several .vcproj files will be created. You can then build them
>-using Visual Studio.
>-
>-On Mac OS X with Xcode installed, a .xcodeproj file will be generated.
>-
>-### Legacy Build Scripts ###
>-
>-Before settling on CMake, we have been providing hand-maintained build
>-projects/scripts for Visual Studio, Xcode, and Autotools. While we
>-continue to provide them for convenience, they are not actively
>-maintained any more. We highly recommend that you follow the
>-instructions in the previous two sections to integrate Google Test
>-with your existing build system.
>-
>-If you still need to use the legacy build scripts, here's how:
>-
>-The msvc\ folder contains two solutions with Visual C++ projects.
>-Open the gtest.sln or gtest-md.sln file using Visual Studio, and you
>-are ready to build Google Test the same way you build any Visual
>-Studio project. Files that have names ending with -md use DLL
>-versions of Microsoft runtime libraries (the /MD or the /MDd compiler
>-option). Files without that suffix use static versions of the runtime
>-libraries (the /MT or the /MTd option). Please note that one must use
>-the same option to compile both gtest and the test code. If you use
>-Visual Studio 2005 or above, we recommend the -md version as /MD is
>-the default for new projects in these versions of Visual Studio.
>-
>-On Mac OS X, open the gtest.xcodeproj in the xcode/ folder using
>-Xcode. Build the "gtest" target. The universal binary framework will
>-end up in your selected build directory (selected in the Xcode
>-"Preferences..." -> "Building" pane and defaults to xcode/build).
>-Alternatively, at the command line, enter:
>-
>- xcodebuild
>-
>-This will build the "Release" configuration of gtest.framework in your
>-default build location. See the "xcodebuild" man page for more
>-information about building different configurations and building in
>-different locations.
>-
>-Tweaking Google Test
>---------------------
>-
>-Google Test can be used in diverse environments. The default
>-configuration may not work (or may not work well) out of the box in
>-some environments. However, you can easily tweak Google Test by
>-defining control macros on the compiler command line. Generally,
>-these macros are named like GTEST_XYZ and you define them to either 1
>-or 0 to enable or disable a certain feature.
>-
>-We list the most frequently used macros below. For a complete list,
>-see file include/gtest/internal/gtest-port.h.
>-
>-### Choosing a TR1 Tuple Library ###
>-
>-Some Google Test features require the C++ Technical Report 1 (TR1)
>-tuple library, which is not yet available with all compilers. The
>-good news is that Google Test implements a subset of TR1 tuple that's
>-enough for its own need, and will automatically use this when the
>-compiler doesn't provide TR1 tuple.
>-
>-Usually you don't need to care about which tuple library Google Test
>-uses. However, if your project already uses TR1 tuple, you need to
>-tell Google Test to use the same TR1 tuple library the rest of your
>-project uses, or the two tuple implementations will clash. To do
>-that, add
>-
>- -DGTEST_USE_OWN_TR1_TUPLE=0
>-
>-to the compiler flags while compiling Google Test and your tests. If
>-you want to force Google Test to use its own tuple library, just add
>-
>- -DGTEST_USE_OWN_TR1_TUPLE=1
>-
>-to the compiler flags instead.
>-
>-If you don't want Google Test to use tuple at all, add
>-
>- -DGTEST_HAS_TR1_TUPLE=0
>-
>-and all features using tuple will be disabled.
>-
>-### Multi-threaded Tests ###
>-
>-Google Test is thread-safe where the pthread library is available.
>-After #include <gtest/gtest.h>, you can check the GTEST_IS_THREADSAFE
>-macro to see whether this is the case (yes if the macro is #defined to
>-1, no if it's undefined.).
>-
>-If Google Test doesn't correctly detect whether pthread is available
>-in your environment, you can force it with
>-
>- -DGTEST_HAS_PTHREAD=1
>-
>-or
>-
>- -DGTEST_HAS_PTHREAD=0
>-
>-When Google Test uses pthread, you may need to add flags to your
>-compiler and/or linker to select the pthread library, or you'll get
>-link errors. If you use the CMake script or the deprecated Autotools
>-script, this is taken care of for you. If you use your own build
>-script, you'll need to read your compiler and linker's manual to
>-figure out what flags to add.
>-
>-### As a Shared Library (DLL) ###
>-
>-Google Test is compact, so most users can build and link it as a
>-static library for the simplicity. You can choose to use Google Test
>-as a shared library (known as a DLL on Windows) if you prefer.
>-
>-To compile gtest as a shared library, add
>-
>- -DGTEST_CREATE_SHARED_LIBRARY=1
>-
>-to the compiler flags. You'll also need to tell the linker to produce
>-a shared library instead - consult your linker's manual for how to do
>-it.
>-
>-To compile your tests that use the gtest shared library, add
>-
>- -DGTEST_LINKED_AS_SHARED_LIBRARY=1
>-
>-to the compiler flags.
>-
>-### Avoiding Macro Name Clashes ###
>-
>-In C++, macros don't obey namespaces. Therefore two libraries that
>-both define a macro of the same name will clash if you #include both
>-definitions. In case a Google Test macro clashes with another
>-library, you can force Google Test to rename its macro to avoid the
>-conflict.
>-
>-Specifically, if both Google Test and some other code define macro
>-FOO, you can add
>-
>- -DGTEST_DONT_DEFINE_FOO=1
>-
>-to the compiler flags to tell Google Test to change the macro's name
>-from FOO to GTEST_FOO. Currently FOO can be FAIL, SUCCEED, or TEST.
>-For example, with -DGTEST_DONT_DEFINE_TEST=1, you'll need to write
>-
>- GTEST_TEST(SomeTest, DoesThis) { ... }
>-
>-instead of
>-
>- TEST(SomeTest, DoesThis) { ... }
>-
>-in order to define a test.
>-
>-Upgrating from an Earlier Version
>----------------------------------
>-
>-We strive to keep Google Test releases backward compatible.
>-Sometimes, though, we have to make some breaking changes for the
>-users' long-term benefits. This section describes what you'll need to
>-do if you are upgrading from an earlier version of Google Test.
>-
>-### Upgrading from 1.3.0 or Earlier ###
>-
>-You may need to explicitly enable or disable Google Test's own TR1
>-tuple library. See the instructions in section "Choosing a TR1 Tuple
>-Library".
>-
>-### Upgrading from 1.4.0 or Earlier ###
>-
>-The Autotools build script (configure + make) is no longer officially
>-supportted. You are encouraged to migrate to your own build system or
>-use CMake. If you still need to use Autotools, you can find
>-instructions in the README file from Google Test 1.4.0.
>-
>-On platforms where the pthread library is available, Google Test uses
>-it in order to be thread-safe. See the "Multi-threaded Tests" section
>-for what this means to your build script.
>-
>-If you use Microsoft Visual C++ 7.1 with exceptions disabled, Google
>-Test will no longer compile. This should affect very few people, as a
>-large portion of STL (including <string>) doesn't compile in this mode
>-anyway. We decided to stop supporting it in order to greatly simplify
>-Google Test's implementation.
>-
>-Developing Google Test
>-----------------------
>-
>-This section discusses how to make your own changes to Google Test.
>-
>-### Testing Google Test Itself ###
>-
>-To make sure your changes work as intended and don't break existing
>-functionality, you'll want to compile and run Google Test's own tests.
>-For that you can use CMake:
>-
>- mkdir mybuild
>- cd mybuild
>- cmake -Dbuild_all_gtest_tests=ON ${GTEST_DIR}
>-
>-Make sure you have Python installed, as some of Google Test's tests
>-are written in Python. If the cmake command complains about not being
>-able to find Python ("Could NOT find PythonInterp (missing:
>-PYTHON_EXECUTABLE)"), try telling it explicitly where your Python
>-executable can be found:
>-
>- cmake -DPYTHON_EXECUTABLE=path/to/python -Dbuild_all_gtest_tests=ON \
>- ${GTEST_DIR}
>-
>-Next, you can build Google Test and all of its own tests. On *nix,
>-this is usually done by 'make'. To run the tests, do
>-
>- make test
>-
>-All tests should pass.
>-
>-### Regenerating Source Files ###
>-
>-Some of Google Test's source files are generated from templates (not
>-in the C++ sense) using a script. A template file is named FOO.pump,
>-where FOO is the name of the file it will generate. For example, the
>-file include/gtest/internal/gtest-type-util.h.pump is used to generate
>-gtest-type-util.h in the same directory.
>-
>-Normally you don't need to worry about regenerating the source files,
>-unless you need to modify them. In that case, you should modify the
>-corresponding .pump files instead and run the pump.py Python script to
>-regenerate them. You can find pump.py in the scripts/ directory.
>-Read the Pump manual [2] for how to use it.
>-
>- [2] http://code.google.com/p/googletest/wiki/PumpManual
>-
>-### Contributing a Patch ###
>-
>-We welcome patches. Please read the Google Test developer's guide [3]
>-for how you can contribute. In particular, make sure you have signed
>-the Contributor License Agreement, or we won't be able to accept the
>-patch.
>-
>- [3] http://code.google.com/p/googletest/wiki/GoogleTestDevGuide
>-
>-Happy testing!
>diff --git a/Source/ThirdParty/gtest/README.WebKit b/Source/ThirdParty/gtest/README.WebKit
>deleted file mode 100644
>index 6a318ff62e3249c8e6532093f40e3cb41c15f9ac..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/README.WebKit
>+++ /dev/null
>@@ -1,16 +0,0 @@
>-GTest v.1.5.0
>-
>-http://googletest.googlecode.com/svn/tags/release-1.5.0/ 
>-
>-2016-01-02 Ting-Wei Lan (lantw44@gmail.com)
>- Remove usage of environ global variable to fix the build on FreeBSD.
>-
>-2012-01-04 Dmitry Lomov (dslomov@google.com) David Kilzer (ddkilzer@apple.com)
>- - WebKit port of gtest uses FastMalloc "new" and "delete" operators from JavaScriptCore.
>- - The gtest.framework target now links to JavaScriptCore.framework.
>-
>-2011-12-22 David Kilzer (ddkilzer@apple.com)
>- Added Production configuration to gtest Xcode project.
>-
>-2011-05-06 Dmitry Lomov (dslomov@google.com)
>- gtest-md.vcproj upgraded to VS 2005 (8.0) format to match the rest of WebKit
>diff --git a/Source/ThirdParty/gtest/README.md b/Source/ThirdParty/gtest/README.md
>new file mode 100644
>index 0000000000000000000000000000000000000000..e30fe8047127bee16d2c71f14b509f37571add41
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/README.md
>@@ -0,0 +1,341 @@
>+### Generic Build Instructions
>+
>+#### Setup
>+
>+To build Google Test and your tests that use it, you need to tell your build
>+system where to find its headers and source files. The exact way to do it
>+depends on which build system you use, and is usually straightforward.
>+
>+#### Build
>+
>+Suppose you put Google Test in directory `${GTEST_DIR}`. To build it, create a
>+library build target (or a project as called by Visual Studio and Xcode) to
>+compile
>+
>+ ${GTEST_DIR}/src/gtest-all.cc
>+
>+with `${GTEST_DIR}/include` in the system header search path and `${GTEST_DIR}`
>+in the normal header search path. Assuming a Linux-like system and gcc,
>+something like the following will do:
>+
>+ g++ -isystem ${GTEST_DIR}/include -I${GTEST_DIR} \
>+ -pthread -c ${GTEST_DIR}/src/gtest-all.cc
>+ ar -rv libgtest.a gtest-all.o
>+
>+(We need `-pthread` as Google Test uses threads.)
>+
>+Next, you should compile your test source file with `${GTEST_DIR}/include` in
>+the system header search path, and link it with gtest and any other necessary
>+libraries:
>+
>+ g++ -isystem ${GTEST_DIR}/include -pthread path/to/your_test.cc libgtest.a \
>+ -o your_test
>+
>+As an example, the make/ directory contains a Makefile that you can use to build
>+Google Test on systems where GNU make is available (e.g. Linux, Mac OS X, and
>+Cygwin). It doesn't try to build Google Test's own tests. Instead, it just
>+builds the Google Test library and a sample test. You can use it as a starting
>+point for your own build script.
>+
>+If the default settings are correct for your environment, the following commands
>+should succeed:
>+
>+ cd ${GTEST_DIR}/make
>+ make
>+ ./sample1_unittest
>+
>+If you see errors, try to tweak the contents of `make/Makefile` to make them go
>+away. There are instructions in `make/Makefile` on how to do it.
>+
>+### Using CMake
>+
>+Google Test comes with a CMake build script (
>+[CMakeLists.txt](https://github.com/google/googletest/blob/master/CMakeLists.txt))
>+that can be used on a wide range of platforms ("C" stands for cross-platform.).
>+If you don't have CMake installed already, you can download it for free from
>+<http://www.cmake.org/>.
>+
>+CMake works by generating native makefiles or build projects that can be used in
>+the compiler environment of your choice. You can either build Google Test as a
>+standalone project or it can be incorporated into an existing CMake build for
>+another project.
>+
>+#### Standalone CMake Project
>+
>+When building Google Test as a standalone project, the typical workflow starts
>+with:
>+
>+ mkdir mybuild # Create a directory to hold the build output.
>+ cd mybuild
>+ cmake ${GTEST_DIR} # Generate native build scripts.
>+
>+If you want to build Google Test's samples, you should replace the last command
>+with
>+
>+ cmake -Dgtest_build_samples=ON ${GTEST_DIR}
>+
>+If you are on a \*nix system, you should now see a Makefile in the current
>+directory. Just type 'make' to build gtest.
>+
>+If you use Windows and have Visual Studio installed, a `gtest.sln` file and
>+several `.vcproj` files will be created. You can then build them using Visual
>+Studio.
>+
>+On Mac OS X with Xcode installed, a `.xcodeproj` file will be generated.
>+
>+#### Incorporating Into An Existing CMake Project
>+
>+If you want to use gtest in a project which already uses CMake, then a more
>+robust and flexible approach is to build gtest as part of that project directly.
>+This is done by making the GoogleTest source code available to the main build
>+and adding it using CMake's `add_subdirectory()` command. This has the
>+significant advantage that the same compiler and linker settings are used
>+between gtest and the rest of your project, so issues associated with using
>+incompatible libraries (eg debug/release), etc. are avoided. This is
>+particularly useful on Windows. Making GoogleTest's source code available to the
>+main build can be done a few different ways:
>+
>+* Download the GoogleTest source code manually and place it at a known
>+ location. This is the least flexible approach and can make it more difficult
>+ to use with continuous integration systems, etc.
>+* Embed the GoogleTest source code as a direct copy in the main project's
>+ source tree. This is often the simplest approach, but is also the hardest to
>+ keep up to date. Some organizations may not permit this method.
>+* Add GoogleTest as a git submodule or equivalent. This may not always be
>+ possible or appropriate. Git submodules, for example, have their own set of
>+ advantages and drawbacks.
>+* Use CMake to download GoogleTest as part of the build's configure step. This
>+ is just a little more complex, but doesn't have the limitations of the other
>+ methods.
>+
>+The last of the above methods is implemented with a small piece of CMake code in
>+a separate file (e.g. `CMakeLists.txt.in`) which is copied to the build area and
>+then invoked as a sub-build _during the CMake stage_. That directory is then
>+pulled into the main build with `add_subdirectory()`. For example:
>+
>+New file `CMakeLists.txt.in`:
>+
>+ cmake_minimum_required(VERSION 2.8.2)
>+
>+ project(googletest-download NONE)
>+
>+ include(ExternalProject)
>+ ExternalProject_Add(googletest
>+ GIT_REPOSITORY https://github.com/google/googletest.git
>+ GIT_TAG master
>+ SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src"
>+ BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build"
>+ CONFIGURE_COMMAND ""
>+ BUILD_COMMAND ""
>+ INSTALL_COMMAND ""
>+ TEST_COMMAND ""
>+ )
>+
>+Existing build's `CMakeLists.txt`:
>+
>+ # Download and unpack googletest at configure time
>+ configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt)
>+ execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
>+ RESULT_VARIABLE result
>+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download )
>+ if(result)
>+ message(FATAL_ERROR "CMake step for googletest failed: ${result}")
>+ endif()
>+ execute_process(COMMAND ${CMAKE_COMMAND} --build .
>+ RESULT_VARIABLE result
>+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download )
>+ if(result)
>+ message(FATAL_ERROR "Build step for googletest failed: ${result}")
>+ endif()
>+
>+ # Prevent overriding the parent project's compiler/linker
>+ # settings on Windows
>+ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
>+
>+ # Add googletest directly to our build. This defines
>+ # the gtest and gtest_main targets.
>+ add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src
>+ ${CMAKE_BINARY_DIR}/googletest-build
>+ EXCLUDE_FROM_ALL)
>+
>+ # The gtest/gtest_main targets carry header search path
>+ # dependencies automatically when using CMake 2.8.11 or
>+ # later. Otherwise we have to add them here ourselves.
>+ if (CMAKE_VERSION VERSION_LESS 2.8.11)
>+ include_directories("${gtest_SOURCE_DIR}/include")
>+ endif()
>+
>+ # Now simply link against gtest or gtest_main as needed. Eg
>+ add_executable(example example.cpp)
>+ target_link_libraries(example gtest_main)
>+ add_test(NAME example_test COMMAND example)
>+
>+Note that this approach requires CMake 2.8.2 or later due to its use of the
>+`ExternalProject_Add()` command. The above technique is discussed in more detail
>+in [this separate article](http://crascit.com/2015/07/25/cmake-gtest/) which
>+also contains a link to a fully generalized implementation of the technique.
>+
>+##### Visual Studio Dynamic vs Static Runtimes
>+
>+By default, new Visual Studio projects link the C runtimes dynamically but
>+Google Test links them statically. This will generate an error that looks
>+something like the following: gtest.lib(gtest-all.obj) : error LNK2038: mismatch
>+detected for 'RuntimeLibrary': value 'MTd_StaticDebug' doesn't match value
>+'MDd_DynamicDebug' in main.obj
>+
>+Google Test already has a CMake option for this: `gtest_force_shared_crt`
>+
>+Enabling this option will make gtest link the runtimes dynamically too, and
>+match the project in which it is included.
>+
>+### Legacy Build Scripts
>+
>+Before settling on CMake, we have been providing hand-maintained build
>+projects/scripts for Visual Studio, Xcode, and Autotools. While we continue to
>+provide them for convenience, they are not actively maintained any more. We
>+highly recommend that you follow the instructions in the above sections to
>+integrate Google Test with your existing build system.
>+
>+If you still need to use the legacy build scripts, here's how:
>+
>+The msvc\ folder contains two solutions with Visual C++ projects. Open the
>+`gtest.sln` or `gtest-md.sln` file using Visual Studio, and you are ready to
>+build Google Test the same way you build any Visual Studio project. Files that
>+have names ending with -md use DLL versions of Microsoft runtime libraries (the
>+/MD or the /MDd compiler option). Files without that suffix use static versions
>+of the runtime libraries (the /MT or the /MTd option). Please note that one must
>+use the same option to compile both gtest and the test code. If you use Visual
>+Studio 2005 or above, we recommend the -md version as /MD is the default for new
>+projects in these versions of Visual Studio.
>+
>+On Mac OS X, open the `gtest.xcodeproj` in the `xcode/` folder using Xcode.
>+Build the "gtest" target. The universal binary framework will end up in your
>+selected build directory (selected in the Xcode "Preferences..." -> "Building"
>+pane and defaults to xcode/build). Alternatively, at the command line, enter:
>+
>+ xcodebuild
>+
>+This will build the "Release" configuration of gtest.framework in your default
>+build location. See the "xcodebuild" man page for more information about
>+building different configurations and building in different locations.
>+
>+If you wish to use the Google Test Xcode project with Xcode 4.x and above, you
>+need to either:
>+
>+* update the SDK configuration options in xcode/Config/General.xconfig.
>+ Comment options `SDKROOT`, `MACOS_DEPLOYMENT_TARGET`, and `GCC_VERSION`. If
>+ you choose this route you lose the ability to target earlier versions of
>+ MacOS X.
>+* Install an SDK for an earlier version. This doesn't appear to be supported
>+ by Apple, but has been reported to work
>+ (http://stackoverflow.com/questions/5378518).
>+
>+### Tweaking Google Test
>+
>+Google Test can be used in diverse environments. The default configuration may
>+not work (or may not work well) out of the box in some environments. However,
>+you can easily tweak Google Test by defining control macros on the compiler
>+command line. Generally, these macros are named like `GTEST_XYZ` and you define
>+them to either 1 or 0 to enable or disable a certain feature.
>+
>+We list the most frequently used macros below. For a complete list, see file
>+[include/gtest/internal/gtest-port.h](https://github.com/google/googletest/blob/master/include/gtest/internal/gtest-port.h).
>+
>+### Choosing a TR1 Tuple Library
>+
>+Some Google Test features require the C++ Technical Report 1 (TR1) tuple
>+library, which is not yet available with all compilers. The good news is that
>+Google Test implements a subset of TR1 tuple that's enough for its own need, and
>+will automatically use this when the compiler doesn't provide TR1 tuple.
>+
>+Usually you don't need to care about which tuple library Google Test uses.
>+However, if your project already uses TR1 tuple, you need to tell Google Test to
>+use the same TR1 tuple library the rest of your project uses, or the two tuple
>+implementations will clash. To do that, add
>+
>+ -DGTEST_USE_OWN_TR1_TUPLE=0
>+
>+to the compiler flags while compiling Google Test and your tests. If you want to
>+force Google Test to use its own tuple library, just add
>+
>+ -DGTEST_USE_OWN_TR1_TUPLE=1
>+
>+to the compiler flags instead.
>+
>+If you don't want Google Test to use tuple at all, add
>+
>+ -DGTEST_HAS_TR1_TUPLE=0
>+
>+and all features using tuple will be disabled.
>+
>+### Multi-threaded Tests
>+
>+Google Test is thread-safe where the pthread library is available. After
>+`#include "gtest/gtest.h"`, you can check the `GTEST_IS_THREADSAFE` macro to see
>+whether this is the case (yes if the macro is `#defined` to 1, no if it's
>+undefined.).
>+
>+If Google Test doesn't correctly detect whether pthread is available in your
>+environment, you can force it with
>+
>+ -DGTEST_HAS_PTHREAD=1
>+
>+or
>+
>+ -DGTEST_HAS_PTHREAD=0
>+
>+When Google Test uses pthread, you may need to add flags to your compiler and/or
>+linker to select the pthread library, or you'll get link errors. If you use the
>+CMake script or the deprecated Autotools script, this is taken care of for you.
>+If you use your own build script, you'll need to read your compiler and linker's
>+manual to figure out what flags to add.
>+
>+### As a Shared Library (DLL)
>+
>+Google Test is compact, so most users can build and link it as a static library
>+for the simplicity. You can choose to use Google Test as a shared library (known
>+as a DLL on Windows) if you prefer.
>+
>+To compile *gtest* as a shared library, add
>+
>+ -DGTEST_CREATE_SHARED_LIBRARY=1
>+
>+to the compiler flags. You'll also need to tell the linker to produce a shared
>+library instead - consult your linker's manual for how to do it.
>+
>+To compile your *tests* that use the gtest shared library, add
>+
>+ -DGTEST_LINKED_AS_SHARED_LIBRARY=1
>+
>+to the compiler flags.
>+
>+Note: while the above steps aren't technically necessary today when using some
>+compilers (e.g. GCC), they may become necessary in the future, if we decide to
>+improve the speed of loading the library (see
>+<http://gcc.gnu.org/wiki/Visibility> for details). Therefore you are recommended
>+to always add the above flags when using Google Test as a shared library.
>+Otherwise a future release of Google Test may break your build script.
>+
>+### Avoiding Macro Name Clashes
>+
>+In C++, macros don't obey namespaces. Therefore two libraries that both define a
>+macro of the same name will clash if you `#include` both definitions. In case a
>+Google Test macro clashes with another library, you can force Google Test to
>+rename its macro to avoid the conflict.
>+
>+Specifically, if both Google Test and some other code define macro FOO, you can
>+add
>+
>+ -DGTEST_DONT_DEFINE_FOO=1
>+
>+to the compiler flags to tell Google Test to change the macro's name from `FOO`
>+to `GTEST_FOO`. Currently `FOO` can be `FAIL`, `SUCCEED`, or `TEST`. For
>+example, with `-DGTEST_DONT_DEFINE_TEST=1`, you'll need to write
>+
>+ GTEST_TEST(SomeTest, DoesThis) { ... }
>+
>+instead of
>+
>+ TEST(SomeTest, DoesThis) { ... }
>+
>+in order to define a test.
>diff --git a/Source/ThirdParty/gtest/cmake/Config.cmake.in b/Source/ThirdParty/gtest/cmake/Config.cmake.in
>new file mode 100644
>index 0000000000000000000000000000000000000000..12be4498b1a079681a129e31b17c57e18126a63a
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/cmake/Config.cmake.in
>@@ -0,0 +1,9 @@
>+@PACKAGE_INIT@
>+include(CMakeFindDependencyMacro)
>+if (@GTEST_HAS_PTHREAD@)
>+ set(THREADS_PREFER_PTHREAD_FLAG @THREADS_PREFER_PTHREAD_FLAG@)
>+ find_dependency(Threads)
>+endif()
>+
>+include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")
>+check_required_components("@project_name@")
>diff --git a/Source/ThirdParty/gtest/cmake/gtest.pc.in b/Source/ThirdParty/gtest/cmake/gtest.pc.in
>new file mode 100644
>index 0000000000000000000000000000000000000000..e7967ad56ff2c32ed4ba06703aea525dcad2ce7b
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/cmake/gtest.pc.in
>@@ -0,0 +1,9 @@
>+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
>+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
>+
>+Name: gtest
>+Description: GoogleTest (without main() function)
>+Version: @PROJECT_VERSION@
>+URL: https://github.com/google/googletest
>+Libs: -L${libdir} -lgtest @CMAKE_THREAD_LIBS_INIT@
>+Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@
>diff --git a/Source/ThirdParty/gtest/cmake/gtest_main.pc.in b/Source/ThirdParty/gtest/cmake/gtest_main.pc.in
>new file mode 100644
>index 0000000000000000000000000000000000000000..fe25d9c73c683b6417b99bb703c13ae16ba8a952
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/cmake/gtest_main.pc.in
>@@ -0,0 +1,10 @@
>+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
>+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
>+
>+Name: gtest_main
>+Description: GoogleTest (with main() function)
>+Version: @PROJECT_VERSION@
>+URL: https://github.com/google/googletest
>+Requires: gtest
>+Libs: -L${libdir} -lgtest_main @CMAKE_THREAD_LIBS_INIT@
>+Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@
>diff --git a/Source/ThirdParty/gtest/cmake/internal_utils.cmake b/Source/ThirdParty/gtest/cmake/internal_utils.cmake
>new file mode 100644
>index 0000000000000000000000000000000000000000..8c1f9ba99cf50574f669dd7deba324dce40595f3
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/cmake/internal_utils.cmake
>@@ -0,0 +1,318 @@
>+# Defines functions and macros useful for building Google Test and
>+# Google Mock.
>+#
>+# Note:
>+#
>+# - This file will be run twice when building Google Mock (once via
>+# Google Test's CMakeLists.txt, and once via Google Mock's).
>+# Therefore it shouldn't have any side effects other than defining
>+# the functions and macros.
>+#
>+# - The functions/macros defined in this file may depend on Google
>+# Test and Google Mock's option() definitions, and thus must be
>+# called *after* the options have been defined.
>+
>+# Tweaks CMake's default compiler/linker settings to suit Google Test's needs.
>+#
>+# This must be a macro(), as inside a function string() can only
>+# update variables in the function scope.
>+macro(fix_default_compiler_settings_)
>+ if (MSVC)
>+ # For MSVC, CMake sets certain flags to defaults we want to override.
>+ # This replacement code is taken from sample in the CMake Wiki at
>+ # https://gitlab.kitware.com/cmake/community/wikis/FAQ#dynamic-replace.
>+ foreach (flag_var
>+ CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
>+ CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
>+ if (NOT BUILD_SHARED_LIBS AND NOT gtest_force_shared_crt)
>+ # When Google Test is built as a shared library, it should also use
>+ # shared runtime libraries. Otherwise, it may end up with multiple
>+ # copies of runtime library data in different modules, resulting in
>+ # hard-to-find crashes. When it is built as a static library, it is
>+ # preferable to use CRT as static libraries, as we don't have to rely
>+ # on CRT DLLs being available. CMake always defaults to using shared
>+ # CRT libraries, so we override that default here.
>+ string(REPLACE "/MD" "-MT" ${flag_var} "${${flag_var}}")
>+ endif()
>+
>+ # We prefer more strict warning checking for building Google Test.
>+ # Replaces /W3 with /W4 in defaults.
>+ string(REPLACE "/W3" "/W4" ${flag_var} "${${flag_var}}")
>+
>+ # Prevent D9025 warning for targets that have exception handling
>+ # turned off (/EHs-c- flag). Where required, exceptions are explicitly
>+ # re-enabled using the cxx_exception_flags variable.
>+ string(REPLACE "/EHsc" "" ${flag_var} "${${flag_var}}")
>+ endforeach()
>+ endif()
>+endmacro()
>+
>+# Defines the compiler/linker flags used to build Google Test and
>+# Google Mock. You can tweak these definitions to suit your need. A
>+# variable's value is empty before it's explicitly assigned to.
>+macro(config_compiler_and_linker)
>+ # Note: pthreads on MinGW is not supported, even if available
>+ # instead, we use windows threading primitives
>+ unset(GTEST_HAS_PTHREAD)
>+ if (NOT gtest_disable_pthreads AND NOT MINGW)
>+ # Defines CMAKE_USE_PTHREADS_INIT and CMAKE_THREAD_LIBS_INIT.
>+ set(THREADS_PREFER_PTHREAD_FLAG ON)
>+ find_package(Threads)
>+ if (CMAKE_USE_PTHREADS_INIT)
>+ set(GTEST_HAS_PTHREAD ON)
>+ endif()
>+ endif()
>+
>+ fix_default_compiler_settings_()
>+ if (MSVC)
>+ # Newlines inside flags variables break CMake's NMake generator.
>+ # TODO(vladl@google.com): Add -RTCs and -RTCu to debug builds.
>+ set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J -Zi")
>+ if (MSVC_VERSION LESS 1400) # 1400 is Visual Studio 2005
>+ # Suppress spurious warnings MSVC 7.1 sometimes issues.
>+ # Forcing value to bool.
>+ set(cxx_base_flags "${cxx_base_flags} -wd4800")
>+ # Copy constructor and assignment operator could not be generated.
>+ set(cxx_base_flags "${cxx_base_flags} -wd4511 -wd4512")
>+ # Compatibility warnings not applicable to Google Test.
>+ # Resolved overload was found by argument-dependent lookup.
>+ set(cxx_base_flags "${cxx_base_flags} -wd4675")
>+ endif()
>+ if (MSVC_VERSION LESS 1500) # 1500 is Visual Studio 2008
>+ # Conditional expression is constant.
>+ # When compiling with /W4, we get several instances of C4127
>+ # (Conditional expression is constant). In our code, we disable that
>+ # warning on a case-by-case basis. However, on Visual Studio 2005,
>+ # the warning fires on std::list. Therefore on that compiler and earlier,
>+ # we disable the warning project-wide.
>+ set(cxx_base_flags "${cxx_base_flags} -wd4127")
>+ endif()
>+ if (NOT (MSVC_VERSION LESS 1700)) # 1700 is Visual Studio 2012.
>+ # Suppress "unreachable code" warning on VS 2012 and later.
>+ # http://stackoverflow.com/questions/3232669 explains the issue.
>+ set(cxx_base_flags "${cxx_base_flags} -wd4702")
>+ endif()
>+
>+ set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32")
>+ set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN")
>+ set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1")
>+ set(cxx_no_exception_flags "-EHs-c- -D_HAS_EXCEPTIONS=0")
>+ set(cxx_no_rtti_flags "-GR-")
>+ elseif (CMAKE_COMPILER_IS_GNUCXX)
>+ set(cxx_base_flags "-Wall -Wshadow -Werror")
>+ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
>+ set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
>+ endif()
>+ set(cxx_exception_flags "-fexceptions")
>+ set(cxx_no_exception_flags "-fno-exceptions")
>+ # Until version 4.3.2, GCC doesn't define a macro to indicate
>+ # whether RTTI is enabled. Therefore we define GTEST_HAS_RTTI
>+ # explicitly.
>+ set(cxx_no_rtti_flags "-fno-rtti -DGTEST_HAS_RTTI=0")
>+ set(cxx_strict_flags
>+ "-Wextra -Wno-unused-parameter -Wno-missing-field-initializers")
>+ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
>+ set(cxx_exception_flags "-features=except")
>+ # Sun Pro doesn't provide macros to indicate whether exceptions and
>+ # RTTI are enabled, so we define GTEST_HAS_* explicitly.
>+ set(cxx_no_exception_flags "-features=no%except -DGTEST_HAS_EXCEPTIONS=0")
>+ set(cxx_no_rtti_flags "-features=no%rtti -DGTEST_HAS_RTTI=0")
>+ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "VisualAge" OR
>+ CMAKE_CXX_COMPILER_ID STREQUAL "XL")
>+ # CMake 2.8 changes Visual Age's compiler ID to "XL".
>+ set(cxx_exception_flags "-qeh")
>+ set(cxx_no_exception_flags "-qnoeh")
>+ # Until version 9.0, Visual Age doesn't define a macro to indicate
>+ # whether RTTI is enabled. Therefore we define GTEST_HAS_RTTI
>+ # explicitly.
>+ set(cxx_no_rtti_flags "-qnortti -DGTEST_HAS_RTTI=0")
>+ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "HP")
>+ set(cxx_base_flags "-AA -mt")
>+ set(cxx_exception_flags "-DGTEST_HAS_EXCEPTIONS=1")
>+ set(cxx_no_exception_flags "+noeh -DGTEST_HAS_EXCEPTIONS=0")
>+ # RTTI can not be disabled in HP aCC compiler.
>+ set(cxx_no_rtti_flags "")
>+ endif()
>+
>+ # The pthreads library is available and allowed?
>+ if (DEFINED GTEST_HAS_PTHREAD)
>+ set(GTEST_HAS_PTHREAD_MACRO "-DGTEST_HAS_PTHREAD=1")
>+ else()
>+ set(GTEST_HAS_PTHREAD_MACRO "-DGTEST_HAS_PTHREAD=0")
>+ endif()
>+ set(cxx_base_flags "${cxx_base_flags} ${GTEST_HAS_PTHREAD_MACRO}")
>+
>+ # For building gtest's own tests and samples.
>+ set(cxx_exception "${cxx_base_flags} ${cxx_exception_flags}")
>+ set(cxx_no_exception
>+ "${CMAKE_CXX_FLAGS} ${cxx_base_flags} ${cxx_no_exception_flags}")
>+ set(cxx_default "${cxx_exception}")
>+ set(cxx_no_rtti "${cxx_default} ${cxx_no_rtti_flags}")
>+ set(cxx_use_own_tuple "${cxx_default} -DGTEST_USE_OWN_TR1_TUPLE=1")
>+
>+ # For building the gtest libraries.
>+ set(cxx_strict "${cxx_default} ${cxx_strict_flags}")
>+endmacro()
>+
>+# Defines the gtest & gtest_main libraries. User tests should link
>+# with one of them.
>+function(cxx_library_with_type name type cxx_flags)
>+ # type can be either STATIC or SHARED to denote a static or shared library.
>+ # ARGN refers to additional arguments after 'cxx_flags'.
>+ add_library(${name} ${type} ${ARGN})
>+ set_target_properties(${name}
>+ PROPERTIES
>+ COMPILE_FLAGS "${cxx_flags}")
>+ # Generate debug library name with a postfix.
>+ set_target_properties(${name}
>+ PROPERTIES
>+ DEBUG_POSTFIX "d")
>+ if (BUILD_SHARED_LIBS OR type STREQUAL "SHARED")
>+ set_target_properties(${name}
>+ PROPERTIES
>+ COMPILE_DEFINITIONS "GTEST_CREATE_SHARED_LIBRARY=1")
>+ if (NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
>+ target_compile_definitions(${name} INTERFACE
>+ $<INSTALL_INTERFACE:GTEST_LINKED_AS_SHARED_LIBRARY=1>)
>+ endif()
>+ endif()
>+ if (DEFINED GTEST_HAS_PTHREAD)
>+ if ("${CMAKE_VERSION}" VERSION_LESS "3.1.0")
>+ set(threads_spec ${CMAKE_THREAD_LIBS_INIT})
>+ else()
>+ set(threads_spec Threads::Threads)
>+ endif()
>+ target_link_libraries(${name} PUBLIC ${threads_spec})
>+ endif()
>+endfunction()
>+
>+########################################################################
>+#
>+# Helper functions for creating build targets.
>+
>+function(cxx_shared_library name cxx_flags)
>+ cxx_library_with_type(${name} SHARED "${cxx_flags}" ${ARGN})
>+endfunction()
>+
>+function(cxx_library name cxx_flags)
>+ cxx_library_with_type(${name} "" "${cxx_flags}" ${ARGN})
>+endfunction()
>+
>+# cxx_executable_with_flags(name cxx_flags libs srcs...)
>+#
>+# creates a named C++ executable that depends on the given libraries and
>+# is built from the given source files with the given compiler flags.
>+function(cxx_executable_with_flags name cxx_flags libs)
>+ add_executable(${name} ${ARGN})
>+ if (MSVC AND (NOT (MSVC_VERSION LESS 1700))) # 1700 is Visual Studio 2012.
>+ # BigObj required for tests.
>+ set(cxx_flags "${cxx_flags} -bigobj")
>+ endif()
>+ if (cxx_flags)
>+ set_target_properties(${name}
>+ PROPERTIES
>+ COMPILE_FLAGS "${cxx_flags}")
>+ endif()
>+ if (BUILD_SHARED_LIBS)
>+ set_target_properties(${name}
>+ PROPERTIES
>+ COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
>+ endif()
>+ # To support mixing linking in static and dynamic libraries, link each
>+ # library in with an extra call to target_link_libraries.
>+ foreach (lib "${libs}")
>+ target_link_libraries(${name} ${lib})
>+ endforeach()
>+endfunction()
>+
>+# cxx_executable(name dir lib srcs...)
>+#
>+# creates a named target that depends on the given libs and is built
>+# from the given source files. dir/name.cc is implicitly included in
>+# the source file list.
>+function(cxx_executable name dir libs)
>+ cxx_executable_with_flags(
>+ ${name} "${cxx_default}" "${libs}" "${dir}/${name}.cc" ${ARGN})
>+endfunction()
>+
>+# Sets PYTHONINTERP_FOUND and PYTHON_EXECUTABLE.
>+find_package(PythonInterp)
>+
>+# cxx_test_with_flags(name cxx_flags libs srcs...)
>+#
>+# creates a named C++ test that depends on the given libs and is built
>+# from the given source files with the given compiler flags.
>+function(cxx_test_with_flags name cxx_flags libs)
>+ cxx_executable_with_flags(${name} "${cxx_flags}" "${libs}" ${ARGN})
>+ add_test(NAME ${name} COMMAND ${name})
>+endfunction()
>+
>+# cxx_test(name libs srcs...)
>+#
>+# creates a named test target that depends on the given libs and is
>+# built from the given source files. Unlike cxx_test_with_flags,
>+# test/name.cc is already implicitly included in the source file list.
>+function(cxx_test name libs)
>+ cxx_test_with_flags("${name}" "${cxx_default}" "${libs}"
>+ "test/${name}.cc" ${ARGN})
>+endfunction()
>+
>+# py_test(name)
>+#
>+# creates a Python test with the given name whose main module is in
>+# test/name.py. It does nothing if Python is not installed.
>+function(py_test name)
>+ if (PYTHONINTERP_FOUND)
>+ if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1)
>+ if (CMAKE_CONFIGURATION_TYPES)
>+	# Multi-configuration build generators as for Visual Studio save
>+	# output in a subdirectory of CMAKE_CURRENT_BINARY_DIR (Debug,
>+	# Release etc.), so we have to provide it here.
>+ add_test(
>+ NAME ${name}
>+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py
>+ --build_dir=${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG> ${ARGN})
>+ else (CMAKE_CONFIGURATION_TYPES)
>+	# Single-configuration build generators like Makefile generators
>+	# don't have subdirs below CMAKE_CURRENT_BINARY_DIR.
>+ add_test(
>+ NAME ${name}
>+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py
>+ --build_dir=${CMAKE_CURRENT_BINARY_DIR} ${ARGN})
>+ endif (CMAKE_CONFIGURATION_TYPES)
>+ else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1)
>+ # ${CMAKE_CURRENT_BINARY_DIR} is known at configuration time, so we can
>+ # directly bind it from cmake. ${CTEST_CONFIGURATION_TYPE} is known
>+ # only at ctest runtime (by calling ctest -c <Configuration>), so
>+ # we have to escape $ to delay variable substitution here.
>+ add_test(
>+ ${name}
>+ ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py
>+ --build_dir=${CMAKE_CURRENT_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE} ${ARGN})
>+ endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1)
>+ endif(PYTHONINTERP_FOUND)
>+endfunction()
>+
>+# install_project(targets...)
>+#
>+# Installs the specified targets and configures the associated pkgconfig files.
>+function(install_project)
>+ if(INSTALL_GTEST)
>+ install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/"
>+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
>+ # Install the project targets.
>+ install(TARGETS ${ARGN}
>+ EXPORT ${targets_export_name}
>+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
>+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
>+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
>+ # Configure and install pkgconfig files.
>+ foreach(t ${ARGN})
>+ set(configured_pc "${generated_dir}/${t}.pc")
>+ configure_file("${PROJECT_SOURCE_DIR}/cmake/${t}.pc.in"
>+ "${configured_pc}" @ONLY)
>+ install(FILES "${configured_pc}"
>+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
>+ endforeach()
>+ endif()
>+endfunction()
>diff --git a/Source/ThirdParty/gtest/configure.ac b/Source/ThirdParty/gtest/configure.ac
>index 1b91237461e39ff61b630f3e019adfeeeb783ae6..254c8c4b31885d2571fa2300b631e8bf9d95ae07 100644
>--- a/Source/ThirdParty/gtest/configure.ac
>+++ b/Source/ThirdParty/gtest/configure.ac
>@@ -5,13 +5,14 @@ m4_include(m4/acx_pthread.m4)
> # "[1.0.1]"). It also asumes that there won't be any closing parenthesis
> # between "AC_INIT(" and the closing ")" including comments and strings.
> AC_INIT([Google C++ Testing Framework],
>- [1.5.0],
>+ [1.8.0],
> [googletestframework@googlegroups.com],
> [gtest])
> 
> # Provide various options to initialize the Autoconf and configure processes.
> AC_PREREQ([2.59])
>-AC_CONFIG_SRCDIR([./COPYING])
>+AC_CONFIG_SRCDIR([./LICENSE])
>+AC_CONFIG_MACRO_DIR([m4])
> AC_CONFIG_AUX_DIR([build-aux])
> AC_CONFIG_HEADERS([build-aux/config.h])
> AC_CONFIG_FILES([Makefile])
>@@ -54,7 +55,7 @@ AS_IF([test "x$with_pthreads" != "xno"],
> [AC_MSG_FAILURE(
> [--with-pthreads was specified, but unable to be used])])])
> have_pthreads="$acx_pthread_ok"])
>-AM_CONDITIONAL([HAVE_PTHREADS],[test "x$have_pthreads" == "xyes"])
>+AM_CONDITIONAL([HAVE_PTHREADS],[test "x$have_pthreads" = "xyes"])
> AC_SUBST(PTHREAD_CFLAGS)
> AC_SUBST(PTHREAD_LIBS)
> 
>diff --git a/Source/ThirdParty/gtest/docs/Pkgconfig.md b/Source/ThirdParty/gtest/docs/Pkgconfig.md
>new file mode 100644
>index 0000000000000000000000000000000000000000..97612894d2a3c8eadb442c5587804fb7785eaa71
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/docs/Pkgconfig.md
>@@ -0,0 +1,146 @@
>+## Using GoogleTest from various build systems ##
>+
>+GoogleTest comes with pkg-config files that can be used to determine all
>+necessary flags for compiling and linking to GoogleTest (and GoogleMock).
>+Pkg-config is a standardised plain-text format containing
>+
>+ * the includedir (-I) path
>+ * necessary macro (-D) definitions
>+ * further required flags (-pthread)
>+ * the library (-L) path
>+ * the library (-l) to link to
>+
>+All current build systems support pkg-config in one way or another. For
>+all examples here we assume you want to compile the sample
>+`samples/sample3_unittest.cc`.
>+
>+
>+### CMake ###
>+
>+Using `pkg-config` in CMake is fairly easy:
>+
>+```
>+cmake_minimum_required(VERSION 3.0)
>+
>+cmake_policy(SET CMP0048 NEW)
>+project(my_gtest_pkgconfig VERSION 0.0.1 LANGUAGES CXX)
>+
>+find_package(PkgConfig)
>+pkg_search_module(GTEST REQUIRED gtest_main)
>+
>+add_executable(testapp samples/sample3_unittest.cc)
>+target_link_libraries(testapp ${GTEST_LDFLAGS})
>+target_compile_options(testapp PUBLIC ${GTEST_CFLAGS})
>+
>+include(CTest)
>+add_test(first_and_only_test testapp)
>+```
>+
>+It is generally recommended that you use `target_compile_options` + `_CFLAGS`
>+over `target_include_directories` + `_INCLUDE_DIRS` as the former includes not
>+just -I flags (GoogleTest might require a macro indicating to internal headers
>+that all libraries have been compiled with threading enabled. In addition,
>+GoogleTest might also require `-pthread` in the compiling step, and as such
>+splitting the pkg-config `Cflags` variable into include dirs and macros for
>+`target_compile_definitions()` might still miss this). The same recommendation
>+goes for using `_LDFLAGS` over the more commonplace `_LIBRARIES`, which
>+happens to discard `-L` flags and `-pthread`.
>+
>+
>+### Autotools ###
>+
>+Finding GoogleTest in Autoconf and using it from Automake is also fairly easy:
>+
>+In your `configure.ac`:
>+
>+```
>+AC_PREREQ([2.69])
>+AC_INIT([my_gtest_pkgconfig], [0.0.1])
>+AC_CONFIG_SRCDIR([samples/sample3_unittest.cc])
>+AC_PROG_CXX
>+
>+PKG_CHECK_MODULES([GTEST], [gtest_main])
>+
>+AM_INIT_AUTOMAKE([foreign subdir-objects])
>+AC_CONFIG_FILES([Makefile])
>+AC_OUTPUT
>+```
>+
>+and in your `Makefile.am`:
>+
>+```
>+check_PROGRAMS = testapp
>+TESTS = $(check_PROGRAMS)
>+
>+testapp_SOURCES = samples/sample3_unittest.cc
>+testapp_CXXFLAGS = $(GTEST_CFLAGS)
>+testapp_LDADD = $(GTEST_LIBS)
>+```
>+
>+
>+### Meson ###
>+
>+Meson natively uses pkgconfig to query dependencies:
>+
>+```
>+project('my_gtest_pkgconfig', 'cpp', version : '0.0.1')
>+
>+gtest_dep = dependency('gtest_main')
>+
>+testapp = executable(
>+ 'testapp',
>+ files(['samples/sample3_unittest.cc']),
>+ dependencies : gtest_dep,
>+ install : false)
>+
>+test('first_and_only_test', testapp)
>+```
>+
>+
>+### Plain Makefiles ###
>+
>+Since `pkg-config` is a small Unix command-line utility, it can be used
>+in handwritten `Makefile`s too:
>+
>+```
>+GTEST_CFLAGS = `pkg-config --cflags gtest_main`
>+GTEST_LIBS = `pkg-config --libs gtest_main`
>+
>+.PHONY: tests all
>+
>+tests: all
>+	./testapp
>+
>+all: testapp
>+
>+testapp: testapp.o
>+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $< -o $@ $(GTEST_LIBS)
>+
>+testapp.o: samples/sample3_unittest.cc
>+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $< -c -o $@ $(GTEST_CFLAGS)
>+```
>+
>+
>+### Help! pkg-config can't find GoogleTest! ###
>+
>+Let's say you have a `CMakeLists.txt` along the lines of the one in this
>+tutorial and you try to run `cmake`. It is very possible that you get a
>+failure along the lines of:
>+
>+```
>+-- Checking for one of the modules 'gtest_main'
>+CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:640 (message):
>+ None of the required 'gtest_main' found
>+```
>+
>+These failures are common if you installed GoogleTest yourself and have not
>+sourced it from a distro or other package manager. If so, you need to tell
>+pkg-config where it can find the `.pc` files containing the information.
>+Say you installed GoogleTest to `/usr/local`, then it might be that the
>+`.pc` files are installed under `/usr/local/lib64/pkgconfig`. If you set
>+
>+```
>+export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
>+```
>+
>+pkg-config will also try to look in `PKG_CONFIG_PATH` to find `gtest_main.pc`.
>diff --git a/Source/ThirdParty/gtest/docs/PumpManual.md b/Source/ThirdParty/gtest/docs/PumpManual.md
>new file mode 100644
>index 0000000000000000000000000000000000000000..827bb24b042dc543af4c409ad03e147ea5949b7b
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/docs/PumpManual.md
>@@ -0,0 +1,177 @@
>+
>+
>+Pump is Useful for Meta Programming.
>+
>+# The Problem #
>+
>+Template and macro libraries often need to define many classes,
>+functions, or macros that vary only (or almost only) in the number of
>+arguments they take. It's a lot of repetitive, mechanical, and
>+error-prone work.
>+
>+Variadic templates and variadic macros can alleviate the problem.
>+However, while both are being considered by the C++ committee, neither
>+is in the standard yet or widely supported by compilers. Thus they
>+are often not a good choice, especially when your code needs to be
>+portable. And their capabilities are still limited.
>+
>+As a result, authors of such libraries often have to write scripts to
>+generate their implementation. However, our experience is that it's
>+tedious to write such scripts, which tend to reflect the structure of
>+the generated code poorly and are often hard to read and edit. For
>+example, a small change needed in the generated code may require some
>+non-intuitive, non-trivial changes in the script. This is especially
>+painful when experimenting with the code.
>+
>+# Our Solution #
>+
>+Pump (for Pump is Useful for Meta Programming, Pretty Useful for Meta
>+Programming, or Practical Utility for Meta Programming, whichever you
>+prefer) is a simple meta-programming tool for C++. The idea is that a
>+programmer writes a `foo.pump` file which contains C++ code plus meta
>+code that manipulates the C++ code. The meta code can handle
>+iterations over a range, nested iterations, local meta variable
>+definitions, simple arithmetic, and conditional expressions. You can
>+view it as a small Domain-Specific Language. The meta language is
>+designed to be non-intrusive (s.t. it won't confuse Emacs' C++ mode,
>+for example) and concise, making Pump code intuitive and easy to
>+maintain.
>+
>+## Highlights ##
>+
>+ * The implementation is in a single Python script and thus ultra portable: no build or installation is needed and it works cross platforms.
>+ * Pump tries to be smart with respect to [Google's style guide](https://github.com/google/styleguide): it breaks long lines (easy to have when they are generated) at acceptable places to fit within 80 columns and indent the continuation lines correctly.
>+ * The format is human-readable and more concise than XML.
>+ * The format works relatively well with Emacs' C++ mode.
>+
>+## Examples ##
>+
>+The following Pump code (where meta keywords start with `$`, `[[` and `]]` are meta brackets, and `$$` starts a meta comment that ends with the line):
>+
>+```
>+$var n = 3 $$ Defines a meta variable n.
>+$range i 0..n $$ Declares the range of meta iterator i (inclusive).
>+$for i [[
>+ $$ Meta loop.
>+// Foo$i does blah for $i-ary predicates.
>+$range j 1..i
>+template <size_t N $for j [[, typename A$j]]>
>+class Foo$i {
>+$if i == 0 [[
>+ blah a;
>+]] $elif i <= 2 [[
>+ blah b;
>+]] $else [[
>+ blah c;
>+]]
>+};
>+
>+]]
>+```
>+
>+will be translated by the Pump compiler to:
>+
>+```
>+// Foo0 does blah for 0-ary predicates.
>+template <size_t N>
>+class Foo0 {
>+ blah a;
>+};
>+
>+// Foo1 does blah for 1-ary predicates.
>+template <size_t N, typename A1>
>+class Foo1 {
>+ blah b;
>+};
>+
>+// Foo2 does blah for 2-ary predicates.
>+template <size_t N, typename A1, typename A2>
>+class Foo2 {
>+ blah b;
>+};
>+
>+// Foo3 does blah for 3-ary predicates.
>+template <size_t N, typename A1, typename A2, typename A3>
>+class Foo3 {
>+ blah c;
>+};
>+```
>+
>+In another example,
>+
>+```
>+$range i 1..n
>+Func($for i + [[a$i]]);
>+$$ The text between i and [[ is the separator between iterations.
>+```
>+
>+will generate one of the following lines (without the comments), depending on the value of `n`:
>+
>+```
>+Func(); // If n is 0.
>+Func(a1); // If n is 1.
>+Func(a1 + a2); // If n is 2.
>+Func(a1 + a2 + a3); // If n is 3.
>+// And so on...
>+```
>+
>+## Constructs ##
>+
>+We support the following meta programming constructs:
>+
>+| `$var id = exp` | Defines a named constant value. `$id` is valid util the end of the current meta lexical block. |
>+|:----------------|:-----------------------------------------------------------------------------------------------|
>+| `$range id exp..exp` | Sets the range of an iteration variable, which can be reused in multiple loops later. |
>+| `$for id sep [[ code ]]` | Iteration. The range of `id` must have been defined earlier. `$id` is valid in `code`. |
>+| `$($)` | Generates a single `$` character. |
>+| `$id` | Value of the named constant or iteration variable. |
>+| `$(exp)` | Value of the expression. |
>+| `$if exp [[ code ]] else_branch` | Conditional. |
>+| `[[ code ]]` | Meta lexical block. |
>+| `cpp_code` | Raw C++ code. |
>+| `$$ comment` | Meta comment. |
>+
>+**Note:** To give the user some freedom in formatting the Pump source
>+code, Pump ignores a new-line character if it's right after `$for foo`
>+or next to `[[` or `]]`. Without this rule you'll often be forced to write
>+very long lines to get the desired output. Therefore sometimes you may
>+need to insert an extra new-line in such places for a new-line to show
>+up in your output.
>+
>+## Grammar ##
>+
>+```
>+code ::= atomic_code*
>+atomic_code ::= $var id = exp
>+ | $var id = [[ code ]]
>+ | $range id exp..exp
>+ | $for id sep [[ code ]]
>+ | $($)
>+ | $id
>+ | $(exp)
>+ | $if exp [[ code ]] else_branch
>+ | [[ code ]]
>+ | cpp_code
>+sep ::= cpp_code | empty_string
>+else_branch ::= $else [[ code ]]
>+ | $elif exp [[ code ]] else_branch
>+ | empty_string
>+exp ::= simple_expression_in_Python_syntax
>+```
>+
>+## Code ##
>+
>+You can find the source code of Pump in [scripts/pump.py](../scripts/pump.py). It is still
>+very unpolished and lacks automated tests, although it has been
>+successfully used many times. If you find a chance to use it in your
>+project, please let us know what you think! We also welcome help on
>+improving Pump.
>+
>+## Real Examples ##
>+
>+You can find real-world applications of Pump in [Google Test](https://github.com/google/googletest/tree/master/googletest) and [Google Mock](https://github.com/google/googletest/tree/master/googlemock). The source file `foo.h.pump` generates `foo.h`.
>+
>+## Tips ##
>+
>+ * If a meta variable is followed by a letter or digit, you can separate them using `[[]]`, which inserts an empty string. For example `Foo$j[[]]Helper` generate `Foo1Helper` when `j` is 1.
>+ * To avoid extra-long Pump source lines, you can break a line anywhere you want by inserting `[[]]` followed by a new line. Since any new-line character next to `[[` or `]]` is ignored, the generated code won't contain this new line.
>diff --git a/Source/ThirdParty/gtest/docs/XcodeGuide.md b/Source/ThirdParty/gtest/docs/XcodeGuide.md
>new file mode 100644
>index 0000000000000000000000000000000000000000..1c60a33dad43baf98381f7c9f20f69b558b2aad0
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/docs/XcodeGuide.md
>@@ -0,0 +1,93 @@
>+
>+
>+This guide will explain how to use the Google Testing Framework in your Xcode projects on Mac OS X. This tutorial begins by quickly explaining what to do for experienced users. After the quick start, the guide goes provides additional explanation about each step.
>+
>+# Quick Start #
>+
>+Here is the quick guide for using Google Test in your Xcode project.
>+
>+ 1. Download the source from the [website](https://github.com/google/googletest) using this command: `svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only`.
>+ 1. Open up the `gtest.xcodeproj` in the `googletest-read-only/xcode/` directory and build the gtest.framework.
>+ 1. Create a new "Shell Tool" target in your Xcode project called something like "UnitTests".
>+ 1. Add the gtest.framework to your project and add it to the "Link Binary with Libraries" build phase of "UnitTests".
>+ 1. Add your unit test source code to the "Compile Sources" build phase of "UnitTests".
>+ 1. Edit the "UnitTests" executable and add an environment variable named "DYLD\_FRAMEWORK\_PATH" with a value equal to the path to the framework containing the gtest.framework relative to the compiled executable.
>+ 1. Build and Go.
>+
>+The following sections further explain each of the steps listed above in depth, describing in more detail how to complete it including some variations.
>+
>+# Get the Source #
>+
>+Currently, the gtest.framework discussed here isn't available in a tagged release of Google Test, it is only available in the trunk. As explained at the Google Test [site](https://github.com/google/googletest), you can get the code from anonymous SVN with this command:
>+
>+```
>+svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only
>+```
>+
>+Alternatively, if you are working with Subversion in your own code base, you can add Google Test as an external dependency to your own Subversion repository. By following this approach, everyone that checks out your svn repository will also receive a copy of Google Test (a specific version, if you wish) without having to check it out explicitly. This makes the set up of your project simpler and reduces the copied code in the repository.
>+
>+To use `svn:externals`, decide where you would like to have the external source reside. You might choose to put the external source inside the trunk, because you want it to be part of the branch when you make a release. However, keeping it outside the trunk in a version-tagged directory called something like `third-party/googletest/1.0.1`, is another option. Once the location is established, use `svn propedit svn:externals _directory_` to set the svn:externals property on a directory in your repository. This directory won't contain the code, but be its versioned parent directory.
>+
>+The command `svn propedit` will bring up your Subversion editor, making editing the long, (potentially multi-line) property simpler. This same method can be used to check out a tagged branch, by using the appropriate URL (e.g. `https://github.com/google/googletest/releases/tag/release-1.0.1`). Additionally, the svn:externals property allows the specification of a particular revision of the trunk with the `-r_##_` option (e.g. `externals/src/googletest -r60 http://googletest.googlecode.com/svn/trunk`).
>+
>+Here is an example of using the svn:externals properties on a trunk (read via `svn propget`) of a project. This value checks out a copy of Google Test into the `trunk/externals/src/googletest/` directory.
>+
>+```
>+[Computer:svn] user$ svn propget svn:externals trunk
>+externals/src/googletest http://googletest.googlecode.com/svn/trunk
>+```
>+
>+# Add the Framework to Your Project #
>+
>+The next step is to build and add the gtest.framework to your own project. This guide describes two common ways below.
>+
>+ * **Option 1** --- The simplest way to add Google Test to your own project, is to open gtest.xcodeproj (found in the xcode/ directory of the Google Test trunk) and build the framework manually. Then, add the built framework into your project using the "Add->Existing Framework..." from the context menu or "Project->Add..." from the main menu. The gtest.framework is relocatable and contains the headers and object code that you'll need to make tests. This method requires rebuilding every time you upgrade Google Test in your project.
>+ * **Option 2** --- If you are going to be living off the trunk of Google Test, incorporating its latest features into your unit tests (or are a Google Test developer yourself). You'll want to rebuild the framework every time the source updates. to do this, you'll need to add the gtest.xcodeproj file, not the framework itself, to your own Xcode project. Then, from the build products that are revealed by the project's disclosure triangle, you can find the gtest.framework, which can be added to your targets (discussed below).
>+
>+# Make a Test Target #
>+
>+To start writing tests, make a new "Shell Tool" target. This target template is available under BSD, Cocoa, or Carbon. Add your unit test source code to the "Compile Sources" build phase of the target.
>+
>+Next, you'll want to add gtest.framework in two different ways, depending upon which option you chose above.
>+
>+ * **Option 1** --- During compilation, Xcode will need to know that you are linking against the gtest.framework. Add the gtest.framework to the "Link Binary with Libraries" build phase of your test target. This will include the Google Test headers in your header search path, and will tell the linker where to find the library.
>+ * **Option 2** --- If your working out of the trunk, you'll also want to add gtest.framework to your "Link Binary with Libraries" build phase of your test target. In addition, you'll want to add the gtest.framework as a dependency to your unit test target. This way, Xcode will make sure that gtest.framework is up to date, every time your build your target. Finally, if you don't share build directories with Google Test, you'll have to copy the gtest.framework into your own build products directory using a "Run Script" build phase.
>+
>+# Set Up the Executable Run Environment #
>+
>+Since the unit test executable is a shell tool, it doesn't have a bundle with a `Contents/Frameworks` directory, in which to place gtest.framework. Instead, the dynamic linker must be told at runtime to search for the framework in another location. This can be accomplished by setting the "DYLD\_FRAMEWORK\_PATH" environment variable in the "Edit Active Executable ..." Arguments tab, under "Variables to be set in the environment:". The path for this value is the path (relative or absolute) of the directory containing the gtest.framework.
>+
>+If you haven't set up the DYLD\_FRAMEWORK\_PATH, correctly, you might get a message like this:
>+
>+```
>+[Session started at 2008-08-15 06:23:57 -0600.]
>+ dyld: Library not loaded: @loader_path/../Frameworks/gtest.framework/Versions/A/gtest
>+ Referenced from: /Users/username/Documents/Sandbox/gtestSample/build/Debug/WidgetFrameworkTest
>+ Reason: image not found
>+```
>+
>+To correct this problem, go to to the directory containing the executable named in "Referenced from:" value in the error message above. Then, with the terminal in this location, find the relative path to the directory containing the gtest.framework. That is the value you'll need to set as the DYLD\_FRAMEWORK\_PATH.
>+
>+# Build and Go #
>+
>+Now, when you click "Build and Go", the test will be executed. Dumping out something like this:
>+
>+```
>+[Session started at 2008-08-06 06:36:13 -0600.]
>+[==========] Running 2 tests from 1 test case.
>+[----------] Global test environment set-up.
>+[----------] 2 tests from WidgetInitializerTest
>+[ RUN ] WidgetInitializerTest.TestConstructor
>+[ OK ] WidgetInitializerTest.TestConstructor
>+[ RUN ] WidgetInitializerTest.TestConversion
>+[ OK ] WidgetInitializerTest.TestConversion
>+[----------] Global test environment tear-down
>+[==========] 2 tests from 1 test case ran.
>+[ PASSED ] 2 tests.
>+
>+The Debugger has exited with status 0. 
>+```
>+
>+# Summary #
>+
>+Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
>diff --git a/Source/ThirdParty/gtest/docs/advanced.md b/Source/ThirdParty/gtest/docs/advanced.md
>new file mode 100644
>index 0000000000000000000000000000000000000000..8065d19621a8b37fb78cb5e0ed1b8618fe7625d2
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/docs/advanced.md
>@@ -0,0 +1,2520 @@
>+# Advanced googletest Topics
>+
>+
>+## Introduction
>+
>+Now that you have read the [googletest Primer](primer.md) and learned how to write
>+tests using googletest, it's time to learn some new tricks. This document will
>+show you more assertions as well as how to construct complex failure messages,
>+propagate fatal failures, reuse and speed up your test fixtures, and use various
>+flags with your tests.
>+
>+## More Assertions
>+
>+This section covers some less frequently used, but still significant,
>+assertions.
>+
>+### Explicit Success and Failure
>+
>+These three assertions do not actually test a value or expression. Instead, they
>+generate a success or failure directly. Like the macros that actually perform a
>+test, you may stream a custom failure message into them.
>+
>+```c++
>+SUCCEED();
>+```
>+
>+Generates a success. This does **NOT** make the overall test succeed. A test is
>+considered successful only if none of its assertions fail during its execution.
>+
>+NOTE: `SUCCEED()` is purely documentary and currently doesn't generate any
>+user-visible output. However, we may add `SUCCEED()` messages to googletest's
>+output in the future.
>+
>+```c++
>+FAIL();
>+ADD_FAILURE();
>+ADD_FAILURE_AT("file_path", line_number);
>+```
>+
>+`FAIL()` generates a fatal failure, while `ADD_FAILURE()` and `ADD_FAILURE_AT()`
>+generate a nonfatal failure. These are useful when control flow, rather than a
>+Boolean expression, determines the test's success or failure. For example, you
>+might want to write something like:
>+
>+```c++
>+switch(expression) {
>+ case 1:
>+ ... some checks ...
>+ case 2:
>+ ... some other checks ...
>+ default:
>+ FAIL() << "We shouldn't get here.";
>+}
>+```
>+
>+NOTE: you can only use `FAIL()` in functions that return `void`. See the
>+[Assertion Placement section](#assertion-placement) for more information.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+### Exception Assertions
>+
>+These are for verifying that a piece of code throws (or does not throw) an
>+exception of the given type:
>+
>+Fatal assertion | Nonfatal assertion | Verifies
>+------------------------------------------ | ------------------------------------------ | --------
>+`ASSERT_THROW(statement, exception_type);` | `EXPECT_THROW(statement, exception_type);` | `statement` throws an exception of the given type
>+`ASSERT_ANY_THROW(statement);` | `EXPECT_ANY_THROW(statement);` | `statement` throws an exception of any type
>+`ASSERT_NO_THROW(statement);` | `EXPECT_NO_THROW(statement);` | `statement` doesn't throw any exception
>+
>+Examples:
>+
>+```c++
>+ASSERT_THROW(Foo(5), bar_exception);
>+
>+EXPECT_NO_THROW({
>+ int n = 5;
>+ Bar(&n);
>+});
>+```
>+
>+**Availability**: Linux, Windows, Mac; requires exceptions to be enabled in the
>+build environment (note that `google3` **disables** exceptions).
>+
>+### Predicate Assertions for Better Error Messages
>+
>+Even though googletest has a rich set of assertions, they can never be complete,
>+as it's impossible (nor a good idea) to anticipate all scenarios a user might
>+run into. Therefore, sometimes a user has to use `EXPECT_TRUE()` to check a
>+complex expression, for lack of a better macro. This has the problem of not
>+showing you the values of the parts of the expression, making it hard to
>+understand what went wrong. As a workaround, some users choose to construct the
>+failure message by themselves, streaming it into `EXPECT_TRUE()`. However, this
>+is awkward especially when the expression has side-effects or is expensive to
>+evaluate.
>+
>+googletest gives you three different options to solve this problem:
>+
>+#### Using an Existing Boolean Function
>+
>+If you already have a function or functor that returns `bool` (or a type that
>+can be implicitly converted to `bool`), you can use it in a *predicate
>+assertion* to get the function arguments printed for free:
>+
>+| Fatal assertion | Nonfatal assertion | Verifies |
>+| ---------------------------------- | ---------------------------------- | --------------------------- |
>+| `ASSERT_PRED1(pred1, val1);` | `EXPECT_PRED1(pred1, val1);` | `pred1(val1)` is true |
>+| `ASSERT_PRED2(pred2, val1, val2);` | `EXPECT_PRED2(pred2, val1, val2);` | `pred2(val1, val2)` is true |
>+| `...` | `...` | ... |
>+
>+In the above, `predn` is an `n`-ary predicate function or functor, where `val1`,
>+`val2`, ..., and `valn` are its arguments. The assertion succeeds if the
>+predicate returns `true` when applied to the given arguments, and fails
>+otherwise. When the assertion fails, it prints the value of each argument. In
>+either case, the arguments are evaluated exactly once.
>+
>+Here's an example. Given
>+
>+```c++
>+// Returns true if m and n have no common divisors except 1.
>+bool MutuallyPrime(int m, int n) { ... }
>+
>+const int a = 3;
>+const int b = 4;
>+const int c = 10;
>+```
>+
>+the assertion
>+
>+```c++
>+ EXPECT_PRED2(MutuallyPrime, a, b);
>+```
>+
>+will succeed, while the assertion
>+
>+```c++
>+ EXPECT_PRED2(MutuallyPrime, b, c);
>+```
>+
>+will fail with the message
>+
>+```none
>+MutuallyPrime(b, c) is false, where
>+b is 4
>+c is 10
>+```
>+
>+> NOTE:
>+>
>+> 1. If you see a compiler error "no matching function to call" when using
>+> `ASSERT_PRED*` or `EXPECT_PRED*`, please see
>+> [this](faq.md#OverloadedPredicate) for how to resolve it.
>+> 1. Currently we only provide predicate assertions of arity <= 5. If you need
>+> a higher-arity assertion, let [us](https://github.com/google/googletest/issues) know.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+#### Using a Function That Returns an AssertionResult
>+
>+While `EXPECT_PRED*()` and friends are handy for a quick job, the syntax is not
>+satisfactory: you have to use different macros for different arities, and it
>+feels more like Lisp than C++. The `::testing::AssertionResult` class solves
>+this problem.
>+
>+An `AssertionResult` object represents the result of an assertion (whether it's
>+a success or a failure, and an associated message). You can create an
>+`AssertionResult` using one of these factory functions:
>+
>+```c++
>+namespace testing {
>+
>+// Returns an AssertionResult object to indicate that an assertion has
>+// succeeded.
>+AssertionResult AssertionSuccess();
>+
>+// Returns an AssertionResult object to indicate that an assertion has
>+// failed.
>+AssertionResult AssertionFailure();
>+
>+}
>+```
>+
>+You can then use the `<<` operator to stream messages to the `AssertionResult`
>+object.
>+
>+To provide more readable messages in Boolean assertions (e.g. `EXPECT_TRUE()`),
>+write a predicate function that returns `AssertionResult` instead of `bool`. For
>+example, if you define `IsEven()` as:
>+
>+```c++
>+::testing::AssertionResult IsEven(int n) {
>+ if ((n % 2) == 0)
>+ return ::testing::AssertionSuccess();
>+ else
>+ return ::testing::AssertionFailure() << n << " is odd";
>+}
>+```
>+
>+instead of:
>+
>+```c++
>+bool IsEven(int n) {
>+ return (n % 2) == 0;
>+}
>+```
>+
>+the failed assertion `EXPECT_TRUE(IsEven(Fib(4)))` will print:
>+
>+```none
>+Value of: IsEven(Fib(4))
>+ Actual: false (3 is odd)
>+Expected: true
>+```
>+
>+instead of a more opaque
>+
>+```none
>+Value of: IsEven(Fib(4))
>+ Actual: false
>+Expected: true
>+```
>+
>+If you want informative messages in `EXPECT_FALSE` and `ASSERT_FALSE` as well
>+(one third of Boolean assertions in the Google code base are negative ones), and
>+are fine with making the predicate slower in the success case, you can supply a
>+success message:
>+
>+```c++
>+::testing::AssertionResult IsEven(int n) {
>+ if ((n % 2) == 0)
>+ return ::testing::AssertionSuccess() << n << " is even";
>+ else
>+ return ::testing::AssertionFailure() << n << " is odd";
>+}
>+```
>+
>+Then the statement `EXPECT_FALSE(IsEven(Fib(6)))` will print
>+
>+```none
>+ Value of: IsEven(Fib(6))
>+ Actual: true (8 is even)
>+ Expected: false
>+```
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+#### Using a Predicate-Formatter
>+
>+If you find the default message generated by `(ASSERT|EXPECT)_PRED*` and
>+`(ASSERT|EXPECT)_(TRUE|FALSE)` unsatisfactory, or some arguments to your
>+predicate do not support streaming to `ostream`, you can instead use the
>+following *predicate-formatter assertions* to *fully* customize how the message
>+is formatted:
>+
>+Fatal assertion | Nonfatal assertion | Verifies
>+------------------------------------------------ | ------------------------------------------------ | --------
>+`ASSERT_PRED_FORMAT1(pred_format1, val1);` | `EXPECT_PRED_FORMAT1(pred_format1, val1);` | `pred_format1(val1)` is successful
>+`ASSERT_PRED_FORMAT2(pred_format2, val1, val2);` | `EXPECT_PRED_FORMAT2(pred_format2, val1, val2);` | `pred_format2(val1, val2)` is successful
>+`...` | `...` | ...
>+
>+The difference between this and the previous group of macros is that instead of
>+a predicate, `(ASSERT|EXPECT)_PRED_FORMAT*` take a *predicate-formatter*
>+(`pred_formatn`), which is a function or functor with the signature:
>+
>+```c++
>+::testing::AssertionResult PredicateFormattern(const char* expr1,
>+ const char* expr2,
>+ ...
>+ const char* exprn,
>+ T1 val1,
>+ T2 val2,
>+ ...
>+ Tn valn);
>+```
>+
>+where `val1`, `val2`, ..., and `valn` are the values of the predicate arguments,
>+and `expr1`, `expr2`, ..., and `exprn` are the corresponding expressions as they
>+appear in the source code. The types `T1`, `T2`, ..., and `Tn` can be either
>+value types or reference types. For example, if an argument has type `Foo`, you
>+can declare it as either `Foo` or `const Foo&`, whichever is appropriate.
>+
>+As an example, let's improve the failure message in `MutuallyPrime()`, which was
>+used with `EXPECT_PRED2()`:
>+
>+```c++
>+// Returns the smallest prime common divisor of m and n,
>+// or 1 when m and n are mutually prime.
>+int SmallestPrimeCommonDivisor(int m, int n) { ... }
>+
>+// A predicate-formatter for asserting that two integers are mutually prime.
>+::testing::AssertionResult AssertMutuallyPrime(const char* m_expr,
>+ const char* n_expr,
>+ int m,
>+ int n) {
>+ if (MutuallyPrime(m, n)) return ::testing::AssertionSuccess();
>+
>+ return ::testing::AssertionFailure() << m_expr << " and " << n_expr
>+ << " (" << m << " and " << n << ") are not mutually prime, "
>+ << "as they have a common divisor " << SmallestPrimeCommonDivisor(m, n);
>+}
>+```
>+
>+With this predicate-formatter, we can use
>+
>+```c++
>+ EXPECT_PRED_FORMAT2(AssertMutuallyPrime, b, c);
>+```
>+
>+to generate the message
>+
>+```none
>+b and c (4 and 10) are not mutually prime, as they have a common divisor 2.
>+```
>+
>+As you may have realized, many of the built-in assertions we introduced earlier
>+are special cases of `(EXPECT|ASSERT)_PRED_FORMAT*`. In fact, most of them are
>+indeed defined using `(EXPECT|ASSERT)_PRED_FORMAT*`.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+### Floating-Point Comparison
>+
>+Comparing floating-point numbers is tricky. Due to round-off errors, it is very
>+unlikely that two floating-points will match exactly. Therefore, `ASSERT_EQ` 's
>+naive comparison usually doesn't work. And since floating-points can have a wide
>+value range, no single fixed error bound works. It's better to compare by a
>+fixed relative error bound, except for values close to 0 due to the loss of
>+precision there.
>+
>+In general, for floating-point comparison to make sense, the user needs to
>+carefully choose the error bound. If they don't want or care to, comparing in
>+terms of Units in the Last Place (ULPs) is a good default, and googletest
>+provides assertions to do this. Full details about ULPs are quite long; if you
>+want to learn more, see
>+[here](https://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/).
>+
>+#### Floating-Point Macros
>+
>+| Fatal assertion | Nonfatal assertion | Verifies |
>+| ------------------------------- | ------------------------------ | ---------------------------------------- |
>+| `ASSERT_FLOAT_EQ(val1, val2);` | `EXPECT_FLOAT_EQ(val1,val2);` | the two `float` values are almost equal |
>+| `ASSERT_DOUBLE_EQ(val1, val2);` | `EXPECT_DOUBLE_EQ(val1, val2);`| the two `double` values are almost equal |
>+
>+By "almost equal" we mean the values are within 4 ULP's from each other.
>+
>+NOTE: `CHECK_DOUBLE_EQ()` in `base/logging.h` uses a fixed absolute error bound,
>+so its result may differ from that of the googletest macros. That macro is
>+unsafe and has been deprecated. Please don't use it any more.
>+
>+The following assertions allow you to choose the acceptable error bound:
>+
>+| Fatal assertion | Nonfatal assertion | Verifies |
>+| ------------------------------------- | ------------------------------------- | ------------------------- |
>+| `ASSERT_NEAR(val1, val2, abs_error);` | `EXPECT_NEAR(val1, val2, abs_error);` | the difference between `val1` and `val2` doesn't exceed the given absolute error |
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+#### Floating-Point Predicate-Format Functions
>+
>+Some floating-point operations are useful, but not that often used. In order to
>+avoid an explosion of new macros, we provide them as predicate-format functions
>+that can be used in predicate assertion macros (e.g. `EXPECT_PRED_FORMAT2`,
>+etc).
>+
>+```c++
>+EXPECT_PRED_FORMAT2(::testing::FloatLE, val1, val2);
>+EXPECT_PRED_FORMAT2(::testing::DoubleLE, val1, val2);
>+```
>+
>+Verifies that `val1` is less than, or almost equal to, `val2`. You can replace
>+`EXPECT_PRED_FORMAT2` in the above table with `ASSERT_PRED_FORMAT2`.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+### Asserting Using gMock Matchers
>+
>+Google-developed C++ mocking framework [gMock](../../googlemock) comes with a
>+library of matchers for validating arguments passed to mock objects. A gMock
>+*matcher* is basically a predicate that knows how to describe itself. It can be
>+used in these assertion macros:
>+
>+| Fatal assertion | Nonfatal assertion | Verifies |
>+| ------------------------------ | ------------------------------ | --------------------- |
>+| `ASSERT_THAT(value, matcher);` | `EXPECT_THAT(value, matcher);` | value matches matcher |
>+
>+For example, `StartsWith(prefix)` is a matcher that matches a string starting
>+with `prefix`, and you can write:
>+
>+```c++
>+using ::testing::StartsWith;
>+...
>+ // Verifies that Foo() returns a string starting with "Hello".
>+ EXPECT_THAT(Foo(), StartsWith("Hello"));
>+```
>+
>+Read this [recipe](../../googlemock/docs/CookBook.md#using-matchers-in-google-test-assertions) in
>+the gMock Cookbook for more details.
>+
>+gMock has a rich set of matchers. You can do many things googletest cannot do
>+alone with them. For a list of matchers gMock provides, read
>+[this](../../googlemock/docs/CookBook.md#using-matchers). Especially useful among them are
>+some [protocol buffer matchers](https://github.com/google/nucleus/blob/master/nucleus/testing/protocol-buffer-matchers.h). It's easy to write
>+your [own matchers](../../googlemock/docs/CookBook.md#writing-new-matchers-quickly) too.
>+
>+For example, you can use gMock's
>+[EqualsProto](https://github.com/google/nucleus/blob/master/nucleus/testing/protocol-buffer-matchers.h)
>+to compare protos in your tests:
>+
>+```c++
>+#include "testing/base/public/gmock.h"
>+using ::testing::EqualsProto;
>+...
>+ EXPECT_THAT(actual_proto, EqualsProto("foo: 123 bar: 'xyz'"));
>+ EXPECT_THAT(*actual_proto_ptr, EqualsProto(expected_proto));
>+```
>+
>+gMock is bundled with googletest, so you don't need to add any build dependency
>+in order to take advantage of this. Just include `"testing/base/public/gmock.h"`
>+and you're ready to go.
>+
>+**Availability**: Linux, Windows, and Mac.
>+
>+### More String Assertions
>+
>+(Please read the [previous](#AssertThat) section first if you haven't.)
>+
>+You can use the gMock [string matchers](../../googlemock/docs/CheatSheet.md#string-matchers)
>+with `EXPECT_THAT()` or `ASSERT_THAT()` to do more string comparison tricks
>+(sub-string, prefix, suffix, regular expression, and etc). For example,
>+
>+```c++
>+using ::testing::HasSubstr;
>+using ::testing::MatchesRegex;
>+...
>+ ASSERT_THAT(foo_string, HasSubstr("needle"));
>+ EXPECT_THAT(bar_string, MatchesRegex("\\w*\\d+"));
>+```
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+If the string contains a well-formed HTML or XML document, you can check whether
>+its DOM tree matches an [XPath
>+expression](http://www.w3.org/TR/xpath/#contents):
>+
>+```c++
>+// Currently still in //template/prototemplate/testing:xpath_matcher
>+#include "template/prototemplate/testing/xpath_matcher.h"
>+using prototemplate::testing::MatchesXPath;
>+EXPECT_THAT(html_string, MatchesXPath("//a[text()='click here']"));
>+```
>+
>+**Availability**: Linux.
>+
>+### Windows HRESULT assertions
>+
>+These assertions test for `HRESULT` success or failure.
>+
>+Fatal assertion | Nonfatal assertion | Verifies
>+-------------------------------------- | -------------------------------------- | --------
>+`ASSERT_HRESULT_SUCCEEDED(expression)` | `EXPECT_HRESULT_SUCCEEDED(expression)` | `expression` is a success `HRESULT`
>+`ASSERT_HRESULT_FAILED(expression)` | `EXPECT_HRESULT_FAILED(expression)` | `expression` is a failure `HRESULT`
>+
>+The generated output contains the human-readable error message associated with
>+the `HRESULT` code returned by `expression`.
>+
>+You might use them like this:
>+
>+```c++
>+CComPtr<IShellDispatch2> shell;
>+ASSERT_HRESULT_SUCCEEDED(shell.CoCreateInstance(L"Shell.Application"));
>+CComVariant empty;
>+ASSERT_HRESULT_SUCCEEDED(shell->ShellExecute(CComBSTR(url), empty, empty, empty, empty));
>+```
>+
>+**Availability**: Windows.
>+
>+### Type Assertions
>+
>+You can call the function
>+
>+```c++
>+::testing::StaticAssertTypeEq<T1, T2>();
>+```
>+
>+to assert that types `T1` and `T2` are the same. The function does nothing if
>+the assertion is satisfied. If the types are different, the function call will
>+fail to compile, and the compiler error message will likely (depending on the
>+compiler) show you the actual values of `T1` and `T2`. This is mainly useful
>+inside template code.
>+
>+**Caveat**: When used inside a member function of a class template or a function
>+template, `StaticAssertTypeEq<T1, T2>()` is effective only if the function is
>+instantiated. For example, given:
>+
>+```c++
>+template <typename T> class Foo {
>+ public:
>+ void Bar() { ::testing::StaticAssertTypeEq<int, T>(); }
>+};
>+```
>+
>+the code:
>+
>+```c++
>+void Test1() { Foo<bool> foo; }
>+```
>+
>+will not generate a compiler error, as `Foo<bool>::Bar()` is never actually
>+instantiated. Instead, you need:
>+
>+```c++
>+void Test2() { Foo<bool> foo; foo.Bar(); }
>+```
>+
>+to cause a compiler error.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+### Assertion Placement
>+
>+You can use assertions in any C++ function. In particular, it doesn't have to be
>+a method of the test fixture class. The one constraint is that assertions that
>+generate a fatal failure (`FAIL*` and `ASSERT_*`) can only be used in
>+void-returning functions. This is a consequence of Google's not using
>+exceptions. By placing it in a non-void function you'll get a confusing compile
>+error like `"error: void value not ignored as it ought to be"` or `"cannot
>+initialize return object of type 'bool' with an rvalue of type 'void'"` or
>+`"error: no viable conversion from 'void' to 'string'"`.
>+
>+If you need to use fatal assertions in a function that returns non-void, one
>+option is to make the function return the value in an out parameter instead. For
>+example, you can rewrite `T2 Foo(T1 x)` to `void Foo(T1 x, T2* result)`. You
>+need to make sure that `*result` contains some sensible value even when the
>+function returns prematurely. As the function now returns `void`, you can use
>+any assertion inside of it.
>+
>+If changing the function's type is not an option, you should just use assertions
>+that generate non-fatal failures, such as `ADD_FAILURE*` and `EXPECT_*`.
>+
>+NOTE: Constructors and destructors are not considered void-returning functions,
>+according to the C++ language specification, and so you may not use fatal
>+assertions in them. You'll get a compilation error if you try. A simple
>+workaround is to transfer the entire body of the constructor or destructor to a
>+private void-returning method. However, you should be aware that a fatal
>+assertion failure in a constructor does not terminate the current test, as your
>+intuition might suggest; it merely returns from the constructor early, possibly
>+leaving your object in a partially-constructed state. Likewise, a fatal
>+assertion failure in a destructor may leave your object in a
>+partially-destructed state. Use assertions carefully in these situations!
>+
>+## Teaching googletest How to Print Your Values
>+
>+When a test assertion such as `EXPECT_EQ` fails, googletest prints the argument
>+values to help you debug. It does this using a user-extensible value printer.
>+
>+This printer knows how to print built-in C++ types, native arrays, STL
>+containers, and any type that supports the `<<` operator. For other types, it
>+prints the raw bytes in the value and hopes that you the user can figure it out.
>+
>+As mentioned earlier, the printer is *extensible*. That means you can teach it
>+to do a better job at printing your particular type than to dump the bytes. To
>+do that, define `<<` for your type:
>+
>+```c++
>+// Streams are allowed only for logging. Don't include this for
>+// any other purpose.
>+#include <ostream>
>+
>+namespace foo {
>+
>+class Bar { // We want googletest to be able to print instances of this.
>+...
>+ // Create a free inline friend function.
>+ friend std::ostream& operator<<(std::ostream& os, const Bar& bar) {
>+ return os << bar.DebugString(); // whatever needed to print bar to os
>+ }
>+};
>+
>+// If you can't declare the function in the class it's important that the
>+// << operator is defined in the SAME namespace that defines Bar. C++'s look-up
>+// rules rely on that.
>+std::ostream& operator<<(std::ostream& os, const Bar& bar) {
>+ return os << bar.DebugString(); // whatever needed to print bar to os
>+}
>+
>+} // namespace foo
>+```
>+
>+Sometimes, this might not be an option: your team may consider it bad style to
>+have a `<<` operator for `Bar`, or `Bar` may already have a `<<` operator that
>+doesn't do what you want (and you cannot change it). If so, you can instead
>+define a `PrintTo()` function like this:
>+
>+```c++
>+// Streams are allowed only for logging. Don't include this for
>+// any other purpose.
>+#include <ostream>
>+
>+namespace foo {
>+
>+class Bar {
>+ ...
>+ friend void PrintTo(const Bar& bar, std::ostream* os) {
>+ *os << bar.DebugString(); // whatever needed to print bar to os
>+ }
>+};
>+
>+// If you can't declare the function in the class it's important that PrintTo()
>+// is defined in the SAME namespace that defines Bar. C++'s look-up rules rely
>+// on that.
>+void PrintTo(const Bar& bar, std::ostream* os) {
>+ *os << bar.DebugString(); // whatever needed to print bar to os
>+}
>+
>+} // namespace foo
>+```
>+
>+If you have defined both `<<` and `PrintTo()`, the latter will be used when
>+googletest is concerned. This allows you to customize how the value appears in
>+googletest's output without affecting code that relies on the behavior of its
>+`<<` operator.
>+
>+If you want to print a value `x` using googletest's value printer yourself, just
>+call `::testing::PrintToString(x)`, which returns an `std::string`:
>+
>+```c++
>+vector<pair<Bar, int> > bar_ints = GetBarIntVector();
>+
>+EXPECT_TRUE(IsCorrectBarIntVector(bar_ints))
>+ << "bar_ints = " << ::testing::PrintToString(bar_ints);
>+```
>+
>+## Death Tests
>+
>+In many applications, there are assertions that can cause application failure if
>+a condition is not met. These sanity checks, which ensure that the program is in
>+a known good state, are there to fail at the earliest possible time after some
>+program state is corrupted. If the assertion checks the wrong condition, then
>+the program may proceed in an erroneous state, which could lead to memory
>+corruption, security holes, or worse. Hence it is vitally important to test that
>+such assertion statements work as expected.
>+
>+Since these precondition checks cause the processes to die, we call such tests
>+_death tests_. More generally, any test that checks that a program terminates
>+(except by throwing an exception) in an expected fashion is also a death test.
>+
>+
>+Note that if a piece of code throws an exception, we don't consider it "death"
>+for the purpose of death tests, as the caller of the code could catch the
>+exception and avoid the crash. If you want to verify exceptions thrown by your
>+code, see [Exception Assertions](#exception-assertions).
>+
>+If you want to test `EXPECT_*()/ASSERT_*()` failures in your test code, see
>+Catching Failures
>+
>+### How to Write a Death Test
>+
>+googletest has the following macros to support death tests:
>+
>+Fatal assertion | Nonfatal assertion | Verifies
>+---------------------------------------------- | ---------------------------------------------- | --------
>+`ASSERT_DEATH(statement, regex);` | `EXPECT_DEATH(statement, regex);` | `statement` crashes with the given error
>+`ASSERT_DEATH_IF_SUPPORTED(statement, regex);` | `EXPECT_DEATH_IF_SUPPORTED(statement, regex);` | if death tests are supported, verifies that `statement` crashes with the given error; otherwise verifies nothing
>+`ASSERT_EXIT(statement, predicate, regex);` | `EXPECT_EXIT(statement, predicate, regex);` | `statement` exits with the given error, and its exit code matches `predicate`
>+
>+where `statement` is a statement that is expected to cause the process to die,
>+`predicate` is a function or function object that evaluates an integer exit
>+status, and `regex` is a (Perl) regular expression that the stderr output of
>+`statement` is expected to match. Note that `statement` can be *any valid
>+statement* (including *compound statement*) and doesn't have to be an
>+expression.
>+
>+
>+As usual, the `ASSERT` variants abort the current test function, while the
>+`EXPECT` variants do not.
>+
>+> NOTE: We use the word "crash" here to mean that the process terminates with a
>+> *non-zero* exit status code. There are two possibilities: either the process
>+> has called `exit()` or `_exit()` with a non-zero value, or it may be killed by
>+> a signal.
>+>
>+> This means that if `*statement*` terminates the process with a 0 exit code, it
>+> is *not* considered a crash by `EXPECT_DEATH`. Use `EXPECT_EXIT` instead if
>+> this is the case, or if you want to restrict the exit code more precisely.
>+
>+A predicate here must accept an `int` and return a `bool`. The death test
>+succeeds only if the predicate returns `true`. googletest defines a few
>+predicates that handle the most common cases:
>+
>+```c++
>+::testing::ExitedWithCode(exit_code)
>+```
>+
>+This expression is `true` if the program exited normally with the given exit
>+code.
>+
>+```c++
>+::testing::KilledBySignal(signal_number) // Not available on Windows.
>+```
>+
>+This expression is `true` if the program was killed by the given signal.
>+
>+The `*_DEATH` macros are convenient wrappers for `*_EXIT` that use a predicate
>+that verifies the process' exit code is non-zero.
>+
>+Note that a death test only cares about three things:
>+
>+1. does `statement` abort or exit the process?
>+2. (in the case of `ASSERT_EXIT` and `EXPECT_EXIT`) does the exit status
>+ satisfy `predicate`? Or (in the case of `ASSERT_DEATH` and `EXPECT_DEATH`)
>+ is the exit status non-zero? And
>+3. does the stderr output match `regex`?
>+
>+In particular, if `statement` generates an `ASSERT_*` or `EXPECT_*` failure, it
>+will **not** cause the death test to fail, as googletest assertions don't abort
>+the process.
>+
>+To write a death test, simply use one of the above macros inside your test
>+function. For example,
>+
>+```c++
>+TEST(MyDeathTest, Foo) {
>+ // This death test uses a compound statement.
>+ ASSERT_DEATH({
>+ int n = 5;
>+ Foo(&n);
>+ }, "Error on line .* of Foo()");
>+}
>+
>+TEST(MyDeathTest, NormalExit) {
>+ EXPECT_EXIT(NormalExit(), ::testing::ExitedWithCode(0), "Success");
>+}
>+
>+TEST(MyDeathTest, KillMyself) {
>+ EXPECT_EXIT(KillMyself(), ::testing::KilledBySignal(SIGKILL),
>+ "Sending myself unblockable signal");
>+}
>+```
>+
>+verifies that:
>+
>+* calling `Foo(5)` causes the process to die with the given error message,
>+* calling `NormalExit()` causes the process to print `"Success"` to stderr and
>+ exit with exit code 0, and
>+* calling `KillMyself()` kills the process with signal `SIGKILL`.
>+
>+The test function body may contain other assertions and statements as well, if
>+necessary.
>+
>+### Death Test Naming
>+
>+IMPORTANT: We strongly recommend you to follow the convention of naming your
>+**test case** (not test) `*DeathTest` when it contains a death test, as
>+demonstrated in the above example. The [Death Tests And
>+Threads](#death-tests-and-threads) section below explains why.
>+
>+If a test fixture class is shared by normal tests and death tests, you can use
>+`using` or `typedef` to introduce an alias for the fixture class and avoid
>+duplicating its code:
>+
>+```c++
>+class FooTest : public ::testing::Test { ... };
>+
>+using FooDeathTest = FooTest;
>+
>+TEST_F(FooTest, DoesThis) {
>+ // normal test
>+}
>+
>+TEST_F(FooDeathTest, DoesThat) {
>+ // death test
>+}
>+```
>+
>+**Availability**: Linux, Windows (requires MSVC 8.0 or above), Cygwin, and Mac
>+
>+### Regular Expression Syntax
>+
>+
>+On POSIX systems (e.g. Linux, Cygwin, and Mac), googletest uses the
>+[POSIX extended regular expression](http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04)
>+syntax. To learn about this syntax, you may want to read this
>+[Wikipedia entry](http://en.wikipedia.org/wiki/Regular_expression#POSIX_Extended_Regular_Expressions).
>+
>+On Windows, googletest uses its own simple regular expression implementation. It
>+lacks many features. For example, we don't support union (`"x|y"`), grouping
>+(`"(xy)"`), brackets (`"[xy]"`), and repetition count (`"x{5,7}"`), among
>+others. Below is what we do support (`A` denotes a literal character, period
>+(`.`), or a single `\\ ` escape sequence; `x` and `y` denote regular
>+expressions.):
>+
>+Expression | Meaning
>+---------- | --------------------------------------------------------------
>+`c` | matches any literal character `c`
>+`\\d` | matches any decimal digit
>+`\\D` | matches any character that's not a decimal digit
>+`\\f` | matches `\f`
>+`\\n` | matches `\n`
>+`\\r` | matches `\r`
>+`\\s` | matches any ASCII whitespace, including `\n`
>+`\\S` | matches any character that's not a whitespace
>+`\\t` | matches `\t`
>+`\\v` | matches `\v`
>+`\\w` | matches any letter, `_`, or decimal digit
>+`\\W` | matches any character that `\\w` doesn't match
>+`\\c` | matches any literal character `c`, which must be a punctuation
>+`.` | matches any single character except `\n`
>+`A?` | matches 0 or 1 occurrences of `A`
>+`A*` | matches 0 or many occurrences of `A`
>+`A+` | matches 1 or many occurrences of `A`
>+`^` | matches the beginning of a string (not that of each line)
>+`$` | matches the end of a string (not that of each line)
>+`xy` | matches `x` followed by `y`
>+
>+To help you determine which capability is available on your system, googletest
>+defines macros to govern which regular expression it is using. The macros are:
>+`GTEST_USES_PCRE=1`, or
>+ `GTEST_USES_SIMPLE_RE=1` or `GTEST_USES_POSIX_RE=1`. If
>+you want your death tests to work in all cases, you can either `#if` on these
>+macros or use the more limited syntax only.
>+
>+### How It Works
>+
>+Under the hood, `ASSERT_EXIT()` spawns a new process and executes the death test
>+statement in that process. The details of how precisely that happens depend on
>+the platform and the variable ::testing::GTEST_FLAG(death_test_style) (which is
>+initialized from the command-line flag `--gtest_death_test_style`).
>+
>+* On POSIX systems, `fork()` (or `clone()` on Linux) is used to spawn the
>+ child, after which:
>+ * If the variable's value is `"fast"`, the death test statement is
>+ immediately executed.
>+ * If the variable's value is `"threadsafe"`, the child process re-executes
>+ the unit test binary just as it was originally invoked, but with some
>+ extra flags to cause just the single death test under consideration to
>+ be run.
>+* On Windows, the child is spawned using the `CreateProcess()` API, and
>+ re-executes the binary to cause just the single death test under
>+ consideration to be run - much like the `threadsafe` mode on POSIX.
>+
>+Other values for the variable are illegal and will cause the death test to fail.
>+Currently, the flag's default value is
>+"fast". However, we reserve
>+the right to change it in the future. Therefore, your tests should not depend on
>+this. In either case, the parent process waits for the child process to
>+complete, and checks that
>+
>+1. the child's exit status satisfies the predicate, and
>+2. the child's stderr matches the regular expression.
>+
>+If the death test statement runs to completion without dying, the child process
>+will nonetheless terminate, and the assertion fails.
>+
>+### Death Tests And Threads
>+
>+The reason for the two death test styles has to do with thread safety. Due to
>+well-known problems with forking in the presence of threads, death tests should
>+be run in a single-threaded context. Sometimes, however, it isn't feasible to
>+arrange that kind of environment. For example, statically-initialized modules
>+may start threads before main is ever reached. Once threads have been created,
>+it may be difficult or impossible to clean them up.
>+
>+googletest has three features intended to raise awareness of threading issues.
>+
>+1. A warning is emitted if multiple threads are running when a death test is
>+ encountered.
>+2. Test cases with a name ending in "DeathTest" are run before all other tests.
>+3. It uses `clone()` instead of `fork()` to spawn the child process on Linux
>+ (`clone()` is not available on Cygwin and Mac), as `fork()` is more likely
>+ to cause the child to hang when the parent process has multiple threads.
>+
>+It's perfectly fine to create threads inside a death test statement; they are
>+executed in a separate process and cannot affect the parent.
>+
>+### Death Test Styles
>+
>+
>+The "threadsafe" death test style was introduced in order to help mitigate the
>+risks of testing in a possibly multithreaded environment. It trades increased
>+test execution time (potentially dramatically so) for improved thread safety.
>+
>+The automated testing framework does not set the style flag. You can choose a
>+particular style of death tests by setting the flag programmatically:
>+
>+```c++
>+testing::FLAGS_gtest_death_test_style="threadsafe"
>+```
>+
>+You can do this in `main()` to set the style for all death tests in the binary,
>+or in individual tests. Recall that flags are saved before running each test and
>+restored afterwards, so you need not do that yourself. For example:
>+
>+```c++
>+int main(int argc, char** argv) {
>+ InitGoogle(argv[0], &argc, &argv, true);
>+ ::testing::FLAGS_gtest_death_test_style = "fast";
>+ return RUN_ALL_TESTS();
>+}
>+
>+TEST(MyDeathTest, TestOne) {
>+ ::testing::FLAGS_gtest_death_test_style = "threadsafe";
>+ // This test is run in the "threadsafe" style:
>+ ASSERT_DEATH(ThisShouldDie(), "");
>+}
>+
>+TEST(MyDeathTest, TestTwo) {
>+ // This test is run in the "fast" style:
>+ ASSERT_DEATH(ThisShouldDie(), "");
>+}
>+```
>+
>+
>+### Caveats
>+
>+The `statement` argument of `ASSERT_EXIT()` can be any valid C++ statement. If
>+it leaves the current function via a `return` statement or by throwing an
>+exception, the death test is considered to have failed. Some googletest macros
>+may return from the current function (e.g. `ASSERT_TRUE()`), so be sure to avoid
>+them in `statement`.
>+
>+Since `statement` runs in the child process, any in-memory side effect (e.g.
>+modifying a variable, releasing memory, etc) it causes will *not* be observable
>+in the parent process. In particular, if you release memory in a death test,
>+your program will fail the heap check as the parent process will never see the
>+memory reclaimed. To solve this problem, you can
>+
>+1. try not to free memory in a death test;
>+2. free the memory again in the parent process; or
>+3. do not use the heap checker in your program.
>+
>+Due to an implementation detail, you cannot place multiple death test assertions
>+on the same line; otherwise, compilation will fail with an unobvious error
>+message.
>+
>+Despite the improved thread safety afforded by the "threadsafe" style of death
>+test, thread problems such as deadlock are still possible in the presence of
>+handlers registered with `pthread_atfork(3)`.
>+
>+
>+## Using Assertions in Sub-routines
>+
>+### Adding Traces to Assertions
>+
>+If a test sub-routine is called from several places, when an assertion inside it
>+fails, it can be hard to tell which invocation of the sub-routine the failure is
>+from. 
>+You can alleviate this problem using extra logging or custom failure messages,
>+but that usually clutters up your tests. A better solution is to use the
>+`SCOPED_TRACE` macro or the `ScopedTrace` utility:
>+
>+```c++
>+SCOPED_TRACE(message);
>+ScopedTrace trace("file_path", line_number, message);
>+```
>+
>+where `message` can be anything streamable to `std::ostream`. `SCOPED_TRACE`
>+macro will cause the current file name, line number, and the given message to be
>+added in every failure message. `ScopedTrace` accepts explicit file name and
>+line number in arguments, which is useful for writing test helpers. The effect
>+will be undone when the control leaves the current lexical scope.
>+
>+For example,
>+
>+```c++
>+10: void Sub1(int n) {
>+11: EXPECT_EQ(1, Bar(n));
>+12: EXPECT_EQ(2, Bar(n + 1));
>+13: }
>+14:
>+15: TEST(FooTest, Bar) {
>+16: {
>+17: SCOPED_TRACE("A"); // This trace point will be included in
>+18: // every failure in this scope.
>+19: Sub1(1);
>+20: }
>+21: // Now it won't.
>+22: Sub1(9);
>+23: }
>+```
>+
>+could result in messages like these:
>+
>+```none
>+path/to/foo_test.cc:11: Failure
>+Value of: Bar(n)
>+Expected: 1
>+ Actual: 2
>+ Trace:
>+path/to/foo_test.cc:17: A
>+
>+path/to/foo_test.cc:12: Failure
>+Value of: Bar(n + 1)
>+Expected: 2
>+ Actual: 3
>+```
>+
>+Without the trace, it would've been difficult to know which invocation of
>+`Sub1()` the two failures come from respectively. (You could add
>+
>+an extra message to each assertion in `Sub1()` to indicate the value of `n`, but
>+that's tedious.)
>+
>+Some tips on using `SCOPED_TRACE`:
>+
>+1. With a suitable message, it's often enough to use `SCOPED_TRACE` at the
>+ beginning of a sub-routine, instead of at each call site.
>+2. When calling sub-routines inside a loop, make the loop iterator part of the
>+ message in `SCOPED_TRACE` such that you can know which iteration the failure
>+ is from.
>+3. Sometimes the line number of the trace point is enough for identifying the
>+ particular invocation of a sub-routine. In this case, you don't have to
>+ choose a unique message for `SCOPED_TRACE`. You can simply use `""`.
>+4. You can use `SCOPED_TRACE` in an inner scope when there is one in the outer
>+ scope. In this case, all active trace points will be included in the failure
>+ messages, in reverse order they are encountered.
>+5. The trace dump is clickable in Emacs - hit `return` on a line number and
>+ you'll be taken to that line in the source file!
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+### Propagating Fatal Failures
>+
>+A common pitfall when using `ASSERT_*` and `FAIL*` is not understanding that
>+when they fail they only abort the _current function_, not the entire test. For
>+example, the following test will segfault:
>+
>+```c++
>+void Subroutine() {
>+ // Generates a fatal failure and aborts the current function.
>+ ASSERT_EQ(1, 2);
>+
>+ // The following won't be executed.
>+ ...
>+}
>+
>+TEST(FooTest, Bar) {
>+ Subroutine(); // The intended behavior is for the fatal failure
>+ // in Subroutine() to abort the entire test.
>+
>+ // The actual behavior: the function goes on after Subroutine() returns.
>+ int* p = NULL;
>+ *p = 3; // Segfault!
>+}
>+```
>+
>+To alleviate this, googletest provides three different solutions. You could use
>+either exceptions, the `(ASSERT|EXPECT)_NO_FATAL_FAILURE` assertions or the
>+`HasFatalFailure()` function. They are described in the following two
>+subsections.
>+
>+#### Asserting on Subroutines with an exception
>+
>+The following code can turn ASSERT-failure into an exception:
>+
>+```c++
>+class ThrowListener : public testing::EmptyTestEventListener {
>+ void OnTestPartResult(const testing::TestPartResult& result) override {
>+ if (result.type() == testing::TestPartResult::kFatalFailure) {
>+ throw testing::AssertionException(result);
>+ }
>+ }
>+};
>+int main(int argc, char** argv) {
>+ ...
>+ testing::UnitTest::GetInstance()->listeners().Append(new ThrowListener);
>+ return RUN_ALL_TESTS();
>+}
>+```
>+
>+This listener should be added after other listeners if you have any, otherwise
>+they won't see failed `OnTestPartResult`.
>+
>+#### Asserting on Subroutines
>+
>+As shown above, if your test calls a subroutine that has an `ASSERT_*` failure
>+in it, the test will continue after the subroutine returns. This may not be what
>+you want.
>+
>+Often people want fatal failures to propagate like exceptions. For that
>+googletest offers the following macros:
>+
>+Fatal assertion | Nonfatal assertion | Verifies
>+------------------------------------- | ------------------------------------- | --------
>+`ASSERT_NO_FATAL_FAILURE(statement);` | `EXPECT_NO_FATAL_FAILURE(statement);` | `statement` doesn't generate any new fatal failures in the current thread.
>+
>+Only failures in the thread that executes the assertion are checked to determine
>+the result of this type of assertions. If `statement` creates new threads,
>+failures in these threads are ignored.
>+
>+Examples:
>+
>+```c++
>+ASSERT_NO_FATAL_FAILURE(Foo());
>+
>+int i;
>+EXPECT_NO_FATAL_FAILURE({
>+ i = Bar();
>+});
>+```
>+
>+**Availability**: Linux, Windows, Mac. Assertions from multiple threads are
>+currently not supported on Windows.
>+
>+#### Checking for Failures in the Current Test
>+
>+`HasFatalFailure()` in the `::testing::Test` class returns `true` if an
>+assertion in the current test has suffered a fatal failure. This allows
>+functions to catch fatal failures in a sub-routine and return early.
>+
>+```c++
>+class Test {
>+ public:
>+ ...
>+ static bool HasFatalFailure();
>+};
>+```
>+
>+The typical usage, which basically simulates the behavior of a thrown exception,
>+is:
>+
>+```c++
>+TEST(FooTest, Bar) {
>+ Subroutine();
>+ // Aborts if Subroutine() had a fatal failure.
>+ if (HasFatalFailure()) return;
>+
>+ // The following won't be executed.
>+ ...
>+}
>+```
>+
>+If `HasFatalFailure()` is used outside of `TEST()` , `TEST_F()` , or a test
>+fixture, you must add the `::testing::Test::` prefix, as in:
>+
>+```c++
>+if (::testing::Test::HasFatalFailure()) return;
>+```
>+
>+Similarly, `HasNonfatalFailure()` returns `true` if the current test has at
>+least one non-fatal failure, and `HasFailure()` returns `true` if the current
>+test has at least one failure of either kind.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+## Logging Additional Information
>+
>+In your test code, you can call `RecordProperty("key", value)` to log additional
>+information, where `value` can be either a string or an `int`. The *last* value
>+recorded for a key will be emitted to the [XML output](#generating-an-xml-report) if you
>+specify one. For example, the test
>+
>+```c++
>+TEST_F(WidgetUsageTest, MinAndMaxWidgets) {
>+ RecordProperty("MaximumWidgets", ComputeMaxUsage());
>+ RecordProperty("MinimumWidgets", ComputeMinUsage());
>+}
>+```
>+
>+will output XML like this:
>+
>+```xml
>+ ...
>+ <testcase name="MinAndMaxWidgets" status="run" time="0.006" classname="WidgetUsageTest" MaximumWidgets="12" MinimumWidgets="9" />
>+ ...
>+```
>+
>+> NOTE:
>+>
>+> * `RecordProperty()` is a static member of the `Test` class. Therefore it
>+> needs to be prefixed with `::testing::Test::` if used outside of the
>+> `TEST` body and the test fixture class.
>+> * `*key*` must be a valid XML attribute name, and cannot conflict with the
>+> ones already used by googletest (`name`, `status`, `time`, `classname`,
>+> `type_param`, and `value_param`).
>+> * Calling `RecordProperty()` outside of the lifespan of a test is allowed.
>+> If it's called outside of a test but between a test case's
>+> `SetUpTestCase()` and `TearDownTestCase()` methods, it will be attributed
>+> to the XML element for the test case. If it's called outside of all test
>+> cases (e.g. in a test environment), it will be attributed to the top-level
>+> XML element.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+## Sharing Resources Between Tests in the Same Test Case
>+
>+googletest creates a new test fixture object for each test in order to make
>+tests independent and easier to debug. However, sometimes tests use resources
>+that are expensive to set up, making the one-copy-per-test model prohibitively
>+expensive.
>+
>+If the tests don't change the resource, there's no harm in their sharing a
>+single resource copy. So, in addition to per-test set-up/tear-down, googletest
>+also supports per-test-case set-up/tear-down. To use it:
>+
>+1. In your test fixture class (say `FooTest` ), declare as `static` some member
>+ variables to hold the shared resources.
>+1. Outside your test fixture class (typically just below it), define those
>+ member variables, optionally giving them initial values.
>+1. In the same test fixture class, define a `static void SetUpTestCase()`
>+ function (remember not to spell it as **`SetupTestCase`** with a small `u`!)
>+ to set up the shared resources and a `static void TearDownTestCase()`
>+ function to tear them down.
>+
>+That's it! googletest automatically calls `SetUpTestCase()` before running the
>+*first test* in the `FooTest` test case (i.e. before creating the first
>+`FooTest` object), and calls `TearDownTestCase()` after running the *last test*
>+in it (i.e. after deleting the last `FooTest` object). In between, the tests can
>+use the shared resources.
>+
>+Remember that the test order is undefined, so your code can't depend on a test
>+preceding or following another. Also, the tests must either not modify the state
>+of any shared resource, or, if they do modify the state, they must restore the
>+state to its original value before passing control to the next test.
>+
>+Here's an example of per-test-case set-up and tear-down:
>+
>+```c++
>+class FooTest : public ::testing::Test {
>+ protected:
>+ // Per-test-case set-up.
>+ // Called before the first test in this test case.
>+ // Can be omitted if not needed.
>+ static void SetUpTestCase() {
>+ shared_resource_ = new ...;
>+ }
>+
>+ // Per-test-case tear-down.
>+ // Called after the last test in this test case.
>+ // Can be omitted if not needed.
>+ static void TearDownTestCase() {
>+ delete shared_resource_;
>+ shared_resource_ = NULL;
>+ }
>+
>+ // You can define per-test set-up logic as usual.
>+ virtual void SetUp() { ... }
>+
>+ // You can define per-test tear-down logic as usual.
>+ virtual void TearDown() { ... }
>+
>+ // Some expensive resource shared by all tests.
>+ static T* shared_resource_;
>+};
>+
>+T* FooTest::shared_resource_ = NULL;
>+
>+TEST_F(FooTest, Test1) {
>+ ... you can refer to shared_resource_ here ...
>+}
>+
>+TEST_F(FooTest, Test2) {
>+ ... you can refer to shared_resource_ here ...
>+}
>+```
>+
>+NOTE: Though the above code declares `SetUpTestCase()` protected, it may
>+sometimes be necessary to declare it public, such as when using it with
>+`TEST_P`.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+## Global Set-Up and Tear-Down
>+
>+Just as you can do set-up and tear-down at the test level and the test case
>+level, you can also do it at the test program level. Here's how.
>+
>+First, you subclass the `::testing::Environment` class to define a test
>+environment, which knows how to set-up and tear-down:
>+
>+```c++
>+class Environment {
>+ public:
>+ virtual ~Environment() {}
>+
>+ // Override this to define how to set up the environment.
>+ virtual void SetUp() {}
>+
>+ // Override this to define how to tear down the environment.
>+ virtual void TearDown() {}
>+};
>+```
>+
>+Then, you register an instance of your environment class with googletest by
>+calling the `::testing::AddGlobalTestEnvironment()` function:
>+
>+```c++
>+Environment* AddGlobalTestEnvironment(Environment* env);
>+```
>+
>+Now, when `RUN_ALL_TESTS()` is called, it first calls the `SetUp()` method of
>+the environment object, then runs the tests if there was no fatal failures, and
>+finally calls `TearDown()` of the environment object.
>+
>+It's OK to register multiple environment objects. In this case, their `SetUp()`
>+will be called in the order they are registered, and their `TearDown()` will be
>+called in the reverse order.
>+
>+Note that googletest takes ownership of the registered environment objects.
>+Therefore **do not delete them** by yourself.
>+
>+You should call `AddGlobalTestEnvironment()` before `RUN_ALL_TESTS()` is called,
>+probably in `main()`. If you use `gtest_main`, you need to call this before
>+`main()` starts for it to take effect. One way to do this is to define a global
>+variable like this:
>+
>+```c++
>+::testing::Environment* const foo_env =
>+ ::testing::AddGlobalTestEnvironment(new FooEnvironment);
>+```
>+
>+However, we strongly recommend you to write your own `main()` and call
>+`AddGlobalTestEnvironment()` there, as relying on initialization of global
>+variables makes the code harder to read and may cause problems when you register
>+multiple environments from different translation units and the environments have
>+dependencies among them (remember that the compiler doesn't guarantee the order
>+in which global variables from different translation units are initialized).
>+
>+## Value-Parameterized Tests
>+
>+*Value-parameterized tests* allow you to test your code with different
>+parameters without writing multiple copies of the same test. This is useful in a
>+number of situations, for example:
>+
>+* You have a piece of code whose behavior is affected by one or more
>+ command-line flags. You want to make sure your code performs correctly for
>+ various values of those flags.
>+* You want to test different implementations of an OO interface.
>+* You want to test your code over various inputs (a.k.a. data-driven testing).
>+ This feature is easy to abuse, so please exercise your good sense when doing
>+ it!
>+
>+### How to Write Value-Parameterized Tests
>+
>+To write value-parameterized tests, first you should define a fixture class. It
>+must be derived from both `::testing::Test` and
>+`::testing::WithParamInterface<T>` (the latter is a pure interface), where `T`
>+is the type of your parameter values. For convenience, you can just derive the
>+fixture class from `::testing::TestWithParam<T>`, which itself is derived from
>+both `::testing::Test` and `::testing::WithParamInterface<T>`. `T` can be any
>+copyable type. If it's a raw pointer, you are responsible for managing the
>+lifespan of the pointed values.
>+
>+NOTE: If your test fixture defines `SetUpTestCase()` or `TearDownTestCase()`
>+they must be declared **public** rather than **protected** in order to use
>+`TEST_P`.
>+
>+```c++
>+class FooTest :
>+ public ::testing::TestWithParam<const char*> {
>+ // You can implement all the usual fixture class members here.
>+ // To access the test parameter, call GetParam() from class
>+ // TestWithParam<T>.
>+};
>+
>+// Or, when you want to add parameters to a pre-existing fixture class:
>+class BaseTest : public ::testing::Test {
>+ ...
>+};
>+class BarTest : public BaseTest,
>+ public ::testing::WithParamInterface<const char*> {
>+ ...
>+};
>+```
>+
>+Then, use the `TEST_P` macro to define as many test patterns using this fixture
>+as you want. The `_P` suffix is for "parameterized" or "pattern", whichever you
>+prefer to think.
>+
>+```c++
>+TEST_P(FooTest, DoesBlah) {
>+ // Inside a test, access the test parameter with the GetParam() method
>+ // of the TestWithParam<T> class:
>+ EXPECT_TRUE(foo.Blah(GetParam()));
>+ ...
>+}
>+
>+TEST_P(FooTest, HasBlahBlah) {
>+ ...
>+}
>+```
>+
>+Finally, you can use `INSTANTIATE_TEST_CASE_P` to instantiate the test case with
>+any set of parameters you want. googletest defines a number of functions for
>+generating test parameters. They return what we call (surprise!) *parameter
>+generators*. Here is a summary of them, which are all in the `testing`
>+namespace:
>+
>+| Parameter Generator | Behavior |
>+| ---------------------------- | ------------------------------------------- |
>+| `Range(begin, end [, step])` | Yields values `{begin, begin+step, begin+step+step, ...}`. The values do not include `end`. `step` defaults to 1. |
>+| `Values(v1, v2, ..., vN)` | Yields values `{v1, v2, ..., vN}`. |
>+| `ValuesIn(container)` and `ValuesIn(begin,end)` | Yields values from a C-style array, an STL-style container, or an iterator range `[begin, end)`. |
>+| `Bool()` | Yields sequence `{false, true}`. |
>+| `Combine(g1, g2, ..., gN)` | Yields all combinations (Cartesian product) as std\:\:tuples of the values generated by the `N` generators. |
>+
>+For more details, see the comments at the definitions of these functions.
>+
>+The following statement will instantiate tests from the `FooTest` test case each
>+with parameter values `"meeny"`, `"miny"`, and `"moe"`.
>+
>+```c++
>+INSTANTIATE_TEST_CASE_P(InstantiationName,
>+ FooTest,
>+ ::testing::Values("meeny", "miny", "moe"));
>+```
>+
>+NOTE: The code above must be placed at global or namespace scope, not at
>+function scope.
>+
>+NOTE: Don't forget this step! If you do your test will silently pass, but none
>+of its cases will ever run!
>+
>+To distinguish different instances of the pattern (yes, you can instantiate it
>+more than once), the first argument to `INSTANTIATE_TEST_CASE_P` is a prefix
>+that will be added to the actual test case name. Remember to pick unique
>+prefixes for different instantiations. The tests from the instantiation above
>+will have these names:
>+
>+* `InstantiationName/FooTest.DoesBlah/0` for `"meeny"`
>+* `InstantiationName/FooTest.DoesBlah/1` for `"miny"`
>+* `InstantiationName/FooTest.DoesBlah/2` for `"moe"`
>+* `InstantiationName/FooTest.HasBlahBlah/0` for `"meeny"`
>+* `InstantiationName/FooTest.HasBlahBlah/1` for `"miny"`
>+* `InstantiationName/FooTest.HasBlahBlah/2` for `"moe"`
>+
>+You can use these names in [`--gtest_filter`](#running-a-subset-of-the-tests).
>+
>+This statement will instantiate all tests from `FooTest` again, each with
>+parameter values `"cat"` and `"dog"`:
>+
>+```c++
>+const char* pets[] = {"cat", "dog"};
>+INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest,
>+ ::testing::ValuesIn(pets));
>+```
>+
>+The tests from the instantiation above will have these names:
>+
>+* `AnotherInstantiationName/FooTest.DoesBlah/0` for `"cat"`
>+* `AnotherInstantiationName/FooTest.DoesBlah/1` for `"dog"`
>+* `AnotherInstantiationName/FooTest.HasBlahBlah/0` for `"cat"`
>+* `AnotherInstantiationName/FooTest.HasBlahBlah/1` for `"dog"`
>+
>+Please note that `INSTANTIATE_TEST_CASE_P` will instantiate *all* tests in the
>+given test case, whether their definitions come before or *after* the
>+`INSTANTIATE_TEST_CASE_P` statement.
>+
>+You can see sample7_unittest.cc and sample8_unittest.cc for more examples.
>+
>+**Availability**: Linux, Windows (requires MSVC 8.0 or above), Mac
>+
>+### Creating Value-Parameterized Abstract Tests
>+
>+In the above, we define and instantiate `FooTest` in the *same* source file.
>+Sometimes you may want to define value-parameterized tests in a library and let
>+other people instantiate them later. This pattern is known as *abstract tests*.
>+As an example of its application, when you are designing an interface you can
>+write a standard suite of abstract tests (perhaps using a factory function as
>+the test parameter) that all implementations of the interface are expected to
>+pass. When someone implements the interface, they can instantiate your suite to
>+get all the interface-conformance tests for free.
>+
>+To define abstract tests, you should organize your code like this:
>+
>+1. Put the definition of the parameterized test fixture class (e.g. `FooTest`)
>+ in a header file, say `foo_param_test.h`. Think of this as *declaring* your
>+ abstract tests.
>+1. Put the `TEST_P` definitions in `foo_param_test.cc`, which includes
>+ `foo_param_test.h`. Think of this as *implementing* your abstract tests.
>+
>+Once they are defined, you can instantiate them by including `foo_param_test.h`,
>+invoking `INSTANTIATE_TEST_CASE_P()`, and depending on the library target that
>+contains `foo_param_test.cc`. You can instantiate the same abstract test case
>+multiple times, possibly in different source files.
>+
>+### Specifying Names for Value-Parameterized Test Parameters
>+
>+The optional last argument to `INSTANTIATE_TEST_CASE_P()` allows the user to
>+specify a function or functor that generates custom test name suffixes based on
>+the test parameters. The function should accept one argument of type
>+`testing::TestParamInfo<class ParamType>`, and return `std::string`.
>+
>+`testing::PrintToStringParamName` is a builtin test suffix generator that
>+returns the value of `testing::PrintToString(GetParam())`. It does not work for
>+`std::string` or C strings.
>+
>+NOTE: test names must be non-empty, unique, and may only contain ASCII
>+alphanumeric characters. In particular, they [should not contain
>+underscores](https://g3doc.corp.google.com/third_party/googletest/googletest/g3doc/faq.md#no-underscores).
>+
>+```c++
>+class MyTestCase : public testing::TestWithParam<int> {};
>+
>+TEST_P(MyTestCase, MyTest)
>+{
>+ std::cout << "Example Test Param: " << GetParam() << std::endl;
>+}
>+
>+INSTANTIATE_TEST_CASE_P(MyGroup, MyTestCase, testing::Range(0, 10),
>+ testing::PrintToStringParamName());
>+```
>+
>+## Typed Tests</id>
>+
>+Suppose you have multiple implementations of the same interface and want to make
>+sure that all of them satisfy some common requirements. Or, you may have defined
>+several types that are supposed to conform to the same "concept" and you want to
>+verify it. In both cases, you want the same test logic repeated for different
>+types.
>+
>+While you can write one `TEST` or `TEST_F` for each type you want to test (and
>+you may even factor the test logic into a function template that you invoke from
>+the `TEST`), it's tedious and doesn't scale: if you want `m` tests over `n`
>+types, you'll end up writing `m*n` `TEST`s.
>+
>+*Typed tests* allow you to repeat the same test logic over a list of types. You
>+only need to write the test logic once, although you must know the type list
>+when writing typed tests. Here's how you do it:
>+
>+First, define a fixture class template. It should be parameterized by a type.
>+Remember to derive it from `::testing::Test`:
>+
>+```c++
>+template <typename T>
>+class FooTest : public ::testing::Test {
>+ public:
>+ ...
>+ typedef std::list<T> List;
>+ static T shared_;
>+ T value_;
>+};
>+```
>+
>+Next, associate a list of types with the test case, which will be repeated for
>+each type in the list:
>+
>+```c++
>+using MyTypes = ::testing::Types<char, int, unsigned int>;
>+TYPED_TEST_CASE(FooTest, MyTypes);
>+```
>+
>+The type alias (`using` or `typedef`) is necessary for the `TYPED_TEST_CASE`
>+macro to parse correctly. Otherwise the compiler will think that each comma in
>+the type list introduces a new macro argument.
>+
>+Then, use `TYPED_TEST()` instead of `TEST_F()` to define a typed test for this
>+test case. You can repeat this as many times as you want:
>+
>+```c++
>+TYPED_TEST(FooTest, DoesBlah) {
>+ // Inside a test, refer to the special name TypeParam to get the type
>+ // parameter. Since we are inside a derived class template, C++ requires
>+ // us to visit the members of FooTest via 'this'.
>+ TypeParam n = this->value_;
>+
>+ // To visit static members of the fixture, add the 'TestFixture::'
>+ // prefix.
>+ n += TestFixture::shared_;
>+
>+ // To refer to typedefs in the fixture, add the 'typename TestFixture::'
>+ // prefix. The 'typename' is required to satisfy the compiler.
>+ typename TestFixture::List values;
>+
>+ values.push_back(n);
>+ ...
>+}
>+
>+TYPED_TEST(FooTest, HasPropertyA) { ... }
>+```
>+
>+You can see sample6_unittest.cc
>+
>+**Availability**: Linux, Windows (requires MSVC 8.0 or above), Mac
>+
>+## Type-Parameterized Tests
>+
>+*Type-parameterized tests* are like typed tests, except that they don't require
>+you to know the list of types ahead of time. Instead, you can define the test
>+logic first and instantiate it with different type lists later. You can even
>+instantiate it more than once in the same program.
>+
>+If you are designing an interface or concept, you can define a suite of
>+type-parameterized tests to verify properties that any valid implementation of
>+the interface/concept should have. Then, the author of each implementation can
>+just instantiate the test suite with their type to verify that it conforms to
>+the requirements, without having to write similar tests repeatedly. Here's an
>+example:
>+
>+First, define a fixture class template, as we did with typed tests:
>+
>+```c++
>+template <typename T>
>+class FooTest : public ::testing::Test {
>+ ...
>+};
>+```
>+
>+Next, declare that you will define a type-parameterized test case:
>+
>+```c++
>+TYPED_TEST_CASE_P(FooTest);
>+```
>+
>+Then, use `TYPED_TEST_P()` to define a type-parameterized test. You can repeat
>+this as many times as you want:
>+
>+```c++
>+TYPED_TEST_P(FooTest, DoesBlah) {
>+ // Inside a test, refer to TypeParam to get the type parameter.
>+ TypeParam n = 0;
>+ ...
>+}
>+
>+TYPED_TEST_P(FooTest, HasPropertyA) { ... }
>+```
>+
>+Now the tricky part: you need to register all test patterns using the
>+`REGISTER_TYPED_TEST_CASE_P` macro before you can instantiate them. The first
>+argument of the macro is the test case name; the rest are the names of the tests
>+in this test case:
>+
>+```c++
>+REGISTER_TYPED_TEST_CASE_P(FooTest,
>+ DoesBlah, HasPropertyA);
>+```
>+
>+Finally, you are free to instantiate the pattern with the types you want. If you
>+put the above code in a header file, you can `#include` it in multiple C++
>+source files and instantiate it multiple times.
>+
>+```c++
>+typedef ::testing::Types<char, int, unsigned int> MyTypes;
>+INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes);
>+```
>+
>+To distinguish different instances of the pattern, the first argument to the
>+`INSTANTIATE_TYPED_TEST_CASE_P` macro is a prefix that will be added to the
>+actual test case name. Remember to pick unique prefixes for different instances.
>+
>+In the special case where the type list contains only one type, you can write
>+that type directly without `::testing::Types<...>`, like this:
>+
>+```c++
>+INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, int);
>+```
>+
>+You can see `sample6_unittest.cc` for a complete example.
>+
>+**Availability**: Linux, Windows (requires MSVC 8.0 or above), Mac
>+
>+## Testing Private Code
>+
>+If you change your software's internal implementation, your tests should not
>+break as long as the change is not observable by users. Therefore, **per the
>+black-box testing principle, most of the time you should test your code through
>+its public interfaces.**
>+
>+**If you still find yourself needing to test internal implementation code,
>+consider if there's a better design.** The desire to test internal
>+implementation is often a sign that the class is doing too much. Consider
>+extracting an implementation class, and testing it. Then use that implementation
>+class in the original class.
>+
>+If you absolutely have to test non-public interface code though, you can. There
>+are two cases to consider:
>+
>+* Static functions ( *not* the same as static member functions!) or unnamed
>+ namespaces, and
>+* Private or protected class members
>+
>+To test them, we use the following special techniques:
>+
>+* Both static functions and definitions/declarations in an unnamed namespace
>+ are only visible within the same translation unit. To test them, you can
>+ `#include` the entire `.cc` file being tested in your `*_test.cc` file.
>+ (including `.cc` files is not a good way to reuse code - you should not do
>+ this in production code!)
>+
>+ However, a better approach is to move the private code into the
>+ `foo::internal` namespace, where `foo` is the namespace your project
>+ normally uses, and put the private declarations in a `*-internal.h` file.
>+ Your production `.cc` files and your tests are allowed to include this
>+ internal header, but your clients are not. This way, you can fully test your
>+ internal implementation without leaking it to your clients.
>+
>+* Private class members are only accessible from within the class or by
>+ friends. To access a class' private members, you can declare your test
>+ fixture as a friend to the class and define accessors in your fixture. Tests
>+ using the fixture can then access the private members of your production
>+ class via the accessors in the fixture. Note that even though your fixture
>+ is a friend to your production class, your tests are not automatically
>+ friends to it, as they are technically defined in sub-classes of the
>+ fixture.
>+
>+ Another way to test private members is to refactor them into an
>+ implementation class, which is then declared in a `*-internal.h` file. Your
>+ clients aren't allowed to include this header but your tests can. Such is
>+ called the
>+ [Pimpl](https://www.gamedev.net/articles/programming/general-and-gameplay-programming/the-c-pimpl-r1794/)
>+ (Private Implementation) idiom.
>+
>+ Or, you can declare an individual test as a friend of your class by adding
>+ this line in the class body:
>+
>+ ```c++
>+ FRIEND_TEST(TestCaseName, TestName);
>+ ```
>+
>+ For example,
>+
>+ ```c++
>+ // foo.h
>+
>+ #include "gtest/gtest_prod.h"
>+
>+ class Foo {
>+ ...
>+ private:
>+ FRIEND_TEST(FooTest, BarReturnsZeroOnNull);
>+
>+ int Bar(void* x);
>+ };
>+
>+ // foo_test.cc
>+ ...
>+ TEST(FooTest, BarReturnsZeroOnNull) {
>+ Foo foo;
>+ EXPECT_EQ(0, foo.Bar(NULL)); // Uses Foo's private member Bar().
>+ }
>+ ```
>+
>+ Pay special attention when your class is defined in a namespace, as you
>+ should define your test fixtures and tests in the same namespace if you want
>+ them to be friends of your class. For example, if the code to be tested
>+ looks like:
>+
>+ ```c++
>+ namespace my_namespace {
>+
>+ class Foo {
>+ friend class FooTest;
>+ FRIEND_TEST(FooTest, Bar);
>+ FRIEND_TEST(FooTest, Baz);
>+ ... definition of the class Foo ...
>+ };
>+
>+ } // namespace my_namespace
>+ ```
>+
>+ Your test code should be something like:
>+
>+ ```c++
>+ namespace my_namespace {
>+
>+ class FooTest : public ::testing::Test {
>+ protected:
>+ ...
>+ };
>+
>+ TEST_F(FooTest, Bar) { ... }
>+ TEST_F(FooTest, Baz) { ... }
>+
>+ } // namespace my_namespace
>+ ```
>+
>+
>+## "Catching" Failures
>+
>+If you are building a testing utility on top of googletest, you'll want to test
>+your utility. What framework would you use to test it? googletest, of course.
>+
>+The challenge is to verify that your testing utility reports failures correctly.
>+In frameworks that report a failure by throwing an exception, you could catch
>+the exception and assert on it. But googletest doesn't use exceptions, so how do
>+we test that a piece of code generates an expected failure?
>+
>+gunit-spi.h contains some constructs to do this. After #including this header,
>+you can use
>+
>+```c++
>+ EXPECT_FATAL_FAILURE(statement, substring);
>+```
>+
>+to assert that `statement` generates a fatal (e.g. `ASSERT_*`) failure in the
>+current thread whose message contains the given `substring`, or use
>+
>+```c++
>+ EXPECT_NONFATAL_FAILURE(statement, substring);
>+```
>+
>+if you are expecting a non-fatal (e.g. `EXPECT_*`) failure.
>+
>+Only failures in the current thread are checked to determine the result of this
>+type of expectations. If `statement` creates new threads, failures in these
>+threads are also ignored. If you want to catch failures in other threads as
>+well, use one of the following macros instead:
>+
>+```c++
>+ EXPECT_FATAL_FAILURE_ON_ALL_THREADS(statement, substring);
>+ EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(statement, substring);
>+```
>+
>+NOTE: Assertions from multiple threads are currently not supported on Windows.
>+
>+For technical reasons, there are some caveats:
>+
>+1. You cannot stream a failure message to either macro.
>+
>+1. `statement` in `EXPECT_FATAL_FAILURE{_ON_ALL_THREADS}()` cannot reference
>+ local non-static variables or non-static members of `this` object.
>+
>+1. `statement` in `EXPECT_FATAL_FAILURE{_ON_ALL_THREADS}()()` cannot return a
>+ value.
>+
>+
>+## Getting the Current Test's Name
>+
>+Sometimes a function may need to know the name of the currently running test.
>+For example, you may be using the `SetUp()` method of your test fixture to set
>+the golden file name based on which test is running. The `::testing::TestInfo`
>+class has this information:
>+
>+```c++
>+namespace testing {
>+
>+class TestInfo {
>+ public:
>+ // Returns the test case name and the test name, respectively.
>+ //
>+ // Do NOT delete or free the return value - it's managed by the
>+ // TestInfo class.
>+ const char* test_case_name() const;
>+ const char* name() const;
>+};
>+
>+}
>+```
>+
>+To obtain a `TestInfo` object for the currently running test, call
>+`current_test_info()` on the `UnitTest` singleton object:
>+
>+```c++
>+ // Gets information about the currently running test.
>+ // Do NOT delete the returned object - it's managed by the UnitTest class.
>+ const ::testing::TestInfo* const test_info =
>+ ::testing::UnitTest::GetInstance()->current_test_info();
>+
>+
>+
>+ printf("We are in test %s of test case %s.\n",
>+ test_info->name(),
>+ test_info->test_case_name());
>+```
>+
>+`current_test_info()` returns a null pointer if no test is running. In
>+particular, you cannot find the test case name in `TestCaseSetUp()`,
>+`TestCaseTearDown()` (where you know the test case name implicitly), or
>+functions called from them.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+## Extending googletest by Handling Test Events
>+
>+googletest provides an **event listener API** to let you receive notifications
>+about the progress of a test program and test failures. The events you can
>+listen to include the start and end of the test program, a test case, or a test
>+method, among others. You may use this API to augment or replace the standard
>+console output, replace the XML output, or provide a completely different form
>+of output, such as a GUI or a database. You can also use test events as
>+checkpoints to implement a resource leak checker, for example.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+### Defining Event Listeners
>+
>+To define a event listener, you subclass either testing::TestEventListener or
>+testing::EmptyTestEventListener The former is an (abstract) interface, where
>+*each pure virtual method can be overridden to handle a test event* (For
>+example, when a test starts, the `OnTestStart()` method will be called.). The
>+latter provides an empty implementation of all methods in the interface, such
>+that a subclass only needs to override the methods it cares about.
>+
>+When an event is fired, its context is passed to the handler function as an
>+argument. The following argument types are used:
>+
>+* UnitTest reflects the state of the entire test program,
>+* TestCase has information about a test case, which can contain one or more
>+ tests,
>+* TestInfo contains the state of a test, and
>+* TestPartResult represents the result of a test assertion.
>+
>+An event handler function can examine the argument it receives to find out
>+interesting information about the event and the test program's state.
>+
>+Here's an example:
>+
>+```c++
>+ class MinimalistPrinter : public ::testing::EmptyTestEventListener {
>+ // Called before a test starts.
>+ virtual void OnTestStart(const ::testing::TestInfo& test_info) {
>+ printf("*** Test %s.%s starting.\n",
>+ test_info.test_case_name(), test_info.name());
>+ }
>+
>+ // Called after a failed assertion or a SUCCESS().
>+ virtual void OnTestPartResult(const ::testing::TestPartResult& test_part_result) {
>+ printf("%s in %s:%d\n%s\n",
>+ test_part_result.failed() ? "*** Failure" : "Success",
>+ test_part_result.file_name(),
>+ test_part_result.line_number(),
>+ test_part_result.summary());
>+ }
>+
>+ // Called after a test ends.
>+ virtual void OnTestEnd(const ::testing::TestInfo& test_info) {
>+ printf("*** Test %s.%s ending.\n",
>+ test_info.test_case_name(), test_info.name());
>+ }
>+ };
>+```
>+
>+### Using Event Listeners
>+
>+To use the event listener you have defined, add an instance of it to the
>+googletest event listener list (represented by class TestEventListeners - note
>+the "s" at the end of the name) in your `main()` function, before calling
>+`RUN_ALL_TESTS()`:
>+
>+```c++
>+int main(int argc, char** argv) {
>+ ::testing::InitGoogleTest(&argc, argv);
>+ // Gets hold of the event listener list.
>+ ::testing::TestEventListeners& listeners =
>+ ::testing::UnitTest::GetInstance()->listeners();
>+ // Adds a listener to the end. googletest takes the ownership.
>+ listeners.Append(new MinimalistPrinter);
>+ return RUN_ALL_TESTS();
>+}
>+```
>+
>+There's only one problem: the default test result printer is still in effect, so
>+its output will mingle with the output from your minimalist printer. To suppress
>+the default printer, just release it from the event listener list and delete it.
>+You can do so by adding one line:
>+
>+```c++
>+ ...
>+ delete listeners.Release(listeners.default_result_printer());
>+ listeners.Append(new MinimalistPrinter);
>+ return RUN_ALL_TESTS();
>+```
>+
>+Now, sit back and enjoy a completely different output from your tests. For more
>+details, you can read this sample9_unittest.cc
>+
>+You may append more than one listener to the list. When an `On*Start()` or
>+`OnTestPartResult()` event is fired, the listeners will receive it in the order
>+they appear in the list (since new listeners are added to the end of the list,
>+the default text printer and the default XML generator will receive the event
>+first). An `On*End()` event will be received by the listeners in the *reverse*
>+order. This allows output by listeners added later to be framed by output from
>+listeners added earlier.
>+
>+### Generating Failures in Listeners
>+
>+You may use failure-raising macros (`EXPECT_*()`, `ASSERT_*()`, `FAIL()`, etc)
>+when processing an event. There are some restrictions:
>+
>+1. You cannot generate any failure in `OnTestPartResult()` (otherwise it will
>+ cause `OnTestPartResult()` to be called recursively).
>+1. A listener that handles `OnTestPartResult()` is not allowed to generate any
>+ failure.
>+
>+When you add listeners to the listener list, you should put listeners that
>+handle `OnTestPartResult()` *before* listeners that can generate failures. This
>+ensures that failures generated by the latter are attributed to the right test
>+by the former.
>+
>+We have a sample of failure-raising listener sample10_unittest.cc
>+
>+## Running Test Programs: Advanced Options
>+
>+googletest test programs are ordinary executables. Once built, you can run them
>+directly and affect their behavior via the following environment variables
>+and/or command line flags. For the flags to work, your programs must call
>+`::testing::InitGoogleTest()` before calling `RUN_ALL_TESTS()`.
>+
>+To see a list of supported flags and their usage, please run your test program
>+with the `--help` flag. You can also use `-h`, `-?`, or `/?` for short.
>+
>+If an option is specified both by an environment variable and by a flag, the
>+latter takes precedence.
>+
>+### Selecting Tests
>+
>+#### Listing Test Names
>+
>+Sometimes it is necessary to list the available tests in a program before
>+running them so that a filter may be applied if needed. Including the flag
>+`--gtest_list_tests` overrides all other flags and lists tests in the following
>+format:
>+
>+```none
>+TestCase1.
>+ TestName1
>+ TestName2
>+TestCase2.
>+ TestName
>+```
>+
>+None of the tests listed are actually run if the flag is provided. There is no
>+corresponding environment variable for this flag.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+#### Running a Subset of the Tests
>+
>+By default, a googletest program runs all tests the user has defined. Sometimes,
>+you want to run only a subset of the tests (e.g. for debugging or quickly
>+verifying a change). If you set the `GTEST_FILTER` environment variable or the
>+`--gtest_filter` flag to a filter string, googletest will only run the tests
>+whose full names (in the form of `TestCaseName.TestName`) match the filter.
>+
>+The format of a filter is a '`:`'-separated list of wildcard patterns (called
>+the *positive patterns*) optionally followed by a '`-`' and another
>+'`:`'-separated pattern list (called the *negative patterns*). A test matches
>+the filter if and only if it matches any of the positive patterns but does not
>+match any of the negative patterns.
>+
>+A pattern may contain `'*'` (matches any string) or `'?'` (matches any single
>+character). For convenience, the filter
>+
>+`'*-NegativePatterns'` can be also written as `'-NegativePatterns'`.
>+
>+For example:
>+
>+* `./foo_test` Has no flag, and thus runs all its tests.
>+* `./foo_test --gtest_filter=*` Also runs everything, due to the single
>+ match-everything `*` value.
>+* `./foo_test --gtest_filter=FooTest.*` Runs everything in test case `FooTest`
>+ .
>+* `./foo_test --gtest_filter=*Null*:*Constructor*` Runs any test whose full
>+ name contains either `"Null"` or `"Constructor"` .
>+* `./foo_test --gtest_filter=-*DeathTest.*` Runs all non-death tests.
>+* `./foo_test --gtest_filter=FooTest.*-FooTest.Bar` Runs everything in test
>+ case `FooTest` except `FooTest.Bar`.
>+* `./foo_test --gtest_filter=FooTest.*:BarTest.*-FooTest.Bar:BarTest.Foo` Runs
>+ everything in test case `FooTest` except `FooTest.Bar` and everything in
>+ test case `BarTest` except `BarTest.Foo`.
>+ 
>+#### Temporarily Disabling Tests
>+
>+If you have a broken test that you cannot fix right away, you can add the
>+`DISABLED_` prefix to its name. This will exclude it from execution. This is
>+better than commenting out the code or using `#if 0`, as disabled tests are
>+still compiled (and thus won't rot).
>+
>+If you need to disable all tests in a test case, you can either add `DISABLED_`
>+to the front of the name of each test, or alternatively add it to the front of
>+the test case name.
>+
>+For example, the following tests won't be run by googletest, even though they
>+will still be compiled:
>+
>+```c++
>+// Tests that Foo does Abc.
>+TEST(FooTest, DISABLED_DoesAbc) { ... }
>+
>+class DISABLED_BarTest : public ::testing::Test { ... };
>+
>+// Tests that Bar does Xyz.
>+TEST_F(DISABLED_BarTest, DoesXyz) { ... }
>+```
>+
>+NOTE: This feature should only be used for temporary pain-relief. You still have
>+to fix the disabled tests at a later date. As a reminder, googletest will print
>+a banner warning you if a test program contains any disabled tests.
>+
>+TIP: You can easily count the number of disabled tests you have using `gsearch`
>+and/or `grep`. This number can be used as a metric for improving your test
>+quality.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+#### Temporarily Enabling Disabled Tests
>+
>+To include disabled tests in test execution, just invoke the test program with
>+the `--gtest_also_run_disabled_tests` flag or set the
>+`GTEST_ALSO_RUN_DISABLED_TESTS` environment variable to a value other than `0`.
>+You can combine this with the `--gtest_filter` flag to further select which
>+disabled tests to run.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+### Repeating the Tests
>+
>+Once in a while you'll run into a test whose result is hit-or-miss. Perhaps it
>+will fail only 1% of the time, making it rather hard to reproduce the bug under
>+a debugger. This can be a major source of frustration.
>+
>+The `--gtest_repeat` flag allows you to repeat all (or selected) test methods in
>+a program many times. Hopefully, a flaky test will eventually fail and give you
>+a chance to debug. Here's how to use it:
>+
>+```none
>+$ foo_test --gtest_repeat=1000
>+Repeat foo_test 1000 times and don't stop at failures.
>+
>+$ foo_test --gtest_repeat=-1
>+A negative count means repeating forever.
>+
>+$ foo_test --gtest_repeat=1000 --gtest_break_on_failure
>+Repeat foo_test 1000 times, stopping at the first failure. This
>+is especially useful when running under a debugger: when the test
>+fails, it will drop into the debugger and you can then inspect
>+variables and stacks.
>+
>+$ foo_test --gtest_repeat=1000 --gtest_filter=FooBar.*
>+Repeat the tests whose name matches the filter 1000 times.
>+```
>+
>+If your test program contains [global set-up/tear-down](#global-set-up-and-tear-down) code, it
>+will be repeated in each iteration as well, as the flakiness may be in it. You
>+can also specify the repeat count by setting the `GTEST_REPEAT` environment
>+variable.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+### Shuffling the Tests
>+
>+You can specify the `--gtest_shuffle` flag (or set the `GTEST_SHUFFLE`
>+environment variable to `1`) to run the tests in a program in a random order.
>+This helps to reveal bad dependencies between tests.
>+
>+By default, googletest uses a random seed calculated from the current time.
>+Therefore you'll get a different order every time. The console output includes
>+the random seed value, such that you can reproduce an order-related test failure
>+later. To specify the random seed explicitly, use the `--gtest_random_seed=SEED`
>+flag (or set the `GTEST_RANDOM_SEED` environment variable), where `SEED` is an
>+integer in the range [0, 99999]. The seed value 0 is special: it tells
>+googletest to do the default behavior of calculating the seed from the current
>+time.
>+
>+If you combine this with `--gtest_repeat=N`, googletest will pick a different
>+random seed and re-shuffle the tests in each iteration.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+### Controlling Test Output
>+
>+#### Colored Terminal Output
>+
>+googletest can use colors in its terminal output to make it easier to spot the
>+important information:
>+
>+... 
>+[----------] 1 test from FooTest 
>+[ RUN ] FooTest.DoesAbc 
>+[ OK ] FooTest.DoesAbc 
>+[----------] 2 tests from BarTest 
>+[ RUN ] BarTest.HasXyzProperty 
>+[ OK ] BarTest.HasXyzProperty 
>+[ RUN ] BarTest.ReturnsTrueOnSuccess 
>+... some error messages ... 
>+[ FAILED ] BarTest.ReturnsTrueOnSuccess 
>+... 
>+[==========] 30 tests from 14 test cases ran. 
>+[ PASSED ] 28 tests. 
>+[ FAILED ] 2 tests, listed below: 
>+[ FAILED ] BarTest.ReturnsTrueOnSuccess 
>+[ FAILED ] AnotherTest.DoesXyz 
>+ 2 FAILED TESTS
>+
>+You can set the `GTEST_COLOR` environment variable or the `--gtest_color`
>+command line flag to `yes`, `no`, or `auto` (the default) to enable colors,
>+disable colors, or let googletest decide. When the value is `auto`, googletest
>+will use colors if and only if the output goes to a terminal and (on non-Windows
>+platforms) the `TERM` environment variable is set to `xterm` or `xterm-color`.
>+
>+ **Availability**: Linux, Windows, Mac.
>+
>+#### Suppressing the Elapsed Time
>+
>+By default, googletest prints the time it takes to run each test. To disable
>+that, run the test program with the `--gtest_print_time=0` command line flag, or
>+set the GTEST_PRINT_TIME environment variable to `0`.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+#### Suppressing UTF-8 Text Output
>+
>+In case of assertion failures, googletest prints expected and actual values of
>+type `string` both as hex-encoded strings as well as in readable UTF-8 text if
>+they contain valid non-ASCII UTF-8 characters. If you want to suppress the UTF-8
>+text because, for example, you don't have an UTF-8 compatible output medium, run
>+the test program with `--gtest_print_utf8=0` or set the `GTEST_PRINT_UTF8`
>+environment variable to `0`.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+
>+#### Generating an XML Report
>+
>+googletest can emit a detailed XML report to a file in addition to its normal
>+textual output. The report contains the duration of each test, and thus can help
>+you identify slow tests. The report is also used by the http://unittest
>+dashboard to show per-test-method error messages.
>+
>+To generate the XML report, set the `GTEST_OUTPUT` environment variable or the
>+`--gtest_output` flag to the string `"xml:path_to_output_file"`, which will
>+create the file at the given location. You can also just use the string `"xml"`,
>+in which case the output can be found in the `test_detail.xml` file in the
>+current directory.
>+
>+If you specify a directory (for example, `"xml:output/directory/"` on Linux or
>+`"xml:output\directory\"` on Windows), googletest will create the XML file in
>+that directory, named after the test executable (e.g. `foo_test.xml` for test
>+program `foo_test` or `foo_test.exe`). If the file already exists (perhaps left
>+over from a previous run), googletest will pick a different name (e.g.
>+`foo_test_1.xml`) to avoid overwriting it.
>+
>+
>+The report is based on the `junitreport` Ant task. Since that format was
>+originally intended for Java, a little interpretation is required to make it
>+apply to googletest tests, as shown here:
>+
>+```xml
>+<testsuites name="AllTests" ...>
>+ <testsuite name="test_case_name" ...>
>+ <testcase name="test_name" ...>
>+ <failure message="..."/>
>+ <failure message="..."/>
>+ <failure message="..."/>
>+ </testcase>
>+ </testsuite>
>+</testsuites>
>+```
>+
>+* The root `<testsuites>` element corresponds to the entire test program.
>+* `<testsuite>` elements correspond to googletest test cases.
>+* `<testcase>` elements correspond to googletest test functions.
>+
>+For instance, the following program
>+
>+```c++
>+TEST(MathTest, Addition) { ... }
>+TEST(MathTest, Subtraction) { ... }
>+TEST(LogicTest, NonContradiction) { ... }
>+```
>+
>+could generate this report:
>+
>+```xml
>+<?xml version="1.0" encoding="UTF-8"?>
>+<testsuites tests="3" failures="1" errors="0" time="0.035" timestamp="2011-10-31T18:52:42" name="AllTests">
>+ <testsuite name="MathTest" tests="2" failures="1" errors="0" time="0.015">
>+ <testcase name="Addition" status="run" time="0.007" classname="">
>+ <failure message="Value of: add(1, 1)&#x0A; Actual: 3&#x0A;Expected: 2" type="">...</failure>
>+ <failure message="Value of: add(1, -1)&#x0A; Actual: 1&#x0A;Expected: 0" type="">...</failure>
>+ </testcase>
>+ <testcase name="Subtraction" status="run" time="0.005" classname="">
>+ </testcase>
>+ </testsuite>
>+ <testsuite name="LogicTest" tests="1" failures="0" errors="0" time="0.005">
>+ <testcase name="NonContradiction" status="run" time="0.005" classname="">
>+ </testcase>
>+ </testsuite>
>+</testsuites>
>+```
>+
>+Things to note:
>+
>+* The `tests` attribute of a `<testsuites>` or `<testsuite>` element tells how
>+ many test functions the googletest program or test case contains, while the
>+ `failures` attribute tells how many of them failed.
>+
>+* The `time` attribute expresses the duration of the test, test case, or
>+ entire test program in seconds.
>+
>+* The `timestamp` attribute records the local date and time of the test
>+ execution.
>+
>+* Each `<failure>` element corresponds to a single failed googletest
>+ assertion.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+#### Generating an JSON Report
>+
>+googletest can also emit a JSON report as an alternative format to XML. To
>+generate the JSON report, set the `GTEST_OUTPUT` environment variable or the
>+`--gtest_output` flag to the string `"json:path_to_output_file"`, which will
>+create the file at the given location. You can also just use the string
>+`"json"`, in which case the output can be found in the `test_detail.json` file
>+in the current directory.
>+
>+The report format conforms to the following JSON Schema:
>+
>+```json
>+{
>+ "$schema": "http://json-schema.org/schema#",
>+ "type": "object",
>+ "definitions": {
>+ "TestCase": {
>+ "type": "object",
>+ "properties": {
>+ "name": { "type": "string" },
>+ "tests": { "type": "integer" },
>+ "failures": { "type": "integer" },
>+ "disabled": { "type": "integer" },
>+ "time": { "type": "string" },
>+ "testsuite": {
>+ "type": "array",
>+ "items": {
>+ "$ref": "#/definitions/TestInfo"
>+ }
>+ }
>+ }
>+ },
>+ "TestInfo": {
>+ "type": "object",
>+ "properties": {
>+ "name": { "type": "string" },
>+ "status": {
>+ "type": "string",
>+ "enum": ["RUN", "NOTRUN"]
>+ },
>+ "time": { "type": "string" },
>+ "classname": { "type": "string" },
>+ "failures": {
>+ "type": "array",
>+ "items": {
>+ "$ref": "#/definitions/Failure"
>+ }
>+ }
>+ }
>+ },
>+ "Failure": {
>+ "type": "object",
>+ "properties": {
>+ "failures": { "type": "string" },
>+ "type": { "type": "string" }
>+ }
>+ }
>+ },
>+ "properties": {
>+ "tests": { "type": "integer" },
>+ "failures": { "type": "integer" },
>+ "disabled": { "type": "integer" },
>+ "errors": { "type": "integer" },
>+ "timestamp": {
>+ "type": "string",
>+ "format": "date-time"
>+ },
>+ "time": { "type": "string" },
>+ "name": { "type": "string" },
>+ "testsuites": {
>+ "type": "array",
>+ "items": {
>+ "$ref": "#/definitions/TestCase"
>+ }
>+ }
>+ }
>+}
>+```
>+
>+The report uses the format that conforms to the following Proto3 using the [JSON
>+encoding](https://developers.google.com/protocol-buffers/docs/proto3#json):
>+
>+```proto
>+syntax = "proto3";
>+
>+package googletest;
>+
>+import "google/protobuf/timestamp.proto";
>+import "google/protobuf/duration.proto";
>+
>+message UnitTest {
>+ int32 tests = 1;
>+ int32 failures = 2;
>+ int32 disabled = 3;
>+ int32 errors = 4;
>+ google.protobuf.Timestamp timestamp = 5;
>+ google.protobuf.Duration time = 6;
>+ string name = 7;
>+ repeated TestCase testsuites = 8;
>+}
>+
>+message TestCase {
>+ string name = 1;
>+ int32 tests = 2;
>+ int32 failures = 3;
>+ int32 disabled = 4;
>+ int32 errors = 5;
>+ google.protobuf.Duration time = 6;
>+ repeated TestInfo testsuite = 7;
>+}
>+
>+message TestInfo {
>+ string name = 1;
>+ enum Status {
>+ RUN = 0;
>+ NOTRUN = 1;
>+ }
>+ Status status = 2;
>+ google.protobuf.Duration time = 3;
>+ string classname = 4;
>+ message Failure {
>+ string failures = 1;
>+ string type = 2;
>+ }
>+ repeated Failure failures = 5;
>+}
>+```
>+
>+For instance, the following program
>+
>+```c++
>+TEST(MathTest, Addition) { ... }
>+TEST(MathTest, Subtraction) { ... }
>+TEST(LogicTest, NonContradiction) { ... }
>+```
>+
>+could generate this report:
>+
>+```json
>+{
>+ "tests": 3,
>+ "failures": 1,
>+ "errors": 0,
>+ "time": "0.035s",
>+ "timestamp": "2011-10-31T18:52:42Z"
>+ "name": "AllTests",
>+ "testsuites": [
>+ {
>+ "name": "MathTest",
>+ "tests": 2,
>+ "failures": 1,
>+ "errors": 0,
>+ "time": "0.015s",
>+ "testsuite": [
>+ {
>+ "name": "Addition",
>+ "status": "RUN",
>+ "time": "0.007s",
>+ "classname": "",
>+ "failures": [
>+ {
>+ "message": "Value of: add(1, 1)\x0A Actual: 3\x0AExpected: 2",
>+ "type": ""
>+ },
>+ {
>+ "message": "Value of: add(1, -1)\x0A Actual: 1\x0AExpected: 0",
>+ "type": ""
>+ }
>+ ]
>+ },
>+ {
>+ "name": "Subtraction",
>+ "status": "RUN",
>+ "time": "0.005s",
>+ "classname": ""
>+ }
>+ ]
>+ }
>+ {
>+ "name": "LogicTest",
>+ "tests": 1,
>+ "failures": 0,
>+ "errors": 0,
>+ "time": "0.005s",
>+ "testsuite": [
>+ {
>+ "name": "NonContradiction",
>+ "status": "RUN",
>+ "time": "0.005s",
>+ "classname": ""
>+ }
>+ ]
>+ }
>+ ]
>+}
>+```
>+
>+IMPORTANT: The exact format of the JSON document is subject to change.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+### Controlling How Failures Are Reported
>+
>+#### Turning Assertion Failures into Break-Points
>+
>+When running test programs under a debugger, it's very convenient if the
>+debugger can catch an assertion failure and automatically drop into interactive
>+mode. googletest's *break-on-failure* mode supports this behavior.
>+
>+To enable it, set the `GTEST_BREAK_ON_FAILURE` environment variable to a value
>+other than `0` . Alternatively, you can use the `--gtest_break_on_failure`
>+command line flag.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+#### Disabling Catching Test-Thrown Exceptions
>+
>+googletest can be used either with or without exceptions enabled. If a test
>+throws a C++ exception or (on Windows) a structured exception (SEH), by default
>+googletest catches it, reports it as a test failure, and continues with the next
>+test method. This maximizes the coverage of a test run. Also, on Windows an
>+uncaught exception will cause a pop-up window, so catching the exceptions allows
>+you to run the tests automatically.
>+
>+When debugging the test failures, however, you may instead want the exceptions
>+to be handled by the debugger, such that you can examine the call stack when an
>+exception is thrown. To achieve that, set the `GTEST_CATCH_EXCEPTIONS`
>+environment variable to `0`, or use the `--gtest_catch_exceptions=0` flag when
>+running the tests.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>diff --git a/Source/ThirdParty/gtest/docs/faq.md b/Source/ThirdParty/gtest/docs/faq.md
>new file mode 100644
>index 0000000000000000000000000000000000000000..7d42ff7dbaa8fabd0cc652fd7052798184e95c49
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/docs/faq.md
>@@ -0,0 +1,770 @@
>+# Googletest FAQ
>+
>+
>+## Why should test case names and test names not contain underscore?
>+
>+Underscore (`_`) is special, as C++ reserves the following to be used by the
>+compiler and the standard library:
>+
>+1. any identifier that starts with an `_` followed by an upper-case letter, and
>+1. any identifier that contains two consecutive underscores (i.e. `__`)
>+ *anywhere* in its name.
>+
>+User code is *prohibited* from using such identifiers.
>+
>+Now let's look at what this means for `TEST` and `TEST_F`.
>+
>+Currently `TEST(TestCaseName, TestName)` generates a class named
>+`TestCaseName_TestName_Test`. What happens if `TestCaseName` or `TestName`
>+contains `_`?
>+
>+1. If `TestCaseName` starts with an `_` followed by an upper-case letter (say,
>+ `_Foo`), we end up with `_Foo_TestName_Test`, which is reserved and thus
>+ invalid.
>+1. If `TestCaseName` ends with an `_` (say, `Foo_`), we get
>+ `Foo__TestName_Test`, which is invalid.
>+1. If `TestName` starts with an `_` (say, `_Bar`), we get
>+ `TestCaseName__Bar_Test`, which is invalid.
>+1. If `TestName` ends with an `_` (say, `Bar_`), we get
>+ `TestCaseName_Bar__Test`, which is invalid.
>+
>+So clearly `TestCaseName` and `TestName` cannot start or end with `_` (Actually,
>+`TestCaseName` can start with `_` -- as long as the `_` isn't followed by an
>+upper-case letter. But that's getting complicated. So for simplicity we just say
>+that it cannot start with `_`.).
>+
>+It may seem fine for `TestCaseName` and `TestName` to contain `_` in the middle.
>+However, consider this:
>+
>+```c++
>+TEST(Time, Flies_Like_An_Arrow) { ... }
>+TEST(Time_Flies, Like_An_Arrow) { ... }
>+```
>+
>+Now, the two `TEST`s will both generate the same class
>+(`Time_Flies_Like_An_Arrow_Test`). That's not good.
>+
>+So for simplicity, we just ask the users to avoid `_` in `TestCaseName` and
>+`TestName`. The rule is more constraining than necessary, but it's simple and
>+easy to remember. It also gives googletest some wiggle room in case its
>+implementation needs to change in the future.
>+
>+If you violate the rule, there may not be immediate consequences, but your test
>+may (just may) break with a new compiler (or a new version of the compiler you
>+are using) or with a new version of googletest. Therefore it's best to follow
>+the rule.
>+
>+## Why does googletest support `EXPECT_EQ(NULL, ptr)` and `ASSERT_EQ(NULL, ptr)` but not `EXPECT_NE(NULL, ptr)` and `ASSERT_NE(NULL, ptr)`?
>+
>+First of all you can use `EXPECT_NE(nullptr, ptr)` and `ASSERT_NE(nullptr,
>+ptr)`. This is the preferred syntax in the style guide because nullptr does not
>+have the type problems that NULL does. Which is why NULL does not work.
>+
>+Due to some peculiarity of C++, it requires some non-trivial template meta
>+programming tricks to support using `NULL` as an argument of the `EXPECT_XX()`
>+and `ASSERT_XX()` macros. Therefore we only do it where it's most needed
>+(otherwise we make the implementation of googletest harder to maintain and more
>+error-prone than necessary).
>+
>+The `EXPECT_EQ()` macro takes the *expected* value as its first argument and the
>+*actual* value as the second. It's reasonable that someone wants to write
>+`EXPECT_EQ(NULL, some_expression)`, and this indeed was requested several times.
>+Therefore we implemented it.
>+
>+The need for `EXPECT_NE(NULL, ptr)` isn't nearly as strong. When the assertion
>+fails, you already know that `ptr` must be `NULL`, so it doesn't add any
>+information to print `ptr` in this case. That means `EXPECT_TRUE(ptr != NULL)`
>+works just as well.
>+
>+If we were to support `EXPECT_NE(NULL, ptr)`, for consistency we'll have to
>+support `EXPECT_NE(ptr, NULL)` as well, as unlike `EXPECT_EQ`, we don't have a
>+convention on the order of the two arguments for `EXPECT_NE`. This means using
>+the template meta programming tricks twice in the implementation, making it even
>+harder to understand and maintain. We believe the benefit doesn't justify the
>+cost.
>+
>+Finally, with the growth of the gMock matcher library, we are encouraging people
>+to use the unified `EXPECT_THAT(value, matcher)` syntax more often in tests. One
>+significant advantage of the matcher approach is that matchers can be easily
>+combined to form new matchers, while the `EXPECT_NE`, etc, macros cannot be
>+easily combined. Therefore we want to invest more in the matchers than in the
>+`EXPECT_XX()` macros.
>+
>+## I need to test that different implementations of an interface satisfy some common requirements. Should I use typed tests or value-parameterized tests?
>+
>+For testing various implementations of the same interface, either typed tests or
>+value-parameterized tests can get it done. It's really up to you the user to
>+decide which is more convenient for you, depending on your particular case. Some
>+rough guidelines:
>+
>+* Typed tests can be easier to write if instances of the different
>+ implementations can be created the same way, modulo the type. For example,
>+ if all these implementations have a public default constructor (such that
>+ you can write `new TypeParam`), or if their factory functions have the same
>+ form (e.g. `CreateInstance<TypeParam>()`).
>+* Value-parameterized tests can be easier to write if you need different code
>+ patterns to create different implementations' instances, e.g. `new Foo` vs
>+ `new Bar(5)`. To accommodate for the differences, you can write factory
>+ function wrappers and pass these function pointers to the tests as their
>+ parameters.
>+* When a typed test fails, the output includes the name of the type, which can
>+ help you quickly identify which implementation is wrong. Value-parameterized
>+ tests cannot do this, so there you'll have to look at the iteration number
>+ to know which implementation the failure is from, which is less direct.
>+* If you make a mistake writing a typed test, the compiler errors can be
>+ harder to digest, as the code is templatized.
>+* When using typed tests, you need to make sure you are testing against the
>+ interface type, not the concrete types (in other words, you want to make
>+ sure `implicit_cast<MyInterface*>(my_concrete_impl)` works, not just that
>+ `my_concrete_impl` works). It's less likely to make mistakes in this area
>+ when using value-parameterized tests.
>+
>+I hope I didn't confuse you more. :-) If you don't mind, I'd suggest you to give
>+both approaches a try. Practice is a much better way to grasp the subtle
>+differences between the two tools. Once you have some concrete experience, you
>+can much more easily decide which one to use the next time.
>+
>+## My death tests became very slow - what happened?
>+
>+In August 2008 we had to switch the default death test style from `fast` to
>+`threadsafe`, as the former is no longer safe now that threaded logging is the
>+default. This caused many death tests to slow down. Unfortunately this change
>+was necessary.
>+
>+Please read [Fixing Failing Death Tests](death_test_styles.md) for what you can
>+do.
>+
>+## I got some run-time errors about invalid proto descriptors when using `ProtocolMessageEquals`. Help!
>+
>+**Note:** `ProtocolMessageEquals` and `ProtocolMessageEquiv` are *deprecated*
>+now. Please use `EqualsProto`, etc instead.
>+
>+`ProtocolMessageEquals` and `ProtocolMessageEquiv` were redefined recently and
>+are now less tolerant on invalid protocol buffer definitions. In particular, if
>+you have a `foo.proto` that doesn't fully qualify the type of a protocol message
>+it references (e.g. `message<Bar>` where it should be `message<blah.Bar>`), you
>+will now get run-time errors like:
>+
>+```
>+... descriptor.cc:...] Invalid proto descriptor for file "path/to/foo.proto":
>+... descriptor.cc:...] blah.MyMessage.my_field: ".Bar" is not defined.
>+```
>+
>+If you see this, your `.proto` file is broken and needs to be fixed by making
>+the types fully qualified. The new definition of `ProtocolMessageEquals` and
>+`ProtocolMessageEquiv` just happen to reveal your bug.
>+
>+## My death test modifies some state, but the change seems lost after the death test finishes. Why?
>+
>+Death tests (`EXPECT_DEATH`, etc) are executed in a sub-process s.t. the
>+expected crash won't kill the test program (i.e. the parent process). As a
>+result, any in-memory side effects they incur are observable in their respective
>+sub-processes, but not in the parent process. You can think of them as running
>+in a parallel universe, more or less.
>+
>+In particular, if you use [gMock](../../googlemock) and the death test statement
>+invokes some mock methods, the parent process will think the calls have never
>+occurred. Therefore, you may want to move your `EXPECT_CALL` statements inside
>+the `EXPECT_DEATH` macro.
>+
>+## EXPECT_EQ(htonl(blah), blah_blah) generates weird compiler errors in opt mode. Is this a googletest bug?
>+
>+Actually, the bug is in `htonl()`.
>+
>+According to `'man htonl'`, `htonl()` is a *function*, which means it's valid to
>+use `htonl` as a function pointer. However, in opt mode `htonl()` is defined as
>+a *macro*, which breaks this usage.
>+
>+Worse, the macro definition of `htonl()` uses a `gcc` extension and is *not*
>+standard C++. That hacky implementation has some ad hoc limitations. In
>+particular, it prevents you from writing `Foo<sizeof(htonl(x))>()`, where `Foo`
>+is a template that has an integral argument.
>+
>+The implementation of `EXPECT_EQ(a, b)` uses `sizeof(... a ...)` inside a
>+template argument, and thus doesn't compile in opt mode when `a` contains a call
>+to `htonl()`. It is difficult to make `EXPECT_EQ` bypass the `htonl()` bug, as
>+the solution must work with different compilers on various platforms.
>+
>+`htonl()` has some other problems as described in `//util/endian/endian.h`,
>+which defines `ghtonl()` to replace it. `ghtonl()` does the same thing `htonl()`
>+does, only without its problems. We suggest you to use `ghtonl()` instead of
>+`htonl()`, both in your tests and production code.
>+
>+`//util/endian/endian.h` also defines `ghtons()`, which solves similar problems
>+in `htons()`.
>+
>+Don't forget to add `//util/endian` to the list of dependencies in the `BUILD`
>+file wherever `ghtonl()` and `ghtons()` are used. The library consists of a
>+single header file and will not bloat your binary.
>+
>+## The compiler complains about "undefined references" to some static const member variables, but I did define them in the class body. What's wrong?
>+
>+If your class has a static data member:
>+
>+```c++
>+// foo.h
>+class Foo {
>+ ...
>+ static const int kBar = 100;
>+};
>+```
>+
>+You also need to define it *outside* of the class body in `foo.cc`:
>+
>+```c++
>+const int Foo::kBar; // No initializer here.
>+```
>+
>+Otherwise your code is **invalid C++**, and may break in unexpected ways. In
>+particular, using it in googletest comparison assertions (`EXPECT_EQ`, etc) will
>+generate an "undefined reference" linker error. The fact that "it used to work"
>+doesn't mean it's valid. It just means that you were lucky. :-)
>+
>+## Can I derive a test fixture from another?
>+
>+Yes.
>+
>+Each test fixture has a corresponding and same named test case. This means only
>+one test case can use a particular fixture. Sometimes, however, multiple test
>+cases may want to use the same or slightly different fixtures. For example, you
>+may want to make sure that all of a GUI library's test cases don't leak
>+important system resources like fonts and brushes.
>+
>+In googletest, you share a fixture among test cases by putting the shared logic
>+in a base test fixture, then deriving from that base a separate fixture for each
>+test case that wants to use this common logic. You then use `TEST_F()` to write
>+tests using each derived fixture.
>+
>+Typically, your code looks like this:
>+
>+```c++
>+// Defines a base test fixture.
>+class BaseTest : public ::testing::Test {
>+ protected:
>+ ...
>+};
>+
>+// Derives a fixture FooTest from BaseTest.
>+class FooTest : public BaseTest {
>+ protected:
>+ void SetUp() override {
>+ BaseTest::SetUp(); // Sets up the base fixture first.
>+ ... additional set-up work ...
>+ }
>+
>+ void TearDown() override {
>+ ... clean-up work for FooTest ...
>+ BaseTest::TearDown(); // Remember to tear down the base fixture
>+ // after cleaning up FooTest!
>+ }
>+
>+ ... functions and variables for FooTest ...
>+};
>+
>+// Tests that use the fixture FooTest.
>+TEST_F(FooTest, Bar) { ... }
>+TEST_F(FooTest, Baz) { ... }
>+
>+... additional fixtures derived from BaseTest ...
>+```
>+
>+If necessary, you can continue to derive test fixtures from a derived fixture.
>+googletest has no limit on how deep the hierarchy can be.
>+
>+For a complete example using derived test fixtures, see [googletest
>+sample](https://github.com/google/googletest/blob/master/googletest/samples/sample5_unittest.cc)
>+
>+## My compiler complains "void value not ignored as it ought to be." What does this mean?
>+
>+You're probably using an `ASSERT_*()` in a function that doesn't return `void`.
>+`ASSERT_*()` can only be used in `void` functions, due to exceptions being
>+disabled by our build system. Please see more details
>+[here](advanced.md#assertion-placement).
>+
>+## My death test hangs (or seg-faults). How do I fix it?
>+
>+In googletest, death tests are run in a child process and the way they work is
>+delicate. To write death tests you really need to understand how they work.
>+Please make sure you have read [this](advanced.md#how-it-works).
>+
>+In particular, death tests don't like having multiple threads in the parent
>+process. So the first thing you can try is to eliminate creating threads outside
>+of `EXPECT_DEATH()`. For example, you may want to use [mocks](../../googlemock)
>+or fake objects instead of real ones in your tests.
>+
>+Sometimes this is impossible as some library you must use may be creating
>+threads before `main()` is even reached. In this case, you can try to minimize
>+the chance of conflicts by either moving as many activities as possible inside
>+`EXPECT_DEATH()` (in the extreme case, you want to move everything inside), or
>+leaving as few things as possible in it. Also, you can try to set the death test
>+style to `"threadsafe"`, which is safer but slower, and see if it helps.
>+
>+If you go with thread-safe death tests, remember that they rerun the test
>+program from the beginning in the child process. Therefore make sure your
>+program can run side-by-side with itself and is deterministic.
>+
>+In the end, this boils down to good concurrent programming. You have to make
>+sure that there is no race conditions or dead locks in your program. No silver
>+bullet - sorry!
>+
>+## Should I use the constructor/destructor of the test fixture or SetUp()/TearDown()?
>+
>+The first thing to remember is that googletest does **not** reuse the same test
>+fixture object across multiple tests. For each `TEST_F`, googletest will create
>+a **fresh** test fixture object, immediately call `SetUp()`, run the test body,
>+call `TearDown()`, and then delete the test fixture object.
>+
>+When you need to write per-test set-up and tear-down logic, you have the choice
>+between using the test fixture constructor/destructor or `SetUp()/TearDown()`.
>+The former is usually preferred, as it has the following benefits:
>+
>+* By initializing a member variable in the constructor, we have the option to
>+ make it `const`, which helps prevent accidental changes to its value and
>+ makes the tests more obviously correct.
>+* In case we need to subclass the test fixture class, the subclass'
>+ constructor is guaranteed to call the base class' constructor *first*, and
>+ the subclass' destructor is guaranteed to call the base class' destructor
>+ *afterward*. With `SetUp()/TearDown()`, a subclass may make the mistake of
>+ forgetting to call the base class' `SetUp()/TearDown()` or call them at the
>+ wrong time.
>+
>+You may still want to use `SetUp()/TearDown()` in the following rare cases:
>+
>+* In the body of a constructor (or destructor), it's not possible to use the
>+ `ASSERT_xx` macros. Therefore, if the set-up operation could cause a fatal
>+ test failure that should prevent the test from running, it's necessary to
>+ use a `CHECK` macro or to use `SetUp()` instead of a constructor.
>+* If the tear-down operation could throw an exception, you must use
>+ `TearDown()` as opposed to the destructor, as throwing in a destructor leads
>+ to undefined behavior and usually will kill your program right away. Note
>+ that many standard libraries (like STL) may throw when exceptions are
>+ enabled in the compiler. Therefore you should prefer `TearDown()` if you
>+ want to write portable tests that work with or without exceptions.
>+* The googletest team is considering making the assertion macros throw on
>+ platforms where exceptions are enabled (e.g. Windows, Mac OS, and Linux
>+ client-side), which will eliminate the need for the user to propagate
>+ failures from a subroutine to its caller. Therefore, you shouldn't use
>+ googletest assertions in a destructor if your code could run on such a
>+ platform.
>+* In a constructor or destructor, you cannot make a virtual function call on
>+ this object. (You can call a method declared as virtual, but it will be
>+ statically bound.) Therefore, if you need to call a method that will be
>+ overridden in a derived class, you have to use `SetUp()/TearDown()`.
>+
>+
>+## The compiler complains "no matching function to call" when I use ASSERT_PRED*. How do I fix it?
>+
>+If the predicate function you use in `ASSERT_PRED*` or `EXPECT_PRED*` is
>+overloaded or a template, the compiler will have trouble figuring out which
>+overloaded version it should use. `ASSERT_PRED_FORMAT*` and
>+`EXPECT_PRED_FORMAT*` don't have this problem.
>+
>+If you see this error, you might want to switch to
>+`(ASSERT|EXPECT)_PRED_FORMAT*`, which will also give you a better failure
>+message. If, however, that is not an option, you can resolve the problem by
>+explicitly telling the compiler which version to pick.
>+
>+For example, suppose you have
>+
>+```c++
>+bool IsPositive(int n) {
>+ return n > 0;
>+}
>+
>+bool IsPositive(double x) {
>+ return x > 0;
>+}
>+```
>+
>+you will get a compiler error if you write
>+
>+```c++
>+EXPECT_PRED1(IsPositive, 5);
>+```
>+
>+However, this will work:
>+
>+```c++
>+EXPECT_PRED1(static_cast<bool (*)(int)>(IsPositive), 5);
>+```
>+
>+(The stuff inside the angled brackets for the `static_cast` operator is the type
>+of the function pointer for the `int`-version of `IsPositive()`.)
>+
>+As another example, when you have a template function
>+
>+```c++
>+template <typename T>
>+bool IsNegative(T x) {
>+ return x < 0;
>+}
>+```
>+
>+you can use it in a predicate assertion like this:
>+
>+```c++
>+ASSERT_PRED1(IsNegative<int>, -5);
>+```
>+
>+Things are more interesting if your template has more than one parameters. The
>+following won't compile:
>+
>+```c++
>+ASSERT_PRED2(GreaterThan<int, int>, 5, 0);
>+```
>+
>+as the C++ pre-processor thinks you are giving `ASSERT_PRED2` 4 arguments, which
>+is one more than expected. The workaround is to wrap the predicate function in
>+parentheses:
>+
>+```c++
>+ASSERT_PRED2((GreaterThan<int, int>), 5, 0);
>+```
>+
>+
>+## My compiler complains about "ignoring return value" when I call RUN_ALL_TESTS(). Why?
>+
>+Some people had been ignoring the return value of `RUN_ALL_TESTS()`. That is,
>+instead of
>+
>+```c++
>+ return RUN_ALL_TESTS();
>+```
>+
>+they write
>+
>+```c++
>+ RUN_ALL_TESTS();
>+```
>+
>+This is **wrong and dangerous**. The testing services needs to see the return
>+value of `RUN_ALL_TESTS()` in order to determine if a test has passed. If your
>+`main()` function ignores it, your test will be considered successful even if it
>+has a googletest assertion failure. Very bad.
>+
>+We have decided to fix this (thanks to Michael Chastain for the idea). Now, your
>+code will no longer be able to ignore `RUN_ALL_TESTS()` when compiled with
>+`gcc`. If you do so, you'll get a compiler error.
>+
>+If you see the compiler complaining about you ignoring the return value of
>+`RUN_ALL_TESTS()`, the fix is simple: just make sure its value is used as the
>+return value of `main()`.
>+
>+But how could we introduce a change that breaks existing tests? Well, in this
>+case, the code was already broken in the first place, so we didn't break it. :-)
>+
>+## My compiler complains that a constructor (or destructor) cannot return a value. What's going on?
>+
>+Due to a peculiarity of C++, in order to support the syntax for streaming
>+messages to an `ASSERT_*`, e.g.
>+
>+```c++
>+ ASSERT_EQ(1, Foo()) << "blah blah" << foo;
>+```
>+
>+we had to give up using `ASSERT*` and `FAIL*` (but not `EXPECT*` and
>+`ADD_FAILURE*`) in constructors and destructors. The workaround is to move the
>+content of your constructor/destructor to a private void member function, or
>+switch to `EXPECT_*()` if that works. This
>+[section](advanced.md#assertion-placement) in the user's guide explains it.
>+
>+## My SetUp() function is not called. Why?
>+
>+C++ is case-sensitive. Did you spell it as `Setup()`?
>+
>+Similarly, sometimes people spell `SetUpTestCase()` as `SetupTestCase()` and
>+wonder why it's never called.
>+
>+## How do I jump to the line of a failure in Emacs directly?
>+
>+googletest's failure message format is understood by Emacs and many other IDEs,
>+like acme and XCode. If a googletest message is in a compilation buffer in
>+Emacs, then it's clickable.
>+
>+
>+## I have several test cases which share the same test fixture logic, do I have to define a new test fixture class for each of them? This seems pretty tedious.
>+
>+You don't have to. Instead of
>+
>+```c++
>+class FooTest : public BaseTest {};
>+
>+TEST_F(FooTest, Abc) { ... }
>+TEST_F(FooTest, Def) { ... }
>+
>+class BarTest : public BaseTest {};
>+
>+TEST_F(BarTest, Abc) { ... }
>+TEST_F(BarTest, Def) { ... }
>+```
>+
>+you can simply `typedef` the test fixtures:
>+
>+```c++
>+typedef BaseTest FooTest;
>+
>+TEST_F(FooTest, Abc) { ... }
>+TEST_F(FooTest, Def) { ... }
>+
>+typedef BaseTest BarTest;
>+
>+TEST_F(BarTest, Abc) { ... }
>+TEST_F(BarTest, Def) { ... }
>+```
>+
>+## googletest output is buried in a whole bunch of LOG messages. What do I do?
>+
>+The googletest output is meant to be a concise and human-friendly report. If
>+your test generates textual output itself, it will mix with the googletest
>+output, making it hard to read. However, there is an easy solution to this
>+problem.
>+
>+Since `LOG` messages go to stderr, we decided to let googletest output go to
>+stdout. This way, you can easily separate the two using redirection. For
>+example:
>+
>+```shell
>+$ ./my_test > gtest_output.txt
>+```
>+
>+
>+## Why should I prefer test fixtures over global variables?
>+
>+There are several good reasons:
>+
>+1. It's likely your test needs to change the states of its global variables.
>+ This makes it difficult to keep side effects from escaping one test and
>+ contaminating others, making debugging difficult. By using fixtures, each
>+ test has a fresh set of variables that's different (but with the same
>+ names). Thus, tests are kept independent of each other.
>+1. Global variables pollute the global namespace.
>+1. Test fixtures can be reused via subclassing, which cannot be done easily
>+ with global variables. This is useful if many test cases have something in
>+ common.
>+
>+
>+ ## What can the statement argument in ASSERT_DEATH() be?
>+
>+`ASSERT_DEATH(*statement*, *regex*)` (or any death assertion macro) can be used
>+wherever `*statement*` is valid. So basically `*statement*` can be any C++
>+statement that makes sense in the current context. In particular, it can
>+reference global and/or local variables, and can be:
>+
>+* a simple function call (often the case),
>+* a complex expression, or
>+* a compound statement.
>+
>+Some examples are shown here:
>+
>+```c++
>+// A death test can be a simple function call.
>+TEST(MyDeathTest, FunctionCall) {
>+ ASSERT_DEATH(Xyz(5), "Xyz failed");
>+}
>+
>+// Or a complex expression that references variables and functions.
>+TEST(MyDeathTest, ComplexExpression) {
>+ const bool c = Condition();
>+ ASSERT_DEATH((c ? Func1(0) : object2.Method("test")),
>+ "(Func1|Method) failed");
>+}
>+
>+// Death assertions can be used any where in a function. In
>+// particular, they can be inside a loop.
>+TEST(MyDeathTest, InsideLoop) {
>+ // Verifies that Foo(0), Foo(1), ..., and Foo(4) all die.
>+ for (int i = 0; i < 5; i++) {
>+ EXPECT_DEATH_M(Foo(i), "Foo has \\d+ errors",
>+ ::testing::Message() << "where i is " << i);
>+ }
>+}
>+
>+// A death assertion can contain a compound statement.
>+TEST(MyDeathTest, CompoundStatement) {
>+ // Verifies that at lease one of Bar(0), Bar(1), ..., and
>+ // Bar(4) dies.
>+ ASSERT_DEATH({
>+ for (int i = 0; i < 5; i++) {
>+ Bar(i);
>+ }
>+ },
>+ "Bar has \\d+ errors");
>+}
>+```
>+
>+gtest-death-test_test.cc contains more examples if you are interested.
>+
>+## I have a fixture class `FooTest`, but `TEST_F(FooTest, Bar)` gives me error ``"no matching function for call to `FooTest::FooTest()'"``. Why?
>+
>+Googletest needs to be able to create objects of your test fixture class, so it
>+must have a default constructor. Normally the compiler will define one for you.
>+However, there are cases where you have to define your own:
>+
>+* If you explicitly declare a non-default constructor for class `FooTest`
>+ (`DISALLOW_EVIL_CONSTRUCTORS()` does this), then you need to define a
>+ default constructor, even if it would be empty.
>+* If `FooTest` has a const non-static data member, then you have to define the
>+ default constructor *and* initialize the const member in the initializer
>+ list of the constructor. (Early versions of `gcc` doesn't force you to
>+ initialize the const member. It's a bug that has been fixed in `gcc 4`.)
>+
>+## Why does ASSERT_DEATH complain about previous threads that were already joined?
>+
>+With the Linux pthread library, there is no turning back once you cross the line
>+from single thread to multiple threads. The first time you create a thread, a
>+manager thread is created in addition, so you get 3, not 2, threads. Later when
>+the thread you create joins the main thread, the thread count decrements by 1,
>+but the manager thread will never be killed, so you still have 2 threads, which
>+means you cannot safely run a death test.
>+
>+The new NPTL thread library doesn't suffer from this problem, as it doesn't
>+create a manager thread. However, if you don't control which machine your test
>+runs on, you shouldn't depend on this.
>+
>+## Why does googletest require the entire test case, instead of individual tests, to be named *DeathTest when it uses ASSERT_DEATH?
>+
>+googletest does not interleave tests from different test cases. That is, it runs
>+all tests in one test case first, and then runs all tests in the next test case,
>+and so on. googletest does this because it needs to set up a test case before
>+the first test in it is run, and tear it down afterwords. Splitting up the test
>+case would require multiple set-up and tear-down processes, which is inefficient
>+and makes the semantics unclean.
>+
>+If we were to determine the order of tests based on test name instead of test
>+case name, then we would have a problem with the following situation:
>+
>+```c++
>+TEST_F(FooTest, AbcDeathTest) { ... }
>+TEST_F(FooTest, Uvw) { ... }
>+
>+TEST_F(BarTest, DefDeathTest) { ... }
>+TEST_F(BarTest, Xyz) { ... }
>+```
>+
>+Since `FooTest.AbcDeathTest` needs to run before `BarTest.Xyz`, and we don't
>+interleave tests from different test cases, we need to run all tests in the
>+`FooTest` case before running any test in the `BarTest` case. This contradicts
>+with the requirement to run `BarTest.DefDeathTest` before `FooTest.Uvw`.
>+
>+## But I don't like calling my entire test case \*DeathTest when it contains both death tests and non-death tests. What do I do?
>+
>+You don't have to, but if you like, you may split up the test case into
>+`FooTest` and `FooDeathTest`, where the names make it clear that they are
>+related:
>+
>+```c++
>+class FooTest : public ::testing::Test { ... };
>+
>+TEST_F(FooTest, Abc) { ... }
>+TEST_F(FooTest, Def) { ... }
>+
>+using FooDeathTest = FooTest;
>+
>+TEST_F(FooDeathTest, Uvw) { ... EXPECT_DEATH(...) ... }
>+TEST_F(FooDeathTest, Xyz) { ... ASSERT_DEATH(...) ... }
>+```
>+
>+## googletest prints the LOG messages in a death test's child process only when the test fails. How can I see the LOG messages when the death test succeeds?
>+
>+Printing the LOG messages generated by the statement inside `EXPECT_DEATH()`
>+makes it harder to search for real problems in the parent's log. Therefore,
>+googletest only prints them when the death test has failed.
>+
>+If you really need to see such LOG messages, a workaround is to temporarily
>+break the death test (e.g. by changing the regex pattern it is expected to
>+match). Admittedly, this is a hack. We'll consider a more permanent solution
>+after the fork-and-exec-style death tests are implemented.
>+
>+## The compiler complains about "no match for 'operator<<'" when I use an assertion. What gives?
>+
>+If you use a user-defined type `FooType` in an assertion, you must make sure
>+there is an `std::ostream& operator<<(std::ostream&, const FooType&)` function
>+defined such that we can print a value of `FooType`.
>+
>+In addition, if `FooType` is declared in a name space, the `<<` operator also
>+needs to be defined in the *same* name space. See go/totw/49 for details.
>+
>+## How do I suppress the memory leak messages on Windows?
>+
>+Since the statically initialized googletest singleton requires allocations on
>+the heap, the Visual C++ memory leak detector will report memory leaks at the
>+end of the program run. The easiest way to avoid this is to use the
>+`_CrtMemCheckpoint` and `_CrtMemDumpAllObjectsSince` calls to not report any
>+statically initialized heap objects. See MSDN for more details and additional
>+heap check/debug routines.
>+
>+
>+## How can my code detect if it is running in a test?
>+
>+If you write code that sniffs whether it's running in a test and does different
>+things accordingly, you are leaking test-only logic into production code and
>+there is no easy way to ensure that the test-only code paths aren't run by
>+mistake in production. Such cleverness also leads to
>+[Heisenbugs](https://en.wikipedia.org/wiki/Heisenbug). Therefore we strongly
>+advise against the practice, and googletest doesn't provide a way to do it.
>+
>+In general, the recommended way to cause the code to behave differently under
>+test is [Dependency Injection](https://en.wikipedia.org/wiki/Dependency_injection). You can inject
>+different functionality from the test and from the production code. Since your
>+production code doesn't link in the for-test logic at all (the
>+[`testonly`](https://docs.bazel.build/versions/master/be/common-definitions.html#common.testonly)
>+attribute for BUILD targets helps to ensure that), there is no danger in
>+accidentally running it.
>+
>+However, if you *really*, *really*, *really* have no choice, and if you follow
>+the rule of ending your test program names with `_test`, you can use the
>+*horrible* hack of sniffing your executable name (`argv[0]` in `main()`) to know
>+whether the code is under test.
>+
>+
>+## How do I temporarily disable a test?
>+
>+If you have a broken test that you cannot fix right away, you can add the
>+DISABLED_ prefix to its name. This will exclude it from execution. This is
>+better than commenting out the code or using #if 0, as disabled tests are still
>+compiled (and thus won't rot).
>+
>+To include disabled tests in test execution, just invoke the test program with
>+the --gtest_also_run_disabled_tests flag.
>+
>+## Is it OK if I have two separate `TEST(Foo, Bar)` test methods defined in different namespaces?
>+
>+Yes.
>+
>+The rule is **all test methods in the same test case must use the same fixture
>+class.** This means that the following is **allowed** because both tests use the
>+same fixture class (`::testing::Test`).
>+
>+```c++
>+namespace foo {
>+TEST(CoolTest, DoSomething) {
>+ SUCCEED();
>+}
>+} // namespace foo
>+
>+namespace bar {
>+TEST(CoolTest, DoSomething) {
>+ SUCCEED();
>+}
>+} // namespace bar
>+```
>+
>+However, the following code is **not allowed** and will produce a runtime error
>+from googletest because the test methods are using different test fixture
>+classes with the same test case name.
>+
>+```c++
>+namespace foo {
>+class CoolTest : public ::testing::Test {}; // Fixture foo::CoolTest
>+TEST_F(CoolTest, DoSomething) {
>+ SUCCEED();
>+}
>+} // namespace foo
>+
>+namespace bar {
>+class CoolTest : public ::testing::Test {}; // Fixture: bar::CoolTest
>+TEST_F(CoolTest, DoSomething) {
>+ SUCCEED();
>+}
>+} // namespace bar
>+```
>diff --git a/Source/ThirdParty/gtest/docs/primer.md b/Source/ThirdParty/gtest/docs/primer.md
>new file mode 100644
>index 0000000000000000000000000000000000000000..7a8ea8d717b835bcbd23f84c9ea05f16a878a5d9
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/docs/primer.md
>@@ -0,0 +1,569 @@
>+# Googletest Primer
>+
>+
>+## Introduction: Why googletest?
>+
>+*googletest* helps you write better C++ tests.
>+
>+googletest is a testing framework developed by the Testing
>+Technology team with Google's specific
>+requirements and constraints in mind. No matter whether you work on Linux,
>+Windows, or a Mac, if you write C++ code, googletest can help you. And it
>+supports *any* kind of tests, not just unit tests.
>+
>+So what makes a good test, and how does googletest fit in? We believe:
>+
>+1. Tests should be *independent* and *repeatable*. It's a pain to debug a test
>+ that succeeds or fails as a result of other tests. googletest isolates the
>+ tests by running each of them on a different object. When a test fails,
>+ googletest allows you to run it in isolation for quick debugging.
>+1. Tests should be well *organized* and reflect the structure of the tested
>+ code. googletest groups related tests into test cases that can share data
>+ and subroutines. This common pattern is easy to recognize and makes tests
>+ easy to maintain. Such consistency is especially helpful when people switch
>+ projects and start to work on a new code base.
>+1. Tests should be *portable* and *reusable*. Google has a lot of code that is
>+ platform-neutral, its tests should also be platform-neutral. googletest
>+ works on different OSes, with different compilers (gcc, icc, and MSVC), with
>+ or without exceptions, so googletest tests can easily work with a variety of
>+ configurations.
>+1. When tests fail, they should provide as much *information* about the problem
>+ as possible. googletest doesn't stop at the first test failure. Instead, it
>+ only stops the current test and continues with the next. You can also set up
>+ tests that report non-fatal failures after which the current test continues.
>+ Thus, you can detect and fix multiple bugs in a single run-edit-compile
>+ cycle.
>+1. The testing framework should liberate test writers from housekeeping chores
>+ and let them focus on the test *content*. googletest automatically keeps
>+ track of all tests defined, and doesn't require the user to enumerate them
>+ in order to run them.
>+1. Tests should be *fast*. With googletest, you can reuse shared resources
>+ across tests and pay for the set-up/tear-down only once, without making
>+ tests depend on each other.
>+
>+Since googletest is based on the popular xUnit architecture, you'll feel right
>+at home if you've used JUnit or PyUnit before. If not, it will take you about 10
>+minutes to learn the basics and get started. So let's go!
>+
>+## Beware of the nomenclature
>+
>+_Note:_ There might be some confusion of idea due to different
>+definitions of the terms _Test_, _Test Case_ and _Test Suite_, so beware
>+of misunderstanding these.
>+
>+Historically, googletest started to use the term _Test Case_ for grouping
>+related tests, whereas current publications including the International Software
>+Testing Qualifications Board ([ISTQB](http://www.istqb.org/)) and various
>+textbooks on Software Quality use the term _[Test
>+Suite](http://glossary.istqb.org/search/test%20suite)_ for this.
>+
>+The related term _Test_, as it is used in the googletest, is corresponding to
>+the term _[Test Case](http://glossary.istqb.org/search/test%20case)_ of ISTQB
>+and others.
>+
>+The term _Test_ is commonly of broad enough sense, including ISTQB's
>+definition of _Test Case_, so it's not much of a problem here. But the
>+term _Test Case_ as used in Google Test is of contradictory sense and thus confusing.
>+
>+Unfortunately replacing the term _Test Case_ by _Test Suite_ throughout the
>+googletest is not easy without breaking dependent projects, as `TestCase` is
>+part of the public API at various places.
>+
>+So for the time being, please be aware of the different definitions of
>+the terms:
>+
>+Meaning | googletest Term | [ISTQB](http://www.istqb.org/) Term
>+:----------------------------------------------------------------------------------- | :--------------------------------------------------------------------------------------------------------- | :----------------------------------
>+Exercise a particular program path with specific input values and verify the results | [TEST()](#simple-tests) | [Test Case](http://glossary.istqb.org/search/test%20case)
>+A set of several tests related to one component | [TestCase](#basic-concepts) | [TestSuite](http://glossary.istqb.org/search/test%20suite)
>+
>+## Basic Concepts
>+
>+When using googletest, you start by writing *assertions*, which are statements
>+that check whether a condition is true. An assertion's result can be *success*,
>+*nonfatal failure*, or *fatal failure*. If a fatal failure occurs, it aborts the
>+current function; otherwise the program continues normally.
>+
>+*Tests* use assertions to verify the tested code's behavior. If a test crashes
>+or has a failed assertion, then it *fails*; otherwise it *succeeds*.
>+
>+A *test case* contains one or many tests. You should group your tests into test
>+cases that reflect the structure of the tested code. When multiple tests in a
>+test case need to share common objects and subroutines, you can put them into a
>+*test fixture* class.
>+
>+A *test program* can contain multiple test cases.
>+
>+We'll now explain how to write a test program, starting at the individual
>+assertion level and building up to tests and test cases.
>+
>+## Assertions
>+
>+googletest assertions are macros that resemble function calls. You test a class
>+or function by making assertions about its behavior. When an assertion fails,
>+googletest prints the assertion's source file and line number location, along
>+with a failure message. You may also supply a custom failure message which will
>+be appended to googletest's message.
>+
>+The assertions come in pairs that test the same thing but have different effects
>+on the current function. `ASSERT_*` versions generate fatal failures when they
>+fail, and **abort the current function**. `EXPECT_*` versions generate nonfatal
>+failures, which don't abort the current function. Usually `EXPECT_*` are
>+preferred, as they allow more than one failure to be reported in a test.
>+However, you should use `ASSERT_*` if it doesn't make sense to continue when the
>+assertion in question fails.
>+
>+Since a failed `ASSERT_*` returns from the current function immediately,
>+possibly skipping clean-up code that comes after it, it may cause a space leak.
>+Depending on the nature of the leak, it may or may not be worth fixing - so keep
>+this in mind if you get a heap checker error in addition to assertion errors.
>+
>+To provide a custom failure message, simply stream it into the macro using the
>+`<<` operator, or a sequence of such operators. An example:
>+
>+```c++
>+ASSERT_EQ(x.size(), y.size()) << "Vectors x and y are of unequal length";
>+
>+for (int i = 0; i < x.size(); ++i) {
>+ EXPECT_EQ(x[i], y[i]) << "Vectors x and y differ at index " << i;
>+}
>+```
>+
>+Anything that can be streamed to an `ostream` can be streamed to an assertion
>+macro--in particular, C strings and `string` objects. If a wide string
>+(`wchar_t*`, `TCHAR*` in `UNICODE` mode on Windows, or `std::wstring`) is
>+streamed to an assertion, it will be translated to UTF-8 when printed.
>+
>+### Basic Assertions
>+
>+These assertions do basic true/false condition testing.
>+
>+Fatal assertion | Nonfatal assertion | Verifies
>+-------------------------- | -------------------------- | --------------------
>+`ASSERT_TRUE(condition);` | `EXPECT_TRUE(condition);` | `condition` is true
>+`ASSERT_FALSE(condition);` | `EXPECT_FALSE(condition);` | `condition` is false
>+
>+Remember, when they fail, `ASSERT_*` yields a fatal failure and returns from the
>+current function, while `EXPECT_*` yields a nonfatal failure, allowing the
>+function to continue running. In either case, an assertion failure means its
>+containing test fails.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+### Binary Comparison
>+
>+This section describes assertions that compare two values.
>+
>+Fatal assertion | Nonfatal assertion | Verifies
>+------------------------ | ------------------------ | --------------
>+`ASSERT_EQ(val1, val2);` | `EXPECT_EQ(val1, val2);` | `val1 == val2`
>+`ASSERT_NE(val1, val2);` | `EXPECT_NE(val1, val2);` | `val1 != val2`
>+`ASSERT_LT(val1, val2);` | `EXPECT_LT(val1, val2);` | `val1 < val2`
>+`ASSERT_LE(val1, val2);` | `EXPECT_LE(val1, val2);` | `val1 <= val2`
>+`ASSERT_GT(val1, val2);` | `EXPECT_GT(val1, val2);` | `val1 > val2`
>+`ASSERT_GE(val1, val2);` | `EXPECT_GE(val1, val2);` | `val1 >= val2`
>+
>+Value arguments must be comparable by the assertion's comparison operator or
>+you'll get a compiler error. We used to require the arguments to support the
>+`<<` operator for streaming to an `ostream`, but it's no longer necessary. If
>+`<<` is supported, it will be called to print the arguments when the assertion
>+fails; otherwise googletest will attempt to print them in the best way it can.
>+For more details and how to customize the printing of the arguments, see
>+gMock [recipe](../../googlemock/docs/CookBook.md#teaching-google-mock-how-to-print-your-values).).
>+
>+These assertions can work with a user-defined type, but only if you define the
>+corresponding comparison operator (e.g. `==`, `<`, etc). Since this is
>+discouraged by the Google [C++ Style
>+Guide](https://google.github.io/styleguide/cppguide.html#Operator_Overloading),
>+you may need to use `ASSERT_TRUE()` or `EXPECT_TRUE()` to assert the equality of
>+two objects of a user-defined type.
>+
>+However, when possible, `ASSERT_EQ(actual, expected)` is preferred to
>+`ASSERT_TRUE(actual == expected)`, since it tells you `actual` and `expected`'s
>+values on failure.
>+
>+Arguments are always evaluated exactly once. Therefore, it's OK for the
>+arguments to have side effects. However, as with any ordinary C/C++ function,
>+the arguments' evaluation order is undefined (i.e. the compiler is free to
>+choose any order) and your code should not depend on any particular argument
>+evaluation order.
>+
>+`ASSERT_EQ()` does pointer equality on pointers. If used on two C strings, it
>+tests if they are in the same memory location, not if they have the same value.
>+Therefore, if you want to compare C strings (e.g. `const char*`) by value, use
>+`ASSERT_STREQ()`, which will be described later on. In particular, to assert
>+that a C string is `NULL`, use `ASSERT_STREQ(c_string, NULL)`. Consider use
>+`ASSERT_EQ(c_string, nullptr)` if c++11 is supported. To compare two `string`
>+objects, you should use `ASSERT_EQ`.
>+
>+When doing pointer comparisons use `*_EQ(ptr, nullptr)` and `*_NE(ptr, nullptr)`
>+instead of `*_EQ(ptr, NULL)` and `*_NE(ptr, NULL)`. This is because `nullptr` is
>+typed while `NULL` is not. See [FAQ](faq.md#why-does-google-test-support-expect_eqnull-ptr-and-assert_eqnull-ptr-but-not-expect_nenull-ptr-and-assert_nenull-ptr)
>+for more details.
>+
>+If you're working with floating point numbers, you may want to use the floating
>+point variations of some of these macros in order to avoid problems caused by
>+rounding. See [Advanced googletest Topics](advanced.md) for details.
>+
>+Macros in this section work with both narrow and wide string objects (`string`
>+and `wstring`).
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+**Historical note**: Before February 2016 `*_EQ` had a convention of calling it
>+as `ASSERT_EQ(expected, actual)`, so lots of existing code uses this order. Now
>+`*_EQ` treats both parameters in the same way.
>+
>+### String Comparison
>+
>+The assertions in this group compare two **C strings**. If you want to compare
>+two `string` objects, use `EXPECT_EQ`, `EXPECT_NE`, and etc instead.
>+
>+| Fatal assertion | Nonfatal assertion | Verifies |
>+| ------------------------------- | ------------------------------- | -------------------------------------------------------- |
>+| `ASSERT_STREQ(str1, str2);` | `EXPECT_STREQ(str1, str2);` | the two C strings have the same content |
>+| `ASSERT_STRNE(str1, str2);` | `EXPECT_STRNE(str1, str2);` | the two C strings have different contents |
>+| `ASSERT_STRCASEEQ(str1, str2);` | `EXPECT_STRCASEEQ(str1, str2);` | the two C strings have the same content, ignoring case |
>+| `ASSERT_STRCASENE(str1, str2);` | `EXPECT_STRCASENE(str1, str2);` | the two C strings have different contents, ignoring case |
>+
>+Note that "CASE" in an assertion name means that case is ignored. A `NULL`
>+pointer and an empty string are considered *different*.
>+
>+`*STREQ*` and `*STRNE*` also accept wide C strings (`wchar_t*`). If a comparison
>+of two wide strings fails, their values will be printed as UTF-8 narrow strings.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+**See also**: For more string comparison tricks (substring, prefix, suffix, and
>+regular expression matching, for example), see
>+[this](https://github.com/google/googletest/blob/master/googletest/docs/advanced.md)
>+in the Advanced googletest Guide.
>+
>+## Simple Tests
>+
>+To create a test:
>+
>+1. Use the `TEST()` macro to define and name a test function, These are
>+ ordinary C++ functions that don't return a value.
>+1. In this function, along with any valid C++ statements you want to include,
>+ use the various googletest assertions to check values.
>+1. The test's result is determined by the assertions; if any assertion in the
>+ test fails (either fatally or non-fatally), or if the test crashes, the
>+ entire test fails. Otherwise, it succeeds.
>+
>+```c++
>+TEST(TestCaseName, TestName) {
>+ ... test body ...
>+}
>+```
>+
>+`TEST()` arguments go from general to specific. The *first* argument is the name
>+of the test case, and the *second* argument is the test's name within the test
>+case. Both names must be valid C++ identifiers, and they should not contain
>+underscore (`_`). A test's *full name* consists of its containing test case and
>+its individual name. Tests from different test cases can have the same
>+individual name.
>+
>+For example, let's take a simple integer function:
>+
>+```c++
>+int Factorial(int n); // Returns the factorial of n
>+```
>+
>+A test case for this function might look like:
>+
>+```c++
>+// Tests factorial of 0.
>+TEST(FactorialTest, HandlesZeroInput) {
>+ EXPECT_EQ(Factorial(0), 1);
>+}
>+
>+// Tests factorial of positive numbers.
>+TEST(FactorialTest, HandlesPositiveInput) {
>+ EXPECT_EQ(Factorial(1), 1);
>+ EXPECT_EQ(Factorial(2), 2);
>+ EXPECT_EQ(Factorial(3), 6);
>+ EXPECT_EQ(Factorial(8), 40320);
>+}
>+```
>+
>+googletest groups the test results by test cases, so logically-related tests
>+should be in the same test case; in other words, the first argument to their
>+`TEST()` should be the same. In the above example, we have two tests,
>+`HandlesZeroInput` and `HandlesPositiveInput`, that belong to the same test case
>+`FactorialTest`.
>+
>+When naming your test cases and tests, you should follow the same convention as
>+for [naming functions and
>+classes](https://google.github.io/styleguide/cppguide.html#Function_Names).
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+## Test Fixtures: Using the Same Data Configuration for Multiple Tests
>+
>+If you find yourself writing two or more tests that operate on similar data, you
>+can use a *test fixture*. It allows you to reuse the same configuration of
>+objects for several different tests.
>+
>+To create a fixture:
>+
>+1. Derive a class from `::testing::Test` . Start its body with `protected:` as
>+ we'll want to access fixture members from sub-classes.
>+1. Inside the class, declare any objects you plan to use.
>+1. If necessary, write a default constructor or `SetUp()` function to prepare
>+ the objects for each test. A common mistake is to spell `SetUp()` as
>+ **`Setup()`** with a small `u` - Use `override` in C++11 to make sure you
>+ spelled it correctly
>+1. If necessary, write a destructor or `TearDown()` function to release any
>+ resources you allocated in `SetUp()` . To learn when you should use the
>+ constructor/destructor and when you should use `SetUp()/TearDown()`, read
>+ this [FAQ](faq.md#should-i-use-the-constructordestructor-of-the-test-fixture-or-setupteardown) entry.
>+1. If needed, define subroutines for your tests to share.
>+
>+When using a fixture, use `TEST_F()` instead of `TEST()` as it allows you to
>+access objects and subroutines in the test fixture:
>+
>+```c++
>+TEST_F(TestCaseName, TestName) {
>+ ... test body ...
>+}
>+```
>+
>+Like `TEST()`, the first argument is the test case name, but for `TEST_F()` this
>+must be the name of the test fixture class. You've probably guessed: `_F` is for
>+fixture.
>+
>+Unfortunately, the C++ macro system does not allow us to create a single macro
>+that can handle both types of tests. Using the wrong macro causes a compiler
>+error.
>+
>+Also, you must first define a test fixture class before using it in a
>+`TEST_F()`, or you'll get the compiler error "`virtual outside class
>+declaration`".
>+
>+For each test defined with `TEST_F()` , googletest will create a *fresh* test
>+fixture at runtime, immediately initialize it via `SetUp()` , run the test,
>+clean up by calling `TearDown()` , and then delete the test fixture. Note that
>+different tests in the same test case have different test fixture objects, and
>+googletest always deletes a test fixture before it creates the next one.
>+googletest does **not** reuse the same test fixture for multiple tests. Any
>+changes one test makes to the fixture do not affect other tests.
>+
>+As an example, let's write tests for a FIFO queue class named `Queue`, which has
>+the following interface:
>+
>+```c++
>+template <typename E> // E is the element type.
>+class Queue {
>+ public:
>+ Queue();
>+ void Enqueue(const E& element);
>+ E* Dequeue(); // Returns NULL if the queue is empty.
>+ size_t size() const;
>+ ...
>+};
>+```
>+
>+First, define a fixture class. By convention, you should give it the name
>+`FooTest` where `Foo` is the class being tested.
>+
>+```c++
>+class QueueTest : public ::testing::Test {
>+ protected:
>+ void SetUp() override {
>+ q1_.Enqueue(1);
>+ q2_.Enqueue(2);
>+ q2_.Enqueue(3);
>+ }
>+
>+ // void TearDown() override {}
>+
>+ Queue<int> q0_;
>+ Queue<int> q1_;
>+ Queue<int> q2_;
>+};
>+```
>+
>+In this case, `TearDown()` is not needed since we don't have to clean up after
>+each test, other than what's already done by the destructor.
>+
>+Now we'll write tests using `TEST_F()` and this fixture.
>+
>+```c++
>+TEST_F(QueueTest, IsEmptyInitially) {
>+ EXPECT_EQ(q0_.size(), 0);
>+}
>+
>+TEST_F(QueueTest, DequeueWorks) {
>+ int* n = q0_.Dequeue();
>+ EXPECT_EQ(n, nullptr);
>+
>+ n = q1_.Dequeue();
>+ ASSERT_NE(n, nullptr);
>+ EXPECT_EQ(*n, 1);
>+ EXPECT_EQ(q1_.size(), 0);
>+ delete n;
>+
>+ n = q2_.Dequeue();
>+ ASSERT_NE(n, nullptr);
>+ EXPECT_EQ(*n, 2);
>+ EXPECT_EQ(q2_.size(), 1);
>+ delete n;
>+}
>+```
>+
>+The above uses both `ASSERT_*` and `EXPECT_*` assertions. The rule of thumb is
>+to use `EXPECT_*` when you want the test to continue to reveal more errors after
>+the assertion failure, and use `ASSERT_*` when continuing after failure doesn't
>+make sense. For example, the second assertion in the `Dequeue` test is
>+=ASSERT_NE(nullptr, n)=, as we need to dereference the pointer `n` later, which
>+would lead to a segfault when `n` is `NULL`.
>+
>+When these tests run, the following happens:
>+
>+1. googletest constructs a `QueueTest` object (let's call it `t1` ).
>+1. `t1.SetUp()` initializes `t1` .
>+1. The first test ( `IsEmptyInitially` ) runs on `t1` .
>+1. `t1.TearDown()` cleans up after the test finishes.
>+1. `t1` is destructed.
>+1. The above steps are repeated on another `QueueTest` object, this time
>+ running the `DequeueWorks` test.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+
>+## Invoking the Tests
>+
>+`TEST()` and `TEST_F()` implicitly register their tests with googletest. So,
>+unlike with many other C++ testing frameworks, you don't have to re-list all
>+your defined tests in order to run them.
>+
>+After defining your tests, you can run them with `RUN_ALL_TESTS()` , which
>+returns `0` if all the tests are successful, or `1` otherwise. Note that
>+`RUN_ALL_TESTS()` runs *all tests* in your link unit -- they can be from
>+different test cases, or even different source files.
>+
>+When invoked, the `RUN_ALL_TESTS()` macro:
>+
>+1. Saves the state of all googletest flags
>+
>+* Creates a test fixture object for the first test.
>+
>+* Initializes it via `SetUp()`.
>+
>+* Runs the test on the fixture object.
>+
>+* Cleans up the fixture via `TearDown()`.
>+
>+* Deletes the fixture.
>+
>+* Restores the state of all googletest flags
>+
>+* Repeats the above steps for the next test, until all tests have run.
>+
>+If a fatal failure happens the subsequent steps will be skipped.
>+
>+> IMPORTANT: You must **not** ignore the return value of `RUN_ALL_TESTS()`, or
>+> you will get a compiler error. The rationale for this design is that the
>+> automated testing service determines whether a test has passed based on its
>+> exit code, not on its stdout/stderr output; thus your `main()` function must
>+> return the value of `RUN_ALL_TESTS()`.
>+>
>+> Also, you should call `RUN_ALL_TESTS()` only **once**. Calling it more than
>+> once conflicts with some advanced googletest features (e.g. thread-safe [death
>+> tests](advanced#death-tests)) and thus is not supported.
>+
>+**Availability**: Linux, Windows, Mac.
>+
>+## Writing the main() Function
>+
>+In `google3`, the simplest approach is to use the default main() function
>+provided by linking in `"//testing/base/public:gtest_main"`. If that doesn't
>+cover what you need, you should write your own main() function, which should
>+return the value of `RUN_ALL_TESTS()`. Link to `"//testing/base/public:gunit"`.
>+You can start from this boilerplate:
>+
>+```c++
>+#include "this/package/foo.h"
>+#include "gtest/gtest.h"
>+
>+namespace {
>+
>+// The fixture for testing class Foo.
>+class FooTest : public ::testing::Test {
>+ protected:
>+ // You can remove any or all of the following functions if its body
>+ // is empty.
>+
>+ FooTest() {
>+ // You can do set-up work for each test here.
>+ }
>+
>+ ~FooTest() override {
>+ // You can do clean-up work that doesn't throw exceptions here.
>+ }
>+
>+ // If the constructor and destructor are not enough for setting up
>+ // and cleaning up each test, you can define the following methods:
>+
>+ void SetUp() override {
>+ // Code here will be called immediately after the constructor (right
>+ // before each test).
>+ }
>+
>+ void TearDown() override {
>+ // Code here will be called immediately after each test (right
>+ // before the destructor).
>+ }
>+
>+ // Objects declared here can be used by all tests in the test case for Foo.
>+};
>+
>+// Tests that the Foo::Bar() method does Abc.
>+TEST_F(FooTest, MethodBarDoesAbc) {
>+ const std::string input_filepath = "this/package/testdata/myinputfile.dat";
>+ const std::string output_filepath = "this/package/testdata/myoutputfile.dat";
>+ Foo f;
>+ EXPECT_EQ(f.Bar(input_filepath, output_filepath), 0);
>+}
>+
>+// Tests that Foo does Xyz.
>+TEST_F(FooTest, DoesXyz) {
>+ // Exercises the Xyz feature of Foo.
>+}
>+
>+} // namespace
>+
>+int main(int argc, char **argv) {
>+ ::testing::InitGoogleTest(&argc, argv);
>+ return RUN_ALL_TESTS();
>+}
>+```
>+
>+
>+The `::testing::InitGoogleTest()` function parses the command line for
>+googletest flags, and removes all recognized flags. This allows the user to
>+control a test program's behavior via various flags, which we'll cover in
>+[AdvancedGuide](advanced.md). You **must** call this function before calling
>+`RUN_ALL_TESTS()`, or the flags won't be properly initialized.
>+
>+On Windows, `InitGoogleTest()` also works with wide strings, so it can be used
>+in programs compiled in `UNICODE` mode as well.
>+
>+But maybe you think that writing all those main() functions is too much work? We
>+agree with you completely and that's why Google Test provides a basic
>+implementation of main(). If it fits your needs, then just link your test with
>+gtest\_main library and you are good to go.
>+
>+NOTE: `ParseGUnitFlags()` is deprecated in favor of `InitGoogleTest()`.
>+
>+
>+## Known Limitations
>+
>+* Google Test is designed to be thread-safe. The implementation is thread-safe
>+ on systems where the `pthreads` library is available. It is currently
>+ _unsafe_ to use Google Test assertions from two threads concurrently on
>+ other systems (e.g. Windows). In most tests this is not an issue as usually
>+ the assertions are done in the main thread. If you want to help, you can
>+ volunteer to implement the necessary synchronization primitives in
>+ `gtest-port.h` for your platform.
>diff --git a/Source/ThirdParty/gtest/docs/samples.md b/Source/ThirdParty/gtest/docs/samples.md
>new file mode 100644
>index 0000000000000000000000000000000000000000..18dcca381491e1982332c6d4472ca82d0d021702
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/docs/samples.md
>@@ -0,0 +1,22 @@
>+# Googletest Samples {#samples}
>+
>+If you're like us, you'd like to look at [googletest
>+samples.](https://github.com/google/googletest/tree/master/googletest/samples)
>+The sample directory has a number of well-commented samples showing how to use a
>+variety of googletest features.
>+
>+* Sample #1 shows the basic steps of using googletest to test C++ functions.
>+* Sample #2 shows a more complex unit test for a class with multiple member
>+ functions.
>+* Sample #3 uses a test fixture.
>+* Sample #4 teaches you how to use googletest and `googletest.h` together to
>+ get the best of both libraries.
>+* Sample #5 puts shared testing logic in a base test fixture, and reuses it in
>+ derived fixtures.
>+* Sample #6 demonstrates type-parameterized tests.
>+* Sample #7 teaches the basics of value-parameterized tests.
>+* Sample #8 shows using `Combine()` in value-parameterized tests.
>+* Sample #9 shows use of the listener API to modify Google Test's console
>+ output and the use of its reflection API to inspect test results.
>+* Sample #10 shows use of the listener API to implement a primitive memory
>+ leak checker.
>diff --git a/Source/ThirdParty/gtest/include/gtest/gtest-death-test.h b/Source/ThirdParty/gtest/include/gtest/gtest-death-test.h
>index 121dc1fb5ac5d59a33d53034058eee91c212a208..20c54d869519f6930e7ebfd2c0805baca42216ba 100644
>--- a/Source/ThirdParty/gtest/include/gtest/gtest-death-test.h
>+++ b/Source/ThirdParty/gtest/include/gtest/gtest-death-test.h
>@@ -26,19 +26,19 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
> //
>-// Author: wan@google.com (Zhanyong Wan)
>-//
>-// The Google C++ Testing Framework (Google Test)
>+// The Google C++ Testing and Mocking Framework (Google Test)
> //
> // This header file defines the public API for death tests. It is
> // #included by gtest.h so a user doesn't need to include this
> // directly.
>+// GOOGLETEST_CM0001 DO NOT DELETE
> 
> #ifndef GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
> #define GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
> 
>-#include <gtest/internal/gtest-death-test-internal.h>
>+#include "gtest/internal/gtest-death-test-internal.h"
> 
> namespace testing {
> 
>@@ -51,6 +51,17 @@ GTEST_DECLARE_string_(death_test_style);
> 
> #if GTEST_HAS_DEATH_TEST
> 
>+namespace internal {
>+
>+// Returns a Boolean value indicating whether the caller is currently
>+// executing in the context of the death test child process. Tools such as
>+// Valgrind heap checkers may need this to modify their behavior in death
>+// tests. IMPORTANT: This is an internal utility. Using it may break the
>+// implementation of death tests. User code MUST NOT use it.
>+GTEST_API_ bool InDeathTestChild();
>+
>+} // namespace internal
>+
> // The following macros are useful for writing death tests.
> 
> // Here's what happens when an ASSERT_DEATH* or EXPECT_DEATH* is
>@@ -75,7 +86,7 @@ GTEST_DECLARE_string_(death_test_style);
> // for (int i = 0; i < 5; i++) {
> // EXPECT_DEATH(server.ProcessRequest(i),
> // "Invalid request .* in ProcessRequest()")
>-// << "Failed to die on request " << i);
>+// << "Failed to die on request " << i;
> // }
> //
> // ASSERT_EXIT(server.ExitNow(), ::testing::ExitedWithCode(0), "Exiting");
>@@ -88,10 +99,11 @@ GTEST_DECLARE_string_(death_test_style);
> //
> // On the regular expressions used in death tests:
> //
>+// GOOGLETEST_CM0005 DO NOT DELETE
> // On POSIX-compliant systems (*nix), we use the <regex.h> library,
> // which uses the POSIX extended regex syntax.
> //
>-// On other platforms (e.g. Windows), we only support a simple regex
>+// On other platforms (e.g. Windows or Mac), we only support a simple regex
> // syntax implemented as part of Google Test. This limited
> // implementation should be enough most of the time when writing
> // death tests; though it lacks many features you can find in PCRE
>@@ -149,29 +161,29 @@ GTEST_DECLARE_string_(death_test_style);
> // is rarely a problem as people usually don't put the test binary
> // directory in PATH.
> //
>-// TODO(wan@google.com): make thread-safe death tests search the PATH.
>+// FIXME: make thread-safe death tests search the PATH.
> 
> // Asserts that a given statement causes the program to exit, with an
> // integer exit status that satisfies predicate, and emitting error output
> // that matches regex.
>-#define ASSERT_EXIT(statement, predicate, regex) \
>- GTEST_DEATH_TEST_(statement, predicate, regex, GTEST_FATAL_FAILURE_)
>+# define ASSERT_EXIT(statement, predicate, regex) \
>+ GTEST_DEATH_TEST_(statement, predicate, regex, GTEST_FATAL_FAILURE_)
> 
> // Like ASSERT_EXIT, but continues on to successive tests in the
> // test case, if any:
>-#define EXPECT_EXIT(statement, predicate, regex) \
>- GTEST_DEATH_TEST_(statement, predicate, regex, GTEST_NONFATAL_FAILURE_)
>+# define EXPECT_EXIT(statement, predicate, regex) \
>+ GTEST_DEATH_TEST_(statement, predicate, regex, GTEST_NONFATAL_FAILURE_)
> 
> // Asserts that a given statement causes the program to exit, either by
> // explicitly exiting with a nonzero exit code or being killed by a
> // signal, and emitting error output that matches regex.
>-#define ASSERT_DEATH(statement, regex) \
>- ASSERT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, regex)
>+# define ASSERT_DEATH(statement, regex) \
>+ ASSERT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, regex)
> 
> // Like ASSERT_DEATH, but continues on to successive tests in the
> // test case, if any:
>-#define EXPECT_DEATH(statement, regex) \
>- EXPECT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, regex)
>+# define EXPECT_DEATH(statement, regex) \
>+ EXPECT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, regex)
> 
> // Two predicate classes that can be used in {ASSERT,EXPECT}_EXIT*:
> 
>@@ -187,9 +199,10 @@ class GTEST_API_ ExitedWithCode {
> const int exit_code_;
> };
> 
>-#if !GTEST_OS_WINDOWS
>+# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
> // Tests that an exit code describes an exit due to termination by a
> // given signal.
>+// GOOGLETEST_CM0006 DO NOT DELETE
> class GTEST_API_ KilledBySignal {
> public:
> explicit KilledBySignal(int signum);
>@@ -197,7 +210,7 @@ class GTEST_API_ KilledBySignal {
> private:
> const int signum_;
> };
>-#endif // !GTEST_OS_WINDOWS
>+# endif // !GTEST_OS_WINDOWS
> 
> // EXPECT_DEBUG_DEATH asserts that the given statements die in debug mode.
> // The death testing framework causes this to have interesting semantics,
>@@ -242,40 +255,88 @@ class GTEST_API_ KilledBySignal {
> // EXPECT_EQ(12, DieInDebugOr12(&sideeffect));
> // }, "death");
> //
>-#ifdef NDEBUG
>+# ifdef NDEBUG
> 
>-#define EXPECT_DEBUG_DEATH(statement, regex) \
>- do { statement; } while (::testing::internal::AlwaysFalse())
>+# define EXPECT_DEBUG_DEATH(statement, regex) \
>+ GTEST_EXECUTE_STATEMENT_(statement, regex)
> 
>-#define ASSERT_DEBUG_DEATH(statement, regex) \
>- do { statement; } while (::testing::internal::AlwaysFalse())
>+# define ASSERT_DEBUG_DEATH(statement, regex) \
>+ GTEST_EXECUTE_STATEMENT_(statement, regex)
> 
>-#else
>+# else
> 
>-#define EXPECT_DEBUG_DEATH(statement, regex) \
>+# define EXPECT_DEBUG_DEATH(statement, regex) \
> EXPECT_DEATH(statement, regex)
> 
>-#define ASSERT_DEBUG_DEATH(statement, regex) \
>+# define ASSERT_DEBUG_DEATH(statement, regex) \
> ASSERT_DEATH(statement, regex)
> 
>-#endif // NDEBUG for EXPECT_DEBUG_DEATH
>+# endif // NDEBUG for EXPECT_DEBUG_DEATH
> #endif // GTEST_HAS_DEATH_TEST
> 
>+// This macro is used for implementing macros such as
>+// EXPECT_DEATH_IF_SUPPORTED and ASSERT_DEATH_IF_SUPPORTED on systems where
>+// death tests are not supported. Those macros must compile on such systems
>+// iff EXPECT_DEATH and ASSERT_DEATH compile with the same parameters on
>+// systems that support death tests. This allows one to write such a macro
>+// on a system that does not support death tests and be sure that it will
>+// compile on a death-test supporting system. It is exposed publicly so that
>+// systems that have death-tests with stricter requirements than
>+// GTEST_HAS_DEATH_TEST can write their own equivalent of
>+// EXPECT_DEATH_IF_SUPPORTED and ASSERT_DEATH_IF_SUPPORTED.
>+//
>+// Parameters:
>+// statement - A statement that a macro such as EXPECT_DEATH would test
>+// for program termination. This macro has to make sure this
>+// statement is compiled but not executed, to ensure that
>+// EXPECT_DEATH_IF_SUPPORTED compiles with a certain
>+// parameter iff EXPECT_DEATH compiles with it.
>+// regex - A regex that a macro such as EXPECT_DEATH would use to test
>+// the output of statement. This parameter has to be
>+// compiled but not evaluated by this macro, to ensure that
>+// this macro only accepts expressions that a macro such as
>+// EXPECT_DEATH would accept.
>+// terminator - Must be an empty statement for EXPECT_DEATH_IF_SUPPORTED
>+// and a return statement for ASSERT_DEATH_IF_SUPPORTED.
>+// This ensures that ASSERT_DEATH_IF_SUPPORTED will not
>+// compile inside functions where ASSERT_DEATH doesn't
>+// compile.
>+//
>+// The branch that has an always false condition is used to ensure that
>+// statement and regex are compiled (and thus syntactically correct) but
>+// never executed. The unreachable code macro protects the terminator
>+// statement from generating an 'unreachable code' warning in case
>+// statement unconditionally returns or throws. The Message constructor at
>+// the end allows the syntax of streaming additional messages into the
>+// macro, for compilational compatibility with EXPECT_DEATH/ASSERT_DEATH.
>+# define GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, terminator) \
>+ GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
>+ if (::testing::internal::AlwaysTrue()) { \
>+ GTEST_LOG_(WARNING) \
>+ << "Death tests are not supported on this platform.\n" \
>+ << "Statement '" #statement "' cannot be verified."; \
>+ } else if (::testing::internal::AlwaysFalse()) { \
>+ ::testing::internal::RE::PartialMatch(".*", (regex)); \
>+ GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
>+ terminator; \
>+ } else \
>+ ::testing::Message()
>+
> // EXPECT_DEATH_IF_SUPPORTED(statement, regex) and
> // ASSERT_DEATH_IF_SUPPORTED(statement, regex) expand to real death tests if
> // death tests are supported; otherwise they just issue a warning. This is
> // useful when you are combining death test assertions with normal test
> // assertions in one test.
> #if GTEST_HAS_DEATH_TEST
>-#define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
>+# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
> EXPECT_DEATH(statement, regex)
>-#define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
>+# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
> ASSERT_DEATH(statement, regex)
> #else
>-#define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
>- GTEST_UNSUPPORTED_DEATH_TEST_(statement, regex, )
>-#define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
>- GTEST_UNSUPPORTED_DEATH_TEST_(statement, regex, return)
>+# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
>+ GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, )
>+# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
>+ GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, return)
> #endif
> 
> } // namespace testing
>diff --git a/Source/ThirdParty/gtest/include/gtest/gtest-message.h b/Source/ThirdParty/gtest/include/gtest/gtest-message.h
>index f135b69427fe9ebe237c4cda7a9c2f0d78dd768e..5ca041614cb355922f355b893f9c84a3b7f52c6f 100644
>--- a/Source/ThirdParty/gtest/include/gtest/gtest-message.h
>+++ b/Source/ThirdParty/gtest/include/gtest/gtest-message.h
>@@ -26,10 +26,9 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
> //
>-// Author: wan@google.com (Zhanyong Wan)
>-//
>-// The Google C++ Testing Framework (Google Test)
>+// The Google C++ Testing and Mocking Framework (Google Test)
> //
> // This header file defines the Message class.
> //
>@@ -43,13 +42,21 @@
> // to CHANGE WITHOUT NOTICE. Therefore DO NOT DEPEND ON IT in a user
> // program!
> 
>+// GOOGLETEST_CM0001 DO NOT DELETE
>+
> #ifndef GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
> #define GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
> 
> #include <limits>
> 
>-#include <gtest/internal/gtest-string.h>
>-#include <gtest/internal/gtest-internal.h>
>+#include "gtest/internal/gtest-port.h"
>+
>+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
>+/* class A needs to have dll-interface to be used by clients of class B */)
>+
>+// Ensures that there is at least one operator<< in the global namespace.
>+// See Message& operator<<(...) below for why.
>+void operator<<(const testing::internal::Secret&, int);
> 
> namespace testing {
> 
>@@ -58,7 +65,7 @@ namespace testing {
> // Typical usage:
> //
> // 1. You stream a bunch of values to a Message object.
>-// It will remember the text in a StrStream.
>+// It will remember the text in a stringstream.
> // 2. Then you stream the Message object to an ostream.
> // This causes the text in the Message to be streamed
> // to the ostream.
>@@ -74,7 +81,7 @@ namespace testing {
> // Message is not intended to be inherited from. In particular, its
> // destructor is not virtual.
> //
>-// Note that StrStream behaves differently in gcc and in MSVC. You
>+// Note that stringstream behaves differently in gcc and in MSVC. You
> // can stream a NULL char pointer to it in the former, but not in the
> // latter (it causes an access violation if you do). The Message
> // class hides this difference by treating a NULL char pointer as
>@@ -87,27 +94,18 @@ class GTEST_API_ Message {
> 
> public:
> // Constructs an empty Message.
>- // We allocate the StrStream separately because it otherwise each use of
>- // ASSERT/EXPECT in a procedure adds over 200 bytes to the procedure's
>- // stack frame leading to huge stack frames in some cases; gcc does not reuse
>- // the stack space.
>- Message() : ss_(new internal::StrStream) {
>- // By default, we want there to be enough precision when printing
>- // a double to a Message.
>- *ss_ << std::setprecision(std::numeric_limits<double>::digits10 + 2);
>- }
>+ Message();
> 
> // Copy constructor.
>- Message(const Message& msg) : ss_(new internal::StrStream) { // NOLINT
>+ Message(const Message& msg) : ss_(new ::std::stringstream) { // NOLINT
> *ss_ << msg.GetString();
> }
> 
> // Constructs a Message from a C-string.
>- explicit Message(const char* str) : ss_(new internal::StrStream) {
>+ explicit Message(const char* str) : ss_(new ::std::stringstream) {
> *ss_ << str;
> }
> 
>- ~Message() { delete ss_; }
> #if GTEST_OS_SYMBIAN
> // Streams a value (either a pointer or not) to this object.
> template <typename T>
>@@ -119,7 +117,22 @@ class GTEST_API_ Message {
> // Streams a non-pointer value to this object.
> template <typename T>
> inline Message& operator <<(const T& val) {
>- ::GTestStreamToHelper(ss_, val);
>+ // Some libraries overload << for STL containers. These
>+ // overloads are defined in the global namespace instead of ::std.
>+ //
>+ // C++'s symbol lookup rule (i.e. Koenig lookup) says that these
>+ // overloads are visible in either the std namespace or the global
>+ // namespace, but not other namespaces, including the testing
>+ // namespace which Google Test's Message class is in.
>+ //
>+ // To allow STL containers (and other types that has a << operator
>+ // defined in the global namespace) to be used in Google Test
>+ // assertions, testing::Message must access the custom << operator
>+ // from the global namespace. With this using declaration,
>+ // overloads of << defined in the global namespace and those
>+ // visible via Koenig lookup are both exposed in this function.
>+ using ::operator <<;
>+ *ss_ << val;
> return *this;
> }
> 
>@@ -141,7 +154,7 @@ class GTEST_API_ Message {
> if (pointer == NULL) {
> *ss_ << "(null)";
> } else {
>- ::GTestStreamToHelper(ss_, pointer);
>+ *ss_ << pointer;
> }
> return *this;
> }
>@@ -165,12 +178,8 @@ class GTEST_API_ Message {
> 
> // These two overloads allow streaming a wide C string to a Message
> // using the UTF-8 encoding.
>- Message& operator <<(const wchar_t* wide_c_str) {
>- return *this << internal::String::ShowWideCString(wide_c_str);
>- }
>- Message& operator <<(wchar_t* wide_c_str) {
>- return *this << internal::String::ShowWideCString(wide_c_str);
>- }
>+ Message& operator <<(const wchar_t* wide_c_str);
>+ Message& operator <<(wchar_t* wide_c_str);
> 
> #if GTEST_HAS_STD_WSTRING
> // Converts the given wide string to a narrow string using the UTF-8
>@@ -184,13 +193,11 @@ class GTEST_API_ Message {
> Message& operator <<(const ::wstring& wstr);
> #endif // GTEST_HAS_GLOBAL_WSTRING
> 
>- // Gets the text streamed to this object so far as a String.
>+ // Gets the text streamed to this object so far as an std::string.
> // Each '\0' character in the buffer is replaced with "\\0".
> //
> // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
>- internal::String GetString() const {
>- return internal::StrStreamToString(ss_);
>- }
>+ std::string GetString() const;
> 
> private:
> #if GTEST_OS_SYMBIAN
>@@ -199,21 +206,25 @@ class GTEST_API_ Message {
> // decide between class template specializations for T and T*, so a
> // tr1::type_traits-like is_pointer works, and we can overload on that.
> template <typename T>
>- inline void StreamHelper(internal::true_type /*dummy*/, T* pointer) {
>+ inline void StreamHelper(internal::true_type /*is_pointer*/, T* pointer) {
> if (pointer == NULL) {
> *ss_ << "(null)";
> } else {
>- ::GTestStreamToHelper(ss_, pointer);
>+ *ss_ << pointer;
> }
> }
> template <typename T>
>- inline void StreamHelper(internal::false_type /*dummy*/, const T& value) {
>- ::GTestStreamToHelper(ss_, value);
>+ inline void StreamHelper(internal::false_type /*is_pointer*/,
>+ const T& value) {
>+ // See the comments in Message& operator <<(const T&) above for why
>+ // we need this using statement.
>+ using ::operator <<;
>+ *ss_ << value;
> }
> #endif // GTEST_OS_SYMBIAN
> 
> // We'll hold the text streamed to this object here.
>- internal::StrStream* const ss_;
>+ const internal::scoped_ptr< ::std::stringstream> ss_;
> 
> // We declare (but don't implement) this to prevent the compiler
> // from implementing the assignment operator.
>@@ -225,6 +236,20 @@ inline std::ostream& operator <<(std::ostream& os, const Message& sb) {
> return os << sb.GetString();
> }
> 
>+namespace internal {
>+
>+// Converts a streamable value to an std::string. A NULL pointer is
>+// converted to "(null)". When the input value is a ::string,
>+// ::std::string, ::wstring, or ::std::wstring object, each NUL
>+// character in it is replaced with "\\0".
>+template <typename T>
>+std::string StreamableToString(const T& streamable) {
>+ return (Message() << streamable).GetString();
>+}
>+
>+} // namespace internal
> } // namespace testing
> 
>+GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251
>+
> #endif // GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
>diff --git a/Source/ThirdParty/gtest/include/gtest/gtest-param-test.h b/Source/ThirdParty/gtest/include/gtest/gtest-param-test.h
>index 810069644d23ad355973cb53fceb0a856b0a006c..1e22f6850240f13ebd99ee9a9af836bbab73bc0e 100644
>--- a/Source/ThirdParty/gtest/include/gtest/gtest-param-test.h
>+++ b/Source/ThirdParty/gtest/include/gtest/gtest-param-test.h
>@@ -1,4 +1,6 @@
>-// This file was GENERATED by a script. DO NOT EDIT BY HAND!!!
>+// This file was GENERATED by command:
>+// pump.py gtest-param-test.h.pump
>+// DO NOT EDIT BY HAND!!!
> 
> // Copyright 2008, Google Inc.
> // All rights reserved.
>@@ -29,13 +31,13 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> //
>-// Authors: vladl@google.com (Vlad Losev)
>-//
> // Macros and functions for implementing parameterized tests
>-// in Google C++ Testing Framework (Google Test)
>+// in Google C++ Testing and Mocking Framework (Google Test)
> //
> // This file is generated by a SCRIPT. DO NOT EDIT BY HAND!
> //
>+// GOOGLETEST_CM0001 DO NOT DELETE
>+
> #ifndef GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
> #define GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
> 
>@@ -48,10 +50,12 @@
> #if 0
> 
> // To write value-parameterized tests, first you should define a fixture
>-// class. It must be derived from testing::TestWithParam<T>, where T is
>-// the type of your parameter values. TestWithParam<T> is itself derived
>-// from testing::Test. T can be any copyable type. If it's a raw pointer,
>-// you are responsible for managing the lifespan of the pointed values.
>+// class. It is usually derived from testing::TestWithParam<T> (see below for
>+// another inheritance scheme that's sometimes useful in more complicated
>+// class hierarchies), where the type of your parameter values.
>+// TestWithParam<T> is itself derived from testing::Test. T can be any
>+// copyable type. If it's a raw pointer, you are responsible for managing the
>+// lifespan of the pointed values.
> 
> class FooTest : public ::testing::TestWithParam<const char*> {
> // You can implement all the usual class fixture members here.
>@@ -75,7 +79,7 @@ TEST_P(FooTest, HasBlahBlah) {
> // Finally, you can use INSTANTIATE_TEST_CASE_P to instantiate the test
> // case with any set of parameters you want. Google Test defines a number
> // of functions for generating test parameters. They return what we call
>-// (surprise!) parameter generators. Here is a summary of them, which
>+// (surprise!) parameter generators. Here is a summary of them, which
> // are all in the testing namespace:
> //
> //
>@@ -146,23 +150,44 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
> // In the future, we plan to publish the API for defining new parameter
> // generators. But for now this interface remains part of the internal
> // implementation and is subject to change.
>+//
>+//
>+// A parameterized test fixture must be derived from testing::Test and from
>+// testing::WithParamInterface<T>, where T is the type of the parameter
>+// values. Inheriting from TestWithParam<T> satisfies that requirement because
>+// TestWithParam<T> inherits from both Test and WithParamInterface. In more
>+// complicated hierarchies, however, it is occasionally useful to inherit
>+// separately from Test and WithParamInterface. For example:
>+
>+class BaseTest : public ::testing::Test {
>+ // You can inherit all the usual members for a non-parameterized test
>+ // fixture here.
>+};
>+
>+class DerivedTest : public BaseTest, public ::testing::WithParamInterface<int> {
>+ // The usual test fixture members go here too.
>+};
>+
>+TEST_F(BaseTest, HasFoo) {
>+ // This is an ordinary non-parameterized test.
>+}
>+
>+TEST_P(DerivedTest, DoesBlah) {
>+ // GetParam works just the same here as if you inherit from TestWithParam.
>+ EXPECT_TRUE(foo.Blah(GetParam()));
>+}
> 
> #endif // 0
> 
>-#include <gtest/internal/gtest-port.h>
>+#include "gtest/internal/gtest-port.h"
> 
> #if !GTEST_OS_SYMBIAN
>-#include <utility>
>+# include <utility>
> #endif
> 
>-// scripts/fuse_gtest.py depends on gtest's own header being #included
>-// *unconditionally*. Therefore these #includes cannot be moved
>-// inside #if GTEST_HAS_PARAM_TEST.
>-#include <gtest/internal/gtest-internal.h>
>-#include <gtest/internal/gtest-param-util.h>
>-#include <gtest/internal/gtest-param-util-generated.h>
>-
>-#if GTEST_HAS_PARAM_TEST
>+#include "gtest/internal/gtest-internal.h"
>+#include "gtest/internal/gtest-param-util.h"
>+#include "gtest/internal/gtest-param-util-generated.h"
> 
> namespace testing {
> 
>@@ -243,7 +268,7 @@ internal::ParamGenerator<T> Range(T start, T end) {
> // each with C-string values of "foo", "bar", and "baz":
> //
> // const char* strings[] = {"foo", "bar", "baz"};
>-// INSTANTIATE_TEST_CASE_P(StringSequence, SrtingTest, ValuesIn(strings));
>+// INSTANTIATE_TEST_CASE_P(StringSequence, StringTest, ValuesIn(strings));
> //
> // This instantiates tests from test case StlStringTest
> // each with STL strings with values "a" and "b":
>@@ -276,11 +301,10 @@ internal::ParamGenerator<T> Range(T start, T end) {
> //
> template <typename ForwardIterator>
> internal::ParamGenerator<
>- typename ::std::iterator_traits<ForwardIterator>::value_type> ValuesIn(
>- ForwardIterator begin,
>- ForwardIterator end) {
>- typedef typename ::std::iterator_traits<ForwardIterator>::value_type
>- ParamType;
>+ typename ::testing::internal::IteratorTraits<ForwardIterator>::value_type>
>+ValuesIn(ForwardIterator begin, ForwardIterator end) {
>+ typedef typename ::testing::internal::IteratorTraits<ForwardIterator>
>+ ::value_type ParamType;
> return internal::ParamGenerator<ParamType>(
> new internal::ValuesInIteratorRangeGenerator<ParamType>(begin, end));
> }
>@@ -1192,7 +1216,7 @@ inline internal::ParamGenerator<bool> Bool() {
> return Values(false, true);
> }
> 
>-#if GTEST_HAS_COMBINE
>+# if GTEST_HAS_COMBINE
> // Combine() allows the user to combine two or more sequences to produce
> // values of a Cartesian product of those sequences' elements.
> //
>@@ -1228,7 +1252,7 @@ inline internal::ParamGenerator<bool> Bool() {
> // Boolean flags:
> //
> // class FlagDependentTest
>-// : public testing::TestWithParam<tuple(bool, bool)> > {
>+// : public testing::TestWithParam<tuple<bool, bool> > {
> // virtual void SetUp() {
> // // Assigns external_flag_1 and external_flag_2 values from the tuple.
> // tie(external_flag_1, external_flag_2) = GetParam();
>@@ -1344,11 +1368,9 @@ internal::CartesianProductHolder10<Generator1, Generator2, Generator3,
> Generator10>(
> g1, g2, g3, g4, g5, g6, g7, g8, g9, g10);
> }
>-#endif // GTEST_HAS_COMBINE
>-
>-
>+# endif // GTEST_HAS_COMBINE
> 
>-#define TEST_P(test_case_name, test_name) \
>+# define TEST_P(test_case_name, test_name) \
> class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \
> : public test_case_name { \
> public: \
>@@ -1358,14 +1380,17 @@ internal::CartesianProductHolder10<Generator1, Generator2, Generator3,
> static int AddToRegistry() { \
> ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
> GetTestCasePatternHolder<test_case_name>(\
>- #test_case_name, __FILE__, __LINE__)->AddTestPattern(\
>- #test_case_name, \
>- #test_name, \
>- new ::testing::internal::TestMetaFactory< \
>- GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>()); \
>+ #test_case_name, \
>+ ::testing::internal::CodeLocation(\
>+ __FILE__, __LINE__))->AddTestPattern(\
>+ GTEST_STRINGIFY_(test_case_name), \
>+ GTEST_STRINGIFY_(test_name), \
>+ new ::testing::internal::TestMetaFactory< \
>+ GTEST_TEST_CLASS_NAME_(\
>+ test_case_name, test_name)>()); \
> return 0; \
> } \
>- static int gtest_registering_dummy_; \
>+ static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_; \
> GTEST_DISALLOW_COPY_AND_ASSIGN_(\
> GTEST_TEST_CLASS_NAME_(test_case_name, test_name)); \
> }; \
>@@ -1374,19 +1399,39 @@ internal::CartesianProductHolder10<Generator1, Generator2, Generator3,
> GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::AddToRegistry(); \
> void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody()
> 
>-#define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator) \
>- ::testing::internal::ParamGenerator<test_case_name::ParamType> \
>- gtest_##prefix##test_case_name##_EvalGenerator_() { return generator; } \
>- int gtest_##prefix##test_case_name##_dummy_ = \
>- ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
>- GetTestCasePatternHolder<test_case_name>(\
>- #test_case_name, __FILE__, __LINE__)->AddTestCaseInstantiation(\
>- #prefix, \
>- &gtest_##prefix##test_case_name##_EvalGenerator_, \
>- __FILE__, __LINE__)
>+// The optional last argument to INSTANTIATE_TEST_CASE_P allows the user
>+// to specify a function or functor that generates custom test name suffixes
>+// based on the test parameters. The function should accept one argument of
>+// type testing::TestParamInfo<class ParamType>, and return std::string.
>+//
>+// testing::PrintToStringParamName is a builtin test suffix generator that
>+// returns the value of testing::PrintToString(GetParam()).
>+//
>+// Note: test names must be non-empty, unique, and may only contain ASCII
>+// alphanumeric characters or underscore. Because PrintToString adds quotes
>+// to std::string and C strings, it won't work for these types.
>+
>+#define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator, ...) \
>+ static ::testing::internal::ParamGenerator<test_case_name::ParamType> \
>+ gtest_##prefix##test_case_name##_EvalGenerator_() { \
>+ return generator; \
>+ } \
>+ static ::std::string gtest_##prefix##test_case_name##_EvalGenerateName_( \
>+ const ::testing::TestParamInfo<test_case_name::ParamType>& info) { \
>+ return ::testing::internal::GetParamNameGen<test_case_name::ParamType>( \
>+ __VA_ARGS__)(info); \
>+ } \
>+ static int gtest_##prefix##test_case_name##_dummy_ GTEST_ATTRIBUTE_UNUSED_ = \
>+ ::testing::UnitTest::GetInstance() \
>+ ->parameterized_test_registry() \
>+ .GetTestCasePatternHolder<test_case_name>( \
>+ #test_case_name, \
>+ ::testing::internal::CodeLocation(__FILE__, __LINE__)) \
>+ ->AddTestCaseInstantiation( \
>+ #prefix, &gtest_##prefix##test_case_name##_EvalGenerator_, \
>+ &gtest_##prefix##test_case_name##_EvalGenerateName_, __FILE__, \
>+ __LINE__)
> 
> } // namespace testing
> 
>-#endif // GTEST_HAS_PARAM_TEST
>-
> #endif // GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
>diff --git a/Source/ThirdParty/gtest/include/gtest/gtest-param-test.h.pump b/Source/ThirdParty/gtest/include/gtest/gtest-param-test.h.pump
>index a23118827f1d480fbbb8252f340f0ebeda346e25..274f2b3b569330012e85ee3cf4fd57eb0b5421d6 100644
>--- a/Source/ThirdParty/gtest/include/gtest/gtest-param-test.h.pump
>+++ b/Source/ThirdParty/gtest/include/gtest/gtest-param-test.h.pump
>@@ -30,13 +30,12 @@ $var maxtuple = 10 $$ Maximum number of Combine arguments we want to support.
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> //
>-// Authors: vladl@google.com (Vlad Losev)
>-//
> // Macros and functions for implementing parameterized tests
>-// in Google C++ Testing Framework (Google Test)
>+// in Google C++ Testing and Mocking Framework (Google Test)
> //
> // This file is generated by a SCRIPT. DO NOT EDIT BY HAND!
> //
>+// GOOGLETEST_CM0001 DO NOT DELETE
> #ifndef GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
> #define GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
> 
>@@ -49,10 +48,12 @@ $var maxtuple = 10 $$ Maximum number of Combine arguments we want to support.
> #if 0
> 
> // To write value-parameterized tests, first you should define a fixture
>-// class. It must be derived from testing::TestWithParam<T>, where T is
>-// the type of your parameter values. TestWithParam<T> is itself derived
>-// from testing::Test. T can be any copyable type. If it's a raw pointer,
>-// you are responsible for managing the lifespan of the pointed values.
>+// class. It is usually derived from testing::TestWithParam<T> (see below for
>+// another inheritance scheme that's sometimes useful in more complicated
>+// class hierarchies), where the type of your parameter values.
>+// TestWithParam<T> is itself derived from testing::Test. T can be any
>+// copyable type. If it's a raw pointer, you are responsible for managing the
>+// lifespan of the pointed values.
> 
> class FooTest : public ::testing::TestWithParam<const char*> {
> // You can implement all the usual class fixture members here.
>@@ -76,7 +77,7 @@ TEST_P(FooTest, HasBlahBlah) {
> // Finally, you can use INSTANTIATE_TEST_CASE_P to instantiate the test
> // case with any set of parameters you want. Google Test defines a number
> // of functions for generating test parameters. They return what we call
>-// (surprise!) parameter generators. Here is a summary of them, which
>+// (surprise!) parameter generators. Here is a summary of them, which
> // are all in the testing namespace:
> //
> //
>@@ -134,9 +135,12 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
> // in the given test case, whether their definitions come before or
> // AFTER the INSTANTIATE_TEST_CASE_P statement.
> //
>-// Please also note that generator expressions are evaluated in
>-// RUN_ALL_TESTS(), after main() has started. This allows evaluation of
>-// parameter list based on command line parameters.
>+// Please also note that generator expressions (including parameters to the
>+// generators) are evaluated in InitGoogleTest(), after main() has started.
>+// This allows the user on one hand, to adjust generator parameters in order
>+// to dynamically determine a set of tests to run and on the other hand,
>+// give the user a chance to inspect the generated tests with Google Test
>+// reflection API before RUN_ALL_TESTS() is executed.
> //
> // You can see samples/sample7_unittest.cc and samples/sample8_unittest.cc
> // for more examples.
>@@ -144,23 +148,44 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
> // In the future, we plan to publish the API for defining new parameter
> // generators. But for now this interface remains part of the internal
> // implementation and is subject to change.
>+//
>+//
>+// A parameterized test fixture must be derived from testing::Test and from
>+// testing::WithParamInterface<T>, where T is the type of the parameter
>+// values. Inheriting from TestWithParam<T> satisfies that requirement because
>+// TestWithParam<T> inherits from both Test and WithParamInterface. In more
>+// complicated hierarchies, however, it is occasionally useful to inherit
>+// separately from Test and WithParamInterface. For example:
>+
>+class BaseTest : public ::testing::Test {
>+ // You can inherit all the usual members for a non-parameterized test
>+ // fixture here.
>+};
>+
>+class DerivedTest : public BaseTest, public ::testing::WithParamInterface<int> {
>+ // The usual test fixture members go here too.
>+};
>+
>+TEST_F(BaseTest, HasFoo) {
>+ // This is an ordinary non-parameterized test.
>+}
>+
>+TEST_P(DerivedTest, DoesBlah) {
>+ // GetParam works just the same here as if you inherit from TestWithParam.
>+ EXPECT_TRUE(foo.Blah(GetParam()));
>+}
> 
> #endif // 0
> 
>-#include <gtest/internal/gtest-port.h>
>+#include "gtest/internal/gtest-port.h"
> 
> #if !GTEST_OS_SYMBIAN
>-#include <utility>
>+# include <utility>
> #endif
> 
>-// scripts/fuse_gtest.py depends on gtest's own header being #included
>-// *unconditionally*. Therefore these #includes cannot be moved
>-// inside #if GTEST_HAS_PARAM_TEST.
>-#include <gtest/internal/gtest-internal.h>
>-#include <gtest/internal/gtest-param-util.h>
>-#include <gtest/internal/gtest-param-util-generated.h>
>-
>-#if GTEST_HAS_PARAM_TEST
>+#include "gtest/internal/gtest-internal.h"
>+#include "gtest/internal/gtest-param-util.h"
>+#include "gtest/internal/gtest-param-util-generated.h"
> 
> namespace testing {
> 
>@@ -241,7 +266,7 @@ internal::ParamGenerator<T> Range(T start, T end) {
> // each with C-string values of "foo", "bar", and "baz":
> //
> // const char* strings[] = {"foo", "bar", "baz"};
>-// INSTANTIATE_TEST_CASE_P(StringSequence, SrtingTest, ValuesIn(strings));
>+// INSTANTIATE_TEST_CASE_P(StringSequence, StringTest, ValuesIn(strings));
> //
> // This instantiates tests from test case StlStringTest
> // each with STL strings with values "a" and "b":
>@@ -274,11 +299,10 @@ internal::ParamGenerator<T> Range(T start, T end) {
> //
> template <typename ForwardIterator>
> internal::ParamGenerator<
>- typename ::std::iterator_traits<ForwardIterator>::value_type> ValuesIn(
>- ForwardIterator begin,
>- ForwardIterator end) {
>- typedef typename ::std::iterator_traits<ForwardIterator>::value_type
>- ParamType;
>+ typename ::testing::internal::IteratorTraits<ForwardIterator>::value_type>
>+ValuesIn(ForwardIterator begin, ForwardIterator end) {
>+ typedef typename ::testing::internal::IteratorTraits<ForwardIterator>
>+ ::value_type ParamType;
> return internal::ParamGenerator<ParamType>(
> new internal::ValuesInIteratorRangeGenerator<ParamType>(begin, end));
> }
>@@ -348,7 +372,7 @@ inline internal::ParamGenerator<bool> Bool() {
> return Values(false, true);
> }
> 
>-#if GTEST_HAS_COMBINE
>+# if GTEST_HAS_COMBINE
> // Combine() allows the user to combine two or more sequences to produce
> // values of a Cartesian product of those sequences' elements.
> //
>@@ -384,7 +408,7 @@ inline internal::ParamGenerator<bool> Bool() {
> // Boolean flags:
> //
> // class FlagDependentTest
>-// : public testing::TestWithParam<tuple(bool, bool)> > {
>+// : public testing::TestWithParam<tuple<bool, bool> > {
> // virtual void SetUp() {
> // // Assigns external_flag_1 and external_flag_2 values from the tuple.
> // tie(external_flag_1, external_flag_2) = GetParam();
>@@ -409,11 +433,9 @@ internal::CartesianProductHolder$i<$for j, [[Generator$j]]> Combine(
> }
> 
> ]]
>-#endif // GTEST_HAS_COMBINE
>-
>-
>+# endif // GTEST_HAS_COMBINE
> 
>-#define TEST_P(test_case_name, test_name) \
>+# define TEST_P(test_case_name, test_name) \
> class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \
> : public test_case_name { \
> public: \
>@@ -423,14 +445,17 @@ internal::CartesianProductHolder$i<$for j, [[Generator$j]]> Combine(
> static int AddToRegistry() { \
> ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
> GetTestCasePatternHolder<test_case_name>(\
>- #test_case_name, __FILE__, __LINE__)->AddTestPattern(\
>- #test_case_name, \
>- #test_name, \
>- new ::testing::internal::TestMetaFactory< \
>- GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>()); \
>+ #test_case_name, \
>+ ::testing::internal::CodeLocation(\
>+ __FILE__, __LINE__))->AddTestPattern(\
>+ GTEST_STRINGIFY_(test_case_name), \
>+ GTEST_STRINGIFY_(test_name), \
>+ new ::testing::internal::TestMetaFactory< \
>+ GTEST_TEST_CLASS_NAME_(\
>+ test_case_name, test_name)>()); \
> return 0; \
> } \
>- static int gtest_registering_dummy_; \
>+ static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_; \
> GTEST_DISALLOW_COPY_AND_ASSIGN_(\
> GTEST_TEST_CLASS_NAME_(test_case_name, test_name)); \
> }; \
>@@ -439,19 +464,37 @@ internal::CartesianProductHolder$i<$for j, [[Generator$j]]> Combine(
> GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::AddToRegistry(); \
> void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody()
> 
>-#define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator) \
>- ::testing::internal::ParamGenerator<test_case_name::ParamType> \
>+// The optional last argument to INSTANTIATE_TEST_CASE_P allows the user
>+// to specify a function or functor that generates custom test name suffixes
>+// based on the test parameters. The function should accept one argument of
>+// type testing::TestParamInfo<class ParamType>, and return std::string.
>+//
>+// testing::PrintToStringParamName is a builtin test suffix generator that
>+// returns the value of testing::PrintToString(GetParam()).
>+//
>+// Note: test names must be non-empty, unique, and may only contain ASCII
>+// alphanumeric characters or underscore. Because PrintToString adds quotes
>+// to std::string and C strings, it won't work for these types.
>+
>+# define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator, ...) \
>+ static ::testing::internal::ParamGenerator<test_case_name::ParamType> \
> gtest_##prefix##test_case_name##_EvalGenerator_() { return generator; } \
>- int gtest_##prefix##test_case_name##_dummy_ = \
>+ static ::std::string gtest_##prefix##test_case_name##_EvalGenerateName_( \
>+ const ::testing::TestParamInfo<test_case_name::ParamType>& info) { \
>+ return ::testing::internal::GetParamNameGen<test_case_name::ParamType> \
>+ (__VA_ARGS__)(info); \
>+ } \
>+ static int gtest_##prefix##test_case_name##_dummy_ GTEST_ATTRIBUTE_UNUSED_ = \
> ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
> GetTestCasePatternHolder<test_case_name>(\
>- #test_case_name, __FILE__, __LINE__)->AddTestCaseInstantiation(\
>- #prefix, \
>- &gtest_##prefix##test_case_name##_EvalGenerator_, \
>- __FILE__, __LINE__)
>+ #test_case_name, \
>+ ::testing::internal::CodeLocation(\
>+ __FILE__, __LINE__))->AddTestCaseInstantiation(\
>+ #prefix, \
>+ &gtest_##prefix##test_case_name##_EvalGenerator_, \
>+ &gtest_##prefix##test_case_name##_EvalGenerateName_, \
>+ __FILE__, __LINE__)
> 
> } // namespace testing
> 
>-#endif // GTEST_HAS_PARAM_TEST
>-
> #endif // GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
>diff --git a/Source/ThirdParty/gtest/include/gtest/gtest-printers.h b/Source/ThirdParty/gtest/include/gtest/gtest-printers.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..51865f84e6f6fa3e0fce198700b5a5dfe5f6550e
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/include/gtest/gtest-printers.h
>@@ -0,0 +1,1107 @@
>+// Copyright 2007, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+
>+// Google Test - The Google C++ Testing and Mocking Framework
>+//
>+// This file implements a universal value printer that can print a
>+// value of any type T:
>+//
>+// void ::testing::internal::UniversalPrinter<T>::Print(value, ostream_ptr);
>+//
>+// A user can teach this function how to print a class type T by
>+// defining either operator<<() or PrintTo() in the namespace that
>+// defines T. More specifically, the FIRST defined function in the
>+// following list will be used (assuming T is defined in namespace
>+// foo):
>+//
>+// 1. foo::PrintTo(const T&, ostream*)
>+// 2. operator<<(ostream&, const T&) defined in either foo or the
>+// global namespace.
>+//
>+// However if T is an STL-style container then it is printed element-wise
>+// unless foo::PrintTo(const T&, ostream*) is defined. Note that
>+// operator<<() is ignored for container types.
>+//
>+// If none of the above is defined, it will print the debug string of
>+// the value if it is a protocol buffer, or print the raw bytes in the
>+// value otherwise.
>+//
>+// To aid debugging: when T is a reference type, the address of the
>+// value is also printed; when T is a (const) char pointer, both the
>+// pointer value and the NUL-terminated string it points to are
>+// printed.
>+//
>+// We also provide some convenient wrappers:
>+//
>+// // Prints a value to a string. For a (const or not) char
>+// // pointer, the NUL-terminated string (but not the pointer) is
>+// // printed.
>+// std::string ::testing::PrintToString(const T& value);
>+//
>+// // Prints a value tersely: for a reference type, the referenced
>+// // value (but not the address) is printed; for a (const or not) char
>+// // pointer, the NUL-terminated string (but not the pointer) is
>+// // printed.
>+// void ::testing::internal::UniversalTersePrint(const T& value, ostream*);
>+//
>+// // Prints value using the type inferred by the compiler. The difference
>+// // from UniversalTersePrint() is that this function prints both the
>+// // pointer and the NUL-terminated string for a (const or not) char pointer.
>+// void ::testing::internal::UniversalPrint(const T& value, ostream*);
>+//
>+// // Prints the fields of a tuple tersely to a string vector, one
>+// // element for each field. Tuple support must be enabled in
>+// // gtest-port.h.
>+// std::vector<string> UniversalTersePrintTupleFieldsToStrings(
>+// const Tuple& value);
>+//
>+// Known limitation:
>+//
>+// The print primitives print the elements of an STL-style container
>+// using the compiler-inferred type of *iter where iter is a
>+// const_iterator of the container. When const_iterator is an input
>+// iterator but not a forward iterator, this inferred type may not
>+// match value_type, and the print output may be incorrect. In
>+// practice, this is rarely a problem as for most containers
>+// const_iterator is a forward iterator. We'll fix this if there's an
>+// actual need for it. Note that this fix cannot rely on value_type
>+// being defined as many user-defined container types don't have
>+// value_type.
>+
>+// GOOGLETEST_CM0001 DO NOT DELETE
>+
>+#ifndef GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
>+#define GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
>+
>+#include <ostream> // NOLINT
>+#include <sstream>
>+#include <string>
>+#include <utility>
>+#include <vector>
>+#include "gtest/internal/gtest-port.h"
>+#include "gtest/internal/gtest-internal.h"
>+
>+#if GTEST_HAS_STD_TUPLE_
>+# include <tuple>
>+#endif
>+
>+#if GTEST_HAS_ABSL
>+#include "absl/strings/string_view.h"
>+#include "absl/types/optional.h"
>+#include "absl/types/variant.h"
>+#endif // GTEST_HAS_ABSL
>+
>+namespace testing {
>+
>+// Definitions in the 'internal' and 'internal2' name spaces are
>+// subject to change without notice. DO NOT USE THEM IN USER CODE!
>+namespace internal2 {
>+
>+// Prints the given number of bytes in the given object to the given
>+// ostream.
>+GTEST_API_ void PrintBytesInObjectTo(const unsigned char* obj_bytes,
>+ size_t count,
>+ ::std::ostream* os);
>+
>+// For selecting which printer to use when a given type has neither <<
>+// nor PrintTo().
>+enum TypeKind {
>+ kProtobuf, // a protobuf type
>+ kConvertibleToInteger, // a type implicitly convertible to BiggestInt
>+ // (e.g. a named or unnamed enum type)
>+#if GTEST_HAS_ABSL
>+ kConvertibleToStringView, // a type implicitly convertible to
>+ // absl::string_view
>+#endif
>+ kOtherType // anything else
>+};
>+
>+// TypeWithoutFormatter<T, kTypeKind>::PrintValue(value, os) is called
>+// by the universal printer to print a value of type T when neither
>+// operator<< nor PrintTo() is defined for T, where kTypeKind is the
>+// "kind" of T as defined by enum TypeKind.
>+template <typename T, TypeKind kTypeKind>
>+class TypeWithoutFormatter {
>+ public:
>+ // This default version is called when kTypeKind is kOtherType.
>+ static void PrintValue(const T& value, ::std::ostream* os) {
>+ PrintBytesInObjectTo(static_cast<const unsigned char*>(
>+ reinterpret_cast<const void*>(&value)),
>+ sizeof(value), os);
>+ }
>+};
>+
>+// We print a protobuf using its ShortDebugString() when the string
>+// doesn't exceed this many characters; otherwise we print it using
>+// DebugString() for better readability.
>+const size_t kProtobufOneLinerMaxLength = 50;
>+
>+template <typename T>
>+class TypeWithoutFormatter<T, kProtobuf> {
>+ public:
>+ static void PrintValue(const T& value, ::std::ostream* os) {
>+ std::string pretty_str = value.ShortDebugString();
>+ if (pretty_str.length() > kProtobufOneLinerMaxLength) {
>+ pretty_str = "\n" + value.DebugString();
>+ }
>+ *os << ("<" + pretty_str + ">");
>+ }
>+};
>+
>+template <typename T>
>+class TypeWithoutFormatter<T, kConvertibleToInteger> {
>+ public:
>+ // Since T has no << operator or PrintTo() but can be implicitly
>+ // converted to BiggestInt, we print it as a BiggestInt.
>+ //
>+ // Most likely T is an enum type (either named or unnamed), in which
>+ // case printing it as an integer is the desired behavior. In case
>+ // T is not an enum, printing it as an integer is the best we can do
>+ // given that it has no user-defined printer.
>+ static void PrintValue(const T& value, ::std::ostream* os) {
>+ const internal::BiggestInt kBigInt = value;
>+ *os << kBigInt;
>+ }
>+};
>+
>+#if GTEST_HAS_ABSL
>+template <typename T>
>+class TypeWithoutFormatter<T, kConvertibleToStringView> {
>+ public:
>+ // Since T has neither operator<< nor PrintTo() but can be implicitly
>+ // converted to absl::string_view, we print it as a absl::string_view.
>+ //
>+ // Note: the implementation is further below, as it depends on
>+ // internal::PrintTo symbol which is defined later in the file.
>+ static void PrintValue(const T& value, ::std::ostream* os);
>+};
>+#endif
>+
>+// Prints the given value to the given ostream. If the value is a
>+// protocol message, its debug string is printed; if it's an enum or
>+// of a type implicitly convertible to BiggestInt, it's printed as an
>+// integer; otherwise the bytes in the value are printed. This is
>+// what UniversalPrinter<T>::Print() does when it knows nothing about
>+// type T and T has neither << operator nor PrintTo().
>+//
>+// A user can override this behavior for a class type Foo by defining
>+// a << operator in the namespace where Foo is defined.
>+//
>+// We put this operator in namespace 'internal2' instead of 'internal'
>+// to simplify the implementation, as much code in 'internal' needs to
>+// use << in STL, which would conflict with our own << were it defined
>+// in 'internal'.
>+//
>+// Note that this operator<< takes a generic std::basic_ostream<Char,
>+// CharTraits> type instead of the more restricted std::ostream. If
>+// we define it to take an std::ostream instead, we'll get an
>+// "ambiguous overloads" compiler error when trying to print a type
>+// Foo that supports streaming to std::basic_ostream<Char,
>+// CharTraits>, as the compiler cannot tell whether
>+// operator<<(std::ostream&, const T&) or
>+// operator<<(std::basic_stream<Char, CharTraits>, const Foo&) is more
>+// specific.
>+template <typename Char, typename CharTraits, typename T>
>+::std::basic_ostream<Char, CharTraits>& operator<<(
>+ ::std::basic_ostream<Char, CharTraits>& os, const T& x) {
>+ TypeWithoutFormatter<T, (internal::IsAProtocolMessage<T>::value
>+ ? kProtobuf
>+ : internal::ImplicitlyConvertible<
>+ const T&, internal::BiggestInt>::value
>+ ? kConvertibleToInteger
>+ :
>+#if GTEST_HAS_ABSL
>+ internal::ImplicitlyConvertible<
>+ const T&, absl::string_view>::value
>+ ? kConvertibleToStringView
>+ :
>+#endif
>+ kOtherType)>::PrintValue(x, &os);
>+ return os;
>+}
>+
>+} // namespace internal2
>+} // namespace testing
>+
>+// This namespace MUST NOT BE NESTED IN ::testing, or the name look-up
>+// magic needed for implementing UniversalPrinter won't work.
>+namespace testing_internal {
>+
>+// Used to print a value that is not an STL-style container when the
>+// user doesn't define PrintTo() for it.
>+template <typename T>
>+void DefaultPrintNonContainerTo(const T& value, ::std::ostream* os) {
>+ // With the following statement, during unqualified name lookup,
>+ // testing::internal2::operator<< appears as if it was declared in
>+ // the nearest enclosing namespace that contains both
>+ // ::testing_internal and ::testing::internal2, i.e. the global
>+ // namespace. For more details, refer to the C++ Standard section
>+ // 7.3.4-1 [namespace.udir]. This allows us to fall back onto
>+ // testing::internal2::operator<< in case T doesn't come with a <<
>+ // operator.
>+ //
>+ // We cannot write 'using ::testing::internal2::operator<<;', which
>+ // gcc 3.3 fails to compile due to a compiler bug.
>+ using namespace ::testing::internal2; // NOLINT
>+
>+ // Assuming T is defined in namespace foo, in the next statement,
>+ // the compiler will consider all of:
>+ //
>+ // 1. foo::operator<< (thanks to Koenig look-up),
>+ // 2. ::operator<< (as the current namespace is enclosed in ::),
>+ // 3. testing::internal2::operator<< (thanks to the using statement above).
>+ //
>+ // The operator<< whose type matches T best will be picked.
>+ //
>+ // We deliberately allow #2 to be a candidate, as sometimes it's
>+ // impossible to define #1 (e.g. when foo is ::std, defining
>+ // anything in it is undefined behavior unless you are a compiler
>+ // vendor.).
>+ *os << value;
>+}
>+
>+} // namespace testing_internal
>+
>+namespace testing {
>+namespace internal {
>+
>+// FormatForComparison<ToPrint, OtherOperand>::Format(value) formats a
>+// value of type ToPrint that is an operand of a comparison assertion
>+// (e.g. ASSERT_EQ). OtherOperand is the type of the other operand in
>+// the comparison, and is used to help determine the best way to
>+// format the value. In particular, when the value is a C string
>+// (char pointer) and the other operand is an STL string object, we
>+// want to format the C string as a string, since we know it is
>+// compared by value with the string object. If the value is a char
>+// pointer but the other operand is not an STL string object, we don't
>+// know whether the pointer is supposed to point to a NUL-terminated
>+// string, and thus want to print it as a pointer to be safe.
>+//
>+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
>+
>+// The default case.
>+template <typename ToPrint, typename OtherOperand>
>+class FormatForComparison {
>+ public:
>+ static ::std::string Format(const ToPrint& value) {
>+ return ::testing::PrintToString(value);
>+ }
>+};
>+
>+// Array.
>+template <typename ToPrint, size_t N, typename OtherOperand>
>+class FormatForComparison<ToPrint[N], OtherOperand> {
>+ public:
>+ static ::std::string Format(const ToPrint* value) {
>+ return FormatForComparison<const ToPrint*, OtherOperand>::Format(value);
>+ }
>+};
>+
>+// By default, print C string as pointers to be safe, as we don't know
>+// whether they actually point to a NUL-terminated string.
>+
>+#define GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(CharType) \
>+ template <typename OtherOperand> \
>+ class FormatForComparison<CharType*, OtherOperand> { \
>+ public: \
>+ static ::std::string Format(CharType* value) { \
>+ return ::testing::PrintToString(static_cast<const void*>(value)); \
>+ } \
>+ }
>+
>+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char);
>+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char);
>+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(wchar_t);
>+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const wchar_t);
>+
>+#undef GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_
>+
>+// If a C string is compared with an STL string object, we know it's meant
>+// to point to a NUL-terminated string, and thus can print it as a string.
>+
>+#define GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(CharType, OtherStringType) \
>+ template <> \
>+ class FormatForComparison<CharType*, OtherStringType> { \
>+ public: \
>+ static ::std::string Format(CharType* value) { \
>+ return ::testing::PrintToString(value); \
>+ } \
>+ }
>+
>+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::std::string);
>+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::std::string);
>+
>+#if GTEST_HAS_GLOBAL_STRING
>+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::string);
>+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::string);
>+#endif
>+
>+#if GTEST_HAS_GLOBAL_WSTRING
>+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::wstring);
>+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::wstring);
>+#endif
>+
>+#if GTEST_HAS_STD_WSTRING
>+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::std::wstring);
>+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::std::wstring);
>+#endif
>+
>+#undef GTEST_IMPL_FORMAT_C_STRING_AS_STRING_
>+
>+// Formats a comparison assertion (e.g. ASSERT_EQ, EXPECT_LT, and etc)
>+// operand to be used in a failure message. The type (but not value)
>+// of the other operand may affect the format. This allows us to
>+// print a char* as a raw pointer when it is compared against another
>+// char* or void*, and print it as a C string when it is compared
>+// against an std::string object, for example.
>+//
>+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
>+template <typename T1, typename T2>
>+std::string FormatForComparisonFailureMessage(
>+ const T1& value, const T2& /* other_operand */) {
>+ return FormatForComparison<T1, T2>::Format(value);
>+}
>+
>+// UniversalPrinter<T>::Print(value, ostream_ptr) prints the given
>+// value to the given ostream. The caller must ensure that
>+// 'ostream_ptr' is not NULL, or the behavior is undefined.
>+//
>+// We define UniversalPrinter as a class template (as opposed to a
>+// function template), as we need to partially specialize it for
>+// reference types, which cannot be done with function templates.
>+template <typename T>
>+class UniversalPrinter;
>+
>+template <typename T>
>+void UniversalPrint(const T& value, ::std::ostream* os);
>+
>+enum DefaultPrinterType {
>+ kPrintContainer,
>+ kPrintPointer,
>+ kPrintFunctionPointer,
>+ kPrintOther,
>+};
>+template <DefaultPrinterType type> struct WrapPrinterType {};
>+
>+// Used to print an STL-style container when the user doesn't define
>+// a PrintTo() for it.
>+template <typename C>
>+void DefaultPrintTo(WrapPrinterType<kPrintContainer> /* dummy */,
>+ const C& container, ::std::ostream* os) {
>+ const size_t kMaxCount = 32; // The maximum number of elements to print.
>+ *os << '{';
>+ size_t count = 0;
>+ for (typename C::const_iterator it = container.begin();
>+ it != container.end(); ++it, ++count) {
>+ if (count > 0) {
>+ *os << ',';
>+ if (count == kMaxCount) { // Enough has been printed.
>+ *os << " ...";
>+ break;
>+ }
>+ }
>+ *os << ' ';
>+ // We cannot call PrintTo(*it, os) here as PrintTo() doesn't
>+ // handle *it being a native array.
>+ internal::UniversalPrint(*it, os);
>+ }
>+
>+ if (count > 0) {
>+ *os << ' ';
>+ }
>+ *os << '}';
>+}
>+
>+// Used to print a pointer that is neither a char pointer nor a member
>+// pointer, when the user doesn't define PrintTo() for it. (A member
>+// variable pointer or member function pointer doesn't really point to
>+// a location in the address space. Their representation is
>+// implementation-defined. Therefore they will be printed as raw
>+// bytes.)
>+template <typename T>
>+void DefaultPrintTo(WrapPrinterType<kPrintPointer> /* dummy */,
>+ T* p, ::std::ostream* os) {
>+ if (p == NULL) {
>+ *os << "NULL";
>+ } else {
>+ // T is not a function type. We just call << to print p,
>+ // relying on ADL to pick up user-defined << for their pointer
>+ // types, if any.
>+ *os << p;
>+ }
>+}
>+template <typename T>
>+void DefaultPrintTo(WrapPrinterType<kPrintFunctionPointer> /* dummy */,
>+ T* p, ::std::ostream* os) {
>+ if (p == NULL) {
>+ *os << "NULL";
>+ } else {
>+ // T is a function type, so '*os << p' doesn't do what we want
>+ // (it just prints p as bool). We want to print p as a const
>+ // void*.
>+ *os << reinterpret_cast<const void*>(p);
>+ }
>+}
>+
>+// Used to print a non-container, non-pointer value when the user
>+// doesn't define PrintTo() for it.
>+template <typename T>
>+void DefaultPrintTo(WrapPrinterType<kPrintOther> /* dummy */,
>+ const T& value, ::std::ostream* os) {
>+ ::testing_internal::DefaultPrintNonContainerTo(value, os);
>+}
>+
>+// Prints the given value using the << operator if it has one;
>+// otherwise prints the bytes in it. This is what
>+// UniversalPrinter<T>::Print() does when PrintTo() is not specialized
>+// or overloaded for type T.
>+//
>+// A user can override this behavior for a class type Foo by defining
>+// an overload of PrintTo() in the namespace where Foo is defined. We
>+// give the user this option as sometimes defining a << operator for
>+// Foo is not desirable (e.g. the coding style may prevent doing it,
>+// or there is already a << operator but it doesn't do what the user
>+// wants).
>+template <typename T>
>+void PrintTo(const T& value, ::std::ostream* os) {
>+ // DefaultPrintTo() is overloaded. The type of its first argument
>+ // determines which version will be picked.
>+ //
>+ // Note that we check for container types here, prior to we check
>+ // for protocol message types in our operator<<. The rationale is:
>+ //
>+ // For protocol messages, we want to give people a chance to
>+ // override Google Mock's format by defining a PrintTo() or
>+ // operator<<. For STL containers, other formats can be
>+ // incompatible with Google Mock's format for the container
>+ // elements; therefore we check for container types here to ensure
>+ // that our format is used.
>+ //
>+ // Note that MSVC and clang-cl do allow an implicit conversion from
>+ // pointer-to-function to pointer-to-object, but clang-cl warns on it.
>+ // So don't use ImplicitlyConvertible if it can be helped since it will
>+ // cause this warning, and use a separate overload of DefaultPrintTo for
>+ // function pointers so that the `*os << p` in the object pointer overload
>+ // doesn't cause that warning either.
>+ DefaultPrintTo(
>+ WrapPrinterType <
>+ (sizeof(IsContainerTest<T>(0)) == sizeof(IsContainer)) &&
>+ !IsRecursiveContainer<T>::value
>+ ? kPrintContainer
>+ : !is_pointer<T>::value
>+ ? kPrintOther
>+#if GTEST_LANG_CXX11
>+ : std::is_function<typename std::remove_pointer<T>::type>::value
>+#else
>+ : !internal::ImplicitlyConvertible<T, const void*>::value
>+#endif
>+ ? kPrintFunctionPointer
>+ : kPrintPointer > (),
>+ value, os);
>+}
>+
>+// The following list of PrintTo() overloads tells
>+// UniversalPrinter<T>::Print() how to print standard types (built-in
>+// types, strings, plain arrays, and pointers).
>+
>+// Overloads for various char types.
>+GTEST_API_ void PrintTo(unsigned char c, ::std::ostream* os);
>+GTEST_API_ void PrintTo(signed char c, ::std::ostream* os);
>+inline void PrintTo(char c, ::std::ostream* os) {
>+ // When printing a plain char, we always treat it as unsigned. This
>+ // way, the output won't be affected by whether the compiler thinks
>+ // char is signed or not.
>+ PrintTo(static_cast<unsigned char>(c), os);
>+}
>+
>+// Overloads for other simple built-in types.
>+inline void PrintTo(bool x, ::std::ostream* os) {
>+ *os << (x ? "true" : "false");
>+}
>+
>+// Overload for wchar_t type.
>+// Prints a wchar_t as a symbol if it is printable or as its internal
>+// code otherwise and also as its decimal code (except for L'\0').
>+// The L'\0' char is printed as "L'\\0'". The decimal code is printed
>+// as signed integer when wchar_t is implemented by the compiler
>+// as a signed type and is printed as an unsigned integer when wchar_t
>+// is implemented as an unsigned type.
>+GTEST_API_ void PrintTo(wchar_t wc, ::std::ostream* os);
>+
>+// Overloads for C strings.
>+GTEST_API_ void PrintTo(const char* s, ::std::ostream* os);
>+inline void PrintTo(char* s, ::std::ostream* os) {
>+ PrintTo(ImplicitCast_<const char*>(s), os);
>+}
>+
>+// signed/unsigned char is often used for representing binary data, so
>+// we print pointers to it as void* to be safe.
>+inline void PrintTo(const signed char* s, ::std::ostream* os) {
>+ PrintTo(ImplicitCast_<const void*>(s), os);
>+}
>+inline void PrintTo(signed char* s, ::std::ostream* os) {
>+ PrintTo(ImplicitCast_<const void*>(s), os);
>+}
>+inline void PrintTo(const unsigned char* s, ::std::ostream* os) {
>+ PrintTo(ImplicitCast_<const void*>(s), os);
>+}
>+inline void PrintTo(unsigned char* s, ::std::ostream* os) {
>+ PrintTo(ImplicitCast_<const void*>(s), os);
>+}
>+
>+// MSVC can be configured to define wchar_t as a typedef of unsigned
>+// short. It defines _NATIVE_WCHAR_T_DEFINED when wchar_t is a native
>+// type. When wchar_t is a typedef, defining an overload for const
>+// wchar_t* would cause unsigned short* be printed as a wide string,
>+// possibly causing invalid memory accesses.
>+#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
>+// Overloads for wide C strings
>+GTEST_API_ void PrintTo(const wchar_t* s, ::std::ostream* os);
>+inline void PrintTo(wchar_t* s, ::std::ostream* os) {
>+ PrintTo(ImplicitCast_<const wchar_t*>(s), os);
>+}
>+#endif
>+
>+// Overload for C arrays. Multi-dimensional arrays are printed
>+// properly.
>+
>+// Prints the given number of elements in an array, without printing
>+// the curly braces.
>+template <typename T>
>+void PrintRawArrayTo(const T a[], size_t count, ::std::ostream* os) {
>+ UniversalPrint(a[0], os);
>+ for (size_t i = 1; i != count; i++) {
>+ *os << ", ";
>+ UniversalPrint(a[i], os);
>+ }
>+}
>+
>+// Overloads for ::string and ::std::string.
>+#if GTEST_HAS_GLOBAL_STRING
>+GTEST_API_ void PrintStringTo(const ::string&s, ::std::ostream* os);
>+inline void PrintTo(const ::string& s, ::std::ostream* os) {
>+ PrintStringTo(s, os);
>+}
>+#endif // GTEST_HAS_GLOBAL_STRING
>+
>+GTEST_API_ void PrintStringTo(const ::std::string&s, ::std::ostream* os);
>+inline void PrintTo(const ::std::string& s, ::std::ostream* os) {
>+ PrintStringTo(s, os);
>+}
>+
>+// Overloads for ::wstring and ::std::wstring.
>+#if GTEST_HAS_GLOBAL_WSTRING
>+GTEST_API_ void PrintWideStringTo(const ::wstring&s, ::std::ostream* os);
>+inline void PrintTo(const ::wstring& s, ::std::ostream* os) {
>+ PrintWideStringTo(s, os);
>+}
>+#endif // GTEST_HAS_GLOBAL_WSTRING
>+
>+#if GTEST_HAS_STD_WSTRING
>+GTEST_API_ void PrintWideStringTo(const ::std::wstring&s, ::std::ostream* os);
>+inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) {
>+ PrintWideStringTo(s, os);
>+}
>+#endif // GTEST_HAS_STD_WSTRING
>+
>+#if GTEST_HAS_ABSL
>+// Overload for absl::string_view.
>+inline void PrintTo(absl::string_view sp, ::std::ostream* os) {
>+ PrintTo(::std::string(sp), os);
>+}
>+#endif // GTEST_HAS_ABSL
>+
>+#if GTEST_LANG_CXX11
>+inline void PrintTo(std::nullptr_t, ::std::ostream* os) { *os << "(nullptr)"; }
>+#endif // GTEST_LANG_CXX11
>+
>+#if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
>+// Helper function for printing a tuple. T must be instantiated with
>+// a tuple type.
>+template <typename T>
>+void PrintTupleTo(const T& t, ::std::ostream* os);
>+#endif // GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
>+
>+#if GTEST_HAS_TR1_TUPLE
>+// Overload for ::std::tr1::tuple. Needed for printing function arguments,
>+// which are packed as tuples.
>+
>+// Overloaded PrintTo() for tuples of various arities. We support
>+// tuples of up-to 10 fields. The following implementation works
>+// regardless of whether tr1::tuple is implemented using the
>+// non-standard variadic template feature or not.
>+
>+inline void PrintTo(const ::std::tr1::tuple<>& t, ::std::ostream* os) {
>+ PrintTupleTo(t, os);
>+}
>+
>+template <typename T1>
>+void PrintTo(const ::std::tr1::tuple<T1>& t, ::std::ostream* os) {
>+ PrintTupleTo(t, os);
>+}
>+
>+template <typename T1, typename T2>
>+void PrintTo(const ::std::tr1::tuple<T1, T2>& t, ::std::ostream* os) {
>+ PrintTupleTo(t, os);
>+}
>+
>+template <typename T1, typename T2, typename T3>
>+void PrintTo(const ::std::tr1::tuple<T1, T2, T3>& t, ::std::ostream* os) {
>+ PrintTupleTo(t, os);
>+}
>+
>+template <typename T1, typename T2, typename T3, typename T4>
>+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4>& t, ::std::ostream* os) {
>+ PrintTupleTo(t, os);
>+}
>+
>+template <typename T1, typename T2, typename T3, typename T4, typename T5>
>+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5>& t,
>+ ::std::ostream* os) {
>+ PrintTupleTo(t, os);
>+}
>+
>+template <typename T1, typename T2, typename T3, typename T4, typename T5,
>+ typename T6>
>+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6>& t,
>+ ::std::ostream* os) {
>+ PrintTupleTo(t, os);
>+}
>+
>+template <typename T1, typename T2, typename T3, typename T4, typename T5,
>+ typename T6, typename T7>
>+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7>& t,
>+ ::std::ostream* os) {
>+ PrintTupleTo(t, os);
>+}
>+
>+template <typename T1, typename T2, typename T3, typename T4, typename T5,
>+ typename T6, typename T7, typename T8>
>+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8>& t,
>+ ::std::ostream* os) {
>+ PrintTupleTo(t, os);
>+}
>+
>+template <typename T1, typename T2, typename T3, typename T4, typename T5,
>+ typename T6, typename T7, typename T8, typename T9>
>+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9>& t,
>+ ::std::ostream* os) {
>+ PrintTupleTo(t, os);
>+}
>+
>+template <typename T1, typename T2, typename T3, typename T4, typename T5,
>+ typename T6, typename T7, typename T8, typename T9, typename T10>
>+void PrintTo(
>+ const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>& t,
>+ ::std::ostream* os) {
>+ PrintTupleTo(t, os);
>+}
>+#endif // GTEST_HAS_TR1_TUPLE
>+
>+#if GTEST_HAS_STD_TUPLE_
>+template <typename... Types>
>+void PrintTo(const ::std::tuple<Types...>& t, ::std::ostream* os) {
>+ PrintTupleTo(t, os);
>+}
>+#endif // GTEST_HAS_STD_TUPLE_
>+
>+// Overload for std::pair.
>+template <typename T1, typename T2>
>+void PrintTo(const ::std::pair<T1, T2>& value, ::std::ostream* os) {
>+ *os << '(';
>+ // We cannot use UniversalPrint(value.first, os) here, as T1 may be
>+ // a reference type. The same for printing value.second.
>+ UniversalPrinter<T1>::Print(value.first, os);
>+ *os << ", ";
>+ UniversalPrinter<T2>::Print(value.second, os);
>+ *os << ')';
>+}
>+
>+// Implements printing a non-reference type T by letting the compiler
>+// pick the right overload of PrintTo() for T.
>+template <typename T>
>+class UniversalPrinter {
>+ public:
>+ // MSVC warns about adding const to a function type, so we want to
>+ // disable the warning.
>+ GTEST_DISABLE_MSC_WARNINGS_PUSH_(4180)
>+
>+ // Note: we deliberately don't call this PrintTo(), as that name
>+ // conflicts with ::testing::internal::PrintTo in the body of the
>+ // function.
>+ static void Print(const T& value, ::std::ostream* os) {
>+ // By default, ::testing::internal::PrintTo() is used for printing
>+ // the value.
>+ //
>+ // Thanks to Koenig look-up, if T is a class and has its own
>+ // PrintTo() function defined in its namespace, that function will
>+ // be visible here. Since it is more specific than the generic ones
>+ // in ::testing::internal, it will be picked by the compiler in the
>+ // following statement - exactly what we want.
>+ PrintTo(value, os);
>+ }
>+
>+ GTEST_DISABLE_MSC_WARNINGS_POP_()
>+};
>+
>+#if GTEST_HAS_ABSL
>+
>+// Printer for absl::optional
>+
>+template <typename T>
>+class UniversalPrinter<::absl::optional<T>> {
>+ public:
>+ static void Print(const ::absl::optional<T>& value, ::std::ostream* os) {
>+ *os << '(';
>+ if (!value) {
>+ *os << "nullopt";
>+ } else {
>+ UniversalPrint(*value, os);
>+ }
>+ *os << ')';
>+ }
>+};
>+
>+// Printer for absl::variant
>+
>+template <typename... T>
>+class UniversalPrinter<::absl::variant<T...>> {
>+ public:
>+ static void Print(const ::absl::variant<T...>& value, ::std::ostream* os) {
>+ *os << '(';
>+ absl::visit(Visitor{os}, value);
>+ *os << ')';
>+ }
>+
>+ private:
>+ struct Visitor {
>+ template <typename U>
>+ void operator()(const U& u) const {
>+ *os << "'" << GetTypeName() << "' with value ";
>+ UniversalPrint(u, os);
>+ }
>+ ::std::ostream* os;
>+ };
>+};
>+
>+#endif // GTEST_HAS_ABSL
>+
>+// UniversalPrintArray(begin, len, os) prints an array of 'len'
>+// elements, starting at address 'begin'.
>+template <typename T>
>+void UniversalPrintArray(const T* begin, size_t len, ::std::ostream* os) {
>+ if (len == 0) {
>+ *os << "{}";
>+ } else {
>+ *os << "{ ";
>+ const size_t kThreshold = 18;
>+ const size_t kChunkSize = 8;
>+ // If the array has more than kThreshold elements, we'll have to
>+ // omit some details by printing only the first and the last
>+ // kChunkSize elements.
>+ // FIXME: let the user control the threshold using a flag.
>+ if (len <= kThreshold) {
>+ PrintRawArrayTo(begin, len, os);
>+ } else {
>+ PrintRawArrayTo(begin, kChunkSize, os);
>+ *os << ", ..., ";
>+ PrintRawArrayTo(begin + len - kChunkSize, kChunkSize, os);
>+ }
>+ *os << " }";
>+ }
>+}
>+// This overload prints a (const) char array compactly.
>+GTEST_API_ void UniversalPrintArray(
>+ const char* begin, size_t len, ::std::ostream* os);
>+
>+// This overload prints a (const) wchar_t array compactly.
>+GTEST_API_ void UniversalPrintArray(
>+ const wchar_t* begin, size_t len, ::std::ostream* os);
>+
>+// Implements printing an array type T[N].
>+template <typename T, size_t N>
>+class UniversalPrinter<T[N]> {
>+ public:
>+ // Prints the given array, omitting some elements when there are too
>+ // many.
>+ static void Print(const T (&a)[N], ::std::ostream* os) {
>+ UniversalPrintArray(a, N, os);
>+ }
>+};
>+
>+// Implements printing a reference type T&.
>+template <typename T>
>+class UniversalPrinter<T&> {
>+ public:
>+ // MSVC warns about adding const to a function type, so we want to
>+ // disable the warning.
>+ GTEST_DISABLE_MSC_WARNINGS_PUSH_(4180)
>+
>+ static void Print(const T& value, ::std::ostream* os) {
>+ // Prints the address of the value. We use reinterpret_cast here
>+ // as static_cast doesn't compile when T is a function type.
>+ *os << "@" << reinterpret_cast<const void*>(&value) << " ";
>+
>+ // Then prints the value itself.
>+ UniversalPrint(value, os);
>+ }
>+
>+ GTEST_DISABLE_MSC_WARNINGS_POP_()
>+};
>+
>+// Prints a value tersely: for a reference type, the referenced value
>+// (but not the address) is printed; for a (const) char pointer, the
>+// NUL-terminated string (but not the pointer) is printed.
>+
>+template <typename T>
>+class UniversalTersePrinter {
>+ public:
>+ static void Print(const T& value, ::std::ostream* os) {
>+ UniversalPrint(value, os);
>+ }
>+};
>+template <typename T>
>+class UniversalTersePrinter<T&> {
>+ public:
>+ static void Print(const T& value, ::std::ostream* os) {
>+ UniversalPrint(value, os);
>+ }
>+};
>+template <typename T, size_t N>
>+class UniversalTersePrinter<T[N]> {
>+ public:
>+ static void Print(const T (&value)[N], ::std::ostream* os) {
>+ UniversalPrinter<T[N]>::Print(value, os);
>+ }
>+};
>+template <>
>+class UniversalTersePrinter<const char*> {
>+ public:
>+ static void Print(const char* str, ::std::ostream* os) {
>+ if (str == NULL) {
>+ *os << "NULL";
>+ } else {
>+ UniversalPrint(std::string(str), os);
>+ }
>+ }
>+};
>+template <>
>+class UniversalTersePrinter<char*> {
>+ public:
>+ static void Print(char* str, ::std::ostream* os) {
>+ UniversalTersePrinter<const char*>::Print(str, os);
>+ }
>+};
>+
>+#if GTEST_HAS_STD_WSTRING
>+template <>
>+class UniversalTersePrinter<const wchar_t*> {
>+ public:
>+ static void Print(const wchar_t* str, ::std::ostream* os) {
>+ if (str == NULL) {
>+ *os << "NULL";
>+ } else {
>+ UniversalPrint(::std::wstring(str), os);
>+ }
>+ }
>+};
>+#endif
>+
>+template <>
>+class UniversalTersePrinter<wchar_t*> {
>+ public:
>+ static void Print(wchar_t* str, ::std::ostream* os) {
>+ UniversalTersePrinter<const wchar_t*>::Print(str, os);
>+ }
>+};
>+
>+template <typename T>
>+void UniversalTersePrint(const T& value, ::std::ostream* os) {
>+ UniversalTersePrinter<T>::Print(value, os);
>+}
>+
>+// Prints a value using the type inferred by the compiler. The
>+// difference between this and UniversalTersePrint() is that for a
>+// (const) char pointer, this prints both the pointer and the
>+// NUL-terminated string.
>+template <typename T>
>+void UniversalPrint(const T& value, ::std::ostream* os) {
>+ // A workarond for the bug in VC++ 7.1 that prevents us from instantiating
>+ // UniversalPrinter with T directly.
>+ typedef T T1;
>+ UniversalPrinter<T1>::Print(value, os);
>+}
>+
>+typedef ::std::vector< ::std::string> Strings;
>+
>+// TuplePolicy<TupleT> must provide:
>+// - tuple_size
>+// size of tuple TupleT.
>+// - get<size_t I>(const TupleT& t)
>+// static function extracting element I of tuple TupleT.
>+// - tuple_element<size_t I>::type
>+// type of element I of tuple TupleT.
>+template <typename TupleT>
>+struct TuplePolicy;
>+
>+#if GTEST_HAS_TR1_TUPLE
>+template <typename TupleT>
>+struct TuplePolicy {
>+ typedef TupleT Tuple;
>+ static const size_t tuple_size = ::std::tr1::tuple_size<Tuple>::value;
>+
>+ template <size_t I>
>+ struct tuple_element : ::std::tr1::tuple_element<static_cast<int>(I), Tuple> {
>+ };
>+
>+ template <size_t I>
>+ static typename AddReference<const typename ::std::tr1::tuple_element<
>+ static_cast<int>(I), Tuple>::type>::type
>+ get(const Tuple& tuple) {
>+ return ::std::tr1::get(tuple);
>+ }
>+};
>+template <typename TupleT>
>+const size_t TuplePolicy<TupleT>::tuple_size;
>+#endif // GTEST_HAS_TR1_TUPLE
>+
>+#if GTEST_HAS_STD_TUPLE_
>+template <typename... Types>
>+struct TuplePolicy< ::std::tuple<Types...> > {
>+ typedef ::std::tuple<Types...> Tuple;
>+ static const size_t tuple_size = ::std::tuple_size<Tuple>::value;
>+
>+ template <size_t I>
>+ struct tuple_element : ::std::tuple_element<I, Tuple> {};
>+
>+ template <size_t I>
>+ static const typename ::std::tuple_element<I, Tuple>::type& get(
>+ const Tuple& tuple) {
>+ return ::std::get(tuple);
>+ }
>+};
>+template <typename... Types>
>+const size_t TuplePolicy< ::std::tuple<Types...> >::tuple_size;
>+#endif // GTEST_HAS_STD_TUPLE_
>+
>+#if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
>+// This helper template allows PrintTo() for tuples and
>+// UniversalTersePrintTupleFieldsToStrings() to be defined by
>+// induction on the number of tuple fields. The idea is that
>+// TuplePrefixPrinter<N>::PrintPrefixTo(t, os) prints the first N
>+// fields in tuple t, and can be defined in terms of
>+// TuplePrefixPrinter<N - 1>.
>+//
>+// The inductive case.
>+template <size_t N>
>+struct TuplePrefixPrinter {
>+ // Prints the first N fields of a tuple.
>+ template <typename Tuple>
>+ static void PrintPrefixTo(const Tuple& t, ::std::ostream* os) {
>+ TuplePrefixPrinter<N - 1>::PrintPrefixTo(t, os);
>+ GTEST_INTENTIONAL_CONST_COND_PUSH_()
>+ if (N > 1) {
>+ GTEST_INTENTIONAL_CONST_COND_POP_()
>+ *os << ", ";
>+ }
>+ UniversalPrinter<
>+ typename TuplePolicy<Tuple>::template tuple_element<N - 1>::type>
>+ ::Print(TuplePolicy<Tuple>::template get<N - 1>(t), os);
>+ }
>+
>+ // Tersely prints the first N fields of a tuple to a string vector,
>+ // one element for each field.
>+ template <typename Tuple>
>+ static void TersePrintPrefixToStrings(const Tuple& t, Strings* strings) {
>+ TuplePrefixPrinter<N - 1>::TersePrintPrefixToStrings(t, strings);
>+ ::std::stringstream ss;
>+ UniversalTersePrint(TuplePolicy<Tuple>::template get<N - 1>(t), &ss);
>+ strings->push_back(ss.str());
>+ }
>+};
>+
>+// Base case.
>+template <>
>+struct TuplePrefixPrinter<0> {
>+ template <typename Tuple>
>+ static void PrintPrefixTo(const Tuple&, ::std::ostream*) {}
>+
>+ template <typename Tuple>
>+ static void TersePrintPrefixToStrings(const Tuple&, Strings*) {}
>+};
>+
>+// Helper function for printing a tuple.
>+// Tuple must be either std::tr1::tuple or std::tuple type.
>+template <typename Tuple>
>+void PrintTupleTo(const Tuple& t, ::std::ostream* os) {
>+ *os << "(";
>+ TuplePrefixPrinter<TuplePolicy<Tuple>::tuple_size>::PrintPrefixTo(t, os);
>+ *os << ")";
>+}
>+
>+// Prints the fields of a tuple tersely to a string vector, one
>+// element for each field. See the comment before
>+// UniversalTersePrint() for how we define "tersely".
>+template <typename Tuple>
>+Strings UniversalTersePrintTupleFieldsToStrings(const Tuple& value) {
>+ Strings result;
>+ TuplePrefixPrinter<TuplePolicy<Tuple>::tuple_size>::
>+ TersePrintPrefixToStrings(value, &result);
>+ return result;
>+}
>+#endif // GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
>+
>+} // namespace internal
>+
>+#if GTEST_HAS_ABSL
>+namespace internal2 {
>+template <typename T>
>+void TypeWithoutFormatter<T, kConvertibleToStringView>::PrintValue(
>+ const T& value, ::std::ostream* os) {
>+ internal::PrintTo(absl::string_view(value), os);
>+}
>+} // namespace internal2
>+#endif
>+
>+template <typename T>
>+::std::string PrintToString(const T& value) {
>+ ::std::stringstream ss;
>+ internal::UniversalTersePrinter<T>::Print(value, &ss);
>+ return ss.str();
>+}
>+
>+} // namespace testing
>+
>+// Include any custom printer added by the local installation.
>+// We must include this header at the end to make sure it can use the
>+// declarations from this file.
>+#include "gtest/internal/custom/gtest-printers.h"
>+
>+#endif // GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
>diff --git a/Source/ThirdParty/gtest/include/gtest/gtest-spi.h b/Source/ThirdParty/gtest/include/gtest/gtest-spi.h
>index c41da48447603e965fb772abca2f145ee82a606f..1e8983938ea2792c52690ead29b00ab58cdaae9c 100644
>--- a/Source/ThirdParty/gtest/include/gtest/gtest-spi.h
>+++ b/Source/ThirdParty/gtest/include/gtest/gtest-spi.h
>@@ -26,16 +26,20 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>+
> //
> // Utilities for testing Google Test itself and code that uses Google Test
> // (e.g. frameworks built on top of Google Test).
> 
>+// GOOGLETEST_CM0004 DO NOT DELETE
>+
> #ifndef GTEST_INCLUDE_GTEST_GTEST_SPI_H_
> #define GTEST_INCLUDE_GTEST_GTEST_SPI_H_
> 
>-#include <gtest/gtest.h>
>+#include "gtest/gtest.h"
>+
>+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
>+/* class A needs to have dll-interface to be used by clients of class B */)
> 
> namespace testing {
> 
>@@ -97,13 +101,12 @@ class GTEST_API_ SingleFailureChecker {
> public:
> // The constructor remembers the arguments.
> SingleFailureChecker(const TestPartResultArray* results,
>- TestPartResult::Type type,
>- const char* substr);
>+ TestPartResult::Type type, const std::string& substr);
> ~SingleFailureChecker();
> private:
> const TestPartResultArray* const results_;
> const TestPartResult::Type type_;
>- const String substr_;
>+ const std::string substr_;
> 
> GTEST_DISALLOW_COPY_AND_ASSIGN_(SingleFailureChecker);
> };
>@@ -112,6 +115,8 @@ class GTEST_API_ SingleFailureChecker {
> 
> } // namespace testing
> 
>+GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251
>+
> // A set of macros for testing Google Test assertions or code that's expected
> // to generate Google Test fatal failures. It verifies that the given
> // statement will cause exactly one fatal Google Test failure with 'substr'
>@@ -223,7 +228,7 @@ class GTEST_API_ SingleFailureChecker {
> (substr));\
> {\
> ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
>- ::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS,\
>+ ::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, \
> &gtest_failures);\
> if (::testing::internal::AlwaysTrue()) { statement; }\
> }\
>diff --git a/Source/ThirdParty/gtest/include/gtest/gtest-test-part.h b/Source/ThirdParty/gtest/include/gtest/gtest-test-part.h
>index f714759067639f1ea4ec0a126347dec120482439..1c7b89e08796d9730f9f8eeae406227177dba519 100644
>--- a/Source/ThirdParty/gtest/include/gtest/gtest-test-part.h
>+++ b/Source/ThirdParty/gtest/include/gtest/gtest-test-part.h
>@@ -27,16 +27,18 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> //
>-// Author: mheule@google.com (Markus Heule)
>-//
>+// GOOGLETEST_CM0001 DO NOT DELETE
> 
> #ifndef GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
> #define GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
> 
> #include <iosfwd>
> #include <vector>
>-#include <gtest/internal/gtest-internal.h>
>-#include <gtest/internal/gtest-string.h>
>+#include "gtest/internal/gtest-internal.h"
>+#include "gtest/internal/gtest-string.h"
>+
>+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
>+/* class A needs to have dll-interface to be used by clients of class B */)
> 
> namespace testing {
> 
>@@ -62,7 +64,7 @@ class GTEST_API_ TestPartResult {
> int a_line_number,
> const char* a_message)
> : type_(a_type),
>- file_name_(a_file_name),
>+ file_name_(a_file_name == NULL ? "" : a_file_name),
> line_number_(a_line_number),
> summary_(ExtractSummary(a_message)),
> message_(a_message) {
>@@ -73,7 +75,9 @@ class GTEST_API_ TestPartResult {
> 
> // Gets the name of the source file where the test part took place, or
> // NULL if it's unknown.
>- const char* file_name() const { return file_name_.c_str(); }
>+ const char* file_name() const {
>+ return file_name_.empty() ? NULL : file_name_.c_str();
>+ }
> 
> // Gets the line in the source file where the test part took place,
> // or -1 if it's unknown.
>@@ -96,21 +100,22 @@ class GTEST_API_ TestPartResult {
> 
> // Returns true iff the test part fatally failed.
> bool fatally_failed() const { return type_ == kFatalFailure; }
>+
> private:
> Type type_;
> 
> // Gets the summary of the failure message by omitting the stack
> // trace in it.
>- static internal::String ExtractSummary(const char* message);
>+ static std::string ExtractSummary(const char* message);
> 
> // The name of the source file where the test part took place, or
>- // NULL if the source file is unknown.
>- internal::String file_name_;
>+ // "" if the source file is unknown.
>+ std::string file_name_;
> // The line in the source file where the test part took place, or -1
> // if the line number is unknown.
> int line_number_;
>- internal::String summary_; // The test failure summary.
>- internal::String message_; // The test failure message.
>+ std::string summary_; // The test failure summary.
>+ std::string message_; // The test failure message.
> };
> 
> // Prints a TestPartResult object.
>@@ -140,7 +145,7 @@ class GTEST_API_ TestPartResultArray {
> };
> 
> // This interface knows how to report a test part result.
>-class TestPartResultReporterInterface {
>+class GTEST_API_ TestPartResultReporterInterface {
> public:
> virtual ~TestPartResultReporterInterface() {}
> 
>@@ -173,4 +178,6 @@ class GTEST_API_ HasNewFatalFailureHelper
> 
> } // namespace testing
> 
>+GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251
>+
> #endif // GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
>diff --git a/Source/ThirdParty/gtest/include/gtest/gtest-typed-test.h b/Source/ThirdParty/gtest/include/gtest/gtest-typed-test.h
>index 1ec8eb8d309398d52bd496384cf47483ae1152ee..29b085992de0ee4f37b6762fc3e23643ccead6da 100644
>--- a/Source/ThirdParty/gtest/include/gtest/gtest-typed-test.h
>+++ b/Source/ThirdParty/gtest/include/gtest/gtest-typed-test.h
>@@ -26,8 +26,9 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>+
>+
>+// GOOGLETEST_CM0001 DO NOT DELETE
> 
> #ifndef GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
> #define GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
>@@ -82,6 +83,24 @@ TYPED_TEST(FooTest, DoesBlah) {
> 
> TYPED_TEST(FooTest, HasPropertyA) { ... }
> 
>+// TYPED_TEST_CASE takes an optional third argument which allows to specify a
>+// class that generates custom test name suffixes based on the type. This should
>+// be a class which has a static template function GetName(int index) returning
>+// a string for each type. The provided integer index equals the index of the
>+// type in the provided type list. In many cases the index can be ignored.
>+//
>+// For example:
>+// class MyTypeNames {
>+// public:
>+// template <typename T>
>+// static std::string GetName(int) {
>+// if (std::is_same<T, char>()) return "char";
>+// if (std::is_same<T, int>()) return "int";
>+// if (std::is_same<T, unsigned int>()) return "unsigned_int";
>+// }
>+// };
>+// TYPED_TEST_CASE(FooTest, MyTypes, MyTypeNames);
>+
> #endif // 0
> 
> // Type-parameterized tests are abstract test patterns parameterized
>@@ -143,11 +162,16 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes);
> // If the type list contains only one type, you can write that type
> // directly without Types<...>:
> // INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, int);
>+//
>+// Similar to the optional argument of TYPED_TEST_CASE above,
>+// INSTANTIATE_TEST_CASE_P takes an optional fourth argument which allows to
>+// generate custom names.
>+// INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes, MyTypeNames);
> 
> #endif // 0
> 
>-#include <gtest/internal/gtest-port.h>
>-#include <gtest/internal/gtest-type-util.h>
>+#include "gtest/internal/gtest-port.h"
>+#include "gtest/internal/gtest-type-util.h"
> 
> // Implements typed tests.
> 
>@@ -157,33 +181,47 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes);
> //
> // Expands to the name of the typedef for the type parameters of the
> // given test case.
>-#define GTEST_TYPE_PARAMS_(TestCaseName) gtest_type_params_##TestCaseName##_
>+# define GTEST_TYPE_PARAMS_(TestCaseName) gtest_type_params_##TestCaseName##_
>+
>+// Expands to the name of the typedef for the NameGenerator, responsible for
>+// creating the suffixes of the name.
>+#define GTEST_NAME_GENERATOR_(TestCaseName) \
>+ gtest_type_params_##TestCaseName##_NameGenerator
> 
> // The 'Types' template argument below must have spaces around it
> // since some compilers may choke on '>>' when passing a template
> // instance (e.g. Types<int>)
>-#define TYPED_TEST_CASE(CaseName, Types) \
>- typedef ::testing::internal::TypeList< Types >::type \
>- GTEST_TYPE_PARAMS_(CaseName)
>-
>-#define TYPED_TEST(CaseName, TestName) \
>- template <typename gtest_TypeParam_> \
>- class GTEST_TEST_CLASS_NAME_(CaseName, TestName) \
>- : public CaseName<gtest_TypeParam_> { \
>- private: \
>- typedef CaseName<gtest_TypeParam_> TestFixture; \
>- typedef gtest_TypeParam_ TypeParam; \
>- virtual void TestBody(); \
>- }; \
>- bool gtest_##CaseName##_##TestName##_registered_ = \
>- ::testing::internal::TypeParameterizedTest< \
>- CaseName, \
>- ::testing::internal::TemplateSel< \
>- GTEST_TEST_CLASS_NAME_(CaseName, TestName)>, \
>- GTEST_TYPE_PARAMS_(CaseName)>::Register(\
>- "", #CaseName, #TestName, 0); \
>- template <typename gtest_TypeParam_> \
>- void GTEST_TEST_CLASS_NAME_(CaseName, TestName)<gtest_TypeParam_>::TestBody()
>+# define TYPED_TEST_CASE(CaseName, Types, ...) \
>+ typedef ::testing::internal::TypeList< Types >::type GTEST_TYPE_PARAMS_( \
>+ CaseName); \
>+ typedef ::testing::internal::NameGeneratorSelector<__VA_ARGS__>::type \
>+ GTEST_NAME_GENERATOR_(CaseName)
>+
>+# define TYPED_TEST(CaseName, TestName) \
>+ template <typename gtest_TypeParam_> \
>+ class GTEST_TEST_CLASS_NAME_(CaseName, TestName) \
>+ : public CaseName<gtest_TypeParam_> { \
>+ private: \
>+ typedef CaseName<gtest_TypeParam_> TestFixture; \
>+ typedef gtest_TypeParam_ TypeParam; \
>+ virtual void TestBody(); \
>+ }; \
>+ bool gtest_##CaseName##_##TestName##_registered_ GTEST_ATTRIBUTE_UNUSED_ = \
>+ ::testing::internal::TypeParameterizedTest< \
>+ CaseName, \
>+ ::testing::internal::TemplateSel<GTEST_TEST_CLASS_NAME_(CaseName, \
>+ TestName)>, \
>+ GTEST_TYPE_PARAMS_( \
>+ CaseName)>::Register("", \
>+ ::testing::internal::CodeLocation( \
>+ __FILE__, __LINE__), \
>+ #CaseName, #TestName, 0, \
>+ ::testing::internal::GenerateNames< \
>+ GTEST_NAME_GENERATOR_(CaseName), \
>+ GTEST_TYPE_PARAMS_(CaseName)>()); \
>+ template <typename gtest_TypeParam_> \
>+ void GTEST_TEST_CLASS_NAME_(CaseName, \
>+ TestName)<gtest_TypeParam_>::TestBody()
> 
> #endif // GTEST_HAS_TYPED_TEST
> 
>@@ -196,31 +234,31 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes);
> // Expands to the namespace name that the type-parameterized tests for
> // the given type-parameterized test case are defined in. The exact
> // name of the namespace is subject to change without notice.
>-#define GTEST_CASE_NAMESPACE_(TestCaseName) \
>+# define GTEST_CASE_NAMESPACE_(TestCaseName) \
> gtest_case_##TestCaseName##_
> 
> // INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
> //
> // Expands to the name of the variable used to remember the names of
> // the defined tests in the given test case.
>-#define GTEST_TYPED_TEST_CASE_P_STATE_(TestCaseName) \
>+# define GTEST_TYPED_TEST_CASE_P_STATE_(TestCaseName) \
> gtest_typed_test_case_p_state_##TestCaseName##_
> 
> // INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE DIRECTLY.
> //
> // Expands to the name of the variable used to remember the names of
> // the registered tests in the given test case.
>-#define GTEST_REGISTERED_TEST_NAMES_(TestCaseName) \
>+# define GTEST_REGISTERED_TEST_NAMES_(TestCaseName) \
> gtest_registered_test_names_##TestCaseName##_
> 
> // The variables defined in the type-parameterized test macros are
> // static as typically these macros are used in a .h file that can be
> // #included in multiple translation units linked together.
>-#define TYPED_TEST_CASE_P(CaseName) \
>+# define TYPED_TEST_CASE_P(CaseName) \
> static ::testing::internal::TypedTestCasePState \
> GTEST_TYPED_TEST_CASE_P_STATE_(CaseName)
> 
>-#define TYPED_TEST_P(CaseName, TestName) \
>+# define TYPED_TEST_P(CaseName, TestName) \
> namespace GTEST_CASE_NAMESPACE_(CaseName) { \
> template <typename gtest_TypeParam_> \
> class TestName : public CaseName<gtest_TypeParam_> { \
>@@ -229,30 +267,38 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes);
> typedef gtest_TypeParam_ TypeParam; \
> virtual void TestBody(); \
> }; \
>- static bool gtest_##TestName##_defined_ = \
>+ static bool gtest_##TestName##_defined_ GTEST_ATTRIBUTE_UNUSED_ = \
> GTEST_TYPED_TEST_CASE_P_STATE_(CaseName).AddTestName(\
> __FILE__, __LINE__, #CaseName, #TestName); \
> } \
> template <typename gtest_TypeParam_> \
> void GTEST_CASE_NAMESPACE_(CaseName)::TestName<gtest_TypeParam_>::TestBody()
> 
>-#define REGISTER_TYPED_TEST_CASE_P(CaseName, ...) \
>+# define REGISTER_TYPED_TEST_CASE_P(CaseName, ...) \
> namespace GTEST_CASE_NAMESPACE_(CaseName) { \
> typedef ::testing::internal::Templates<__VA_ARGS__>::type gtest_AllTests_; \
> } \
>- static const char* const GTEST_REGISTERED_TEST_NAMES_(CaseName) = \
>- GTEST_TYPED_TEST_CASE_P_STATE_(CaseName).VerifyRegisteredTestNames(\
>- __FILE__, __LINE__, #__VA_ARGS__)
>+ static const char* const GTEST_REGISTERED_TEST_NAMES_(CaseName) \
>+ GTEST_ATTRIBUTE_UNUSED_ = \
>+ GTEST_TYPED_TEST_CASE_P_STATE_(CaseName).VerifyRegisteredTestNames( \
>+ __FILE__, __LINE__, #__VA_ARGS__)
> 
> // The 'Types' template argument below must have spaces around it
> // since some compilers may choke on '>>' when passing a template
> // instance (e.g. Types<int>)
>-#define INSTANTIATE_TYPED_TEST_CASE_P(Prefix, CaseName, Types) \
>- bool gtest_##Prefix##_##CaseName = \
>- ::testing::internal::TypeParameterizedTestCase<CaseName, \
>- GTEST_CASE_NAMESPACE_(CaseName)::gtest_AllTests_, \
>- ::testing::internal::TypeList< Types >::type>::Register(\
>- #Prefix, #CaseName, GTEST_REGISTERED_TEST_NAMES_(CaseName))
>+# define INSTANTIATE_TYPED_TEST_CASE_P(Prefix, CaseName, Types, ...) \
>+ bool gtest_##Prefix##_##CaseName GTEST_ATTRIBUTE_UNUSED_ = \
>+ ::testing::internal::TypeParameterizedTestCase< \
>+ CaseName, GTEST_CASE_NAMESPACE_(CaseName)::gtest_AllTests_, \
>+ ::testing::internal::TypeList< Types >::type>:: \
>+ Register(#Prefix, \
>+ ::testing::internal::CodeLocation(__FILE__, __LINE__), \
>+ &GTEST_TYPED_TEST_CASE_P_STATE_(CaseName), #CaseName, \
>+ GTEST_REGISTERED_TEST_NAMES_(CaseName), \
>+ ::testing::internal::GenerateNames< \
>+ ::testing::internal::NameGeneratorSelector< \
>+ __VA_ARGS__>::type, \
>+ ::testing::internal::TypeList< Types >::type>())
> 
> #endif // GTEST_HAS_TYPED_TEST_P
> 
>diff --git a/Source/ThirdParty/gtest/include/gtest/gtest.h b/Source/ThirdParty/gtest/include/gtest/gtest.h
>index 921fad11fcc8f24c0dd22394a4867ab24b6ea0c3..2be8b112c637b10dacfd069fb971fe6866a8d875 100644
>--- a/Source/ThirdParty/gtest/include/gtest/gtest.h
>+++ b/Source/ThirdParty/gtest/include/gtest/gtest.h
>@@ -26,10 +26,9 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
> //
>-// Author: wan@google.com (Zhanyong Wan)
>-//
>-// The Google C++ Testing Framework (Google Test)
>+// The Google C++ Testing and Mocking Framework (Google Test)
> //
> // This header file defines the public API for Google Test. It should be
> // included by any test program that uses Google Test.
>@@ -48,38 +47,54 @@
> // registration from Barthelemy Dagenais' (barthelemy@prologique.com)
> // easyUnit framework.
> 
>+// GOOGLETEST_CM0001 DO NOT DELETE
>+
> #ifndef GTEST_INCLUDE_GTEST_GTEST_H_
> #define GTEST_INCLUDE_GTEST_GTEST_H_
> 
> #include <limits>
>+#include <ostream>
> #include <vector>
> 
>-#include <gtest/internal/gtest-internal.h>
>-#include <gtest/internal/gtest-string.h>
>-#include <gtest/gtest-death-test.h>
>-#include <gtest/gtest-message.h>
>-#include <gtest/gtest-param-test.h>
>-#include <gtest/gtest_prod.h>
>-#include <gtest/gtest-test-part.h>
>-#include <gtest/gtest-typed-test.h>
>+#include "gtest/internal/gtest-internal.h"
>+#include "gtest/internal/gtest-string.h"
>+#include "gtest/gtest-death-test.h"
>+#include "gtest/gtest-message.h"
>+#include "gtest/gtest-param-test.h"
>+#include "gtest/gtest-printers.h"
>+#include "gtest/gtest_prod.h"
>+#include "gtest/gtest-test-part.h"
>+#include "gtest/gtest-typed-test.h"
>+
>+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
>+/* class A needs to have dll-interface to be used by clients of class B */)
> 
> // Depending on the platform, different string classes are available.
> // On Linux, in addition to ::std::string, Google also makes use of
> // class ::string, which has the same interface as ::std::string, but
> // has a different implementation.
> //
>-// The user can define GTEST_HAS_GLOBAL_STRING to 1 to indicate that
>+// You can define GTEST_HAS_GLOBAL_STRING to 1 to indicate that
> // ::string is available AND is a distinct type to ::std::string, or
> // define it to 0 to indicate otherwise.
> //
>-// If the user's ::std::string and ::string are the same class due to
>-// aliasing, he should define GTEST_HAS_GLOBAL_STRING to 0.
>+// If ::std::string and ::string are the same class on your platform
>+// due to aliasing, you should define GTEST_HAS_GLOBAL_STRING to 0.
> //
>-// If the user doesn't define GTEST_HAS_GLOBAL_STRING, it is defined
>+// If you do not define GTEST_HAS_GLOBAL_STRING, it is defined
> // heuristically.
> 
> namespace testing {
> 
>+// Silence C4100 (unreferenced formal parameter) and 4805
>+// unsafe mix of type 'const int' and type 'const bool'
>+#ifdef _MSC_VER
>+# pragma warning(push)
>+# pragma warning(disable:4805)
>+# pragma warning(disable:4100)
>+#endif
>+
>+
> // Declares the flags.
> 
> // This flag temporary enables the disabled tests.
>@@ -113,6 +128,9 @@ GTEST_DECLARE_string_(output);
> // test.
> GTEST_DECLARE_bool_(print_time);
> 
>+// This flags control whether Google Test prints UTF8 characters as text.
>+GTEST_DECLARE_bool_(print_utf8);
>+
> // This flag specifies the random number seed.
> GTEST_DECLARE_int32_(random_seed);
> 
>@@ -133,9 +151,14 @@ GTEST_DECLARE_int32_(stack_trace_depth);
> 
> // When this flag is specified, a failed assertion will throw an
> // exception if exceptions are enabled, or exit the program with a
>-// non-zero code otherwise.
>+// non-zero code otherwise. For use with an external test framework.
> GTEST_DECLARE_bool_(throw_on_failure);
> 
>+// When this flag is set with a "host:port" string, on supported
>+// platforms test results are streamed to the specified port on
>+// the specified host machine.
>+GTEST_DECLARE_string_(stream_result_to);
>+
> // The upper limit for valid stack trace depths.
> const int kMaxStackTraceDepth = 100;
> 
>@@ -147,31 +170,27 @@ class ExecDeathTest;
> class NoExecDeathTest;
> class FinalSuccessChecker;
> class GTestFlagSaver;
>-class TestInfoImpl;
>+class StreamingListenerTest;
> class TestResultAccessor;
> class TestEventListenersAccessor;
> class TestEventRepeater;
>+class UnitTestRecordPropertyTestHelper;
> class WindowsDeathTest;
>+class FuchsiaDeathTest;
> class UnitTestImpl* GetUnitTestImpl();
> void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
>- const String& message);
>-class PrettyUnitTestResultPrinter;
>-class XmlUnitTestResultPrinter;
>-
>-// Converts a streamable value to a String. A NULL pointer is
>-// converted to "(null)". When the input value is a ::string,
>-// ::std::string, ::wstring, or ::std::wstring object, each NUL
>-// character in it is replaced with "\\0".
>-// Declared in gtest-internal.h but defined here, so that it has access
>-// to the definition of the Message class, required by the ARM
>-// compiler.
>-template <typename T>
>-String StreamableToString(const T& streamable) {
>- return (Message() << streamable).GetString();
>-}
>+ const std::string& message);
> 
> } // namespace internal
> 
>+// The friend relationship of some of these classes is cyclic.
>+// If we don't forward declare them the compiler might confuse the classes
>+// in friendship clauses with same named classes on the scope.
>+class Test;
>+class TestCase;
>+class TestInfo;
>+class UnitTest;
>+
> // A class for indicating whether an assertion was successful. When
> // the assertion wasn't successful, the AssertionResult object
> // remembers a non-empty message that describes how it failed.
>@@ -256,8 +275,35 @@ class GTEST_API_ AssertionResult {
> // Copy constructor.
> // Used in EXPECT_TRUE/FALSE(assertion_result).
> AssertionResult(const AssertionResult& other);
>+
>+#if defined(_MSC_VER) && _MSC_VER < 1910
>+ GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 /* forcing value to bool */)
>+#endif
>+
> // Used in the EXPECT_TRUE/FALSE(bool_expression).
>- explicit AssertionResult(bool success) : success_(success) {}
>+ //
>+ // T must be contextually convertible to bool.
>+ //
>+ // The second parameter prevents this overload from being considered if
>+ // the argument is implicitly convertible to AssertionResult. In that case
>+ // we want AssertionResult's copy constructor to be used.
>+ template <typename T>
>+ explicit AssertionResult(
>+ const T& success,
>+ typename internal::EnableIf<
>+ !internal::ImplicitlyConvertible<T, AssertionResult>::value>::type*
>+ /*enabler*/ = NULL)
>+ : success_(success) {}
>+
>+#if defined(_MSC_VER) && _MSC_VER < 1910
>+ GTEST_DISABLE_MSC_WARNINGS_POP_()
>+#endif
>+
>+ // Assignment operator.
>+ AssertionResult& operator=(AssertionResult other) {
>+ swap(other);
>+ return *this;
>+ }
> 
> // Returns true iff the assertion succeeded.
> operator bool() const { return success_; } // NOLINT
>@@ -270,20 +316,36 @@ class GTEST_API_ AssertionResult {
> // assertion's expectation). When nothing has been streamed into the
> // object, returns an empty string.
> const char* message() const {
>- return message_.get() != NULL && message_->c_str() != NULL ?
>- message_->c_str() : "";
>+ return message_.get() != NULL ? message_->c_str() : "";
> }
>- // TODO(vladl@google.com): Remove this after making sure no clients use it.
>+ // FIXME: Remove this after making sure no clients use it.
> // Deprecated; please use message() instead.
> const char* failure_message() const { return message(); }
> 
> // Streams a custom failure message into this object.
>- template <typename T> AssertionResult& operator<<(const T& value);
>+ template <typename T> AssertionResult& operator<<(const T& value) {
>+ AppendMessage(Message() << value);
>+ return *this;
>+ }
>+
>+ // Allows streaming basic output manipulators such as endl or flush into
>+ // this object.
>+ AssertionResult& operator<<(
>+ ::std::ostream& (*basic_manipulator)(::std::ostream& stream)) {
>+ AppendMessage(Message() << basic_manipulator);
>+ return *this;
>+ }
> 
> private:
>- // No implementation - we want AssertionResult to be
>- // copy-constructible but not assignable.
>- void operator=(const AssertionResult& other);
>+ // Appends the contents of message to message_.
>+ void AppendMessage(const Message& a_message) {
>+ if (message_.get() == NULL)
>+ message_.reset(new ::std::string);
>+ message_->append(a_message.GetString().c_str());
>+ }
>+
>+ // Swap the contents of this AssertionResult with other.
>+ void swap(AssertionResult& other);
> 
> // Stores result of the assertion predicate.
> bool success_;
>@@ -291,19 +353,8 @@ class GTEST_API_ AssertionResult {
> // construct is not satisfied with the predicate's outcome.
> // Referenced via a pointer to avoid taking too much stack frame space
> // with test assertions.
>- internal::scoped_ptr<internal::String> message_;
>-}; // class AssertionResult
>-
>-// Streams a custom failure message into this object.
>-template <typename T>
>-AssertionResult& AssertionResult::operator<<(const T& value) {
>- Message msg;
>- if (message_.get() != NULL)
>- msg << *message_;
>- msg << value;
>- message_.reset(new internal::String(msg.GetString()));
>- return *this;
>-}
>+ internal::scoped_ptr< ::std::string> message_;
>+};
> 
> // Makes a successful assertion result.
> GTEST_API_ AssertionResult AssertionSuccess();
>@@ -315,6 +366,15 @@ GTEST_API_ AssertionResult AssertionFailure();
> // Deprecated; use AssertionFailure() << msg.
> GTEST_API_ AssertionResult AssertionFailure(const Message& msg);
> 
>+} // namespace testing
>+
>+// Includes the auto-generated header that implements a family of generic
>+// predicate assertion macros. This include comes late because it relies on
>+// APIs declared above.
>+#include "gtest/gtest_pred_impl.h"
>+
>+namespace testing {
>+
> // The abstract class that all tests inherit from.
> //
> // In Google Test, a unit test program contains one or many TestCases, and
>@@ -325,12 +385,12 @@ GTEST_API_ AssertionResult AssertionFailure(const Message& msg);
> // this for you.
> //
> // The only time you derive from Test is when defining a test fixture
>-// to be used a TEST_F. For example:
>+// to be used in a TEST_F. For example:
> //
> // class FooTest : public testing::Test {
> // protected:
>-// virtual void SetUp() { ... }
>-// virtual void TearDown() { ... }
>+// void SetUp() override { ... }
>+// void TearDown() override { ... }
> // ...
> // };
> //
>@@ -340,7 +400,7 @@ GTEST_API_ AssertionResult AssertionFailure(const Message& msg);
> // Test is not copyable.
> class GTEST_API_ Test {
> public:
>- friend class internal::TestInfoImpl;
>+ friend class TestInfo;
> 
> // Defines types for pointers to functions that set up and tear down
> // a test case.
>@@ -376,20 +436,21 @@ class GTEST_API_ Test {
> // non-fatal) failure.
> static bool HasFailure() { return HasFatalFailure() || HasNonfatalFailure(); }
> 
>- // Logs a property for the current test. Only the last value for a given
>- // key is remembered.
>- // These are public static so they can be called from utility functions
>- // that are not members of the test fixture.
>- // The arguments are const char* instead strings, as Google Test is used
>- // on platforms where string doesn't compile.
>- //
>- // Note that a driving consideration for these RecordProperty methods
>- // was to produce xml output suited to the Greenspan charting utility,
>- // which at present will only chart values that fit in a 32-bit int. It
>- // is the user's responsibility to restrict their values to 32-bit ints
>- // if they intend them to be used with Greenspan.
>- static void RecordProperty(const char* key, const char* value);
>- static void RecordProperty(const char* key, int value);
>+ // Logs a property for the current test, test case, or for the entire
>+ // invocation of the test program when used outside of the context of a
>+ // test case. Only the last value for a given key is remembered. These
>+ // are public static so they can be called from utility functions that are
>+ // not members of the test fixture. Calls to RecordProperty made during
>+ // lifespan of the test (from the moment its constructor starts to the
>+ // moment its destructor finishes) will be output in XML as attributes of
>+ // the <testcase> element. Properties recorded from fixture's
>+ // SetUpTestCase or TearDownTestCase are logged as attributes of the
>+ // corresponding <testsuite> element. Calls to RecordProperty made in the
>+ // global context (before or after invocation of RUN_ALL_TESTS and from
>+ // SetUp/TearDown method of Environment objects registered with Google
>+ // Test) will be output as attributes of the <testsuites> element.
>+ static void RecordProperty(const std::string& key, const std::string& value);
>+ static void RecordProperty(const std::string& key, int value);
> 
> protected:
> // Creates a Test object.
>@@ -417,20 +478,23 @@ class GTEST_API_ Test {
> // Sets up, executes, and tears down the test.
> void Run();
> 
>- // Uses a GTestFlagSaver to save and restore all Google Test flags.
>- const internal::GTestFlagSaver* const gtest_flag_saver_;
>+ // Deletes self. We deliberately pick an unusual name for this
>+ // internal method to avoid clashing with names used in user TESTs.
>+ void DeleteSelf_() { delete this; }
> 
>- // Often a user mis-spells SetUp() as Setup() and spends a long time
>+ const internal::scoped_ptr< GTEST_FLAG_SAVER_ > gtest_flag_saver_;
>+
>+ // Often a user misspells SetUp() as Setup() and spends a long time
> // wondering why it is never called by Google Test. The declaration of
> // the following method is solely for catching such an error at
> // compile time:
> //
> // - The return type is deliberately chosen to be not void, so it
>- // will be a conflict if a user declares void Setup() in his test
>- // fixture.
>+ // will be a conflict if void Setup() is declared in the user's
>+ // test fixture.
> //
> // - This method is private, so it will be another compiler error
>- // if a user calls it from his test fixture.
>+ // if the method is called from the user's test fixture.
> //
> // DO NOT OVERRIDE THIS FUNCTION.
> //
>@@ -454,7 +518,7 @@ class TestProperty {
> // C'tor. TestProperty does NOT have a default constructor.
> // Always use this constructor (with parameters) to create a
> // TestProperty object.
>- TestProperty(const char* a_key, const char* a_value) :
>+ TestProperty(const std::string& a_key, const std::string& a_value) :
> key_(a_key), value_(a_value) {
> }
> 
>@@ -469,15 +533,15 @@ class TestProperty {
> }
> 
> // Sets a new value, overriding the one supplied in the constructor.
>- void SetValue(const char* new_value) {
>+ void SetValue(const std::string& new_value) {
> value_ = new_value;
> }
> 
> private:
> // The key supplied by the user.
>- internal::String key_;
>+ std::string key_;
> // The value supplied by the user.
>- internal::String value_;
>+ std::string value_;
> };
> 
> // The result of a single Test. This includes a list of
>@@ -516,9 +580,8 @@ class GTEST_API_ TestResult {
> // Returns the elapsed time, in milliseconds.
> TimeInMillis elapsed_time() const { return elapsed_time_; }
> 
>- // Returns the i-th test part result among all the results. i can range
>- // from 0 to test_property_count() - 1. If i is not in that range, aborts
>- // the program.
>+ // Returns the i-th test part result among all the results. i can range from 0
>+ // to total_part_count() - 1. If i is not in that range, aborts the program.
> const TestPartResult& GetTestPartResult(int i) const;
> 
> // Returns the i-th test property. i can range from 0 to
>@@ -528,13 +591,14 @@ class GTEST_API_ TestResult {
> 
> private:
> friend class TestInfo;
>+ friend class TestCase;
> friend class UnitTest;
> friend class internal::DefaultGlobalTestPartResultReporter;
> friend class internal::ExecDeathTest;
>- friend class internal::TestInfoImpl;
> friend class internal::TestResultAccessor;
> friend class internal::UnitTestImpl;
> friend class internal::WindowsDeathTest;
>+ friend class internal::FuchsiaDeathTest;
> 
> // Gets the vector of TestPartResults.
> const std::vector<TestPartResult>& test_part_results() const {
>@@ -553,13 +617,16 @@ class GTEST_API_ TestResult {
> // a non-fatal failure if invalid (e.g., if it conflicts with reserved
> // key names). If a property is already recorded for the same key, the
> // value will be updated, rather than storing multiple values for the same
>- // key.
>- void RecordProperty(const TestProperty& test_property);
>+ // key. xml_element specifies the element for which the property is being
>+ // recorded and is used for validation.
>+ void RecordProperty(const std::string& xml_element,
>+ const TestProperty& test_property);
> 
> // Adds a failure if the key is a reserved attribute of Google Test
> // testcase tags. Returns true if the property is valid.
>- // TODO(russr): Validate attribute names are legal and human readable.
>- static bool ValidateTestProperty(const TestProperty& test_property);
>+ // FIXME: Validate attribute names are legal and human readable.
>+ static bool ValidateTestProperty(const std::string& xml_element,
>+ const TestProperty& test_property);
> 
> // Adds a test part result to the list.
> void AddTestPartResult(const TestPartResult& test_part_result);
>@@ -611,20 +678,39 @@ class GTEST_API_ TestInfo {
> ~TestInfo();
> 
> // Returns the test case name.
>- const char* test_case_name() const;
>+ const char* test_case_name() const { return test_case_name_.c_str(); }
> 
> // Returns the test name.
>- const char* name() const;
>+ const char* name() const { return name_.c_str(); }
>+
>+ // Returns the name of the parameter type, or NULL if this is not a typed
>+ // or a type-parameterized test.
>+ const char* type_param() const {
>+ if (type_param_.get() != NULL)
>+ return type_param_->c_str();
>+ return NULL;
>+ }
>+
>+ // Returns the text representation of the value parameter, or NULL if this
>+ // is not a value-parameterized test.
>+ const char* value_param() const {
>+ if (value_param_.get() != NULL)
>+ return value_param_->c_str();
>+ return NULL;
>+ }
>+
>+ // Returns the file name where this test is defined.
>+ const char* file() const { return location_.file.c_str(); }
> 
>- // Returns the test case comment.
>- const char* test_case_comment() const;
>+ // Returns the line where this test is defined.
>+ int line() const { return location_.line; }
> 
>- // Returns the test comment.
>- const char* comment() const;
>+ // Return true if this test should not be run because it's in another shard.
>+ bool is_in_another_shard() const { return is_in_another_shard_; }
> 
>- // Returns true if this test should run, that is if the test is not disabled
>- // (or it is disabled but the also_run_disabled_tests flag has been specified)
>- // and its full name matches the user-specified filter.
>+ // Returns true if this test should run, that is if the test is not
>+ // disabled (or it is disabled but the also_run_disabled_tests flag has
>+ // been specified) and its full name matches the user-specified filter.
> //
> // Google Test allows the user to filter the tests by their full names.
> // The full name of a test Bar in test case Foo is defined as
>@@ -638,10 +724,17 @@ class GTEST_API_ TestInfo {
> //
> // For example, *A*:Foo.* is a filter that matches any string that
> // contains the character 'A' or starts with "Foo.".
>- bool should_run() const;
>+ bool should_run() const { return should_run_; }
>+
>+ // Returns true iff this test will appear in the XML report.
>+ bool is_reportable() const {
>+ // The XML report includes tests matching the filter, excluding those
>+ // run in other shards.
>+ return matches_filter_ && !is_in_another_shard_;
>+ }
> 
> // Returns the result of the test.
>- const TestResult* result() const;
>+ const TestResult* result() const { return &result_; }
> 
> private:
> #if GTEST_HAS_DEATH_TEST
>@@ -649,36 +742,65 @@ class GTEST_API_ TestInfo {
> #endif // GTEST_HAS_DEATH_TEST
> friend class Test;
> friend class TestCase;
>- friend class internal::TestInfoImpl;
> friend class internal::UnitTestImpl;
>+ friend class internal::StreamingListenerTest;
> friend TestInfo* internal::MakeAndRegisterTestInfo(
>- const char* test_case_name, const char* name,
>- const char* test_case_comment, const char* comment,
>+ const char* test_case_name,
>+ const char* name,
>+ const char* type_param,
>+ const char* value_param,
>+ internal::CodeLocation code_location,
> internal::TypeId fixture_class_id,
> Test::SetUpTestCaseFunc set_up_tc,
> Test::TearDownTestCaseFunc tear_down_tc,
> internal::TestFactoryBase* factory);
> 
>- // Returns true if this test matches the user-specified filter.
>- bool matches_filter() const;
>+ // Constructs a TestInfo object. The newly constructed instance assumes
>+ // ownership of the factory object.
>+ TestInfo(const std::string& test_case_name,
>+ const std::string& name,
>+ const char* a_type_param, // NULL if not a type-parameterized test
>+ const char* a_value_param, // NULL if not a value-parameterized test
>+ internal::CodeLocation a_code_location,
>+ internal::TypeId fixture_class_id,
>+ internal::TestFactoryBase* factory);
> 
> // Increments the number of death tests encountered in this test so
> // far.
>- int increment_death_test_count();
>+ int increment_death_test_count() {
>+ return result_.increment_death_test_count();
>+ }
> 
>- // Accessors for the implementation object.
>- internal::TestInfoImpl* impl() { return impl_; }
>- const internal::TestInfoImpl* impl() const { return impl_; }
>+ // Creates the test object, runs it, records its result, and then
>+ // deletes it.
>+ void Run();
> 
>- // Constructs a TestInfo object. The newly constructed instance assumes
>- // ownership of the factory object.
>- TestInfo(const char* test_case_name, const char* name,
>- const char* test_case_comment, const char* comment,
>- internal::TypeId fixture_class_id,
>- internal::TestFactoryBase* factory);
>+ static void ClearTestResult(TestInfo* test_info) {
>+ test_info->result_.Clear();
>+ }
> 
>- // An opaque implementation object.
>- internal::TestInfoImpl* impl_;
>+ // These fields are immutable properties of the test.
>+ const std::string test_case_name_; // Test case name
>+ const std::string name_; // Test name
>+ // Name of the parameter type, or NULL if this is not a typed or a
>+ // type-parameterized test.
>+ const internal::scoped_ptr<const ::std::string> type_param_;
>+ // Text representation of the value parameter, or NULL if this is not a
>+ // value-parameterized test.
>+ const internal::scoped_ptr<const ::std::string> value_param_;
>+ internal::CodeLocation location_;
>+ const internal::TypeId fixture_class_id_; // ID of the test fixture class
>+ bool should_run_; // True iff this test should run
>+ bool is_disabled_; // True iff this test is disabled
>+ bool matches_filter_; // True if this test matches the
>+ // user-specified filter.
>+ bool is_in_another_shard_; // Will be run in another shard.
>+ internal::TestFactoryBase* const factory_; // The factory that creates
>+ // the test object
>+
>+ // This field is mutable and needs to be reset before running the
>+ // test for the second time.
>+ TestResult result_;
> 
> GTEST_DISALLOW_COPY_AND_ASSIGN_(TestInfo);
> };
>@@ -696,9 +818,11 @@ class GTEST_API_ TestCase {
> // Arguments:
> //
> // name: name of the test case
>+ // a_type_param: the name of the test's type parameter, or NULL if
>+ // this is not a type-parameterized test.
> // set_up_tc: pointer to the function that sets up the test case
> // tear_down_tc: pointer to the function that tears down the test case
>- TestCase(const char* name, const char* comment,
>+ TestCase(const char* name, const char* a_type_param,
> Test::SetUpTestCaseFunc set_up_tc,
> Test::TearDownTestCaseFunc tear_down_tc);
> 
>@@ -708,8 +832,13 @@ class GTEST_API_ TestCase {
> // Gets the name of the TestCase.
> const char* name() const { return name_.c_str(); }
> 
>- // Returns the test case comment.
>- const char* comment() const { return comment_.c_str(); }
>+ // Returns the name of the parameter type, or NULL if this is not a
>+ // type-parameterized test case.
>+ const char* type_param() const {
>+ if (type_param_.get() != NULL)
>+ return type_param_->c_str();
>+ return NULL;
>+ }
> 
> // Returns true if any test in this test case should run.
> bool should_run() const { return should_run_; }
>@@ -720,9 +849,15 @@ class GTEST_API_ TestCase {
> // Gets the number of failed tests in this test case.
> int failed_test_count() const;
> 
>+ // Gets the number of disabled tests that will be reported in the XML report.
>+ int reportable_disabled_test_count() const;
>+
> // Gets the number of disabled tests in this test case.
> int disabled_test_count() const;
> 
>+ // Gets the number of tests to be printed in the XML report.
>+ int reportable_test_count() const;
>+
> // Get the number of tests in this test case that should run.
> int test_to_run_count() const;
> 
>@@ -742,6 +877,10 @@ class GTEST_API_ TestCase {
> // total_test_count() - 1. If i is not in that range, returns NULL.
> const TestInfo* GetTestInfo(int i) const;
> 
>+ // Returns the TestResult that holds test properties recorded during
>+ // execution of SetUpTestCase and TearDownTestCase.
>+ const TestResult& ad_hoc_test_result() const { return ad_hoc_test_result_; }
>+
> private:
> friend class Test;
> friend class internal::UnitTestImpl;
>@@ -776,17 +915,44 @@ class GTEST_API_ TestCase {
> // Runs every test in this TestCase.
> void Run();
> 
>+ // Runs SetUpTestCase() for this TestCase. This wrapper is needed
>+ // for catching exceptions thrown from SetUpTestCase().
>+ void RunSetUpTestCase() { (*set_up_tc_)(); }
>+
>+ // Runs TearDownTestCase() for this TestCase. This wrapper is
>+ // needed for catching exceptions thrown from TearDownTestCase().
>+ void RunTearDownTestCase() { (*tear_down_tc_)(); }
>+
> // Returns true iff test passed.
>- static bool TestPassed(const TestInfo * test_info);
>+ static bool TestPassed(const TestInfo* test_info) {
>+ return test_info->should_run() && test_info->result()->Passed();
>+ }
> 
> // Returns true iff test failed.
>- static bool TestFailed(const TestInfo * test_info);
>+ static bool TestFailed(const TestInfo* test_info) {
>+ return test_info->should_run() && test_info->result()->Failed();
>+ }
>+
>+ // Returns true iff the test is disabled and will be reported in the XML
>+ // report.
>+ static bool TestReportableDisabled(const TestInfo* test_info) {
>+ return test_info->is_reportable() && test_info->is_disabled_;
>+ }
> 
> // Returns true iff test is disabled.
>- static bool TestDisabled(const TestInfo * test_info);
>+ static bool TestDisabled(const TestInfo* test_info) {
>+ return test_info->is_disabled_;
>+ }
>+
>+ // Returns true iff this test will appear in the XML report.
>+ static bool TestReportable(const TestInfo* test_info) {
>+ return test_info->is_reportable();
>+ }
> 
> // Returns true if the given test should run.
>- static bool ShouldRunTest(const TestInfo *test_info);
>+ static bool ShouldRunTest(const TestInfo* test_info) {
>+ return test_info->should_run();
>+ }
> 
> // Shuffles the tests in this test case.
> void ShuffleTests(internal::Random* random);
>@@ -795,9 +961,10 @@ class GTEST_API_ TestCase {
> void UnshuffleTests();
> 
> // Name of the test case.
>- internal::String name_;
>- // Comment on the test case.
>- internal::String comment_;
>+ std::string name_;
>+ // Name of the parameter type, or NULL if this is not a typed or a
>+ // type-parameterized test.
>+ const internal::scoped_ptr<const ::std::string> type_param_;
> // The vector of TestInfos in their original order. It owns the
> // elements in the vector.
> std::vector<TestInfo*> test_info_list_;
>@@ -813,13 +980,16 @@ class GTEST_API_ TestCase {
> bool should_run_;
> // Elapsed time, in milliseconds.
> TimeInMillis elapsed_time_;
>+ // Holds test properties recorded during execution of SetUpTestCase and
>+ // TearDownTestCase.
>+ TestResult ad_hoc_test_result_;
> 
> // We disallow copying TestCases.
> GTEST_DISALLOW_COPY_AND_ASSIGN_(TestCase);
> };
> 
> // An Environment object is capable of setting up and tearing down an
>-// environment. The user should subclass this to define his own
>+// environment. You should subclass this to define your own
> // environment(s).
> //
> // An Environment object does the set-up and tear-down in virtual
>@@ -849,6 +1019,18 @@ class Environment {
> virtual Setup_should_be_spelled_SetUp* Setup() { return NULL; }
> };
> 
>+#if GTEST_HAS_EXCEPTIONS
>+
>+// Exception which can be thrown from TestEventListener::OnTestPartResult.
>+class GTEST_API_ AssertionException
>+ : public internal::GoogleTestFailureException {
>+ public:
>+ explicit AssertionException(const TestPartResult& result)
>+ : GoogleTestFailureException(result) {}
>+};
>+
>+#endif // GTEST_HAS_EXCEPTIONS
>+
> // The interface for tracing execution of tests. The methods are organized in
> // the order the corresponding events are fired.
> class TestEventListener {
>@@ -876,7 +1058,9 @@ class TestEventListener {
> // Fired before the test starts.
> virtual void OnTestStart(const TestInfo& test_info) = 0;
> 
>- // Fired after a failed assertion or a SUCCESS().
>+ // Fired after a failed assertion or a SUCCEED() invocation.
>+ // If you want to throw an exception from this function to skip to the next
>+ // TEST, it must be AssertionException defined above, or inherited from it.
> virtual void OnTestPartResult(const TestPartResult& test_part_result) = 0;
> 
> // Fired after the test ends.
>@@ -961,10 +1145,10 @@ class GTEST_API_ TestEventListeners {
> 
> private:
> friend class TestCase;
>+ friend class TestInfo;
> friend class internal::DefaultGlobalTestPartResultReporter;
> friend class internal::NoExecDeathTest;
> friend class internal::TestEventListenersAccessor;
>- friend class internal::TestInfoImpl;
> friend class internal::UnitTestImpl;
> 
> // Returns repeater that broadcasts the TestEventListener events to all
>@@ -1032,22 +1216,23 @@ class GTEST_API_ UnitTest {
> 
> // Returns the TestCase object for the test that's currently running,
> // or NULL if no test is running.
>- const TestCase* current_test_case() const;
>+ const TestCase* current_test_case() const
>+ GTEST_LOCK_EXCLUDED_(mutex_);
> 
> // Returns the TestInfo object for the test that's currently running,
> // or NULL if no test is running.
>- const TestInfo* current_test_info() const;
>+ const TestInfo* current_test_info() const
>+ GTEST_LOCK_EXCLUDED_(mutex_);
> 
> // Returns the random seed used at the start of the current test run.
> int random_seed() const;
> 
>-#if GTEST_HAS_PARAM_TEST
> // Returns the ParameterizedTestCaseRegistry object used to keep track of
> // value-parameterized tests and instantiate and register them.
> //
> // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
>- internal::ParameterizedTestCaseRegistry& parameterized_test_registry();
>-#endif // GTEST_HAS_PARAM_TEST
>+ internal::ParameterizedTestCaseRegistry& parameterized_test_registry()
>+ GTEST_LOCK_EXCLUDED_(mutex_);
> 
> // Gets the number of successful test cases.
> int successful_test_case_count() const;
>@@ -1068,15 +1253,25 @@ class GTEST_API_ UnitTest {
> // Gets the number of failed tests.
> int failed_test_count() const;
> 
>+ // Gets the number of disabled tests that will be reported in the XML report.
>+ int reportable_disabled_test_count() const;
>+
> // Gets the number of disabled tests.
> int disabled_test_count() const;
> 
>+ // Gets the number of tests to be printed in the XML report.
>+ int reportable_test_count() const;
>+
> // Gets the number of all tests.
> int total_test_count() const;
> 
> // Gets the number of tests that should run.
> int test_to_run_count() const;
> 
>+ // Gets the time of the test program start, in ms from the start of the
>+ // UNIX epoch.
>+ TimeInMillis start_timestamp() const;
>+
> // Gets the elapsed time, in milliseconds.
> TimeInMillis elapsed_time() const;
> 
>@@ -1091,6 +1286,10 @@ class GTEST_API_ UnitTest {
> // total_test_case_count() - 1. If i is not in that range, returns NULL.
> const TestCase* GetTestCase(int i) const;
> 
>+ // Returns the TestResult containing information on test failures and
>+ // properties logged outside of individual test cases.
>+ const TestResult& ad_hoc_test_result() const;
>+
> // Returns the list of event listeners that can be used to track events
> // inside Google Test.
> TestEventListeners& listeners();
>@@ -1114,12 +1313,16 @@ class GTEST_API_ UnitTest {
> void AddTestPartResult(TestPartResult::Type result_type,
> const char* file_name,
> int line_number,
>- const internal::String& message,
>- const internal::String& os_stack_trace);
>+ const std::string& message,
>+ const std::string& os_stack_trace)
>+ GTEST_LOCK_EXCLUDED_(mutex_);
> 
>- // Adds a TestProperty to the current TestResult object. If the result already
>- // contains a property with the same key, the value will be updated.
>- void RecordPropertyForCurrentTest(const char* key, const char* value);
>+ // Adds a TestProperty to the current TestResult object when invoked from
>+ // inside a test, to current TestCase's ad_hoc_test_result_ when invoked
>+ // from SetUpTestCase or TearDownTestCase, or to the global property set
>+ // when invoked elsewhere. If the result already contains a property with
>+ // the same key, the value will be updated.
>+ void RecordProperty(const std::string& key, const std::string& value);
> 
> // Gets the i-th test case among all the test cases. i can range from 0 to
> // total_test_case_count() - 1. If i is not in that range, returns NULL.
>@@ -1129,16 +1332,18 @@ class GTEST_API_ UnitTest {
> internal::UnitTestImpl* impl() { return impl_; }
> const internal::UnitTestImpl* impl() const { return impl_; }
> 
>- // These classes and funcions are friends as they need to access private
>+ // These classes and functions are friends as they need to access private
> // members of UnitTest.
>+ friend class ScopedTrace;
> friend class Test;
> friend class internal::AssertHelper;
>- friend class internal::ScopedTrace;
>+ friend class internal::StreamingListenerTest;
>+ friend class internal::UnitTestRecordPropertyTestHelper;
> friend Environment* AddGlobalTestEnvironment(Environment* env);
> friend internal::UnitTestImpl* internal::GetUnitTestImpl();
> friend void internal::ReportFailureInUnknownLocation(
> TestPartResult::Type result_type,
>- const internal::String& message);
>+ const std::string& message);
> 
> // Creates an empty UnitTest.
> UnitTest();
>@@ -1148,10 +1353,12 @@ class GTEST_API_ UnitTest {
> 
> // Pushes a trace defined by SCOPED_TRACE() on to the per-thread
> // Google Test trace stack.
>- void PushGTestTrace(const internal::TraceInfo& trace);
>+ void PushGTestTrace(const internal::TraceInfo& trace)
>+ GTEST_LOCK_EXCLUDED_(mutex_);
> 
> // Pops a trace from the per-thread Google Test trace stack.
>- void PopGTestTrace();
>+ void PopGTestTrace()
>+ GTEST_LOCK_EXCLUDED_(mutex_);
> 
> // Protects mutable state in *impl_. This is mutable as some const
> // methods need to lock it too.
>@@ -1206,82 +1413,40 @@ GTEST_API_ void InitGoogleTest(int* argc, wchar_t** argv);
> 
> namespace internal {
> 
>-// These overloaded versions handle ::std::string and ::std::wstring.
>-GTEST_API_ inline String FormatForFailureMessage(const ::std::string& str) {
>- return (Message() << '"' << str << '"').GetString();
>-}
>-
>-#if GTEST_HAS_STD_WSTRING
>-GTEST_API_ inline String FormatForFailureMessage(const ::std::wstring& wstr) {
>- return (Message() << "L\"" << wstr << '"').GetString();
>-}
>-#endif // GTEST_HAS_STD_WSTRING
>-
>-// These overloaded versions handle ::string and ::wstring.
>-#if GTEST_HAS_GLOBAL_STRING
>-GTEST_API_ inline String FormatForFailureMessage(const ::string& str) {
>- return (Message() << '"' << str << '"').GetString();
>-}
>-#endif // GTEST_HAS_GLOBAL_STRING
>-
>-#if GTEST_HAS_GLOBAL_WSTRING
>-GTEST_API_ inline String FormatForFailureMessage(const ::wstring& wstr) {
>- return (Message() << "L\"" << wstr << '"').GetString();
>-}
>-#endif // GTEST_HAS_GLOBAL_WSTRING
>-
>-// Formats a comparison assertion (e.g. ASSERT_EQ, EXPECT_LT, and etc)
>-// operand to be used in a failure message. The type (but not value)
>-// of the other operand may affect the format. This allows us to
>-// print a char* as a raw pointer when it is compared against another
>-// char*, and print it as a C string when it is compared against an
>-// std::string object, for example.
>-//
>-// The default implementation ignores the type of the other operand.
>-// Some specialized versions are used to handle formatting wide or
>-// narrow C strings.
>-//
>-// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
>+// Separate the error generating code from the code path to reduce the stack
>+// frame size of CmpHelperEQ. This helps reduce the overhead of some sanitizers
>+// when calling EXPECT_* in a tight loop.
> template <typename T1, typename T2>
>-String FormatForComparisonFailureMessage(const T1& value,
>- const T2& /* other_operand */) {
>- return FormatForFailureMessage(value);
>+AssertionResult CmpHelperEQFailure(const char* lhs_expression,
>+ const char* rhs_expression,
>+ const T1& lhs, const T2& rhs) {
>+ return EqFailure(lhs_expression,
>+ rhs_expression,
>+ FormatForComparisonFailureMessage(lhs, rhs),
>+ FormatForComparisonFailureMessage(rhs, lhs),
>+ false);
> }
> 
> // The helper function for {ASSERT|EXPECT}_EQ.
> template <typename T1, typename T2>
>-AssertionResult CmpHelperEQ(const char* expected_expression,
>- const char* actual_expression,
>- const T1& expected,
>- const T2& actual) {
>-#ifdef _MSC_VER
>-#pragma warning(push) // Saves the current warning state.
>-#pragma warning(disable:4389) // Temporarily disables warning on
>- // signed/unsigned mismatch.
>-#endif
>-
>- if (expected == actual) {
>+AssertionResult CmpHelperEQ(const char* lhs_expression,
>+ const char* rhs_expression,
>+ const T1& lhs,
>+ const T2& rhs) {
>+ if (lhs == rhs) {
> return AssertionSuccess();
> }
> 
>-#ifdef _MSC_VER
>-#pragma warning(pop) // Restores the warning state.
>-#endif
>-
>- return EqFailure(expected_expression,
>- actual_expression,
>- FormatForComparisonFailureMessage(expected, actual),
>- FormatForComparisonFailureMessage(actual, expected),
>- false);
>+ return CmpHelperEQFailure(lhs_expression, rhs_expression, lhs, rhs);
> }
> 
> // With this overloaded version, we allow anonymous enums to be used
> // in {ASSERT|EXPECT}_EQ when compiled with gcc 4, as anonymous enums
> // can be implicitly cast to BiggestInt.
>-GTEST_API_ AssertionResult CmpHelperEQ(const char* expected_expression,
>- const char* actual_expression,
>- BiggestInt expected,
>- BiggestInt actual);
>+GTEST_API_ AssertionResult CmpHelperEQ(const char* lhs_expression,
>+ const char* rhs_expression,
>+ BiggestInt lhs,
>+ BiggestInt rhs);
> 
> // The helper class for {ASSERT|EXPECT}_EQ. The template argument
> // lhs_is_null_literal is true iff the first argument to ASSERT_EQ()
>@@ -1292,12 +1457,11 @@ class EqHelper {
> public:
> // This templatized version is for the general case.
> template <typename T1, typename T2>
>- static AssertionResult Compare(const char* expected_expression,
>- const char* actual_expression,
>- const T1& expected,
>- const T2& actual) {
>- return CmpHelperEQ(expected_expression, actual_expression, expected,
>- actual);
>+ static AssertionResult Compare(const char* lhs_expression,
>+ const char* rhs_expression,
>+ const T1& lhs,
>+ const T2& rhs) {
>+ return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs);
> }
> 
> // With this overloaded version, we allow anonymous enums to be used
>@@ -1306,17 +1470,16 @@ class EqHelper {
> //
> // Even though its body looks the same as the above version, we
> // cannot merge the two, as it will make anonymous enums unhappy.
>- static AssertionResult Compare(const char* expected_expression,
>- const char* actual_expression,
>- BiggestInt expected,
>- BiggestInt actual) {
>- return CmpHelperEQ(expected_expression, actual_expression, expected,
>- actual);
>+ static AssertionResult Compare(const char* lhs_expression,
>+ const char* rhs_expression,
>+ BiggestInt lhs,
>+ BiggestInt rhs) {
>+ return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs);
> }
> };
> 
> // This specialization is used when the first argument to ASSERT_EQ()
>-// is a null pointer literal.
>+// is a null pointer literal, like NULL, false, or 0.
> template <>
> class EqHelper<true> {
> public:
>@@ -1325,27 +1488,53 @@ class EqHelper<true> {
> // NOT a pointer, e.g. ASSERT_EQ(0, AnIntFunction()) or
> // EXPECT_EQ(false, a_bool).
> template <typename T1, typename T2>
>- static AssertionResult Compare(const char* expected_expression,
>- const char* actual_expression,
>- const T1& expected,
>- const T2& actual) {
>- return CmpHelperEQ(expected_expression, actual_expression, expected,
>- actual);
>+ static AssertionResult Compare(
>+ const char* lhs_expression,
>+ const char* rhs_expression,
>+ const T1& lhs,
>+ const T2& rhs,
>+ // The following line prevents this overload from being considered if T2
>+ // is not a pointer type. We need this because ASSERT_EQ(NULL, my_ptr)
>+ // expands to Compare("", "", NULL, my_ptr), which requires a conversion
>+ // to match the Secret* in the other overload, which would otherwise make
>+ // this template match better.
>+ typename EnableIf<!is_pointer<T2>::value>::type* = 0) {
>+ return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs);
> }
> 
>- // This version will be picked when the second argument to
>- // ASSERT_EQ() is a pointer, e.g. ASSERT_EQ(NULL, a_pointer).
>- template <typename T1, typename T2>
>- static AssertionResult Compare(const char* expected_expression,
>- const char* actual_expression,
>- const T1& /* expected */,
>- T2* actual) {
>- // We already know that 'expected' is a null pointer.
>- return CmpHelperEQ(expected_expression, actual_expression,
>- static_cast<T2*>(NULL), actual);
>+ // This version will be picked when the second argument to ASSERT_EQ() is a
>+ // pointer, e.g. ASSERT_EQ(NULL, a_pointer).
>+ template <typename T>
>+ static AssertionResult Compare(
>+ const char* lhs_expression,
>+ const char* rhs_expression,
>+ // We used to have a second template parameter instead of Secret*. That
>+ // template parameter would deduce to 'long', making this a better match
>+ // than the first overload even without the first overload's EnableIf.
>+ // Unfortunately, gcc with -Wconversion-null warns when "passing NULL to
>+ // non-pointer argument" (even a deduced integral argument), so the old
>+ // implementation caused warnings in user code.
>+ Secret* /* lhs (NULL) */,
>+ T* rhs) {
>+ // We already know that 'lhs' is a null pointer.
>+ return CmpHelperEQ(lhs_expression, rhs_expression,
>+ static_cast<T*>(NULL), rhs);
> }
> };
> 
>+// Separate the error generating code from the code path to reduce the stack
>+// frame size of CmpHelperOP. This helps reduce the overhead of some sanitizers
>+// when calling EXPECT_OP in a tight loop.
>+template <typename T1, typename T2>
>+AssertionResult CmpHelperOpFailure(const char* expr1, const char* expr2,
>+ const T1& val1, const T2& val2,
>+ const char* op) {
>+ return AssertionFailure()
>+ << "Expected: (" << expr1 << ") " << op << " (" << expr2
>+ << "), actual: " << FormatForComparisonFailureMessage(val1, val2)
>+ << " vs " << FormatForComparisonFailureMessage(val2, val1);
>+}
>+
> // A macro for implementing the helper functions needed to implement
> // ASSERT_?? and EXPECT_??. It is here just to avoid copy-and-paste
> // of similar code.
>@@ -1356,6 +1545,7 @@ class EqHelper<true> {
> // with gcc 4.
> //
> // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
>+
> #define GTEST_IMPL_CMP_HELPER_(op_name, op)\
> template <typename T1, typename T2>\
> AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \
>@@ -1363,11 +1553,7 @@ AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \
> if (val1 op val2) {\
> return AssertionSuccess();\
> } else {\
>- Message msg;\
>- msg << "Expected: (" << expr1 << ") " #op " (" << expr2\
>- << "), actual: " << FormatForComparisonFailureMessage(val1, val2)\
>- << " vs " << FormatForComparisonFailureMessage(val2, val1);\
>- return AssertionFailure(msg);\
>+ return CmpHelperOpFailure(expr1, expr2, val1, val2, #op);\
> }\
> }\
> GTEST_API_ AssertionResult CmpHelper##op_name(\
>@@ -1380,29 +1566,29 @@ GTEST_IMPL_CMP_HELPER_(NE, !=);
> // Implements the helper function for {ASSERT|EXPECT}_LE
> GTEST_IMPL_CMP_HELPER_(LE, <=);
> // Implements the helper function for {ASSERT|EXPECT}_LT
>-GTEST_IMPL_CMP_HELPER_(LT, < );
>+GTEST_IMPL_CMP_HELPER_(LT, <);
> // Implements the helper function for {ASSERT|EXPECT}_GE
> GTEST_IMPL_CMP_HELPER_(GE, >=);
> // Implements the helper function for {ASSERT|EXPECT}_GT
>-GTEST_IMPL_CMP_HELPER_(GT, > );
>+GTEST_IMPL_CMP_HELPER_(GT, >);
> 
> #undef GTEST_IMPL_CMP_HELPER_
> 
> // The helper function for {ASSERT|EXPECT}_STREQ.
> //
> // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
>-GTEST_API_ AssertionResult CmpHelperSTREQ(const char* expected_expression,
>- const char* actual_expression,
>- const char* expected,
>- const char* actual);
>+GTEST_API_ AssertionResult CmpHelperSTREQ(const char* s1_expression,
>+ const char* s2_expression,
>+ const char* s1,
>+ const char* s2);
> 
> // The helper function for {ASSERT|EXPECT}_STRCASEEQ.
> //
> // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
>-GTEST_API_ AssertionResult CmpHelperSTRCASEEQ(const char* expected_expression,
>- const char* actual_expression,
>- const char* expected,
>- const char* actual);
>+GTEST_API_ AssertionResult CmpHelperSTRCASEEQ(const char* s1_expression,
>+ const char* s2_expression,
>+ const char* s1,
>+ const char* s2);
> 
> // The helper function for {ASSERT|EXPECT}_STRNE.
> //
>@@ -1424,10 +1610,10 @@ GTEST_API_ AssertionResult CmpHelperSTRCASENE(const char* s1_expression,
> // Helper function for *_STREQ on wide strings.
> //
> // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
>-GTEST_API_ AssertionResult CmpHelperSTREQ(const char* expected_expression,
>- const char* actual_expression,
>- const wchar_t* expected,
>- const wchar_t* actual);
>+GTEST_API_ AssertionResult CmpHelperSTREQ(const char* s1_expression,
>+ const char* s2_expression,
>+ const wchar_t* s1,
>+ const wchar_t* s2);
> 
> // Helper function for *_STRNE on wide strings.
> //
>@@ -1485,28 +1671,28 @@ namespace internal {
> //
> // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
> template <typename RawType>
>-AssertionResult CmpHelperFloatingPointEQ(const char* expected_expression,
>- const char* actual_expression,
>- RawType expected,
>- RawType actual) {
>- const FloatingPoint<RawType> lhs(expected), rhs(actual);
>+AssertionResult CmpHelperFloatingPointEQ(const char* lhs_expression,
>+ const char* rhs_expression,
>+ RawType lhs_value,
>+ RawType rhs_value) {
>+ const FloatingPoint<RawType> lhs(lhs_value), rhs(rhs_value);
> 
> if (lhs.AlmostEquals(rhs)) {
> return AssertionSuccess();
> }
> 
>- StrStream expected_ss;
>- expected_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
>- << expected;
>+ ::std::stringstream lhs_ss;
>+ lhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
>+ << lhs_value;
> 
>- StrStream actual_ss;
>- actual_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
>- << actual;
>+ ::std::stringstream rhs_ss;
>+ rhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
>+ << rhs_value;
> 
>- return EqFailure(expected_expression,
>- actual_expression,
>- StrStreamToString(&expected_ss),
>- StrStreamToString(&actual_ss),
>+ return EqFailure(lhs_expression,
>+ rhs_expression,
>+ StringStreamToString(&lhs_ss),
>+ StringStreamToString(&rhs_ss),
> false);
> }
> 
>@@ -1548,9 +1734,9 @@ class GTEST_API_ AssertHelper {
> : type(t), file(srcfile), line(line_num), message(msg) { }
> 
> TestPartResult::Type const type;
>- const char* const file;
>- int const line;
>- String const message;
>+ const char* const file;
>+ int const line;
>+ std::string const message;
> 
> private:
> GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelperData);
>@@ -1563,10 +1749,13 @@ class GTEST_API_ AssertHelper {
> 
> } // namespace internal
> 
>-#if GTEST_HAS_PARAM_TEST
>-// The abstract base class that all value-parameterized tests inherit from.
>+// The pure interface class that all value-parameterized tests inherit from.
>+// A value-parameterized class must inherit from both ::testing::Test and
>+// ::testing::WithParamInterface. In most cases that just means inheriting
>+// from ::testing::TestWithParam, but more complicated test hierarchies
>+// may need to inherit from Test and WithParamInterface at different levels.
> //
>-// This class adds support for accessing the test parameter value via
>+// This interface has support for accessing the test parameter value via
> // the GetParam() method.
> //
> // Use it with one of the parameter generator defining functions, like Range(),
>@@ -1595,13 +1784,22 @@ class GTEST_API_ AssertHelper {
> // INSTANTIATE_TEST_CASE_P(OneToTenRange, FooTest, ::testing::Range(1, 10));
> 
> template <typename T>
>-class TestWithParam : public Test {
>+class WithParamInterface {
> public:
> typedef T ParamType;
>+ virtual ~WithParamInterface() {}
> 
> // The current parameter value. Is also available in the test fixture's
>- // constructor.
>- const ParamType& GetParam() const { return *parameter_; }
>+ // constructor. This member function is non-static, even though it only
>+ // references static data, to reduce the opportunity for incorrect uses
>+ // like writing 'WithParamInterface<bool>::GetParam()' for a test that
>+ // uses a fixture whose parameter type is int.
>+ const ParamType& GetParam() const {
>+ GTEST_CHECK_(parameter_ != NULL)
>+ << "GetParam() can only be called inside a value-parameterized test "
>+ << "-- did you intend to write TEST_P instead of TEST_F?";
>+ return *parameter_;
>+ }
> 
> private:
> // Sets parameter value. The caller is responsible for making sure the value
>@@ -1613,14 +1811,19 @@ class TestWithParam : public Test {
> // Static value used for accessing parameter during a test lifetime.
> static const ParamType* parameter_;
> 
>- // TestClass must be a subclass of TestWithParam<T>.
>+ // TestClass must be a subclass of WithParamInterface<T> and Test.
> template <class TestClass> friend class internal::ParameterizedTestFactory;
> };
> 
> template <typename T>
>-const T* TestWithParam<T>::parameter_ = NULL;
>+const T* WithParamInterface<T>::parameter_ = NULL;
>+
>+// Most value-parameterized classes can ignore the existence of
>+// WithParamInterface, and can just inherit from ::testing::TestWithParam.
> 
>-#endif // GTEST_HAS_PARAM_TEST
>+template <typename T>
>+class TestWithParam : public Test, public WithParamInterface<T> {
>+};
> 
> // Macros for indicating success/failure in test code.
> 
>@@ -1640,23 +1843,23 @@ const T* TestWithParam<T>::parameter_ = NULL;
> // usually want the fail-fast behavior of FAIL and ASSERT_*, but those
> // writing data-driven tests often find themselves using ADD_FAILURE
> // and EXPECT_* more.
>-//
>-// Examples:
>-//
>-// EXPECT_TRUE(server.StatusIsOK());
>-// ASSERT_FALSE(server.HasPendingRequest(port))
>-// << "There are still pending requests " << "on port " << port;
> 
> // Generates a nonfatal failure with a generic message.
> #define ADD_FAILURE() GTEST_NONFATAL_FAILURE_("Failed")
> 
>+// Generates a nonfatal failure at the given source file location with
>+// a generic message.
>+#define ADD_FAILURE_AT(file, line) \
>+ GTEST_MESSAGE_AT_(file, line, "Failed", \
>+ ::testing::TestPartResult::kNonFatalFailure)
>+
> // Generates a fatal failure with a generic message.
> #define GTEST_FAIL() GTEST_FATAL_FAILURE_("Failed")
> 
> // Define this macro to 1 to omit the definition of FAIL(), which is a
> // generic name and clashes with some other libraries.
> #if !GTEST_DONT_DEFINE_FAIL
>-#define FAIL() GTEST_FAIL()
>+# define FAIL() GTEST_FAIL()
> #endif
> 
> // Generates a success with a generic message.
>@@ -1665,7 +1868,7 @@ const T* TestWithParam<T>::parameter_ = NULL;
> // Define this macro to 1 to omit the definition of SUCCEED(), which
> // is a generic name and clashes with some other libraries.
> #if !GTEST_DONT_DEFINE_SUCCEED
>-#define SUCCEED() GTEST_SUCCEED()
>+# define SUCCEED() GTEST_SUCCEED()
> #endif
> 
> // Macros for testing exceptions.
>@@ -1706,18 +1909,14 @@ const T* TestWithParam<T>::parameter_ = NULL;
> GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \
> GTEST_FATAL_FAILURE_)
> 
>-// Includes the auto-generated header that implements a family of
>-// generic predicate assertion macros.
>-#include <gtest/gtest_pred_impl.h>
>-
> // Macros for testing equalities and inequalities.
> //
>-// * {ASSERT|EXPECT}_EQ(expected, actual): Tests that expected == actual
>-// * {ASSERT|EXPECT}_NE(v1, v2): Tests that v1 != v2
>-// * {ASSERT|EXPECT}_LT(v1, v2): Tests that v1 < v2
>-// * {ASSERT|EXPECT}_LE(v1, v2): Tests that v1 <= v2
>-// * {ASSERT|EXPECT}_GT(v1, v2): Tests that v1 > v2
>-// * {ASSERT|EXPECT}_GE(v1, v2): Tests that v1 >= v2
>+// * {ASSERT|EXPECT}_EQ(v1, v2): Tests that v1 == v2
>+// * {ASSERT|EXPECT}_NE(v1, v2): Tests that v1 != v2
>+// * {ASSERT|EXPECT}_LT(v1, v2): Tests that v1 < v2
>+// * {ASSERT|EXPECT}_LE(v1, v2): Tests that v1 <= v2
>+// * {ASSERT|EXPECT}_GT(v1, v2): Tests that v1 > v2
>+// * {ASSERT|EXPECT}_GE(v1, v2): Tests that v1 >= v2
> //
> // When they are not, Google Test prints both the tested expressions and
> // their actual values. The values must be compatible built-in types,
>@@ -1739,8 +1938,8 @@ const T* TestWithParam<T>::parameter_ = NULL;
> // are related, not how their content is related. To compare two C
> // strings by content, use {ASSERT|EXPECT}_STR*().
> //
>-// 3. {ASSERT|EXPECT}_EQ(expected, actual) is preferred to
>-// {ASSERT|EXPECT}_TRUE(expected == actual), as the former tells you
>+// 3. {ASSERT|EXPECT}_EQ(v1, v2) is preferred to
>+// {ASSERT|EXPECT}_TRUE(v1 == v2), as the former tells you
> // what the actual value is when it fails, and similarly for the
> // other comparisons.
> //
>@@ -1751,17 +1950,17 @@ const T* TestWithParam<T>::parameter_ = NULL;
> //
> // Examples:
> //
>-// EXPECT_NE(5, Foo());
>-// EXPECT_EQ(NULL, a_pointer);
>+// EXPECT_NE(Foo(), 5);
>+// EXPECT_EQ(a_pointer, NULL);
> // ASSERT_LT(i, array_size);
> // ASSERT_GT(records.size(), 0) << "There is no record left.";
> 
>-#define EXPECT_EQ(expected, actual) \
>+#define EXPECT_EQ(val1, val2) \
> EXPECT_PRED_FORMAT2(::testing::internal:: \
>- EqHelper<GTEST_IS_NULL_LITERAL_(expected)>::Compare, \
>- expected, actual)
>-#define EXPECT_NE(expected, actual) \
>- EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNE, expected, actual)
>+ EqHelper<GTEST_IS_NULL_LITERAL_(val1)>::Compare, \
>+ val1, val2)
>+#define EXPECT_NE(val1, val2) \
>+ EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2)
> #define EXPECT_LE(val1, val2) \
> EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2)
> #define EXPECT_LT(val1, val2) \
>@@ -1771,22 +1970,49 @@ const T* TestWithParam<T>::parameter_ = NULL;
> #define EXPECT_GT(val1, val2) \
> EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2)
> 
>-#define ASSERT_EQ(expected, actual) \
>+#define GTEST_ASSERT_EQ(val1, val2) \
> ASSERT_PRED_FORMAT2(::testing::internal:: \
>- EqHelper<GTEST_IS_NULL_LITERAL_(expected)>::Compare, \
>- expected, actual)
>-#define ASSERT_NE(val1, val2) \
>+ EqHelper<GTEST_IS_NULL_LITERAL_(val1)>::Compare, \
>+ val1, val2)
>+#define GTEST_ASSERT_NE(val1, val2) \
> ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2)
>-#define ASSERT_LE(val1, val2) \
>+#define GTEST_ASSERT_LE(val1, val2) \
> ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2)
>-#define ASSERT_LT(val1, val2) \
>+#define GTEST_ASSERT_LT(val1, val2) \
> ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2)
>-#define ASSERT_GE(val1, val2) \
>+#define GTEST_ASSERT_GE(val1, val2) \
> ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2)
>-#define ASSERT_GT(val1, val2) \
>+#define GTEST_ASSERT_GT(val1, val2) \
> ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2)
> 
>-// C String Comparisons. All tests treat NULL and any non-NULL string
>+// Define macro GTEST_DONT_DEFINE_ASSERT_XY to 1 to omit the definition of
>+// ASSERT_XY(), which clashes with some users' own code.
>+
>+#if !GTEST_DONT_DEFINE_ASSERT_EQ
>+# define ASSERT_EQ(val1, val2) GTEST_ASSERT_EQ(val1, val2)
>+#endif
>+
>+#if !GTEST_DONT_DEFINE_ASSERT_NE
>+# define ASSERT_NE(val1, val2) GTEST_ASSERT_NE(val1, val2)
>+#endif
>+
>+#if !GTEST_DONT_DEFINE_ASSERT_LE
>+# define ASSERT_LE(val1, val2) GTEST_ASSERT_LE(val1, val2)
>+#endif
>+
>+#if !GTEST_DONT_DEFINE_ASSERT_LT
>+# define ASSERT_LT(val1, val2) GTEST_ASSERT_LT(val1, val2)
>+#endif
>+
>+#if !GTEST_DONT_DEFINE_ASSERT_GE
>+# define ASSERT_GE(val1, val2) GTEST_ASSERT_GE(val1, val2)
>+#endif
>+
>+#if !GTEST_DONT_DEFINE_ASSERT_GT
>+# define ASSERT_GT(val1, val2) GTEST_ASSERT_GT(val1, val2)
>+#endif
>+
>+// C-string Comparisons. All tests treat NULL and any non-NULL string
> // as different. Two NULLs are equal.
> //
> // * {ASSERT|EXPECT}_STREQ(s1, s2): Tests that s1 == s2
>@@ -1802,29 +2028,29 @@ const T* TestWithParam<T>::parameter_ = NULL;
> //
> // These macros evaluate their arguments exactly once.
> 
>-#define EXPECT_STREQ(expected, actual) \
>- EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, expected, actual)
>+#define EXPECT_STREQ(s1, s2) \
>+ EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, s1, s2)
> #define EXPECT_STRNE(s1, s2) \
> EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2)
>-#define EXPECT_STRCASEEQ(expected, actual) \
>- EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, expected, actual)
>+#define EXPECT_STRCASEEQ(s1, s2) \
>+ EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, s1, s2)
> #define EXPECT_STRCASENE(s1, s2)\
> EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2)
> 
>-#define ASSERT_STREQ(expected, actual) \
>- ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, expected, actual)
>+#define ASSERT_STREQ(s1, s2) \
>+ ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, s1, s2)
> #define ASSERT_STRNE(s1, s2) \
> ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2)
>-#define ASSERT_STRCASEEQ(expected, actual) \
>- ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, expected, actual)
>+#define ASSERT_STRCASEEQ(s1, s2) \
>+ ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, s1, s2)
> #define ASSERT_STRCASENE(s1, s2)\
> ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2)
> 
> // Macros for comparing floating-point numbers.
> //
>-// * {ASSERT|EXPECT}_FLOAT_EQ(expected, actual):
>+// * {ASSERT|EXPECT}_FLOAT_EQ(val1, val2):
> // Tests that two float values are almost equal.
>-// * {ASSERT|EXPECT}_DOUBLE_EQ(expected, actual):
>+// * {ASSERT|EXPECT}_DOUBLE_EQ(val1, val2):
> // Tests that two double values are almost equal.
> // * {ASSERT|EXPECT}_NEAR(v1, v2, abs_error):
> // Tests that v1 and v2 are within the given distance to each other.
>@@ -1834,21 +2060,21 @@ const T* TestWithParam<T>::parameter_ = NULL;
> // FloatingPoint template class in gtest-internal.h if you are
> // interested in the implementation details.
> 
>-#define EXPECT_FLOAT_EQ(expected, actual)\
>+#define EXPECT_FLOAT_EQ(val1, val2)\
> EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<float>, \
>- expected, actual)
>+ val1, val2)
> 
>-#define EXPECT_DOUBLE_EQ(expected, actual)\
>+#define EXPECT_DOUBLE_EQ(val1, val2)\
> EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<double>, \
>- expected, actual)
>+ val1, val2)
> 
>-#define ASSERT_FLOAT_EQ(expected, actual)\
>+#define ASSERT_FLOAT_EQ(val1, val2)\
> ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<float>, \
>- expected, actual)
>+ val1, val2)
> 
>-#define ASSERT_DOUBLE_EQ(expected, actual)\
>+#define ASSERT_DOUBLE_EQ(val1, val2)\
> ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<double>, \
>- expected, actual)
>+ val1, val2)
> 
> #define EXPECT_NEAR(val1, val2, abs_error)\
> EXPECT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \
>@@ -1882,16 +2108,16 @@ GTEST_API_ AssertionResult DoubleLE(const char* expr1, const char* expr2,
> // expected result and the actual result with both a human-readable
> // string representation of the error, if available, as well as the
> // hex result code.
>-#define EXPECT_HRESULT_SUCCEEDED(expr) \
>+# define EXPECT_HRESULT_SUCCEEDED(expr) \
> EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr))
> 
>-#define ASSERT_HRESULT_SUCCEEDED(expr) \
>+# define ASSERT_HRESULT_SUCCEEDED(expr) \
> ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr))
> 
>-#define EXPECT_HRESULT_FAILED(expr) \
>+# define EXPECT_HRESULT_FAILED(expr) \
> EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr))
> 
>-#define ASSERT_HRESULT_FAILED(expr) \
>+# define ASSERT_HRESULT_FAILED(expr) \
> ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr))
> 
> #endif // GTEST_OS_WINDOWS
>@@ -1911,6 +2137,57 @@ GTEST_API_ AssertionResult DoubleLE(const char* expr1, const char* expr2,
> #define EXPECT_NO_FATAL_FAILURE(statement) \
> GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_NONFATAL_FAILURE_)
> 
>+// Causes a trace (including the given source file path and line number,
>+// and the given message) to be included in every test failure message generated
>+// by code in the scope of the lifetime of an instance of this class. The effect
>+// is undone with the destruction of the instance.
>+//
>+// The message argument can be anything streamable to std::ostream.
>+//
>+// Example:
>+// testing::ScopedTrace trace("file.cc", 123, "message");
>+//
>+class GTEST_API_ ScopedTrace {
>+ public:
>+ // The c'tor pushes the given source file location and message onto
>+ // a trace stack maintained by Google Test.
>+
>+ // Template version. Uses Message() to convert the values into strings.
>+ // Slow, but flexible.
>+ template <typename T>
>+ ScopedTrace(const char* file, int line, const T& message) {
>+ PushTrace(file, line, (Message() << message).GetString());
>+ }
>+
>+ // Optimize for some known types.
>+ ScopedTrace(const char* file, int line, const char* message) {
>+ PushTrace(file, line, message ? message : "(null)");
>+ }
>+
>+#if GTEST_HAS_GLOBAL_STRING
>+ ScopedTrace(const char* file, int line, const ::string& message) {
>+ PushTrace(file, line, message);
>+ }
>+#endif
>+
>+ ScopedTrace(const char* file, int line, const std::string& message) {
>+ PushTrace(file, line, message);
>+ }
>+
>+ // The d'tor pops the info pushed by the c'tor.
>+ //
>+ // Note that the d'tor is not virtual in order to be efficient.
>+ // Don't inherit from ScopedTrace!
>+ ~ScopedTrace();
>+
>+ private:
>+ void PushTrace(const char* file, int line, std::string message);
>+
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedTrace);
>+} GTEST_ATTRIBUTE_UNUSED_; // A ScopedTrace object does its job in its
>+ // c'tor and d'tor. Therefore it doesn't
>+ // need to be used otherwise.
>+
> // Causes a trace (including the source file path, the current line
> // number, and the given message) to be included in every test failure
> // message generated by code in the current scope. The effect is
>@@ -1922,20 +2199,14 @@ GTEST_API_ AssertionResult DoubleLE(const char* expr1, const char* expr2,
> // of the dummy variable name, thus allowing multiple SCOPED_TRACE()s
> // to appear in the same block - as long as they are on different
> // lines.
>+//
>+// Assuming that each thread maintains its own stack of traces.
>+// Therefore, a SCOPED_TRACE() would (correctly) only affect the
>+// assertions in its own thread.
> #define SCOPED_TRACE(message) \
>- ::testing::internal::ScopedTrace GTEST_CONCAT_TOKEN_(gtest_trace_, __LINE__)(\
>- __FILE__, __LINE__, ::testing::Message() << (message))
>-
>-namespace internal {
>-
>-// This template is declared, but intentionally undefined.
>-template <typename T1, typename T2>
>-struct StaticAssertTypeEqHelper;
>-
>-template <typename T>
>-struct StaticAssertTypeEqHelper<T, T> {};
>+ ::testing::ScopedTrace GTEST_CONCAT_TOKEN_(gtest_trace_, __LINE__)(\
>+ __FILE__, __LINE__, (message))
> 
>-} // namespace internal
> 
> // Compile-time assertion for type equality.
> // StaticAssertTypeEq<type1, type2>() compiles iff type1 and type2 are
>@@ -1969,7 +2240,7 @@ struct StaticAssertTypeEqHelper<T, T> {};
> // to cause a compiler error.
> template <typename T1, typename T2>
> bool StaticAssertTypeEq() {
>- internal::StaticAssertTypeEqHelper<T1, T2>();
>+ (void)internal::StaticAssertTypeEqHelper<T1, T2>();
> return true;
> }
> 
>@@ -1981,8 +2252,8 @@ bool StaticAssertTypeEq() {
> // The convention is to end the test case name with "Test". For
> // example, a test case for the Foo class can be named FooTest.
> //
>-// The user should put his test code between braces after using this
>-// macro. Example:
>+// Test code should appear between braces after an invocation of
>+// this macro. Example:
> //
> // TEST(FooTest, InitializesCorrectly) {
> // Foo foo;
>@@ -2005,7 +2276,7 @@ bool StaticAssertTypeEq() {
> // Define this macro to 1 to omit the definition of TEST(), which
> // is a generic name and clashes with some other libraries.
> #if !GTEST_DONT_DEFINE_TEST
>-#define TEST(test_case_name, test_name) GTEST_TEST(test_case_name, test_name)
>+# define TEST(test_case_name, test_name) GTEST_TEST(test_case_name, test_name)
> #endif
> 
> // Defines a test that uses a test fixture.
>@@ -2015,7 +2286,7 @@ bool StaticAssertTypeEq() {
> // name of the test within the test case.
> //
> // A test fixture class must be declared earlier. The user should put
>-// his test code between braces after using this macro. Example:
>+// the test code between braces after using this macro. Example:
> //
> // class FooTest : public testing::Test {
> // protected:
>@@ -2030,23 +2301,38 @@ bool StaticAssertTypeEq() {
> // }
> //
> // TEST_F(FooTest, ReturnsElementCountCorrectly) {
>-// EXPECT_EQ(0, a_.size());
>-// EXPECT_EQ(1, b_.size());
>+// EXPECT_EQ(a_.size(), 0);
>+// EXPECT_EQ(b_.size(), 1);
> // }
> 
> #define TEST_F(test_fixture, test_name)\
> GTEST_TEST_(test_fixture, test_name, test_fixture, \
> ::testing::internal::GetTypeId<test_fixture>())
> 
>-// Use this macro in main() to run all tests. It returns 0 if all
>+// Returns a path to temporary directory.
>+// Tries to determine an appropriate directory for the platform.
>+GTEST_API_ std::string TempDir();
>+
>+#ifdef _MSC_VER
>+# pragma warning(pop)
>+#endif
>+
>+} // namespace testing
>+
>+// Use this function in main() to run all tests. It returns 0 if all
> // tests are successful, or 1 otherwise.
> //
> // RUN_ALL_TESTS() should be invoked after the command line has been
> // parsed by InitGoogleTest().
>+//
>+// This function was formerly a macro; thus, it is in the global
>+// namespace and has an all-caps name.
>+int RUN_ALL_TESTS() GTEST_MUST_USE_RESULT_;
> 
>-#define RUN_ALL_TESTS()\
>- (::testing::UnitTest::GetInstance()->Run())
>+inline int RUN_ALL_TESTS() {
>+ return ::testing::UnitTest::GetInstance()->Run();
>+}
> 
>-} // namespace testing
>+GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251
> 
> #endif // GTEST_INCLUDE_GTEST_GTEST_H_
>diff --git a/Source/ThirdParty/gtest/include/gtest/gtest_pred_impl.h b/Source/ThirdParty/gtest/include/gtest/gtest_pred_impl.h
>index e1e2f8c4c887a8defcb758ca0caab3b7ceb9d41a..0c1105cb8eb2ef7c2616e67ff5556aab29ff2d1d 100644
>--- a/Source/ThirdParty/gtest/include/gtest/gtest_pred_impl.h
>+++ b/Source/ThirdParty/gtest/include/gtest/gtest_pred_impl.h
>@@ -27,18 +27,19 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
>-// This file is AUTOMATICALLY GENERATED on 10/02/2008 by command
>+// This file is AUTOMATICALLY GENERATED on 01/02/2018 by command
> // 'gen_gtest_pred_impl.py 5'. DO NOT EDIT BY HAND!
> //
> // Implements a family of generic predicate assertion macros.
> 
>+// GOOGLETEST_CM0001 DO NOT DELETE
>+
> #ifndef GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
> #define GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
> 
>-// Makes sure this header is not included before gtest.h.
>-#ifndef GTEST_INCLUDE_GTEST_GTEST_H_
>-#error Do not include gtest_pred_impl.h directly. Include gtest.h instead.
>-#endif // GTEST_INCLUDE_GTEST_GTEST_H_
>+#include "gtest/gtest.h"
>+
>+namespace testing {
> 
> // This header implements a family of generic predicate assertion
> // macros:
>@@ -66,8 +67,6 @@
> // We also define the EXPECT_* variations.
> //
> // For now we only support predicates whose arity is at most 5.
>-// Please email googletestframework@googlegroups.com if you need
>-// support for higher arities.
> 
> // GTEST_ASSERT_ is the basic statement to which all of the assertions
> // in this file reduce. Don't use this in your code.
>@@ -90,17 +89,15 @@ AssertionResult AssertPred1Helper(const char* pred_text,
> const T1& v1) {
> if (pred(v1)) return AssertionSuccess();
> 
>- Message msg;
>- msg << pred_text << "("
>- << e1 << ") evaluates to false, where"
>- << "\n" << e1 << " evaluates to " << v1;
>- return AssertionFailure(msg);
>+ return AssertionFailure() << pred_text << "("
>+ << e1 << ") evaluates to false, where"
>+ << "\n" << e1 << " evaluates to " << v1;
> }
> 
> // Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT1.
> // Don't use this in your code.
> #define GTEST_PRED_FORMAT1_(pred_format, v1, on_failure)\
>- GTEST_ASSERT_(pred_format(#v1, v1),\
>+ GTEST_ASSERT_(pred_format(#v1, v1), \
> on_failure)
> 
> // Internal macro for implementing {EXPECT|ASSERT}_PRED1. Don't use
>@@ -136,19 +133,17 @@ AssertionResult AssertPred2Helper(const char* pred_text,
> const T2& v2) {
> if (pred(v1, v2)) return AssertionSuccess();
> 
>- Message msg;
>- msg << pred_text << "("
>- << e1 << ", "
>- << e2 << ") evaluates to false, where"
>- << "\n" << e1 << " evaluates to " << v1
>- << "\n" << e2 << " evaluates to " << v2;
>- return AssertionFailure(msg);
>+ return AssertionFailure() << pred_text << "("
>+ << e1 << ", "
>+ << e2 << ") evaluates to false, where"
>+ << "\n" << e1 << " evaluates to " << v1
>+ << "\n" << e2 << " evaluates to " << v2;
> }
> 
> // Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT2.
> // Don't use this in your code.
> #define GTEST_PRED_FORMAT2_(pred_format, v1, v2, on_failure)\
>- GTEST_ASSERT_(pred_format(#v1, #v2, v1, v2),\
>+ GTEST_ASSERT_(pred_format(#v1, #v2, v1, v2), \
> on_failure)
> 
> // Internal macro for implementing {EXPECT|ASSERT}_PRED2. Don't use
>@@ -189,21 +184,19 @@ AssertionResult AssertPred3Helper(const char* pred_text,
> const T3& v3) {
> if (pred(v1, v2, v3)) return AssertionSuccess();
> 
>- Message msg;
>- msg << pred_text << "("
>- << e1 << ", "
>- << e2 << ", "
>- << e3 << ") evaluates to false, where"
>- << "\n" << e1 << " evaluates to " << v1
>- << "\n" << e2 << " evaluates to " << v2
>- << "\n" << e3 << " evaluates to " << v3;
>- return AssertionFailure(msg);
>+ return AssertionFailure() << pred_text << "("
>+ << e1 << ", "
>+ << e2 << ", "
>+ << e3 << ") evaluates to false, where"
>+ << "\n" << e1 << " evaluates to " << v1
>+ << "\n" << e2 << " evaluates to " << v2
>+ << "\n" << e3 << " evaluates to " << v3;
> }
> 
> // Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT3.
> // Don't use this in your code.
> #define GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, on_failure)\
>- GTEST_ASSERT_(pred_format(#v1, #v2, #v3, v1, v2, v3),\
>+ GTEST_ASSERT_(pred_format(#v1, #v2, #v3, v1, v2, v3), \
> on_failure)
> 
> // Internal macro for implementing {EXPECT|ASSERT}_PRED3. Don't use
>@@ -249,23 +242,21 @@ AssertionResult AssertPred4Helper(const char* pred_text,
> const T4& v4) {
> if (pred(v1, v2, v3, v4)) return AssertionSuccess();
> 
>- Message msg;
>- msg << pred_text << "("
>- << e1 << ", "
>- << e2 << ", "
>- << e3 << ", "
>- << e4 << ") evaluates to false, where"
>- << "\n" << e1 << " evaluates to " << v1
>- << "\n" << e2 << " evaluates to " << v2
>- << "\n" << e3 << " evaluates to " << v3
>- << "\n" << e4 << " evaluates to " << v4;
>- return AssertionFailure(msg);
>+ return AssertionFailure() << pred_text << "("
>+ << e1 << ", "
>+ << e2 << ", "
>+ << e3 << ", "
>+ << e4 << ") evaluates to false, where"
>+ << "\n" << e1 << " evaluates to " << v1
>+ << "\n" << e2 << " evaluates to " << v2
>+ << "\n" << e3 << " evaluates to " << v3
>+ << "\n" << e4 << " evaluates to " << v4;
> }
> 
> // Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT4.
> // Don't use this in your code.
> #define GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, on_failure)\
>- GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, v1, v2, v3, v4),\
>+ GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, v1, v2, v3, v4), \
> on_failure)
> 
> // Internal macro for implementing {EXPECT|ASSERT}_PRED4. Don't use
>@@ -316,25 +307,23 @@ AssertionResult AssertPred5Helper(const char* pred_text,
> const T5& v5) {
> if (pred(v1, v2, v3, v4, v5)) return AssertionSuccess();
> 
>- Message msg;
>- msg << pred_text << "("
>- << e1 << ", "
>- << e2 << ", "
>- << e3 << ", "
>- << e4 << ", "
>- << e5 << ") evaluates to false, where"
>- << "\n" << e1 << " evaluates to " << v1
>- << "\n" << e2 << " evaluates to " << v2
>- << "\n" << e3 << " evaluates to " << v3
>- << "\n" << e4 << " evaluates to " << v4
>- << "\n" << e5 << " evaluates to " << v5;
>- return AssertionFailure(msg);
>+ return AssertionFailure() << pred_text << "("
>+ << e1 << ", "
>+ << e2 << ", "
>+ << e3 << ", "
>+ << e4 << ", "
>+ << e5 << ") evaluates to false, where"
>+ << "\n" << e1 << " evaluates to " << v1
>+ << "\n" << e2 << " evaluates to " << v2
>+ << "\n" << e3 << " evaluates to " << v3
>+ << "\n" << e4 << " evaluates to " << v4
>+ << "\n" << e5 << " evaluates to " << v5;
> }
> 
> // Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT5.
> // Don't use this in your code.
> #define GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, on_failure)\
>- GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, #v5, v1, v2, v3, v4, v5),\
>+ GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, #v5, v1, v2, v3, v4, v5), \
> on_failure)
> 
> // Internal macro for implementing {EXPECT|ASSERT}_PRED5. Don't use
>@@ -365,4 +354,6 @@ AssertionResult AssertPred5Helper(const char* pred_text,
> 
> 
> 
>+} // namespace testing
>+
> #endif // GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
>diff --git a/Source/ThirdParty/gtest/include/gtest/gtest_prod.h b/Source/ThirdParty/gtest/include/gtest/gtest_prod.h
>index da80ddc6c70ee2dc773ed6765a4f89dfa8cb38e8..e651671ebde859fc731b5459bdc0661af0757cb6 100644
>--- a/Source/ThirdParty/gtest/include/gtest/gtest_prod.h
>+++ b/Source/ThirdParty/gtest/include/gtest/gtest_prod.h
>@@ -26,10 +26,10 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
> //
>-// Author: wan@google.com (Zhanyong Wan)
>-//
>-// Google C++ Testing Framework definitions useful in production code.
>+// Google C++ Testing and Mocking Framework definitions useful in production code.
>+// GOOGLETEST_CM0003 DO NOT DELETE
> 
> #ifndef GTEST_INCLUDE_GTEST_GTEST_PROD_H_
> #define GTEST_INCLUDE_GTEST_GTEST_PROD_H_
>@@ -40,17 +40,20 @@
> //
> // class MyClass {
> // private:
>-// void MyMethod();
>-// FRIEND_TEST(MyClassTest, MyMethod);
>+// void PrivateMethod();
>+// FRIEND_TEST(MyClassTest, PrivateMethodWorks);
> // };
> //
> // class MyClassTest : public testing::Test {
> // // ...
> // };
> //
>-// TEST_F(MyClassTest, MyMethod) {
>-// // Can call MyClass::MyMethod() here.
>+// TEST_F(MyClassTest, PrivateMethodWorks) {
>+// // Can call MyClass::PrivateMethod() here.
> // }
>+//
>+// Note: The test class must be in the same namespace as the class being tested.
>+// For example, putting MyClassTest in an anonymous namespace will not work.
> 
> #define FRIEND_TEST(test_case_name, test_name)\
> friend class test_case_name##_##test_name##_Test
>diff --git a/Source/ThirdParty/gtest/include/gtest/internal/custom/README.md b/Source/ThirdParty/gtest/include/gtest/internal/custom/README.md
>new file mode 100644
>index 0000000000000000000000000000000000000000..ff391fb4e2b5765cac8c6943359b15bbd5f4f149
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/include/gtest/internal/custom/README.md
>@@ -0,0 +1,56 @@
>+# Customization Points
>+
>+The custom directory is an injection point for custom user configurations.
>+
>+## Header `gtest.h`
>+
>+### The following macros can be defined:
>+
>+* `GTEST_OS_STACK_TRACE_GETTER_` - The name of an implementation of
>+ `OsStackTraceGetterInterface`.
>+* `GTEST_CUSTOM_TEMPDIR_FUNCTION_` - An override for `testing::TempDir()`. See
>+ `testing::TempDir` for semantics and signature.
>+
>+## Header `gtest-port.h`
>+
>+The following macros can be defined:
>+
>+### Flag related macros:
>+
>+* `GTEST_FLAG(flag_name)`
>+* `GTEST_USE_OWN_FLAGFILE_FLAG_` - Define to 0 when the system provides its
>+ own flagfile flag parsing.
>+* `GTEST_DECLARE_bool_(name)`
>+* `GTEST_DECLARE_int32_(name)`
>+* `GTEST_DECLARE_string_(name)`
>+* `GTEST_DEFINE_bool_(name, default_val, doc)`
>+* `GTEST_DEFINE_int32_(name, default_val, doc)`
>+* `GTEST_DEFINE_string_(name, default_val, doc)`
>+
>+### Logging:
>+
>+* `GTEST_LOG_(severity)`
>+* `GTEST_CHECK_(condition)`
>+* Functions `LogToStderr()` and `FlushInfoLog()` have to be provided too.
>+
>+### Threading:
>+
>+* `GTEST_HAS_NOTIFICATION_` - Enabled if Notification is already provided.
>+* `GTEST_HAS_MUTEX_AND_THREAD_LOCAL_` - Enabled if `Mutex` and `ThreadLocal`
>+ are already provided. Must also provide `GTEST_DECLARE_STATIC_MUTEX_(mutex)`
>+ and `GTEST_DEFINE_STATIC_MUTEX_(mutex)`
>+* `GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks)`
>+* `GTEST_LOCK_EXCLUDED_(locks)`
>+
>+### Underlying library support features
>+
>+* `GTEST_HAS_CXXABI_H_`
>+
>+### Exporting API symbols:
>+
>+* `GTEST_API_` - Specifier for exported symbols.
>+
>+## Header `gtest-printers.h`
>+
>+* See documentation at `gtest/gtest-printers.h` for details on how to define a
>+ custom printer.
>diff --git a/Source/ThirdParty/gtest/include/gtest/internal/custom/gtest-port.h b/Source/ThirdParty/gtest/include/gtest/internal/custom/gtest-port.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..cd85d956d2dc17bd537f2142340bdf58f4737118
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/include/gtest/internal/custom/gtest-port.h
>@@ -0,0 +1,37 @@
>+// Copyright 2015, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+//
>+// Injection point for custom user configurations. See README for details
>+//
>+// ** Custom implementation starts here **
>+
>+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
>+#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
>+
>+#endif // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
>diff --git a/Source/ThirdParty/gtest/include/gtest/internal/custom/gtest-printers.h b/Source/ThirdParty/gtest/include/gtest/internal/custom/gtest-printers.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..eb4467abcabea7ff76f9d2d527387c9da810148b
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/include/gtest/internal/custom/gtest-printers.h
>@@ -0,0 +1,42 @@
>+// Copyright 2015, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+//
>+// This file provides an injection point for custom printers in a local
>+// installation of gTest.
>+// It will be included from gtest-printers.h and the overrides in this file
>+// will be visible to everyone.
>+//
>+// Injection point for custom user configurations. See README for details
>+//
>+// ** Custom implementation starts here **
>+
>+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
>+#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
>+
>+#endif // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
>diff --git a/Source/ThirdParty/gtest/include/gtest/internal/custom/gtest.h b/Source/ThirdParty/gtest/include/gtest/internal/custom/gtest.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..4c8e07be23f1fd6159afef2eefd7444034dd0604
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/include/gtest/internal/custom/gtest.h
>@@ -0,0 +1,37 @@
>+// Copyright 2015, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+//
>+// Injection point for custom user configurations. See README for details
>+//
>+// ** Custom implementation starts here **
>+
>+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_
>+#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_
>+
>+#endif // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_
>diff --git a/Source/ThirdParty/gtest/include/gtest/internal/gtest-death-test-internal.h b/Source/ThirdParty/gtest/include/gtest/internal/gtest-death-test-internal.h
>index e4330848d4eae570f280dac57cf00b29722c7d0c..0a9b42c8a572a87194c6510903e21ea2260fac5c 100644
>--- a/Source/ThirdParty/gtest/include/gtest/internal/gtest-death-test-internal.h
>+++ b/Source/ThirdParty/gtest/include/gtest/internal/gtest-death-test-internal.h
>@@ -27,17 +27,18 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> //
>-// Authors: wan@google.com (Zhanyong Wan), eefacm@gmail.com (Sean Mcafee)
>-//
>-// The Google C++ Testing Framework (Google Test)
>+// The Google C++ Testing and Mocking Framework (Google Test)
> //
> // This header file defines internal utilities needed for implementing
> // death tests. They are subject to change without notice.
>+// GOOGLETEST_CM0001 DO NOT DELETE
> 
> #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
> #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
> 
>-#include <gtest/internal/gtest-internal.h>
>+#include "gtest/internal/gtest-internal.h"
>+
>+#include <stdio.h>
> 
> namespace testing {
> namespace internal {
>@@ -51,6 +52,9 @@ const char kInternalRunDeathTestFlag[] = "internal_run_death_test";
> 
> #if GTEST_HAS_DEATH_TEST
> 
>+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
>+/* class A needs to have dll-interface to be used by clients of class B */)
>+
> // DeathTest is a class that hides much of the complexity of the
> // GTEST_DEATH_TEST_ macro. It is abstract; its static Create method
> // returns a concrete class that depends on the prevailing death test
>@@ -96,8 +100,12 @@ class GTEST_API_ DeathTest {
> // test, then wait for it to complete.
> enum TestRole { OVERSEE_TEST, EXECUTE_TEST };
> 
>- // An enumeration of the two reasons that a test might be aborted.
>- enum AbortReason { TEST_ENCOUNTERED_RETURN_STATEMENT, TEST_DID_NOT_DIE };
>+ // An enumeration of the three reasons that a test might be aborted.
>+ enum AbortReason {
>+ TEST_ENCOUNTERED_RETURN_STATEMENT,
>+ TEST_THREW_EXCEPTION,
>+ TEST_DID_NOT_DIE
>+ };
> 
> // Assumes one of the above roles.
> virtual TestRole AssumeRole() = 0;
>@@ -121,15 +129,17 @@ class GTEST_API_ DeathTest {
> // the last death test.
> static const char* LastMessage();
> 
>- static void set_last_death_test_message(const String& message);
>+ static void set_last_death_test_message(const std::string& message);
> 
> private:
> // A string containing a description of the outcome of the last death test.
>- static String last_death_test_message_;
>+ static std::string last_death_test_message_;
> 
> GTEST_DISALLOW_COPY_AND_ASSIGN_(DeathTest);
> };
> 
>+GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251
>+
> // Factory interface for death tests. May be mocked out for testing.
> class DeathTestFactory {
> public:
>@@ -149,9 +159,34 @@ class DefaultDeathTestFactory : public DeathTestFactory {
> // by a signal, or exited normally with a nonzero exit code.
> GTEST_API_ bool ExitedUnsuccessfully(int exit_status);
> 
>+// Traps C++ exceptions escaping statement and reports them as test
>+// failures. Note that trapping SEH exceptions is not implemented here.
>+# if GTEST_HAS_EXCEPTIONS
>+# define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \
>+ try { \
>+ GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
>+ } catch (const ::std::exception& gtest_exception) { \
>+ fprintf(\
>+ stderr, \
>+ "\n%s: Caught std::exception-derived exception escaping the " \
>+ "death test statement. Exception message: %s\n", \
>+ ::testing::internal::FormatFileLocation(__FILE__, __LINE__).c_str(), \
>+ gtest_exception.what()); \
>+ fflush(stderr); \
>+ death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \
>+ } catch (...) { \
>+ death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \
>+ }
>+
>+# else
>+# define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \
>+ GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement)
>+
>+# endif
>+
> // This macro is for implementing ASSERT_DEATH*, EXPECT_DEATH*,
> // ASSERT_EXIT*, and EXPECT_EXIT*.
>-#define GTEST_DEATH_TEST_(statement, predicate, regex, fail) \
>+# define GTEST_DEATH_TEST_(statement, predicate, regex, fail) \
> GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
> if (::testing::internal::AlwaysTrue()) { \
> const ::testing::internal::RE& gtest_regex = (regex); \
>@@ -172,10 +207,12 @@ GTEST_API_ bool ExitedUnsuccessfully(int exit_status);
> case ::testing::internal::DeathTest::EXECUTE_TEST: { \
> ::testing::internal::DeathTest::ReturnSentinel \
> gtest_sentinel(gtest_dt); \
>- GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
>+ GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, gtest_dt); \
> gtest_dt->Abort(::testing::internal::DeathTest::TEST_DID_NOT_DIE); \
> break; \
> } \
>+ default: \
>+ break; \
> } \
> } \
> } else \
>@@ -184,12 +221,27 @@ GTEST_API_ bool ExitedUnsuccessfully(int exit_status);
> // The symbol "fail" here expands to something into which a message
> // can be streamed.
> 
>+// This macro is for implementing ASSERT/EXPECT_DEBUG_DEATH when compiled in
>+// NDEBUG mode. In this case we need the statements to be executed and the macro
>+// must accept a streamed message even though the message is never printed.
>+// The regex object is not evaluated, but it is used to prevent "unused"
>+// warnings and to avoid an expression that doesn't compile in debug mode.
>+#define GTEST_EXECUTE_STATEMENT_(statement, regex) \
>+ GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
>+ if (::testing::internal::AlwaysTrue()) { \
>+ GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
>+ } else if (!::testing::internal::AlwaysTrue()) { \
>+ const ::testing::internal::RE& gtest_regex = (regex); \
>+ static_cast<void>(gtest_regex); \
>+ } else \
>+ ::testing::Message()
>+
> // A class representing the parsed contents of the
> // --gtest_internal_run_death_test flag, as it existed when
> // RUN_ALL_TESTS was called.
> class InternalRunDeathTestFlag {
> public:
>- InternalRunDeathTestFlag(const String& a_file,
>+ InternalRunDeathTestFlag(const std::string& a_file,
> int a_line,
> int an_index,
> int a_write_fd)
>@@ -201,13 +253,13 @@ class InternalRunDeathTestFlag {
> posix::Close(write_fd_);
> }
> 
>- String file() const { return file_; }
>+ const std::string& file() const { return file_; }
> int line() const { return line_; }
> int index() const { return index_; }
> int write_fd() const { return write_fd_; }
> 
> private:
>- String file_;
>+ std::string file_;
> int line_;
> int index_;
> int write_fd_;
>@@ -220,53 +272,6 @@ class InternalRunDeathTestFlag {
> // the flag is specified; otherwise returns NULL.
> InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag();
> 
>-#else // GTEST_HAS_DEATH_TEST
>-
>-// This macro is used for implementing macros such as
>-// EXPECT_DEATH_IF_SUPPORTED and ASSERT_DEATH_IF_SUPPORTED on systems where
>-// death tests are not supported. Those macros must compile on such systems
>-// iff EXPECT_DEATH and ASSERT_DEATH compile with the same parameters on
>-// systems that support death tests. This allows one to write such a macro
>-// on a system that does not support death tests and be sure that it will
>-// compile on a death-test supporting system.
>-//
>-// Parameters:
>-// statement - A statement that a macro such as EXPECT_DEATH would test
>-// for program termination. This macro has to make sure this
>-// statement is compiled but not executed, to ensure that
>-// EXPECT_DEATH_IF_SUPPORTED compiles with a certain
>-// parameter iff EXPECT_DEATH compiles with it.
>-// regex - A regex that a macro such as EXPECT_DEATH would use to test
>-// the output of statement. This parameter has to be
>-// compiled but not evaluated by this macro, to ensure that
>-// this macro only accepts expressions that a macro such as
>-// EXPECT_DEATH would accept.
>-// terminator - Must be an empty statement for EXPECT_DEATH_IF_SUPPORTED
>-// and a return statement for ASSERT_DEATH_IF_SUPPORTED.
>-// This ensures that ASSERT_DEATH_IF_SUPPORTED will not
>-// compile inside functions where ASSERT_DEATH doesn't
>-// compile.
>-//
>-// The branch that has an always false condition is used to ensure that
>-// statement and regex are compiled (and thus syntactically correct) but
>-// never executed. The unreachable code macro protects the terminator
>-// statement from generating an 'unreachable code' warning in case
>-// statement unconditionally returns or throws. The Message constructor at
>-// the end allows the syntax of streaming additional messages into the
>-// macro, for compilational compatibility with EXPECT_DEATH/ASSERT_DEATH.
>-#define GTEST_UNSUPPORTED_DEATH_TEST_(statement, regex, terminator) \
>- GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
>- if (::testing::internal::AlwaysTrue()) { \
>- GTEST_LOG_(WARNING) \
>- << "Death tests are not supported on this platform.\n" \
>- << "Statement '" #statement "' cannot be verified."; \
>- } else if (::testing::internal::AlwaysFalse()) { \
>- ::testing::internal::RE::PartialMatch(".*", (regex)); \
>- GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
>- terminator; \
>- } else \
>- ::testing::Message()
>-
> #endif // GTEST_HAS_DEATH_TEST
> 
> } // namespace internal
>diff --git a/Source/ThirdParty/gtest/include/gtest/internal/gtest-filepath.h b/Source/ThirdParty/gtest/include/gtest/internal/gtest-filepath.h
>index 4b76d79506b026aba3716472fc43cefc1a7e388a..ae38d95bf844fa9dc21739cf821276d5b3417e3a 100644
>--- a/Source/ThirdParty/gtest/include/gtest/internal/gtest-filepath.h
>+++ b/Source/ThirdParty/gtest/include/gtest/internal/gtest-filepath.h
>@@ -27,20 +27,23 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> //
>-// Author: keith.ray@gmail.com (Keith Ray)
>-//
> // Google Test filepath utilities
> //
> // This header file declares classes and functions used internally by
> // Google Test. They are subject to change without notice.
> //
>-// This file is #included in <gtest/internal/gtest-internal.h>.
>+// This file is #included in gtest/internal/gtest-internal.h.
> // Do not include this header file separately!
> 
>+// GOOGLETEST_CM0001 DO NOT DELETE
>+
> #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
> #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
> 
>-#include <gtest/internal/gtest-string.h>
>+#include "gtest/internal/gtest-string.h"
>+
>+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
>+/* class A needs to have dll-interface to be used by clients of class B */)
> 
> namespace testing {
> namespace internal {
>@@ -61,11 +64,7 @@ class GTEST_API_ FilePath {
> FilePath() : pathname_("") { }
> FilePath(const FilePath& rhs) : pathname_(rhs.pathname_) { }
> 
>- explicit FilePath(const char* pathname) : pathname_(pathname) {
>- Normalize();
>- }
>-
>- explicit FilePath(const String& pathname) : pathname_(pathname) {
>+ explicit FilePath(const std::string& pathname) : pathname_(pathname) {
> Normalize();
> }
> 
>@@ -78,7 +77,7 @@ class GTEST_API_ FilePath {
> pathname_ = rhs.pathname_;
> }
> 
>- String ToString() const { return pathname_; }
>+ const std::string& string() const { return pathname_; }
> const char* c_str() const { return pathname_.c_str(); }
> 
> // Returns the current working directory, or "" if unsuccessful.
>@@ -111,8 +110,8 @@ class GTEST_API_ FilePath {
> const FilePath& base_name,
> const char* extension);
> 
>- // Returns true iff the path is NULL or "".
>- bool IsEmpty() const { return c_str() == NULL || *c_str() == '\0'; }
>+ // Returns true iff the path is "".
>+ bool IsEmpty() const { return pathname_.empty(); }
> 
> // If input name has a trailing separator character, removes it and returns
> // the name, otherwise return the name string unmodified.
>@@ -201,10 +200,12 @@ class GTEST_API_ FilePath {
> // separators. Returns NULL if no path separator was found.
> const char* FindLastPathSeparator() const;
> 
>- String pathname_;
>+ std::string pathname_;
> }; // class FilePath
> 
> } // namespace internal
> } // namespace testing
> 
>+GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251
>+
> #endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
>diff --git a/Source/ThirdParty/gtest/include/gtest/internal/gtest-internal.h b/Source/ThirdParty/gtest/include/gtest/internal/gtest-internal.h
>index 31a66e99d3c482151e40fc35a40270069032a1d5..b762f61fc53c3db9cfb753940d91b5d54ab36357 100644
>--- a/Source/ThirdParty/gtest/include/gtest/internal/gtest-internal.h
>+++ b/Source/ThirdParty/gtest/include/gtest/internal/gtest-internal.h
>@@ -27,34 +27,43 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> //
>-// Authors: wan@google.com (Zhanyong Wan), eefacm@gmail.com (Sean Mcafee)
>-//
>-// The Google C++ Testing Framework (Google Test)
>+// The Google C++ Testing and Mocking Framework (Google Test)
> //
> // This header file declares functions and macros used internally by
> // Google Test. They are subject to change without notice.
> 
>+// GOOGLETEST_CM0001 DO NOT DELETE
>+
> #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
> #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
> 
>-#include <gtest/internal/gtest-port.h>
>+#include "gtest/internal/gtest-port.h"
> 
> #if GTEST_OS_LINUX
>-#include <stdlib.h>
>-#include <sys/types.h>
>-#include <sys/wait.h>
>-#include <unistd.h>
>+# include <stdlib.h>
>+# include <sys/types.h>
>+# include <sys/wait.h>
>+# include <unistd.h>
> #endif // GTEST_OS_LINUX
> 
>+#if GTEST_HAS_EXCEPTIONS
>+# include <stdexcept>
>+#endif
>+
> #include <ctype.h>
>+#include <float.h>
> #include <string.h>
> #include <iomanip>
> #include <limits>
>+#include <map>
> #include <set>
>+#include <string>
>+#include <vector>
> 
>-#include <gtest/internal/gtest-string.h>
>-#include <gtest/internal/gtest-filepath.h>
>-#include <gtest/internal/gtest-type-util.h>
>+#include "gtest/gtest-message.h"
>+#include "gtest/internal/gtest-filepath.h"
>+#include "gtest/internal/gtest-string.h"
>+#include "gtest/internal/gtest-type-util.h"
> 
> // Due to C++ preprocessor weirdness, we need double indirection to
> // concatenate two tokens when one of them is __LINE__. Writing
>@@ -67,39 +76,15 @@
> #define GTEST_CONCAT_TOKEN_(foo, bar) GTEST_CONCAT_TOKEN_IMPL_(foo, bar)
> #define GTEST_CONCAT_TOKEN_IMPL_(foo, bar) foo ## bar
> 
>-// Google Test defines the testing::Message class to allow construction of
>-// test messages via the << operator. The idea is that anything
>-// streamable to std::ostream can be streamed to a testing::Message.
>-// This allows a user to use his own types in Google Test assertions by
>-// overloading the << operator.
>-//
>-// util/gtl/stl_logging-inl.h overloads << for STL containers. These
>-// overloads cannot be defined in the std namespace, as that will be
>-// undefined behavior. Therefore, they are defined in the global
>-// namespace instead.
>-//
>-// C++'s symbol lookup rule (i.e. Koenig lookup) says that these
>-// overloads are visible in either the std namespace or the global
>-// namespace, but not other namespaces, including the testing
>-// namespace which Google Test's Message class is in.
>-//
>-// To allow STL containers (and other types that has a << operator
>-// defined in the global namespace) to be used in Google Test assertions,
>-// testing::Message must access the custom << operator from the global
>-// namespace. Hence this helper function.
>-//
>-// Note: Jeffrey Yasskin suggested an alternative fix by "using
>-// ::operator<<;" in the definition of Message's operator<<. That fix
>-// doesn't require a helper function, but unfortunately doesn't
>-// compile with MSVC.
>-template <typename T>
>-inline void GTestStreamToHelper(std::ostream* os, const T& val) {
>- *os << val;
>-}
>+// Stringifies its argument.
>+#define GTEST_STRINGIFY_(name) #name
>+
>+class ProtocolMessage;
>+namespace proto2 { class Message; }
> 
> namespace testing {
> 
>-// Forward declaration of classes.
>+// Forward declarations.
> 
> class AssertionResult; // Result of an assertion.
> class Message; // Represents a failure message.
>@@ -108,25 +93,19 @@ class TestInfo; // Information about a test.
> class TestPartResult; // Result of a test part.
> class UnitTest; // A collection of test cases.
> 
>+template <typename T>
>+::std::string PrintToString(const T& value);
>+
> namespace internal {
> 
> struct TraceInfo; // Information about a trace point.
>-class ScopedTrace; // Implements scoped trace.
> class TestInfoImpl; // Opaque implementation of TestInfo
> class UnitTestImpl; // Opaque implementation of UnitTest
> 
>-// How many times InitGoogleTest() has been called.
>-extern int g_init_gtest_count;
>-
> // The text used in failure messages to indicate the start of the
> // stack trace.
> GTEST_API_ extern const char kStackTraceMarker[];
> 
>-// A secret type that Google Test users don't know about. It has no
>-// definition on purpose. Therefore it's impossible to create a
>-// Secret object, which is what we want.
>-class Secret;
>-
> // Two overloaded helpers for checking at compile time whether an
> // expression is a null pointer literal (i.e. NULL or any 0-valued
> // compile-time integral constant). Their return values have
>@@ -150,127 +129,65 @@ char (&IsNullLiteralHelper(...))[2]; // NOLINT
> #ifdef GTEST_ELLIPSIS_NEEDS_POD_
> // We lose support for NULL detection where the compiler doesn't like
> // passing non-POD classes through ellipsis (...).
>-#define GTEST_IS_NULL_LITERAL_(x) false
>+# define GTEST_IS_NULL_LITERAL_(x) false
> #else
>-#define GTEST_IS_NULL_LITERAL_(x) \
>+# define GTEST_IS_NULL_LITERAL_(x) \
> (sizeof(::testing::internal::IsNullLiteralHelper(x)) == 1)
> #endif // GTEST_ELLIPSIS_NEEDS_POD_
> 
> // Appends the user-supplied message to the Google-Test-generated message.
>-GTEST_API_ String AppendUserMessage(const String& gtest_msg,
>- const Message& user_msg);
>-
>-// A helper class for creating scoped traces in user programs.
>-class GTEST_API_ ScopedTrace {
>- public:
>- // The c'tor pushes the given source file location and message onto
>- // a trace stack maintained by Google Test.
>- ScopedTrace(const char* file, int line, const Message& message);
>-
>- // The d'tor pops the info pushed by the c'tor.
>- //
>- // Note that the d'tor is not virtual in order to be efficient.
>- // Don't inherit from ScopedTrace!
>- ~ScopedTrace();
>-
>- private:
>- GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedTrace);
>-} GTEST_ATTRIBUTE_UNUSED_; // A ScopedTrace object does its job in its
>- // c'tor and d'tor. Therefore it doesn't
>- // need to be used otherwise.
>-
>-// Converts a streamable value to a String. A NULL pointer is
>-// converted to "(null)". When the input value is a ::string,
>-// ::std::string, ::wstring, or ::std::wstring object, each NUL
>-// character in it is replaced with "\\0".
>-// Declared here but defined in gtest.h, so that it has access
>-// to the definition of the Message class, required by the ARM
>-// compiler.
>-template <typename T>
>-String StreamableToString(const T& streamable);
>-
>-// Formats a value to be used in a failure message.
>-
>-#ifdef GTEST_NEEDS_IS_POINTER_
>-
>-// These are needed as the Nokia Symbian and IBM XL C/C++ compilers
>-// cannot decide between const T& and const T* in a function template.
>-// These compilers _can_ decide between class template specializations
>-// for T and T*, so a tr1::type_traits-like is_pointer works, and we
>-// can overload on that.
>+GTEST_API_ std::string AppendUserMessage(
>+ const std::string& gtest_msg, const Message& user_msg);
> 
>-// This overload makes sure that all pointers (including
>-// those to char or wchar_t) are printed as raw pointers.
>-template <typename T>
>-inline String FormatValueForFailureMessage(internal::true_type /*dummy*/,
>- T* pointer) {
>- return StreamableToString(static_cast<const void*>(pointer));
>-}
>-
>-template <typename T>
>-inline String FormatValueForFailureMessage(internal::false_type /*dummy*/,
>- const T& value) {
>- return StreamableToString(value);
>-}
>+#if GTEST_HAS_EXCEPTIONS
> 
>-template <typename T>
>-inline String FormatForFailureMessage(const T& value) {
>- return FormatValueForFailureMessage(
>- typename internal::is_pointer<T>::type(), value);
>-}
>+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4275 \
>+/* an exported class was derived from a class that was not exported */)
> 
>-#else
>+// This exception is thrown by (and only by) a failed Google Test
>+// assertion when GTEST_FLAG(throw_on_failure) is true (if exceptions
>+// are enabled). We derive it from std::runtime_error, which is for
>+// errors presumably detectable only at run time. Since
>+// std::runtime_error inherits from std::exception, many testing
>+// frameworks know how to extract and print the message inside it.
>+class GTEST_API_ GoogleTestFailureException : public ::std::runtime_error {
>+ public:
>+ explicit GoogleTestFailureException(const TestPartResult& failure);
>+};
> 
>-// These are needed as the above solution using is_pointer has the
>-// limitation that T cannot be a type without external linkage, when
>-// compiled using MSVC.
>+GTEST_DISABLE_MSC_WARNINGS_POP_() // 4275
> 
>-template <typename T>
>-inline String FormatForFailureMessage(const T& value) {
>- return StreamableToString(value);
>-}
>+#endif // GTEST_HAS_EXCEPTIONS
> 
>-// This overload makes sure that all pointers (including
>-// those to char or wchar_t) are printed as raw pointers.
>-template <typename T>
>-inline String FormatForFailureMessage(T* pointer) {
>- return StreamableToString(static_cast<const void*>(pointer));
>-}
>+namespace edit_distance {
>+// Returns the optimal edits to go from 'left' to 'right'.
>+// All edits cost the same, with replace having lower priority than
>+// add/remove.
>+// Simple implementation of the Wagner-Fischer algorithm.
>+// See http://en.wikipedia.org/wiki/Wagner-Fischer_algorithm
>+enum EditType { kMatch, kAdd, kRemove, kReplace };
>+GTEST_API_ std::vector<EditType> CalculateOptimalEdits(
>+ const std::vector<size_t>& left, const std::vector<size_t>& right);
> 
>-#endif // GTEST_NEEDS_IS_POINTER_
>-
>-// These overloaded versions handle narrow and wide characters.
>-GTEST_API_ String FormatForFailureMessage(char ch);
>-GTEST_API_ String FormatForFailureMessage(wchar_t wchar);
>-
>-// When this operand is a const char* or char*, and the other operand
>-// is a ::std::string or ::string, we print this operand as a C string
>-// rather than a pointer. We do the same for wide strings.
>-
>-// This internal macro is used to avoid duplicated code.
>-#define GTEST_FORMAT_IMPL_(operand2_type, operand1_printer)\
>-inline String FormatForComparisonFailureMessage(\
>- operand2_type::value_type* str, const operand2_type& /*operand2*/) {\
>- return operand1_printer(str);\
>-}\
>-inline String FormatForComparisonFailureMessage(\
>- const operand2_type::value_type* str, const operand2_type& /*operand2*/) {\
>- return operand1_printer(str);\
>-}
>+// Same as above, but the input is represented as strings.
>+GTEST_API_ std::vector<EditType> CalculateOptimalEdits(
>+ const std::vector<std::string>& left,
>+ const std::vector<std::string>& right);
> 
>-GTEST_FORMAT_IMPL_(::std::string, String::ShowCStringQuoted)
>-#if GTEST_HAS_STD_WSTRING
>-GTEST_FORMAT_IMPL_(::std::wstring, String::ShowWideCStringQuoted)
>-#endif // GTEST_HAS_STD_WSTRING
>+// Create a diff of the input strings in Unified diff format.
>+GTEST_API_ std::string CreateUnifiedDiff(const std::vector<std::string>& left,
>+ const std::vector<std::string>& right,
>+ size_t context = 2);
> 
>-#if GTEST_HAS_GLOBAL_STRING
>-GTEST_FORMAT_IMPL_(::string, String::ShowCStringQuoted)
>-#endif // GTEST_HAS_GLOBAL_STRING
>-#if GTEST_HAS_GLOBAL_WSTRING
>-GTEST_FORMAT_IMPL_(::wstring, String::ShowWideCStringQuoted)
>-#endif // GTEST_HAS_GLOBAL_WSTRING
>+} // namespace edit_distance
> 
>-#undef GTEST_FORMAT_IMPL_
>+// Calculate the diff between 'left' and 'right' and return it in unified diff
>+// format.
>+// If not null, stores in 'total_line_count' the total number of lines found
>+// in left + right.
>+GTEST_API_ std::string DiffStrings(const std::string& left,
>+ const std::string& right,
>+ size_t* total_line_count);
> 
> // Constructs and returns the message for an equality assertion
> // (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure.
>@@ -289,12 +206,12 @@ GTEST_FORMAT_IMPL_(::wstring, String::ShowWideCStringQuoted)
> // be inserted into the message.
> GTEST_API_ AssertionResult EqFailure(const char* expected_expression,
> const char* actual_expression,
>- const String& expected_value,
>- const String& actual_value,
>+ const std::string& expected_value,
>+ const std::string& actual_value,
> bool ignoring_case);
> 
> // Constructs a failure message for Boolean assertions such as EXPECT_TRUE.
>-GTEST_API_ String GetBoolAssertionFailureMessage(
>+GTEST_API_ std::string GetBoolAssertionFailureMessage(
> const AssertionResult& assertion_result,
> const char* expression_text,
> const char* actual_predicate_value,
>@@ -369,7 +286,7 @@ class FloatingPoint {
> // bits. Therefore, 4 should be enough for ordinary use.
> //
> // See the following article for more details on ULP:
>- // http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm.
>+ // http://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/
> static const size_t kMaxUlps = 4;
> 
> // Constructs a FloatingPoint from a raw floating-point number.
>@@ -396,6 +313,9 @@ class FloatingPoint {
> return ReinterpretBits(kExponentBitMask);
> }
> 
>+ // Returns the maximum representable finite floating-point number.
>+ static RawType Max();
>+
> // Non-static methods
> 
> // Returns the bits that represents this number.
>@@ -476,6 +396,13 @@ class FloatingPoint {
> FloatingPointUnion u_;
> };
> 
>+// We cannot use std::numeric_limits<T>::max() as it clashes with the max()
>+// macro defined by <windows.h>.
>+template <>
>+inline float FloatingPoint<float>::Max() { return FLT_MAX; }
>+template <>
>+inline double FloatingPoint<double>::Max() { return DBL_MAX; }
>+
> // Typedefs the instances of the FloatingPoint template class that we
> // care to use.
> typedef FloatingPoint<float> Float;
>@@ -558,24 +485,18 @@ GTEST_API_ AssertionResult IsHRESULTFailure(const char* expr,
> 
> #endif // GTEST_OS_WINDOWS
> 
>-// Formats a source file path and a line number as they would appear
>-// in a compiler error message.
>-inline String FormatFileLocation(const char* file, int line) {
>- const char* const file_name = file == NULL ? "unknown file" : file;
>- if (line < 0) {
>- return String::Format("%s:", file_name);
>- }
>-#ifdef _MSC_VER
>- return String::Format("%s(%d):", file_name, line);
>-#else
>- return String::Format("%s:%d:", file_name, line);
>-#endif // _MSC_VER
>-}
>-
> // Types of SetUpTestCase() and TearDownTestCase() functions.
> typedef void (*SetUpTestCaseFunc)();
> typedef void (*TearDownTestCaseFunc)();
> 
>+struct CodeLocation {
>+ CodeLocation(const std::string& a_file, int a_line)
>+ : file(a_file), line(a_line) {}
>+
>+ std::string file;
>+ int line;
>+};
>+
> // Creates a new TestInfo object and registers it with Google Test;
> // returns the created object.
> //
>@@ -583,10 +504,11 @@ typedef void (*TearDownTestCaseFunc)();
> //
> // test_case_name: name of the test case
> // name: name of the test
>-// test_case_comment: a comment on the test case that will be included in
>-// the test output
>-// comment: a comment on the test that will be included in the
>-// test output
>+// type_param the name of the test's type parameter, or NULL if
>+// this is not a typed or a type-parameterized test.
>+// value_param text representation of the test's value parameter,
>+// or NULL if this is not a type-parameterized test.
>+// code_location: code location where the test is defined
> // fixture_class_id: ID of the test fixture class
> // set_up_tc: pointer to the function that sets up the test case
> // tear_down_tc: pointer to the function that tears down the test case
>@@ -594,8 +516,11 @@ typedef void (*TearDownTestCaseFunc)();
> // The newly created TestInfo instance will assume
> // ownership of the factory object.
> GTEST_API_ TestInfo* MakeAndRegisterTestInfo(
>- const char* test_case_name, const char* name,
>- const char* test_case_comment, const char* comment,
>+ const char* test_case_name,
>+ const char* name,
>+ const char* type_param,
>+ const char* value_param,
>+ CodeLocation code_location,
> TypeId fixture_class_id,
> SetUpTestCaseFunc set_up_tc,
> TearDownTestCaseFunc tear_down_tc,
>@@ -604,10 +529,13 @@ GTEST_API_ TestInfo* MakeAndRegisterTestInfo(
> // If *pstr starts with the given prefix, modifies *pstr to be right
> // past the prefix and returns true; otherwise leaves *pstr unchanged
> // and returns false. None of pstr, *pstr, and prefix can be NULL.
>-bool SkipPrefix(const char* prefix, const char** pstr);
>+GTEST_API_ bool SkipPrefix(const char* prefix, const char** pstr);
> 
> #if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
> 
>+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
>+/* class A needs to have dll-interface to be used by clients of class B */)
>+
> // State of the definition of a type-parameterized test case.
> class GTEST_API_ TypedTestCasePState {
> public:
>@@ -625,10 +553,21 @@ class GTEST_API_ TypedTestCasePState {
> fflush(stderr);
> posix::Abort();
> }
>- defined_test_names_.insert(test_name);
>+ registered_tests_.insert(
>+ ::std::make_pair(test_name, CodeLocation(file, line)));
> return true;
> }
> 
>+ bool TestExists(const std::string& test_name) const {
>+ return registered_tests_.count(test_name) > 0;
>+ }
>+
>+ const CodeLocation& GetCodeLocation(const std::string& test_name) const {
>+ RegisteredTestsMap::const_iterator it = registered_tests_.find(test_name);
>+ GTEST_CHECK_(it != registered_tests_.end());
>+ return it->second;
>+ }
>+
> // Verifies that registered_tests match the test names in
> // defined_test_names_; returns registered_tests if successful, or
> // aborts the program otherwise.
>@@ -636,10 +575,14 @@ class GTEST_API_ TypedTestCasePState {
> const char* file, int line, const char* registered_tests);
> 
> private:
>+ typedef ::std::map<std::string, CodeLocation> RegisteredTestsMap;
>+
> bool registered_;
>- ::std::set<const char*> defined_test_names_;
>+ RegisteredTestsMap registered_tests_;
> };
> 
>+GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251
>+
> // Skips to the first non-space char after the first comma in 'str';
> // returns NULL if no comma is found in 'str'.
> inline const char* SkipComma(const char* str) {
>@@ -647,15 +590,51 @@ inline const char* SkipComma(const char* str) {
> if (comma == NULL) {
> return NULL;
> }
>- while (isspace(*(++comma))) {}
>+ while (IsSpace(*(++comma))) {}
> return comma;
> }
> 
> // Returns the prefix of 'str' before the first comma in it; returns
> // the entire string if it contains no comma.
>-inline String GetPrefixUntilComma(const char* str) {
>+inline std::string GetPrefixUntilComma(const char* str) {
> const char* comma = strchr(str, ',');
>- return comma == NULL ? String(str) : String(str, comma - str);
>+ return comma == NULL ? str : std::string(str, comma);
>+}
>+
>+// Splits a given string on a given delimiter, populating a given
>+// vector with the fields.
>+void SplitString(const ::std::string& str, char delimiter,
>+ ::std::vector< ::std::string>* dest);
>+
>+// The default argument to the template below for the case when the user does
>+// not provide a name generator.
>+struct DefaultNameGenerator {
>+ template <typename T>
>+ static std::string GetName(int i) {
>+ return StreamableToString(i);
>+ }
>+};
>+
>+template <typename Provided = DefaultNameGenerator>
>+struct NameGeneratorSelector {
>+ typedef Provided type;
>+};
>+
>+template <typename NameGenerator>
>+void GenerateNamesRecursively(Types0, std::vector<std::string>*, int) {}
>+
>+template <typename NameGenerator, typename Types>
>+void GenerateNamesRecursively(Types, std::vector<std::string>* result, int i) {
>+ result->push_back(NameGenerator::template GetName<typename Types::Head>(i));
>+ GenerateNamesRecursively<NameGenerator>(typename Types::Tail(), result,
>+ i + 1);
>+}
>+
>+template <typename NameGenerator, typename Types>
>+std::vector<std::string> GenerateNames() {
>+ std::vector<std::string> result;
>+ GenerateNamesRecursively<NameGenerator>(Types(), &result, 0);
>+ return result;
> }
> 
> // TypeParameterizedTest<Fixture, TestSel, Types>::Register()
>@@ -672,8 +651,10 @@ class TypeParameterizedTest {
> // specified in INSTANTIATE_TYPED_TEST_CASE_P(Prefix, TestCase,
> // Types). Valid values for 'index' are [0, N - 1] where N is the
> // length of Types.
>- static bool Register(const char* prefix, const char* case_name,
>- const char* test_names, int index) {
>+ static bool Register(const char* prefix, const CodeLocation& code_location,
>+ const char* case_name, const char* test_names, int index,
>+ const std::vector<std::string>& type_names =
>+ GenerateNames<DefaultNameGenerator, Types>()) {
> typedef typename Types::Head Type;
> typedef Fixture<Type> FixtureClass;
> typedef typename GTEST_BIND_(TestSel, Type) TestClass;
>@@ -681,19 +662,23 @@ class TypeParameterizedTest {
> // First, registers the first type-parameterized test in the type
> // list.
> MakeAndRegisterTestInfo(
>- String::Format("%s%s%s/%d", prefix, prefix[0] == '\0' ? "" : "/",
>- case_name, index).c_str(),
>- GetPrefixUntilComma(test_names).c_str(),
>- String::Format("TypeParam = %s", GetTypeName<Type>().c_str()).c_str(),
>- "",
>- GetTypeId<FixtureClass>(),
>- TestClass::SetUpTestCase,
>- TestClass::TearDownTestCase,
>- new TestFactoryImpl<TestClass>);
>+ (std::string(prefix) + (prefix[0] == '\0' ? "" : "/") + case_name +
>+ "/" + type_names[index])
>+ .c_str(),
>+ StripTrailingSpaces(GetPrefixUntilComma(test_names)).c_str(),
>+ GetTypeName<Type>().c_str(),
>+ NULL, // No value parameter.
>+ code_location, GetTypeId<FixtureClass>(), TestClass::SetUpTestCase,
>+ TestClass::TearDownTestCase, new TestFactoryImpl<TestClass>);
> 
> // Next, recurses (at compile time) with the tail of the type list.
>- return TypeParameterizedTest<Fixture, TestSel, typename Types::Tail>
>- ::Register(prefix, case_name, test_names, index + 1);
>+ return TypeParameterizedTest<Fixture, TestSel,
>+ typename Types::Tail>::Register(prefix,
>+ code_location,
>+ case_name,
>+ test_names,
>+ index + 1,
>+ type_names);
> }
> };
> 
>@@ -701,8 +686,11 @@ class TypeParameterizedTest {
> template <GTEST_TEMPLATE_ Fixture, class TestSel>
> class TypeParameterizedTest<Fixture, TestSel, Types0> {
> public:
>- static bool Register(const char* /*prefix*/, const char* /*case_name*/,
>- const char* /*test_names*/, int /*index*/) {
>+ static bool Register(const char* /*prefix*/, const CodeLocation&,
>+ const char* /*case_name*/, const char* /*test_names*/,
>+ int /*index*/,
>+ const std::vector<std::string>& =
>+ std::vector<std::string>() /*type_names*/) {
> return true;
> }
> };
>@@ -714,17 +702,35 @@ class TypeParameterizedTest<Fixture, TestSel, Types0> {
> template <GTEST_TEMPLATE_ Fixture, typename Tests, typename Types>
> class TypeParameterizedTestCase {
> public:
>- static bool Register(const char* prefix, const char* case_name,
>- const char* test_names) {
>+ static bool Register(const char* prefix, CodeLocation code_location,
>+ const TypedTestCasePState* state, const char* case_name,
>+ const char* test_names,
>+ const std::vector<std::string>& type_names =
>+ GenerateNames<DefaultNameGenerator, Types>()) {
>+ std::string test_name = StripTrailingSpaces(
>+ GetPrefixUntilComma(test_names));
>+ if (!state->TestExists(test_name)) {
>+ fprintf(stderr, "Failed to get code location for test %s.%s at %s.",
>+ case_name, test_name.c_str(),
>+ FormatFileLocation(code_location.file.c_str(),
>+ code_location.line).c_str());
>+ fflush(stderr);
>+ posix::Abort();
>+ }
>+ const CodeLocation& test_location = state->GetCodeLocation(test_name);
>+
> typedef typename Tests::Head Head;
> 
> // First, register the first test in 'Test' for each type in 'Types'.
> TypeParameterizedTest<Fixture, Head, Types>::Register(
>- prefix, case_name, test_names, 0);
>+ prefix, test_location, case_name, test_names, 0, type_names);
> 
> // Next, recurses (at compile time) with the tail of the test list.
>- return TypeParameterizedTestCase<Fixture, typename Tests::Tail, Types>
>- ::Register(prefix, case_name, SkipComma(test_names));
>+ return TypeParameterizedTestCase<Fixture, typename Tests::Tail,
>+ Types>::Register(prefix, code_location,
>+ state, case_name,
>+ SkipComma(test_names),
>+ type_names);
> }
> };
> 
>@@ -732,15 +738,18 @@ class TypeParameterizedTestCase {
> template <GTEST_TEMPLATE_ Fixture, typename Types>
> class TypeParameterizedTestCase<Fixture, Templates0, Types> {
> public:
>- static bool Register(const char* /*prefix*/, const char* /*case_name*/,
>- const char* /*test_names*/) {
>+ static bool Register(const char* /*prefix*/, const CodeLocation&,
>+ const TypedTestCasePState* /*state*/,
>+ const char* /*case_name*/, const char* /*test_names*/,
>+ const std::vector<std::string>& =
>+ std::vector<std::string>() /*type_names*/) {
> return true;
> }
> };
> 
> #endif // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
> 
>-// Returns the current OS stack trace as a String.
>+// Returns the current OS stack trace as an std::string.
> //
> // The maximum number of stack frames to be included is specified by
> // the gtest_stack_trace_depth flag. The skip_count parameter
>@@ -750,8 +759,8 @@ class TypeParameterizedTestCase<Fixture, Templates0, Types> {
> // For example, if Foo() calls Bar(), which in turn calls
> // GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
> // the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
>-GTEST_API_ String GetCurrentOsStackTraceExceptTop(UnitTest* unit_test,
>- int skip_count);
>+GTEST_API_ std::string GetCurrentOsStackTraceExceptTop(
>+ UnitTest* unit_test, int skip_count);
> 
> // Helpers for suppressing warnings on unreachable code or constant
> // condition.
>@@ -762,6 +771,15 @@ GTEST_API_ bool AlwaysTrue();
> // Always returns false.
> inline bool AlwaysFalse() { return !AlwaysTrue(); }
> 
>+// Helper for suppressing false warning from Clang on a const char*
>+// variable declared in a conditional expression always being NULL in
>+// the else branch.
>+struct GTEST_API_ ConstCharPtr {
>+ ConstCharPtr(const char* str) : value(str) {}
>+ operator bool() const { return true; }
>+ const char* value;
>+};
>+
> // A simple Linear Congruential Generator for generating random
> // numbers with a uniform distribution. Unlike rand() and srand(), it
> // doesn't use global state (and therefore can't interfere with user
>@@ -784,13 +802,403 @@ class GTEST_API_ Random {
> GTEST_DISALLOW_COPY_AND_ASSIGN_(Random);
> };
> 
>+// Defining a variable of type CompileAssertTypesEqual<T1, T2> will cause a
>+// compiler error iff T1 and T2 are different types.
>+template <typename T1, typename T2>
>+struct CompileAssertTypesEqual;
>+
>+template <typename T>
>+struct CompileAssertTypesEqual<T, T> {
>+};
>+
>+// Removes the reference from a type if it is a reference type,
>+// otherwise leaves it unchanged. This is the same as
>+// tr1::remove_reference, which is not widely available yet.
>+template <typename T>
>+struct RemoveReference { typedef T type; }; // NOLINT
>+template <typename T>
>+struct RemoveReference<T&> { typedef T type; }; // NOLINT
>+
>+// A handy wrapper around RemoveReference that works when the argument
>+// T depends on template parameters.
>+#define GTEST_REMOVE_REFERENCE_(T) \
>+ typename ::testing::internal::RemoveReference<T>::type
>+
>+// Removes const from a type if it is a const type, otherwise leaves
>+// it unchanged. This is the same as tr1::remove_const, which is not
>+// widely available yet.
>+template <typename T>
>+struct RemoveConst { typedef T type; }; // NOLINT
>+template <typename T>
>+struct RemoveConst<const T> { typedef T type; }; // NOLINT
>+
>+// MSVC 8.0, Sun C++, and IBM XL C++ have a bug which causes the above
>+// definition to fail to remove the const in 'const int[3]' and 'const
>+// char[3][4]'. The following specialization works around the bug.
>+template <typename T, size_t N>
>+struct RemoveConst<const T[N]> {
>+ typedef typename RemoveConst<T>::type type[N];
>+};
>+
>+#if defined(_MSC_VER) && _MSC_VER < 1400
>+// This is the only specialization that allows VC++ 7.1 to remove const in
>+// 'const int[3] and 'const int[3][4]'. However, it causes trouble with GCC
>+// and thus needs to be conditionally compiled.
>+template <typename T, size_t N>
>+struct RemoveConst<T[N]> {
>+ typedef typename RemoveConst<T>::type type[N];
>+};
>+#endif
>+
>+// A handy wrapper around RemoveConst that works when the argument
>+// T depends on template parameters.
>+#define GTEST_REMOVE_CONST_(T) \
>+ typename ::testing::internal::RemoveConst<T>::type
>+
>+// Turns const U&, U&, const U, and U all into U.
>+#define GTEST_REMOVE_REFERENCE_AND_CONST_(T) \
>+ GTEST_REMOVE_CONST_(GTEST_REMOVE_REFERENCE_(T))
>+
>+// ImplicitlyConvertible<From, To>::value is a compile-time bool
>+// constant that's true iff type From can be implicitly converted to
>+// type To.
>+template <typename From, typename To>
>+class ImplicitlyConvertible {
>+ private:
>+ // We need the following helper functions only for their types.
>+ // They have no implementations.
>+
>+ // MakeFrom() is an expression whose type is From. We cannot simply
>+ // use From(), as the type From may not have a public default
>+ // constructor.
>+ static typename AddReference<From>::type MakeFrom();
>+
>+ // These two functions are overloaded. Given an expression
>+ // Helper(x), the compiler will pick the first version if x can be
>+ // implicitly converted to type To; otherwise it will pick the
>+ // second version.
>+ //
>+ // The first version returns a value of size 1, and the second
>+ // version returns a value of size 2. Therefore, by checking the
>+ // size of Helper(x), which can be done at compile time, we can tell
>+ // which version of Helper() is used, and hence whether x can be
>+ // implicitly converted to type To.
>+ static char Helper(To);
>+ static char (&Helper(...))[2]; // NOLINT
>+
>+ // We have to put the 'public' section after the 'private' section,
>+ // or MSVC refuses to compile the code.
>+ public:
>+#if defined(__BORLANDC__)
>+ // C++Builder cannot use member overload resolution during template
>+ // instantiation. The simplest workaround is to use its C++0x type traits
>+ // functions (C++Builder 2009 and above only).
>+ static const bool value = __is_convertible(From, To);
>+#else
>+ // MSVC warns about implicitly converting from double to int for
>+ // possible loss of data, so we need to temporarily disable the
>+ // warning.
>+ GTEST_DISABLE_MSC_WARNINGS_PUSH_(4244)
>+ static const bool value =
>+ sizeof(Helper(ImplicitlyConvertible::MakeFrom())) == 1;
>+ GTEST_DISABLE_MSC_WARNINGS_POP_()
>+#endif // __BORLANDC__
>+};
>+template <typename From, typename To>
>+const bool ImplicitlyConvertible<From, To>::value;
>+
>+// IsAProtocolMessage<T>::value is a compile-time bool constant that's
>+// true iff T is type ProtocolMessage, proto2::Message, or a subclass
>+// of those.
>+template <typename T>
>+struct IsAProtocolMessage
>+ : public bool_constant<
>+ ImplicitlyConvertible<const T*, const ::ProtocolMessage*>::value ||
>+ ImplicitlyConvertible<const T*, const ::proto2::Message*>::value> {
>+};
>+
>+// When the compiler sees expression IsContainerTest<C>(0), if C is an
>+// STL-style container class, the first overload of IsContainerTest
>+// will be viable (since both C::iterator* and C::const_iterator* are
>+// valid types and NULL can be implicitly converted to them). It will
>+// be picked over the second overload as 'int' is a perfect match for
>+// the type of argument 0. If C::iterator or C::const_iterator is not
>+// a valid type, the first overload is not viable, and the second
>+// overload will be picked. Therefore, we can determine whether C is
>+// a container class by checking the type of IsContainerTest<C>(0).
>+// The value of the expression is insignificant.
>+//
>+// In C++11 mode we check the existence of a const_iterator and that an
>+// iterator is properly implemented for the container.
>+//
>+// For pre-C++11 that we look for both C::iterator and C::const_iterator.
>+// The reason is that C++ injects the name of a class as a member of the
>+// class itself (e.g. you can refer to class iterator as either
>+// 'iterator' or 'iterator::iterator'). If we look for C::iterator
>+// only, for example, we would mistakenly think that a class named
>+// iterator is an STL container.
>+//
>+// Also note that the simpler approach of overloading
>+// IsContainerTest(typename C::const_iterator*) and
>+// IsContainerTest(...) doesn't work with Visual Age C++ and Sun C++.
>+typedef int IsContainer;
>+#if GTEST_LANG_CXX11
>+template <class C,
>+ class Iterator = decltype(::std::declval<const C&>().begin()),
>+ class = decltype(::std::declval<const C&>().end()),
>+ class = decltype(++::std::declval<Iterator&>()),
>+ class = decltype(*::std::declval<Iterator>()),
>+ class = typename C::const_iterator>
>+IsContainer IsContainerTest(int /* dummy */) {
>+ return 0;
>+}
>+#else
>+template <class C>
>+IsContainer IsContainerTest(int /* dummy */,
>+ typename C::iterator* /* it */ = NULL,
>+ typename C::const_iterator* /* const_it */ = NULL) {
>+ return 0;
>+}
>+#endif // GTEST_LANG_CXX11
>+
>+typedef char IsNotContainer;
>+template <class C>
>+IsNotContainer IsContainerTest(long /* dummy */) { return '\0'; }
>+
>+// Trait to detect whether a type T is a hash table.
>+// The heuristic used is that the type contains an inner type `hasher` and does
>+// not contain an inner type `reverse_iterator`.
>+// If the container is iterable in reverse, then order might actually matter.
>+template <typename T>
>+struct IsHashTable {
>+ private:
>+ template <typename U>
>+ static char test(typename U::hasher*, typename U::reverse_iterator*);
>+ template <typename U>
>+ static int test(typename U::hasher*, ...);
>+ template <typename U>
>+ static char test(...);
>+
>+ public:
>+ static const bool value = sizeof(test<T>(0, 0)) == sizeof(int);
>+};
>+
>+template <typename T>
>+const bool IsHashTable<T>::value;
>+
>+template<typename T>
>+struct VoidT {
>+ typedef void value_type;
>+};
>+
>+template <typename T, typename = void>
>+struct HasValueType : false_type {};
>+template <typename T>
>+struct HasValueType<T, VoidT<typename T::value_type> > : true_type {
>+};
>+
>+template <typename C,
>+ bool = sizeof(IsContainerTest<C>(0)) == sizeof(IsContainer),
>+ bool = HasValueType<C>::value>
>+struct IsRecursiveContainerImpl;
>+
>+template <typename C, bool HV>
>+struct IsRecursiveContainerImpl<C, false, HV> : public false_type {};
>+
>+// Since the IsRecursiveContainerImpl depends on the IsContainerTest we need to
>+// obey the same inconsistencies as the IsContainerTest, namely check if
>+// something is a container is relying on only const_iterator in C++11 and
>+// is relying on both const_iterator and iterator otherwise
>+template <typename C>
>+struct IsRecursiveContainerImpl<C, true, false> : public false_type {};
>+
>+template <typename C>
>+struct IsRecursiveContainerImpl<C, true, true> {
>+ #if GTEST_LANG_CXX11
>+ typedef typename IteratorTraits<typename C::const_iterator>::value_type
>+ value_type;
>+#else
>+ typedef typename IteratorTraits<typename C::iterator>::value_type value_type;
>+#endif
>+ typedef is_same<value_type, C> type;
>+};
>+
>+// IsRecursiveContainer<Type> is a unary compile-time predicate that
>+// evaluates whether C is a recursive container type. A recursive container
>+// type is a container type whose value_type is equal to the container type
>+// itself. An example for a recursive container type is
>+// boost::filesystem::path, whose iterator has a value_type that is equal to
>+// boost::filesystem::path.
>+template <typename C>
>+struct IsRecursiveContainer : public IsRecursiveContainerImpl<C>::type {};
>+
>+// EnableIf<condition>::type is void when 'Cond' is true, and
>+// undefined when 'Cond' is false. To use SFINAE to make a function
>+// overload only apply when a particular expression is true, add
>+// "typename EnableIf<expression>::type* = 0" as the last parameter.
>+template<bool> struct EnableIf;
>+template<> struct EnableIf<true> { typedef void type; }; // NOLINT
>+
>+// Utilities for native arrays.
>+
>+// ArrayEq() compares two k-dimensional native arrays using the
>+// elements' operator==, where k can be any integer >= 0. When k is
>+// 0, ArrayEq() degenerates into comparing a single pair of values.
>+
>+template <typename T, typename U>
>+bool ArrayEq(const T* lhs, size_t size, const U* rhs);
>+
>+// This generic version is used when k is 0.
>+template <typename T, typename U>
>+inline bool ArrayEq(const T& lhs, const U& rhs) { return lhs == rhs; }
>+
>+// This overload is used when k >= 1.
>+template <typename T, typename U, size_t N>
>+inline bool ArrayEq(const T(&lhs)[N], const U(&rhs)[N]) {
>+ return internal::ArrayEq(lhs, N, rhs);
>+}
>+
>+// This helper reduces code bloat. If we instead put its logic inside
>+// the previous ArrayEq() function, arrays with different sizes would
>+// lead to different copies of the template code.
>+template <typename T, typename U>
>+bool ArrayEq(const T* lhs, size_t size, const U* rhs) {
>+ for (size_t i = 0; i != size; i++) {
>+ if (!internal::ArrayEq(lhs[i], rhs[i]))
>+ return false;
>+ }
>+ return true;
>+}
>+
>+// Finds the first element in the iterator range [begin, end) that
>+// equals elem. Element may be a native array type itself.
>+template <typename Iter, typename Element>
>+Iter ArrayAwareFind(Iter begin, Iter end, const Element& elem) {
>+ for (Iter it = begin; it != end; ++it) {
>+ if (internal::ArrayEq(*it, elem))
>+ return it;
>+ }
>+ return end;
>+}
>+
>+// CopyArray() copies a k-dimensional native array using the elements'
>+// operator=, where k can be any integer >= 0. When k is 0,
>+// CopyArray() degenerates into copying a single value.
>+
>+template <typename T, typename U>
>+void CopyArray(const T* from, size_t size, U* to);
>+
>+// This generic version is used when k is 0.
>+template <typename T, typename U>
>+inline void CopyArray(const T& from, U* to) { *to = from; }
>+
>+// This overload is used when k >= 1.
>+template <typename T, typename U, size_t N>
>+inline void CopyArray(const T(&from)[N], U(*to)[N]) {
>+ internal::CopyArray(from, N, *to);
>+}
>+
>+// This helper reduces code bloat. If we instead put its logic inside
>+// the previous CopyArray() function, arrays with different sizes
>+// would lead to different copies of the template code.
>+template <typename T, typename U>
>+void CopyArray(const T* from, size_t size, U* to) {
>+ for (size_t i = 0; i != size; i++) {
>+ internal::CopyArray(from[i], to + i);
>+ }
>+}
>+
>+// The relation between an NativeArray object (see below) and the
>+// native array it represents.
>+// We use 2 different structs to allow non-copyable types to be used, as long
>+// as RelationToSourceReference() is passed.
>+struct RelationToSourceReference {};
>+struct RelationToSourceCopy {};
>+
>+// Adapts a native array to a read-only STL-style container. Instead
>+// of the complete STL container concept, this adaptor only implements
>+// members useful for Google Mock's container matchers. New members
>+// should be added as needed. To simplify the implementation, we only
>+// support Element being a raw type (i.e. having no top-level const or
>+// reference modifier). It's the client's responsibility to satisfy
>+// this requirement. Element can be an array type itself (hence
>+// multi-dimensional arrays are supported).
>+template <typename Element>
>+class NativeArray {
>+ public:
>+ // STL-style container typedefs.
>+ typedef Element value_type;
>+ typedef Element* iterator;
>+ typedef const Element* const_iterator;
>+
>+ // Constructs from a native array. References the source.
>+ NativeArray(const Element* array, size_t count, RelationToSourceReference) {
>+ InitRef(array, count);
>+ }
>+
>+ // Constructs from a native array. Copies the source.
>+ NativeArray(const Element* array, size_t count, RelationToSourceCopy) {
>+ InitCopy(array, count);
>+ }
>+
>+ // Copy constructor.
>+ NativeArray(const NativeArray& rhs) {
>+ (this->*rhs.clone_)(rhs.array_, rhs.size_);
>+ }
>+
>+ ~NativeArray() {
>+ if (clone_ != &NativeArray::InitRef)
>+ delete[] array_;
>+ }
>+
>+ // STL-style container methods.
>+ size_t size() const { return size_; }
>+ const_iterator begin() const { return array_; }
>+ const_iterator end() const { return array_ + size_; }
>+ bool operator==(const NativeArray& rhs) const {
>+ return size() == rhs.size() &&
>+ ArrayEq(begin(), size(), rhs.begin());
>+ }
>+
>+ private:
>+ enum {
>+ kCheckTypeIsNotConstOrAReference = StaticAssertTypeEqHelper<
>+ Element, GTEST_REMOVE_REFERENCE_AND_CONST_(Element)>::value
>+ };
>+
>+ // Initializes this object with a copy of the input.
>+ void InitCopy(const Element* array, size_t a_size) {
>+ Element* const copy = new Element[a_size];
>+ CopyArray(array, a_size, copy);
>+ array_ = copy;
>+ size_ = a_size;
>+ clone_ = &NativeArray::InitCopy;
>+ }
>+
>+ // Initializes this object with a reference of the input.
>+ void InitRef(const Element* array, size_t a_size) {
>+ array_ = array;
>+ size_ = a_size;
>+ clone_ = &NativeArray::InitRef;
>+ }
>+
>+ const Element* array_;
>+ size_t size_;
>+ void (NativeArray::*clone_)(const Element*, size_t);
>+
>+ GTEST_DISALLOW_ASSIGN_(NativeArray);
>+};
>+
> } // namespace internal
> } // namespace testing
> 
>-#define GTEST_MESSAGE_(message, result_type) \
>- ::testing::internal::AssertHelper(result_type, __FILE__, __LINE__, message) \
>+#define GTEST_MESSAGE_AT_(file, line, message, result_type) \
>+ ::testing::internal::AssertHelper(result_type, file, line, message) \
> = ::testing::Message()
> 
>+#define GTEST_MESSAGE_(message, result_type) \
>+ GTEST_MESSAGE_AT_(__FILE__, __LINE__, message, result_type)
>+
> #define GTEST_FATAL_FAILURE_(message) \
> return GTEST_MESSAGE_(message, ::testing::TestPartResult::kFatalFailure)
> 
>@@ -800,7 +1208,7 @@ class GTEST_API_ Random {
> #define GTEST_SUCCESS_(message) \
> GTEST_MESSAGE_(message, ::testing::TestPartResult::kSuccess)
> 
>-// Suppresses MSVC warnings 4072 (unreachable code) for the code following
>+// Suppress MSVC warning 4702 (unreachable code) for the code following
> // statement if it returns or throws (or doesn't return or throw in some
> // situations).
> #define GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) \
>@@ -808,7 +1216,7 @@ class GTEST_API_ Random {
> 
> #define GTEST_TEST_THROW_(statement, expected_exception, fail) \
> GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
>- if (const char* gtest_msg = "") { \
>+ if (::testing::internal::ConstCharPtr gtest_msg = "") { \
> bool gtest_caught_expected = false; \
> try { \
> GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
>@@ -817,38 +1225,38 @@ class GTEST_API_ Random {
> gtest_caught_expected = true; \
> } \
> catch (...) { \
>- gtest_msg = "Expected: " #statement " throws an exception of type " \
>- #expected_exception ".\n Actual: it throws a different " \
>- "type."; \
>+ gtest_msg.value = \
>+ "Expected: " #statement " throws an exception of type " \
>+ #expected_exception ".\n Actual: it throws a different type."; \
> goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
> } \
> if (!gtest_caught_expected) { \
>- gtest_msg = "Expected: " #statement " throws an exception of type " \
>- #expected_exception ".\n Actual: it throws nothing."; \
>+ gtest_msg.value = \
>+ "Expected: " #statement " throws an exception of type " \
>+ #expected_exception ".\n Actual: it throws nothing."; \
> goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
> } \
> } else \
> GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__): \
>- fail(gtest_msg)
>+ fail(gtest_msg.value)
> 
> #define GTEST_TEST_NO_THROW_(statement, fail) \
> GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
>- if (const char* gtest_msg = "") { \
>+ if (::testing::internal::AlwaysTrue()) { \
> try { \
> GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
> } \
> catch (...) { \
>- gtest_msg = "Expected: " #statement " doesn't throw an exception.\n" \
>- " Actual: it throws."; \
> goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \
> } \
> } else \
> GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__): \
>- fail(gtest_msg)
>+ fail("Expected: " #statement " doesn't throw an exception.\n" \
>+ " Actual: it throws.")
> 
> #define GTEST_TEST_ANY_THROW_(statement, fail) \
> GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
>- if (const char* gtest_msg = "") { \
>+ if (::testing::internal::AlwaysTrue()) { \
> bool gtest_caught_any = false; \
> try { \
> GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
>@@ -857,13 +1265,12 @@ class GTEST_API_ Random {
> gtest_caught_any = true; \
> } \
> if (!gtest_caught_any) { \
>- gtest_msg = "Expected: " #statement " throws an exception.\n" \
>- " Actual: it doesn't."; \
> goto GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__); \
> } \
> } else \
> GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__): \
>- fail(gtest_msg)
>+ fail("Expected: " #statement " throws an exception.\n" \
>+ " Actual: it doesn't.")
> 
> 
> // Implements Boolean test assertions such as EXPECT_TRUE. expression can be
>@@ -880,18 +1287,17 @@ class GTEST_API_ Random {
> 
> #define GTEST_TEST_NO_FATAL_FAILURE_(statement, fail) \
> GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
>- if (const char* gtest_msg = "") { \
>+ if (::testing::internal::AlwaysTrue()) { \
> ::testing::internal::HasNewFatalFailureHelper gtest_fatal_failure_checker; \
> GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
> if (gtest_fatal_failure_checker.has_new_fatal_failure()) { \
>- gtest_msg = "Expected: " #statement " doesn't generate new fatal " \
>- "failures in the current thread.\n" \
>- " Actual: it does."; \
> goto GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__); \
> } \
> } else \
> GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__): \
>- fail(gtest_msg)
>+ fail("Expected: " #statement " doesn't generate new fatal " \
>+ "failures in the current thread.\n" \
>+ " Actual: it does.")
> 
> // Expands to the name of the class that implements the given test.
> #define GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \
>@@ -904,7 +1310,7 @@ class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) : public parent_class {\
> GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {}\
> private:\
> virtual void TestBody();\
>- static ::testing::TestInfo* const test_info_;\
>+ static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_;\
> GTEST_DISALLOW_COPY_AND_ASSIGN_(\
> GTEST_TEST_CLASS_NAME_(test_case_name, test_name));\
> };\
>@@ -912,7 +1318,8 @@ class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) : public parent_class {\
> ::testing::TestInfo* const GTEST_TEST_CLASS_NAME_(test_case_name, test_name)\
> ::test_info_ =\
> ::testing::internal::MakeAndRegisterTestInfo(\
>- #test_case_name, #test_name, "", "", \
>+ #test_case_name, #test_name, NULL, NULL, \
>+ ::testing::internal::CodeLocation(__FILE__, __LINE__), \
> (parent_id), \
> parent_class::SetUpTestCase, \
> parent_class::TearDownTestCase, \
>diff --git a/Source/ThirdParty/gtest/include/gtest/internal/gtest-linked_ptr.h b/Source/ThirdParty/gtest/include/gtest/internal/gtest-linked_ptr.h
>index 540ef4cd44e72b558657081a5f07a0f28b3e40e3..082b87289ae17c8aa7b96d8e8c92b96e018c768b 100644
>--- a/Source/ThirdParty/gtest/include/gtest/internal/gtest-linked_ptr.h
>+++ b/Source/ThirdParty/gtest/include/gtest/internal/gtest-linked_ptr.h
>@@ -27,8 +27,6 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> //
>-// Authors: Dan Egnor (egnor@google.com)
>-//
> // A "smart" pointer type with reference tracking. Every pointer to a
> // particular object is kept on a circular linked list. When the last pointer
> // to an object is destroyed or reassigned, the object is deleted.
>@@ -62,16 +60,18 @@
> // raw pointer (e.g. via get()) concurrently, and
> // - it's safe to write to two linked_ptrs that point to the same
> // shared object concurrently.
>-// TODO(wan@google.com): rename this to safe_linked_ptr to avoid
>+// FIXME: rename this to safe_linked_ptr to avoid
> // confusion with normal linked_ptr.
> 
>+// GOOGLETEST_CM0001 DO NOT DELETE
>+
> #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_
> #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_
> 
> #include <stdlib.h>
> #include <assert.h>
> 
>-#include <gtest/internal/gtest-port.h>
>+#include "gtest/internal/gtest-port.h"
> 
> namespace testing {
> namespace internal {
>@@ -105,25 +105,35 @@ class linked_ptr_internal {
> // framework.
> 
> // Join an existing circle.
>- // L < g_linked_ptr_mutex
>- void join(linked_ptr_internal const* ptr) {
>+ void join(linked_ptr_internal const* ptr)
>+ GTEST_LOCK_EXCLUDED_(g_linked_ptr_mutex) {
> MutexLock lock(&g_linked_ptr_mutex);
> 
> linked_ptr_internal const* p = ptr;
>- while (p->next_ != ptr) p = p->next_;
>+ while (p->next_ != ptr) {
>+ assert(p->next_ != this &&
>+ "Trying to join() a linked ring we are already in. "
>+ "Is GMock thread safety enabled?");
>+ p = p->next_;
>+ }
> p->next_ = this;
> next_ = ptr;
> }
> 
> // Leave whatever circle we're part of. Returns true if we were the
> // last member of the circle. Once this is done, you can join() another.
>- // L < g_linked_ptr_mutex
>- bool depart() {
>+ bool depart()
>+ GTEST_LOCK_EXCLUDED_(g_linked_ptr_mutex) {
> MutexLock lock(&g_linked_ptr_mutex);
> 
> if (next_ == this) return true;
> linked_ptr_internal const* p = next_;
>- while (p->next_ != this) p = p->next_;
>+ while (p->next_ != this) {
>+ assert(p->next_ != next_ &&
>+ "Trying to depart() a linked ring we are not in. "
>+ "Is GMock thread safety enabled?");
>+ p = p->next_;
>+ }
> p->next_ = next_;
> return false;
> }
>@@ -172,15 +182,6 @@ class linked_ptr {
> T* get() const { return value_; }
> T* operator->() const { return value_; }
> T& operator*() const { return *value_; }
>- // Release ownership of the pointed object and returns it.
>- // Sole ownership by this linked_ptr object is required.
>- T* release() {
>- bool last = link_.depart();
>- assert(last);
>- T* v = value_;
>- value_ = NULL;
>- return v;
>- }
> 
> bool operator==(T* p) const { return value_ == p; }
> bool operator!=(T* p) const { return value_ != p; }
>diff --git a/Source/ThirdParty/gtest/include/gtest/internal/gtest-param-util-generated.h b/Source/ThirdParty/gtest/include/gtest/internal/gtest-param-util-generated.h
>index 62b5ae13e28e566b1e885127dbb07cd172a26f19..f4df599190572e7b09e9d7b0ce899472dc7eb916 100644
>--- a/Source/ThirdParty/gtest/include/gtest/internal/gtest-param-util-generated.h
>+++ b/Source/ThirdParty/gtest/include/gtest/internal/gtest-param-util-generated.h
>@@ -1,4 +1,6 @@
>-// This file was GENERATED by a script. DO NOT EDIT BY HAND!!!
>+// This file was GENERATED by command:
>+// pump.py gtest-param-util-generated.h.pump
>+// DO NOT EDIT BY HAND!!!
> 
> // Copyright 2008 Google Inc.
> // All Rights Reserved.
>@@ -28,8 +30,7 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: vladl@google.com (Vlad Losev)
>+
> 
> // Type and function utilities for implementing parameterized tests.
> // This file is generated by a SCRIPT. DO NOT EDIT BY HAND!
>@@ -41,16 +42,13 @@
> // by the maximum arity of the implementation of tuple which is
> // currently set at 10.
> 
>+// GOOGLETEST_CM0001 DO NOT DELETE
>+
> #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_
> #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_
> 
>-// scripts/fuse_gtest.py depends on gtest's own header being #included
>-// *unconditionally*. Therefore these #includes cannot be moved
>-// inside #if GTEST_HAS_PARAM_TEST.
>-#include <gtest/internal/gtest-param-util.h>
>-#include <gtest/internal/gtest-port.h>
>-
>-#if GTEST_HAS_PARAM_TEST
>+#include "gtest/internal/gtest-param-util.h"
>+#include "gtest/internal/gtest-port.h"
> 
> namespace testing {
> 
>@@ -58,8 +56,8 @@ namespace testing {
> // include/gtest/gtest-param-test.h.
> template <typename ForwardIterator>
> internal::ParamGenerator<
>- typename ::std::iterator_traits<ForwardIterator>::value_type> ValuesIn(
>- ForwardIterator begin, ForwardIterator end);
>+ typename ::testing::internal::IteratorTraits<ForwardIterator>::value_type>
>+ValuesIn(ForwardIterator begin, ForwardIterator end);
> 
> template <typename T, size_t N>
> internal::ParamGenerator<T> ValuesIn(const T (&array)[N]);
>@@ -77,7 +75,10 @@ class ValueArray1 {
> explicit ValueArray1(T1 v1) : v1_(v1) {}
> 
> template <typename T>
>- operator ParamGenerator<T>() const { return ValuesIn(&v1_, &v1_ + 1); }
>+ operator ParamGenerator<T>() const {
>+ const T array[] = {static_cast<T>(v1_)};
>+ return ValuesIn(array);
>+ }
> 
> private:
> // No implementation - assignment is unsupported.
>@@ -93,7 +94,7 @@ class ValueArray2 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_)};
> return ValuesIn(array);
> }
> 
>@@ -112,7 +113,8 @@ class ValueArray3 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_)};
> return ValuesIn(array);
> }
> 
>@@ -133,7 +135,8 @@ class ValueArray4 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_)};
> return ValuesIn(array);
> }
> 
>@@ -155,7 +158,8 @@ class ValueArray5 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_)};
> return ValuesIn(array);
> }
> 
>@@ -179,7 +183,9 @@ class ValueArray6 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_)};
> return ValuesIn(array);
> }
> 
>@@ -204,7 +210,9 @@ class ValueArray7 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_)};
> return ValuesIn(array);
> }
> 
>@@ -231,7 +239,9 @@ class ValueArray8 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_)};
> return ValuesIn(array);
> }
> 
>@@ -259,7 +269,10 @@ class ValueArray9 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_)};
> return ValuesIn(array);
> }
> 
>@@ -288,7 +301,10 @@ class ValueArray10 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_)};
> return ValuesIn(array);
> }
> 
>@@ -319,7 +335,10 @@ class ValueArray11 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_)};
> return ValuesIn(array);
> }
> 
>@@ -351,8 +370,11 @@ class ValueArray12 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_)};
> return ValuesIn(array);
> }
> 
>@@ -386,8 +408,11 @@ class ValueArray13 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_)};
> return ValuesIn(array);
> }
> 
>@@ -422,8 +447,11 @@ class ValueArray14 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_)};
> return ValuesIn(array);
> }
> 
>@@ -459,8 +487,12 @@ class ValueArray15 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_)};
> return ValuesIn(array);
> }
> 
>@@ -499,8 +531,12 @@ class ValueArray16 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_)};
> return ValuesIn(array);
> }
> 
>@@ -540,8 +576,12 @@ class ValueArray17 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_)};
> return ValuesIn(array);
> }
> 
>@@ -582,8 +622,13 @@ class ValueArray18 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_)};
> return ValuesIn(array);
> }
> 
>@@ -625,8 +670,13 @@ class ValueArray19 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_)};
> return ValuesIn(array);
> }
> 
>@@ -670,8 +720,13 @@ class ValueArray20 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_)};
> return ValuesIn(array);
> }
> 
>@@ -717,8 +772,14 @@ class ValueArray21 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_)};
> return ValuesIn(array);
> }
> 
>@@ -765,8 +826,14 @@ class ValueArray22 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_)};
> return ValuesIn(array);
> }
> 
>@@ -815,9 +882,14 @@ class ValueArray23 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_,
>- v23_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_)};
> return ValuesIn(array);
> }
> 
>@@ -867,9 +939,15 @@ class ValueArray24 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_)};
> return ValuesIn(array);
> }
> 
>@@ -920,9 +998,15 @@ class ValueArray25 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_)};
> return ValuesIn(array);
> }
> 
>@@ -975,9 +1059,15 @@ class ValueArray26 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_)};
> return ValuesIn(array);
> }
> 
>@@ -1032,9 +1122,16 @@ class ValueArray27 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_)};
> return ValuesIn(array);
> }
> 
>@@ -1090,9 +1187,16 @@ class ValueArray28 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_)};
> return ValuesIn(array);
> }
> 
>@@ -1149,9 +1253,16 @@ class ValueArray29 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_)};
> return ValuesIn(array);
> }
> 
>@@ -1210,9 +1321,17 @@ class ValueArray30 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_)};
> return ValuesIn(array);
> }
> 
>@@ -1273,9 +1392,17 @@ class ValueArray31 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_)};
> return ValuesIn(array);
> }
> 
>@@ -1337,9 +1464,17 @@ class ValueArray32 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_, v32_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_)};
> return ValuesIn(array);
> }
> 
>@@ -1403,9 +1538,18 @@ class ValueArray33 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_, v32_, v33_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
>+ static_cast<T>(v33_)};
> return ValuesIn(array);
> }
> 
>@@ -1470,9 +1614,18 @@ class ValueArray34 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_, v32_, v33_, v34_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
>+ static_cast<T>(v33_), static_cast<T>(v34_)};
> return ValuesIn(array);
> }
> 
>@@ -1538,10 +1691,18 @@ class ValueArray35 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_, v32_, v33_, v34_,
>- v35_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
>+ static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_)};
> return ValuesIn(array);
> }
> 
>@@ -1609,10 +1770,19 @@ class ValueArray36 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_, v32_, v33_, v34_, v35_,
>- v36_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
>+ static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
>+ static_cast<T>(v36_)};
> return ValuesIn(array);
> }
> 
>@@ -1682,10 +1852,19 @@ class ValueArray37 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_, v32_, v33_, v34_, v35_,
>- v36_, v37_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
>+ static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
>+ static_cast<T>(v36_), static_cast<T>(v37_)};
> return ValuesIn(array);
> }
> 
>@@ -1756,10 +1935,19 @@ class ValueArray38 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_, v32_, v33_, v34_, v35_,
>- v36_, v37_, v38_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
>+ static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
>+ static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_)};
> return ValuesIn(array);
> }
> 
>@@ -1831,10 +2019,20 @@ class ValueArray39 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_, v32_, v33_, v34_, v35_,
>- v36_, v37_, v38_, v39_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
>+ static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
>+ static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
>+ static_cast<T>(v39_)};
> return ValuesIn(array);
> }
> 
>@@ -1908,10 +2106,20 @@ class ValueArray40 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_, v32_, v33_, v34_, v35_,
>- v36_, v37_, v38_, v39_, v40_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
>+ static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
>+ static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
>+ static_cast<T>(v39_), static_cast<T>(v40_)};
> return ValuesIn(array);
> }
> 
>@@ -1987,10 +2195,20 @@ class ValueArray41 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_, v32_, v33_, v34_, v35_,
>- v36_, v37_, v38_, v39_, v40_, v41_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
>+ static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
>+ static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
>+ static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_)};
> return ValuesIn(array);
> }
> 
>@@ -2067,10 +2285,21 @@ class ValueArray42 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_, v32_, v33_, v34_, v35_,
>- v36_, v37_, v38_, v39_, v40_, v41_, v42_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
>+ static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
>+ static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
>+ static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
>+ static_cast<T>(v42_)};
> return ValuesIn(array);
> }
> 
>@@ -2148,10 +2377,21 @@ class ValueArray43 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_, v32_, v33_, v34_, v35_,
>- v36_, v37_, v38_, v39_, v40_, v41_, v42_, v43_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
>+ static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
>+ static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
>+ static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
>+ static_cast<T>(v42_), static_cast<T>(v43_)};
> return ValuesIn(array);
> }
> 
>@@ -2231,10 +2471,21 @@ class ValueArray44 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_, v32_, v33_, v34_, v35_,
>- v36_, v37_, v38_, v39_, v40_, v41_, v42_, v43_, v44_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
>+ static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
>+ static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
>+ static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
>+ static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_)};
> return ValuesIn(array);
> }
> 
>@@ -2315,10 +2566,22 @@ class ValueArray45 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_, v32_, v33_, v34_, v35_,
>- v36_, v37_, v38_, v39_, v40_, v41_, v42_, v43_, v44_, v45_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
>+ static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
>+ static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
>+ static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
>+ static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_),
>+ static_cast<T>(v45_)};
> return ValuesIn(array);
> }
> 
>@@ -2401,10 +2664,22 @@ class ValueArray46 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_, v32_, v33_, v34_, v35_,
>- v36_, v37_, v38_, v39_, v40_, v41_, v42_, v43_, v44_, v45_, v46_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
>+ static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
>+ static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
>+ static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
>+ static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_),
>+ static_cast<T>(v45_), static_cast<T>(v46_)};
> return ValuesIn(array);
> }
> 
>@@ -2489,11 +2764,22 @@ class ValueArray47 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_, v32_, v33_, v34_, v35_,
>- v36_, v37_, v38_, v39_, v40_, v41_, v42_, v43_, v44_, v45_, v46_,
>- v47_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
>+ static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
>+ static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
>+ static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
>+ static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_),
>+ static_cast<T>(v45_), static_cast<T>(v46_), static_cast<T>(v47_)};
> return ValuesIn(array);
> }
> 
>@@ -2579,11 +2865,23 @@ class ValueArray48 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_, v32_, v33_, v34_, v35_,
>- v36_, v37_, v38_, v39_, v40_, v41_, v42_, v43_, v44_, v45_, v46_, v47_,
>- v48_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
>+ static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
>+ static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
>+ static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
>+ static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_),
>+ static_cast<T>(v45_), static_cast<T>(v46_), static_cast<T>(v47_),
>+ static_cast<T>(v48_)};
> return ValuesIn(array);
> }
> 
>@@ -2670,11 +2968,23 @@ class ValueArray49 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_, v32_, v33_, v34_, v35_,
>- v36_, v37_, v38_, v39_, v40_, v41_, v42_, v43_, v44_, v45_, v46_, v47_,
>- v48_, v49_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
>+ static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
>+ static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
>+ static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
>+ static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_),
>+ static_cast<T>(v45_), static_cast<T>(v46_), static_cast<T>(v47_),
>+ static_cast<T>(v48_), static_cast<T>(v49_)};
> return ValuesIn(array);
> }
> 
>@@ -2762,11 +3072,23 @@ class ValueArray50 {
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {v1_, v2_, v3_, v4_, v5_, v6_, v7_, v8_, v9_, v10_, v11_,
>- v12_, v13_, v14_, v15_, v16_, v17_, v18_, v19_, v20_, v21_, v22_, v23_,
>- v24_, v25_, v26_, v27_, v28_, v29_, v30_, v31_, v32_, v33_, v34_, v35_,
>- v36_, v37_, v38_, v39_, v40_, v41_, v42_, v43_, v44_, v45_, v46_, v47_,
>- v48_, v49_, v50_};
>+ const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
>+ static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
>+ static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
>+ static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
>+ static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
>+ static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
>+ static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
>+ static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
>+ static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
>+ static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
>+ static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
>+ static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
>+ static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
>+ static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
>+ static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_),
>+ static_cast<T>(v45_), static_cast<T>(v46_), static_cast<T>(v47_),
>+ static_cast<T>(v48_), static_cast<T>(v49_), static_cast<T>(v50_)};
> return ValuesIn(array);
> }
> 
>@@ -2826,7 +3148,7 @@ class ValueArray50 {
> const T50 v50_;
> };
> 
>-#if GTEST_HAS_COMBINE
>+# if GTEST_HAS_COMBINE
> // INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
> //
> // Generates values from the Cartesian product of values produced
>@@ -2834,9 +3156,9 @@ class ValueArray50 {
> //
> template <typename T1, typename T2>
> class CartesianProductGenerator2
>- : public ParamGeneratorInterface< ::std::tuple<T1, T2> > {
>+ : public ParamGeneratorInterface< ::testing::tuple<T1, T2> > {
> public:
>- typedef ::std::tuple<T1, T2> ParamType;
>+ typedef ::testing::tuple<T1, T2> ParamType;
> 
> CartesianProductGenerator2(const ParamGenerator<T1>& g1,
> const ParamGenerator<T2>& g2)
>@@ -2882,7 +3204,7 @@ class CartesianProductGenerator2
> virtual ParamIteratorInterface<ParamType>* Clone() const {
> return new Iterator(*this);
> }
>- virtual const ParamType* Current() const { return &current_value_; }
>+ virtual const ParamType* Current() const { return current_value_.get(); }
> virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
> // Having the same base generator guarantees that the other
> // iterator is of the same type and we can downcast.
>@@ -2914,7 +3236,7 @@ class CartesianProductGenerator2
> 
> void ComputeCurrentValue() {
> if (!AtEnd())
>- current_value_ = ParamType(*current1_, *current2_);
>+ current_value_.reset(new ParamType(*current1_, *current2_));
> }
> bool AtEnd() const {
> // We must report iterator past the end of the range when either of the
>@@ -2936,7 +3258,7 @@ class CartesianProductGenerator2
> const typename ParamGenerator<T2>::iterator begin2_;
> const typename ParamGenerator<T2>::iterator end2_;
> typename ParamGenerator<T2>::iterator current2_;
>- ParamType current_value_;
>+ linked_ptr<ParamType> current_value_;
> }; // class CartesianProductGenerator2::Iterator
> 
> // No implementation - assignment is unsupported.
>@@ -2949,9 +3271,9 @@ class CartesianProductGenerator2
> 
> template <typename T1, typename T2, typename T3>
> class CartesianProductGenerator3
>- : public ParamGeneratorInterface< ::std::tuple<T1, T2, T3> > {
>+ : public ParamGeneratorInterface< ::testing::tuple<T1, T2, T3> > {
> public:
>- typedef ::std::tuple<T1, T2, T3> ParamType;
>+ typedef ::testing::tuple<T1, T2, T3> ParamType;
> 
> CartesianProductGenerator3(const ParamGenerator<T1>& g1,
> const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3)
>@@ -3005,7 +3327,7 @@ class CartesianProductGenerator3
> virtual ParamIteratorInterface<ParamType>* Clone() const {
> return new Iterator(*this);
> }
>- virtual const ParamType* Current() const { return &current_value_; }
>+ virtual const ParamType* Current() const { return current_value_.get(); }
> virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
> // Having the same base generator guarantees that the other
> // iterator is of the same type and we can downcast.
>@@ -3041,7 +3363,7 @@ class CartesianProductGenerator3
> 
> void ComputeCurrentValue() {
> if (!AtEnd())
>- current_value_ = ParamType(*current1_, *current2_, *current3_);
>+ current_value_.reset(new ParamType(*current1_, *current2_, *current3_));
> }
> bool AtEnd() const {
> // We must report iterator past the end of the range when either of the
>@@ -3067,7 +3389,7 @@ class CartesianProductGenerator3
> const typename ParamGenerator<T3>::iterator begin3_;
> const typename ParamGenerator<T3>::iterator end3_;
> typename ParamGenerator<T3>::iterator current3_;
>- ParamType current_value_;
>+ linked_ptr<ParamType> current_value_;
> }; // class CartesianProductGenerator3::Iterator
> 
> // No implementation - assignment is unsupported.
>@@ -3081,9 +3403,9 @@ class CartesianProductGenerator3
> 
> template <typename T1, typename T2, typename T3, typename T4>
> class CartesianProductGenerator4
>- : public ParamGeneratorInterface< ::std::tuple<T1, T2, T3, T4> > {
>+ : public ParamGeneratorInterface< ::testing::tuple<T1, T2, T3, T4> > {
> public:
>- typedef ::std::tuple<T1, T2, T3, T4> ParamType;
>+ typedef ::testing::tuple<T1, T2, T3, T4> ParamType;
> 
> CartesianProductGenerator4(const ParamGenerator<T1>& g1,
> const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
>@@ -3146,7 +3468,7 @@ class CartesianProductGenerator4
> virtual ParamIteratorInterface<ParamType>* Clone() const {
> return new Iterator(*this);
> }
>- virtual const ParamType* Current() const { return &current_value_; }
>+ virtual const ParamType* Current() const { return current_value_.get(); }
> virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
> // Having the same base generator guarantees that the other
> // iterator is of the same type and we can downcast.
>@@ -3186,8 +3508,8 @@ class CartesianProductGenerator4
> 
> void ComputeCurrentValue() {
> if (!AtEnd())
>- current_value_ = ParamType(*current1_, *current2_, *current3_,
>- *current4_);
>+ current_value_.reset(new ParamType(*current1_, *current2_, *current3_,
>+ *current4_));
> }
> bool AtEnd() const {
> // We must report iterator past the end of the range when either of the
>@@ -3217,7 +3539,7 @@ class CartesianProductGenerator4
> const typename ParamGenerator<T4>::iterator begin4_;
> const typename ParamGenerator<T4>::iterator end4_;
> typename ParamGenerator<T4>::iterator current4_;
>- ParamType current_value_;
>+ linked_ptr<ParamType> current_value_;
> }; // class CartesianProductGenerator4::Iterator
> 
> // No implementation - assignment is unsupported.
>@@ -3232,9 +3554,9 @@ class CartesianProductGenerator4
> 
> template <typename T1, typename T2, typename T3, typename T4, typename T5>
> class CartesianProductGenerator5
>- : public ParamGeneratorInterface< ::std::tuple<T1, T2, T3, T4, T5> > {
>+ : public ParamGeneratorInterface< ::testing::tuple<T1, T2, T3, T4, T5> > {
> public:
>- typedef ::std::tuple<T1, T2, T3, T4, T5> ParamType;
>+ typedef ::testing::tuple<T1, T2, T3, T4, T5> ParamType;
> 
> CartesianProductGenerator5(const ParamGenerator<T1>& g1,
> const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
>@@ -3304,7 +3626,7 @@ class CartesianProductGenerator5
> virtual ParamIteratorInterface<ParamType>* Clone() const {
> return new Iterator(*this);
> }
>- virtual const ParamType* Current() const { return &current_value_; }
>+ virtual const ParamType* Current() const { return current_value_.get(); }
> virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
> // Having the same base generator guarantees that the other
> // iterator is of the same type and we can downcast.
>@@ -3348,8 +3670,8 @@ class CartesianProductGenerator5
> 
> void ComputeCurrentValue() {
> if (!AtEnd())
>- current_value_ = ParamType(*current1_, *current2_, *current3_,
>- *current4_, *current5_);
>+ current_value_.reset(new ParamType(*current1_, *current2_, *current3_,
>+ *current4_, *current5_));
> }
> bool AtEnd() const {
> // We must report iterator past the end of the range when either of the
>@@ -3383,7 +3705,7 @@ class CartesianProductGenerator5
> const typename ParamGenerator<T5>::iterator begin5_;
> const typename ParamGenerator<T5>::iterator end5_;
> typename ParamGenerator<T5>::iterator current5_;
>- ParamType current_value_;
>+ linked_ptr<ParamType> current_value_;
> }; // class CartesianProductGenerator5::Iterator
> 
> // No implementation - assignment is unsupported.
>@@ -3400,10 +3722,10 @@ class CartesianProductGenerator5
> template <typename T1, typename T2, typename T3, typename T4, typename T5,
> typename T6>
> class CartesianProductGenerator6
>- : public ParamGeneratorInterface< ::std::tuple<T1, T2, T3, T4, T5,
>+ : public ParamGeneratorInterface< ::testing::tuple<T1, T2, T3, T4, T5,
> T6> > {
> public:
>- typedef ::std::tuple<T1, T2, T3, T4, T5, T6> ParamType;
>+ typedef ::testing::tuple<T1, T2, T3, T4, T5, T6> ParamType;
> 
> CartesianProductGenerator6(const ParamGenerator<T1>& g1,
> const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
>@@ -3481,7 +3803,7 @@ class CartesianProductGenerator6
> virtual ParamIteratorInterface<ParamType>* Clone() const {
> return new Iterator(*this);
> }
>- virtual const ParamType* Current() const { return &current_value_; }
>+ virtual const ParamType* Current() const { return current_value_.get(); }
> virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
> // Having the same base generator guarantees that the other
> // iterator is of the same type and we can downcast.
>@@ -3529,8 +3851,8 @@ class CartesianProductGenerator6
> 
> void ComputeCurrentValue() {
> if (!AtEnd())
>- current_value_ = ParamType(*current1_, *current2_, *current3_,
>- *current4_, *current5_, *current6_);
>+ current_value_.reset(new ParamType(*current1_, *current2_, *current3_,
>+ *current4_, *current5_, *current6_));
> }
> bool AtEnd() const {
> // We must report iterator past the end of the range when either of the
>@@ -3568,7 +3890,7 @@ class CartesianProductGenerator6
> const typename ParamGenerator<T6>::iterator begin6_;
> const typename ParamGenerator<T6>::iterator end6_;
> typename ParamGenerator<T6>::iterator current6_;
>- ParamType current_value_;
>+ linked_ptr<ParamType> current_value_;
> }; // class CartesianProductGenerator6::Iterator
> 
> // No implementation - assignment is unsupported.
>@@ -3586,10 +3908,10 @@ class CartesianProductGenerator6
> template <typename T1, typename T2, typename T3, typename T4, typename T5,
> typename T6, typename T7>
> class CartesianProductGenerator7
>- : public ParamGeneratorInterface< ::std::tuple<T1, T2, T3, T4, T5, T6,
>+ : public ParamGeneratorInterface< ::testing::tuple<T1, T2, T3, T4, T5, T6,
> T7> > {
> public:
>- typedef ::std::tuple<T1, T2, T3, T4, T5, T6, T7> ParamType;
>+ typedef ::testing::tuple<T1, T2, T3, T4, T5, T6, T7> ParamType;
> 
> CartesianProductGenerator7(const ParamGenerator<T1>& g1,
> const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
>@@ -3675,7 +3997,7 @@ class CartesianProductGenerator7
> virtual ParamIteratorInterface<ParamType>* Clone() const {
> return new Iterator(*this);
> }
>- virtual const ParamType* Current() const { return &current_value_; }
>+ virtual const ParamType* Current() const { return current_value_.get(); }
> virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
> // Having the same base generator guarantees that the other
> // iterator is of the same type and we can downcast.
>@@ -3727,8 +4049,8 @@ class CartesianProductGenerator7
> 
> void ComputeCurrentValue() {
> if (!AtEnd())
>- current_value_ = ParamType(*current1_, *current2_, *current3_,
>- *current4_, *current5_, *current6_, *current7_);
>+ current_value_.reset(new ParamType(*current1_, *current2_, *current3_,
>+ *current4_, *current5_, *current6_, *current7_));
> }
> bool AtEnd() const {
> // We must report iterator past the end of the range when either of the
>@@ -3770,7 +4092,7 @@ class CartesianProductGenerator7
> const typename ParamGenerator<T7>::iterator begin7_;
> const typename ParamGenerator<T7>::iterator end7_;
> typename ParamGenerator<T7>::iterator current7_;
>- ParamType current_value_;
>+ linked_ptr<ParamType> current_value_;
> }; // class CartesianProductGenerator7::Iterator
> 
> // No implementation - assignment is unsupported.
>@@ -3789,10 +4111,10 @@ class CartesianProductGenerator7
> template <typename T1, typename T2, typename T3, typename T4, typename T5,
> typename T6, typename T7, typename T8>
> class CartesianProductGenerator8
>- : public ParamGeneratorInterface< ::std::tuple<T1, T2, T3, T4, T5, T6,
>+ : public ParamGeneratorInterface< ::testing::tuple<T1, T2, T3, T4, T5, T6,
> T7, T8> > {
> public:
>- typedef ::std::tuple<T1, T2, T3, T4, T5, T6, T7, T8> ParamType;
>+ typedef ::testing::tuple<T1, T2, T3, T4, T5, T6, T7, T8> ParamType;
> 
> CartesianProductGenerator8(const ParamGenerator<T1>& g1,
> const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
>@@ -3888,7 +4210,7 @@ class CartesianProductGenerator8
> virtual ParamIteratorInterface<ParamType>* Clone() const {
> return new Iterator(*this);
> }
>- virtual const ParamType* Current() const { return &current_value_; }
>+ virtual const ParamType* Current() const { return current_value_.get(); }
> virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
> // Having the same base generator guarantees that the other
> // iterator is of the same type and we can downcast.
>@@ -3944,8 +4266,8 @@ class CartesianProductGenerator8
> 
> void ComputeCurrentValue() {
> if (!AtEnd())
>- current_value_ = ParamType(*current1_, *current2_, *current3_,
>- *current4_, *current5_, *current6_, *current7_, *current8_);
>+ current_value_.reset(new ParamType(*current1_, *current2_, *current3_,
>+ *current4_, *current5_, *current6_, *current7_, *current8_));
> }
> bool AtEnd() const {
> // We must report iterator past the end of the range when either of the
>@@ -3991,7 +4313,7 @@ class CartesianProductGenerator8
> const typename ParamGenerator<T8>::iterator begin8_;
> const typename ParamGenerator<T8>::iterator end8_;
> typename ParamGenerator<T8>::iterator current8_;
>- ParamType current_value_;
>+ linked_ptr<ParamType> current_value_;
> }; // class CartesianProductGenerator8::Iterator
> 
> // No implementation - assignment is unsupported.
>@@ -4011,10 +4333,10 @@ class CartesianProductGenerator8
> template <typename T1, typename T2, typename T3, typename T4, typename T5,
> typename T6, typename T7, typename T8, typename T9>
> class CartesianProductGenerator9
>- : public ParamGeneratorInterface< ::std::tuple<T1, T2, T3, T4, T5, T6,
>+ : public ParamGeneratorInterface< ::testing::tuple<T1, T2, T3, T4, T5, T6,
> T7, T8, T9> > {
> public:
>- typedef ::std::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9> ParamType;
>+ typedef ::testing::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9> ParamType;
> 
> CartesianProductGenerator9(const ParamGenerator<T1>& g1,
> const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
>@@ -4117,7 +4439,7 @@ class CartesianProductGenerator9
> virtual ParamIteratorInterface<ParamType>* Clone() const {
> return new Iterator(*this);
> }
>- virtual const ParamType* Current() const { return &current_value_; }
>+ virtual const ParamType* Current() const { return current_value_.get(); }
> virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
> // Having the same base generator guarantees that the other
> // iterator is of the same type and we can downcast.
>@@ -4177,9 +4499,9 @@ class CartesianProductGenerator9
> 
> void ComputeCurrentValue() {
> if (!AtEnd())
>- current_value_ = ParamType(*current1_, *current2_, *current3_,
>+ current_value_.reset(new ParamType(*current1_, *current2_, *current3_,
> *current4_, *current5_, *current6_, *current7_, *current8_,
>- *current9_);
>+ *current9_));
> }
> bool AtEnd() const {
> // We must report iterator past the end of the range when either of the
>@@ -4229,7 +4551,7 @@ class CartesianProductGenerator9
> const typename ParamGenerator<T9>::iterator begin9_;
> const typename ParamGenerator<T9>::iterator end9_;
> typename ParamGenerator<T9>::iterator current9_;
>- ParamType current_value_;
>+ linked_ptr<ParamType> current_value_;
> }; // class CartesianProductGenerator9::Iterator
> 
> // No implementation - assignment is unsupported.
>@@ -4250,10 +4572,10 @@ class CartesianProductGenerator9
> template <typename T1, typename T2, typename T3, typename T4, typename T5,
> typename T6, typename T7, typename T8, typename T9, typename T10>
> class CartesianProductGenerator10
>- : public ParamGeneratorInterface< ::std::tuple<T1, T2, T3, T4, T5, T6,
>+ : public ParamGeneratorInterface< ::testing::tuple<T1, T2, T3, T4, T5, T6,
> T7, T8, T9, T10> > {
> public:
>- typedef ::std::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ParamType;
>+ typedef ::testing::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ParamType;
> 
> CartesianProductGenerator10(const ParamGenerator<T1>& g1,
> const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
>@@ -4364,7 +4686,7 @@ class CartesianProductGenerator10
> virtual ParamIteratorInterface<ParamType>* Clone() const {
> return new Iterator(*this);
> }
>- virtual const ParamType* Current() const { return &current_value_; }
>+ virtual const ParamType* Current() const { return current_value_.get(); }
> virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
> // Having the same base generator guarantees that the other
> // iterator is of the same type and we can downcast.
>@@ -4428,9 +4750,9 @@ class CartesianProductGenerator10
> 
> void ComputeCurrentValue() {
> if (!AtEnd())
>- current_value_ = ParamType(*current1_, *current2_, *current3_,
>+ current_value_.reset(new ParamType(*current1_, *current2_, *current3_,
> *current4_, *current5_, *current6_, *current7_, *current8_,
>- *current9_, *current10_);
>+ *current9_, *current10_));
> }
> bool AtEnd() const {
> // We must report iterator past the end of the range when either of the
>@@ -4484,7 +4806,7 @@ class CartesianProductGenerator10
> const typename ParamGenerator<T10>::iterator begin10_;
> const typename ParamGenerator<T10>::iterator end10_;
> typename ParamGenerator<T10>::iterator current10_;
>- ParamType current_value_;
>+ linked_ptr<ParamType> current_value_;
> }; // class CartesianProductGenerator10::Iterator
> 
> // No implementation - assignment is unsupported.
>@@ -4515,8 +4837,8 @@ class CartesianProductHolder2 {
> CartesianProductHolder2(const Generator1& g1, const Generator2& g2)
> : g1_(g1), g2_(g2) {}
> template <typename T1, typename T2>
>- operator ParamGenerator< ::std::tuple<T1, T2> >() const {
>- return ParamGenerator< ::std::tuple<T1, T2> >(
>+ operator ParamGenerator< ::testing::tuple<T1, T2> >() const {
>+ return ParamGenerator< ::testing::tuple<T1, T2> >(
> new CartesianProductGenerator2<T1, T2>(
> static_cast<ParamGenerator<T1> >(g1_),
> static_cast<ParamGenerator<T2> >(g2_)));
>@@ -4537,8 +4859,8 @@ CartesianProductHolder3(const Generator1& g1, const Generator2& g2,
> const Generator3& g3)
> : g1_(g1), g2_(g2), g3_(g3) {}
> template <typename T1, typename T2, typename T3>
>- operator ParamGenerator< ::std::tuple<T1, T2, T3> >() const {
>- return ParamGenerator< ::std::tuple<T1, T2, T3> >(
>+ operator ParamGenerator< ::testing::tuple<T1, T2, T3> >() const {
>+ return ParamGenerator< ::testing::tuple<T1, T2, T3> >(
> new CartesianProductGenerator3<T1, T2, T3>(
> static_cast<ParamGenerator<T1> >(g1_),
> static_cast<ParamGenerator<T2> >(g2_),
>@@ -4562,8 +4884,8 @@ CartesianProductHolder4(const Generator1& g1, const Generator2& g2,
> const Generator3& g3, const Generator4& g4)
> : g1_(g1), g2_(g2), g3_(g3), g4_(g4) {}
> template <typename T1, typename T2, typename T3, typename T4>
>- operator ParamGenerator< ::std::tuple<T1, T2, T3, T4> >() const {
>- return ParamGenerator< ::std::tuple<T1, T2, T3, T4> >(
>+ operator ParamGenerator< ::testing::tuple<T1, T2, T3, T4> >() const {
>+ return ParamGenerator< ::testing::tuple<T1, T2, T3, T4> >(
> new CartesianProductGenerator4<T1, T2, T3, T4>(
> static_cast<ParamGenerator<T1> >(g1_),
> static_cast<ParamGenerator<T2> >(g2_),
>@@ -4589,8 +4911,8 @@ CartesianProductHolder5(const Generator1& g1, const Generator2& g2,
> const Generator3& g3, const Generator4& g4, const Generator5& g5)
> : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5) {}
> template <typename T1, typename T2, typename T3, typename T4, typename T5>
>- operator ParamGenerator< ::std::tuple<T1, T2, T3, T4, T5> >() const {
>- return ParamGenerator< ::std::tuple<T1, T2, T3, T4, T5> >(
>+ operator ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5> >() const {
>+ return ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5> >(
> new CartesianProductGenerator5<T1, T2, T3, T4, T5>(
> static_cast<ParamGenerator<T1> >(g1_),
> static_cast<ParamGenerator<T2> >(g2_),
>@@ -4620,8 +4942,8 @@ CartesianProductHolder6(const Generator1& g1, const Generator2& g2,
> : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6) {}
> template <typename T1, typename T2, typename T3, typename T4, typename T5,
> typename T6>
>- operator ParamGenerator< ::std::tuple<T1, T2, T3, T4, T5, T6> >() const {
>- return ParamGenerator< ::std::tuple<T1, T2, T3, T4, T5, T6> >(
>+ operator ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6> >() const {
>+ return ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6> >(
> new CartesianProductGenerator6<T1, T2, T3, T4, T5, T6>(
> static_cast<ParamGenerator<T1> >(g1_),
> static_cast<ParamGenerator<T2> >(g2_),
>@@ -4653,9 +4975,9 @@ CartesianProductHolder7(const Generator1& g1, const Generator2& g2,
> : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7) {}
> template <typename T1, typename T2, typename T3, typename T4, typename T5,
> typename T6, typename T7>
>- operator ParamGenerator< ::std::tuple<T1, T2, T3, T4, T5, T6,
>+ operator ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6,
> T7> >() const {
>- return ParamGenerator< ::std::tuple<T1, T2, T3, T4, T5, T6, T7> >(
>+ return ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6, T7> >(
> new CartesianProductGenerator7<T1, T2, T3, T4, T5, T6, T7>(
> static_cast<ParamGenerator<T1> >(g1_),
> static_cast<ParamGenerator<T2> >(g2_),
>@@ -4691,9 +5013,9 @@ CartesianProductHolder8(const Generator1& g1, const Generator2& g2,
> g8_(g8) {}
> template <typename T1, typename T2, typename T3, typename T4, typename T5,
> typename T6, typename T7, typename T8>
>- operator ParamGenerator< ::std::tuple<T1, T2, T3, T4, T5, T6, T7,
>+ operator ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6, T7,
> T8> >() const {
>- return ParamGenerator< ::std::tuple<T1, T2, T3, T4, T5, T6, T7, T8> >(
>+ return ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6, T7, T8> >(
> new CartesianProductGenerator8<T1, T2, T3, T4, T5, T6, T7, T8>(
> static_cast<ParamGenerator<T1> >(g1_),
> static_cast<ParamGenerator<T2> >(g2_),
>@@ -4732,9 +5054,9 @@ CartesianProductHolder9(const Generator1& g1, const Generator2& g2,
> g9_(g9) {}
> template <typename T1, typename T2, typename T3, typename T4, typename T5,
> typename T6, typename T7, typename T8, typename T9>
>- operator ParamGenerator< ::std::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
>+ operator ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
> T9> >() const {
>- return ParamGenerator< ::std::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
>+ return ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
> T9> >(
> new CartesianProductGenerator9<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
> static_cast<ParamGenerator<T1> >(g1_),
>@@ -4776,10 +5098,10 @@ CartesianProductHolder10(const Generator1& g1, const Generator2& g2,
> g9_(g9), g10_(g10) {}
> template <typename T1, typename T2, typename T3, typename T4, typename T5,
> typename T6, typename T7, typename T8, typename T9, typename T10>
>- operator ParamGenerator< ::std::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
>- T9, T10> >() const {
>- return ParamGenerator< ::std::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
>- T9, T10> >(
>+ operator ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9,
>+ T10> >() const {
>+ return ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9,
>+ T10> >(
> new CartesianProductGenerator10<T1, T2, T3, T4, T5, T6, T7, T8, T9,
> T10>(
> static_cast<ParamGenerator<T1> >(g1_),
>@@ -4810,11 +5132,9 @@ CartesianProductHolder10(const Generator1& g1, const Generator2& g2,
> const Generator10 g10_;
> }; // class CartesianProductHolder10
> 
>-#endif // GTEST_HAS_COMBINE
>+# endif // GTEST_HAS_COMBINE
> 
> } // namespace internal
> } // namespace testing
> 
>-#endif // GTEST_HAS_PARAM_TEST
>-
> #endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_
>diff --git a/Source/ThirdParty/gtest/include/gtest/internal/gtest-param-util-generated.h.pump b/Source/ThirdParty/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
>index baedfbc2d7e8341b5b559d9ce33b8d87453ded42..ae8c57b52ba1f78591c53a592983694741668bc4 100644
>--- a/Source/ThirdParty/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
>+++ b/Source/ThirdParty/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
>@@ -29,8 +29,7 @@ $var maxtuple = 10 $$ Maximum number of Combine arguments we want to support.
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: vladl@google.com (Vlad Losev)
>+
> 
> // Type and function utilities for implementing parameterized tests.
> // This file is generated by a SCRIPT. DO NOT EDIT BY HAND!
>@@ -39,19 +38,16 @@ $var maxtuple = 10 $$ Maximum number of Combine arguments we want to support.
> // and at most $maxtuple arguments in Combine. Please contact
> // googletestframework@googlegroups.com if you need more.
> // Please note that the number of arguments to Combine is limited
>-// by the maximum arity of the implementation of tr1::tuple which is
>+// by the maximum arity of the implementation of tuple which is
> // currently set at $maxtuple.
> 
>+// GOOGLETEST_CM0001 DO NOT DELETE
>+
> #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_
> #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_
> 
>-// scripts/fuse_gtest.py depends on gtest's own header being #included
>-// *unconditionally*. Therefore these #includes cannot be moved
>-// inside #if GTEST_HAS_PARAM_TEST.
>-#include <gtest/internal/gtest-param-util.h>
>-#include <gtest/internal/gtest-port.h>
>-
>-#if GTEST_HAS_PARAM_TEST
>+#include "gtest/internal/gtest-param-util.h"
>+#include "gtest/internal/gtest-port.h"
> 
> namespace testing {
> 
>@@ -59,8 +55,8 @@ namespace testing {
> // include/gtest/gtest-param-test.h.
> template <typename ForwardIterator>
> internal::ParamGenerator<
>- typename ::std::iterator_traits<ForwardIterator>::value_type> ValuesIn(
>- ForwardIterator begin, ForwardIterator end);
>+ typename ::testing::internal::IteratorTraits<ForwardIterator>::value_type>
>+ValuesIn(ForwardIterator begin, ForwardIterator end);
> 
> template <typename T, size_t N>
> internal::ParamGenerator<T> ValuesIn(const T (&array)[N]);
>@@ -72,33 +68,18 @@ internal::ParamGenerator<typename Container::value_type> ValuesIn(
> namespace internal {
> 
> // Used in the Values() function to provide polymorphic capabilities.
>-template <typename T1>
>-class ValueArray1 {
>- public:
>- explicit ValueArray1(T1 v1) : v1_(v1) {}
>-
>- template <typename T>
>- operator ParamGenerator<T>() const { return ValuesIn(&v1_, &v1_ + 1); }
>-
>- private:
>- // No implementation - assignment is unsupported.
>- void operator=(const ValueArray1& other);
>-
>- const T1 v1_;
>-};
>-
>-$range i 2..n
>+$range i 1..n
> $for i [[
> $range j 1..i
> 
> template <$for j, [[typename T$j]]>
> class ValueArray$i {
> public:
>- ValueArray$i($for j, [[T$j v$j]]) : $for j, [[v$(j)_(v$j)]] {}
>+ $if i==1 [[explicit ]]ValueArray$i($for j, [[T$j v$j]]) : $for j, [[v$(j)_(v$j)]] {}
> 
> template <typename T>
> operator ParamGenerator<T>() const {
>- const T array[] = {$for j, [[v$(j)_]]};
>+ const T array[] = {$for j, [[static_cast<T>(v$(j)_)]]};
> return ValuesIn(array);
> }
> 
>@@ -115,7 +96,7 @@ $for j [[
> 
> ]]
> 
>-#if GTEST_HAS_COMBINE
>+# if GTEST_HAS_COMBINE
> // INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
> //
> // Generates values from the Cartesian product of values produced
>@@ -128,9 +109,9 @@ $range k 2..i
> 
> template <$for j, [[typename T$j]]>
> class CartesianProductGenerator$i
>- : public ParamGeneratorInterface< ::std::tr1::tuple<$for j, [[T$j]]> > {
>+ : public ParamGeneratorInterface< ::testing::tuple<$for j, [[T$j]]> > {
> public:
>- typedef ::std::tr1::tuple<$for j, [[T$j]]> ParamType;
>+ typedef ::testing::tuple<$for j, [[T$j]]> ParamType;
> 
> CartesianProductGenerator$i($for j, [[const ParamGenerator<T$j>& g$j]])
> : $for j, [[g$(j)_(g$j)]] {}
>@@ -180,7 +161,7 @@ $for k [[
> virtual ParamIteratorInterface<ParamType>* Clone() const {
> return new Iterator(*this);
> }
>- virtual const ParamType* Current() const { return &current_value_; }
>+ virtual const ParamType* Current() const { return current_value_.get(); }
> virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
> // Having the same base generator guarantees that the other
> // iterator is of the same type and we can downcast.
>@@ -212,7 +193,7 @@ $for k [[
> 
> void ComputeCurrentValue() {
> if (!AtEnd())
>- current_value_ = ParamType($for j, [[*current$(j)_]]);
>+ current_value_.reset(new ParamType($for j, [[*current$(j)_]]));
> }
> bool AtEnd() const {
> // We must report iterator past the end of the range when either of the
>@@ -237,7 +218,7 @@ $for j [[
> typename ParamGenerator<T$j>::iterator current$(j)_;
> ]]
> 
>- ParamType current_value_;
>+ linked_ptr<ParamType> current_value_;
> }; // class CartesianProductGenerator$i::Iterator
> 
> // No implementation - assignment is unsupported.
>@@ -269,8 +250,8 @@ class CartesianProductHolder$i {
> CartesianProductHolder$i($for j, [[const Generator$j& g$j]])
> : $for j, [[g$(j)_(g$j)]] {}
> template <$for j, [[typename T$j]]>
>- operator ParamGenerator< ::std::tr1::tuple<$for j, [[T$j]]> >() const {
>- return ParamGenerator< ::std::tr1::tuple<$for j, [[T$j]]> >(
>+ operator ParamGenerator< ::testing::tuple<$for j, [[T$j]]> >() const {
>+ return ParamGenerator< ::testing::tuple<$for j, [[T$j]]> >(
> new CartesianProductGenerator$i<$for j, [[T$j]]>(
> $for j,[[
> 
>@@ -291,11 +272,9 @@ $for j [[
> 
> ]]
> 
>-#endif // GTEST_HAS_COMBINE
>+# endif // GTEST_HAS_COMBINE
> 
> } // namespace internal
> } // namespace testing
> 
>-#endif // GTEST_HAS_PARAM_TEST
>-
> #endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_
>diff --git a/Source/ThirdParty/gtest/include/gtest/internal/gtest-param-util.h b/Source/ThirdParty/gtest/include/gtest/internal/gtest-param-util.h
>index 0cbb58c21b7b89cd48a8d1c5cb520f311374cde2..d64f620c4c67434673c0a61e23960b615c34e784 100644
>--- a/Source/ThirdParty/gtest/include/gtest/internal/gtest-param-util.h
>+++ b/Source/ThirdParty/gtest/include/gtest/internal/gtest-param-util.h
>@@ -26,28 +26,49 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: vladl@google.com (Vlad Losev)
>+
> 
> // Type and function utilities for implementing parameterized tests.
> 
>+// GOOGLETEST_CM0001 DO NOT DELETE
>+
> #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
> #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
> 
>+#include <ctype.h>
>+
> #include <iterator>
>+#include <set>
> #include <utility>
> #include <vector>
> 
>-// scripts/fuse_gtest.py depends on gtest's own header being #included
>-// *unconditionally*. Therefore these #includes cannot be moved
>-// inside #if GTEST_HAS_PARAM_TEST.
>-#include <gtest/internal/gtest-internal.h>
>-#include <gtest/internal/gtest-linked_ptr.h>
>-#include <gtest/internal/gtest-port.h>
>-
>-#if GTEST_HAS_PARAM_TEST
>+#include "gtest/internal/gtest-internal.h"
>+#include "gtest/internal/gtest-linked_ptr.h"
>+#include "gtest/internal/gtest-port.h"
>+#include "gtest/gtest-printers.h"
> 
> namespace testing {
>+
>+// Input to a parameterized test name generator, describing a test parameter.
>+// Consists of the parameter value and the integer parameter index.
>+template <class ParamType>
>+struct TestParamInfo {
>+ TestParamInfo(const ParamType& a_param, size_t an_index) :
>+ param(a_param),
>+ index(an_index) {}
>+ ParamType param;
>+ size_t index;
>+};
>+
>+// A builtin parameterized test name generator which returns the result of
>+// testing::PrintToString.
>+struct PrintToStringParamName {
>+ template <class ParamType>
>+ std::string operator()(const TestParamInfo<ParamType>& info) const {
>+ return PrintToString(info.param);
>+ }
>+};
>+
> namespace internal {
> 
> // INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
>@@ -57,7 +78,7 @@ namespace internal {
> // TEST_P macro is used to define two tests with the same name
> // but in different namespaces.
> GTEST_API_ void ReportInvalidTestCaseType(const char* test_case_name,
>- const char* file, int line);
>+ CodeLocation code_location);
> 
> template <typename> class ParamGeneratorInterface;
> template <typename> class ParamGenerator;
>@@ -171,7 +192,7 @@ class ParamGenerator {
> iterator end() const { return iterator(impl_->End()); }
> 
> private:
>- ::testing::internal::linked_ptr<const ParamGeneratorInterface<T> > impl_;
>+ linked_ptr<const ParamGeneratorInterface<T> > impl_;
> };
> 
> // Generates values from a range of two comparable values. Can be used to
>@@ -205,7 +226,7 @@ class RangeGenerator : public ParamGeneratorInterface<T> {
> return base_;
> }
> virtual void Advance() {
>- value_ = value_ + step_;
>+ value_ = static_cast<T>(value_ + step_);
> index_++;
> }
> virtual ParamIteratorInterface<T>* Clone() const {
>@@ -242,7 +263,7 @@ class RangeGenerator : public ParamGeneratorInterface<T> {
> const T& end,
> const IncrementT& step) {
> int end_index = 0;
>- for (T i = begin; i < end; i = i + step)
>+ for (T i = begin; i < end; i = static_cast<T>(i + step))
> end_index++;
> return end_index;
> }
>@@ -285,7 +306,7 @@ class ValuesInIteratorRangeGenerator : public ParamGeneratorInterface<T> {
> public:
> Iterator(const ParamGeneratorInterface<T>* base,
> typename ContainerType::const_iterator iterator)
>- : base_(base), iterator_(iterator) {}
>+ : base_(base), iterator_(iterator) {}
> virtual ~Iterator() {}
> 
> virtual const ParamGeneratorInterface<T>* BaseGenerator() const {
>@@ -344,6 +365,37 @@ class ValuesInIteratorRangeGenerator : public ParamGeneratorInterface<T> {
> const ContainerType container_;
> }; // class ValuesInIteratorRangeGenerator
> 
>+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
>+//
>+// Default parameterized test name generator, returns a string containing the
>+// integer test parameter index.
>+template <class ParamType>
>+std::string DefaultParamName(const TestParamInfo<ParamType>& info) {
>+ Message name_stream;
>+ name_stream << info.index;
>+ return name_stream.GetString();
>+}
>+
>+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
>+//
>+// Parameterized test name overload helpers, which help the
>+// INSTANTIATE_TEST_CASE_P macro choose between the default parameterized
>+// test name generator and user param name generator.
>+template <class ParamType, class ParamNameGenFunctor>
>+ParamNameGenFunctor GetParamNameGen(ParamNameGenFunctor func) {
>+ return func;
>+}
>+
>+template <class ParamType>
>+struct ParamNameGenFunc {
>+ typedef std::string Type(const TestParamInfo<ParamType>&);
>+};
>+
>+template <class ParamType>
>+typename ParamNameGenFunc<ParamType>::Type *GetParamNameGen() {
>+ return DefaultParamName;
>+}
>+
> // INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
> //
> // Stores a parameter value and later creates tests parameterized with that
>@@ -416,7 +468,7 @@ class ParameterizedTestCaseInfoBase {
> virtual ~ParameterizedTestCaseInfoBase() {}
> 
> // Base part of test case name for display purposes.
>- virtual const String& GetTestCaseName() const = 0;
>+ virtual const std::string& GetTestCaseName() const = 0;
> // Test case id to verify identity.
> virtual TypeId GetTestCaseTypeId() const = 0;
> // UnitTest class invokes this method to register tests in this
>@@ -448,12 +500,14 @@ class ParameterizedTestCaseInfo : public ParameterizedTestCaseInfoBase {
> typedef typename TestCase::ParamType ParamType;
> // A function that returns an instance of appropriate generator type.
> typedef ParamGenerator<ParamType>(GeneratorCreationFunc)();
>+ typedef typename ParamNameGenFunc<ParamType>::Type ParamNameGeneratorFunc;
> 
>- explicit ParameterizedTestCaseInfo(const char* name)
>- : test_case_name_(name) {}
>+ explicit ParameterizedTestCaseInfo(
>+ const char* name, CodeLocation code_location)
>+ : test_case_name_(name), code_location_(code_location) {}
> 
> // Test case base name for display purposes.
>- virtual const String& GetTestCaseName() const { return test_case_name_; }
>+ virtual const std::string& GetTestCaseName() const { return test_case_name_; }
> // Test case id to verify identity.
> virtual TypeId GetTestCaseTypeId() const { return GetTypeId<TestCase>(); }
> // TEST_P macro uses AddTestPattern() to record information
>@@ -471,11 +525,12 @@ class ParameterizedTestCaseInfo : public ParameterizedTestCaseInfoBase {
> }
> // INSTANTIATE_TEST_CASE_P macro uses AddGenerator() to record information
> // about a generator.
>- int AddTestCaseInstantiation(const char* instantiation_name,
>+ int AddTestCaseInstantiation(const std::string& instantiation_name,
> GeneratorCreationFunc* func,
>- const char* /* file */,
>- int /* line */) {
>- instantiations_.push_back(::std::make_pair(instantiation_name, func));
>+ ParamNameGeneratorFunc* name_func,
>+ const char* file, int line) {
>+ instantiations_.push_back(
>+ InstantiationInfo(instantiation_name, func, name_func, file, line));
> return 0; // Return value used only to run this method in namespace scope.
> }
> // UnitTest class invokes this method to register tests in this test case
>@@ -490,26 +545,45 @@ class ParameterizedTestCaseInfo : public ParameterizedTestCaseInfoBase {
> for (typename InstantiationContainer::iterator gen_it =
> instantiations_.begin(); gen_it != instantiations_.end();
> ++gen_it) {
>- const String& instantiation_name = gen_it->first;
>- ParamGenerator<ParamType> generator((*gen_it->second)());
>+ const std::string& instantiation_name = gen_it->name;
>+ ParamGenerator<ParamType> generator((*gen_it->generator)());
>+ ParamNameGeneratorFunc* name_func = gen_it->name_func;
>+ const char* file = gen_it->file;
>+ int line = gen_it->line;
> 
>- Message test_case_name_stream;
>+ std::string test_case_name;
> if ( !instantiation_name.empty() )
>- test_case_name_stream << instantiation_name.c_str() << "/";
>- test_case_name_stream << test_info->test_case_base_name.c_str();
>+ test_case_name = instantiation_name + "/";
>+ test_case_name += test_info->test_case_base_name;
> 
>- int i = 0;
>+ size_t i = 0;
>+ std::set<std::string> test_param_names;
> for (typename ParamGenerator<ParamType>::iterator param_it =
> generator.begin();
> param_it != generator.end(); ++param_it, ++i) {
> Message test_name_stream;
>- test_name_stream << test_info->test_base_name.c_str() << "/" << i;
>- ::testing::internal::MakeAndRegisterTestInfo(
>- test_case_name_stream.GetString().c_str(),
>+
>+ std::string param_name = name_func(
>+ TestParamInfo<ParamType>(*param_it, i));
>+
>+ GTEST_CHECK_(IsValidParamName(param_name))
>+ << "Parameterized test name '" << param_name
>+ << "' is invalid, in " << file
>+ << " line " << line << std::endl;
>+
>+ GTEST_CHECK_(test_param_names.count(param_name) == 0)
>+ << "Duplicate parameterized test name '" << param_name
>+ << "', in " << file << " line " << line << std::endl;
>+
>+ test_param_names.insert(param_name);
>+
>+ test_name_stream << test_info->test_base_name << "/" << param_name;
>+ MakeAndRegisterTestInfo(
>+ test_case_name.c_str(),
> test_name_stream.GetString().c_str(),
>- "", // test_case_comment
>- "", // comment; TODO(vladl@google.com): provide parameter value
>- // representation.
>+ NULL, // No type parameter.
>+ PrintToString(*param_it).c_str(),
>+ code_location_,
> GetTestCaseTypeId(),
> TestCase::SetUpTestCase,
> TestCase::TearDownTestCase,
>@@ -530,17 +604,50 @@ class ParameterizedTestCaseInfo : public ParameterizedTestCaseInfoBase {
> test_base_name(a_test_base_name),
> test_meta_factory(a_test_meta_factory) {}
> 
>- const String test_case_base_name;
>- const String test_base_name;
>+ const std::string test_case_base_name;
>+ const std::string test_base_name;
> const scoped_ptr<TestMetaFactoryBase<ParamType> > test_meta_factory;
> };
> typedef ::std::vector<linked_ptr<TestInfo> > TestInfoContainer;
>- // Keeps pairs of <Instantiation name, Sequence generator creation function>
>- // received from INSTANTIATE_TEST_CASE_P macros.
>- typedef ::std::vector<std::pair<String, GeneratorCreationFunc*> >
>- InstantiationContainer;
>+ // Records data received from INSTANTIATE_TEST_CASE_P macros:
>+ // <Instantiation name, Sequence generator creation function,
>+ // Name generator function, Source file, Source line>
>+ struct InstantiationInfo {
>+ InstantiationInfo(const std::string &name_in,
>+ GeneratorCreationFunc* generator_in,
>+ ParamNameGeneratorFunc* name_func_in,
>+ const char* file_in,
>+ int line_in)
>+ : name(name_in),
>+ generator(generator_in),
>+ name_func(name_func_in),
>+ file(file_in),
>+ line(line_in) {}
>+
>+ std::string name;
>+ GeneratorCreationFunc* generator;
>+ ParamNameGeneratorFunc* name_func;
>+ const char* file;
>+ int line;
>+ };
>+ typedef ::std::vector<InstantiationInfo> InstantiationContainer;
> 
>- const String test_case_name_;
>+ static bool IsValidParamName(const std::string& name) {
>+ // Check for empty string
>+ if (name.empty())
>+ return false;
>+
>+ // Check for invalid characters
>+ for (std::string::size_type index = 0; index < name.size(); ++index) {
>+ if (!isalnum(name[index]) && name[index] != '_')
>+ return false;
>+ }
>+
>+ return true;
>+ }
>+
>+ const std::string test_case_name_;
>+ CodeLocation code_location_;
> TestInfoContainer tests_;
> InstantiationContainer instantiations_;
> 
>@@ -568,8 +675,7 @@ class ParameterizedTestCaseRegistry {
> template <class TestCase>
> ParameterizedTestCaseInfo<TestCase>* GetTestCasePatternHolder(
> const char* test_case_name,
>- const char* file,
>- int line) {
>+ CodeLocation code_location) {
> ParameterizedTestCaseInfo<TestCase>* typed_test_info = NULL;
> for (TestCaseInfoContainer::iterator it = test_case_infos_.begin();
> it != test_case_infos_.end(); ++it) {
>@@ -578,8 +684,8 @@ class ParameterizedTestCaseRegistry {
> // Complain about incorrect usage of Google Test facilities
> // and terminate the program since we cannot guaranty correct
> // test case setup and tear-down in this case.
>- ReportInvalidTestCaseType(test_case_name, file, line);
>- abort();
>+ ReportInvalidTestCaseType(test_case_name, code_location);
>+ posix::Abort();
> } else {
> // At this point we are sure that the object we found is of the same
> // type we are looking for, so we downcast it to that type
>@@ -591,7 +697,8 @@ class ParameterizedTestCaseRegistry {
> }
> }
> if (typed_test_info == NULL) {
>- typed_test_info = new ParameterizedTestCaseInfo<TestCase>(test_case_name);
>+ typed_test_info = new ParameterizedTestCaseInfo<TestCase>(
>+ test_case_name, code_location);
> test_case_infos_.push_back(typed_test_info);
> }
> return typed_test_info;
>@@ -614,6 +721,4 @@ class ParameterizedTestCaseRegistry {
> } // namespace internal
> } // namespace testing
> 
>-#endif // GTEST_HAS_PARAM_TEST
>-
> #endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
>diff --git a/Source/ThirdParty/gtest/include/gtest/internal/gtest-port-arch.h b/Source/ThirdParty/gtest/include/gtest/internal/gtest-port-arch.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..f83700e06d98c36f6487291c3f931807af353f74
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/include/gtest/internal/gtest-port-arch.h
>@@ -0,0 +1,100 @@
>+// Copyright 2015, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+//
>+// The Google C++ Testing and Mocking Framework (Google Test)
>+//
>+// This header file defines the GTEST_OS_* macro.
>+// It is separate from gtest-port.h so that custom/gtest-port.h can include it.
>+
>+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
>+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
>+
>+// Determines the platform on which Google Test is compiled.
>+#ifdef __CYGWIN__
>+# define GTEST_OS_CYGWIN 1
>+#elif defined __SYMBIAN32__
>+# define GTEST_OS_SYMBIAN 1
>+#elif defined _WIN32
>+# define GTEST_OS_WINDOWS 1
>+# ifdef _WIN32_WCE
>+# define GTEST_OS_WINDOWS_MOBILE 1
>+# elif defined(__MINGW__) || defined(__MINGW32__)
>+# define GTEST_OS_WINDOWS_MINGW 1
>+# elif defined(WINAPI_FAMILY)
>+# include <winapifamily.h>
>+# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
>+# define GTEST_OS_WINDOWS_DESKTOP 1
>+# elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP)
>+# define GTEST_OS_WINDOWS_PHONE 1
>+# elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
>+# define GTEST_OS_WINDOWS_RT 1
>+# elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_TV_TITLE)
>+# define GTEST_OS_WINDOWS_PHONE 1
>+# define GTEST_OS_WINDOWS_TV_TITLE 1
>+# else
>+ // WINAPI_FAMILY defined but no known partition matched.
>+ // Default to desktop.
>+# define GTEST_OS_WINDOWS_DESKTOP 1
>+# endif
>+# else
>+# define GTEST_OS_WINDOWS_DESKTOP 1
>+# endif // _WIN32_WCE
>+#elif defined __APPLE__
>+# define GTEST_OS_MAC 1
>+# if TARGET_OS_IPHONE
>+# define GTEST_OS_IOS 1
>+# endif
>+#elif defined __FreeBSD__
>+# define GTEST_OS_FREEBSD 1
>+#elif defined __Fuchsia__
>+# define GTEST_OS_FUCHSIA 1
>+#elif defined __linux__
>+# define GTEST_OS_LINUX 1
>+# if defined __ANDROID__
>+# define GTEST_OS_LINUX_ANDROID 1
>+# endif
>+#elif defined __MVS__
>+# define GTEST_OS_ZOS 1
>+#elif defined(__sun) && defined(__SVR4)
>+# define GTEST_OS_SOLARIS 1
>+#elif defined(_AIX)
>+# define GTEST_OS_AIX 1
>+#elif defined(__hpux)
>+# define GTEST_OS_HPUX 1
>+#elif defined __native_client__
>+# define GTEST_OS_NACL 1
>+#elif defined __NetBSD__
>+# define GTEST_OS_NETBSD 1
>+#elif defined __OpenBSD__
>+# define GTEST_OS_OPENBSD 1
>+#elif defined __QNX__
>+# define GTEST_OS_QNX 1
>+#endif // __CYGWIN__
>+
>+#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
>diff --git a/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h b/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h
>index f8be80926f8987d3c9582861602010bff6e64d6d..786497d854c97f1b6ab9372a241c1fa155a30a54 100644
>--- a/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h
>+++ b/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h
>@@ -27,29 +27,57 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> //
>-// Authors: wan@google.com (Zhanyong Wan)
>-//
> // Low-level types and utilities for porting Google Test to various
>-// platforms. They are subject to change without notice. DO NOT USE
>-// THEM IN USER CODE.
>+// platforms. All macros ending with _ and symbols defined in an
>+// internal namespace are subject to change without notice. Code
>+// outside Google Test MUST NOT USE THEM DIRECTLY. Macros that don't
>+// end with _ are part of Google Test's public API and can be used by
>+// code outside Google Test.
>+//
>+// This file is fundamental to Google Test. All other Google Test source
>+// files are expected to #include this. Therefore, it cannot #include
>+// any other Google Test header.
>+
>+// GOOGLETEST_CM0001 DO NOT DELETE
> 
> #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
> #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
> 
>-// The user can define the following macros in the build script to
>-// control Google Test's behavior. If the user doesn't define a macro
>-// in this list, Google Test will define it.
>+// Environment-describing macros
>+// -----------------------------
>+//
>+// Google Test can be used in many different environments. Macros in
>+// this section tell Google Test what kind of environment it is being
>+// used in, such that Google Test can provide environment-specific
>+// features and implementations.
>+//
>+// Google Test tries to automatically detect the properties of its
>+// environment, so users usually don't need to worry about these
>+// macros. However, the automatic detection is not perfect.
>+// Sometimes it's necessary for a user to define some of the following
>+// macros in the build script to override Google Test's decisions.
>+//
>+// If the user doesn't define a macro in the list, Google Test will
>+// provide a default definition. After this header is #included, all
>+// macros in this list will be defined to either 1 or 0.
>+//
>+// Notes to maintainers:
>+// - Each macro here is a user-tweakable knob; do not grow the list
>+// lightly.
>+// - Use #if to key off these macros. Don't use #ifdef or "#if
>+// defined(...)", which will not work as these macros are ALWAYS
>+// defined.
> //
> // GTEST_HAS_CLONE - Define it to 1/0 to indicate that clone(2)
> // is/isn't available.
> // GTEST_HAS_EXCEPTIONS - Define it to 1/0 to indicate that exceptions
> // are enabled.
> // GTEST_HAS_GLOBAL_STRING - Define it to 1/0 to indicate that ::string
>-// is/isn't available (some systems define
>-// ::string, which is different to std::string).
>-// GTEST_HAS_GLOBAL_WSTRING - Define it to 1/0 to indicate that ::string
>-// is/isn't available (some systems define
>-// ::wstring, which is different to std::wstring).
>+// is/isn't available
>+// GTEST_HAS_GLOBAL_WSTRING - Define it to 1/0 to indicate that ::wstring
>+// is/isn't available
>+// GTEST_HAS_POSIX_RE - Define it to 1/0 to indicate that POSIX regular
>+// expressions are/aren't available.
> // GTEST_HAS_PTHREAD - Define it to 1/0 to indicate that <pthread.h>
> // is/isn't available.
> // GTEST_HAS_RTTI - Define it to 1/0 to indicate that RTTI is/isn't
>@@ -62,10 +90,16 @@
> // GTEST_HAS_SEH - Define it to 1/0 to indicate whether the
> // compiler supports Microsoft's "Structured
> // Exception Handling".
>+// GTEST_HAS_STREAM_REDIRECTION
>+// - Define it to 1/0 to indicate whether the
>+// platform supports I/O stream redirection using
>+// dup() and dup2().
> // GTEST_USE_OWN_TR1_TUPLE - Define it to 1/0 to indicate whether Google
> // Test's own tr1 tuple implementation should be
> // used. Unused when the user sets
> // GTEST_HAS_TR1_TUPLE to 0.
>+// GTEST_LANG_CXX11 - Define it to 1/0 to indicate that Google Test
>+// is building in C++11/C++98 mode.
> // GTEST_LINKED_AS_SHARED_LIBRARY
> // - Define to 1 when compiling tests that use
> // Google Test as a shared library (known as
>@@ -73,23 +107,43 @@
> // GTEST_CREATE_SHARED_LIBRARY
> // - Define to 1 when compiling Google Test itself
> // as a shared library.
>-
>-// This header defines the following utilities:
>+// GTEST_DEFAULT_DEATH_TEST_STYLE
>+// - The default value of --gtest_death_test_style.
>+// The legacy default has been "fast" in the open
>+// source version since 2008. The recommended value
>+// is "threadsafe", and can be set in
>+// custom/gtest-port.h.
>+
>+// Platform-indicating macros
>+// --------------------------
>+//
>+// Macros indicating the platform on which Google Test is being used
>+// (a macro is defined to 1 if compiled on the given platform;
>+// otherwise UNDEFINED -- it's never defined to 0.). Google Test
>+// defines these macros automatically. Code outside Google Test MUST
>+// NOT define them.
> //
>-// Macros indicating the current platform (defined to 1 if compiled on
>-// the given platform; otherwise undefined):
> // GTEST_OS_AIX - IBM AIX
> // GTEST_OS_CYGWIN - Cygwin
>-// GTEST_OS_LINUX - Linux
> // GTEST_OS_FREEBSD - FreeBSD
>-// GTEST_OS_HURD - GNU/Hurd
>+// GTEST_OS_FUCHSIA - Fuchsia
>+// GTEST_OS_HPUX - HP-UX
>+// GTEST_OS_LINUX - Linux
>+// GTEST_OS_LINUX_ANDROID - Google Android
> // GTEST_OS_MAC - Mac OS X
>+// GTEST_OS_IOS - iOS
>+// GTEST_OS_NACL - Google Native Client (NaCl)
>+// GTEST_OS_NETBSD - NetBSD
>+// GTEST_OS_OPENBSD - OpenBSD
>+// GTEST_OS_QNX - QNX
> // GTEST_OS_SOLARIS - Sun Solaris
> // GTEST_OS_SYMBIAN - Symbian
> // GTEST_OS_WINDOWS - Windows (Desktop, MinGW, or Mobile)
> // GTEST_OS_WINDOWS_DESKTOP - Windows Desktop
> // GTEST_OS_WINDOWS_MINGW - MinGW
> // GTEST_OS_WINDOWS_MOBILE - Windows Mobile
>+// GTEST_OS_WINDOWS_PHONE - Windows Phone
>+// GTEST_OS_WINDOWS_RT - Windows Store App/WinRT
> // GTEST_OS_ZOS - z/OS
> //
> // Among the platforms, Cygwin, Linux, Max OS X, and Windows have the
>@@ -99,20 +153,50 @@
> // googletestframework@googlegroups.com (patches for fixing them are
> // even more welcome!).
> //
>-// Note that it is possible that none of the GTEST_OS_* macros are defined.
>+// It is possible that none of the GTEST_OS_* macros are defined.
>+
>+// Feature-indicating macros
>+// -------------------------
>+//
>+// Macros indicating which Google Test features are available (a macro
>+// is defined to 1 if the corresponding feature is supported;
>+// otherwise UNDEFINED -- it's never defined to 0.). Google Test
>+// defines these macros automatically. Code outside Google Test MUST
>+// NOT define them.
>+//
>+// These macros are public so that portable tests can be written.
>+// Such tests typically surround code using a feature with an #if
>+// which controls that code. For example:
>+//
>+// #if GTEST_HAS_DEATH_TEST
>+// EXPECT_DEATH(DoSomethingDeadly());
>+// #endif
> //
>-// Macros indicating available Google Test features (defined to 1 if
>-// the corresponding feature is supported; otherwise undefined):
> // GTEST_HAS_COMBINE - the Combine() function (for value-parameterized
> // tests)
> // GTEST_HAS_DEATH_TEST - death tests
>-// GTEST_HAS_PARAM_TEST - value-parameterized tests
> // GTEST_HAS_TYPED_TEST - typed tests
> // GTEST_HAS_TYPED_TEST_P - type-parameterized tests
>-// GTEST_USES_POSIX_RE - enhanced POSIX regex is used.
>+// GTEST_IS_THREADSAFE - Google Test is thread-safe.
>+// GOOGLETEST_CM0007 DO NOT DELETE
>+// GTEST_USES_POSIX_RE - enhanced POSIX regex is used. Do not confuse with
>+// GTEST_HAS_POSIX_RE (see above) which users can
>+// define themselves.
> // GTEST_USES_SIMPLE_RE - our own simple regex is used;
>-// the above two are mutually exclusive.
>+// the above RE\b(s) are mutually exclusive.
> // GTEST_CAN_COMPARE_NULL - accepts untyped NULL in EXPECT_EQ().
>+
>+// Misc public macros
>+// ------------------
>+//
>+// GTEST_FLAG(flag_name) - references the variable corresponding to
>+// the given Google Test flag.
>+
>+// Internal utilities
>+// ------------------
>+//
>+// The following macros and utilities are for Google Test's INTERNAL
>+// use only. Code outside Google Test MUST NOT USE THEM DIRECTLY.
> //
> // Macros for basic C++ coding:
> // GTEST_AMBIGUOUS_ELSE_BLOCKER_ - for disabling a gcc warning.
>@@ -121,25 +205,34 @@
> // GTEST_DISALLOW_ASSIGN_ - disables operator=.
> // GTEST_DISALLOW_COPY_AND_ASSIGN_ - disables copy ctor and operator=.
> // GTEST_MUST_USE_RESULT_ - declares that a function's result must be used.
>+// GTEST_INTENTIONAL_CONST_COND_PUSH_ - start code section where MSVC C4127 is
>+// suppressed (constant conditional).
>+// GTEST_INTENTIONAL_CONST_COND_POP_ - finish code section where MSVC C4127
>+// is suppressed.
>+//
>+// C++11 feature wrappers:
>+//
>+// testing::internal::forward - portability wrapper for std::forward.
>+// testing::internal::move - portability wrapper for std::move.
> //
> // Synchronization:
> // Mutex, MutexLock, ThreadLocal, GetThreadCount()
>-// - synchronization primitives.
>-// GTEST_IS_THREADSAFE - defined to 1 to indicate that the above
>-// synchronization primitives have real implementations
>-// and Google Test is thread-safe; or 0 otherwise.
>+// - synchronization primitives.
> //
> // Template meta programming:
> // is_pointer - as in TR1; needed on Symbian and IBM XL C/C++ only.
>+// IteratorTraits - partial implementation of std::iterator_traits, which
>+// is not available in libCstd when compiled with Sun C++.
> //
> // Smart pointers:
> // scoped_ptr - as in TR2.
> //
> // Regular expressions:
> // RE - a simple regular expression class using the POSIX
>-// Extended Regular Expression syntax. Not available on
>-// Windows.
>-//
>+// Extended Regular Expression syntax on UNIX-like platforms
>+// GOOGLETEST_CM0008 DO NOT DELETE
>+// or a reduced regular exception syntax on other
>+// platforms, including Windows.
> // Logging:
> // GTEST_LOG_() - logs messages at the specified severity level.
> // LogToStderr() - directs all log messages to stderr.
>@@ -160,10 +253,9 @@
> // BiggestInt - the biggest signed integer type.
> //
> // Command-line utilities:
>-// GTEST_FLAG() - references a flag.
> // GTEST_DECLARE_*() - declares a flag.
> // GTEST_DEFINE_*() - defines a flag.
>-// GetArgvs() - returns the command line as a vector of strings.
>+// GetInjectableArgvs() - returns the command line as a vector of strings.
> //
> // Environment variable utilities:
> // GetEnv() - gets the value of an environment variable.
>@@ -171,171 +263,305 @@
> // Int32FromGTestEnv() - parses an Int32 environment variable.
> // StringFromGTestEnv() - parses a string environment variable.
> 
>-#include <stddef.h> // For ptrdiff_t
>+#include <ctype.h> // for isspace, etc
>+#include <stddef.h> // for ptrdiff_t
> #include <stdlib.h>
> #include <stdio.h>
> #include <string.h>
> #ifndef _WIN32_WCE
>-#include <sys/stat.h>
>+# include <sys/types.h>
>+# include <sys/stat.h>
> #endif // !_WIN32_WCE
> 
>-#include <wtf/Platform.h>
>-#include <wtf/ExportMacros.h>
>-#include <JavaScriptCore/JSExportMacros.h>
>-#include <wtf/Assertions.h>
>-#include <wtf/FastMalloc.h>
>+#if defined __APPLE__
>+# include <AvailabilityMacros.h>
>+# include <TargetConditionals.h>
>+#endif
> 
>+// Brings in the definition of HAS_GLOBAL_STRING. This must be done
>+// BEFORE we test HAS_GLOBAL_STRING.
>+#include <string> // NOLINT
>+#include <algorithm> // NOLINT
> #include <iostream> // NOLINT
> #include <sstream> // NOLINT
>-#include <string> // NOLINT
>+#include <utility>
>+#include <vector> // NOLINT
>+
>+#include "gtest/internal/gtest-port-arch.h"
>+#include "gtest/internal/custom/gtest-port.h"
>+
>+#if !defined(GTEST_DEV_EMAIL_)
>+# define GTEST_DEV_EMAIL_ "googletestframework@@googlegroups.com"
>+# define GTEST_FLAG_PREFIX_ "gtest_"
>+# define GTEST_FLAG_PREFIX_DASH_ "gtest-"
>+# define GTEST_FLAG_PREFIX_UPPER_ "GTEST_"
>+# define GTEST_NAME_ "Google Test"
>+# define GTEST_PROJECT_URL_ "https://github.com/google/googletest/"
>+#endif // !defined(GTEST_DEV_EMAIL_)
> 
>-#define GTEST_DEV_EMAIL_ "googletestframework@@googlegroups.com"
>-#define GTEST_FLAG_PREFIX_ "gtest_"
>-#define GTEST_FLAG_PREFIX_DASH_ "gtest-"
>-#define GTEST_FLAG_PREFIX_UPPER_ "GTEST_"
>-#define GTEST_NAME_ "Google Test"
>-#define GTEST_PROJECT_URL_ "http://code.google.com/p/googletest/"
>+#if !defined(GTEST_INIT_GOOGLE_TEST_NAME_)
>+# define GTEST_INIT_GOOGLE_TEST_NAME_ "testing::InitGoogleTest"
>+#endif // !defined(GTEST_INIT_GOOGLE_TEST_NAME_)
> 
> // Determines the version of gcc that is used to compile this.
> #ifdef __GNUC__
> // 40302 means version 4.3.2.
>-#define GTEST_GCC_VER_ \
>+# define GTEST_GCC_VER_ \
> (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__)
> #endif // __GNUC__
> 
>-// Determines the platform on which Google Test is compiled.
>-#ifdef __CYGWIN__
>-#define GTEST_OS_CYGWIN 1
>-#elif defined __SYMBIAN32__
>-#define GTEST_OS_SYMBIAN 1
>-#elif defined _WIN32
>-#define GTEST_OS_WINDOWS 1
>-#ifdef _WIN32_WCE
>-#define GTEST_OS_WINDOWS_MOBILE 1
>-#elif defined(__MINGW__) || defined(__MINGW32__)
>-#define GTEST_OS_WINDOWS_MINGW 1
>+// Macros for disabling Microsoft Visual C++ warnings.
>+//
>+// GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 4385)
>+// /* code that triggers warnings C4800 and C4385 */
>+// GTEST_DISABLE_MSC_WARNINGS_POP_()
>+#if _MSC_VER >= 1400
>+# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings) \
>+ __pragma(warning(push)) \
>+ __pragma(warning(disable: warnings))
>+# define GTEST_DISABLE_MSC_WARNINGS_POP_() \
>+ __pragma(warning(pop))
> #else
>-#define GTEST_OS_WINDOWS_DESKTOP 1
>-#endif // _WIN32_WCE
>-#elif defined __APPLE__
>-#define GTEST_OS_MAC 1
>-#elif defined __linux__
>-#define GTEST_OS_LINUX 1
>-#elif defined __GNU__
>-#define GTEST_OS_HURD 1
>-#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
>-#define GTEST_OS_FREEBSD 1
>-#elif defined __MVS__
>-#define GTEST_OS_ZOS 1
>-#elif defined(__sun) && defined(__SVR4)
>-#define GTEST_OS_SOLARIS 1
>-#elif defined(_AIX)
>-#define GTEST_OS_AIX 1
>-#endif // __CYGWIN__
>-
>-#if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_SYMBIAN || \
>- GTEST_OS_SOLARIS || GTEST_OS_AIX || GTEST_OS_FREEBSD || GTEST_OS_HURD
>+// Older versions of MSVC don't have __pragma.
>+# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings)
>+# define GTEST_DISABLE_MSC_WARNINGS_POP_()
>+#endif
>+
>+// Clang on Windows does not understand MSVC's pragma warning.
>+// We need clang-specific way to disable function deprecation warning.
>+#ifdef __clang__
>+# define GTEST_DISABLE_MSC_DEPRECATED_PUSH_() \
>+ _Pragma("clang diagnostic push") \
>+ _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") \
>+ _Pragma("clang diagnostic ignored \"-Wdeprecated-implementations\"")
>+#define GTEST_DISABLE_MSC_DEPRECATED_POP_() \
>+ _Pragma("clang diagnostic pop")
>+#else
>+# define GTEST_DISABLE_MSC_DEPRECATED_PUSH_() \
>+ GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996)
>+# define GTEST_DISABLE_MSC_DEPRECATED_POP_() \
>+ GTEST_DISABLE_MSC_WARNINGS_POP_()
>+#endif
>+
>+#ifndef GTEST_LANG_CXX11
>+// gcc and clang define __GXX_EXPERIMENTAL_CXX0X__ when
>+// -std={c,gnu}++{0x,11} is passed. The C++11 standard specifies a
>+// value for __cplusplus, and recent versions of clang, gcc, and
>+// probably other compilers set that too in C++11 mode.
>+# if __GXX_EXPERIMENTAL_CXX0X__ || __cplusplus >= 201103L || _MSC_VER >= 1900
>+// Compiling in at least C++11 mode.
>+# define GTEST_LANG_CXX11 1
>+# else
>+# define GTEST_LANG_CXX11 0
>+# endif
>+#endif
>+
>+// Distinct from C++11 language support, some environments don't provide
>+// proper C++11 library support. Notably, it's possible to build in
>+// C++11 mode when targeting Mac OS X 10.6, which has an old libstdc++
>+// with no C++11 support.
>+//
>+// libstdc++ has sufficient C++11 support as of GCC 4.6.0, __GLIBCXX__
>+// 20110325, but maintenance releases in the 4.4 and 4.5 series followed
>+// this date, so check for those versions by their date stamps.
>+// https://gcc.gnu.org/onlinedocs/libstdc++/manual/abi.html#abi.versioning
>+#if GTEST_LANG_CXX11 && \
>+ (!defined(__GLIBCXX__) || ( \
>+ __GLIBCXX__ >= 20110325ul && /* GCC >= 4.6.0 */ \
>+ /* Blacklist of patch releases of older branches: */ \
>+ __GLIBCXX__ != 20110416ul && /* GCC 4.4.6 */ \
>+ __GLIBCXX__ != 20120313ul && /* GCC 4.4.7 */ \
>+ __GLIBCXX__ != 20110428ul && /* GCC 4.5.3 */ \
>+ __GLIBCXX__ != 20120702ul)) /* GCC 4.5.4 */
>+# define GTEST_STDLIB_CXX11 1
>+#endif
>+
>+// Only use C++11 library features if the library provides them.
>+#if GTEST_STDLIB_CXX11
>+# define GTEST_HAS_STD_BEGIN_AND_END_ 1
>+# define GTEST_HAS_STD_FORWARD_LIST_ 1
>+# if !defined(_MSC_VER) || (_MSC_FULL_VER >= 190023824)
>+// works only with VS2015U2 and better
>+# define GTEST_HAS_STD_FUNCTION_ 1
>+# endif
>+# define GTEST_HAS_STD_INITIALIZER_LIST_ 1
>+# define GTEST_HAS_STD_MOVE_ 1
>+# define GTEST_HAS_STD_UNIQUE_PTR_ 1
>+# define GTEST_HAS_STD_SHARED_PTR_ 1
>+# define GTEST_HAS_UNORDERED_MAP_ 1
>+# define GTEST_HAS_UNORDERED_SET_ 1
>+#endif
>+
>+// C++11 specifies that <tuple> provides std::tuple.
>+// Some platforms still might not have it, however.
>+#if GTEST_LANG_CXX11
>+# define GTEST_HAS_STD_TUPLE_ 1
>+# if defined(__clang__)
>+// Inspired by
>+// https://clang.llvm.org/docs/LanguageExtensions.html#include-file-checking-macros
>+# if defined(__has_include) && !__has_include(<tuple>)
>+# undef GTEST_HAS_STD_TUPLE_
>+# endif
>+# elif defined(_MSC_VER)
>+// Inspired by boost/config/stdlib/dinkumware.hpp
>+# if defined(_CPPLIB_VER) && _CPPLIB_VER < 520
>+# undef GTEST_HAS_STD_TUPLE_
>+# endif
>+# elif defined(__GLIBCXX__)
>+// Inspired by boost/config/stdlib/libstdcpp3.hpp,
>+// http://gcc.gnu.org/gcc-4.2/changes.html and
>+// https://web.archive.org/web/20140227044429/gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt01ch01.html#manual.intro.status.standard.200x
>+# if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2)
>+# undef GTEST_HAS_STD_TUPLE_
>+# endif
>+# endif
>+#endif
>+
>+// Brings in definitions for functions used in the testing::internal::posix
>+// namespace (read, write, close, chdir, isatty, stat). We do not currently
>+// use them on Windows Mobile.
>+#if GTEST_OS_WINDOWS
>+# if !GTEST_OS_WINDOWS_MOBILE
>+# include <direct.h>
>+# include <io.h>
>+# endif
>+// In order to avoid having to include <windows.h>, use forward declaration
>+#if GTEST_OS_WINDOWS_MINGW && !defined(__MINGW64_VERSION_MAJOR)
>+// MinGW defined _CRITICAL_SECTION and _RTL_CRITICAL_SECTION as two
>+// separate (equivalent) structs, instead of using typedef
>+typedef struct _CRITICAL_SECTION GTEST_CRITICAL_SECTION;
>+#else
>+// Assume CRITICAL_SECTION is a typedef of _RTL_CRITICAL_SECTION.
>+// This assumption is verified by
>+// WindowsTypesTest.CRITICAL_SECTIONIs_RTL_CRITICAL_SECTION.
>+typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
>+#endif
>+#else
>+// This assumes that non-Windows OSes provide unistd.h. For OSes where this
>+// is not the case, we need to include headers that provide the functions
>+// mentioned above.
>+# include <unistd.h>
>+# include <strings.h>
>+#endif // GTEST_OS_WINDOWS
>+
>+#if GTEST_OS_LINUX_ANDROID
>+// Used to define __ANDROID_API__ matching the target NDK API level.
>+# include <android/api-level.h> // NOLINT
>+#endif
>+
>+// Defines this to true iff Google Test can use POSIX regular expressions.
>+#ifndef GTEST_HAS_POSIX_RE
>+# if GTEST_OS_LINUX_ANDROID
>+// On Android, <regex.h> is only available starting with Gingerbread.
>+# define GTEST_HAS_POSIX_RE (__ANDROID_API__ >= 9)
>+# else
>+# define GTEST_HAS_POSIX_RE (!GTEST_OS_WINDOWS)
>+# endif
>+#endif
>+
>+#if GTEST_USES_PCRE
>+// The appropriate headers have already been included.
>+
>+#elif GTEST_HAS_POSIX_RE
> 
> // On some platforms, <regex.h> needs someone to define size_t, and
> // won't compile otherwise. We can #include it here as we already
> // included <stdlib.h>, which is guaranteed to define size_t through
> // <stddef.h>.
>-#if HAVE(REGEX_H)
>-#include <regex.h> // NOLINT
>-#define GTEST_USES_POSIX_RE 1
>-#else
>-#define GTEST_USES_SIMPLE_RE 1
>-#endif
>-#include <strings.h> // NOLINT
>-#include <sys/types.h> // NOLINT
>-#include <time.h> // NOLINT
>-#include <unistd.h> // NOLINT
>+# include <regex.h> // NOLINT
> 
>+# define GTEST_USES_POSIX_RE 1
> 
> #elif GTEST_OS_WINDOWS
> 
>-#if !GTEST_OS_WINDOWS_MOBILE
>-#include <direct.h> // NOLINT
>-#include <io.h> // NOLINT
>-#endif
>-
> // <regex.h> is not available on Windows. Use our own simple regex
> // implementation instead.
>-#define GTEST_USES_SIMPLE_RE 1
>+# define GTEST_USES_SIMPLE_RE 1
> 
> #else
> 
> // <regex.h> may not be available on this platform. Use our own
> // simple regex implementation instead.
>-#define GTEST_USES_SIMPLE_RE 1
>+# define GTEST_USES_SIMPLE_RE 1
> 
>-#endif // GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC ||
>- // GTEST_OS_SYMBIAN || GTEST_OS_SOLARIS || GTEST_OS_AIX ||
>- // GTEST_OS_FREEBSD || GTEST_OS_HURD
>+#endif // GTEST_USES_PCRE
> 
> #ifndef GTEST_HAS_EXCEPTIONS
> // The user didn't tell us whether exceptions are enabled, so we need
> // to figure it out.
>-#if defined(_MSC_VER) || defined(__BORLANDC__)
>-// MSVC's and C++Builder's implementations of the STL use the _HAS_EXCEPTIONS
>+# if defined(_MSC_VER) && defined(_CPPUNWIND)
>+// MSVC defines _CPPUNWIND to 1 iff exceptions are enabled.
>+# define GTEST_HAS_EXCEPTIONS 1
>+# elif defined(__BORLANDC__)
>+// C++Builder's implementation of the STL uses the _HAS_EXCEPTIONS
> // macro to enable exceptions, so we'll do the same.
> // Assumes that exceptions are enabled by default.
>-#ifndef _HAS_EXCEPTIONS
>-#define _HAS_EXCEPTIONS 1
>-#endif // _HAS_EXCEPTIONS
>-#define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS
>-#elif defined(__GNUC__) && __EXCEPTIONS
>+# ifndef _HAS_EXCEPTIONS
>+# define _HAS_EXCEPTIONS 1
>+# endif // _HAS_EXCEPTIONS
>+# define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS
>+# elif defined(__clang__)
>+// clang defines __EXCEPTIONS iff exceptions are enabled before clang 220714,
>+// but iff cleanups are enabled after that. In Obj-C++ files, there can be
>+// cleanups for ObjC exceptions which also need cleanups, even if C++ exceptions
>+// are disabled. clang has __has_feature(cxx_exceptions) which checks for C++
>+// exceptions starting at clang r206352, but which checked for cleanups prior to
>+// that. To reliably check for C++ exception availability with clang, check for
>+// __EXCEPTIONS && __has_feature(cxx_exceptions).
>+# define GTEST_HAS_EXCEPTIONS (__EXCEPTIONS && __has_feature(cxx_exceptions))
>+# elif defined(__GNUC__) && __EXCEPTIONS
> // gcc defines __EXCEPTIONS to 1 iff exceptions are enabled.
>-#define GTEST_HAS_EXCEPTIONS 1
>-#elif defined(__SUNPRO_CC)
>+# define GTEST_HAS_EXCEPTIONS 1
>+# elif defined(__SUNPRO_CC)
> // Sun Pro CC supports exceptions. However, there is no compile-time way of
> // detecting whether they are enabled or not. Therefore, we assume that
> // they are enabled unless the user tells us otherwise.
>-#define GTEST_HAS_EXCEPTIONS 1
>-#elif defined(__IBMCPP__) && __EXCEPTIONS
>+# define GTEST_HAS_EXCEPTIONS 1
>+# elif defined(__IBMCPP__) && __EXCEPTIONS
> // xlC defines __EXCEPTIONS to 1 iff exceptions are enabled.
>-#define GTEST_HAS_EXCEPTIONS 1
>-#else
>+# define GTEST_HAS_EXCEPTIONS 1
>+# elif defined(__HP_aCC)
>+// Exception handling is in effect by default in HP aCC compiler. It has to
>+// be turned of by +noeh compiler option if desired.
>+# define GTEST_HAS_EXCEPTIONS 1
>+# else
> // For other compilers, we assume exceptions are disabled to be
> // conservative.
>-#define GTEST_HAS_EXCEPTIONS 0
>-#endif // defined(_MSC_VER) || defined(__BORLANDC__)
>+# define GTEST_HAS_EXCEPTIONS 0
>+# endif // defined(_MSC_VER) || defined(__BORLANDC__)
> #endif // GTEST_HAS_EXCEPTIONS
> 
> #if !defined(GTEST_HAS_STD_STRING)
> // Even though we don't use this macro any longer, we keep it in case
> // some clients still depend on it.
>-#define GTEST_HAS_STD_STRING 1
>+# define GTEST_HAS_STD_STRING 1
> #elif !GTEST_HAS_STD_STRING
> // The user told us that ::std::string isn't available.
>-#error "Google Test cannot be used where ::std::string isn't available."
>+# error "::std::string isn't available."
> #endif // !defined(GTEST_HAS_STD_STRING)
> 
> #ifndef GTEST_HAS_GLOBAL_STRING
>-// The user didn't tell us whether ::string is available, so we need
>-// to figure it out.
>-
>-#define GTEST_HAS_GLOBAL_STRING 0
>-
>+# define GTEST_HAS_GLOBAL_STRING 0
> #endif // GTEST_HAS_GLOBAL_STRING
> 
> #ifndef GTEST_HAS_STD_WSTRING
> // The user didn't tell us whether ::std::wstring is available, so we need
> // to figure it out.
>-// TODO(wan@google.com): uses autoconf to detect whether ::std::wstring
>+// FIXME: uses autoconf to detect whether ::std::wstring
> // is available.
> 
>-// Cygwin 1.5 and below doesn't support ::std::wstring.
>-// Cygwin 1.7 might add wstring support; this should be updated when clear.
>-// Solaris' libc++ doesn't support it either.
>-#define GTEST_HAS_STD_WSTRING (!(GTEST_OS_CYGWIN || GTEST_OS_SOLARIS))
>+// Cygwin 1.7 and below doesn't support ::std::wstring.
>+// Solaris' libc++ doesn't support it either. Android has
>+// no support for it at least as recent as Froyo (2.2).
>+# define GTEST_HAS_STD_WSTRING \
>+ (!(GTEST_OS_LINUX_ANDROID || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS))
> 
> #endif // GTEST_HAS_STD_WSTRING
> 
> #ifndef GTEST_HAS_GLOBAL_WSTRING
> // The user didn't tell us whether ::wstring is available, so we need
> // to figure it out.
>-#define GTEST_HAS_GLOBAL_WSTRING \
>+# define GTEST_HAS_GLOBAL_WSTRING \
> (GTEST_HAS_STD_WSTRING && GTEST_HAS_GLOBAL_STRING)
> #endif // GTEST_HAS_GLOBAL_WSTRING
> 
>@@ -344,133 +570,212 @@
> // The user didn't tell us whether RTTI is enabled, so we need to
> // figure it out.
> 
>-#ifdef _MSC_VER
>+# ifdef _MSC_VER
> 
>-#ifdef _CPPRTTI // MSVC defines this macro iff RTTI is enabled.
>-#define GTEST_HAS_RTTI 1
>-#else
>-#define GTEST_HAS_RTTI 0
>-#endif
>+# ifdef _CPPRTTI // MSVC defines this macro iff RTTI is enabled.
>+# define GTEST_HAS_RTTI 1
>+# else
>+# define GTEST_HAS_RTTI 0
>+# endif
> 
> // Starting with version 4.3.2, gcc defines __GXX_RTTI iff RTTI is enabled.
>-#elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40302)
>-
>-#ifdef __GXX_RTTI
>-#define GTEST_HAS_RTTI 1
>-#else
>-#define GTEST_HAS_RTTI 0
>-#endif // __GXX_RTTI
>+# elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40302)
>+
>+# ifdef __GXX_RTTI
>+// When building against STLport with the Android NDK and with
>+// -frtti -fno-exceptions, the build fails at link time with undefined
>+// references to __cxa_bad_typeid. Note sure if STL or toolchain bug,
>+// so disable RTTI when detected.
>+# if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR) && \
>+ !defined(__EXCEPTIONS)
>+# define GTEST_HAS_RTTI 0
>+# else
>+# define GTEST_HAS_RTTI 1
>+# endif // GTEST_OS_LINUX_ANDROID && __STLPORT_MAJOR && !__EXCEPTIONS
>+# else
>+# define GTEST_HAS_RTTI 0
>+# endif // __GXX_RTTI
>+
>+// Clang defines __GXX_RTTI starting with version 3.0, but its manual recommends
>+// using has_feature instead. has_feature(cxx_rtti) is supported since 2.7, the
>+// first version with C++ support.
>+# elif defined(__clang__)
>+
>+# define GTEST_HAS_RTTI __has_feature(cxx_rtti)
> 
> // Starting with version 9.0 IBM Visual Age defines __RTTI_ALL__ to 1 if
> // both the typeid and dynamic_cast features are present.
>-#elif defined(__IBMCPP__) && (__IBMCPP__ >= 900)
>+# elif defined(__IBMCPP__) && (__IBMCPP__ >= 900)
> 
>-#ifdef __RTTI_ALL__
>-#define GTEST_HAS_RTTI 1
>-#else
>-#define GTEST_HAS_RTTI 0
>-#endif
>+# ifdef __RTTI_ALL__
>+# define GTEST_HAS_RTTI 1
>+# else
>+# define GTEST_HAS_RTTI 0
>+# endif
> 
>-#else
>+# else
> 
> // For all other compilers, we assume RTTI is enabled.
>-#define GTEST_HAS_RTTI 1
>+# define GTEST_HAS_RTTI 1
> 
>-#endif // _MSC_VER
>+# endif // _MSC_VER
> 
> #endif // GTEST_HAS_RTTI
> 
> // It's this header's responsibility to #include <typeinfo> when RTTI
> // is enabled.
> #if GTEST_HAS_RTTI
>-#include <typeinfo>
>+# include <typeinfo>
> #endif
> 
> // Determines whether Google Test can use the pthreads library.
> #ifndef GTEST_HAS_PTHREAD
>-// The user didn't tell us explicitly, so we assume pthreads support is
>-// available on Linux and Mac.
>+// The user didn't tell us explicitly, so we make reasonable assumptions about
>+// which platforms have pthreads support.
> //
> // To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
> // to your compiler flags.
>-#define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_FREEBSD || GTEST_OS_HURD || GTEST_OS_MAC)
>+#define GTEST_HAS_PTHREAD \
>+ (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX || GTEST_OS_QNX || \
>+ GTEST_OS_FREEBSD || GTEST_OS_NACL || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA)
> #endif // GTEST_HAS_PTHREAD
> 
>+#if GTEST_HAS_PTHREAD
>+// gtest-port.h guarantees to #include <pthread.h> when GTEST_HAS_PTHREAD is
>+// true.
>+# include <pthread.h> // NOLINT
>+
>+// For timespec and nanosleep, used below.
>+# include <time.h> // NOLINT
>+#endif
>+
>+// Determines if hash_map/hash_set are available.
>+// Only used for testing against those containers.
>+#if !defined(GTEST_HAS_HASH_MAP_)
>+# if defined(_MSC_VER) && (_MSC_VER < 1900)
>+# define GTEST_HAS_HASH_MAP_ 1 // Indicates that hash_map is available.
>+# define GTEST_HAS_HASH_SET_ 1 // Indicates that hash_set is available.
>+# endif // _MSC_VER
>+#endif // !defined(GTEST_HAS_HASH_MAP_)
>+
> // Determines whether Google Test can use tr1/tuple. You can define
> // this macro to 0 to prevent Google Test from using tuple (any
> // feature depending on tuple with be disabled in this mode).
> #ifndef GTEST_HAS_TR1_TUPLE
>+# if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR)
>+// STLport, provided with the Android NDK, has neither <tr1/tuple> or <tuple>.
>+# define GTEST_HAS_TR1_TUPLE 0
>+# elif defined(_MSC_VER) && (_MSC_VER >= 1910)
>+// Prevent `warning C4996: 'std::tr1': warning STL4002:
>+// The non-Standard std::tr1 namespace and TR1-only machinery
>+// are deprecated and will be REMOVED.`
>+# define GTEST_HAS_TR1_TUPLE 0
>+# elif GTEST_LANG_CXX11 && defined(_LIBCPP_VERSION)
>+// libc++ doesn't support TR1.
>+# define GTEST_HAS_TR1_TUPLE 0
>+# else
> // The user didn't tell us not to do it, so we assume it's OK.
>-#define GTEST_HAS_TR1_TUPLE 1
>+# define GTEST_HAS_TR1_TUPLE 1
>+# endif
> #endif // GTEST_HAS_TR1_TUPLE
> 
> // Determines whether Google Test's own tr1 tuple implementation
> // should be used.
> #ifndef GTEST_USE_OWN_TR1_TUPLE
>+// We use our own tuple implementation on Symbian.
>+# if GTEST_OS_SYMBIAN
>+# define GTEST_USE_OWN_TR1_TUPLE 1
>+# else
> // The user didn't tell us, so we need to figure it out.
> 
> // We use our own TR1 tuple if we aren't sure the user has an
>-// implementation of it already. At this time, GCC 4.0.0+ and MSVC
>-// 2010 are the only mainstream compilers that come with a TR1 tuple
>-// implementation. NVIDIA's CUDA NVCC compiler pretends to be GCC by
>-// defining __GNUC__ and friends, but cannot compile GCC's tuple
>-// implementation. MSVC 2008 (9.0) provides TR1 tuple in a 323 MB
>-// Feature Pack download, which we cannot assume the user has.
>-#if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= 40000)) \
>- || _MSC_VER >= 1600
>-#define GTEST_USE_OWN_TR1_TUPLE 0
>-#else
>-#define GTEST_USE_OWN_TR1_TUPLE 1
>-#endif
>-
>+// implementation of it already. At this time, libstdc++ 4.0.0+ and
>+// MSVC 2010 are the only mainstream standard libraries that come
>+// with a TR1 tuple implementation. NVIDIA's CUDA NVCC compiler
>+// pretends to be GCC by defining __GNUC__ and friends, but cannot
>+// compile GCC's tuple implementation. MSVC 2008 (9.0) provides TR1
>+// tuple in a 323 MB Feature Pack download, which we cannot assume the
>+// user has. QNX's QCC compiler is a modified GCC but it doesn't
>+// support TR1 tuple. libc++ only provides std::tuple, in C++11 mode,
>+// and it can be used with some compilers that define __GNUC__.
>+# if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= 40000) \
>+ && !GTEST_OS_QNX && !defined(_LIBCPP_VERSION)) \
>+ || (_MSC_VER >= 1600 && _MSC_VER < 1900)
>+# define GTEST_ENV_HAS_TR1_TUPLE_ 1
>+# endif
>+
>+// C++11 specifies that <tuple> provides std::tuple. Use that if gtest is used
>+// in C++11 mode and libstdc++ isn't very old (binaries targeting OS X 10.6
>+// can build with clang but need to use gcc4.2's libstdc++).
>+# if GTEST_LANG_CXX11 && (!defined(__GLIBCXX__) || __GLIBCXX__ > 20110325)
>+# define GTEST_ENV_HAS_STD_TUPLE_ 1
>+# endif
>+
>+# if GTEST_ENV_HAS_TR1_TUPLE_ || GTEST_ENV_HAS_STD_TUPLE_
>+# define GTEST_USE_OWN_TR1_TUPLE 0
>+# else
>+# define GTEST_USE_OWN_TR1_TUPLE 1
>+# endif
>+# endif // GTEST_OS_SYMBIAN
> #endif // GTEST_USE_OWN_TR1_TUPLE
> 
>-// To avoid conditional compilation everywhere, we make it
>-// gtest-port.h's responsibility to #include the header implementing
>-// tr1/tuple.
>+// To avoid conditional compilation we make it gtest-port.h's responsibility
>+// to #include the header implementing tuple.
>+#if GTEST_HAS_STD_TUPLE_
>+# include <tuple> // IWYU pragma: export
>+# define GTEST_TUPLE_NAMESPACE_ ::std
>+#endif // GTEST_HAS_STD_TUPLE_
>+
>+// We include tr1::tuple even if std::tuple is available to define printers for
>+// them.
> #if GTEST_HAS_TR1_TUPLE
>+# ifndef GTEST_TUPLE_NAMESPACE_
>+# define GTEST_TUPLE_NAMESPACE_ ::std::tr1
>+# endif // GTEST_TUPLE_NAMESPACE_
> 
>-#if GTEST_USE_OWN_TR1_TUPLE
>-#include <gtest/internal/gtest-tuple.h>
>-#elif GTEST_OS_SYMBIAN
>+# if GTEST_USE_OWN_TR1_TUPLE
>+# include "gtest/internal/gtest-tuple.h" // IWYU pragma: export // NOLINT
>+# elif GTEST_OS_SYMBIAN
> 
> // On Symbian, BOOST_HAS_TR1_TUPLE causes Boost's TR1 tuple library to
> // use STLport's tuple implementation, which unfortunately doesn't
> // work as the copy of STLport distributed with Symbian is incomplete.
> // By making sure BOOST_HAS_TR1_TUPLE is undefined, we force Boost to
> // use its own tuple implementation.
>-#ifdef BOOST_HAS_TR1_TUPLE
>-#undef BOOST_HAS_TR1_TUPLE
>-#endif // BOOST_HAS_TR1_TUPLE
>+# ifdef BOOST_HAS_TR1_TUPLE
>+# undef BOOST_HAS_TR1_TUPLE
>+# endif // BOOST_HAS_TR1_TUPLE
> 
> // This prevents <boost/tr1/detail/config.hpp>, which defines
> // BOOST_HAS_TR1_TUPLE, from being #included by Boost's <tuple>.
>-#define BOOST_TR1_DETAIL_CONFIG_HPP_INCLUDED
>-#include <tuple>
>+# define BOOST_TR1_DETAIL_CONFIG_HPP_INCLUDED
>+# include <tuple> // IWYU pragma: export // NOLINT
> 
>-#elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000)
>+# elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000)
> // GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header. This does
> // not conform to the TR1 spec, which requires the header to be <tuple>.
> 
>-#if !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302
>+# if !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302
> // Until version 4.3.2, gcc has a bug that causes <tr1/functional>,
> // which is #included by <tr1/tuple>, to not compile when RTTI is
> // disabled. _TR1_FUNCTIONAL is the header guard for
>-// <tr1/functional>. Hence the following #define is a hack to prevent
>+// <tr1/functional>. Hence the following #define is used to prevent
> // <tr1/functional> from being included.
>-#define _TR1_FUNCTIONAL 1
>-#include <tr1/tuple>
>-#undef _TR1_FUNCTIONAL // Allows the user to #include
>- // <tr1/functional> if he chooses to.
>-#else
>-#include <tr1/tuple> // NOLINT
>-#endif // !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302
>-
>-#else
>-// If the compiler is not GCC 4.0+, we assume the user is using a
>-// spec-conforming TR1 implementation.
>-#include <tuple> // NOLINT
>-#endif // GTEST_USE_OWN_TR1_TUPLE
>+# define _TR1_FUNCTIONAL 1
>+# include <tr1/tuple>
>+# undef _TR1_FUNCTIONAL // Allows the user to #include
>+ // <tr1/functional> if they choose to.
>+# else
>+# include <tr1/tuple> // NOLINT
>+# endif // !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302
>+
>+// VS 2010 now has tr1 support.
>+# elif _MSC_VER >= 1600
>+# include <tuple> // IWYU pragma: export // NOLINT
>+
>+# else // GTEST_USE_OWN_TR1_TUPLE
>+# include <tr1/tuple> // IWYU pragma: export // NOLINT
>+# endif // GTEST_USE_OWN_TR1_TUPLE
> 
> #endif // GTEST_HAS_TR1_TUPLE
> 
>@@ -481,59 +786,80 @@
> #ifndef GTEST_HAS_CLONE
> // The user didn't tell us, so we need to figure it out.
> 
>-#if GTEST_OS_LINUX && !defined(__ia64__)
>-#define GTEST_HAS_CLONE 1
>-#else
>-#define GTEST_HAS_CLONE 0
>-#endif // GTEST_OS_LINUX && !defined(__ia64__)
>+# if GTEST_OS_LINUX && !defined(__ia64__)
>+# if GTEST_OS_LINUX_ANDROID
>+// On Android, clone() became available at different API levels for each 32-bit
>+// architecture.
>+# if defined(__LP64__) || \
>+ (defined(__arm__) && __ANDROID_API__ >= 9) || \
>+ (defined(__mips__) && __ANDROID_API__ >= 12) || \
>+ (defined(__i386__) && __ANDROID_API__ >= 17)
>+# define GTEST_HAS_CLONE 1
>+# else
>+# define GTEST_HAS_CLONE 0
>+# endif
>+# else
>+# define GTEST_HAS_CLONE 1
>+# endif
>+# else
>+# define GTEST_HAS_CLONE 0
>+# endif // GTEST_OS_LINUX && !defined(__ia64__)
> 
> #endif // GTEST_HAS_CLONE
> 
> // Determines whether to support stream redirection. This is used to test
> // output correctness and to implement death tests.
>-#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_SYMBIAN
>-#define GTEST_HAS_STREAM_REDIRECTION_ 1
>-#endif // !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_SYMBIAN
>+#ifndef GTEST_HAS_STREAM_REDIRECTION
>+// By default, we assume that stream redirection is supported on all
>+// platforms except known mobile ones.
>+# if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN || \
>+ GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT
>+# define GTEST_HAS_STREAM_REDIRECTION 0
>+# else
>+# define GTEST_HAS_STREAM_REDIRECTION 1
>+# endif // !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_SYMBIAN
>+#endif // GTEST_HAS_STREAM_REDIRECTION
> 
> // Determines whether to support death tests.
> // Google Test does not support death tests for VC 7.1 and earlier as
> // abort() in a VC 7.1 application compiled as GUI in debug config
> // pops up a dialog window that cannot be suppressed programmatically.
>-#if (GTEST_OS_LINUX || GTEST_OS_FREEBSD || GTEST_OS_HURD || \
>- GTEST_OS_MAC || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
>- (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
>- GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX)
>-#define GTEST_HAS_DEATH_TEST 1
>-#include <vector> // NOLINT
>+#if (GTEST_OS_LINUX || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
>+ (GTEST_OS_MAC && !GTEST_OS_IOS) || \
>+ (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
>+ GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \
>+ GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD || \
>+ GTEST_OS_NETBSD || GTEST_OS_FUCHSIA)
>+# define GTEST_HAS_DEATH_TEST 1
> #endif
> 
>-// We don't support MSVC 7.1 with exceptions disabled now. Therefore
>-// all the compilers we care about are adequate for supporting
>-// value-parameterized tests.
>-#define GTEST_HAS_PARAM_TEST 1
>-
> // Determines whether to support type-driven tests.
> 
> // Typed tests need <typeinfo> and variadic macros, which GCC, VC++ 8.0,
>-// Sun Pro CC, and IBM Visual Age support.
>+// Sun Pro CC, IBM Visual Age, and HP aCC support.
> #if defined(__GNUC__) || (_MSC_VER >= 1400) || defined(__SUNPRO_CC) || \
>- defined(__IBMCPP__)
>-#define GTEST_HAS_TYPED_TEST 1
>-#define GTEST_HAS_TYPED_TEST_P 1
>+ defined(__IBMCPP__) || defined(__HP_aCC)
>+# define GTEST_HAS_TYPED_TEST 1
>+# define GTEST_HAS_TYPED_TEST_P 1
> #endif
> 
> // Determines whether to support Combine(). This only makes sense when
> // value-parameterized tests are enabled. The implementation doesn't
> // work on Sun Studio since it doesn't understand templated conversion
> // operators.
>-#if GTEST_HAS_PARAM_TEST && GTEST_HAS_TR1_TUPLE && !defined(__SUNPRO_CC)
>-#define GTEST_HAS_COMBINE 1
>+#if (GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_) && !defined(__SUNPRO_CC)
>+# define GTEST_HAS_COMBINE 1
> #endif
> 
> // Determines whether the system compiler uses UTF-16 for encoding wide strings.
> #define GTEST_WIDE_STRING_USES_UTF16_ \
> (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_SYMBIAN || GTEST_OS_AIX)
> 
>+// Determines whether test results can be streamed to a socket.
>+#if GTEST_OS_LINUX
>+# define GTEST_CAN_STREAM_RESULTS_ 1
>+#endif
>+
> // Defines some utility macros.
> 
> // The GNU compiler emits a warning if nested "if" statements are followed by
>@@ -545,9 +871,9 @@
> //
> // The "switch (0) case 0:" idiom is used to suppress this.
> #ifdef __INTEL_COMPILER
>-#define GTEST_AMBIGUOUS_ELSE_BLOCKER_
>+# define GTEST_AMBIGUOUS_ELSE_BLOCKER_
> #else
>-#define GTEST_AMBIGUOUS_ELSE_BLOCKER_ switch (0) case 0: // NOLINT
>+# define GTEST_AMBIGUOUS_ELSE_BLOCKER_ switch (0) case 0: default: // NOLINT
> #endif
> 
> // Use this annotation at the end of a struct/class definition to
>@@ -562,20 +888,49 @@
> // Also use it after a variable or parameter declaration to tell the
> // compiler the variable/parameter does not have to be used.
> #if defined(__GNUC__) && !defined(COMPILER_ICC)
>-#define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
>+# define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
>+#elif defined(__clang__)
>+# if __has_attribute(unused)
>+# define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
>+# endif
>+#endif
>+#ifndef GTEST_ATTRIBUTE_UNUSED_
>+# define GTEST_ATTRIBUTE_UNUSED_
>+#endif
>+
>+#if GTEST_LANG_CXX11
>+# define GTEST_CXX11_EQUALS_DELETE_ = delete
>+#else // GTEST_LANG_CXX11
>+# define GTEST_CXX11_EQUALS_DELETE_
>+#endif // GTEST_LANG_CXX11
>+
>+// Use this annotation before a function that takes a printf format string.
>+#if (defined(__GNUC__) || defined(__clang__)) && !defined(COMPILER_ICC)
>+# if defined(__MINGW_PRINTF_FORMAT)
>+// MinGW has two different printf implementations. Ensure the format macro
>+// matches the selected implementation. See
>+// https://sourceforge.net/p/mingw-w64/wiki2/gnu%20printf/.
>+# define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \
>+ __attribute__((__format__(__MINGW_PRINTF_FORMAT, string_index, \
>+ first_to_check)))
>+# else
>+# define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \
>+ __attribute__((__format__(__printf__, string_index, first_to_check)))
>+# endif
> #else
>-#define GTEST_ATTRIBUTE_UNUSED_
>+# define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check)
> #endif
> 
>+
> // A macro to disallow operator=
> // This should be used in the private: declarations for a class.
>-#define GTEST_DISALLOW_ASSIGN_(type)\
>- void operator=(type const &)
>+#define GTEST_DISALLOW_ASSIGN_(type) \
>+ void operator=(type const &) GTEST_CXX11_EQUALS_DELETE_
> 
> // A macro to disallow copy constructor and operator=
> // This should be used in the private: declarations for a class.
>-#define GTEST_DISALLOW_COPY_AND_ASSIGN_(type)\
>- type(type const &);\
>+#define GTEST_DISALLOW_COPY_AND_ASSIGN_(type) \
>+ type(type const &) GTEST_CXX11_EQUALS_DELETE_; \
> GTEST_DISALLOW_ASSIGN_(type)
> 
> // Tell the compiler to warn about unused return values for functions declared
>@@ -584,72 +939,250 @@
> //
> // Sprocket* AllocateSprocket() GTEST_MUST_USE_RESULT_;
> #if defined(__GNUC__) && (GTEST_GCC_VER_ >= 30400) && !defined(COMPILER_ICC)
>-#define GTEST_MUST_USE_RESULT_ __attribute__ ((warn_unused_result))
>+# define GTEST_MUST_USE_RESULT_ __attribute__ ((warn_unused_result))
> #else
>-#define GTEST_MUST_USE_RESULT_
>+# define GTEST_MUST_USE_RESULT_
> #endif // __GNUC__ && (GTEST_GCC_VER_ >= 30400) && !COMPILER_ICC
> 
>+// MS C++ compiler emits warning when a conditional expression is compile time
>+// constant. In some contexts this warning is false positive and needs to be
>+// suppressed. Use the following two macros in such cases:
>+//
>+// GTEST_INTENTIONAL_CONST_COND_PUSH_()
>+// while (true) {
>+// GTEST_INTENTIONAL_CONST_COND_POP_()
>+// }
>+# define GTEST_INTENTIONAL_CONST_COND_PUSH_() \
>+ GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127)
>+# define GTEST_INTENTIONAL_CONST_COND_POP_() \
>+ GTEST_DISABLE_MSC_WARNINGS_POP_()
>+
> // Determine whether the compiler supports Microsoft's Structured Exception
> // Handling. This is supported by several Windows compilers but generally
> // does not exist on any other system.
> #ifndef GTEST_HAS_SEH
> // The user didn't tell us, so we need to figure it out.
> 
>-#if defined(_MSC_VER) || defined(__BORLANDC__)
>+# if defined(_MSC_VER) || defined(__BORLANDC__)
> // These two compilers are known to support SEH.
>-#define GTEST_HAS_SEH 1
>-#else
>+# define GTEST_HAS_SEH 1
>+# else
> // Assume no SEH.
>-#define GTEST_HAS_SEH 0
>-#endif
>+# define GTEST_HAS_SEH 0
>+# endif
> 
>-#endif // GTEST_HAS_SEH
>+#define GTEST_IS_THREADSAFE \
>+ (GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ \
>+ || (GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT) \
>+ || GTEST_HAS_PTHREAD)
> 
>-#ifdef _MSC_VER
>+#endif // GTEST_HAS_SEH
> 
>-#if GTEST_LINKED_AS_SHARED_LIBRARY
>-#define GTEST_API_ __declspec(dllimport)
>-#elif GTEST_CREATE_SHARED_LIBRARY
>-#define GTEST_API_ __declspec(dllexport)
>-#endif
>+// GTEST_API_ qualifies all symbols that must be exported. The definitions below
>+// are guarded by #ifndef to give embedders a chance to define GTEST_API_ in
>+// gtest/internal/custom/gtest-port.h
>+#ifndef GTEST_API_
> 
>+#ifdef _MSC_VER
>+# if GTEST_LINKED_AS_SHARED_LIBRARY
>+# define GTEST_API_ __declspec(dllimport)
>+# elif GTEST_CREATE_SHARED_LIBRARY
>+# define GTEST_API_ __declspec(dllexport)
>+# endif
>+#elif __GNUC__ >= 4 || defined(__clang__)
>+# define GTEST_API_ __attribute__((visibility ("default")))
> #endif // _MSC_VER
> 
>+#endif // GTEST_API_
>+
> #ifndef GTEST_API_
>-#define GTEST_API_
>+# define GTEST_API_
>+#endif // GTEST_API_
>+
>+#ifndef GTEST_DEFAULT_DEATH_TEST_STYLE
>+# define GTEST_DEFAULT_DEATH_TEST_STYLE "fast"
>+#endif // GTEST_DEFAULT_DEATH_TEST_STYLE
>+
>+#ifdef __GNUC__
>+// Ask the compiler to never inline a given function.
>+# define GTEST_NO_INLINE_ __attribute__((noinline))
>+#else
>+# define GTEST_NO_INLINE_
> #endif
> 
>+// _LIBCPP_VERSION is defined by the libc++ library from the LLVM project.
>+#if !defined(GTEST_HAS_CXXABI_H_)
>+# if defined(__GLIBCXX__) || (defined(_LIBCPP_VERSION) && !defined(_MSC_VER))
>+# define GTEST_HAS_CXXABI_H_ 1
>+# else
>+# define GTEST_HAS_CXXABI_H_ 0
>+# endif
>+#endif
>+
>+// A function level attribute to disable checking for use of uninitialized
>+// memory when built with MemorySanitizer.
>+#if defined(__clang__)
>+# if __has_feature(memory_sanitizer)
>+# define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ \
>+ __attribute__((no_sanitize_memory))
>+# else
>+# define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
>+# endif // __has_feature(memory_sanitizer)
>+#else
>+# define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
>+#endif // __clang__
>+
>+// A function level attribute to disable AddressSanitizer instrumentation.
>+#if defined(__clang__)
>+# if __has_feature(address_sanitizer)
>+# define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ \
>+ __attribute__((no_sanitize_address))
>+# else
>+# define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
>+# endif // __has_feature(address_sanitizer)
>+#else
>+# define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
>+#endif // __clang__
>+
>+// A function level attribute to disable ThreadSanitizer instrumentation.
>+#if defined(__clang__)
>+# if __has_feature(thread_sanitizer)
>+# define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ \
>+ __attribute__((no_sanitize_thread))
>+# else
>+# define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
>+# endif // __has_feature(thread_sanitizer)
>+#else
>+# define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
>+#endif // __clang__
>+
> namespace testing {
> 
> class Message;
> 
>+#if defined(GTEST_TUPLE_NAMESPACE_)
>+// Import tuple and friends into the ::testing namespace.
>+// It is part of our interface, having them in ::testing allows us to change
>+// their types as needed.
>+using GTEST_TUPLE_NAMESPACE_::get;
>+using GTEST_TUPLE_NAMESPACE_::make_tuple;
>+using GTEST_TUPLE_NAMESPACE_::tuple;
>+using GTEST_TUPLE_NAMESPACE_::tuple_size;
>+using GTEST_TUPLE_NAMESPACE_::tuple_element;
>+#endif // defined(GTEST_TUPLE_NAMESPACE_)
>+
> namespace internal {
> 
>-class String;
>+// A secret type that Google Test users don't know about. It has no
>+// definition on purpose. Therefore it's impossible to create a
>+// Secret object, which is what we want.
>+class Secret;
> 
>-class StrStream : public ::std::stringstream {
>- public:
>- void* operator new(size_t, void* p) { return p; }
>- void* operator new[](size_t, void* p) { return p; }
>+// The GTEST_COMPILE_ASSERT_ macro can be used to verify that a compile time
>+// expression is true. For example, you could use it to verify the
>+// size of a static array:
>+//
>+// GTEST_COMPILE_ASSERT_(GTEST_ARRAY_SIZE_(names) == NUM_NAMES,
>+// names_incorrect_size);
>+//
>+// or to make sure a struct is smaller than a certain size:
>+//
>+// GTEST_COMPILE_ASSERT_(sizeof(foo) < 128, foo_too_large);
>+//
>+// The second argument to the macro is the name of the variable. If
>+// the expression is false, most compilers will issue a warning/error
>+// containing the name of the variable.
>+
>+#if GTEST_LANG_CXX11
>+# define GTEST_COMPILE_ASSERT_(expr, msg) static_assert(expr, #msg)
>+#else // !GTEST_LANG_CXX11
>+template <bool>
>+ struct CompileAssert {
>+};
> 
>- void* operator new(size_t size) {
>- return malloc(size);
>- }
>+# define GTEST_COMPILE_ASSERT_(expr, msg) \
>+ typedef ::testing::internal::CompileAssert<(static_cast<bool>(expr))> \
>+ msg[static_cast<bool>(expr) ? 1 : -1] GTEST_ATTRIBUTE_UNUSED_
>+#endif // !GTEST_LANG_CXX11
> 
>- void operator delete(void* p) {
>- free(p);
>- }
>+// Implementation details of GTEST_COMPILE_ASSERT_:
>+//
>+// (In C++11, we simply use static_assert instead of the following)
>+//
>+// - GTEST_COMPILE_ASSERT_ works by defining an array type that has -1
>+// elements (and thus is invalid) when the expression is false.
>+//
>+// - The simpler definition
>+//
>+// #define GTEST_COMPILE_ASSERT_(expr, msg) typedef char msg[(expr) ? 1 : -1]
>+//
>+// does not work, as gcc supports variable-length arrays whose sizes
>+// are determined at run-time (this is gcc's extension and not part
>+// of the C++ standard). As a result, gcc fails to reject the
>+// following code with the simple definition:
>+//
>+// int foo;
>+// GTEST_COMPILE_ASSERT_(foo, msg); // not supposed to compile as foo is
>+// // not a compile-time constant.
>+//
>+// - By using the type CompileAssert<(bool(expr))>, we ensures that
>+// expr is a compile-time constant. (Template arguments must be
>+// determined at compile-time.)
>+//
>+// - The outter parentheses in CompileAssert<(bool(expr))> are necessary
>+// to work around a bug in gcc 3.4.4 and 4.0.1. If we had written
>+//
>+// CompileAssert<bool(expr)>
>+//
>+// instead, these compilers will refuse to compile
>+//
>+// GTEST_COMPILE_ASSERT_(5 > 0, some_message);
>+//
>+// (They seem to think the ">" in "5 > 0" marks the end of the
>+// template argument list.)
>+//
>+// - The array size is (bool(expr) ? 1 : -1), instead of simply
>+//
>+// ((expr) ? 1 : -1).
>+//
>+// This is to avoid running into a bug in MS VC 7.1, which
>+// causes ((0.0) ? 1 : -1) to incorrectly evaluate to 1.
> 
>- void* operator new[](size_t size) {
>- return malloc(size);
>- }
>+// StaticAssertTypeEqHelper is used by StaticAssertTypeEq defined in gtest.h.
>+//
>+// This template is declared, but intentionally undefined.
>+template <typename T1, typename T2>
>+struct StaticAssertTypeEqHelper;
> 
>- void operator delete[](void* p) {
>- free(p);
>- }
>+template <typename T>
>+struct StaticAssertTypeEqHelper<T, T> {
>+ enum { value = true };
> };
> 
>+// Same as std::is_same<>.
>+template <typename T, typename U>
>+struct IsSame {
>+ enum { value = false };
>+};
>+template <typename T>
>+struct IsSame<T, T> {
>+ enum { value = true };
>+};
> 
>+// Evaluates to the number of elements in 'array'.
>+#define GTEST_ARRAY_SIZE_(array) (sizeof(array) / sizeof(array[0]))
>+
>+#if GTEST_HAS_GLOBAL_STRING
>+typedef ::string string;
>+#else
>+typedef ::std::string string;
>+#endif // GTEST_HAS_GLOBAL_STRING
>+
>+#if GTEST_HAS_GLOBAL_WSTRING
>+typedef ::wstring wstring;
>+#elif GTEST_HAS_STD_WSTRING
>+typedef ::std::wstring wstring;
>+#endif // GTEST_HAS_GLOBAL_WSTRING
> 
> // A helper for suppressing warnings on constant condition. It just
> // returns 'condition'.
>@@ -685,6 +1218,12 @@ class scoped_ptr {
> ptr_ = p;
> }
> }
>+
>+ friend void swap(scoped_ptr& a, scoped_ptr& b) {
>+ using std::swap;
>+ swap(a.ptr_, b.ptr_);
>+ }
>+
> private:
> T* ptr_;
> 
>@@ -693,6 +1232,10 @@ class scoped_ptr {
> 
> // Defines RE.
> 
>+#if GTEST_USES_PCRE
>+// if used, PCRE is injected by custom/gtest-port.h
>+#elif GTEST_USES_POSIX_RE || GTEST_USES_SIMPLE_RE
>+
> // A simple C++ wrapper for <regex.h>. It uses the POSIX Extended
> // Regular Expression syntax.
> class GTEST_API_ RE {
>@@ -704,9 +1247,11 @@ class GTEST_API_ RE {
> // Constructs an RE from a string.
> RE(const ::std::string& regex) { Init(regex.c_str()); } // NOLINT
> 
>-#if GTEST_HAS_GLOBAL_STRING
>+# if GTEST_HAS_GLOBAL_STRING
>+
> RE(const ::string& regex) { Init(regex.c_str()); } // NOLINT
>-#endif // GTEST_HAS_GLOBAL_STRING
>+
>+# endif // GTEST_HAS_GLOBAL_STRING
> 
> RE(const char* regex) { Init(regex); } // NOLINT
> ~RE();
>@@ -719,7 +1264,7 @@ class GTEST_API_ RE {
> // PartialMatch(str, re) returns true iff regular expression re
> // matches a substring of str (including str itself).
> //
>- // TODO(wan@google.com): make FullMatch() and PartialMatch() work
>+ // FIXME: make FullMatch() and PartialMatch() work
> // when str contains NUL characters.
> static bool FullMatch(const ::std::string& str, const RE& re) {
> return FullMatch(str.c_str(), re);
>@@ -728,14 +1273,16 @@ class GTEST_API_ RE {
> return PartialMatch(str.c_str(), re);
> }
> 
>-#if GTEST_HAS_GLOBAL_STRING
>+# if GTEST_HAS_GLOBAL_STRING
>+
> static bool FullMatch(const ::string& str, const RE& re) {
> return FullMatch(str.c_str(), re);
> }
> static bool PartialMatch(const ::string& str, const RE& re) {
> return PartialMatch(str.c_str(), re);
> }
>-#endif // GTEST_HAS_GLOBAL_STRING
>+
>+# endif // GTEST_HAS_GLOBAL_STRING
> 
> static bool FullMatch(const char* str, const RE& re);
> static bool PartialMatch(const char* str, const RE& re);
>@@ -743,22 +1290,38 @@ class GTEST_API_ RE {
> private:
> void Init(const char* regex);
> 
>- // We use a const char* instead of a string, as Google Test may be used
>- // where string is not available. We also do not use Google Test's own
>- // String type here, in order to simplify dependencies between the
>- // files.
>+ // We use a const char* instead of an std::string, as Google Test used to be
>+ // used where std::string is not available. FIXME: change to
>+ // std::string.
> const char* pattern_;
> bool is_valid_;
>-#if GTEST_USES_POSIX_RE
>+
>+# if GTEST_USES_POSIX_RE
>+
> regex_t full_regex_; // For FullMatch().
> regex_t partial_regex_; // For PartialMatch().
>-#else // GTEST_USES_SIMPLE_RE
>+
>+# else // GTEST_USES_SIMPLE_RE
>+
> const char* full_pattern_; // For FullMatch();
>-#endif
>+
>+# endif
> 
> GTEST_DISALLOW_ASSIGN_(RE);
> };
> 
>+#endif // GTEST_USES_PCRE
>+
>+// Formats a source file path and a line number as they would appear
>+// in an error message from the compiler used to compile this code.
>+GTEST_API_ ::std::string FormatFileLocation(const char* file, int line);
>+
>+// Formats a file location for compiler-independent XML output.
>+// Although this function is not platform dependent, we put it next to
>+// FormatFileLocation in order to contrast the two functions.
>+GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(const char* file,
>+ int line);
>+
> // Defines logging utilities:
> // GTEST_LOG_(severity) - logs messages at the specified severity level. The
> // message itself is streamed into the macro.
>@@ -790,13 +1353,18 @@ class GTEST_API_ GTestLog {
> GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestLog);
> };
> 
>-#define GTEST_LOG_(severity) \
>+#if !defined(GTEST_LOG_)
>+
>+# define GTEST_LOG_(severity) \
> ::testing::internal::GTestLog(::testing::internal::GTEST_##severity, \
> __FILE__, __LINE__).GetStream()
> 
> inline void LogToStderr() {}
> inline void FlushInfoLog() { fflush(NULL); }
> 
>+#endif // !defined(GTEST_LOG_)
>+
>+#if !defined(GTEST_CHECK_)
> // INTERNAL IMPLEMENTATION - DO NOT USE.
> //
> // GTEST_CHECK_ is an all-mode assert. It aborts the program if the condition
>@@ -811,12 +1379,13 @@ inline void FlushInfoLog() { fflush(NULL); }
> // condition itself, plus additional message streamed into it, if any,
> // and then it aborts the program. It aborts the program irrespective of
> // whether it is built in the debug mode or not.
>-#define GTEST_CHECK_(condition) \
>+# define GTEST_CHECK_(condition) \
> GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
> if (::testing::internal::IsTrue(condition)) \
> ; \
> else \
> GTEST_LOG_(FATAL) << "Condition " #condition " failed. "
>+#endif // !defined(GTEST_CHECK_)
> 
> // An all-mode assert to verify that the given POSIX-style function
> // call returns 0 (indicating success). Known limitation: this
>@@ -828,8 +1397,125 @@ inline void FlushInfoLog() { fflush(NULL); }
> GTEST_LOG_(FATAL) << #posix_call << "failed with error " \
> << gtest_error
> 
>+// Adds reference to a type if it is not a reference type,
>+// otherwise leaves it unchanged. This is the same as
>+// tr1::add_reference, which is not widely available yet.
>+template <typename T>
>+struct AddReference { typedef T& type; }; // NOLINT
>+template <typename T>
>+struct AddReference<T&> { typedef T& type; }; // NOLINT
>+
>+// A handy wrapper around AddReference that works when the argument T
>+// depends on template parameters.
>+#define GTEST_ADD_REFERENCE_(T) \
>+ typename ::testing::internal::AddReference<T>::type
>+
>+// Transforms "T" into "const T&" according to standard reference collapsing
>+// rules (this is only needed as a backport for C++98 compilers that do not
>+// support reference collapsing). Specifically, it transforms:
>+//
>+// char ==> const char&
>+// const char ==> const char&
>+// char& ==> char&
>+// const char& ==> const char&
>+//
>+// Note that the non-const reference will not have "const" added. This is
>+// standard, and necessary so that "T" can always bind to "const T&".
>+template <typename T>
>+struct ConstRef { typedef const T& type; };
>+template <typename T>
>+struct ConstRef<T&> { typedef T& type; };
>+
>+// The argument T must depend on some template parameters.
>+#define GTEST_REFERENCE_TO_CONST_(T) \
>+ typename ::testing::internal::ConstRef<T>::type
>+
>+#if GTEST_HAS_STD_MOVE_
>+using std::forward;
>+using std::move;
>+
>+template <typename T>
>+struct RvalueRef {
>+ typedef T&& type;
>+};
>+#else // GTEST_HAS_STD_MOVE_
>+template <typename T>
>+const T& move(const T& t) {
>+ return t;
>+}
>+template <typename T>
>+GTEST_ADD_REFERENCE_(T) forward(GTEST_ADD_REFERENCE_(T) t) { return t; }
>+
>+template <typename T>
>+struct RvalueRef {
>+ typedef const T& type;
>+};
>+#endif // GTEST_HAS_STD_MOVE_
>+
> // INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
> //
>+// Use ImplicitCast_ as a safe version of static_cast for upcasting in
>+// the type hierarchy (e.g. casting a Foo* to a SuperclassOfFoo* or a
>+// const Foo*). When you use ImplicitCast_, the compiler checks that
>+// the cast is safe. Such explicit ImplicitCast_s are necessary in
>+// surprisingly many situations where C++ demands an exact type match
>+// instead of an argument type convertable to a target type.
>+//
>+// The syntax for using ImplicitCast_ is the same as for static_cast:
>+//
>+// ImplicitCast_<ToType>(expr)
>+//
>+// ImplicitCast_ would have been part of the C++ standard library,
>+// but the proposal was submitted too late. It will probably make
>+// its way into the language in the future.
>+//
>+// This relatively ugly name is intentional. It prevents clashes with
>+// similar functions users may have (e.g., implicit_cast). The internal
>+// namespace alone is not enough because the function can be found by ADL.
>+template<typename To>
>+inline To ImplicitCast_(To x) { return x; }
>+
>+// When you upcast (that is, cast a pointer from type Foo to type
>+// SuperclassOfFoo), it's fine to use ImplicitCast_<>, since upcasts
>+// always succeed. When you downcast (that is, cast a pointer from
>+// type Foo to type SubclassOfFoo), static_cast<> isn't safe, because
>+// how do you know the pointer is really of type SubclassOfFoo? It
>+// could be a bare Foo, or of type DifferentSubclassOfFoo. Thus,
>+// when you downcast, you should use this macro. In debug mode, we
>+// use dynamic_cast<> to double-check the downcast is legal (we die
>+// if it's not). In normal mode, we do the efficient static_cast<>
>+// instead. Thus, it's important to test in debug mode to make sure
>+// the cast is legal!
>+// This is the only place in the code we should use dynamic_cast<>.
>+// In particular, you SHOULDN'T be using dynamic_cast<> in order to
>+// do RTTI (eg code like this:
>+// if (dynamic_cast<Subclass1>(foo)) HandleASubclass1Object(foo);
>+// if (dynamic_cast<Subclass2>(foo)) HandleASubclass2Object(foo);
>+// You should design the code some other way not to need this.
>+//
>+// This relatively ugly name is intentional. It prevents clashes with
>+// similar functions users may have (e.g., down_cast). The internal
>+// namespace alone is not enough because the function can be found by ADL.
>+template<typename To, typename From> // use like this: DownCast_<T*>(foo);
>+inline To DownCast_(From* f) { // so we only accept pointers
>+ // Ensures that To is a sub-type of From *. This test is here only
>+ // for compile-time type checking, and has no overhead in an
>+ // optimized build at run-time, as it will be optimized away
>+ // completely.
>+ GTEST_INTENTIONAL_CONST_COND_PUSH_()
>+ if (false) {
>+ GTEST_INTENTIONAL_CONST_COND_POP_()
>+ const To to = NULL;
>+ ::testing::internal::ImplicitCast_<From*>(to);
>+ }
>+
>+#if GTEST_HAS_RTTI
>+ // RTTI: debug mode only!
>+ GTEST_CHECK_(f == NULL || dynamic_cast<To>(f) != NULL);
>+#endif
>+ return static_cast<To>(f);
>+}
>+
> // Downcasts the pointer of type Base to Derived.
> // Derived must be a subclass of Base. The parameter MUST
> // point to a class of type Derived, not any subclass of it.
>@@ -839,13 +1525,18 @@ template <class Derived, class Base>
> Derived* CheckedDowncastToActualType(Base* base) {
> #if GTEST_HAS_RTTI
> GTEST_CHECK_(typeid(*base) == typeid(Derived));
>+#endif
>+
>+#if GTEST_HAS_DOWNCAST_
>+ return ::down_cast<Derived*>(base);
>+#elif GTEST_HAS_RTTI
> return dynamic_cast<Derived*>(base); // NOLINT
> #else
> return static_cast<Derived*>(base); // Poor man's downcast.
> #endif
> }
> 
>-#if GTEST_HAS_STREAM_REDIRECTION_
>+#if GTEST_HAS_STREAM_REDIRECTION
> 
> // Defines the stderr capturer:
> // CaptureStdout - starts capturing stdout.
>@@ -854,30 +1545,39 @@ Derived* CheckedDowncastToActualType(Base* base) {
> // GetCapturedStderr - stops capturing stderr and returns the captured string.
> //
> GTEST_API_ void CaptureStdout();
>-GTEST_API_ String GetCapturedStdout();
>+GTEST_API_ std::string GetCapturedStdout();
> GTEST_API_ void CaptureStderr();
>-GTEST_API_ String GetCapturedStderr();
>+GTEST_API_ std::string GetCapturedStderr();
> 
>-#endif // GTEST_HAS_STREAM_REDIRECTION_
>+#endif // GTEST_HAS_STREAM_REDIRECTION
>+// Returns the size (in bytes) of a file.
>+GTEST_API_ size_t GetFileSize(FILE* file);
> 
>+// Reads the entire content of a file as a string.
>+GTEST_API_ std::string ReadEntireFile(FILE* file);
> 
>-#if GTEST_HAS_DEATH_TEST
>+// All command line arguments.
>+GTEST_API_ std::vector<std::string> GetArgvs();
> 
>-// A copy of all command line arguments. Set by InitGoogleTest().
>-extern ::std::vector<String> g_argvs;
>+#if GTEST_HAS_DEATH_TEST
> 
>-// GTEST_HAS_DEATH_TEST implies we have ::std::string.
>-const ::std::vector<String>& GetArgvs();
>+std::vector<std::string> GetInjectableArgvs();
>+// Deprecated: pass the args vector by value instead.
>+void SetInjectableArgvs(const std::vector<std::string>* new_argvs);
>+void SetInjectableArgvs(const std::vector<std::string>& new_argvs);
>+#if GTEST_HAS_GLOBAL_STRING
>+void SetInjectableArgvs(const std::vector< ::string>& new_argvs);
>+#endif // GTEST_HAS_GLOBAL_STRING
>+void ClearInjectableArgvs();
> 
> #endif // GTEST_HAS_DEATH_TEST
> 
> // Defines synchronization primitives.
>-
>-#if GTEST_HAS_PTHREAD
>-
>-// Sleeps for (roughly) n milli-seconds. This function is only for
>-// testing Google Test's own constructs. Don't use it in user tests,
>-// either directly or indirectly.
>+#if GTEST_IS_THREADSAFE
>+# if GTEST_HAS_PTHREAD
>+// Sleeps for (roughly) n milliseconds. This function is only for testing
>+// Google Test's own constructs. Don't use it in user tests, either
>+// directly or indirectly.
> inline void SleepMilliseconds(int n) {
> const timespec time = {
> 0, // 0 seconds.
>@@ -885,7 +1585,13 @@ inline void SleepMilliseconds(int n) {
> };
> nanosleep(&time, NULL);
> }
>+# endif // GTEST_HAS_PTHREAD
> 
>+# if GTEST_HAS_NOTIFICATION_
>+// Notification has already been imported into the namespace.
>+// Nothing to do here.
>+
>+# elif GTEST_HAS_PTHREAD
> // Allows a controller thread to pause execution of newly created
> // threads until notified. Instances of this class must be created
> // and destroyed in the controller thread.
>@@ -894,25 +1600,96 @@ inline void SleepMilliseconds(int n) {
> // use it in user tests, either directly or indirectly.
> class Notification {
> public:
>- Notification() : notified_(false) {}
>+ Notification() : notified_(false) {
>+ GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, NULL));
>+ }
>+ ~Notification() {
>+ pthread_mutex_destroy(&mutex_);
>+ }
> 
> // Notifies all threads created with this notification to start. Must
> // be called from the controller thread.
>- void Notify() { notified_ = true; }
>+ void Notify() {
>+ pthread_mutex_lock(&mutex_);
>+ notified_ = true;
>+ pthread_mutex_unlock(&mutex_);
>+ }
> 
> // Blocks until the controller thread notifies. Must be called from a test
> // thread.
> void WaitForNotification() {
>- while(!notified_) {
>+ for (;;) {
>+ pthread_mutex_lock(&mutex_);
>+ const bool notified = notified_;
>+ pthread_mutex_unlock(&mutex_);
>+ if (notified)
>+ break;
> SleepMilliseconds(10);
> }
> }
> 
> private:
>- volatile bool notified_;
>+ pthread_mutex_t mutex_;
>+ bool notified_;
>+
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);
>+};
>+
>+# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
>+
>+GTEST_API_ void SleepMilliseconds(int n);
>+
>+// Provides leak-safe Windows kernel handle ownership.
>+// Used in death tests and in threading support.
>+class GTEST_API_ AutoHandle {
>+ public:
>+ // Assume that Win32 HANDLE type is equivalent to void*. Doing so allows us to
>+ // avoid including <windows.h> in this header file. Including <windows.h> is
>+ // undesirable because it defines a lot of symbols and macros that tend to
>+ // conflict with client code. This assumption is verified by
>+ // WindowsTypesTest.HANDLEIsVoidStar.
>+ typedef void* Handle;
>+ AutoHandle();
>+ explicit AutoHandle(Handle handle);
>+
>+ ~AutoHandle();
>+
>+ Handle Get() const;
>+ void Reset();
>+ void Reset(Handle handle);
>+
>+ private:
>+ // Returns true iff the handle is a valid handle object that can be closed.
>+ bool IsCloseable() const;
>+
>+ Handle handle_;
>+
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(AutoHandle);
>+};
>+
>+// Allows a controller thread to pause execution of newly created
>+// threads until notified. Instances of this class must be created
>+// and destroyed in the controller thread.
>+//
>+// This class is only for testing Google Test's own constructs. Do not
>+// use it in user tests, either directly or indirectly.
>+class GTEST_API_ Notification {
>+ public:
>+ Notification();
>+ void Notify();
>+ void WaitForNotification();
>+
>+ private:
>+ AutoHandle event_;
> 
> GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);
> };
>+# endif // GTEST_HAS_NOTIFICATION_
>+
>+// On MinGW, we can have both GTEST_OS_WINDOWS and GTEST_HAS_PTHREAD
>+// defined, but we don't want to use MinGW's pthreads implementation, which
>+// has conformance problems with some versions of the POSIX standard.
>+# if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW
> 
> // As a C-function, ThreadFuncWithCLinkage cannot be templated itself.
> // Consequently, it cannot select a correct instantiation of ThreadWithParam
>@@ -951,10 +1728,9 @@ extern "C" inline void* ThreadFuncWithCLinkage(void* thread) {
> template <typename T>
> class ThreadWithParam : public ThreadWithParamBase {
> public:
>- typedef void (*UserThreadFunc)(T);
>+ typedef void UserThreadFunc(T);
> 
>- ThreadWithParam(
>- UserThreadFunc func, T param, Notification* thread_can_start)
>+ ThreadWithParam(UserThreadFunc* func, T param, Notification* thread_can_start)
> : func_(func),
> param_(param),
> thread_can_start_(thread_can_start),
>@@ -981,7 +1757,7 @@ class ThreadWithParam : public ThreadWithParamBase {
> }
> 
> private:
>- const UserThreadFunc func_; // User-supplied thread function.
>+ UserThreadFunc* const func_; // User-supplied thread function.
> const T param_; // User-supplied parameter to the thread function.
> // When non-NULL, used to block execution until the controller thread
> // notifies.
>@@ -991,51 +1767,316 @@ class ThreadWithParam : public ThreadWithParamBase {
> 
> GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam);
> };
>+# endif // !GTEST_OS_WINDOWS && GTEST_HAS_PTHREAD ||
>+ // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
> 
>-// gtest-port.h guarantees to #include <pthread.h> when GTEST_HAS_PTHREAD is
>-// true.
>-#include <pthread.h>
>+# if GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
>+// Mutex and ThreadLocal have already been imported into the namespace.
>+// Nothing to do here.
> 
>-// MutexBase and Mutex implement mutex on pthreads-based platforms. They
>-// are used in conjunction with class MutexLock:
>+# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
>+
>+// Mutex implements mutex on Windows platforms. It is used in conjunction
>+// with class MutexLock:
> //
> // Mutex mutex;
> // ...
>-// MutexLock lock(&mutex); // Acquires the mutex and releases it at the end
>-// // of the current scope.
>-//
>-// MutexBase implements behavior for both statically and dynamically
>-// allocated mutexes. Do not use MutexBase directly. Instead, write
>-// the following to define a static mutex:
>+// MutexLock lock(&mutex); // Acquires the mutex and releases it at the
>+// // end of the current scope.
> //
>+// A static Mutex *must* be defined or declared using one of the following
>+// macros:
> // GTEST_DEFINE_STATIC_MUTEX_(g_some_mutex);
>+// GTEST_DECLARE_STATIC_MUTEX_(g_some_mutex);
>+//
>+// (A non-static Mutex is defined/declared in the usual way).
>+class GTEST_API_ Mutex {
>+ public:
>+ enum MutexType { kStatic = 0, kDynamic = 1 };
>+ // We rely on kStaticMutex being 0 as it is to what the linker initializes
>+ // type_ in static mutexes. critical_section_ will be initialized lazily
>+ // in ThreadSafeLazyInit().
>+ enum StaticConstructorSelector { kStaticMutex = 0 };
>+
>+ // This constructor intentionally does nothing. It relies on type_ being
>+ // statically initialized to 0 (effectively setting it to kStatic) and on
>+ // ThreadSafeLazyInit() to lazily initialize the rest of the members.
>+ explicit Mutex(StaticConstructorSelector /*dummy*/) {}
>+
>+ Mutex();
>+ ~Mutex();
>+
>+ void Lock();
>+
>+ void Unlock();
>+
>+ // Does nothing if the current thread holds the mutex. Otherwise, crashes
>+ // with high probability.
>+ void AssertHeld();
>+
>+ private:
>+ // Initializes owner_thread_id_ and critical_section_ in static mutexes.
>+ void ThreadSafeLazyInit();
>+
>+ // Per https://blogs.msdn.microsoft.com/oldnewthing/20040223-00/?p=40503,
>+ // we assume that 0 is an invalid value for thread IDs.
>+ unsigned int owner_thread_id_;
>+
>+ // For static mutexes, we rely on these members being initialized to zeros
>+ // by the linker.
>+ MutexType type_;
>+ long critical_section_init_phase_; // NOLINT
>+ GTEST_CRITICAL_SECTION* critical_section_;
>+
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex);
>+};
>+
>+# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
>+ extern ::testing::internal::Mutex mutex
>+
>+# define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
>+ ::testing::internal::Mutex mutex(::testing::internal::Mutex::kStaticMutex)
>+
>+// We cannot name this class MutexLock because the ctor declaration would
>+// conflict with a macro named MutexLock, which is defined on some
>+// platforms. That macro is used as a defensive measure to prevent against
>+// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
>+// "MutexLock l(&mu)". Hence the typedef trick below.
>+class GTestMutexLock {
>+ public:
>+ explicit GTestMutexLock(Mutex* mutex)
>+ : mutex_(mutex) { mutex_->Lock(); }
>+
>+ ~GTestMutexLock() { mutex_->Unlock(); }
>+
>+ private:
>+ Mutex* const mutex_;
>+
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestMutexLock);
>+};
>+
>+typedef GTestMutexLock MutexLock;
>+
>+// Base class for ValueHolder<T>. Allows a caller to hold and delete a value
>+// without knowing its type.
>+class ThreadLocalValueHolderBase {
>+ public:
>+ virtual ~ThreadLocalValueHolderBase() {}
>+};
>+
>+// Provides a way for a thread to send notifications to a ThreadLocal
>+// regardless of its parameter type.
>+class ThreadLocalBase {
>+ public:
>+ // Creates a new ValueHolder<T> object holding a default value passed to
>+ // this ThreadLocal<T>'s constructor and returns it. It is the caller's
>+ // responsibility not to call this when the ThreadLocal<T> instance already
>+ // has a value on the current thread.
>+ virtual ThreadLocalValueHolderBase* NewValueForCurrentThread() const = 0;
>+
>+ protected:
>+ ThreadLocalBase() {}
>+ virtual ~ThreadLocalBase() {}
>+
>+ private:
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocalBase);
>+};
>+
>+// Maps a thread to a set of ThreadLocals that have values instantiated on that
>+// thread and notifies them when the thread exits. A ThreadLocal instance is
>+// expected to persist until all threads it has values on have terminated.
>+class GTEST_API_ ThreadLocalRegistry {
>+ public:
>+ // Registers thread_local_instance as having value on the current thread.
>+ // Returns a value that can be used to identify the thread from other threads.
>+ static ThreadLocalValueHolderBase* GetValueOnCurrentThread(
>+ const ThreadLocalBase* thread_local_instance);
>+
>+ // Invoked when a ThreadLocal instance is destroyed.
>+ static void OnThreadLocalDestroyed(
>+ const ThreadLocalBase* thread_local_instance);
>+};
>+
>+class GTEST_API_ ThreadWithParamBase {
>+ public:
>+ void Join();
>+
>+ protected:
>+ class Runnable {
>+ public:
>+ virtual ~Runnable() {}
>+ virtual void Run() = 0;
>+ };
>+
>+ ThreadWithParamBase(Runnable *runnable, Notification* thread_can_start);
>+ virtual ~ThreadWithParamBase();
>+
>+ private:
>+ AutoHandle thread_;
>+};
>+
>+// Helper class for testing Google Test's multi-threading constructs.
>+template <typename T>
>+class ThreadWithParam : public ThreadWithParamBase {
>+ public:
>+ typedef void UserThreadFunc(T);
>+
>+ ThreadWithParam(UserThreadFunc* func, T param, Notification* thread_can_start)
>+ : ThreadWithParamBase(new RunnableImpl(func, param), thread_can_start) {
>+ }
>+ virtual ~ThreadWithParam() {}
>+
>+ private:
>+ class RunnableImpl : public Runnable {
>+ public:
>+ RunnableImpl(UserThreadFunc* func, T param)
>+ : func_(func),
>+ param_(param) {
>+ }
>+ virtual ~RunnableImpl() {}
>+ virtual void Run() {
>+ func_(param_);
>+ }
>+
>+ private:
>+ UserThreadFunc* const func_;
>+ const T param_;
>+
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(RunnableImpl);
>+ };
>+
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam);
>+};
>+
>+// Implements thread-local storage on Windows systems.
> //
>-// You can forward declare a static mutex like this:
>+// // Thread 1
>+// ThreadLocal<int> tl(100); // 100 is the default value for each thread.
> //
>-// GTEST_DECLARE_STATIC_MUTEX_(g_some_mutex);
>+// // Thread 2
>+// tl.set(150); // Changes the value for thread 2 only.
>+// EXPECT_EQ(150, tl.get());
> //
>-// To create a dynamic mutex, just define an object of type Mutex.
>+// // Thread 1
>+// EXPECT_EQ(100, tl.get()); // In thread 1, tl has the original value.
>+// tl.set(200);
>+// EXPECT_EQ(200, tl.get());
>+//
>+// The template type argument T must have a public copy constructor.
>+// In addition, the default ThreadLocal constructor requires T to have
>+// a public default constructor.
>+//
>+// The users of a TheadLocal instance have to make sure that all but one
>+// threads (including the main one) using that instance have exited before
>+// destroying it. Otherwise, the per-thread objects managed for them by the
>+// ThreadLocal instance are not guaranteed to be destroyed on all platforms.
>+//
>+// Google Test only uses global ThreadLocal objects. That means they
>+// will die after main() has returned. Therefore, no per-thread
>+// object managed by Google Test will be leaked as long as all threads
>+// using Google Test have exited when main() returns.
>+template <typename T>
>+class ThreadLocal : public ThreadLocalBase {
>+ public:
>+ ThreadLocal() : default_factory_(new DefaultValueHolderFactory()) {}
>+ explicit ThreadLocal(const T& value)
>+ : default_factory_(new InstanceValueHolderFactory(value)) {}
>+
>+ ~ThreadLocal() { ThreadLocalRegistry::OnThreadLocalDestroyed(this); }
>+
>+ T* pointer() { return GetOrCreateValue(); }
>+ const T* pointer() const { return GetOrCreateValue(); }
>+ const T& get() const { return *pointer(); }
>+ void set(const T& value) { *pointer() = value; }
>+
>+ private:
>+ // Holds a value of T. Can be deleted via its base class without the caller
>+ // knowing the type of T.
>+ class ValueHolder : public ThreadLocalValueHolderBase {
>+ public:
>+ ValueHolder() : value_() {}
>+ explicit ValueHolder(const T& value) : value_(value) {}
>+
>+ T* pointer() { return &value_; }
>+
>+ private:
>+ T value_;
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolder);
>+ };
>+
>+
>+ T* GetOrCreateValue() const {
>+ return static_cast<ValueHolder*>(
>+ ThreadLocalRegistry::GetValueOnCurrentThread(this))->pointer();
>+ }
>+
>+ virtual ThreadLocalValueHolderBase* NewValueForCurrentThread() const {
>+ return default_factory_->MakeNewHolder();
>+ }
>+
>+ class ValueHolderFactory {
>+ public:
>+ ValueHolderFactory() {}
>+ virtual ~ValueHolderFactory() {}
>+ virtual ValueHolder* MakeNewHolder() const = 0;
>+
>+ private:
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolderFactory);
>+ };
>+
>+ class DefaultValueHolderFactory : public ValueHolderFactory {
>+ public:
>+ DefaultValueHolderFactory() {}
>+ virtual ValueHolder* MakeNewHolder() const { return new ValueHolder(); }
>+
>+ private:
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultValueHolderFactory);
>+ };
>+
>+ class InstanceValueHolderFactory : public ValueHolderFactory {
>+ public:
>+ explicit InstanceValueHolderFactory(const T& value) : value_(value) {}
>+ virtual ValueHolder* MakeNewHolder() const {
>+ return new ValueHolder(value_);
>+ }
>+
>+ private:
>+ const T value_; // The value for each thread.
>+
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(InstanceValueHolderFactory);
>+ };
>+
>+ scoped_ptr<ValueHolderFactory> default_factory_;
>+
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal);
>+};
>+
>+# elif GTEST_HAS_PTHREAD
>+
>+// MutexBase and Mutex implement mutex on pthreads-based platforms.
> class MutexBase {
> public:
> // Acquires this mutex.
> void Lock() {
> GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_lock(&mutex_));
> owner_ = pthread_self();
>+ has_owner_ = true;
> }
> 
> // Releases this mutex.
> void Unlock() {
>- // We don't protect writing to owner_ here, as it's the caller's
>- // responsibility to ensure that the current thread holds the
>+ // Since the lock is being released the owner_ field should no longer be
>+ // considered valid. We don't protect writing to has_owner_ here, as it's
>+ // the caller's responsibility to ensure that the current thread holds the
> // mutex when this is called.
>- owner_ = 0;
>+ has_owner_ = false;
> GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&mutex_));
> }
> 
> // Does nothing if the current thread holds the mutex. Otherwise, crashes
> // with high probability.
> void AssertHeld() const {
>- GTEST_CHECK_(owner_ == pthread_self())
>+ GTEST_CHECK_(has_owner_ && pthread_equal(owner_, pthread_self()))
> << "The current thread is not holding the mutex @" << this;
> }
> 
>@@ -1046,16 +2087,28 @@ class MutexBase {
> // have to be public.
> public:
> pthread_mutex_t mutex_; // The underlying pthread mutex.
>- pthread_t owner_; // The thread holding the mutex; 0 means no one holds it.
>+ // has_owner_ indicates whether the owner_ field below contains a valid thread
>+ // ID and is therefore safe to inspect (e.g., to use in pthread_equal()). All
>+ // accesses to the owner_ field should be protected by a check of this field.
>+ // An alternative might be to memset() owner_ to all zeros, but there's no
>+ // guarantee that a zero'd pthread_t is necessarily invalid or even different
>+ // from pthread_self().
>+ bool has_owner_;
>+ pthread_t owner_; // The thread holding the mutex.
> };
> 
> // Forward-declares a static mutex.
>-#define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
>- extern ::testing::internal::MutexBase mutex
>+# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
>+ extern ::testing::internal::MutexBase mutex
> 
> // Defines and statically (i.e. at link time) initializes a static mutex.
>+// The initialization list here does not explicitly initialize each field,
>+// instead relying on default initialization for the unspecified fields. In
>+// particular, the owner_ field (a pthread_t) is not explicitly initialized.
>+// This allows initialization to work whether pthread_t is a scalar or struct.
>+// The flag -Wmissing-field-initializers must not be specified for this to work.
> #define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
>- ::testing::internal::MutexBase mutex = { PTHREAD_MUTEX_INITIALIZER, 0 }
>+ ::testing::internal::MutexBase mutex = {PTHREAD_MUTEX_INITIALIZER, false, 0}
> 
> // The Mutex class can only be used for mutexes created at runtime. It
> // shares its API with MutexBase otherwise.
>@@ -1063,7 +2116,7 @@ class Mutex : public MutexBase {
> public:
> Mutex() {
> GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, NULL));
>- owner_ = 0;
>+ has_owner_ = false;
> }
> ~Mutex() {
> GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_destroy(&mutex_));
>@@ -1073,9 +2126,11 @@ class Mutex : public MutexBase {
> GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex);
> };
> 
>-// We cannot name this class MutexLock as the ctor declaration would
>+// We cannot name this class MutexLock because the ctor declaration would
> // conflict with a macro named MutexLock, which is defined on some
>-// platforms. Hence the typedef trick below.
>+// platforms. That macro is used as a defensive measure to prevent against
>+// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
>+// "MutexLock l(&mu)". Hence the typedef trick below.
> class GTestMutexLock {
> public:
> explicit GTestMutexLock(MutexBase* mutex)
>@@ -1109,41 +2164,14 @@ extern "C" inline void DeleteThreadLocalValue(void* value_holder) {
> }
> 
> // Implements thread-local storage on pthreads-based systems.
>-//
>-// // Thread 1
>-// ThreadLocal<int> tl(100); // 100 is the default value for each thread.
>-//
>-// // Thread 2
>-// tl.set(150); // Changes the value for thread 2 only.
>-// EXPECT_EQ(150, tl.get());
>-//
>-// // Thread 1
>-// EXPECT_EQ(100, tl.get()); // In thread 1, tl has the original value.
>-// tl.set(200);
>-// EXPECT_EQ(200, tl.get());
>-//
>-// The template type argument T must have a public copy constructor.
>-// In addition, the default ThreadLocal constructor requires T to have
>-// a public default constructor.
>-//
>-// An object managed for a thread by a ThreadLocal instance is deleted
>-// when the thread exits. Or, if the ThreadLocal instance dies in
>-// that thread, when the ThreadLocal dies. It's the user's
>-// responsibility to ensure that all other threads using a ThreadLocal
>-// have exited when it dies, or the per-thread objects for those
>-// threads will not be deleted.
>-//
>-// Google Test only uses global ThreadLocal objects. That means they
>-// will die after main() has returned. Therefore, no per-thread
>-// object managed by Google Test will be leaked as long as all threads
>-// using Google Test have exited when main() returns.
> template <typename T>
>-class ThreadLocal {
>+class GTEST_API_ ThreadLocal {
> public:
>- ThreadLocal() : key_(CreateKey()),
>- default_() {}
>- explicit ThreadLocal(const T& value) : key_(CreateKey()),
>- default_(value) {}
>+ ThreadLocal()
>+ : key_(CreateKey()), default_factory_(new DefaultValueHolderFactory()) {}
>+ explicit ThreadLocal(const T& value)
>+ : key_(CreateKey()),
>+ default_factory_(new InstanceValueHolderFactory(value)) {}
> 
> ~ThreadLocal() {
> // Destroys the managed object for the current thread, if any.
>@@ -1163,6 +2191,7 @@ class ThreadLocal {
> // Holds a value of type T.
> class ValueHolder : public ThreadLocalValueHolderBase {
> public:
>+ ValueHolder() : value_() {}
> explicit ValueHolder(const T& value) : value_(value) {}
> 
> T* pointer() { return &value_; }
>@@ -1188,22 +2217,54 @@ class ThreadLocal {
> return CheckedDowncastToActualType<ValueHolder>(holder)->pointer();
> }
> 
>- ValueHolder* const new_holder = new ValueHolder(default_);
>+ ValueHolder* const new_holder = default_factory_->MakeNewHolder();
> ThreadLocalValueHolderBase* const holder_base = new_holder;
> GTEST_CHECK_POSIX_SUCCESS_(pthread_setspecific(key_, holder_base));
> return new_holder->pointer();
> }
> 
>+ class ValueHolderFactory {
>+ public:
>+ ValueHolderFactory() {}
>+ virtual ~ValueHolderFactory() {}
>+ virtual ValueHolder* MakeNewHolder() const = 0;
>+
>+ private:
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolderFactory);
>+ };
>+
>+ class DefaultValueHolderFactory : public ValueHolderFactory {
>+ public:
>+ DefaultValueHolderFactory() {}
>+ virtual ValueHolder* MakeNewHolder() const { return new ValueHolder(); }
>+
>+ private:
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultValueHolderFactory);
>+ };
>+
>+ class InstanceValueHolderFactory : public ValueHolderFactory {
>+ public:
>+ explicit InstanceValueHolderFactory(const T& value) : value_(value) {}
>+ virtual ValueHolder* MakeNewHolder() const {
>+ return new ValueHolder(value_);
>+ }
>+
>+ private:
>+ const T value_; // The value for each thread.
>+
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(InstanceValueHolderFactory);
>+ };
>+
> // A key pthreads uses for looking up per-thread values.
> const pthread_key_t key_;
>- const T default_; // The default value for each thread.
>+ scoped_ptr<ValueHolderFactory> default_factory_;
> 
> GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal);
> };
> 
>-#define GTEST_IS_THREADSAFE 1
>+# endif // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
> 
>-#else // GTEST_HAS_PTHREAD
>+#else // GTEST_IS_THREADSAFE
> 
> // A dummy implementation of synchronization primitives (mutex, lock,
> // and thread-local variable). Necessary for compiling Google Test where
>@@ -1213,14 +2274,21 @@ class ThreadLocal {
> class Mutex {
> public:
> Mutex() {}
>+ void Lock() {}
>+ void Unlock() {}
> void AssertHeld() const {}
> };
> 
>-#define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
>+# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
> extern ::testing::internal::Mutex mutex
> 
>-#define GTEST_DEFINE_STATIC_MUTEX_(mutex) ::testing::internal::Mutex mutex
>+# define GTEST_DEFINE_STATIC_MUTEX_(mutex) ::testing::internal::Mutex mutex
> 
>+// We cannot name this class MutexLock because the ctor declaration would
>+// conflict with a macro named MutexLock, which is defined on some
>+// platforms. That macro is used as a defensive measure to prevent against
>+// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
>+// "MutexLock l(&mu)". Hence the typedef trick below.
> class GTestMutexLock {
> public:
> explicit GTestMutexLock(Mutex*) {} // NOLINT
>@@ -1229,7 +2297,7 @@ class GTestMutexLock {
> typedef GTestMutexLock MutexLock;
> 
> template <typename T>
>-class ThreadLocal {
>+class GTEST_API_ ThreadLocal {
> public:
> ThreadLocal() : value_() {}
> explicit ThreadLocal(const T& value) : value_(value) {}
>@@ -1241,28 +2309,25 @@ class ThreadLocal {
> T value_;
> };
> 
>-// The above synchronization primitives have dummy implementations.
>-// Therefore Google Test is not thread-safe.
>-#define GTEST_IS_THREADSAFE 0
>-
>-#endif // GTEST_HAS_PTHREAD
>+#endif // GTEST_IS_THREADSAFE
> 
> // Returns the number of threads running in the process, or 0 to indicate that
> // we cannot detect it.
> GTEST_API_ size_t GetThreadCount();
> 
> // Passing non-POD classes through ellipsis (...) crashes the ARM
>-// compiler and generates a warning in Sun Studio. The Nokia Symbian
>+// compiler and generates a warning in Sun Studio before 12u4. The Nokia Symbian
> // and the IBM XL C/C++ compiler try to instantiate a copy constructor
> // for objects passed through ellipsis (...), failing for uncopyable
> // objects. We define this to ensure that only POD is passed through
> // ellipsis on these systems.
>-#if defined(__SYMBIAN32__) || defined(__IBMCPP__) || defined(__SUNPRO_CC)
>+#if defined(__SYMBIAN32__) || defined(__IBMCPP__) || \
>+ (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x5130)
> // We lose support for NULL detection where the compiler doesn't like
> // passing non-POD classes through ellipsis (...).
>-#define GTEST_ELLIPSIS_NEEDS_POD_ 1
>+# define GTEST_ELLIPSIS_NEEDS_POD_ 1
> #else
>-#define GTEST_CAN_COMPARE_NULL 1
>+# define GTEST_CAN_COMPARE_NULL 1
> #endif
> 
> // The Nokia Symbian and IBM XL C/C++ compilers cannot decide between
>@@ -1270,7 +2335,7 @@ GTEST_API_ size_t GetThreadCount();
> // _can_ decide between class template specializations for T and T*,
> // so a tr1::type_traits-like is_pointer works.
> #if defined(__SYMBIAN32__) || defined(__IBMCPP__)
>-#define GTEST_NEEDS_IS_POINTER_ 1
>+# define GTEST_NEEDS_IS_POINTER_ 1
> #endif
> 
> template <bool bool_value>
>@@ -1283,23 +2348,93 @@ template <bool bool_value> const bool bool_constant<bool_value>::value;
> typedef bool_constant<false> false_type;
> typedef bool_constant<true> true_type;
> 
>+template <typename T, typename U>
>+struct is_same : public false_type {};
>+
>+template <typename T>
>+struct is_same<T, T> : public true_type {};
>+
>+
> template <typename T>
> struct is_pointer : public false_type {};
> 
> template <typename T>
> struct is_pointer<T*> : public true_type {};
> 
>+template <typename Iterator>
>+struct IteratorTraits {
>+ typedef typename Iterator::value_type value_type;
>+};
>+
>+
>+template <typename T>
>+struct IteratorTraits<T*> {
>+ typedef T value_type;
>+};
>+
>+template <typename T>
>+struct IteratorTraits<const T*> {
>+ typedef T value_type;
>+};
>+
> #if GTEST_OS_WINDOWS
>-#define GTEST_PATH_SEP_ "\\"
>-#define GTEST_HAS_ALT_PATH_SEP_ 1
>+# define GTEST_PATH_SEP_ "\\"
>+# define GTEST_HAS_ALT_PATH_SEP_ 1
> // The biggest signed integer type the compiler supports.
> typedef __int64 BiggestInt;
> #else
>-#define GTEST_PATH_SEP_ "/"
>-#define GTEST_HAS_ALT_PATH_SEP_ 0
>+# define GTEST_PATH_SEP_ "/"
>+# define GTEST_HAS_ALT_PATH_SEP_ 0
> typedef long long BiggestInt; // NOLINT
> #endif // GTEST_OS_WINDOWS
> 
>+// Utilities for char.
>+
>+// isspace(int ch) and friends accept an unsigned char or EOF. char
>+// may be signed, depending on the compiler (or compiler flags).
>+// Therefore we need to cast a char to unsigned char before calling
>+// isspace(), etc.
>+
>+inline bool IsAlpha(char ch) {
>+ return isalpha(static_cast<unsigned char>(ch)) != 0;
>+}
>+inline bool IsAlNum(char ch) {
>+ return isalnum(static_cast<unsigned char>(ch)) != 0;
>+}
>+inline bool IsDigit(char ch) {
>+ return isdigit(static_cast<unsigned char>(ch)) != 0;
>+}
>+inline bool IsLower(char ch) {
>+ return islower(static_cast<unsigned char>(ch)) != 0;
>+}
>+inline bool IsSpace(char ch) {
>+ return isspace(static_cast<unsigned char>(ch)) != 0;
>+}
>+inline bool IsUpper(char ch) {
>+ return isupper(static_cast<unsigned char>(ch)) != 0;
>+}
>+inline bool IsXDigit(char ch) {
>+ return isxdigit(static_cast<unsigned char>(ch)) != 0;
>+}
>+inline bool IsXDigit(wchar_t ch) {
>+ const unsigned char low_byte = static_cast<unsigned char>(ch);
>+ return ch == low_byte && isxdigit(low_byte) != 0;
>+}
>+
>+inline char ToLower(char ch) {
>+ return static_cast<char>(tolower(static_cast<unsigned char>(ch)));
>+}
>+inline char ToUpper(char ch) {
>+ return static_cast<char>(toupper(static_cast<unsigned char>(ch)));
>+}
>+
>+inline std::string StripTrailingSpaces(std::string str) {
>+ std::string::iterator it = str.end();
>+ while (it != str.begin() && IsSpace(*--it))
>+ it = str.erase(it);
>+ return str;
>+}
>+
> // The testing::internal::posix namespace holds wrappers for common
> // POSIX functions. These wrappers hide the differences between
> // Windows/MSVC and POSIX systems. Since some compilers define these
>@@ -1314,36 +2449,36 @@ namespace posix {
> 
> typedef struct _stat StatStruct;
> 
>-#ifdef __BORLANDC__
>+# ifdef __BORLANDC__
> inline int IsATTY(int fd) { return isatty(fd); }
> inline int StrCaseCmp(const char* s1, const char* s2) {
> return stricmp(s1, s2);
> }
> inline char* StrDup(const char* src) { return strdup(src); }
>-#else // !__BORLANDC__
>-#if GTEST_OS_WINDOWS_MOBILE
>+# else // !__BORLANDC__
>+# if GTEST_OS_WINDOWS_MOBILE
> inline int IsATTY(int /* fd */) { return 0; }
>-#else
>+# else
> inline int IsATTY(int fd) { return _isatty(fd); }
>-#endif // GTEST_OS_WINDOWS_MOBILE
>+# endif // GTEST_OS_WINDOWS_MOBILE
> inline int StrCaseCmp(const char* s1, const char* s2) {
> return _stricmp(s1, s2);
> }
> inline char* StrDup(const char* src) { return _strdup(src); }
>-#endif // __BORLANDC__
>+# endif // __BORLANDC__
> 
>-#if GTEST_OS_WINDOWS_MOBILE
>+# if GTEST_OS_WINDOWS_MOBILE
> inline int FileNo(FILE* file) { return reinterpret_cast<int>(_fileno(file)); }
> // Stat(), RmDir(), and IsDir() are not needed on Windows CE at this
> // time and thus not defined there.
>-#else
>+# else
> inline int FileNo(FILE* file) { return _fileno(file); }
> inline int Stat(const char* path, StatStruct* buf) { return _stat(path, buf); }
> inline int RmDir(const char* dir) { return _rmdir(dir); }
> inline bool IsDir(const StatStruct& st) {
> return (_S_IFDIR & st.st_mode) != 0;
> }
>-#endif // GTEST_OS_WINDOWS_MOBILE
>+# endif // GTEST_OS_WINDOWS_MOBILE
> 
> #else
> 
>@@ -1363,11 +2498,7 @@ inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
> 
> // Functions deprecated by MSVC 8.0.
> 
>-#ifdef _MSC_VER
>-// Temporarily disable warning 4996 (deprecated function).
>-#pragma warning(push)
>-#pragma warning(disable:4996)
>-#endif
>+GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
> 
> inline const char* StrNCpy(char* dest, const char* src, size_t n) {
> return strncpy(dest, src, n);
>@@ -1377,7 +2508,7 @@ inline const char* StrNCpy(char* dest, const char* src, size_t n) {
> // StrError() aren't needed on Windows CE at this time and thus not
> // defined there.
> 
>-#if !GTEST_OS_WINDOWS_MOBILE
>+#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
> inline int ChDir(const char* dir) { return chdir(dir); }
> #endif
> inline FILE* FOpen(const char* path, const char* mode) {
>@@ -1401,8 +2532,9 @@ inline int Close(int fd) { return close(fd); }
> inline const char* StrError(int errnum) { return strerror(errnum); }
> #endif
> inline const char* GetEnv(const char* name) {
>-#if GTEST_OS_WINDOWS_MOBILE
>+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT
> // We are on Windows CE, which has no environment variables.
>+ static_cast<void>(name); // To prevent 'unused argument' warning.
> return NULL;
> #elif defined(__BORLANDC__) || defined(__SunOS_5_8) || defined(__SunOS_5_9)
> // Environment variables which we programmatically clear will be set to the
>@@ -1414,9 +2546,7 @@ inline const char* GetEnv(const char* name) {
> #endif
> }
> 
>-#ifdef _MSC_VER
>-#pragma warning(pop) // Restores the warning state.
>-#endif
>+GTEST_DISABLE_MSC_DEPRECATED_POP_()
> 
> #if GTEST_OS_WINDOWS_MOBILE
> // Windows CE has no C library. The abort() function is used in
>@@ -1429,6 +2559,23 @@ inline void Abort() { abort(); }
> 
> } // namespace posix
> 
>+// MSVC "deprecates" snprintf and issues warnings wherever it is used. In
>+// order to avoid these warnings, we need to use _snprintf or _snprintf_s on
>+// MSVC-based platforms. We map the GTEST_SNPRINTF_ macro to the appropriate
>+// function in order to achieve that. We use macro definition here because
>+// snprintf is a variadic function.
>+#if _MSC_VER >= 1400 && !GTEST_OS_WINDOWS_MOBILE
>+// MSVC 2005 and above support variadic macros.
>+# define GTEST_SNPRINTF_(buffer, size, format, ...) \
>+ _snprintf_s(buffer, size, size, format, __VA_ARGS__)
>+#elif defined(_MSC_VER)
>+// Windows CE does not define _snprintf_s and MSVC prior to 2005 doesn't
>+// complain about _snprintf.
>+# define GTEST_SNPRINTF_ _snprintf
>+#else
>+# define GTEST_SNPRINTF_ snprintf
>+#endif
>+
> // The maximum number a BiggestInt can represent. This definition
> // works no matter BiggestInt is represented in one's complement or
> // two's complement.
>@@ -1500,27 +2647,44 @@ typedef TypeWithSize<8>::Int TimeInMillis; // Represents time in milliseconds.
> // Utilities for command line flags and environment variables.
> 
> // Macro for referencing flags.
>-#define GTEST_FLAG(name) FLAGS_gtest_##name
>+#if !defined(GTEST_FLAG)
>+# define GTEST_FLAG(name) FLAGS_gtest_##name
>+#endif // !defined(GTEST_FLAG)
>+
>+#if !defined(GTEST_USE_OWN_FLAGFILE_FLAG_)
>+# define GTEST_USE_OWN_FLAGFILE_FLAG_ 1
>+#endif // !defined(GTEST_USE_OWN_FLAGFILE_FLAG_)
>+
>+#if !defined(GTEST_DECLARE_bool_)
>+# define GTEST_FLAG_SAVER_ ::testing::internal::GTestFlagSaver
> 
> // Macros for declaring flags.
>-#define GTEST_DECLARE_bool_(name) GTEST_API_ extern bool GTEST_FLAG(name)
>-#define GTEST_DECLARE_int32_(name) \
>+# define GTEST_DECLARE_bool_(name) GTEST_API_ extern bool GTEST_FLAG(name)
>+# define GTEST_DECLARE_int32_(name) \
> GTEST_API_ extern ::testing::internal::Int32 GTEST_FLAG(name)
>-#define GTEST_DECLARE_string_(name) \
>- GTEST_API_ extern ::testing::internal::String GTEST_FLAG(name)
>+# define GTEST_DECLARE_string_(name) \
>+ GTEST_API_ extern ::std::string GTEST_FLAG(name)
> 
> // Macros for defining flags.
>-#define GTEST_DEFINE_bool_(name, default_val, doc) \
>+# define GTEST_DEFINE_bool_(name, default_val, doc) \
> GTEST_API_ bool GTEST_FLAG(name) = (default_val)
>-#define GTEST_DEFINE_int32_(name, default_val, doc) \
>+# define GTEST_DEFINE_int32_(name, default_val, doc) \
> GTEST_API_ ::testing::internal::Int32 GTEST_FLAG(name) = (default_val)
>-#define GTEST_DEFINE_string_(name, default_val, doc) \
>- GTEST_API_ ::testing::internal::String GTEST_FLAG(name) = (default_val)
>+# define GTEST_DEFINE_string_(name, default_val, doc) \
>+ GTEST_API_ ::std::string GTEST_FLAG(name) = (default_val)
>+
>+#endif // !defined(GTEST_DECLARE_bool_)
>+
>+// Thread annotations
>+#if !defined(GTEST_EXCLUSIVE_LOCK_REQUIRED_)
>+# define GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks)
>+# define GTEST_LOCK_EXCLUDED_(locks)
>+#endif // !defined(GTEST_EXCLUSIVE_LOCK_REQUIRED_)
> 
> // Parses 'str' for a 32-bit signed integer. If successful, writes the result
> // to *value and returns true; otherwise leaves *value unchanged and returns
> // false.
>-// TODO(chandlerc): Find a better way to refactor flag and environment parsing
>+// FIXME: Find a better way to refactor flag and environment parsing
> // out of both gtest-port.cc and gtest.cc to avoid exporting this utility
> // function.
> bool ParseInt32(const Message& src_text, const char* str, Int32* value);
>@@ -1529,6 +2693,7 @@ bool ParseInt32(const Message& src_text, const char* str, Int32* value);
> // corresponding to the given Google Test flag.
> bool BoolFromGTestEnv(const char* flag, bool default_val);
> GTEST_API_ Int32 Int32FromGTestEnv(const char* flag, Int32 default_val);
>+std::string OutputFlagAlsoCheckEnvVar();
> const char* StringFromGTestEnv(const char* flag, const char* default_val);
> 
> } // namespace internal
>diff --git a/Source/ThirdParty/gtest/include/gtest/internal/gtest-string.h b/Source/ThirdParty/gtest/include/gtest/internal/gtest-string.h
>index aff093dec8db399074ea3b71bb7227da7e96730a..4c9b6262c3c103726aa3cab4c19995baef958b98 100644
>--- a/Source/ThirdParty/gtest/include/gtest/internal/gtest-string.h
>+++ b/Source/ThirdParty/gtest/include/gtest/internal/gtest-string.h
>@@ -27,70 +27,38 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> //
>-// Authors: wan@google.com (Zhanyong Wan), eefacm@gmail.com (Sean Mcafee)
>-//
>-// The Google C++ Testing Framework (Google Test)
>+// The Google C++ Testing and Mocking Framework (Google Test)
> //
> // This header file declares the String class and functions used internally by
> // Google Test. They are subject to change without notice. They should not used
> // by code external to Google Test.
> //
>-// This header file is #included by <gtest/internal/gtest-internal.h>.
>+// This header file is #included by gtest-internal.h.
> // It should not be #included by other files.
> 
>+// GOOGLETEST_CM0001 DO NOT DELETE
>+
> #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
> #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
> 
> #ifdef __BORLANDC__
> // string.h is not guaranteed to provide strcpy on C++ Builder.
>-#include <mem.h>
>+# include <mem.h>
> #endif
> 
> #include <string.h>
>-#include <gtest/internal/gtest-port.h>
>-
> #include <string>
> 
>+#include "gtest/internal/gtest-port.h"
>+
> namespace testing {
> namespace internal {
> 
>-// String - a UTF-8 string class.
>-//
>-// For historic reasons, we don't use std::string.
>-//
>-// TODO(wan@google.com): replace this class with std::string or
>-// implement it in terms of the latter.
>-//
>-// Note that String can represent both NULL and the empty string,
>-// while std::string cannot represent NULL.
>-//
>-// NULL and the empty string are considered different. NULL is less
>-// than anything (including the empty string) except itself.
>-//
>-// This class only provides minimum functionality necessary for
>-// implementing Google Test. We do not intend to implement a full-fledged
>-// string class here.
>-//
>-// Since the purpose of this class is to provide a substitute for
>-// std::string on platforms where it cannot be used, we define a copy
>-// constructor and assignment operators such that we don't need
>-// conditional compilation in a lot of places.
>-//
>-// In order to make the representation efficient, the d'tor of String
>-// is not virtual. Therefore DO NOT INHERIT FROM String.
>+// String - an abstract class holding static string utilities.
> class GTEST_API_ String {
> public:
> // Static utility methods
> 
>- // Returns the input enclosed in double quotes if it's not NULL;
>- // otherwise returns "(null)". For example, "\"Hello\"" is returned
>- // for input "Hello".
>- //
>- // This is useful for printing a C string in the syntax of a literal.
>- //
>- // Known issue: escape sequences are not handled yet.
>- static String ShowCStringQuoted(const char* c_str);
>-
> // Clones a 0-terminated C string, allocating memory using new. The
> // caller is responsible for deleting the return value using
> // delete[]. Returns the cloned string, or NULL if the input is
>@@ -137,11 +105,7 @@ class GTEST_API_ String {
> // NULL will be converted to "(null)". If an error occurred during
> // the conversion, "(failed to convert from wide string)" is
> // returned.
>- static String ShowWideCString(const wchar_t* wide_c_str);
>-
>- // Similar to ShowWideCString(), except that this function encloses
>- // the converted string in double quotes.
>- static String ShowWideCStringQuoted(const wchar_t* wide_c_str);
>+ static std::string ShowWideCString(const wchar_t* wide_c_str);
> 
> // Compares two wide C strings. Returns true iff they have the same
> // content.
>@@ -175,174 +139,27 @@ class GTEST_API_ String {
> static bool CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
> const wchar_t* rhs);
> 
>- // Formats a list of arguments to a String, using the same format
>- // spec string as for printf.
>- //
>- // We do not use the StringPrintf class as it is not universally
>- // available.
>- //
>- // The result is limited to 4096 characters (including the tailing
>- // 0). If 4096 characters are not enough to format the input,
>- // "<buffer exceeded>" is returned.
>- static String Format(const char* format, ...);
>-
>- // C'tors
>-
>- // The default c'tor constructs a NULL string.
>- String() : c_str_(NULL), length_(0) {}
>-
>- // Constructs a String by cloning a 0-terminated C string.
>- String(const char* a_c_str) { // NOLINT
>- if (a_c_str == NULL) {
>- c_str_ = NULL;
>- length_ = 0;
>- } else {
>- ConstructNonNull(a_c_str, strlen(a_c_str));
>- }
>- }
>+ // Returns true iff the given string ends with the given suffix, ignoring
>+ // case. Any string is considered to end with an empty suffix.
>+ static bool EndsWithCaseInsensitive(
>+ const std::string& str, const std::string& suffix);
> 
>- // Constructs a String by copying a given number of chars from a
>- // buffer. E.g. String("hello", 3) creates the string "hel",
>- // String("a\0bcd", 4) creates "a\0bc", String(NULL, 0) creates "",
>- // and String(NULL, 1) results in access violation.
>- String(const char* buffer, size_t a_length) {
>- ConstructNonNull(buffer, a_length);
>- }
>+ // Formats an int value as "%02d".
>+ static std::string FormatIntWidth2(int value); // "%02d" for width == 2
> 
>- // The copy c'tor creates a new copy of the string. The two
>- // String objects do not share content.
>- String(const String& str) : c_str_(NULL), length_(0) { *this = str; }
>+ // Formats an int value as "%X".
>+ static std::string FormatHexInt(int value);
> 
>- // D'tor. String is intended to be a final class, so the d'tor
>- // doesn't need to be virtual.
>- ~String() { delete[] c_str_; }
>-
>- // Allows a String to be implicitly converted to an ::std::string or
>- // ::string, and vice versa. Converting a String containing a NULL
>- // pointer to ::std::string or ::string is undefined behavior.
>- // Converting a ::std::string or ::string containing an embedded NUL
>- // character to a String will result in the prefix up to the first
>- // NUL character.
>- String(const ::std::string& str) {
>- ConstructNonNull(str.c_str(), str.length());
>- }
>-
>- operator ::std::string() const { return ::std::string(c_str(), length()); }
>-
>-#if GTEST_HAS_GLOBAL_STRING
>- String(const ::string& str) {
>- ConstructNonNull(str.c_str(), str.length());
>- }
>-
>- operator ::string() const { return ::string(c_str(), length()); }
>-#endif // GTEST_HAS_GLOBAL_STRING
>-
>- // Returns true iff this is an empty string (i.e. "").
>- bool empty() const { return (c_str() != NULL) && (length() == 0); }
>-
>- // Compares this with another String.
>- // Returns < 0 if this is less than rhs, 0 if this is equal to rhs, or > 0
>- // if this is greater than rhs.
>- int Compare(const String& rhs) const;
>-
>- // Returns true iff this String equals the given C string. A NULL
>- // string and a non-NULL string are considered not equal.
>- bool operator==(const char* a_c_str) const { return Compare(a_c_str) == 0; }
>-
>- // Returns true iff this String is less than the given String. A
>- // NULL string is considered less than "".
>- bool operator<(const String& rhs) const { return Compare(rhs) < 0; }
>-
>- // Returns true iff this String doesn't equal the given C string. A NULL
>- // string and a non-NULL string are considered not equal.
>- bool operator!=(const char* a_c_str) const { return !(*this == a_c_str); }
>-
>- // Returns true iff this String ends with the given suffix. *Any*
>- // String is considered to end with a NULL or empty suffix.
>- bool EndsWith(const char* suffix) const;
>-
>- // Returns true iff this String ends with the given suffix, not considering
>- // case. Any String is considered to end with a NULL or empty suffix.
>- bool EndsWithCaseInsensitive(const char* suffix) const;
>-
>- // Returns the length of the encapsulated string, or 0 if the
>- // string is NULL.
>- size_t length() const { return length_; }
>-
>- // Gets the 0-terminated C string this String object represents.
>- // The String object still owns the string. Therefore the caller
>- // should NOT delete the return value.
>- const char* c_str() const { return c_str_; }
>-
>- // Assigns a C string to this object. Self-assignment works.
>- const String& operator=(const char* a_c_str) {
>- return *this = String(a_c_str);
>- }
>-
>- // Assigns a String object to this object. Self-assignment works.
>- const String& operator=(const String& rhs) {
>- if (this != &rhs) {
>- delete[] c_str_;
>- if (rhs.c_str() == NULL) {
>- c_str_ = NULL;
>- length_ = 0;
>- } else {
>- ConstructNonNull(rhs.c_str(), rhs.length());
>- }
>- }
>-
>- return *this;
>- }
>+ // Formats a byte as "%02X".
>+ static std::string FormatByte(unsigned char value);
> 
> private:
>- // Constructs a non-NULL String from the given content. This
>- // function can only be called when data_ has not been allocated.
>- // ConstructNonNull(NULL, 0) results in an empty string ("").
>- // ConstructNonNull(NULL, non_zero) is undefined behavior.
>- void ConstructNonNull(const char* buffer, size_t a_length) {
>- char* const str = new char[a_length + 1];
>- memcpy(str, buffer, a_length);
>- str[a_length] = '\0';
>- c_str_ = str;
>- length_ = a_length;
>- }
>-
>- const char* c_str_;
>- size_t length_;
>+ String(); // Not meant to be instantiated.
> }; // class String
> 
>-// Streams a String to an ostream. Each '\0' character in the String
>-// is replaced with "\\0".
>-inline ::std::ostream& operator<<(::std::ostream& os, const String& str) {
>- if (str.c_str() == NULL) {
>- os << "(null)";
>- } else {
>- const char* const c_str = str.c_str();
>- for (size_t i = 0; i != str.length(); i++) {
>- if (c_str[i] == '\0') {
>- os << "\\0";
>- } else {
>- os << c_str[i];
>- }
>- }
>- }
>- return os;
>-}
>-
>-// Gets the content of the StrStream's buffer as a String. Each '\0'
>+// Gets the content of the stringstream's buffer as an std::string. Each '\0'
> // character in the buffer is replaced with "\\0".
>-GTEST_API_ String StrStreamToString(StrStream* stream);
>-
>-// Converts a streamable value to a String. A NULL pointer is
>-// converted to "(null)". When the input value is a ::string,
>-// ::std::string, ::wstring, or ::std::wstring object, each NUL
>-// character in it is replaced with "\\0".
>-
>-// Declared here but defined in gtest.h, so that it has access
>-// to the definition of the Message class, required by the ARM
>-// compiler.
>-template <typename T>
>-String StreamableToString(const T& streamable);
>+GTEST_API_ std::string StringStreamToString(::std::stringstream* stream);
> 
> } // namespace internal
> } // namespace testing
>diff --git a/Source/ThirdParty/gtest/include/gtest/internal/gtest-tuple.h b/Source/ThirdParty/gtest/include/gtest/internal/gtest-tuple.h
>index c27f3a421d9c4971ede49cc332912d4a8360c5a5..78a3a6a01fac75517eab831312427e15d5e4ebb7 100644
>--- a/Source/ThirdParty/gtest/include/gtest/internal/gtest-tuple.h
>+++ b/Source/ThirdParty/gtest/include/gtest/internal/gtest-tuple.h
>@@ -1,4 +1,6 @@
>-// This file was GENERATED by a script. DO NOT EDIT BY HAND!!!
>+// This file was GENERATED by command:
>+// pump.py gtest-tuple.h.pump
>+// DO NOT EDIT BY HAND!!!
> 
> // Copyright 2009 Google Inc.
> // All Rights Reserved.
>@@ -28,11 +30,12 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>+
> 
> // Implements a subset of TR1 tuple needed by Google Test and Google Mock.
> 
>+// GOOGLETEST_CM0001 DO NOT DELETE
>+
> #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_
> #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_
> 
>@@ -40,17 +43,25 @@
> 
> // The compiler used in Symbian has a bug that prevents us from declaring the
> // tuple template as a friend (it complains that tuple is redefined). This
>-// hack bypasses the bug by declaring the members that should otherwise be
>+// bypasses the bug by declaring the members that should otherwise be
> // private as public.
> // Sun Studio versions < 12 also have the above bug.
> #if defined(__SYMBIAN32__) || (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x590)
>-#define GTEST_DECLARE_TUPLE_AS_FRIEND_ public:
>+# define GTEST_DECLARE_TUPLE_AS_FRIEND_ public:
> #else
>-#define GTEST_DECLARE_TUPLE_AS_FRIEND_ \
>+# define GTEST_DECLARE_TUPLE_AS_FRIEND_ \
> template <GTEST_10_TYPENAMES_(U)> friend class tuple; \
> private:
> #endif
> 
>+// Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that conflict
>+// with our own definitions. Therefore using our own tuple does not work on
>+// those compilers.
>+#if defined(_MSC_VER) && _MSC_VER >= 1600 /* 1600 is Visual Studio 2010 */
>+# error "gtest's tuple doesn't compile on Visual Studio 2010 or later. \
>+GTEST_USE_OWN_TR1_TUPLE must be set to 0 on those compilers."
>+#endif
>+
> // GTEST_n_TUPLE_(T) is the type of an n-tuple.
> #define GTEST_0_TUPLE_(T) tuple<>
> #define GTEST_1_TUPLE_(T) tuple<T##0, void, void, void, void, void, void, \
>@@ -140,34 +151,54 @@ template <bool kIndexValid, int kIndex, class Tuple>
> struct TupleElement;
> 
> template <GTEST_10_TYPENAMES_(T)>
>-struct TupleElement<true, 0, GTEST_10_TUPLE_(T)> { typedef T0 type; };
>+struct TupleElement<true, 0, GTEST_10_TUPLE_(T) > {
>+ typedef T0 type;
>+};
> 
> template <GTEST_10_TYPENAMES_(T)>
>-struct TupleElement<true, 1, GTEST_10_TUPLE_(T)> { typedef T1 type; };
>+struct TupleElement<true, 1, GTEST_10_TUPLE_(T) > {
>+ typedef T1 type;
>+};
> 
> template <GTEST_10_TYPENAMES_(T)>
>-struct TupleElement<true, 2, GTEST_10_TUPLE_(T)> { typedef T2 type; };
>+struct TupleElement<true, 2, GTEST_10_TUPLE_(T) > {
>+ typedef T2 type;
>+};
> 
> template <GTEST_10_TYPENAMES_(T)>
>-struct TupleElement<true, 3, GTEST_10_TUPLE_(T)> { typedef T3 type; };
>+struct TupleElement<true, 3, GTEST_10_TUPLE_(T) > {
>+ typedef T3 type;
>+};
> 
> template <GTEST_10_TYPENAMES_(T)>
>-struct TupleElement<true, 4, GTEST_10_TUPLE_(T)> { typedef T4 type; };
>+struct TupleElement<true, 4, GTEST_10_TUPLE_(T) > {
>+ typedef T4 type;
>+};
> 
> template <GTEST_10_TYPENAMES_(T)>
>-struct TupleElement<true, 5, GTEST_10_TUPLE_(T)> { typedef T5 type; };
>+struct TupleElement<true, 5, GTEST_10_TUPLE_(T) > {
>+ typedef T5 type;
>+};
> 
> template <GTEST_10_TYPENAMES_(T)>
>-struct TupleElement<true, 6, GTEST_10_TUPLE_(T)> { typedef T6 type; };
>+struct TupleElement<true, 6, GTEST_10_TUPLE_(T) > {
>+ typedef T6 type;
>+};
> 
> template <GTEST_10_TYPENAMES_(T)>
>-struct TupleElement<true, 7, GTEST_10_TUPLE_(T)> { typedef T7 type; };
>+struct TupleElement<true, 7, GTEST_10_TUPLE_(T) > {
>+ typedef T7 type;
>+};
> 
> template <GTEST_10_TYPENAMES_(T)>
>-struct TupleElement<true, 8, GTEST_10_TUPLE_(T)> { typedef T8 type; };
>+struct TupleElement<true, 8, GTEST_10_TUPLE_(T) > {
>+ typedef T8 type;
>+};
> 
> template <GTEST_10_TYPENAMES_(T)>
>-struct TupleElement<true, 9, GTEST_10_TUPLE_(T)> { typedef T9 type; };
>+struct TupleElement<true, 9, GTEST_10_TUPLE_(T) > {
>+ typedef T9 type;
>+};
> 
> } // namespace gtest_internal
> 
>@@ -708,37 +739,59 @@ inline GTEST_10_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2,
> template <typename Tuple> struct tuple_size;
> 
> template <GTEST_0_TYPENAMES_(T)>
>-struct tuple_size<GTEST_0_TUPLE_(T)> { static const int value = 0; };
>+struct tuple_size<GTEST_0_TUPLE_(T) > {
>+ static const int value = 0;
>+};
> 
> template <GTEST_1_TYPENAMES_(T)>
>-struct tuple_size<GTEST_1_TUPLE_(T)> { static const int value = 1; };
>+struct tuple_size<GTEST_1_TUPLE_(T) > {
>+ static const int value = 1;
>+};
> 
> template <GTEST_2_TYPENAMES_(T)>
>-struct tuple_size<GTEST_2_TUPLE_(T)> { static const int value = 2; };
>+struct tuple_size<GTEST_2_TUPLE_(T) > {
>+ static const int value = 2;
>+};
> 
> template <GTEST_3_TYPENAMES_(T)>
>-struct tuple_size<GTEST_3_TUPLE_(T)> { static const int value = 3; };
>+struct tuple_size<GTEST_3_TUPLE_(T) > {
>+ static const int value = 3;
>+};
> 
> template <GTEST_4_TYPENAMES_(T)>
>-struct tuple_size<GTEST_4_TUPLE_(T)> { static const int value = 4; };
>+struct tuple_size<GTEST_4_TUPLE_(T) > {
>+ static const int value = 4;
>+};
> 
> template <GTEST_5_TYPENAMES_(T)>
>-struct tuple_size<GTEST_5_TUPLE_(T)> { static const int value = 5; };
>+struct tuple_size<GTEST_5_TUPLE_(T) > {
>+ static const int value = 5;
>+};
> 
> template <GTEST_6_TYPENAMES_(T)>
>-struct tuple_size<GTEST_6_TUPLE_(T)> { static const int value = 6; };
>+struct tuple_size<GTEST_6_TUPLE_(T) > {
>+ static const int value = 6;
>+};
> 
> template <GTEST_7_TYPENAMES_(T)>
>-struct tuple_size<GTEST_7_TUPLE_(T)> { static const int value = 7; };
>+struct tuple_size<GTEST_7_TUPLE_(T) > {
>+ static const int value = 7;
>+};
> 
> template <GTEST_8_TYPENAMES_(T)>
>-struct tuple_size<GTEST_8_TUPLE_(T)> { static const int value = 8; };
>+struct tuple_size<GTEST_8_TUPLE_(T) > {
>+ static const int value = 8;
>+};
> 
> template <GTEST_9_TYPENAMES_(T)>
>-struct tuple_size<GTEST_9_TUPLE_(T)> { static const int value = 9; };
>+struct tuple_size<GTEST_9_TUPLE_(T) > {
>+ static const int value = 9;
>+};
> 
> template <GTEST_10_TYPENAMES_(T)>
>-struct tuple_size<GTEST_10_TUPLE_(T)> { static const int value = 10; };
>+struct tuple_size<GTEST_10_TUPLE_(T) > {
>+ static const int value = 10;
>+};
> 
> template <int k, class Tuple>
> struct tuple_element {
>@@ -912,7 +965,7 @@ struct SameSizeTuplePrefixComparator<k, k> {
> template <class Tuple1, class Tuple2>
> static bool Eq(const Tuple1& t1, const Tuple2& t2) {
> return SameSizeTuplePrefixComparator<k - 1, k - 1>::Eq(t1, t2) &&
>- ::std::get<k - 1>(t1) == ::std::get<k - 1>(t2);
>+ ::std::tr1::get<k - 1>(t1) == ::std::tr1::get<k - 1>(t2);
> }
> };
> 
>@@ -922,8 +975,8 @@ template <GTEST_10_TYPENAMES_(T), GTEST_10_TYPENAMES_(U)>
> inline bool operator==(const GTEST_10_TUPLE_(T)& t,
> const GTEST_10_TUPLE_(U)& u) {
> return gtest_internal::SameSizeTuplePrefixComparator<
>- tuple_size<GTEST_10_TUPLE_(T)>::value,
>- tuple_size<GTEST_10_TUPLE_(U)>::value>::Eq(t, u);
>+ tuple_size<GTEST_10_TUPLE_(T) >::value,
>+ tuple_size<GTEST_10_TUPLE_(U) >::value>::Eq(t, u);
> }
> 
> template <GTEST_10_TYPENAMES_(T), GTEST_10_TYPENAMES_(U)>
>diff --git a/Source/ThirdParty/gtest/include/gtest/internal/gtest-tuple.h.pump b/Source/ThirdParty/gtest/include/gtest/internal/gtest-tuple.h.pump
>index 85ebc8062ee1044737b36e8a4085d267f18dc205..bb626e049f08780ffce96d4852cb8ed5d3ef5f11 100644
>--- a/Source/ThirdParty/gtest/include/gtest/internal/gtest-tuple.h.pump
>+++ b/Source/ThirdParty/gtest/include/gtest/internal/gtest-tuple.h.pump
>@@ -29,11 +29,12 @@ $$ This meta comment fixes auto-indentation in Emacs. }}
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>+
> 
> // Implements a subset of TR1 tuple needed by Google Test and Google Mock.
> 
>+// GOOGLETEST_CM0001 DO NOT DELETE
>+
> #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_
> #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_
> 
>@@ -41,17 +42,25 @@ $$ This meta comment fixes auto-indentation in Emacs. }}
> 
> // The compiler used in Symbian has a bug that prevents us from declaring the
> // tuple template as a friend (it complains that tuple is redefined). This
>-// hack bypasses the bug by declaring the members that should otherwise be
>+// bypasses the bug by declaring the members that should otherwise be
> // private as public.
> // Sun Studio versions < 12 also have the above bug.
> #if defined(__SYMBIAN32__) || (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x590)
>-#define GTEST_DECLARE_TUPLE_AS_FRIEND_ public:
>+# define GTEST_DECLARE_TUPLE_AS_FRIEND_ public:
> #else
>-#define GTEST_DECLARE_TUPLE_AS_FRIEND_ \
>+# define GTEST_DECLARE_TUPLE_AS_FRIEND_ \
> template <GTEST_$(n)_TYPENAMES_(U)> friend class tuple; \
> private:
> #endif
> 
>+// Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that conflict
>+// with our own definitions. Therefore using our own tuple does not work on
>+// those compilers.
>+#if defined(_MSC_VER) && _MSC_VER >= 1600 /* 1600 is Visual Studio 2010 */
>+# error "gtest's tuple doesn't compile on Visual Studio 2010 or later. \
>+GTEST_USE_OWN_TR1_TUPLE must be set to 0 on those compilers."
>+#endif
>+
> 
> $range i 0..n-1
> $range j 0..n
>@@ -118,8 +127,9 @@ struct TupleElement;
> 
> $for i [[
> template <GTEST_$(n)_TYPENAMES_(T)>
>-struct TupleElement<true, $i, GTEST_$(n)_TUPLE_(T)> [[]]
>-{ typedef T$i type; };
>+struct TupleElement<true, $i, GTEST_$(n)_TUPLE_(T) > {
>+ typedef T$i type;
>+};
> 
> 
> ]]
>@@ -220,7 +230,9 @@ template <typename Tuple> struct tuple_size;
> 
> $for j [[
> template <GTEST_$(j)_TYPENAMES_(T)>
>-struct tuple_size<GTEST_$(j)_TUPLE_(T)> { static const int value = $j; };
>+struct tuple_size<GTEST_$(j)_TUPLE_(T) > {
>+ static const int value = $j;
>+};
> 
> 
> ]]
>@@ -302,8 +314,8 @@ template <GTEST_$(n)_TYPENAMES_(T), GTEST_$(n)_TYPENAMES_(U)>
> inline bool operator==(const GTEST_$(n)_TUPLE_(T)& t,
> const GTEST_$(n)_TUPLE_(U)& u) {
> return gtest_internal::SameSizeTuplePrefixComparator<
>- tuple_size<GTEST_$(n)_TUPLE_(T)>::value,
>- tuple_size<GTEST_$(n)_TUPLE_(U)>::value>::Eq(t, u);
>+ tuple_size<GTEST_$(n)_TUPLE_(T) >::value,
>+ tuple_size<GTEST_$(n)_TUPLE_(U) >::value>::Eq(t, u);
> }
> 
> template <GTEST_$(n)_TYPENAMES_(T), GTEST_$(n)_TYPENAMES_(U)>
>diff --git a/Source/ThirdParty/gtest/include/gtest/internal/gtest-type-util.h b/Source/ThirdParty/gtest/include/gtest/internal/gtest-type-util.h
>index 093eee6f019635569f404ae6357b8de48b718e81..28e411245361c08f28707e9248e6d03320e68618 100644
>--- a/Source/ThirdParty/gtest/include/gtest/internal/gtest-type-util.h
>+++ b/Source/ThirdParty/gtest/include/gtest/internal/gtest-type-util.h
>@@ -30,8 +30,7 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>+
> 
> // Type utilities needed for implementing typed and type-parameterized
> // tests. This file is generated by a SCRIPT. DO NOT EDIT BY HAND!
>@@ -41,58 +40,84 @@
> // Please contact googletestframework@googlegroups.com if you need
> // more.
> 
>+// GOOGLETEST_CM0001 DO NOT DELETE
>+
> #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
> #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
> 
>-#include <gtest/internal/gtest-port.h>
>-#include <gtest/internal/gtest-string.h>
>-
>-#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
>+#include "gtest/internal/gtest-port.h"
> 
> // #ifdef __GNUC__ is too general here. It is possible to use gcc without using
> // libstdc++ (which is where cxxabi.h comes from).
>-#ifdef __GLIBCXX__
>-#include <cxxabi.h>
>-#endif // __GLIBCXX__
>+# if GTEST_HAS_CXXABI_H_
>+# include <cxxabi.h>
>+# elif defined(__HP_aCC)
>+# include <acxx_demangle.h>
>+# endif // GTEST_HASH_CXXABI_H_
> 
> namespace testing {
> namespace internal {
> 
>-// AssertyTypeEq<T1, T2>::type is defined iff T1 and T2 are the same
>-// type. This can be used as a compile-time assertion to ensure that
>-// two types are equal.
>-
>-template <typename T1, typename T2>
>-struct AssertTypeEq;
>-
>-template <typename T>
>-struct AssertTypeEq<T, T> {
>- typedef bool type;
>-};
>+// Canonicalizes a given name with respect to the Standard C++ Library.
>+// This handles removing the inline namespace within `std` that is
>+// used by various standard libraries (e.g., `std::__1`). Names outside
>+// of namespace std are returned unmodified.
>+inline std::string CanonicalizeForStdLibVersioning(std::string s) {
>+ static const char prefix[] = "std::__";
>+ if (s.compare(0, strlen(prefix), prefix) == 0) {
>+ std::string::size_type end = s.find("::", strlen(prefix));
>+ if (end != s.npos) {
>+ // Erase everything between the initial `std` and the second `::`.
>+ s.erase(strlen("std"), end - strlen("std"));
>+ }
>+ }
>+ return s;
>+}
> 
> // GetTypeName<T>() returns a human-readable name of type T.
>+// NB: This function is also used in Google Mock, so don't move it inside of
>+// the typed-test-only section below.
> template <typename T>
>-String GetTypeName() {
>-#if GTEST_HAS_RTTI
>+std::string GetTypeName() {
>+# if GTEST_HAS_RTTI
> 
> const char* const name = typeid(T).name();
>-#ifdef __GLIBCXX__
>+# if GTEST_HAS_CXXABI_H_ || defined(__HP_aCC)
> int status = 0;
> // gcc's implementation of typeid(T).name() mangles the type name,
> // so we have to demangle it.
>- char* const readable_name = abi::__cxa_demangle(name, 0, 0, &status);
>- const String name_str(status == 0 ? readable_name : name);
>+# if GTEST_HAS_CXXABI_H_
>+ using abi::__cxa_demangle;
>+# endif // GTEST_HAS_CXXABI_H_
>+ char* const readable_name = __cxa_demangle(name, 0, 0, &status);
>+ const std::string name_str(status == 0 ? readable_name : name);
> free(readable_name);
>- return name_str;
>-#else
>+ return CanonicalizeForStdLibVersioning(name_str);
>+# else
> return name;
>-#endif // __GLIBCXX__
>+# endif // GTEST_HAS_CXXABI_H_ || __HP_aCC
>+
>+# else
> 
>-#else
> return "<type>";
>-#endif // GTEST_HAS_RTTI
>+
>+# endif // GTEST_HAS_RTTI
> }
> 
>+#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
>+
>+// AssertyTypeEq<T1, T2>::type is defined iff T1 and T2 are the same
>+// type. This can be used as a compile-time assertion to ensure that
>+// two types are equal.
>+
>+template <typename T1, typename T2>
>+struct AssertTypeEq;
>+
>+template <typename T>
>+struct AssertTypeEq<T, T> {
>+ typedef bool type;
>+};
>+
> // A unique type used as the default value for the arguments of class
> // template Types. This allows us to simulate variadic templates
> // (e.g. Types<int>, Type<int, double>, and etc), which C++ doesn't
>@@ -1611,7 +1636,7 @@ struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
> 
> namespace internal {
> 
>-#define GTEST_TEMPLATE_ template <typename T> class
>+# define GTEST_TEMPLATE_ template <typename T> class
> 
> // The template "selector" struct TemplateSel<Tmpl> is used to
> // represent Tmpl, which must be a class template with one type
>@@ -1629,7 +1654,7 @@ struct TemplateSel {
> };
> };
> 
>-#define GTEST_BIND_(TmplSel, T) \
>+# define GTEST_BIND_(TmplSel, T) \
> TmplSel::template Bind<T>::type
> 
> // A unique struct template used as the default value for the
>@@ -3291,7 +3316,9 @@ struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
> // INSTANTIATE_TYPED_TEST_CASE_P().
> 
> template <typename T>
>-struct TypeList { typedef Types1<T> type; };
>+struct TypeList {
>+ typedef Types1<T> type;
>+};
> 
> template <typename T1, typename T2, typename T3, typename T4, typename T5,
> typename T6, typename T7, typename T8, typename T9, typename T10,
>@@ -3313,9 +3340,9 @@ struct TypeList<Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
> T41, T42, T43, T44, T45, T46, T47, T48, T49, T50>::type type;
> };
> 
>+#endif // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
>+
> } // namespace internal
> } // namespace testing
> 
>-#endif // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
>-
> #endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
>diff --git a/Source/ThirdParty/gtest/include/gtest/internal/gtest-type-util.h.pump b/Source/ThirdParty/gtest/include/gtest/internal/gtest-type-util.h.pump
>index 5aed1e5544fa2da1589734cbc3b4141b587a1f32..0001a5d39dfa6d24c7c41a16a15f2e2a5ce949db 100644
>--- a/Source/ThirdParty/gtest/include/gtest/internal/gtest-type-util.h.pump
>+++ b/Source/ThirdParty/gtest/include/gtest/internal/gtest-type-util.h.pump
>@@ -28,8 +28,7 @@ $var n = 50 $$ Maximum length of type lists we want to support.
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>+
> 
> // Type utilities needed for implementing typed and type-parameterized
> // tests. This file is generated by a SCRIPT. DO NOT EDIT BY HAND!
>@@ -39,58 +38,84 @@ $var n = 50 $$ Maximum length of type lists we want to support.
> // Please contact googletestframework@googlegroups.com if you need
> // more.
> 
>+// GOOGLETEST_CM0001 DO NOT DELETE
>+
> #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
> #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
> 
>-#include <gtest/internal/gtest-port.h>
>-#include <gtest/internal/gtest-string.h>
>-
>-#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
>+#include "gtest/internal/gtest-port.h"
> 
> // #ifdef __GNUC__ is too general here. It is possible to use gcc without using
> // libstdc++ (which is where cxxabi.h comes from).
>-#ifdef __GLIBCXX__
>-#include <cxxabi.h>
>-#endif // __GLIBCXX__
>+# if GTEST_HAS_CXXABI_H_
>+# include <cxxabi.h>
>+# elif defined(__HP_aCC)
>+# include <acxx_demangle.h>
>+# endif // GTEST_HASH_CXXABI_H_
> 
> namespace testing {
> namespace internal {
> 
>-// AssertyTypeEq<T1, T2>::type is defined iff T1 and T2 are the same
>-// type. This can be used as a compile-time assertion to ensure that
>-// two types are equal.
>-
>-template <typename T1, typename T2>
>-struct AssertTypeEq;
>-
>-template <typename T>
>-struct AssertTypeEq<T, T> {
>- typedef bool type;
>-};
>+// Canonicalizes a given name with respect to the Standard C++ Library.
>+// This handles removing the inline namespace within `std` that is
>+// used by various standard libraries (e.g., `std::__1`). Names outside
>+// of namespace std are returned unmodified.
>+inline std::string CanonicalizeForStdLibVersioning(std::string s) {
>+ static const char prefix[] = "std::__";
>+ if (s.compare(0, strlen(prefix), prefix) == 0) {
>+ std::string::size_type end = s.find("::", strlen(prefix));
>+ if (end != s.npos) {
>+ // Erase everything between the initial `std` and the second `::`.
>+ s.erase(strlen("std"), end - strlen("std"));
>+ }
>+ }
>+ return s;
>+}
> 
> // GetTypeName<T>() returns a human-readable name of type T.
>+// NB: This function is also used in Google Mock, so don't move it inside of
>+// the typed-test-only section below.
> template <typename T>
>-String GetTypeName() {
>-#if GTEST_HAS_RTTI
>+std::string GetTypeName() {
>+# if GTEST_HAS_RTTI
> 
> const char* const name = typeid(T).name();
>-#ifdef __GLIBCXX__
>+# if GTEST_HAS_CXXABI_H_ || defined(__HP_aCC)
> int status = 0;
> // gcc's implementation of typeid(T).name() mangles the type name,
> // so we have to demangle it.
>- char* const readable_name = abi::__cxa_demangle(name, 0, 0, &status);
>- const String name_str(status == 0 ? readable_name : name);
>+# if GTEST_HAS_CXXABI_H_
>+ using abi::__cxa_demangle;
>+# endif // GTEST_HAS_CXXABI_H_
>+ char* const readable_name = __cxa_demangle(name, 0, 0, &status);
>+ const std::string name_str(status == 0 ? readable_name : name);
> free(readable_name);
>- return name_str;
>-#else
>+ return CanonicalizeForStdLibVersioning(name_str);
>+# else
> return name;
>-#endif // __GLIBCXX__
>+# endif // GTEST_HAS_CXXABI_H_ || __HP_aCC
>+
>+# else
> 
>-#else
> return "<type>";
>-#endif // GTEST_HAS_RTTI
>+
>+# endif // GTEST_HAS_RTTI
> }
> 
>+#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
>+
>+// AssertyTypeEq<T1, T2>::type is defined iff T1 and T2 are the same
>+// type. This can be used as a compile-time assertion to ensure that
>+// two types are equal.
>+
>+template <typename T1, typename T2>
>+struct AssertTypeEq;
>+
>+template <typename T>
>+struct AssertTypeEq<T, T> {
>+ typedef bool type;
>+};
>+
> // A unique type used as the default value for the arguments of class
> // template Types. This allows us to simulate variadic templates
> // (e.g. Types<int>, Type<int, double>, and etc), which C++ doesn't
>@@ -169,7 +194,7 @@ struct Types<$for j, [[T$j]]$for k[[, internal::None]]> {
> 
> namespace internal {
> 
>-#define GTEST_TEMPLATE_ template <typename T> class
>+# define GTEST_TEMPLATE_ template <typename T> class
> 
> // The template "selector" struct TemplateSel<Tmpl> is used to
> // represent Tmpl, which must be a class template with one type
>@@ -187,7 +212,7 @@ struct TemplateSel {
> };
> };
> 
>-#define GTEST_BIND_(TmplSel, T) \
>+# define GTEST_BIND_(TmplSel, T) \
> TmplSel::template Bind<T>::type
> 
> // A unique struct template used as the default value for the
>@@ -270,7 +295,9 @@ struct Templates<$for j, [[T$j]]$for k[[, NoneT]]> {
> // INSTANTIATE_TYPED_TEST_CASE_P().
> 
> template <typename T>
>-struct TypeList { typedef Types1<T> type; };
>+struct TypeList {
>+ typedef Types1<T> type;
>+};
> 
> 
> $range i 1..n
>@@ -279,9 +306,9 @@ struct TypeList<Types<$for i, [[T$i]]> > {
> typedef typename Types<$for i, [[T$i]]>::type type;
> };
> 
>+#endif // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
>+
> } // namespace internal
> } // namespace testing
> 
>-#endif // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
>-
> #endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
>diff --git a/Source/ThirdParty/gtest/make/Makefile b/Source/ThirdParty/gtest/make/Makefile
>index 5b27b6a2cbb13e380ee75d186f553bfb5fa144b5..9ac74493ba55246597e90b898fae847ae358eab5 100644
>--- a/Source/ThirdParty/gtest/make/Makefile
>+++ b/Source/ThirdParty/gtest/make/Makefile
>@@ -20,10 +20,12 @@ GTEST_DIR = ..
> USER_DIR = ../samples
> 
> # Flags passed to the preprocessor.
>-CPPFLAGS += -I$(GTEST_DIR)/include
>+# Set Google Test's header directory as a system directory, such that
>+# the compiler doesn't generate warnings in Google Test headers.
>+CPPFLAGS += -isystem $(GTEST_DIR)/include
> 
> # Flags passed to the C++ compiler.
>-CXXFLAGS += -g -Wall -Wextra
>+CXXFLAGS += -g -Wall -Wextra -pthread
> 
> # All tests produced by this Makefile. Remember to add new tests you
> # created to the list.
>diff --git a/Source/ThirdParty/gtest/msvc/2010/gtest-md.sln b/Source/ThirdParty/gtest/msvc/2010/gtest-md.sln
>new file mode 100644
>index 0000000000000000000000000000000000000000..e36b33b6215c374afc116b52084b16f41488047a
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/msvc/2010/gtest-md.sln
>@@ -0,0 +1,55 @@
>+Microsoft Visual Studio Solution File, Format Version 11.00
>+# Visual C++ Express 2010
>+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-md", "gtest-md.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}"
>+EndProject
>+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main-md", "gtest_main-md.vcxproj", "{3AF54C8A-10BF-4332-9147-F68ED9862033}"
>+EndProject
>+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test-md", "gtest_prod_test-md.vcxproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}"
>+EndProject
>+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest-md", "gtest_unittest-md.vcxproj", "{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}"
>+EndProject
>+Global
>+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
>+		Debug|Win32 = Debug|Win32
>+		Debug|x64 = Debug|x64
>+		Release|Win32 = Release|Win32
>+		Release|x64 = Release|x64
>+	EndGlobalSection
>+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
>+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug|Win32.ActiveCfg = Debug|Win32
>+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug|Win32.Build.0 = Debug|Win32
>+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug|x64.ActiveCfg = Debug|x64
>+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug|x64.Build.0 = Debug|x64
>+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release|Win32.ActiveCfg = Release|Win32
>+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release|Win32.Build.0 = Release|Win32
>+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release|x64.ActiveCfg = Release|x64
>+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release|x64.Build.0 = Release|x64
>+		{3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug|Win32.ActiveCfg = Debug|Win32
>+		{3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug|Win32.Build.0 = Debug|Win32
>+		{3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug|x64.ActiveCfg = Debug|x64
>+		{3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug|x64.Build.0 = Debug|x64
>+		{3AF54C8A-10BF-4332-9147-F68ED9862033}.Release|Win32.ActiveCfg = Release|Win32
>+		{3AF54C8A-10BF-4332-9147-F68ED9862033}.Release|Win32.Build.0 = Release|Win32
>+		{3AF54C8A-10BF-4332-9147-F68ED9862033}.Release|x64.ActiveCfg = Release|x64
>+		{3AF54C8A-10BF-4332-9147-F68ED9862033}.Release|x64.Build.0 = Release|x64
>+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug|Win32.ActiveCfg = Debug|Win32
>+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug|Win32.Build.0 = Debug|Win32
>+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug|x64.ActiveCfg = Debug|x64
>+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug|x64.Build.0 = Debug|x64
>+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release|Win32.ActiveCfg = Release|Win32
>+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release|Win32.Build.0 = Release|Win32
>+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release|x64.ActiveCfg = Release|x64
>+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release|x64.Build.0 = Release|x64
>+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug|Win32.ActiveCfg = Debug|Win32
>+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug|Win32.Build.0 = Debug|Win32
>+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug|x64.ActiveCfg = Debug|x64
>+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug|x64.Build.0 = Debug|x64
>+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release|Win32.ActiveCfg = Release|Win32
>+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release|Win32.Build.0 = Release|Win32
>+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release|x64.ActiveCfg = Release|x64
>+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release|x64.Build.0 = Release|x64
>+	EndGlobalSection
>+	GlobalSection(SolutionProperties) = preSolution
>+		HideSolutionNode = FALSE
>+	EndGlobalSection
>+EndGlobal
>diff --git a/Source/ThirdParty/gtest/msvc/2010/gtest-md.vcxproj b/Source/ThirdParty/gtest/msvc/2010/gtest-md.vcxproj
>new file mode 100644
>index 0000000000000000000000000000000000000000..16a6ff12f7b579015abb141580e2f2d4fda6f9c3
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/msvc/2010/gtest-md.vcxproj
>@@ -0,0 +1,149 @@
>+ï»¿<?xml version="1.0" encoding="utf-8"?>
>+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>+ <ItemGroup Label="ProjectConfigurations">
>+ <ProjectConfiguration Include="Debug|Win32">
>+ <Configuration>Debug</Configuration>
>+ <Platform>Win32</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Debug|x64">
>+ <Configuration>Debug</Configuration>
>+ <Platform>x64</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Release|Win32">
>+ <Configuration>Release</Configuration>
>+ <Platform>Win32</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Release|x64">
>+ <Configuration>Release</Configuration>
>+ <Platform>x64</Platform>
>+ </ProjectConfiguration>
>+ </ItemGroup>
>+ <PropertyGroup Label="Globals">
>+ <ProjectGuid>{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}</ProjectGuid>
>+ <Keyword>Win32Proj</Keyword>
>+ </PropertyGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
>+ <ConfigurationType>StaticLibrary</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
>+ <ConfigurationType>StaticLibrary</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
>+ <ConfigurationType>StaticLibrary</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
>+ <ConfigurationType>StaticLibrary</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
>+ <ImportGroup Label="ExtensionSettings">
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <PropertyGroup Label="UserMacros" />
>+ <PropertyGroup>
>+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
>+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(ProjectName)\</IntDir>
>+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(ProjectName)\</IntDir>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ <OutDir>$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir>$(OutDir)$(ProjectName)\</IntDir>
>+ <TargetName>gtestd</TargetName>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ <OutDir>$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir>$(OutDir)$(ProjectName)\</IntDir>
>+ <TargetName>gtest</TargetName>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ <TargetName>gtestd</TargetName>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ <TargetName>gtest</TargetName>
>+ </PropertyGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ <ClCompile>
>+ <Optimization>Disabled</Optimization>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <MinimalRebuild>true</MinimalRebuild>
>+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
>+ <PrecompiledHeader>
>+ </PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Lib />
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ <ClCompile>
>+ <Optimization>Disabled</Optimization>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
>+ <PrecompiledHeader>
>+ </PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Lib />
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ <ClCompile>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>+ <PrecompiledHeader>
>+ </PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Lib />
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ <ClCompile>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>+ <PrecompiledHeader>
>+ </PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Lib />
>+ </ItemDefinitionGroup>
>+ <ItemGroup>
>+ <ClCompile Include="..\..\src\gtest-all.cc">
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ </ItemGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
>+ <ImportGroup Label="ExtensionTargets">
>+ </ImportGroup>
>+</Project>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/gtest/msvc/2010/gtest-md.vcxproj.filters b/Source/ThirdParty/gtest/msvc/2010/gtest-md.vcxproj.filters
>new file mode 100644
>index 0000000000000000000000000000000000000000..69edeff2306e1fac93e77c553f056b70fd2a6856
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/msvc/2010/gtest-md.vcxproj.filters
>@@ -0,0 +1,18 @@
>+ï»¿<?xml version="1.0" encoding="utf-8"?>
>+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>+ <ItemGroup>
>+ <Filter Include="Source Files">
>+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
>+ <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
>+ </Filter>
>+ <Filter Include="Header Files">
>+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
>+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
>+ </Filter>
>+ </ItemGroup>
>+ <ItemGroup>
>+ <ClCompile Include="..\..\src\gtest-all.cc">
>+ <Filter>Source Files</Filter>
>+ </ClCompile>
>+ </ItemGroup>
>+</Project>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/gtest/msvc/2010/gtest.sln b/Source/ThirdParty/gtest/msvc/2010/gtest.sln
>new file mode 100644
>index 0000000000000000000000000000000000000000..cacd5c0ce6b93286ba5270f8311f7d64921e02e6
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/msvc/2010/gtest.sln
>@@ -0,0 +1,55 @@
>+Microsoft Visual Studio Solution File, Format Version 11.00
>+# Visual C++ Express 2010
>+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "gtest.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
>+EndProject
>+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "gtest_main.vcxproj", "{3AF54C8A-10BF-4332-9147-F68ED9862032}"
>+EndProject
>+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest", "gtest_unittest.vcxproj", "{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}"
>+EndProject
>+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test", "gtest_prod_test.vcxproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}"
>+EndProject
>+Global
>+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
>+		Debug|Win32 = Debug|Win32
>+		Debug|x64 = Debug|x64
>+		Release|Win32 = Release|Win32
>+		Release|x64 = Release|x64
>+	EndGlobalSection
>+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
>+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32
>+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32
>+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64
>+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64
>+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.ActiveCfg = Release|Win32
>+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32
>+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64
>+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64
>+		{3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|Win32.ActiveCfg = Debug|Win32
>+		{3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|Win32.Build.0 = Debug|Win32
>+		{3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|x64.ActiveCfg = Debug|x64
>+		{3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|x64.Build.0 = Debug|x64
>+		{3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|Win32.ActiveCfg = Release|Win32
>+		{3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|Win32.Build.0 = Release|Win32
>+		{3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|x64.ActiveCfg = Release|x64
>+		{3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|x64.Build.0 = Release|x64
>+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|Win32.ActiveCfg = Debug|Win32
>+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|Win32.Build.0 = Debug|Win32
>+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|x64.ActiveCfg = Debug|x64
>+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|x64.Build.0 = Debug|x64
>+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|Win32.ActiveCfg = Release|Win32
>+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|Win32.Build.0 = Release|Win32
>+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|x64.ActiveCfg = Release|x64
>+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|x64.Build.0 = Release|x64
>+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|Win32.ActiveCfg = Debug|Win32
>+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|Win32.Build.0 = Debug|Win32
>+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|x64.ActiveCfg = Debug|x64
>+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|x64.Build.0 = Debug|x64
>+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|Win32.ActiveCfg = Release|Win32
>+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|Win32.Build.0 = Release|Win32
>+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|x64.ActiveCfg = Release|x64
>+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|x64.Build.0 = Release|x64
>+	EndGlobalSection
>+	GlobalSection(SolutionProperties) = preSolution
>+		HideSolutionNode = FALSE
>+	EndGlobalSection
>+EndGlobal
>diff --git a/Source/ThirdParty/gtest/msvc/2010/gtest.vcxproj b/Source/ThirdParty/gtest/msvc/2010/gtest.vcxproj
>new file mode 100644
>index 0000000000000000000000000000000000000000..a46f5c7af24538d398c3626c8ecce9148c96f01d
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/msvc/2010/gtest.vcxproj
>@@ -0,0 +1,149 @@
>+ï»¿<?xml version="1.0" encoding="utf-8"?>
>+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>+ <ItemGroup Label="ProjectConfigurations">
>+ <ProjectConfiguration Include="Debug|Win32">
>+ <Configuration>Debug</Configuration>
>+ <Platform>Win32</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Debug|x64">
>+ <Configuration>Debug</Configuration>
>+ <Platform>x64</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Release|Win32">
>+ <Configuration>Release</Configuration>
>+ <Platform>Win32</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Release|x64">
>+ <Configuration>Release</Configuration>
>+ <Platform>x64</Platform>
>+ </ProjectConfiguration>
>+ </ItemGroup>
>+ <PropertyGroup Label="Globals">
>+ <ProjectGuid>{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}</ProjectGuid>
>+ <Keyword>Win32Proj</Keyword>
>+ </PropertyGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
>+ <ConfigurationType>StaticLibrary</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
>+ <ConfigurationType>StaticLibrary</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
>+ <ConfigurationType>StaticLibrary</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
>+ <ConfigurationType>StaticLibrary</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
>+ <ImportGroup Label="ExtensionSettings">
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <PropertyGroup Label="UserMacros" />
>+ <PropertyGroup>
>+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
>+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)temp\$(ProjectName)\</IntDir>
>+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)temp\$(ProjectName)\</IntDir>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ <OutDir>$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
>+ <TargetName>gtestd</TargetName>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ <OutDir>$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
>+ <TargetName>gtest</TargetName>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ <TargetName>gtestd</TargetName>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ <TargetName>gtest</TargetName>
>+ </PropertyGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ <ClCompile>
>+ <Optimization>Disabled</Optimization>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <MinimalRebuild>true</MinimalRebuild>
>+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
>+ <PrecompiledHeader>
>+ </PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Lib />
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ <ClCompile>
>+ <Optimization>Disabled</Optimization>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
>+ <PrecompiledHeader>
>+ </PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Lib />
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ <ClCompile>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
>+ <PrecompiledHeader>
>+ </PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Lib />
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ <ClCompile>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
>+ <PrecompiledHeader>
>+ </PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Lib />
>+ </ItemDefinitionGroup>
>+ <ItemGroup>
>+ <ClCompile Include="..\..\src\gtest-all.cc">
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ </ItemGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
>+ <ImportGroup Label="ExtensionTargets">
>+ </ImportGroup>
>+</Project>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/gtest/msvc/2010/gtest.vcxproj.filters b/Source/ThirdParty/gtest/msvc/2010/gtest.vcxproj.filters
>new file mode 100644
>index 0000000000000000000000000000000000000000..69edeff2306e1fac93e77c553f056b70fd2a6856
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/msvc/2010/gtest.vcxproj.filters
>@@ -0,0 +1,18 @@
>+ï»¿<?xml version="1.0" encoding="utf-8"?>
>+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>+ <ItemGroup>
>+ <Filter Include="Source Files">
>+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
>+ <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
>+ </Filter>
>+ <Filter Include="Header Files">
>+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
>+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
>+ </Filter>
>+ </ItemGroup>
>+ <ItemGroup>
>+ <ClCompile Include="..\..\src\gtest-all.cc">
>+ <Filter>Source Files</Filter>
>+ </ClCompile>
>+ </ItemGroup>
>+</Project>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/gtest/msvc/2010/gtest_main-md.vcxproj b/Source/ThirdParty/gtest/msvc/2010/gtest_main-md.vcxproj
>new file mode 100644
>index 0000000000000000000000000000000000000000..3d773895b7023de84740d62bba63ec900f74c927
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/msvc/2010/gtest_main-md.vcxproj
>@@ -0,0 +1,154 @@
>+ï»¿<?xml version="1.0" encoding="utf-8"?>
>+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>+ <ItemGroup Label="ProjectConfigurations">
>+ <ProjectConfiguration Include="Debug|Win32">
>+ <Configuration>Debug</Configuration>
>+ <Platform>Win32</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Debug|x64">
>+ <Configuration>Debug</Configuration>
>+ <Platform>x64</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Release|Win32">
>+ <Configuration>Release</Configuration>
>+ <Platform>Win32</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Release|x64">
>+ <Configuration>Release</Configuration>
>+ <Platform>x64</Platform>
>+ </ProjectConfiguration>
>+ </ItemGroup>
>+ <PropertyGroup Label="Globals">
>+ <ProjectGuid>{3AF54C8A-10BF-4332-9147-F68ED9862033}</ProjectGuid>
>+ <Keyword>Win32Proj</Keyword>
>+ </PropertyGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
>+ <ConfigurationType>StaticLibrary</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
>+ <ConfigurationType>StaticLibrary</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
>+ <ConfigurationType>StaticLibrary</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
>+ <ConfigurationType>StaticLibrary</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
>+ <ImportGroup Label="ExtensionSettings">
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <PropertyGroup Label="UserMacros" />
>+ <PropertyGroup>
>+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
>+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(ProjectName)\</IntDir>
>+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(ProjectName)\</IntDir>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ <OutDir>$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir>$(OutDir)$(ProjectName)\</IntDir>
>+ <TargetName>gtest_maind</TargetName>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ <OutDir>$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir>$(OutDir)$(ProjectName)\</IntDir>
>+ <TargetName>gtest_main</TargetName>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ <TargetName>gtest_maind</TargetName>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ <TargetName>gtest_main</TargetName>
>+ </PropertyGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ <ClCompile>
>+ <Optimization>Disabled</Optimization>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <MinimalRebuild>true</MinimalRebuild>
>+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
>+ <PrecompiledHeader>
>+ </PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Lib />
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ <ClCompile>
>+ <Optimization>Disabled</Optimization>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
>+ <PrecompiledHeader>
>+ </PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Lib />
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ <ClCompile>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>+ <PrecompiledHeader>
>+ </PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Lib />
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ <ClCompile>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>+ <PrecompiledHeader>
>+ </PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Lib />
>+ </ItemDefinitionGroup>
>+ <ItemGroup>
>+ <ClCompile Include="..\..\src\gtest_main.cc">
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ </ItemGroup>
>+ <ItemGroup>
>+ <ProjectReference Include="gtest-md.vcxproj">
>+ <Project>{c8f6c172-56f2-4e76-b5fa-c3b423b31be8}</Project>
>+ </ProjectReference>
>+ </ItemGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
>+ <ImportGroup Label="ExtensionTargets">
>+ </ImportGroup>
>+</Project>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/gtest/msvc/2010/gtest_main-md.vcxproj.filters b/Source/ThirdParty/gtest/msvc/2010/gtest_main-md.vcxproj.filters
>new file mode 100644
>index 0000000000000000000000000000000000000000..726c773ccb1776a58d6f4fd65a16cb50f422d154
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/msvc/2010/gtest_main-md.vcxproj.filters
>@@ -0,0 +1,18 @@
>+ï»¿<?xml version="1.0" encoding="utf-8"?>
>+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>+ <ItemGroup>
>+ <Filter Include="Source Files">
>+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
>+ <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
>+ </Filter>
>+ <Filter Include="Header Files">
>+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
>+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
>+ </Filter>
>+ </ItemGroup>
>+ <ItemGroup>
>+ <ClCompile Include="..\..\src\gtest_main.cc">
>+ <Filter>Source Files</Filter>
>+ </ClCompile>
>+ </ItemGroup>
>+</Project>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/gtest/msvc/2010/gtest_main.vcxproj b/Source/ThirdParty/gtest/msvc/2010/gtest_main.vcxproj
>new file mode 100644
>index 0000000000000000000000000000000000000000..8fb25897c8b1c2dbb3cf6c13e9b4193fc9ae050b
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/msvc/2010/gtest_main.vcxproj
>@@ -0,0 +1,162 @@
>+ï»¿<?xml version="1.0" encoding="utf-8"?>
>+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>+ <ItemGroup Label="ProjectConfigurations">
>+ <ProjectConfiguration Include="Debug|Win32">
>+ <Configuration>Debug</Configuration>
>+ <Platform>Win32</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Debug|x64">
>+ <Configuration>Debug</Configuration>
>+ <Platform>x64</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Release|Win32">
>+ <Configuration>Release</Configuration>
>+ <Platform>Win32</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Release|x64">
>+ <Configuration>Release</Configuration>
>+ <Platform>x64</Platform>
>+ </ProjectConfiguration>
>+ </ItemGroup>
>+ <PropertyGroup Label="Globals">
>+ <ProjectGuid>{3AF54C8A-10BF-4332-9147-F68ED9862032}</ProjectGuid>
>+ <Keyword>Win32Proj</Keyword>
>+ </PropertyGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
>+ <ConfigurationType>StaticLibrary</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
>+ <ConfigurationType>StaticLibrary</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
>+ <ConfigurationType>StaticLibrary</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
>+ <ConfigurationType>StaticLibrary</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
>+ <ImportGroup Label="ExtensionSettings">
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <PropertyGroup Label="UserMacros" />
>+ <PropertyGroup>
>+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
>+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)temp\$(ProjectName)\</IntDir>
>+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)temp\$(ProjectName)\</IntDir>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ <OutDir>$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
>+ <TargetName>gtest_maind</TargetName>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ <OutDir>$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
>+ <TargetName>gtest_main</TargetName>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ <TargetName>gtest_maind</TargetName>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ <TargetName>gtest_main</TargetName>
>+ </PropertyGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ <ClCompile>
>+ <Optimization>Disabled</Optimization>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <MinimalRebuild>true</MinimalRebuild>
>+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
>+ <PrecompiledHeader>
>+ </PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Lib>
>+ <OutputFile>$(OutDir)$(ProjectName)d.lib</OutputFile>
>+ </Lib>
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ <ClCompile>
>+ <Optimization>Disabled</Optimization>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
>+ <PrecompiledHeader>
>+ </PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Lib>
>+ <OutputFile>$(OutDir)$(ProjectName)d.lib</OutputFile>
>+ </Lib>
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ <ClCompile>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
>+ <PrecompiledHeader>
>+ </PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Lib>
>+ <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
>+ </Lib>
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ <ClCompile>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
>+ <PrecompiledHeader>
>+ </PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Lib>
>+ <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
>+ </Lib>
>+ </ItemDefinitionGroup>
>+ <ItemGroup>
>+ <ClCompile Include="..\..\src\gtest_main.cc">
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ </ItemGroup>
>+ <ItemGroup>
>+ <ProjectReference Include="gtest.vcxproj">
>+ <Project>{c8f6c172-56f2-4e76-b5fa-c3b423b31be7}</Project>
>+ </ProjectReference>
>+ </ItemGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
>+ <ImportGroup Label="ExtensionTargets">
>+ </ImportGroup>
>+</Project>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/gtest/msvc/2010/gtest_main.vcxproj.filters b/Source/ThirdParty/gtest/msvc/2010/gtest_main.vcxproj.filters
>new file mode 100644
>index 0000000000000000000000000000000000000000..726c773ccb1776a58d6f4fd65a16cb50f422d154
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/msvc/2010/gtest_main.vcxproj.filters
>@@ -0,0 +1,18 @@
>+ï»¿<?xml version="1.0" encoding="utf-8"?>
>+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>+ <ItemGroup>
>+ <Filter Include="Source Files">
>+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
>+ <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
>+ </Filter>
>+ <Filter Include="Header Files">
>+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
>+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
>+ </Filter>
>+ </ItemGroup>
>+ <ItemGroup>
>+ <ClCompile Include="..\..\src\gtest_main.cc">
>+ <Filter>Source Files</Filter>
>+ </ClCompile>
>+ </ItemGroup>
>+</Project>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/gtest/msvc/2010/gtest_prod_test-md.vcxproj b/Source/ThirdParty/gtest/msvc/2010/gtest_prod_test-md.vcxproj
>new file mode 100644
>index 0000000000000000000000000000000000000000..830e5dce410623c15b68fea718ed94c457f070f5
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/msvc/2010/gtest_prod_test-md.vcxproj
>@@ -0,0 +1,199 @@
>+ï»¿<?xml version="1.0" encoding="utf-8"?>
>+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>+ <ItemGroup Label="ProjectConfigurations">
>+ <ProjectConfiguration Include="Debug|Win32">
>+ <Configuration>Debug</Configuration>
>+ <Platform>Win32</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Debug|x64">
>+ <Configuration>Debug</Configuration>
>+ <Platform>x64</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Release|Win32">
>+ <Configuration>Release</Configuration>
>+ <Platform>Win32</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Release|x64">
>+ <Configuration>Release</Configuration>
>+ <Platform>x64</Platform>
>+ </ProjectConfiguration>
>+ </ItemGroup>
>+ <PropertyGroup Label="Globals">
>+ <ProjectGuid>{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}</ProjectGuid>
>+ <Keyword>Win32Proj</Keyword>
>+ </PropertyGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
>+ <ConfigurationType>Application</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
>+ <ConfigurationType>Application</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
>+ <ConfigurationType>Application</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
>+ <ConfigurationType>Application</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
>+ <ImportGroup Label="ExtensionSettings">
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <PropertyGroup Label="UserMacros" />
>+ <PropertyGroup>
>+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
>+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(ProjectName)\</IntDir>
>+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
>+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
>+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(ProjectName)\</IntDir>
>+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
>+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ <OutDir>$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir>$(OutDir)$(ProjectName)\</IntDir>
>+ <TargetName>gtest_prod_test</TargetName>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ <OutDir>$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir>$(OutDir)$(ProjectName)\</IntDir>
>+ <TargetName>gtest_prod_test</TargetName>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ <TargetName>gtest_prod_test</TargetName>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ <TargetName>gtest_prod_test</TargetName>
>+ </PropertyGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ <ClCompile>
>+ <Optimization>Disabled</Optimization>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <MinimalRebuild>true</MinimalRebuild>
>+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
>+ <PrecompiledHeader>Use</PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Link>
>+ <GenerateDebugInformation>true</GenerateDebugInformation>
>+ <ProgramDatabaseFile>$(OutDir)gtest_prod_test.pdb</ProgramDatabaseFile>
>+ <SubSystem>Console</SubSystem>
>+ <TargetMachine>MachineX86</TargetMachine>
>+ </Link>
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ <ClCompile>
>+ <Optimization>Disabled</Optimization>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
>+ <PrecompiledHeader>Use</PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Link>
>+ <GenerateDebugInformation>true</GenerateDebugInformation>
>+ <ProgramDatabaseFile>$(OutDir)gtest_prod_test.pdb</ProgramDatabaseFile>
>+ <SubSystem>Console</SubSystem>
>+ </Link>
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ <ClCompile>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>+ <PrecompiledHeader>Use</PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Link>
>+ <GenerateDebugInformation>true</GenerateDebugInformation>
>+ <SubSystem>Console</SubSystem>
>+ <OptimizeReferences>true</OptimizeReferences>
>+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
>+ <TargetMachine>MachineX86</TargetMachine>
>+ </Link>
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ <ClCompile>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>+ <PrecompiledHeader>Use</PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Link>
>+ <GenerateDebugInformation>true</GenerateDebugInformation>
>+ <SubSystem>Console</SubSystem>
>+ <OptimizeReferences>true</OptimizeReferences>
>+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
>+ </Link>
>+ </ItemDefinitionGroup>
>+ <ItemGroup>
>+ <ClCompile Include="..\..\test\gtest_prod_test.cc">
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ </PrecompiledHeader>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ </PrecompiledHeader>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ </PrecompiledHeader>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ </PrecompiledHeader>
>+ </ClCompile>
>+ <ClCompile Include="..\..\test\production.cc">
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ </PrecompiledHeader>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ </PrecompiledHeader>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ </PrecompiledHeader>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ </PrecompiledHeader>
>+ </ClCompile>
>+ </ItemGroup>
>+ <ItemGroup>
>+ <ClInclude Include="..\..\test\production.h" />
>+ </ItemGroup>
>+ <ItemGroup>
>+ <ProjectReference Include="gtest_main-md.vcxproj">
>+ <Project>{3af54c8a-10bf-4332-9147-f68ed9862033}</Project>
>+ </ProjectReference>
>+ </ItemGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
>+ <ImportGroup Label="ExtensionTargets">
>+ </ImportGroup>
>+</Project>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/gtest/msvc/2010/gtest_prod_test-md.vcxproj.filters b/Source/ThirdParty/gtest/msvc/2010/gtest_prod_test-md.vcxproj.filters
>new file mode 100644
>index 0000000000000000000000000000000000000000..ac367310aee626f4ec9c1dffda733a50f2a5c5ec
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/msvc/2010/gtest_prod_test-md.vcxproj.filters
>@@ -0,0 +1,26 @@
>+ï»¿<?xml version="1.0" encoding="utf-8"?>
>+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>+ <ItemGroup>
>+ <Filter Include="Source Files">
>+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
>+ <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
>+ </Filter>
>+ <Filter Include="Header Files">
>+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
>+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
>+ </Filter>
>+ </ItemGroup>
>+ <ItemGroup>
>+ <ClCompile Include="..\..\test\gtest_prod_test.cc">
>+ <Filter>Source Files</Filter>
>+ </ClCompile>
>+ <ClCompile Include="..\..\test\production.cc">
>+ <Filter>Source Files</Filter>
>+ </ClCompile>
>+ </ItemGroup>
>+ <ItemGroup>
>+ <ClInclude Include="..\..\test\production.h">
>+ <Filter>Header Files</Filter>
>+ </ClInclude>
>+ </ItemGroup>
>+</Project>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/gtest/msvc/2010/gtest_prod_test.vcxproj b/Source/ThirdParty/gtest/msvc/2010/gtest_prod_test.vcxproj
>new file mode 100644
>index 0000000000000000000000000000000000000000..d42e13511df28a5322242057e7541f965670dda2
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/msvc/2010/gtest_prod_test.vcxproj
>@@ -0,0 +1,191 @@
>+ï»¿<?xml version="1.0" encoding="utf-8"?>
>+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>+ <ItemGroup Label="ProjectConfigurations">
>+ <ProjectConfiguration Include="Debug|Win32">
>+ <Configuration>Debug</Configuration>
>+ <Platform>Win32</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Debug|x64">
>+ <Configuration>Debug</Configuration>
>+ <Platform>x64</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Release|Win32">
>+ <Configuration>Release</Configuration>
>+ <Platform>Win32</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Release|x64">
>+ <Configuration>Release</Configuration>
>+ <Platform>x64</Platform>
>+ </ProjectConfiguration>
>+ </ItemGroup>
>+ <PropertyGroup Label="Globals">
>+ <ProjectGuid>{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}</ProjectGuid>
>+ <Keyword>Win32Proj</Keyword>
>+ </PropertyGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
>+ <ConfigurationType>Application</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
>+ <ConfigurationType>Application</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
>+ <ConfigurationType>Application</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
>+ <ConfigurationType>Application</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
>+ <ImportGroup Label="ExtensionSettings">
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <PropertyGroup Label="UserMacros" />
>+ <PropertyGroup>
>+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
>+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)temp\$(ProjectName)\</IntDir>
>+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
>+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
>+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)temp\$(ProjectName)\</IntDir>
>+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
>+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ <OutDir>$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ <OutDir>$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
>+ </PropertyGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ <ClCompile>
>+ <Optimization>Disabled</Optimization>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <MinimalRebuild>true</MinimalRebuild>
>+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
>+ <PrecompiledHeader>Use</PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Link>
>+ <GenerateDebugInformation>true</GenerateDebugInformation>
>+ <ProgramDatabaseFile>$(OutDir)gtest_prod_test.pdb</ProgramDatabaseFile>
>+ <SubSystem>Console</SubSystem>
>+ <TargetMachine>MachineX86</TargetMachine>
>+ </Link>
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ <ClCompile>
>+ <Optimization>Disabled</Optimization>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
>+ <PrecompiledHeader>Use</PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Link>
>+ <GenerateDebugInformation>true</GenerateDebugInformation>
>+ <ProgramDatabaseFile>$(OutDir)gtest_prod_test.pdb</ProgramDatabaseFile>
>+ <SubSystem>Console</SubSystem>
>+ </Link>
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ <ClCompile>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
>+ <PrecompiledHeader>Use</PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Link>
>+ <GenerateDebugInformation>true</GenerateDebugInformation>
>+ <SubSystem>Console</SubSystem>
>+ <OptimizeReferences>true</OptimizeReferences>
>+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
>+ <TargetMachine>MachineX86</TargetMachine>
>+ </Link>
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ <ClCompile>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
>+ <PrecompiledHeader>Use</PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Link>
>+ <GenerateDebugInformation>true</GenerateDebugInformation>
>+ <SubSystem>Console</SubSystem>
>+ <OptimizeReferences>true</OptimizeReferences>
>+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
>+ </Link>
>+ </ItemDefinitionGroup>
>+ <ItemGroup>
>+ <ClCompile Include="..\..\test\gtest_prod_test.cc">
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ </PrecompiledHeader>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ </PrecompiledHeader>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ </PrecompiledHeader>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ </PrecompiledHeader>
>+ </ClCompile>
>+ <ClCompile Include="..\..\test\production.cc">
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ </PrecompiledHeader>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ </PrecompiledHeader>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ </PrecompiledHeader>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ </PrecompiledHeader>
>+ </ClCompile>
>+ </ItemGroup>
>+ <ItemGroup>
>+ <ClInclude Include="..\..\test\production.h" />
>+ </ItemGroup>
>+ <ItemGroup>
>+ <ProjectReference Include="gtest_main.vcxproj">
>+ <Project>{3af54c8a-10bf-4332-9147-f68ed9862032}</Project>
>+ </ProjectReference>
>+ </ItemGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
>+ <ImportGroup Label="ExtensionTargets">
>+ </ImportGroup>
>+</Project>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/gtest/msvc/2010/gtest_prod_test.vcxproj.filters b/Source/ThirdParty/gtest/msvc/2010/gtest_prod_test.vcxproj.filters
>new file mode 100644
>index 0000000000000000000000000000000000000000..ac367310aee626f4ec9c1dffda733a50f2a5c5ec
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/msvc/2010/gtest_prod_test.vcxproj.filters
>@@ -0,0 +1,26 @@
>+ï»¿<?xml version="1.0" encoding="utf-8"?>
>+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>+ <ItemGroup>
>+ <Filter Include="Source Files">
>+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
>+ <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
>+ </Filter>
>+ <Filter Include="Header Files">
>+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
>+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
>+ </Filter>
>+ </ItemGroup>
>+ <ItemGroup>
>+ <ClCompile Include="..\..\test\gtest_prod_test.cc">
>+ <Filter>Source Files</Filter>
>+ </ClCompile>
>+ <ClCompile Include="..\..\test\production.cc">
>+ <Filter>Source Files</Filter>
>+ </ClCompile>
>+ </ItemGroup>
>+ <ItemGroup>
>+ <ClInclude Include="..\..\test\production.h">
>+ <Filter>Header Files</Filter>
>+ </ClInclude>
>+ </ItemGroup>
>+</Project>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/gtest/msvc/2010/gtest_unittest-md.vcxproj b/Source/ThirdParty/gtest/msvc/2010/gtest_unittest-md.vcxproj
>new file mode 100644
>index 0000000000000000000000000000000000000000..93b0dc4e1a4e03ae8d63eff36c67bfe82365f188
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/msvc/2010/gtest_unittest-md.vcxproj
>@@ -0,0 +1,188 @@
>+ï»¿<?xml version="1.0" encoding="utf-8"?>
>+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>+ <ItemGroup Label="ProjectConfigurations">
>+ <ProjectConfiguration Include="Debug|Win32">
>+ <Configuration>Debug</Configuration>
>+ <Platform>Win32</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Debug|x64">
>+ <Configuration>Debug</Configuration>
>+ <Platform>x64</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Release|Win32">
>+ <Configuration>Release</Configuration>
>+ <Platform>Win32</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Release|x64">
>+ <Configuration>Release</Configuration>
>+ <Platform>x64</Platform>
>+ </ProjectConfiguration>
>+ </ItemGroup>
>+ <PropertyGroup Label="Globals">
>+ <ProjectGuid>{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}</ProjectGuid>
>+ <Keyword>Win32Proj</Keyword>
>+ </PropertyGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
>+ <ConfigurationType>Application</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
>+ <ConfigurationType>Application</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
>+ <ConfigurationType>Application</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
>+ <ConfigurationType>Application</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
>+ <ImportGroup Label="ExtensionSettings">
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <PropertyGroup Label="UserMacros" />
>+ <PropertyGroup>
>+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
>+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(ProjectName)\</IntDir>
>+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
>+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
>+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(ProjectName)\</IntDir>
>+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
>+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ <OutDir>$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir>$(OutDir)$(ProjectName)\</IntDir>
>+ <TargetName>gtest_unittest</TargetName>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ <OutDir>$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir>$(OutDir)$(ProjectName)\</IntDir>
>+ <TargetName>gtest_unittest</TargetName>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ <TargetName>gtest_unittest</TargetName>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ <TargetName>gtest_unittest</TargetName>
>+ </PropertyGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ <ClCompile>
>+ <Optimization>Disabled</Optimization>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <MinimalRebuild>true</MinimalRebuild>
>+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
>+ <PrecompiledHeader>Use</PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Link>
>+ <GenerateDebugInformation>true</GenerateDebugInformation>
>+ <ProgramDatabaseFile>$(OutDir)gtest_unittest.pdb</ProgramDatabaseFile>
>+ <SubSystem>Console</SubSystem>
>+ <TargetMachine>MachineX86</TargetMachine>
>+ </Link>
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ <ClCompile>
>+ <Optimization>Disabled</Optimization>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
>+ <PrecompiledHeader>Use</PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Link>
>+ <GenerateDebugInformation>true</GenerateDebugInformation>
>+ <ProgramDatabaseFile>$(OutDir)gtest_unittest.pdb</ProgramDatabaseFile>
>+ <SubSystem>Console</SubSystem>
>+ </Link>
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ <ClCompile>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>+ <PrecompiledHeader>Use</PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Link>
>+ <GenerateDebugInformation>true</GenerateDebugInformation>
>+ <SubSystem>Console</SubSystem>
>+ <OptimizeReferences>true</OptimizeReferences>
>+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
>+ <TargetMachine>MachineX86</TargetMachine>
>+ </Link>
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ <ClCompile>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>+ <PrecompiledHeader>Use</PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Link>
>+ <GenerateDebugInformation>true</GenerateDebugInformation>
>+ <SubSystem>Console</SubSystem>
>+ <OptimizeReferences>true</OptimizeReferences>
>+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
>+ </Link>
>+ </ItemDefinitionGroup>
>+ <ItemGroup>
>+ <ClCompile Include="..\..\test\gtest_unittest.cc">
>+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
>+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MinSpace</Optimization>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Default</BasicRuntimeChecks>
>+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Default</BasicRuntimeChecks>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ </PrecompiledHeader>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ </PrecompiledHeader>
>+ <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ProgramDatabase</DebugInformationFormat>
>+ <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ </PrecompiledHeader>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ </PrecompiledHeader>
>+ </ClCompile>
>+ </ItemGroup>
>+ <ItemGroup>
>+ <ProjectReference Include="gtest_main-md.vcxproj">
>+ <Project>{3af54c8a-10bf-4332-9147-f68ed9862033}</Project>
>+ </ProjectReference>
>+ </ItemGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
>+ <ImportGroup Label="ExtensionTargets">
>+ </ImportGroup>
>+</Project>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/gtest/msvc/2010/gtest_unittest-md.vcxproj.filters b/Source/ThirdParty/gtest/msvc/2010/gtest_unittest-md.vcxproj.filters
>new file mode 100644
>index 0000000000000000000000000000000000000000..047dae513e860153a5cec2f45b48cdbc75f9b6ce
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/msvc/2010/gtest_unittest-md.vcxproj.filters
>@@ -0,0 +1,18 @@
>+ï»¿<?xml version="1.0" encoding="utf-8"?>
>+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>+ <ItemGroup>
>+ <Filter Include="Source Files">
>+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
>+ <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
>+ </Filter>
>+ <Filter Include="Header Files">
>+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
>+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
>+ </Filter>
>+ </ItemGroup>
>+ <ItemGroup>
>+ <ClCompile Include="..\..\test\gtest_unittest.cc">
>+ <Filter>Source Files</Filter>
>+ </ClCompile>
>+ </ItemGroup>
>+</Project>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/gtest/msvc/2010/gtest_unittest.vcxproj b/Source/ThirdParty/gtest/msvc/2010/gtest_unittest.vcxproj
>new file mode 100644
>index 0000000000000000000000000000000000000000..ec6abde7da17e29ed2476f70c69415ae968f21f3
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/msvc/2010/gtest_unittest.vcxproj
>@@ -0,0 +1,180 @@
>+ï»¿<?xml version="1.0" encoding="utf-8"?>
>+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>+ <ItemGroup Label="ProjectConfigurations">
>+ <ProjectConfiguration Include="Debug|Win32">
>+ <Configuration>Debug</Configuration>
>+ <Platform>Win32</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Debug|x64">
>+ <Configuration>Debug</Configuration>
>+ <Platform>x64</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Release|Win32">
>+ <Configuration>Release</Configuration>
>+ <Platform>Win32</Platform>
>+ </ProjectConfiguration>
>+ <ProjectConfiguration Include="Release|x64">
>+ <Configuration>Release</Configuration>
>+ <Platform>x64</Platform>
>+ </ProjectConfiguration>
>+ </ItemGroup>
>+ <PropertyGroup Label="Globals">
>+ <ProjectGuid>{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}</ProjectGuid>
>+ <Keyword>Win32Proj</Keyword>
>+ </PropertyGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
>+ <ConfigurationType>Application</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
>+ <ConfigurationType>Application</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
>+ <ConfigurationType>Application</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
>+ <ConfigurationType>Application</ConfigurationType>
>+ <CharacterSet>MultiByte</CharacterSet>
>+ <PlatformToolset>v100</PlatformToolset>
>+ </PropertyGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
>+ <ImportGroup Label="ExtensionSettings">
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
>+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>+ </ImportGroup>
>+ <PropertyGroup Label="UserMacros" />
>+ <PropertyGroup>
>+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
>+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)temp\$(ProjectName)\</IntDir>
>+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
>+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
>+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)temp\$(ProjectName)\</IntDir>
>+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
>+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ <OutDir>$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
>+ </PropertyGroup>
>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ <OutDir>$(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\</OutDir>
>+ <IntDir>$(OutDir)temp\$(ProjectName)\</IntDir>
>+ </PropertyGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ <ClCompile>
>+ <Optimization>Disabled</Optimization>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <MinimalRebuild>true</MinimalRebuild>
>+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
>+ <PrecompiledHeader>Use</PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Link>
>+ <GenerateDebugInformation>true</GenerateDebugInformation>
>+ <ProgramDatabaseFile>$(OutDir)gtest_unittest.pdb</ProgramDatabaseFile>
>+ <SubSystem>Console</SubSystem>
>+ <TargetMachine>MachineX86</TargetMachine>
>+ </Link>
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ <ClCompile>
>+ <Optimization>Disabled</Optimization>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
>+ <PrecompiledHeader>Use</PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Link>
>+ <GenerateDebugInformation>true</GenerateDebugInformation>
>+ <ProgramDatabaseFile>$(OutDir)gtest_unittest.pdb</ProgramDatabaseFile>
>+ <SubSystem>Console</SubSystem>
>+ </Link>
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ <ClCompile>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
>+ <PrecompiledHeader>Use</PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Link>
>+ <GenerateDebugInformation>true</GenerateDebugInformation>
>+ <SubSystem>Console</SubSystem>
>+ <OptimizeReferences>true</OptimizeReferences>
>+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
>+ <TargetMachine>MachineX86</TargetMachine>
>+ </Link>
>+ </ItemDefinitionGroup>
>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ <ClCompile>
>+ <PreprocessorDefinitions>WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
>+ <PrecompiledHeader>Use</PrecompiledHeader>
>+ <WarningLevel>Level3</WarningLevel>
>+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ </ClCompile>
>+ <Link>
>+ <GenerateDebugInformation>true</GenerateDebugInformation>
>+ <SubSystem>Console</SubSystem>
>+ <OptimizeReferences>true</OptimizeReferences>
>+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
>+ </Link>
>+ </ItemDefinitionGroup>
>+ <ItemGroup>
>+ <ClCompile Include="..\..\test\gtest_unittest.cc">
>+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
>+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MinSpace</Optimization>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Default</BasicRuntimeChecks>
>+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Default</BasicRuntimeChecks>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>+ </PrecompiledHeader>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>+ </PrecompiledHeader>
>+ <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ProgramDatabase</DebugInformationFormat>
>+ <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ProgramDatabase</DebugInformationFormat>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>+ </PrecompiledHeader>
>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>+ </PrecompiledHeader>
>+ </ClCompile>
>+ </ItemGroup>
>+ <ItemGroup>
>+ <ProjectReference Include="gtest_main.vcxproj">
>+ <Project>{3af54c8a-10bf-4332-9147-f68ed9862032}</Project>
>+ </ProjectReference>
>+ </ItemGroup>
>+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
>+ <ImportGroup Label="ExtensionTargets">
>+ </ImportGroup>
>+</Project>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/gtest/msvc/2010/gtest_unittest.vcxproj.filters b/Source/ThirdParty/gtest/msvc/2010/gtest_unittest.vcxproj.filters
>new file mode 100644
>index 0000000000000000000000000000000000000000..047dae513e860153a5cec2f45b48cdbc75f9b6ce
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/msvc/2010/gtest_unittest.vcxproj.filters
>@@ -0,0 +1,18 @@
>+ï»¿<?xml version="1.0" encoding="utf-8"?>
>+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>+ <ItemGroup>
>+ <Filter Include="Source Files">
>+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
>+ <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
>+ </Filter>
>+ <Filter Include="Header Files">
>+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
>+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
>+ </Filter>
>+ </ItemGroup>
>+ <ItemGroup>
>+ <ClCompile Include="..\..\test\gtest_unittest.cc">
>+ <Filter>Source Files</Filter>
>+ </ClCompile>
>+ </ItemGroup>
>+</Project>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj b/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj
>deleted file mode 100644
>index 10078e4aab691712a103c2eb63ee7dac1ef499be..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj
>+++ /dev/null
>@@ -1,360 +0,0 @@
>-ï»¿<?xml version="1.0" encoding="utf-8"?>
>-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>- <ItemGroup Label="ProjectConfigurations">
>- <ProjectConfiguration Include="DebugSuffix|Win32">
>- <Configuration>DebugSuffix</Configuration>
>- <Platform>Win32</Platform>
>- </ProjectConfiguration>
>- <ProjectConfiguration Include="DebugSuffix|x64">
>- <Configuration>DebugSuffix</Configuration>
>- <Platform>x64</Platform>
>- </ProjectConfiguration>
>- <ProjectConfiguration Include="Debug_WinCairo|Win32">
>- <Configuration>Debug_WinCairo</Configuration>
>- <Platform>Win32</Platform>
>- </ProjectConfiguration>
>- <ProjectConfiguration Include="Debug_WinCairo|x64">
>- <Configuration>Debug_WinCairo</Configuration>
>- <Platform>x64</Platform>
>- </ProjectConfiguration>
>- <ProjectConfiguration Include="Debug|Win32">
>- <Configuration>Debug</Configuration>
>- <Platform>Win32</Platform>
>- </ProjectConfiguration>
>- <ProjectConfiguration Include="Debug|x64">
>- <Configuration>Debug</Configuration>
>- <Platform>x64</Platform>
>- </ProjectConfiguration>
>- <ProjectConfiguration Include="Production|Win32">
>- <Configuration>Production</Configuration>
>- <Platform>Win32</Platform>
>- </ProjectConfiguration>
>- <ProjectConfiguration Include="Production|x64">
>- <Configuration>Production</Configuration>
>- <Platform>x64</Platform>
>- </ProjectConfiguration>
>- <ProjectConfiguration Include="Release_WinCairo|Win32">
>- <Configuration>Release_WinCairo</Configuration>
>- <Platform>Win32</Platform>
>- </ProjectConfiguration>
>- <ProjectConfiguration Include="Release_WinCairo|x64">
>- <Configuration>Release_WinCairo</Configuration>
>- <Platform>x64</Platform>
>- </ProjectConfiguration>
>- <ProjectConfiguration Include="Release|Win32">
>- <Configuration>Release</Configuration>
>- <Platform>Win32</Platform>
>- </ProjectConfiguration>
>- <ProjectConfiguration Include="Release|x64">
>- <Configuration>Release</Configuration>
>- <Platform>x64</Platform>
>- </ProjectConfiguration>
>- </ItemGroup>
>- <PropertyGroup Label="Globals">
>- <ProjectGuid>{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}</ProjectGuid>
>- <RootNamespace>gtest-md</RootNamespace>
>- <Keyword>Win32Proj</Keyword>
>- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
>- </PropertyGroup>
>- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
>- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
>- <ConfigurationType>StaticLibrary</ConfigurationType>
>- <CharacterSet>MultiByte</CharacterSet>
>- <PlatformToolset>v140</PlatformToolset>
>- </PropertyGroup>
>- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
>- <ConfigurationType>StaticLibrary</ConfigurationType>
>- <CharacterSet>MultiByte</CharacterSet>
>- <PlatformToolset>v140</PlatformToolset>
>- </PropertyGroup>
>- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
>- <ConfigurationType>StaticLibrary</ConfigurationType>
>- <CharacterSet>MultiByte</CharacterSet>
>- <PlatformToolset>v140</PlatformToolset>
>- </PropertyGroup>
>- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
>- <ConfigurationType>StaticLibrary</ConfigurationType>
>- <CharacterSet>MultiByte</CharacterSet>
>- <PlatformToolset>v140</PlatformToolset>
>- </PropertyGroup>
>- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
>- <ConfigurationType>StaticLibrary</ConfigurationType>
>- <CharacterSet>MultiByte</CharacterSet>
>- <PlatformToolset>v140</PlatformToolset>
>- </PropertyGroup>
>- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
>- <ConfigurationType>StaticLibrary</ConfigurationType>
>- <CharacterSet>MultiByte</CharacterSet>
>- <PlatformToolset>v140</PlatformToolset>
>- </PropertyGroup>
>- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
>- <ConfigurationType>StaticLibrary</ConfigurationType>
>- <CharacterSet>MultiByte</CharacterSet>
>- <PlatformToolset>v140</PlatformToolset>
>- </PropertyGroup>
>- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
>- <ConfigurationType>StaticLibrary</ConfigurationType>
>- <CharacterSet>MultiByte</CharacterSet>
>- <PlatformToolset>v140</PlatformToolset>
>- </PropertyGroup>
>- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
>- <ConfigurationType>StaticLibrary</ConfigurationType>
>- <CharacterSet>MultiByte</CharacterSet>
>- <PlatformToolset>v140</PlatformToolset>
>- </PropertyGroup>
>- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
>- <ConfigurationType>StaticLibrary</ConfigurationType>
>- <CharacterSet>MultiByte</CharacterSet>
>- <PlatformToolset>v140</PlatformToolset>
>- </PropertyGroup>
>- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
>- <ConfigurationType>StaticLibrary</ConfigurationType>
>- <CharacterSet>MultiByte</CharacterSet>
>- <PlatformToolset>v140</PlatformToolset>
>- </PropertyGroup>
>- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
>- <ConfigurationType>StaticLibrary</ConfigurationType>
>- <CharacterSet>MultiByte</CharacterSet>
>- <PlatformToolset>v140</PlatformToolset>
>- </PropertyGroup>
>- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
>- <ImportGroup Label="ExtensionSettings">
>- </ImportGroup>
>- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
>- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>- <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
>- </ImportGroup>
>- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
>- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>- <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
>- </ImportGroup>
>- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="PropertySheets">
>- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>- <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
>- </ImportGroup>
>- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
>- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>- <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
>- </ImportGroup>
>- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
>- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>- <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
>- </ImportGroup>
>- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="PropertySheets">
>- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>- <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
>- </ImportGroup>
>- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
>- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>- <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
>- </ImportGroup>
>- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
>- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>- <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
>- </ImportGroup>
>- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">
>- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>- <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
>- </ImportGroup>
>- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
>- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>- <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
>- </ImportGroup>
>- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
>- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>- <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
>- <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />
>- </ImportGroup>
>- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="PropertySheets">
>- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
>- <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
>- <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />
>- </ImportGroup>
>- <PropertyGroup Label="UserMacros" />
>- <PropertyGroup>
>- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
>- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ConfigurationBuildDir)\lib$(PlatformArchitecture)\</OutDir>
>- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ConfigurationBuildDir)\lib$(PlatformArchitecture)\</OutDir>
>- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">$(ConfigurationBuildDir)\lib$(PlatformArchitecture)\</OutDir>
>- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">$(ConfigurationBuildDir)\lib$(PlatformArchitecture)\</OutDir>
>- <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">$(ConfigurationBuildDir)\lib$(PlatformArchitecture)\</OutDir>
>- <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">$(ConfigurationBuildDir)\lib$(PlatformArchitecture)\</OutDir>
>- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ConfigurationBuildDir)\lib$(PlatformArchitecture)\</OutDir>
>- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ConfigurationBuildDir)\lib$(PlatformArchitecture)\</OutDir>
>- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">$(ConfigurationBuildDir)\lib$(PlatformArchitecture)\</OutDir>
>- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">$(ConfigurationBuildDir)\lib$(PlatformArchitecture)\</OutDir>
>- <OutDir Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">$(ConfigurationBuildDir)\lib$(PlatformArchitecture)\</OutDir>
>- <OutDir Condition="'$(Configuration)|$(Platform)'=='Production|x64'">$(ConfigurationBuildDir)\lib$(PlatformArchitecture)\</OutDir>
>- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gtest$(DebugSuffix)</TargetName>
>- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gtest$(DebugSuffix)</TargetName>
>- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">gtest$(DebugSuffix)</TargetName>
>- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">gtest$(DebugSuffix)</TargetName>
>- <TargetName Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">gtest$(DebugSuffix)</TargetName>
>- <TargetName Condition="'$(Configuration)|$(Platform)'=='Production|x64'">gtest$(DebugSuffix)</TargetName>
>- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gtest$(DebugSuffix)</TargetName>
>- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gtest$(DebugSuffix)</TargetName>
>- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">gtest$(DebugSuffix)</TargetName>
>- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">gtest$(DebugSuffix)</TargetName>
>- <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">gtest$(DebugSuffix)</TargetName>
>- <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">gtest$(DebugSuffix)</TargetName>
>- </PropertyGroup>
>- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>- <ClCompile>
>- <Optimization>Disabled</Optimization>
>- <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>- <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>- <PrecompiledHeader>
>- </PrecompiledHeader>
>- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>- </ClCompile>
>- <Lib>
>- <OutputFile>$(OutDir)gtest$(DebugSuffix).lib</OutputFile>
>- </Lib>
>- </ItemDefinitionGroup>
>- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
>- <ClCompile>
>- <Optimization>Disabled</Optimization>
>- <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>- <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>- <PrecompiledHeader>
>- </PrecompiledHeader>
>- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>- </ClCompile>
>- <Lib>
>- <OutputFile>$(OutDir)gtest$(DebugSuffix).lib</OutputFile>
>- </Lib>
>- </ItemDefinitionGroup>
>- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
>- <ClCompile>
>- <Optimization>Disabled</Optimization>
>- <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>- <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>- <PrecompiledHeader>
>- </PrecompiledHeader>
>- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>- </ClCompile>
>- <Lib>
>- <OutputFile>$(OutDir)gtest.lib</OutputFile>
>- </Lib>
>- </ItemDefinitionGroup>
>- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
>- <ClCompile>
>- <Optimization>Disabled</Optimization>
>- <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>- <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>- <PrecompiledHeader>
>- </PrecompiledHeader>
>- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>- </ClCompile>
>- <Lib>
>- <OutputFile>$(OutDir)gtest.lib</OutputFile>
>- </Lib>
>- </ItemDefinitionGroup>
>- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">
>- <ClCompile>
>- <Optimization>Disabled</Optimization>
>- <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>- <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>- <PrecompiledHeader>
>- </PrecompiledHeader>
>- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>- </ClCompile>
>- <Lib>
>- <OutputFile>$(OutDir)gtest$(DebugSuffix).lib</OutputFile>
>- </Lib>
>- </ItemDefinitionGroup>
>- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">
>- <ClCompile>
>- <Optimization>Disabled</Optimization>
>- <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>- <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>- <PrecompiledHeader>
>- </PrecompiledHeader>
>- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
>- </ClCompile>
>- <Lib>
>- <OutputFile>$(OutDir)gtest$(DebugSuffix).lib</OutputFile>
>- </Lib>
>- </ItemDefinitionGroup>
>- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>- <ClCompile>
>- <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>- <PrecompiledHeader>
>- </PrecompiledHeader>
>- <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>- </ClCompile>
>- <Lib />
>- </ItemDefinitionGroup>
>- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
>- <ClCompile>
>- <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>- <PrecompiledHeader>
>- </PrecompiledHeader>
>- <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>- </ClCompile>
>- <Lib />
>- </ItemDefinitionGroup>
>- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
>- <ClCompile>
>- <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>- <PrecompiledHeader>
>- </PrecompiledHeader>
>- <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>- </ClCompile>
>- <Lib />
>- </ItemDefinitionGroup>
>- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
>- <ClCompile>
>- <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>- <PrecompiledHeader>
>- </PrecompiledHeader>
>- <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>- </ClCompile>
>- <Lib />
>- </ItemDefinitionGroup>
>- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
>- <ClCompile>
>- <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>- <PrecompiledHeader>
>- </PrecompiledHeader>
>- <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>- </ClCompile>
>- <Lib />
>- </ItemDefinitionGroup>
>- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
>- <ClCompile>
>- <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>- <PrecompiledHeader>
>- </PrecompiledHeader>
>- <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>- </ClCompile>
>- <Lib />
>- </ItemDefinitionGroup>
>- <ItemGroup>
>- <ClCompile Include="..\src\gtest-death-test.cc" />
>- <ClCompile Include="..\src\gtest-filepath.cc" />
>- <ClCompile Include="..\src\gtest-port.cc" />
>- <ClCompile Include="..\src\gtest-test-part.cc" />
>- <ClCompile Include="..\src\gtest-typed-test.cc" />
>- <ClCompile Include="..\src\gtest.cc" />
>- </ItemGroup>
>- <ItemGroup>
>- <ClInclude Include="..\include\gtest\internal\gtest-death-test-internal.h" />
>- <ClInclude Include="..\include\gtest\gtest-death-test.h" />
>- <ClInclude Include="..\include\gtest\internal\gtest-filepath.h" />
>- <ClInclude Include="..\src\gtest-internal-inl.h" />
>- <ClInclude Include="..\include\gtest\internal\gtest-internal.h" />
>- <ClInclude Include="..\include\gtest\gtest-message.h" />
>- <ClInclude Include="..\include\gtest\internal\gtest-port.h" />
>- <ClInclude Include="..\include\gtest\gtest-spi.h" />
>- <ClInclude Include="..\include\gtest\internal\gtest-string.h" />
>- <ClInclude Include="..\include\gtest\gtest.h" />
>- <ClInclude Include="..\include\gtest\gtest_pred_impl.h" />
>- <ClInclude Include="..\include\gtest\gtest_prod.h" />
>- </ItemGroup>
>- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
>- <ImportGroup Label="ExtensionTargets">
>- </ImportGroup>
>-</Project>
>diff --git a/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj.filters b/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj.filters
>deleted file mode 100644
>index 037d1c9b4dca6a14ec706bc4a8c131f6b5c83800..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj.filters
>+++ /dev/null
>@@ -1,71 +0,0 @@
>-ï»¿<?xml version="1.0" encoding="utf-8"?>
>-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
>- <ItemGroup>
>- <Filter Include="Source Files">
>- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
>- <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
>- </Filter>
>- <Filter Include="Header Files">
>- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
>- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
>- </Filter>
>- </ItemGroup>
>- <ItemGroup>
>- <ClCompile Include="..\src\gtest-death-test.cc">
>- <Filter>Source Files</Filter>
>- </ClCompile>
>- <ClCompile Include="..\src\gtest-filepath.cc">
>- <Filter>Source Files</Filter>
>- </ClCompile>
>- <ClCompile Include="..\src\gtest-port.cc">
>- <Filter>Source Files</Filter>
>- </ClCompile>
>- <ClCompile Include="..\src\gtest-test-part.cc">
>- <Filter>Source Files</Filter>
>- </ClCompile>
>- <ClCompile Include="..\src\gtest-typed-test.cc">
>- <Filter>Source Files</Filter>
>- </ClCompile>
>- <ClCompile Include="..\src\gtest.cc">
>- <Filter>Source Files</Filter>
>- </ClCompile>
>- </ItemGroup>
>- <ItemGroup>
>- <ClInclude Include="..\include\gtest\internal\gtest-death-test-internal.h">
>- <Filter>Header Files</Filter>
>- </ClInclude>
>- <ClInclude Include="..\include\gtest\gtest-death-test.h">
>- <Filter>Header Files</Filter>
>- </ClInclude>
>- <ClInclude Include="..\include\gtest\internal\gtest-filepath.h">
>- <Filter>Header Files</Filter>
>- </ClInclude>
>- <ClInclude Include="..\src\gtest-internal-inl.h">
>- <Filter>Header Files</Filter>
>- </ClInclude>
>- <ClInclude Include="..\include\gtest\internal\gtest-internal.h">
>- <Filter>Header Files</Filter>
>- </ClInclude>
>- <ClInclude Include="..\include\gtest\gtest-message.h">
>- <Filter>Header Files</Filter>
>- </ClInclude>
>- <ClInclude Include="..\include\gtest\internal\gtest-port.h">
>- <Filter>Header Files</Filter>
>- </ClInclude>
>- <ClInclude Include="..\include\gtest\gtest-spi.h">
>- <Filter>Header Files</Filter>
>- </ClInclude>
>- <ClInclude Include="..\include\gtest\internal\gtest-string.h">
>- <Filter>Header Files</Filter>
>- </ClInclude>
>- <ClInclude Include="..\include\gtest\gtest.h">
>- <Filter>Header Files</Filter>
>- </ClInclude>
>- <ClInclude Include="..\include\gtest\gtest_pred_impl.h">
>- <Filter>Header Files</Filter>
>- </ClInclude>
>- <ClInclude Include="..\include\gtest\gtest_prod.h">
>- <Filter>Header Files</Filter>
>- </ClInclude>
>- </ItemGroup>
>-</Project>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/gtest/run_tests.py b/Source/ThirdParty/gtest/run_tests.py
>deleted file mode 100755
>index e1084056e23bdd5cfcf44f0676c1d628ae63d761..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/run_tests.py
>+++ /dev/null
>@@ -1,60 +0,0 @@
>-#!/usr/bin/env python
>-#
>-# Copyright 2008, Google Inc. All rights reserved.
>-#
>-# Redistribution and use in source and binary forms, with or without
>-# modification, are permitted provided that the following conditions are
>-# met:
>-#
>-# * Redistributions of source code must retain the above copyright
>-# notice, this list of conditions and the following disclaimer.
>-# * Redistributions in binary form must reproduce the above
>-# copyright notice, this list of conditions and the following disclaimer
>-# in the documentation and/or other materials provided with the
>-# distribution.
>-# * Neither the name of Google Inc. nor the names of its
>-# contributors may be used to endorse or promote products derived from
>-# this software without specific prior written permission.
>-#
>-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-
>-"""Runs the specified tests for Google Test.
>-
>-This script requires Python 2.3 or higher. To learn the usage, run it
>-with -h.
>-"""
>-
>-import os
>-import sys
>-
>-SCRIPT_DIR = os.path.dirname(__file__) or '.'
>-
>-sys.path.append(os.path.join(SCRIPT_DIR, 'test'))
>-import run_tests_util
>-
>-
>-def _Main():
>- """Runs all tests for Google Test."""
>-
>- options, args = run_tests_util.ParseArgs('gtest')
>- test_runner = run_tests_util.TestRunner(script_dir=SCRIPT_DIR)
>- tests = test_runner.GetTestsToRun(args,
>- options.configurations,
>- options.built_configurations)
>- if not tests:
>- sys.exit(1) # Incorrect parameters given, abort execution.
>-
>- sys.exit(test_runner.RunTests(tests[0], tests[1]))
>-
>-if __name__ == '__main__':
>- _Main()
>diff --git a/Source/ThirdParty/gtest/samples/prime_tables.h b/Source/ThirdParty/gtest/samples/prime_tables.h
>index 92ce16a0144d502fd0e45b73f37d32bbedf1c3f3..523c50b9afb1a0919168094d71fdf376b64af6b2 100644
>--- a/Source/ThirdParty/gtest/samples/prime_tables.h
>+++ b/Source/ThirdParty/gtest/samples/prime_tables.h
>@@ -26,9 +26,8 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>-// Author: vladl@google.com (Vlad Losev)
>+
>+
> 
> // This provides interface PrimeTable that determines whether a number is a
> // prime and determines a next prime number. This interface is used
>@@ -103,11 +102,15 @@ class PreCalculatedPrimeTable : public PrimeTable {
> ::std::fill(is_prime_, is_prime_ + is_prime_size_, true);
> is_prime_[0] = is_prime_[1] = false;
> 
>- for (int i = 2; i <= max; i++) {
>+ // Checks every candidate for prime number (we know that 2 is the only even
>+ // prime).
>+ for (int i = 2; i*i <= max; i += i%2+1) {
> if (!is_prime_[i]) continue;
> 
> // Marks all multiples of i (except i itself) as non-prime.
>- for (int j = 2*i; j <= max; j += i) {
>+ // We are starting here from i-th multiplier, because all smaller
>+ // complex numbers were already marked.
>+ for (int j = i*i; j <= max; j += i) {
> is_prime_[j] = false;
> }
> }
>diff --git a/Source/ThirdParty/gtest/samples/sample1.cc b/Source/ThirdParty/gtest/samples/sample1.cc
>index f171e2609d25132284621fb62cf3ba86e1e69925..13cec1d0fbfabdaaf1c6c41b1a86bc1d0908983d 100644
>--- a/Source/ThirdParty/gtest/samples/sample1.cc
>+++ b/Source/ThirdParty/gtest/samples/sample1.cc
>@@ -28,8 +28,6 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> // A sample program demonstrating using Google C++ testing framework.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
> 
> #include "sample1.h"
> 
>@@ -55,7 +53,7 @@ bool IsPrime(int n) {
> 
> // Try to divide n by every odd number i, starting from 3
> for (int i = 3; ; i += 2) {
>- // We only have to try i up to the squre root of n
>+ // We only have to try i up to the square root of n
> if (i > n/i) break;
> 
> // Now, we have i <= n/i < n.
>diff --git a/Source/ThirdParty/gtest/samples/sample1.h b/Source/ThirdParty/gtest/samples/sample1.h
>index 3dfeb98c45030145f9ea18d79531c91c81ee849a..2c3e9f05f1a10a4425f77b28716e80596821961f 100644
>--- a/Source/ThirdParty/gtest/samples/sample1.h
>+++ b/Source/ThirdParty/gtest/samples/sample1.h
>@@ -28,8 +28,6 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> // A sample program demonstrating using Google C++ testing framework.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
> 
> #ifndef GTEST_SAMPLES_SAMPLE1_H_
> #define GTEST_SAMPLES_SAMPLE1_H_
>diff --git a/Source/ThirdParty/gtest/samples/sample10_unittest.cc b/Source/ThirdParty/gtest/samples/sample10_unittest.cc
>index 3ad6fd65382617f7d6b401f4d1bd83fc86ed84fe..7ce9550f883aa342d25b048593faa96cabd8e1fa 100644
>--- a/Source/ThirdParty/gtest/samples/sample10_unittest.cc
>+++ b/Source/ThirdParty/gtest/samples/sample10_unittest.cc
>@@ -25,8 +25,7 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: vladl@google.com (Vlad Losev)
>+
> 
> // This sample shows how to use Google Test listener API to implement
> // a primitive leak checker.
>@@ -34,19 +33,16 @@
> #include <stdio.h>
> #include <stdlib.h>
> 
>-#include <gtest/gtest.h>
>-
>+#include "gtest/gtest.h"
> using ::testing::EmptyTestEventListener;
> using ::testing::InitGoogleTest;
> using ::testing::Test;
>-using ::testing::TestCase;
> using ::testing::TestEventListeners;
> using ::testing::TestInfo;
> using ::testing::TestPartResult;
> using ::testing::UnitTest;
> 
> namespace {
>-
> // We will track memory used by this class.
> class Water {
> public:
>@@ -89,8 +85,7 @@ class LeakChecker : public EmptyTestEventListener {
> // You can generate a failure in any event handler except
> // OnTestPartResult. Just use an appropriate Google Test assertion to do
> // it.
>- EXPECT_TRUE(difference <= 0)
>- << "Leaked " << difference << " unit(s) of Water!";
>+ EXPECT_LE(difference, 0) << "Leaked " << difference << " unit(s) of Water!";
> }
> 
> int initially_allocated_;
>@@ -107,7 +102,6 @@ TEST(ListenersTest, LeaksWater) {
> Water* water = new Water;
> EXPECT_TRUE(water != NULL);
> }
>-
> } // namespace
> 
> int main(int argc, char **argv) {
>diff --git a/Source/ThirdParty/gtest/samples/sample1_unittest.cc b/Source/ThirdParty/gtest/samples/sample1_unittest.cc
>index 01eb5462f81ad54b38ac5ee6337972eaa04d7ade..cb08b61a59a9e16b3657861f1c9609001d2096b2 100644
>--- a/Source/ThirdParty/gtest/samples/sample1_unittest.cc
>+++ b/Source/ThirdParty/gtest/samples/sample1_unittest.cc
>@@ -28,9 +28,6 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> // A sample program demonstrating using Google C++ testing framework.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>-
> 
> // This sample shows how to write a simple unit test for a function,
> // using Google C++ testing framework.
>@@ -45,8 +42,8 @@
> 
> #include <limits.h>
> #include "sample1.h"
>-#include <gtest/gtest.h>
>-
>+#include "gtest/gtest.h"
>+namespace {
> 
> // Step 2. Use the TEST macro to define your tests.
> //
>@@ -81,7 +78,7 @@ TEST(FactorialTest, Negative) {
> // test case.
> EXPECT_EQ(1, Factorial(-5));
> EXPECT_EQ(1, Factorial(-1));
>- EXPECT_TRUE(Factorial(-10) > 0);
>+ EXPECT_GT(Factorial(-10), 0);
> 
> // <TechnicalDetails>
> //
>@@ -139,6 +136,7 @@ TEST(IsPrimeTest, Positive) {
> EXPECT_FALSE(IsPrime(6));
> EXPECT_TRUE(IsPrime(23));
> }
>+} // namespace
> 
> // Step 3. Call RUN_ALL_TESTS() in main().
> //
>diff --git a/Source/ThirdParty/gtest/samples/sample2.cc b/Source/ThirdParty/gtest/samples/sample2.cc
>index 5f763b9bdf8d7abc13c61c568331d21b9fa4975d..f3b722fcacfeee7d890b2d1f19bc97415eca49f6 100644
>--- a/Source/ThirdParty/gtest/samples/sample2.cc
>+++ b/Source/ThirdParty/gtest/samples/sample2.cc
>@@ -28,8 +28,6 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> // A sample program demonstrating using Google C++ testing framework.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
> 
> #include "sample2.h"
> 
>diff --git a/Source/ThirdParty/gtest/samples/sample2.h b/Source/ThirdParty/gtest/samples/sample2.h
>index 5b57e6082fa4f6b724bfb582687bfe0a6319f2a7..58f360f45c7658c0197e3ffc65ec8b375fb336b0 100644
>--- a/Source/ThirdParty/gtest/samples/sample2.h
>+++ b/Source/ThirdParty/gtest/samples/sample2.h
>@@ -28,8 +28,6 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> // A sample program demonstrating using Google C++ testing framework.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
> 
> #ifndef GTEST_SAMPLES_SAMPLE2_H_
> #define GTEST_SAMPLES_SAMPLE2_H_
>@@ -44,7 +42,6 @@ class MyString {
> const MyString& operator=(const MyString& rhs);
> 
> public:
>-
> // Clones a 0-terminated C string, allocating memory using new.
> static const char* CloneCString(const char* a_c_string);
> 
>diff --git a/Source/ThirdParty/gtest/samples/sample2_unittest.cc b/Source/ThirdParty/gtest/samples/sample2_unittest.cc
>index 32232d98c0bd254821c8f691a6b855f1f1616fb8..0848826192cc66fcb7906ef2c0aaef66af843f92 100644
>--- a/Source/ThirdParty/gtest/samples/sample2_unittest.cc
>+++ b/Source/ThirdParty/gtest/samples/sample2_unittest.cc
>@@ -28,9 +28,6 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> // A sample program demonstrating using Google C++ testing framework.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>-
> 
> // This sample shows how to write a more complex unit test for a class
> // that has multiple member functions.
>@@ -41,8 +38,8 @@
> // needed.
> 
> #include "sample2.h"
>-#include <gtest/gtest.h>
>-
>+#include "gtest/gtest.h"
>+namespace {
> // In this example, we test the MyString class (a simple string).
> 
> // Tests the default c'tor.
>@@ -79,7 +76,7 @@ const char kHelloString[] = "Hello, world!";
> // Tests the c'tor that accepts a C string.
> TEST(MyString, ConstructorFromCString) {
> const MyString s(kHelloString);
>- EXPECT_TRUE(strcmp(s.c_string(), kHelloString) == 0);
>+ EXPECT_EQ(0, strcmp(s.c_string(), kHelloString));
> EXPECT_EQ(sizeof(kHelloString)/sizeof(kHelloString[0]) - 1,
> s.Length());
> }
>@@ -88,7 +85,7 @@ TEST(MyString, ConstructorFromCString) {
> TEST(MyString, CopyConstructor) {
> const MyString s1(kHelloString);
> const MyString s2 = s1;
>- EXPECT_TRUE(strcmp(s2.c_string(), kHelloString) == 0);
>+ EXPECT_EQ(0, strcmp(s2.c_string(), kHelloString));
> }
> 
> // Tests the Set method.
>@@ -96,14 +93,15 @@ TEST(MyString, Set) {
> MyString s;
> 
> s.Set(kHelloString);
>- EXPECT_TRUE(strcmp(s.c_string(), kHelloString) == 0);
>+ EXPECT_EQ(0, strcmp(s.c_string(), kHelloString));
> 
> // Set should work when the input pointer is the same as the one
> // already in the MyString object.
> s.Set(s.c_string());
>- EXPECT_TRUE(strcmp(s.c_string(), kHelloString) == 0);
>+ EXPECT_EQ(0, strcmp(s.c_string(), kHelloString));
> 
> // Can we set the MyString to NULL?
> s.Set(NULL);
> EXPECT_STREQ(NULL, s.c_string());
> }
>+} // namespace
>diff --git a/Source/ThirdParty/gtest/samples/sample3-inl.h b/Source/ThirdParty/gtest/samples/sample3-inl.h
>index 46369a076d85c411423acaa98dd455e559ed300a..1a29ce9296a64dfe97a9f7fdc6da86387dc0b75b 100644
>--- a/Source/ThirdParty/gtest/samples/sample3-inl.h
>+++ b/Source/ThirdParty/gtest/samples/sample3-inl.h
>@@ -28,8 +28,6 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> // A sample program demonstrating using Google C++ testing framework.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
> 
> #ifndef GTEST_SAMPLES_SAMPLE3_INL_H_
> #define GTEST_SAMPLES_SAMPLE3_INL_H_
>@@ -60,7 +58,7 @@ class QueueNode {
> private:
> // Creates a node with a given element value. The next pointer is
> // set to NULL.
>- QueueNode(const E& an_element) : element_(an_element), next_(NULL) {}
>+ explicit QueueNode(const E& an_element) : element_(an_element), next_(NULL) {}
> 
> // We disable the default assignment operator and copy c'tor.
> const QueueNode& operator = (const QueueNode&);
>@@ -72,8 +70,7 @@ class QueueNode {
> 
> template <typename E> // E is the element type.
> class Queue {
>-public:
>-
>+ public:
> // Creates an empty queue.
> Queue() : head_(NULL), last_(NULL), size_(0) {}
> 
>@@ -168,6 +165,6 @@ public:
> // We disallow copying a queue.
> Queue(const Queue&);
> const Queue& operator = (const Queue&);
>- };
>+};
> 
> #endif // GTEST_SAMPLES_SAMPLE3_INL_H_
>diff --git a/Source/ThirdParty/gtest/samples/sample3_unittest.cc b/Source/ThirdParty/gtest/samples/sample3_unittest.cc
>index 34c1ca8656eab564181560dbf149d0a2aa92cc1d..e093c2588573f96270a5ed41245ac7e89f485118 100644
>--- a/Source/ThirdParty/gtest/samples/sample3_unittest.cc
>+++ b/Source/ThirdParty/gtest/samples/sample3_unittest.cc
>@@ -28,9 +28,6 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> // A sample program demonstrating using Google C++ testing framework.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>-
> 
> // In this example, we use a more advanced feature of Google Test called
> // test fixture.
>@@ -64,15 +61,15 @@
> // </TechnicalDetails>
> 
> #include "sample3-inl.h"
>-#include <gtest/gtest.h>
>-
>+#include "gtest/gtest.h"
>+namespace {
> // To use a test fixture, derive a class from testing::Test.
>-class QueueTest : public testing::Test {
>+class QueueTestSmpl3 : public testing::Test {
> protected: // You should make the members protected s.t. they can be
> // accessed from sub-classes.
> 
> // virtual void SetUp() will be called before each test is run. You
>- // should define it if you need to initialize the varaibles.
>+ // should define it if you need to initialize the variables.
> // Otherwise, this can be skipped.
> virtual void SetUp() {
> q1_.Enqueue(1);
>@@ -120,13 +117,13 @@ class QueueTest : public testing::Test {
> // instead of TEST.
> 
> // Tests the default c'tor.
>-TEST_F(QueueTest, DefaultConstructor) {
>+TEST_F(QueueTestSmpl3, DefaultConstructor) {
> // You can access data in the test fixture here.
> EXPECT_EQ(0u, q0_.Size());
> }
> 
> // Tests Dequeue().
>-TEST_F(QueueTest, Dequeue) {
>+TEST_F(QueueTestSmpl3, Dequeue) {
> int * n = q0_.Dequeue();
> EXPECT_TRUE(n == NULL);
> 
>@@ -144,8 +141,9 @@ TEST_F(QueueTest, Dequeue) {
> }
> 
> // Tests the Queue::Map() function.
>-TEST_F(QueueTest, Map) {
>+TEST_F(QueueTestSmpl3, Map) {
> MapTester(&q0_);
> MapTester(&q1_);
> MapTester(&q2_);
> }
>+} // namespace
>diff --git a/Source/ThirdParty/gtest/samples/sample4.cc b/Source/ThirdParty/gtest/samples/sample4.cc
>index ae44bda6f1bad53ff3c6f14e0302bd3bb309cba7..b0ee6093b4a250cf11936ccc8208a612291b8140 100644
>--- a/Source/ThirdParty/gtest/samples/sample4.cc
>+++ b/Source/ThirdParty/gtest/samples/sample4.cc
>@@ -28,8 +28,6 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> // A sample program demonstrating using Google C++ testing framework.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
> 
> #include <stdio.h>
> 
>@@ -40,6 +38,16 @@ int Counter::Increment() {
> return counter_++;
> }
> 
>+// Returns the current counter value, and decrements it.
>+// counter can not be less than 0, return 0 in this case
>+int Counter::Decrement() {
>+ if (counter_ == 0) {
>+ return counter_;
>+ } else {
>+ return counter_--;
>+ }
>+}
>+
> // Prints the current counter value to STDOUT.
> void Counter::Print() const {
> printf("%d", counter_);
>diff --git a/Source/ThirdParty/gtest/samples/sample4.h b/Source/ThirdParty/gtest/samples/sample4.h
>index cd60f0dd2d1860737b7f0ea45c5675a3a8ea721f..e256f4064fe91a7f01a94550d32c3bb11b0a4fff 100644
>--- a/Source/ThirdParty/gtest/samples/sample4.h
>+++ b/Source/ThirdParty/gtest/samples/sample4.h
>@@ -28,9 +28,6 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> // A sample program demonstrating using Google C++ testing framework.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>-
> #ifndef GTEST_SAMPLES_SAMPLE4_H_
> #define GTEST_SAMPLES_SAMPLE4_H_
> 
>@@ -46,6 +43,9 @@ class Counter {
> // Returns the current counter value, and increments it.
> int Increment();
> 
>+ // Returns the current counter value, and decrements it.
>+ int Decrement();
>+
> // Prints the current counter value to STDOUT.
> void Print() const;
> };
>diff --git a/Source/ThirdParty/gtest/samples/sample4_unittest.cc b/Source/ThirdParty/gtest/samples/sample4_unittest.cc
>index b4fb3736abbff83f79af447ca4bc6b910586932e..d5144c0d00f5c7600693ea025802c0d7d5250d2e 100644
>--- a/Source/ThirdParty/gtest/samples/sample4_unittest.cc
>+++ b/Source/ThirdParty/gtest/samples/sample4_unittest.cc
>@@ -26,20 +26,28 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
> 
>-#include <gtest/gtest.h>
>+
> #include "sample4.h"
>+#include "gtest/gtest.h"
> 
>+namespace {
> // Tests the Increment() method.
>+
> TEST(Counter, Increment) {
> Counter c;
> 
>+ // Test that counter 0 returns 0
>+ EXPECT_EQ(0, c.Decrement());
>+
> // EXPECT_EQ() evaluates its arguments exactly once, so they
> // can have side effects.
> 
> EXPECT_EQ(0, c.Increment());
> EXPECT_EQ(1, c.Increment());
> EXPECT_EQ(2, c.Increment());
>+
>+ EXPECT_EQ(3, c.Decrement());
> }
>+
>+} // namespace
>diff --git a/Source/ThirdParty/gtest/samples/sample5_unittest.cc b/Source/ThirdParty/gtest/samples/sample5_unittest.cc
>index 49dae7c69fa76e8a48607706b4a162c642f0a085..d8a8788c6d0fda238646fea290e097cc76277855 100644
>--- a/Source/ThirdParty/gtest/samples/sample5_unittest.cc
>+++ b/Source/ThirdParty/gtest/samples/sample5_unittest.cc
>@@ -26,8 +26,7 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>+
> 
> // This sample teaches how to reuse a test fixture in multiple test
> // cases by deriving sub-fixtures from it.
>@@ -46,10 +45,10 @@
> 
> #include <limits.h>
> #include <time.h>
>-#include "sample3-inl.h"
>-#include <gtest/gtest.h>
>+#include "gtest/gtest.h"
> #include "sample1.h"
>-
>+#include "sample3-inl.h"
>+namespace {
> // In this sample, we want to ensure that every test finishes within
> // ~5 seconds. If a test takes longer to run, we consider it a
> // failure.
>@@ -101,7 +100,7 @@ TEST_F(IntegerFunctionTest, Factorial) {
> // Tests factorial of negative numbers.
> EXPECT_EQ(1, Factorial(-5));
> EXPECT_EQ(1, Factorial(-1));
>- EXPECT_TRUE(Factorial(-10) > 0);
>+ EXPECT_GT(Factorial(-10), 0);
> 
> // Tests factorial of 0.
> EXPECT_EQ(1, Factorial(0));
>@@ -117,20 +116,20 @@ TEST_F(IntegerFunctionTest, Factorial) {
> // Tests IsPrime()
> TEST_F(IntegerFunctionTest, IsPrime) {
> // Tests negative input.
>- EXPECT_TRUE(!IsPrime(-1));
>- EXPECT_TRUE(!IsPrime(-2));
>- EXPECT_TRUE(!IsPrime(INT_MIN));
>+ EXPECT_FALSE(IsPrime(-1));
>+ EXPECT_FALSE(IsPrime(-2));
>+ EXPECT_FALSE(IsPrime(INT_MIN));
> 
> // Tests some trivial cases.
>- EXPECT_TRUE(!IsPrime(0));
>- EXPECT_TRUE(!IsPrime(1));
>+ EXPECT_FALSE(IsPrime(0));
>+ EXPECT_FALSE(IsPrime(1));
> EXPECT_TRUE(IsPrime(2));
> EXPECT_TRUE(IsPrime(3));
> 
> // Tests positive input.
>- EXPECT_TRUE(!IsPrime(4));
>+ EXPECT_FALSE(IsPrime(4));
> EXPECT_TRUE(IsPrime(5));
>- EXPECT_TRUE(!IsPrime(6));
>+ EXPECT_FALSE(IsPrime(6));
> EXPECT_TRUE(IsPrime(23));
> }
> 
>@@ -191,7 +190,7 @@ TEST_F(QueueTest, Dequeue) {
> EXPECT_EQ(1u, q2_.Size());
> delete n;
> }
>-
>+} // namespace
> // If necessary, you can derive further test fixtures from a derived
> // fixture itself. For example, you can derive another fixture from
> // QueueTest. Google Test imposes no limit on how deep the hierarchy
>diff --git a/Source/ThirdParty/gtest/samples/sample6_unittest.cc b/Source/ThirdParty/gtest/samples/sample6_unittest.cc
>index dd0df31f0bb7cbf261607342e86404d75a85343e..ddf2f1c13bbe03481344936b0a72dbb2a0b28424 100644
>--- a/Source/ThirdParty/gtest/samples/sample6_unittest.cc
>+++ b/Source/ThirdParty/gtest/samples/sample6_unittest.cc
>@@ -26,8 +26,7 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>+
> 
> // This sample shows how to test common properties of multiple
> // implementations of the same interface (aka interface tests).
>@@ -35,8 +34,8 @@
> // The interface and its implementations are in this header.
> #include "prime_tables.h"
> 
>-#include <gtest/gtest.h>
>-
>+#include "gtest/gtest.h"
>+namespace {
> // First, we define some factory functions for creating instances of
> // the implementations. You may be able to skip this step if all your
> // implementations can be constructed the same way.
>@@ -222,3 +221,4 @@ INSTANTIATE_TYPED_TEST_CASE_P(OnTheFlyAndPreCalculated, // Instance name
> PrimeTableImplementations); // Type list
> 
> #endif // GTEST_HAS_TYPED_TEST_P
>+} // namespace
>diff --git a/Source/ThirdParty/gtest/samples/sample7_unittest.cc b/Source/ThirdParty/gtest/samples/sample7_unittest.cc
>index f4552827ed9b8306cdd319aa57f3ed06762b4f5f..c1ae8bdedc9afc9a11d0d92021ef7677d398a9c9 100644
>--- a/Source/ThirdParty/gtest/samples/sample7_unittest.cc
>+++ b/Source/ThirdParty/gtest/samples/sample7_unittest.cc
>@@ -26,8 +26,7 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: vladl@google.com (Vlad Losev)
>+
> 
> // This sample shows how to test common properties of multiple
> // implementations of an interface (aka interface tests) using
>@@ -38,19 +37,17 @@
> // The interface and its implementations are in this header.
> #include "prime_tables.h"
> 
>-#include <gtest/gtest.h>
>-
>-#if GTEST_HAS_PARAM_TEST
>+#include "gtest/gtest.h"
>+namespace {
> 
> using ::testing::TestWithParam;
> using ::testing::Values;
> 
>-// As a general rule, tested objects should not be reused between tests.
>-// Also, their constructors and destructors of tested objects can have
>-// side effects. Thus you should create and destroy them for each test.
>-// In this sample we will define a simple factory function for PrimeTable
>-// objects. We will instantiate objects in test's SetUp() method and
>-// delete them in TearDown() method.
>+// As a general rule, to prevent a test from affecting the tests that come
>+// after it, you should create and destroy the tested objects for each test
>+// instead of reusing them. In this sample we will define a simple factory
>+// function for PrimeTable objects. We will instantiate objects in test's
>+// SetUp() method and delete them in TearDown() method.
> typedef PrimeTable* CreatePrimeTableFunc();
> 
> PrimeTable* CreateOnTheFlyPrimeTable() {
>@@ -62,14 +59,13 @@ PrimeTable* CreatePreCalculatedPrimeTable() {
> return new PreCalculatedPrimeTable(max_precalculated);
> }
> 
>-// Inside the test body, fixture constructor, SetUp(), and TearDown()
>-// you can refer to the test parameter by GetParam().
>-// In this case, the test parameter is a PrimeTableFactory interface pointer
>-// which we use in fixture's SetUp() to create and store an instance of
>-// PrimeTable.
>-class PrimeTableTest : public TestWithParam<CreatePrimeTableFunc*> {
>+// Inside the test body, fixture constructor, SetUp(), and TearDown() you
>+// can refer to the test parameter by GetParam(). In this case, the test
>+// parameter is a factory function which we call in fixture's SetUp() to
>+// create and store an instance of PrimeTable.
>+class PrimeTableTestSmpl7 : public TestWithParam<CreatePrimeTableFunc*> {
> public:
>- virtual ~PrimeTableTest() { delete table_; }
>+ virtual ~PrimeTableTestSmpl7() { delete table_; }
> virtual void SetUp() { table_ = (*GetParam())(); }
> virtual void TearDown() {
> delete table_;
>@@ -80,7 +76,7 @@ class PrimeTableTest : public TestWithParam<CreatePrimeTableFunc*> {
> PrimeTable* table_;
> };
> 
>-TEST_P(PrimeTableTest, ReturnsFalseForNonPrimes) {
>+TEST_P(PrimeTableTestSmpl7, ReturnsFalseForNonPrimes) {
> EXPECT_FALSE(table_->IsPrime(-5));
> EXPECT_FALSE(table_->IsPrime(0));
> EXPECT_FALSE(table_->IsPrime(1));
>@@ -89,7 +85,7 @@ TEST_P(PrimeTableTest, ReturnsFalseForNonPrimes) {
> EXPECT_FALSE(table_->IsPrime(100));
> }
> 
>-TEST_P(PrimeTableTest, ReturnsTrueForPrimes) {
>+TEST_P(PrimeTableTestSmpl7, ReturnsTrueForPrimes) {
> EXPECT_TRUE(table_->IsPrime(2));
> EXPECT_TRUE(table_->IsPrime(3));
> EXPECT_TRUE(table_->IsPrime(5));
>@@ -98,7 +94,7 @@ TEST_P(PrimeTableTest, ReturnsTrueForPrimes) {
> EXPECT_TRUE(table_->IsPrime(131));
> }
> 
>-TEST_P(PrimeTableTest, CanGetNextPrime) {
>+TEST_P(PrimeTableTestSmpl7, CanGetNextPrime) {
> EXPECT_EQ(2, table_->GetNextPrime(0));
> EXPECT_EQ(3, table_->GetNextPrime(2));
> EXPECT_EQ(5, table_->GetNextPrime(3));
>@@ -114,19 +110,8 @@ TEST_P(PrimeTableTest, CanGetNextPrime) {
> //
> // Here, we instantiate our tests with a list of two PrimeTable object
> // factory functions:
>-INSTANTIATE_TEST_CASE_P(
>- OnTheFlyAndPreCalculated,
>- PrimeTableTest,
>- Values(&CreateOnTheFlyPrimeTable, &CreatePreCalculatedPrimeTable<1000>));
>-
>-#else
>-
>-// Google Test may not support value-parameterized tests with some
>-// compilers. If we use conditional compilation to compile out all
>-// code referring to the gtest_main library, MSVC linker will not link
>-// that library at all and consequently complain about missing entry
>-// point defined in that library (fatal error LNK1561: entry point
>-// must be defined). This dummy test keeps gtest_main linked in.
>-TEST(DummyTest, ValueParameterizedTestsAreNotSupportedOnThisPlatform) {}
>+INSTANTIATE_TEST_CASE_P(OnTheFlyAndPreCalculated, PrimeTableTestSmpl7,
>+ Values(&CreateOnTheFlyPrimeTable,
>+ &CreatePreCalculatedPrimeTable<1000>));
> 
>-#endif // GTEST_HAS_PARAM_TEST
>+} // namespace
>diff --git a/Source/ThirdParty/gtest/samples/sample8_unittest.cc b/Source/ThirdParty/gtest/samples/sample8_unittest.cc
>index ccf61d92b85c312f7f2ec2f6d8a673dff4b02d66..ce75cf030870c376dfec6031db247110870383f6 100644
>--- a/Source/ThirdParty/gtest/samples/sample8_unittest.cc
>+++ b/Source/ThirdParty/gtest/samples/sample8_unittest.cc
>@@ -26,8 +26,7 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: vladl@google.com (Vlad Losev)
>+
> 
> // This sample shows how to test code relying on some global flag variables.
> // Combine() helps with generating all possible combinations of such flags,
>@@ -36,8 +35,8 @@
> // Use class definitions to test from this header.
> #include "prime_tables.h"
> 
>-#include <gtest/gtest.h>
>-
>+#include "gtest/gtest.h"
>+namespace {
> #if GTEST_HAS_COMBINE
> 
> // Suppose we want to introduce a new, improved implementation of PrimeTable
>@@ -90,7 +89,7 @@ using ::testing::Combine;
> // PreCalculatedPrimeTable disabled. We do this by defining fixture which will
> // accept different combinations of parameters for instantiating a
> // HybridPrimeTable instance.
>-class PrimeTableTest : public TestWithParam< ::std::tr1::tuple<bool, int> > {
>+class PrimeTableTest : public TestWithParam< ::testing::tuple<bool, int> > {
> protected:
> virtual void SetUp() {
> // This can be written as
>@@ -101,8 +100,8 @@ class PrimeTableTest : public TestWithParam< ::std::tr1::tuple<bool, int> > {
> //
> // once the Google C++ Style Guide allows use of ::std::tr1::tie.
> //
>- bool force_on_the_fly = ::std::tr1::get<0>(GetParam());
>- int max_precalculated = ::std::tr1::get<1>(GetParam());
>+ bool force_on_the_fly = ::testing::get<0>(GetParam());
>+ int max_precalculated = ::testing::get<1>(GetParam());
> table_ = new HybridPrimeTable(force_on_the_fly, max_precalculated);
> }
> virtual void TearDown() {
>@@ -171,3 +170,4 @@ INSTANTIATE_TEST_CASE_P(MeaningfulTestParameters,
> TEST(DummyTest, CombineIsNotSupportedOnThisPlatform) {}
> 
> #endif // GTEST_HAS_COMBINE
>+} // namespace
>diff --git a/Source/ThirdParty/gtest/samples/sample9_unittest.cc b/Source/ThirdParty/gtest/samples/sample9_unittest.cc
>index d828ef4d86b746b25697bdd46d2100a446142d31..53f9af5ba1dfc269566078f236f695599dc52ada 100644
>--- a/Source/ThirdParty/gtest/samples/sample9_unittest.cc
>+++ b/Source/ThirdParty/gtest/samples/sample9_unittest.cc
>@@ -25,8 +25,7 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: vladl@google.com (Vlad Losev)
>+
> 
> // This sample shows how to use Google Test listener API to implement
> // an alternative console output and how to use the UnitTest reflection API
>@@ -34,7 +33,7 @@
> 
> #include <stdio.h>
> 
>-#include <gtest/gtest.h>
>+#include "gtest/gtest.h"
> 
> using ::testing::EmptyTestEventListener;
> using ::testing::InitGoogleTest;
>@@ -44,9 +43,7 @@ using ::testing::TestEventListeners;
> using ::testing::TestInfo;
> using ::testing::TestPartResult;
> using ::testing::UnitTest;
>-
> namespace {
>-
> // Provides alternative output mode which produces minimal amount of
> // information about tests.
> class TersePrinter : public EmptyTestEventListener {
>@@ -69,7 +66,7 @@ class TersePrinter : public EmptyTestEventListener {
> fflush(stdout);
> }
> 
>- // Called after a failed assertion or a SUCCESS().
>+ // Called after a failed assertion or a SUCCEED() invocation.
> virtual void OnTestPartResult(const TestPartResult& test_part_result) {
> fprintf(stdout,
> "%s in %s:%d\n%s\n",
>@@ -102,7 +99,6 @@ TEST(CustomOutputTest, Fails) {
> EXPECT_EQ(1, 2)
> << "This test fails in order to demonstrate alternative failure messages";
> }
>-
> } // namespace
> 
> int main(int argc, char **argv) {
>diff --git a/Source/ThirdParty/gtest/scripts/common.py b/Source/ThirdParty/gtest/scripts/common.py
>new file mode 100644
>index 0000000000000000000000000000000000000000..3c0347a75bdff3188097745015a5803764ad741c
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/scripts/common.py
>@@ -0,0 +1,83 @@
>+# Copyright 2013 Google Inc. All Rights Reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+"""Shared utilities for writing scripts for Google Test/Mock."""
>+
>+__author__ = 'wan@google.com (Zhanyong Wan)'
>+
>+
>+import os
>+import re
>+
>+
>+# Matches the line from 'svn info .' output that describes what SVN
>+# path the current local directory corresponds to. For example, in
>+# a googletest SVN workspace's trunk/test directory, the output will be:
>+#
>+# URL: https://googletest.googlecode.com/svn/trunk/test
>+_SVN_INFO_URL_RE = re.compile(r'^URL: https://(\w+)\.googlecode\.com/svn(.*)')
>+
>+
>+def GetCommandOutput(command):
>+ """Runs the shell command and returns its stdout as a list of lines."""
>+
>+ f = os.popen(command, 'r')
>+ lines = [line.strip() for line in f.readlines()]
>+ f.close()
>+ return lines
>+
>+
>+def GetSvnInfo():
>+ """Returns the project name and the current SVN workspace's root path."""
>+
>+ for line in GetCommandOutput('svn info .'):
>+ m = _SVN_INFO_URL_RE.match(line)
>+ if m:
>+ project = m.group(1) # googletest or googlemock
>+ rel_path = m.group(2)
>+ root = os.path.realpath(rel_path.count('/') * '../')
>+ return project, root
>+
>+ return None, None
>+
>+
>+def GetSvnTrunk():
>+ """Returns the current SVN workspace's trunk root path."""
>+
>+ _, root = GetSvnInfo()
>+ return root + '/trunk' if root else None
>+
>+
>+def IsInGTestSvn():
>+ project, _ = GetSvnInfo()
>+ return project == 'googletest'
>+
>+
>+def IsInGMockSvn():
>+ project, _ = GetSvnInfo()
>+ return project == 'googlemock'
>diff --git a/Source/ThirdParty/gtest/scripts/fuse_gtest_files.py b/Source/ThirdParty/gtest/scripts/fuse_gtest_files.py
>index 148444ca711b1edaaafea8d7826d3cfd4c01de0b..d0dd464fe8b59c5410a3d1b85db4795bbd031d89 100755
>--- a/Source/ThirdParty/gtest/scripts/fuse_gtest_files.py
>+++ b/Source/ThirdParty/gtest/scripts/fuse_gtest_files.py
>@@ -52,7 +52,7 @@ EXAMPLES
> This tool is experimental. In particular, it assumes that there is no
> conditional inclusion of Google Test headers. Please report any
> problems to googletestframework@googlegroups.com. You can read
>-http://code.google.com/p/googletest/wiki/GoogleTestAdvancedGuide for
>+https://github.com/google/googletest/blob/master/googletest/docs/advanced.md for
> more information.
> """
> 
>@@ -60,15 +60,18 @@ __author__ = 'wan@google.com (Zhanyong Wan)'
> 
> import os
> import re
>-import sets
>+try:
>+ from sets import Set as set # For Python 2.3 compatibility
>+except ImportError:
>+ pass
> import sys
> 
> # We assume that this file is in the scripts/ directory in the Google
> # Test root directory.
> DEFAULT_GTEST_ROOT_DIR = os.path.join(os.path.dirname(__file__), '..')
> 
>-# Regex for matching '#include <gtest/...>'.
>-INCLUDE_GTEST_FILE_REGEX = re.compile(r'^\s*#\s*include\s*<(gtest/.+)>')
>+# Regex for matching '#include "gtest/..."'.
>+INCLUDE_GTEST_FILE_REGEX = re.compile(r'^\s*#\s*include\s*"(gtest/.+)"')
> 
> # Regex for matching '#include "src/..."'.
> INCLUDE_SRC_FILE_REGEX = re.compile(r'^\s*#\s*include\s*"(src/.+)"')
>@@ -90,10 +93,10 @@ def VerifyFileExists(directory, relative_path):
> """
> 
> if not os.path.isfile(os.path.join(directory, relative_path)):
>- print 'ERROR: Cannot find %s in directory %s.' % (relative_path,
>- directory)
>- print ('Please either specify a valid project root directory '
>- 'or omit it on the command line.')
>+ print('ERROR: Cannot find %s in directory %s.' % (relative_path,
>+ directory))
>+ print('Please either specify a valid project root directory '
>+ 'or omit it on the command line.')
> sys.exit(1)
> 
> 
>@@ -119,11 +122,11 @@ def VerifyOutputFile(output_dir, relative_path):
> # TODO(wan@google.com): The following user-interaction doesn't
> # work with automated processes. We should provide a way for the
> # Makefile to force overwriting the files.
>- print ('%s already exists in directory %s - overwrite it? (y/N) ' %
>- (relative_path, output_dir))
>+ print('%s already exists in directory %s - overwrite it? (y/N) ' %
>+ (relative_path, output_dir))
> answer = sys.stdin.readline().strip()
> if answer not in ['y', 'Y']:
>- print 'ABORTED.'
>+ print('ABORTED.')
> sys.exit(1)
> 
> # Makes sure the directory holding the output file exists; creates
>@@ -146,8 +149,8 @@ def ValidateOutputDir(output_dir):
> def FuseGTestH(gtest_root, output_dir):
> """Scans folder gtest_root to generate gtest/gtest.h in output_dir."""
> 
>- output_file = file(os.path.join(output_dir, GTEST_H_OUTPUT), 'w')
>- processed_files = sets.Set() # Holds all gtest headers we've processed.
>+ output_file = open(os.path.join(output_dir, GTEST_H_OUTPUT), 'w')
>+ processed_files = set() # Holds all gtest headers we've processed.
> 
> def ProcessFile(gtest_header_path):
> """Processes the given gtest header file."""
>@@ -159,10 +162,10 @@ def FuseGTestH(gtest_root, output_dir):
> processed_files.add(gtest_header_path)
> 
> # Reads each line in the given gtest header.
>- for line in file(os.path.join(gtest_root, gtest_header_path), 'r'):
>+ for line in open(os.path.join(gtest_root, gtest_header_path), 'r'):
> m = INCLUDE_GTEST_FILE_REGEX.match(line)
> if m:
>- # It's '#include <gtest/...>' - let's process it recursively.
>+ # It's '#include "gtest/..."' - let's process it recursively.
> ProcessFile('include/' + m.group(1))
> else:
> # Otherwise we copy the line unchanged to the output file.
>@@ -175,7 +178,7 @@ def FuseGTestH(gtest_root, output_dir):
> def FuseGTestAllCcToFile(gtest_root, output_file):
> """Scans folder gtest_root to generate gtest/gtest-all.cc in output_file."""
> 
>- processed_files = sets.Set()
>+ processed_files = set()
> 
> def ProcessFile(gtest_source_file):
> """Processes the given gtest source file."""
>@@ -187,23 +190,23 @@ def FuseGTestAllCcToFile(gtest_root, output_file):
> processed_files.add(gtest_source_file)
> 
> # Reads each line in the given gtest source file.
>- for line in file(os.path.join(gtest_root, gtest_source_file), 'r'):
>+ for line in open(os.path.join(gtest_root, gtest_source_file), 'r'):
> m = INCLUDE_GTEST_FILE_REGEX.match(line)
> if m:
> if 'include/' + m.group(1) == GTEST_SPI_H_SEED:
>- # It's '#include <gtest/gtest-spi.h>'. This file is not
>- # #included by <gtest/gtest.h>, so we need to process it.
>+ # It's '#include "gtest/gtest-spi.h"'. This file is not
>+ # #included by "gtest/gtest.h", so we need to process it.
> ProcessFile(GTEST_SPI_H_SEED)
> else:
>- # It's '#include <gtest/foo.h>' where foo is not gtest-spi.
>- # We treat it as '#include <gtest/gtest.h>', as all other
>+ # It's '#include "gtest/foo.h"' where foo is not gtest-spi.
>+ # We treat it as '#include "gtest/gtest.h"', as all other
> # gtest headers are being fused into gtest.h and cannot be
> # #included directly.
> 
>- # There is no need to #include <gtest/gtest.h> more than once.
>+ # There is no need to #include "gtest/gtest.h" more than once.
> if not GTEST_H_SEED in processed_files:
> processed_files.add(GTEST_H_SEED)
>- output_file.write('#include <%s>\n' % (GTEST_H_OUTPUT,))
>+ output_file.write('#include "%s"\n' % (GTEST_H_OUTPUT,))
> else:
> m = INCLUDE_SRC_FILE_REGEX.match(line)
> if m:
>@@ -218,7 +221,7 @@ def FuseGTestAllCcToFile(gtest_root, output_file):
> def FuseGTestAllCc(gtest_root, output_dir):
> """Scans folder gtest_root to generate gtest/gtest-all.cc in output_dir."""
> 
>- output_file = file(os.path.join(output_dir, GTEST_ALL_CC_OUTPUT), 'w')
>+ output_file = open(os.path.join(output_dir, GTEST_ALL_CC_OUTPUT), 'w')
> FuseGTestAllCcToFile(gtest_root, output_file)
> output_file.close()
> 
>@@ -242,7 +245,7 @@ def main():
> # fuse_gtest_files.py GTEST_ROOT_DIR OUTPUT_DIR
> FuseGTest(sys.argv[1], sys.argv[2])
> else:
>- print __doc__
>+ print(__doc__)
> sys.exit(1)
> 
> 
>diff --git a/Source/ThirdParty/gtest/scripts/gen_gtest_pred_impl.py b/Source/ThirdParty/gtest/scripts/gen_gtest_pred_impl.py
>index 8307134adaf4da2be8fa2332291520d39c94bb12..b43efdf41e5c02740f72b35532be5cf049794835 100755
>--- a/Source/ThirdParty/gtest/scripts/gen_gtest_pred_impl.py
>+++ b/Source/ThirdParty/gtest/scripts/gen_gtest_pred_impl.py
>@@ -115,10 +115,9 @@ def HeaderPreamble(n):
> #ifndef GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
> #define GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
> 
>-// Makes sure this header is not included before gtest.h.
>-#ifndef GTEST_INCLUDE_GTEST_GTEST_H_
>-#error Do not include gtest_pred_impl.h directly. Include gtest.h instead.
>-#endif // GTEST_INCLUDE_GTEST_GTEST_H_
>+#include "gtest/gtest.h"
>+
>+namespace testing {
> 
> // This header implements a family of generic predicate assertion
> // macros:
>@@ -238,27 +237,25 @@ AssertionResult AssertPred%(n)sHelper(const char* pred_text""" % DEFS
> impl += """) {
> if (pred(%(vs)s)) return AssertionSuccess();
> 
>- Message msg;
> """ % DEFS
> 
>- impl += ' msg << pred_text << "("'
>+ impl += ' return AssertionFailure() << pred_text << "("'
> 
> impl += Iter(n, """
>- << e%s""", sep=' << ", "')
>+ << e%s""", sep=' << ", "')
> 
> impl += ' << ") evaluates to false, where"'
> 
> impl += Iter(n, """
>- << "\\n" << e%s << " evaluates to " << v%s""")
>+ << "\\n" << e%s << " evaluates to " << v%s""")
> 
> impl += """;
>- return AssertionFailure(msg);
> }
> 
> // Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT%(n)s.
> // Don't use this in your code.
> #define GTEST_PRED_FORMAT%(n)s_(pred_format, %(vs)s, on_failure)\\
>- GTEST_ASSERT_(pred_format(%(vts)s, %(vs)s),\\
>+ GTEST_ASSERT_(pred_format(%(vts)s, %(vs)s), \\
> on_failure)
> 
> // Internal macro for implementing {EXPECT|ASSERT}_PRED%(n)s. Don't use
>@@ -297,16 +294,17 @@ def HeaderPostamble():
> 
> return """
> 
>+} // namespace testing
>+
> #endif // GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
> """
> 
> 
> def GenerateFile(path, content):
>- """Given a file path and a content string, overwrites it with the
>- given content."""
>-
>+ """Given a file path and a content string
>+ overwrites it with the given content.
>+ """
> print 'Updating file %s . . .' % path
>-
> f = file(path, 'w+')
> print >>f, content,
> f.close()
>@@ -316,8 +314,8 @@ def GenerateFile(path, content):
> 
> def GenerateHeader(n):
> """Given the maximum arity n, updates the header file that implements
>- the predicate assertions."""
>-
>+ the predicate assertions.
>+ """
> GenerateFile(HEADER,
> HeaderPreamble(n)
> + ''.join([ImplementationForArity(i) for i in OneTo(n)])
>@@ -386,8 +384,8 @@ def UnitTestPreamble():
> 
> #include <iostream>
> 
>-#include <gtest/gtest.h>
>-#include <gtest/gtest-spi.h>
>+#include "gtest/gtest.h"
>+#include "gtest/gtest-spi.h"
> 
> // A user-defined data type.
> struct Bool {
>@@ -478,15 +476,14 @@ testing::AssertionResult PredFormatFunction%(n)s(""" % DEFS
> if (PredFunction%(n)s(%(vs)s))
> return testing::AssertionSuccess();
> 
>- testing::Message msg;
>- msg << """ % DEFS
>+ return testing::AssertionFailure()
>+ << """ % DEFS
> 
> tests += Iter(n, 'e%s', sep=' << " + " << ')
> 
> tests += """
> << " is expected to be positive, but evaluates to "
> << %(v_sum)s << ".";
>- return testing::AssertionFailure(msg);
> }
> """ % DEFS
> 
>diff --git a/Source/ThirdParty/gtest/scripts/gtest-config.in b/Source/ThirdParty/gtest/scripts/gtest-config.in
>index 9c7263854b9f863b618c708de1efe0e8b1f7280a..780f8432efcc1aeeaaad0706086d3ff641285b68 100755
>--- a/Source/ThirdParty/gtest/scripts/gtest-config.in
>+++ b/Source/ThirdParty/gtest/scripts/gtest-config.in
>@@ -209,7 +209,7 @@ if test "${this_bindir}" = "${this_bindir%${bindir}}"; then
> # The path to the script doesn't end in the bindir sequence from Autoconf,
> # assume that we are in a build tree.
> build_dir=`dirname ${this_bindir}`
>- src_dir=`cd ${this_bindir}/@top_srcdir@; pwd -P`
>+ src_dir=`cd ${this_bindir}; cd @top_srcdir@; pwd -P`
> 
> # TODO(chandlerc@google.com): This is a dangerous dependency on libtool, we
> # should work to remove it, and/or remove libtool altogether, replacing it
>diff --git a/Source/ThirdParty/gtest/scripts/pump.py b/Source/ThirdParty/gtest/scripts/pump.py
>index f15c1b6ceb4b8b1bb0bf4e83e3ea93b38c785800..5efb653c207d1f1c2aecc4d690bf732e3c1d71ab 100755
>--- a/Source/ThirdParty/gtest/scripts/pump.py
>+++ b/Source/ThirdParty/gtest/scripts/pump.py
>@@ -29,7 +29,7 @@
> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
>-"""pump v0.1 - Pretty Useful for Meta Programming.
>+"""pump v0.2.0 - Pretty Useful for Meta Programming.
> 
> A tool for preprocessor meta programming. Useful for generating
> repetitive boilerplate code. Especially useful for writing C++
>@@ -78,7 +78,6 @@ TOKEN_TABLE = [
> (re.compile(r'\$range\s+'), '$range'),
> (re.compile(r'\$[_A-Za-z]\w*'), '$id'),
> (re.compile(r'\$$\$$'), '$($)'),
>- (re.compile(r'\$\$.*'), '$$'),
> (re.compile(r'\$'), '$'),
> (re.compile(r'\[\[\n?'), '[['),
> (re.compile(r'\]\]\n?'), ']]'),
>@@ -224,6 +223,17 @@ def SubString(lines, start, end):
> return ''.join(result_lines)
> 
> 
>+def StripMetaComments(str):
>+ """Strip meta comments from each line in the given string."""
>+
>+ # First, completely remove lines containing nothing but a meta
>+ # comment, including the trailing \n.
>+ str = re.sub(r'^\s*\$\$.*\n', '', str)
>+
>+ # Then, remove meta comments from contentful lines.
>+ return re.sub(r'\s*\$\$.*', '', str)
>+
>+
> def MakeToken(lines, start, end, token_type):
> """Creates a new instance of Token."""
> 
>@@ -311,11 +321,7 @@ def TokenizeLines(lines, pos):
> prev_token = MakeToken(lines, pos, found.start, 'code')
> prev_token_rstripped = RStripNewLineFromToken(prev_token)
> 
>- if found.token_type == '$$': # A meta comment.
>- if prev_token_rstripped:
>- yield prev_token_rstripped
>- pos = Cursor(found.end.line + 1, 0)
>- elif found.token_type == '$var':
>+ if found.token_type == '$var':
> if prev_token_rstripped:
> yield prev_token_rstripped
> yield found
>@@ -374,8 +380,11 @@ def TokenizeLines(lines, pos):
> 
> 
> def Tokenize(s):
>- lines = s.splitlines(True)
>- return TokenizeLines(lines, Cursor(0, 0))
>+ """A generator that yields the tokens in the given string."""
>+ if s != '':
>+ lines = s.splitlines(True)
>+ for token in TokenizeLines(lines, Cursor(0, 0)):
>+ yield token
> 
> 
> class CodeNode:
>@@ -565,11 +574,9 @@ def ParseCodeNode(tokens):
> return CodeNode(atomic_code_list)
> 
> 
>-def Convert(file_path):
>- s = file(file_path, 'r').read()
>- tokens = []
>- for token in Tokenize(s):
>- tokens.append(token)
>+def ParseToAST(pump_src_text):
>+ """Convert the given Pump source text into an AST."""
>+ tokens = list(Tokenize(pump_src_text))
> code_node = ParseCodeNode(tokens)
> return code_node
> 
>@@ -697,14 +704,14 @@ def RunCode(env, code_node, output):
> RunAtomicCode(env, atomic_code, output)
> 
> 
>-def IsComment(cur_line):
>+def IsSingleLineComment(cur_line):
> return '//' in cur_line
> 
> 
>-def IsInPreprocessorDirevative(prev_lines, cur_line):
>+def IsInPreprocessorDirective(prev_lines, cur_line):
> if cur_line.lstrip().startswith('#'):
> return True
>- return prev_lines != [] and prev_lines[-1].endswith('\\')
>+ return prev_lines and prev_lines[-1].endswith('\\')
> 
> 
> def WrapComment(line, output):
>@@ -761,7 +768,7 @@ def WrapCode(line, line_concat, output):
> output.append(prefix + cur_line.strip())
> 
> 
>-def WrapPreprocessorDirevative(line, output):
>+def WrapPreprocessorDirective(line, output):
> WrapCode(line, ' \\', output)
> 
> 
>@@ -769,29 +776,37 @@ def WrapPlainCode(line, output):
> WrapCode(line, '', output)
> 
> 
>-def IsHeaderGuardOrInclude(line):
>+def IsMultiLineIWYUPragma(line):
>+ return re.search(r'/\* IWYU pragma: ', line)
>+
>+
>+def IsHeaderGuardIncludeOrOneLineIWYUPragma(line):
> return (re.match(r'^#(ifndef|define|endif\s*//)\s*[\w_]+\s*$', line) or
>- re.match(r'^#include\s', line))
>+ re.match(r'^#include\s', line) or
>+ # Don't break IWYU pragmas, either; that causes iwyu.py problems.
>+ re.search(r'// IWYU pragma: ', line))
> 
> 
> def WrapLongLine(line, output):
> line = line.rstrip()
> if len(line) <= 80:
> output.append(line)
>- elif IsComment(line):
>- if IsHeaderGuardOrInclude(line):
>- # The style guide made an exception to allow long header guard lines
>- # and includes.
>+ elif IsSingleLineComment(line):
>+ if IsHeaderGuardIncludeOrOneLineIWYUPragma(line):
>+ # The style guide made an exception to allow long header guard lines,
>+ # includes and IWYU pragmas.
> output.append(line)
> else:
> WrapComment(line, output)
>- elif IsInPreprocessorDirevative(output, line):
>- if IsHeaderGuardOrInclude(line):
>- # The style guide made an exception to allow long header guard lines
>- # and includes.
>+ elif IsInPreprocessorDirective(output, line):
>+ if IsHeaderGuardIncludeOrOneLineIWYUPragma(line):
>+ # The style guide made an exception to allow long header guard lines,
>+ # includes and IWYU pragmas.
> output.append(line)
> else:
>- WrapPreprocessorDirevative(line, output)
>+ WrapPreprocessorDirective(line, output)
>+ elif IsMultiLineIWYUPragma(line):
>+ output.append(line)
> else:
> WrapPlainCode(line, output)
> 
>@@ -805,16 +820,21 @@ def BeautifyCode(string):
> return '\n'.join(output2) + '\n'
> 
> 
>+def ConvertFromPumpSource(src_text):
>+ """Return the text generated from the given Pump source text."""
>+ ast = ParseToAST(StripMetaComments(src_text))
>+ output = Output()
>+ RunCode(Env(), ast, output)
>+ return BeautifyCode(output.string)
>+
>+
> def main(argv):
> if len(argv) == 1:
> print __doc__
> sys.exit(1)
> 
> file_path = argv[-1]
>- ast = Convert(file_path)
>- output = Output()
>- RunCode(Env(), ast, output)
>- output_str = BeautifyCode(output.string)
>+ output_str = ConvertFromPumpSource(file(file_path, 'r').read())
> if file_path.endswith('.pump'):
> output_file_path = file_path[:-5]
> else:
>diff --git a/Source/ThirdParty/gtest/scripts/release_docs.py b/Source/ThirdParty/gtest/scripts/release_docs.py
>new file mode 100755
>index 0000000000000000000000000000000000000000..1291347f674afd7af849615a75b138d5293f9cf4
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/scripts/release_docs.py
>@@ -0,0 +1,158 @@
>+#!/usr/bin/env python
>+#
>+# Copyright 2013 Google Inc. All Rights Reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+"""Script for branching Google Test/Mock wiki pages for a new version.
>+
>+SYNOPSIS
>+ release_docs.py NEW_RELEASE_VERSION
>+
>+ Google Test and Google Mock's external user documentation is in
>+ interlinked wiki files. When we release a new version of
>+ Google Test or Google Mock, we need to branch the wiki files
>+ such that users of a specific version of Google Test/Mock can
>+ look up documenation relevant for that version. This script
>+ automates that process by:
>+
>+ - branching the current wiki pages (which document the
>+ behavior of the SVN trunk head) to pages for the specified
>+ version (e.g. branching FAQ.wiki to V2_6_FAQ.wiki when
>+ NEW_RELEASE_VERSION is 2.6);
>+ - updating the links in the branched files to point to the branched
>+ version (e.g. a link in V2_6_FAQ.wiki that pointed to
>+ Primer.wiki#Anchor will now point to V2_6_Primer.wiki#Anchor).
>+
>+ NOTE: NEW_RELEASE_VERSION must be a NEW version number for
>+ which the wiki pages don't yet exist; otherwise you'll get SVN
>+ errors like "svn: Path 'V1_7_PumpManual.wiki' is not a
>+ directory" when running the script.
>+
>+EXAMPLE
>+ $ cd PATH/TO/GTEST_SVN_WORKSPACE/trunk
>+ $ scripts/release_docs.py 2.6 # create wiki pages for v2.6
>+ $ svn status # verify the file list
>+ $ svn diff # verify the file contents
>+ $ svn commit -m "release wiki pages for v2.6"
>+"""
>+
>+__author__ = 'wan@google.com (Zhanyong Wan)'
>+
>+import os
>+import re
>+import sys
>+
>+import common
>+
>+
>+# Wiki pages that shouldn't be branched for every gtest/gmock release.
>+GTEST_UNVERSIONED_WIKIS = ['DevGuide.wiki']
>+GMOCK_UNVERSIONED_WIKIS = [
>+ 'DesignDoc.wiki',
>+ 'DevGuide.wiki',
>+ 'KnownIssues.wiki'
>+ ]
>+
>+
>+def DropWikiSuffix(wiki_filename):
>+ """Removes the .wiki suffix (if any) from the given filename."""
>+
>+ return (wiki_filename[:-len('.wiki')] if wiki_filename.endswith('.wiki')
>+ else wiki_filename)
>+
>+
>+class WikiBrancher(object):
>+ """Branches ..."""
>+
>+ def __init__(self, dot_version):
>+ self.project, svn_root_path = common.GetSvnInfo()
>+ if self.project not in ('googletest', 'googlemock'):
>+ sys.exit('This script must be run in a gtest or gmock SVN workspace.')
>+ self.wiki_dir = svn_root_path + '/wiki'
>+ # Turn '2.6' to 'V2_6_'.
>+ self.version_prefix = 'V' + dot_version.replace('.', '_') + '_'
>+ self.files_to_branch = self.GetFilesToBranch()
>+ page_names = [DropWikiSuffix(f) for f in self.files_to_branch]
>+ # A link to Foo.wiki is in one of the following forms:
>+ # [Foo words]
>+ # [Foo#Anchor words]
>+ # [http://code.google.com/.../wiki/Foo words]
>+ # [http://code.google.com/.../wiki/Foo#Anchor words]
>+ # We want to replace 'Foo' with 'V2_6_Foo' in the above cases.
>+ self.search_for_re = re.compile(
>+ # This regex matches either
>+ # [Foo
>+ # or
>+ # /wiki/Foo
>+ # followed by a space or a #, where Foo is the name of an
>+ # unversioned wiki page.
>+ r'(\[|/wiki/)(%s)([ #])' % '|'.join(page_names))
>+ self.replace_with = r'\1%s\2\3' % (self.version_prefix,)
>+
>+ def GetFilesToBranch(self):
>+ """Returns a list of .wiki file names that need to be branched."""
>+
>+ unversioned_wikis = (GTEST_UNVERSIONED_WIKIS if self.project == 'googletest'
>+ else GMOCK_UNVERSIONED_WIKIS)
>+ return [f for f in os.listdir(self.wiki_dir)
>+ if (f.endswith('.wiki') and
>+ not re.match(r'^V\d', f) and # Excluded versioned .wiki files.
>+ f not in unversioned_wikis)]
>+
>+ def BranchFiles(self):
>+ """Branches the .wiki files needed to be branched."""
>+
>+ print 'Branching %d .wiki files:' % (len(self.files_to_branch),)
>+ os.chdir(self.wiki_dir)
>+ for f in self.files_to_branch:
>+ command = 'svn cp %s %s%s' % (f, self.version_prefix, f)
>+ print command
>+ os.system(command)
>+
>+ def UpdateLinksInBranchedFiles(self):
>+
>+ for f in self.files_to_branch:
>+ source_file = os.path.join(self.wiki_dir, f)
>+ versioned_file = os.path.join(self.wiki_dir, self.version_prefix + f)
>+ print 'Updating links in %s.' % (versioned_file,)
>+ text = file(source_file, 'r').read()
>+ new_text = self.search_for_re.sub(self.replace_with, text)
>+ file(versioned_file, 'w').write(new_text)
>+
>+
>+def main():
>+ if len(sys.argv) != 2:
>+ sys.exit(__doc__)
>+
>+ brancher = WikiBrancher(sys.argv[1])
>+ brancher.BranchFiles()
>+ brancher.UpdateLinksInBranchedFiles()
>+
>+
>+if __name__ == '__main__':
>+ main()
>diff --git a/Source/ThirdParty/gtest/scripts/test/Makefile b/Source/ThirdParty/gtest/scripts/test/Makefile
>index ffc0c90ad99572df94afb5b64136a9c29488ae06..cdff584637b7a6e9df1fa43ce8f588c43815e561 100644
>--- a/Source/ThirdParty/gtest/scripts/test/Makefile
>+++ b/Source/ThirdParty/gtest/scripts/test/Makefile
>@@ -21,7 +21,9 @@ SAMPLE_DIR = ../../samples
> GTEST_MAIN_CC = ../../src/gtest_main.cc
> 
> # Flags passed to the preprocessor.
>-CPPFLAGS += -I$(FUSED_GTEST_DIR)
>+# We have no idea here whether pthreads is available in the system, so
>+# disable its use.
>+CPPFLAGS += -I$(FUSED_GTEST_DIR) -DGTEST_HAS_PTHREAD=0
> 
> # Flags passed to the C++ compiler.
> CXXFLAGS += -g
>diff --git a/Source/ThirdParty/gtest/scripts/upload.py b/Source/ThirdParty/gtest/scripts/upload.py
>index 6e6f9a14719ef8c9fdb603ad50bdd35dc7996e2d..c852e4c91e06ef7c49e038683509ffd9495c820f 100755
>--- a/Source/ThirdParty/gtest/scripts/upload.py
>+++ b/Source/ThirdParty/gtest/scripts/upload.py
>@@ -242,7 +242,7 @@ class AbstractRpcServer(object):
> The authentication process works as follows:
> 1) We get a username and password from the user
> 2) We use ClientLogin to obtain an AUTH token for the user
>- (see http://code.google.com/apis/accounts/AuthForInstalledApps.html).
>+ (see https://developers.google.com/identity/protocols/AuthForInstalledApps).
> 3) We pass the auth token to /_ah/login on the server to obtain an
> authentication cookie. If login was successful, it tries to redirect
> us to the URL we provided.
>@@ -506,7 +506,7 @@ def EncodeMultipartFormData(fields, files):
> (content_type, body) ready for httplib.HTTP instance.
> 
> Source:
>- http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/146306
>+ https://web.archive.org/web/20160116052001/code.activestate.com/recipes/146306
> """
> BOUNDARY = '-M-A-G-I-C---B-O-U-N-D-A-R-Y-'
> CRLF = '\r\n'
>@@ -732,7 +732,7 @@ class SubversionVCS(VersionControlSystem):
> else:
> self.rev_start = self.rev_end = None
> # Cache output from "svn list -r REVNO dirname".
>- # Keys: dirname, Values: 2-tuple (ouput for start rev and end rev).
>+ # Keys: dirname, Values: 2-tuple (output for start rev and end rev).
> self.svnls_cache = {}
> # SVN base URL is required to fetch files deleted in an older revision.
> # Result is cached to not guess it over and over again in GetBaseFile().
>@@ -807,7 +807,7 @@ class SubversionVCS(VersionControlSystem):
> # svn cat translates keywords but svn diff doesn't. As a result of this
> # behavior patching.PatchChunks() fails with a chunk mismatch error.
> # This part was originally written by the Review Board development team
>- # who had the same problem (http://reviews.review-board.org/r/276/).
>+ # who had the same problem (https://reviews.reviewboard.org/r/276/).
> # Mapping of keywords to known aliases
> svn_keywords = {
> # Standard keywords
>@@ -860,7 +860,7 @@ class SubversionVCS(VersionControlSystem):
> status_lines = status.splitlines()
> # If file is in a cl, the output will begin with
> # "\n--- Changelist 'cl_name':\n". See
>- # http://svn.collab.net/repos/svn/trunk/notes/changelist-design.txt
>+ # https://web.archive.org/web/20090918234815/svn.collab.net/repos/svn/trunk/notes/changelist-design.txt
> if (len(status_lines) == 3 and
> not status_lines[0] and
> status_lines[1].startswith("--- Changelist")):
>diff --git a/Source/ThirdParty/gtest/src/gtest-all.cc b/Source/ThirdParty/gtest/src/gtest-all.cc
>index fe34765fb67218a56cb5e252a70e68a36bc88d07..b217a18006b0c8bdaf4a9f9b6d06de4fd8ad9eed 100644
>--- a/Source/ThirdParty/gtest/src/gtest-all.cc
>+++ b/Source/ThirdParty/gtest/src/gtest-all.cc
>@@ -26,22 +26,22 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
> //
>-// Author: mheule@google.com (Markus Heule)
>-//
>-// Google C++ Testing Framework (Google Test)
>+// Google C++ Testing and Mocking Framework (Google Test)
> //
> // Sometimes it's desirable to build Google Test by compiling a single file.
> // This file serves this purpose.
> 
> // This line ensures that gtest.h can be compiled on its own, even
> // when it's fused.
>-#include <gtest/gtest.h>
>+#include "gtest/gtest.h"
> 
> // The following lines pull in the real gtest *.cc files.
> #include "src/gtest.cc"
> #include "src/gtest-death-test.cc"
> #include "src/gtest-filepath.cc"
> #include "src/gtest-port.cc"
>+#include "src/gtest-printers.cc"
> #include "src/gtest-test-part.cc"
> #include "src/gtest-typed-test.cc"
>diff --git a/Source/ThirdParty/gtest/src/gtest-death-test.cc b/Source/ThirdParty/gtest/src/gtest-death-test.cc
>index 0cf7825bcac79fa35d0a1248e2308a24aa627b8a..09083551612e3c3b9b3bd7d1ee606c18ffb5f73a 100644
>--- a/Source/ThirdParty/gtest/src/gtest-death-test.cc
>+++ b/Source/ThirdParty/gtest/src/gtest-death-test.cc
>@@ -26,52 +26,65 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan), vladl@google.com (Vlad Losev)
>+
> //
> // This file implements death tests.
> 
>-#include <gtest/gtest-death-test.h>
>-#include <gtest/internal/gtest-port.h>
>+#include "gtest/gtest-death-test.h"
>+#include "gtest/internal/gtest-port.h"
>+#include "gtest/internal/custom/gtest.h"
> 
> #if GTEST_HAS_DEATH_TEST
> 
>-#if GTEST_OS_MAC
>-#include <crt_externs.h>
>-#endif // GTEST_OS_MAC
>+# if GTEST_OS_MAC
>+# include <crt_externs.h>
>+# endif // GTEST_OS_MAC
> 
>-#include <errno.h>
>-#include <fcntl.h>
>-#include <limits.h>
>-#include <stdarg.h>
>+# include <errno.h>
>+# include <fcntl.h>
>+# include <limits.h>
> 
>-#if GTEST_OS_WINDOWS
>-#include <windows.h>
>-#else
>-#include <sys/mman.h>
>-#include <sys/wait.h>
>-#endif // GTEST_OS_WINDOWS
>+# if GTEST_OS_LINUX
>+# include <signal.h>
>+# endif // GTEST_OS_LINUX
> 
>-#endif // GTEST_HAS_DEATH_TEST
>+# include <stdarg.h>
>+
>+# if GTEST_OS_WINDOWS
>+# include <windows.h>
>+# else
>+# include <sys/mman.h>
>+# include <sys/wait.h>
>+# endif // GTEST_OS_WINDOWS
>+
>+# if GTEST_OS_QNX
>+# include <spawn.h>
>+# endif // GTEST_OS_QNX
>+
>+# if GTEST_OS_FUCHSIA
>+# include <lib/fdio/io.h>
>+# include <lib/fdio/spawn.h>
>+# include <zircon/processargs.h>
>+# include <zircon/syscalls.h>
>+# include <zircon/syscalls/port.h>
>+# endif // GTEST_OS_FUCHSIA
> 
>-#include <gtest/gtest-message.h>
>-#include <gtest/internal/gtest-string.h>
>+#endif // GTEST_HAS_DEATH_TEST
> 
>-// Indicates that this translation unit is part of Google Test's
>-// implementation. It must come before gtest-internal-inl.h is
>-// included, or there will be a compiler error. This trick is to
>-// prevent a user from accidentally including gtest-internal-inl.h in
>-// his code.
>-#define GTEST_IMPLEMENTATION_ 1
>+#include "gtest/gtest-message.h"
>+#include "gtest/internal/gtest-string.h"
> #include "src/gtest-internal-inl.h"
>-#undef GTEST_IMPLEMENTATION_
> 
> namespace testing {
> 
> // Constants.
> 
> // The default death test style.
>-static const char kDefaultDeathTestStyle[] = "fast";
>+//
>+// This is defined in internal/gtest-port.h as "fast", but can be overridden by
>+// a definition in internal/custom/gtest-port.h. The recommended value, which is
>+// used internally at Google, is "threadsafe".
>+static const char kDefaultDeathTestStyle[] = GTEST_DEFAULT_DEATH_TEST_STYLE;
> 
> GTEST_DEFINE_string_(
> death_test_style,
>@@ -100,36 +113,79 @@ GTEST_DEFINE_string_(
> "Indicates the file, line number, temporal index of "
> "the single death test to run, and a file descriptor to "
> "which a success code may be sent, all separated by "
>- "colons. This flag is specified if and only if the current "
>+ "the '|' characters. This flag is specified if and only if the current "
> "process is a sub-process launched for running a thread-safe "
> "death test. FOR INTERNAL USE ONLY.");
> } // namespace internal
> 
> #if GTEST_HAS_DEATH_TEST
> 
>+namespace internal {
>+
>+// Valid only for fast death tests. Indicates the code is running in the
>+// child process of a fast style death test.
>+# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
>+static bool g_in_fast_death_test_child = false;
>+# endif
>+
>+// Returns a Boolean value indicating whether the caller is currently
>+// executing in the context of the death test child process. Tools such as
>+// Valgrind heap checkers may need this to modify their behavior in death
>+// tests. IMPORTANT: This is an internal utility. Using it may break the
>+// implementation of death tests. User code MUST NOT use it.
>+bool InDeathTestChild() {
>+# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
>+
>+ // On Windows and Fuchsia, death tests are thread-safe regardless of the value
>+ // of the death_test_style flag.
>+ return !GTEST_FLAG(internal_run_death_test).empty();
>+
>+# else
>+
>+ if (GTEST_FLAG(death_test_style) == "threadsafe")
>+ return !GTEST_FLAG(internal_run_death_test).empty();
>+ else
>+ return g_in_fast_death_test_child;
>+#endif
>+}
>+
>+} // namespace internal
>+
> // ExitedWithCode constructor.
> ExitedWithCode::ExitedWithCode(int exit_code) : exit_code_(exit_code) {
> }
> 
> // ExitedWithCode function-call operator.
> bool ExitedWithCode::operator()(int exit_status) const {
>-#if GTEST_OS_WINDOWS
>+# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
>+
> return exit_status == exit_code_;
>-#else
>+
>+# else
>+
> return WIFEXITED(exit_status) && WEXITSTATUS(exit_status) == exit_code_;
>-#endif // GTEST_OS_WINDOWS
>+
>+# endif // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
> }
> 
>-#if !GTEST_OS_WINDOWS
>+# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
> // KilledBySignal constructor.
> KilledBySignal::KilledBySignal(int signum) : signum_(signum) {
> }
> 
> // KilledBySignal function-call operator.
> bool KilledBySignal::operator()(int exit_status) const {
>+# if defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_)
>+ {
>+ bool result;
>+ if (GTEST_KILLED_BY_SIGNAL_OVERRIDE_(signum_, exit_status, &result)) {
>+ return result;
>+ }
>+ }
>+# endif // defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_)
> return WIFSIGNALED(exit_status) && WTERMSIG(exit_status) == signum_;
> }
>-#endif // !GTEST_OS_WINDOWS
>+# endif // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
> 
> namespace internal {
> 
>@@ -137,22 +193,27 @@ namespace internal {
> 
> // Generates a textual description of a given exit code, in the format
> // specified by wait(2).
>-static String ExitSummary(int exit_code) {
>+static std::string ExitSummary(int exit_code) {
> Message m;
>-#if GTEST_OS_WINDOWS
>+
>+# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
>+
> m << "Exited with exit status " << exit_code;
>-#else
>+
>+# else
>+
> if (WIFEXITED(exit_code)) {
> m << "Exited with exit status " << WEXITSTATUS(exit_code);
> } else if (WIFSIGNALED(exit_code)) {
> m << "Terminated by signal " << WTERMSIG(exit_code);
> }
>-#ifdef WCOREDUMP
>+# ifdef WCOREDUMP
> if (WCOREDUMP(exit_code)) {
> m << " (core dumped)";
> }
>-#endif
>-#endif // GTEST_OS_WINDOWS
>+# endif
>+# endif // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
>+
> return m.GetString();
> }
> 
>@@ -162,42 +223,59 @@ bool ExitedUnsuccessfully(int exit_status) {
> return !ExitedWithCode(0)(exit_status);
> }
> 
>-#if !GTEST_OS_WINDOWS
>+# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
> // Generates a textual failure message when a death test finds more than
> // one thread running, or cannot determine the number of threads, prior
> // to executing the given statement. It is the responsibility of the
> // caller not to pass a thread_count of 1.
>-static String DeathTestThreadWarning(size_t thread_count) {
>+static std::string DeathTestThreadWarning(size_t thread_count) {
> Message msg;
> msg << "Death tests use fork(), which is unsafe particularly"
> << " in a threaded context. For this test, " << GTEST_NAME_ << " ";
>- if (thread_count == 0)
>+ if (thread_count == 0) {
> msg << "couldn't detect the number of threads.";
>- else
>+ } else {
> msg << "detected " << thread_count << " threads.";
>+ }
>+ msg << " See "
>+ "https://github.com/google/googletest/blob/master/googletest/docs/"
>+ "advanced.md#death-tests-and-threads"
>+ << " for more explanation and suggested solutions, especially if"
>+ << " this is the last message you see before your test times out.";
> return msg.GetString();
> }
>-#endif // !GTEST_OS_WINDOWS
>+# endif // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
> 
> // Flag characters for reporting a death test that did not die.
> static const char kDeathTestLived = 'L';
> static const char kDeathTestReturned = 'R';
>+static const char kDeathTestThrew = 'T';
> static const char kDeathTestInternalError = 'I';
> 
>-// An enumeration describing all of the possible ways that a death test
>-// can conclude. DIED means that the process died while executing the
>-// test code; LIVED means that process lived beyond the end of the test
>-// code; and RETURNED means that the test statement attempted a "return,"
>-// which is not allowed. IN_PROGRESS means the test has not yet
>-// concluded.
>-enum DeathTestOutcome { IN_PROGRESS, DIED, LIVED, RETURNED };
>+#if GTEST_OS_FUCHSIA
>+
>+// File descriptor used for the pipe in the child process.
>+static const int kFuchsiaReadPipeFd = 3;
>+
>+#endif
>+
>+// An enumeration describing all of the possible ways that a death test can
>+// conclude. DIED means that the process died while executing the test
>+// code; LIVED means that process lived beyond the end of the test code;
>+// RETURNED means that the test statement attempted to execute a return
>+// statement, which is not allowed; THREW means that the test statement
>+// returned control by throwing an exception. IN_PROGRESS means the test
>+// has not yet concluded.
>+// FIXME: Unify names and possibly values for
>+// AbortReason, DeathTestOutcome, and flag characters above.
>+enum DeathTestOutcome { IN_PROGRESS, DIED, LIVED, RETURNED, THREW };
> 
> // Routine for aborting the program which is safe to call from an
> // exec-style death test child process, in which case the error
> // message is propagated back to the parent process. Otherwise, the
> // message is simply printed to stderr. In either case, the program
> // then exits with status 1.
>-void DeathTestAbort(const String& message) {
>+static void DeathTestAbort(const std::string& message) {
> // On a POSIX system, this function may be called from a threadsafe-style
> // death test child process, which operates on a very small stack. Use
> // the heap for any additional non-minuscule memory requirements.
>@@ -212,18 +290,19 @@ void DeathTestAbort(const String& message) {
> } else {
> fprintf(stderr, "%s", message.c_str());
> fflush(stderr);
>- abort();
>+ posix::Abort();
> }
> }
> 
> // A replacement for CHECK that calls DeathTestAbort if the assertion
> // fails.
>-#define GTEST_DEATH_TEST_CHECK_(expression) \
>+# define GTEST_DEATH_TEST_CHECK_(expression) \
> do { \
> if (!::testing::internal::IsTrue(expression)) { \
>- DeathTestAbort(::testing::internal::String::Format( \
>- "CHECK failed: File %s, line %d: %s", \
>- __FILE__, __LINE__, #expression)); \
>+ DeathTestAbort( \
>+ ::std::string("CHECK failed: File ") + __FILE__ + ", line " \
>+ + ::testing::internal::StreamableToString(__LINE__) + ": " \
>+ + #expression); \
> } \
> } while (::testing::internal::AlwaysFalse())
> 
>@@ -234,22 +313,23 @@ void DeathTestAbort(const String& message) {
> // evaluates the expression as long as it evaluates to -1 and sets
> // errno to EINTR. If the expression evaluates to -1 but errno is
> // something other than EINTR, DeathTestAbort is called.
>-#define GTEST_DEATH_TEST_CHECK_SYSCALL_(expression) \
>+# define GTEST_DEATH_TEST_CHECK_SYSCALL_(expression) \
> do { \
> int gtest_retval; \
> do { \
> gtest_retval = (expression); \
> } while (gtest_retval == -1 && errno == EINTR); \
> if (gtest_retval == -1) { \
>- DeathTestAbort(::testing::internal::String::Format( \
>- "CHECK failed: File %s, line %d: %s != -1", \
>- __FILE__, __LINE__, #expression)); \
>+ DeathTestAbort( \
>+ ::std::string("CHECK failed: File ") + __FILE__ + ", line " \
>+ + ::testing::internal::StreamableToString(__LINE__) + ": " \
>+ + #expression + " != -1"); \
> } \
> } while (::testing::internal::AlwaysFalse())
> 
> // Returns the message describing the last system error in errno.
>-String GetLastErrnoDescription() {
>- return String(errno == 0 ? "" : posix::StrError(errno));
>+std::string GetLastErrnoDescription() {
>+ return errno == 0 ? "" : posix::StrError(errno);
> }
> 
> // This is called from a death test parent process to read a failure
>@@ -299,11 +379,11 @@ const char* DeathTest::LastMessage() {
> return last_death_test_message_.c_str();
> }
> 
>-void DeathTest::set_last_death_test_message(const String& message) {
>+void DeathTest::set_last_death_test_message(const std::string& message) {
> last_death_test_message_ = message;
> }
> 
>-String DeathTest::last_death_test_message_;
>+std::string DeathTest::last_death_test_message_;
> 
> // Provides cross platform implementation for some death functionality.
> class DeathTestImpl : public DeathTest {
>@@ -388,6 +468,9 @@ void DeathTestImpl::ReadAndInterpretStatusByte() {
> case kDeathTestReturned:
> set_outcome(RETURNED);
> break;
>+ case kDeathTestThrew:
>+ set_outcome(THREW);
>+ break;
> case kDeathTestLived:
> set_outcome(LIVED);
> break;
>@@ -416,19 +499,46 @@ void DeathTestImpl::Abort(AbortReason reason) {
> // it finds any data in our pipe. So, here we write a single flag byte
> // to the pipe, then exit.
> const char status_ch =
>- reason == TEST_DID_NOT_DIE ? kDeathTestLived : kDeathTestReturned;
>+ reason == TEST_DID_NOT_DIE ? kDeathTestLived :
>+ reason == TEST_THREW_EXCEPTION ? kDeathTestThrew : kDeathTestReturned;
>+
> GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Write(write_fd(), &status_ch, 1));
>- GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Close(write_fd()));
>+ // We are leaking the descriptor here because on some platforms (i.e.,
>+ // when built as Windows DLL), destructors of global objects will still
>+ // run after calling _exit(). On such systems, write_fd_ will be
>+ // indirectly closed from the destructor of UnitTestImpl, causing double
>+ // close if it is also closed here. On debug configurations, double close
>+ // may assert. As there are no in-process buffers to flush here, we are
>+ // relying on the OS to close the descriptor after the process terminates
>+ // when the destructors are not run.
> _exit(1); // Exits w/o any normal exit hooks (we were supposed to crash)
> }
> 
>+// Returns an indented copy of stderr output for a death test.
>+// This makes distinguishing death test output lines from regular log lines
>+// much easier.
>+static ::std::string FormatDeathTestOutput(const ::std::string& output) {
>+ ::std::string ret;
>+ for (size_t at = 0; ; ) {
>+ const size_t line_end = output.find('\n', at);
>+ ret += "[ DEATH ] ";
>+ if (line_end == ::std::string::npos) {
>+ ret += output.substr(at);
>+ break;
>+ }
>+ ret += output.substr(at, line_end + 1 - at);
>+ at = line_end + 1;
>+ }
>+ return ret;
>+}
>+
> // Assesses the success or failure of a death test, using both private
> // members which have previously been set, and one argument:
> //
> // Private data members:
> // outcome: An enumeration describing how the death test
>-// concluded: DIED, LIVED, or RETURNED. The death test fails
>-// in the latter two cases.
>+// concluded: DIED, LIVED, THREW, or RETURNED. The death test
>+// fails in the latter three cases.
> // status: The exit status of the child process. On *nix, it is in the
> // in the format specified by wait(2). On Windows, this is the
> // value supplied to the ExitProcess() API or a numeric code
>@@ -448,7 +558,7 @@ bool DeathTestImpl::Passed(bool status_ok) {
> if (!spawned())
> return false;
> 
>- const String error_message = GetCapturedStderr();
>+ const std::string error_message = GetCapturedStderr();
> 
> bool success = false;
> Message buffer;
>@@ -457,25 +567,35 @@ bool DeathTestImpl::Passed(bool status_ok) {
> switch (outcome()) {
> case LIVED:
> buffer << " Result: failed to die.\n"
>- << " Error msg: " << error_message;
>+ << " Error msg:\n" << FormatDeathTestOutput(error_message);
>+ break;
>+ case THREW:
>+ buffer << " Result: threw an exception.\n"
>+ << " Error msg:\n" << FormatDeathTestOutput(error_message);
> break;
> case RETURNED:
> buffer << " Result: illegal return in test statement.\n"
>- << " Error msg: " << error_message;
>+ << " Error msg:\n" << FormatDeathTestOutput(error_message);
> break;
> case DIED:
> if (status_ok) {
>+# if GTEST_USES_PCRE
>+ // PCRE regexes support embedded NULs.
>+ const bool matched = RE::PartialMatch(error_message, *regex());
>+# else
> const bool matched = RE::PartialMatch(error_message.c_str(), *regex());
>+# endif // GTEST_USES_PCRE
> if (matched) {
> success = true;
> } else {
> buffer << " Result: died but not with expected error.\n"
> << " Expected: " << regex()->pattern() << "\n"
>- << "Actual msg: " << error_message;
>+ << "Actual msg:\n" << FormatDeathTestOutput(error_message);
> }
> } else {
> buffer << " Result: died but not with expected exit code:\n"
>- << " " << ExitSummary(status()) << "\n";
>+ << " " << ExitSummary(status()) << "\n"
>+ << "Actual msg:\n" << FormatDeathTestOutput(error_message);
> }
> break;
> case IN_PROGRESS:
>@@ -488,7 +608,7 @@ bool DeathTestImpl::Passed(bool status_ok) {
> return success;
> }
> 
>-#if GTEST_OS_WINDOWS
>+# if GTEST_OS_WINDOWS
> // WindowsDeathTest implements death tests on Windows. Due to the
> // specifics of starting new processes on Windows, death tests there are
> // always threadsafe, and Google Test considers the
>@@ -519,11 +639,11 @@ bool DeathTestImpl::Passed(bool status_ok) {
> //
> class WindowsDeathTest : public DeathTestImpl {
> public:
>- WindowsDeathTest(const char* statement,
>- const RE* regex,
>+ WindowsDeathTest(const char* a_statement,
>+ const RE* a_regex,
> const char* file,
> int line)
>- : DeathTestImpl(statement, regex), file_(file), line_(line) {}
>+ : DeathTestImpl(a_statement, a_regex), file_(file), line_(line) {}
> 
> // All of these virtual functions are inherited from DeathTest.
> virtual int Wait();
>@@ -580,12 +700,12 @@ int WindowsDeathTest::Wait() {
> GTEST_DEATH_TEST_CHECK_(
> WAIT_OBJECT_0 == ::WaitForSingleObject(child_handle_.Get(),
> INFINITE));
>- DWORD status;
>- GTEST_DEATH_TEST_CHECK_(::GetExitCodeProcess(child_handle_.Get(), &status)
>- != FALSE);
>+ DWORD status_code;
>+ GTEST_DEATH_TEST_CHECK_(
>+ ::GetExitCodeProcess(child_handle_.Get(), &status_code) != FALSE);
> child_handle_.Reset();
>- set_status(static_cast<int>(status));
>- return this->status();
>+ set_status(static_cast<int>(status_code));
>+ return status();
> }
> 
> // The AssumeRole process for a Windows death test. It creates a child
>@@ -625,22 +745,19 @@ DeathTest::TestRole WindowsDeathTest::AssumeRole() {
> FALSE, // The initial state is non-signalled.
> NULL)); // The even is unnamed.
> GTEST_DEATH_TEST_CHECK_(event_handle_.Get() != NULL);
>- const String filter_flag = String::Format("--%s%s=%s.%s",
>- GTEST_FLAG_PREFIX_, kFilterFlag,
>- info->test_case_name(),
>- info->name());
>- const String internal_flag = String::Format(
>- "--%s%s=%s|%d|%d|%u|%Iu|%Iu",
>- GTEST_FLAG_PREFIX_,
>- kInternalRunDeathTestFlag,
>- file_, line_,
>- death_test_index,
>- static_cast<unsigned int>(::GetCurrentProcessId()),
>- // size_t has the same with as pointers on both 32-bit and 64-bit
>+ const std::string filter_flag =
>+ std::string("--") + GTEST_FLAG_PREFIX_ + kFilterFlag + "=" +
>+ info->test_case_name() + "." + info->name();
>+ const std::string internal_flag =
>+ std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag +
>+ "=" + file_ + "|" + StreamableToString(line_) + "|" +
>+ StreamableToString(death_test_index) + "|" +
>+ StreamableToString(static_cast<unsigned int>(::GetCurrentProcessId())) +
>+ // size_t has the same width as pointers on both 32-bit and 64-bit
> // Windows platforms.
> // See http://msdn.microsoft.com/en-us/library/tcxf1dw6.aspx.
>- reinterpret_cast<size_t>(write_handle),
>- reinterpret_cast<size_t>(event_handle_.Get()));
>+ "|" + StreamableToString(reinterpret_cast<size_t>(write_handle)) +
>+ "|" + StreamableToString(reinterpret_cast<size_t>(event_handle_.Get()));
> 
> char executable_path[_MAX_PATH + 1]; // NOLINT
> GTEST_DEATH_TEST_CHECK_(
>@@ -648,10 +765,9 @@ DeathTest::TestRole WindowsDeathTest::AssumeRole() {
> executable_path,
> _MAX_PATH));
> 
>- String command_line = String::Format("%s %s \"%s\"",
>- ::GetCommandLineA(),
>- filter_flag.c_str(),
>- internal_flag.c_str());
>+ std::string command_line =
>+ std::string(::GetCommandLineA()) + " " + filter_flag + " \"" +
>+ internal_flag + "\"";
> 
> DeathTest::set_last_death_test_message("");
> 
>@@ -684,7 +800,200 @@ DeathTest::TestRole WindowsDeathTest::AssumeRole() {
> set_spawned(true);
> return OVERSEE_TEST;
> }
>-#else // We are not on Windows.
>+
>+# elif GTEST_OS_FUCHSIA
>+
>+class FuchsiaDeathTest : public DeathTestImpl {
>+ public:
>+ FuchsiaDeathTest(const char* a_statement,
>+ const RE* a_regex,
>+ const char* file,
>+ int line)
>+ : DeathTestImpl(a_statement, a_regex), file_(file), line_(line) {}
>+ virtual ~FuchsiaDeathTest() {
>+ zx_status_t status = zx_handle_close(child_process_);
>+ GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
>+ status = zx_handle_close(port_);
>+ GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
>+ }
>+
>+ // All of these virtual functions are inherited from DeathTest.
>+ virtual int Wait();
>+ virtual TestRole AssumeRole();
>+
>+ private:
>+ // The name of the file in which the death test is located.
>+ const char* const file_;
>+ // The line number on which the death test is located.
>+ const int line_;
>+
>+ zx_handle_t child_process_ = ZX_HANDLE_INVALID;
>+ zx_handle_t port_ = ZX_HANDLE_INVALID;
>+};
>+
>+// Utility class for accumulating command-line arguments.
>+class Arguments {
>+ public:
>+ Arguments() {
>+ args_.push_back(NULL);
>+ }
>+
>+ ~Arguments() {
>+ for (std::vector<char*>::iterator i = args_.begin(); i != args_.end();
>+ ++i) {
>+ free(*i);
>+ }
>+ }
>+ void AddArgument(const char* argument) {
>+ args_.insert(args_.end() - 1, posix::StrDup(argument));
>+ }
>+
>+ template <typename Str>
>+ void AddArguments(const ::std::vector<Str>& arguments) {
>+ for (typename ::std::vector<Str>::const_iterator i = arguments.begin();
>+ i != arguments.end();
>+ ++i) {
>+ args_.insert(args_.end() - 1, posix::StrDup(i->c_str()));
>+ }
>+ }
>+ char* const* Argv() {
>+ return &args_[0];
>+ }
>+
>+ int size() {
>+ return args_.size() - 1;
>+ }
>+
>+ private:
>+ std::vector<char*> args_;
>+};
>+
>+// Waits for the child in a death test to exit, returning its exit
>+// status, or 0 if no child process exists. As a side effect, sets the
>+// outcome data member.
>+int FuchsiaDeathTest::Wait() {
>+ if (!spawned())
>+ return 0;
>+
>+ // Register to wait for the child process to terminate.
>+ zx_status_t status_zx;
>+ status_zx = zx_object_wait_async(child_process_,
>+ port_,
>+ 0 /* key */,
>+ ZX_PROCESS_TERMINATED,
>+ ZX_WAIT_ASYNC_ONCE);
>+ GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
>+
>+ // Wait for it to terminate, or an exception to be received.
>+ zx_port_packet_t packet;
>+ status_zx = zx_port_wait(port_, ZX_TIME_INFINITE, &packet);
>+ GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
>+
>+ if (ZX_PKT_IS_EXCEPTION(packet.type)) {
>+ // Process encountered an exception. Kill it directly rather than letting
>+ // other handlers process the event.
>+ status_zx = zx_task_kill(child_process_);
>+ GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
>+
>+ // Now wait for |child_process_| to terminate.
>+ zx_signals_t signals = 0;
>+ status_zx = zx_object_wait_one(
>+ child_process_, ZX_PROCESS_TERMINATED, ZX_TIME_INFINITE, &signals);
>+ GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
>+ GTEST_DEATH_TEST_CHECK_(signals & ZX_PROCESS_TERMINATED);
>+ } else {
>+ // Process terminated.
>+ GTEST_DEATH_TEST_CHECK_(ZX_PKT_IS_SIGNAL_ONE(packet.type));
>+ GTEST_DEATH_TEST_CHECK_(packet.signal.observed & ZX_PROCESS_TERMINATED);
>+ }
>+
>+ ReadAndInterpretStatusByte();
>+
>+ zx_info_process_t buffer;
>+ status_zx = zx_object_get_info(
>+ child_process_,
>+ ZX_INFO_PROCESS,
>+ &buffer,
>+ sizeof(buffer),
>+ nullptr,
>+ nullptr);
>+ GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
>+
>+ GTEST_DEATH_TEST_CHECK_(buffer.exited);
>+ set_status(buffer.return_code);
>+ return status();
>+}
>+
>+// The AssumeRole process for a Fuchsia death test. It creates a child
>+// process with the same executable as the current process to run the
>+// death test. The child process is given the --gtest_filter and
>+// --gtest_internal_run_death_test flags such that it knows to run the
>+// current death test only.
>+DeathTest::TestRole FuchsiaDeathTest::AssumeRole() {
>+ const UnitTestImpl* const impl = GetUnitTestImpl();
>+ const InternalRunDeathTestFlag* const flag =
>+ impl->internal_run_death_test_flag();
>+ const TestInfo* const info = impl->current_test_info();
>+ const int death_test_index = info->result()->death_test_count();
>+
>+ if (flag != NULL) {
>+ // ParseInternalRunDeathTestFlag() has performed all the necessary
>+ // processing.
>+ set_write_fd(kFuchsiaReadPipeFd);
>+ return EXECUTE_TEST;
>+ }
>+
>+ CaptureStderr();
>+ // Flush the log buffers since the log streams are shared with the child.
>+ FlushInfoLog();
>+
>+ // Build the child process command line.
>+ const std::string filter_flag =
>+ std::string("--") + GTEST_FLAG_PREFIX_ + kFilterFlag + "="
>+ + info->test_case_name() + "." + info->name();
>+ const std::string internal_flag =
>+ std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "="
>+ + file_ + "|"
>+ + StreamableToString(line_) + "|"
>+ + StreamableToString(death_test_index);
>+ Arguments args;
>+ args.AddArguments(GetInjectableArgvs());
>+ args.AddArgument(filter_flag.c_str());
>+ args.AddArgument(internal_flag.c_str());
>+
>+ // Build the pipe for communication with the child.
>+ zx_status_t status;
>+ zx_handle_t child_pipe_handle;
>+ uint32_t type;
>+ status = fdio_pipe_half(&child_pipe_handle, &type);
>+ GTEST_DEATH_TEST_CHECK_(status >= 0);
>+ set_read_fd(status);
>+
>+ // Set the pipe handle for the child.
>+ fdio_spawn_action_t add_handle_action = {};
>+ add_handle_action.action = FDIO_SPAWN_ACTION_ADD_HANDLE;
>+ add_handle_action.h.id = PA_HND(type, kFuchsiaReadPipeFd);
>+ add_handle_action.h.handle = child_pipe_handle;
>+
>+ // Spawn the child process.
>+ status = fdio_spawn_etc(ZX_HANDLE_INVALID, FDIO_SPAWN_CLONE_ALL,
>+ args.Argv()[0], args.Argv(), nullptr, 1,
>+ &add_handle_action, &child_process_, nullptr);
>+ GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
>+
>+ // Create an exception port and attach it to the |child_process_|, to allow
>+ // us to suppress the system default exception handler from firing.
>+ status = zx_port_create(0, &port_);
>+ GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
>+ status = zx_task_bind_exception_port(
>+ child_process_, port_, 0 /* key */, 0 /*options */);
>+ GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
>+
>+ set_spawned(true);
>+ return OVERSEE_TEST;
>+}
>+
>+#else // We are neither on Windows, nor on Fuchsia.
> 
> // ForkingDeathTest provides implementations for most of the abstract
> // methods of the DeathTest interface. Only the AssumeRole method is
>@@ -768,6 +1077,7 @@ DeathTest::TestRole NoExecDeathTest::AssumeRole() {
> // Event forwarding to the listeners of event listener API mush be shut
> // down in death test subprocesses.
> GetUnitTestImpl()->listeners()->SuppressEventForwarding();
>+ g_in_fast_death_test_child = true;
> return EXECUTE_TEST;
> } else {
> GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1]));
>@@ -787,6 +1097,15 @@ class ExecDeathTest : public ForkingDeathTest {
> ForkingDeathTest(a_statement, a_regex), file_(file), line_(line) { }
> virtual TestRole AssumeRole();
> private:
>+ static ::std::vector<std::string> GetArgvsForDeathTestChildProcess() {
>+ ::std::vector<std::string> args = GetInjectableArgvs();
>+# if defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_)
>+ ::std::vector<std::string> extra_args =
>+ GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_();
>+ args.insert(args.end(), extra_args.begin(), extra_args.end());
>+# endif // defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_)
>+ return args;
>+ }
> // The name of the file in which the death test is located.
> const char* const file_;
> // The line number on which the death test is located.
>@@ -821,6 +1140,7 @@ class Arguments {
> char* const* Argv() {
> return &args_[0];
> }
>+
> private:
> std::vector<char*> args_;
> };
>@@ -832,6 +1152,21 @@ struct ExecDeathTestArgs {
> int close_fd; // File descriptor to close; the read end of a pipe
> };
> 
>+# if GTEST_OS_MAC
>+inline char** GetEnviron() {
>+ // When Google Test is built as a framework on MacOS X, the environ variable
>+ // is unavailable. Apple's documentation (man environ) recommends using
>+ // _NSGetEnviron() instead.
>+ return *_NSGetEnviron();
>+}
>+# else
>+// Some POSIX platforms expect you to declare environ. extern "C" makes
>+// it reside in the global namespace.
>+extern "C" char** environ;
>+inline char** GetEnviron() { return environ; }
>+# endif // GTEST_OS_MAC
>+
>+# if !GTEST_OS_QNX
> // The main function for a threadsafe-style death test child process.
> // This function is called in a clone()-ed process and thus must avoid
> // any potentially unsafe operations like malloc or libc functions.
>@@ -846,9 +1181,8 @@ static int ExecDeathTestChildMain(void* child_arg) {
> UnitTest::GetInstance()->original_working_dir();
> // We can safely call chdir() as it's a direct system call.
> if (chdir(original_dir) != 0) {
>- DeathTestAbort(String::Format("chdir(\"%s\") failed: %s",
>- original_dir,
>- GetLastErrnoDescription().c_str()));
>+ DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " +
>+ GetLastErrnoDescription());
> return EXIT_FAILURE;
> }
> 
>@@ -857,40 +1191,97 @@ static int ExecDeathTestChildMain(void* child_arg) {
> // unsafe. Since execve() doesn't search the PATH, the user must
> // invoke the test program via a valid path that contains at least
> // one path separator.
>- // We have replaced execve() with execv() for WebKit to avoid using
>- // environ. It should be safe because execv() is just a simple wrapper
>- // of execve().
>- execv(args->argv[0], args->argv);
>- DeathTestAbort(String::Format("execv(%s, ...) in %s failed: %s",
>- args->argv[0],
>- original_dir,
>- GetLastErrnoDescription().c_str()));
>+ execve(args->argv[0], args->argv, GetEnviron());
>+ DeathTestAbort(std::string("execve(") + args->argv[0] + ", ...) in " +
>+ original_dir + " failed: " +
>+ GetLastErrnoDescription());
> return EXIT_FAILURE;
> }
>+# endif // !GTEST_OS_QNX
> 
>+# if GTEST_HAS_CLONE
> // Two utility routines that together determine the direction the stack
> // grows.
> // This could be accomplished more elegantly by a single recursive
> // function, but we want to guard against the unlikely possibility of
> // a smart compiler optimizing the recursion away.
>-bool StackLowerThanAddress(const void* ptr) {
>+//
>+// GTEST_NO_INLINE_ is required to prevent GCC 4.6 from inlining
>+// StackLowerThanAddress into StackGrowsDown, which then doesn't give
>+// correct answer.
>+static void StackLowerThanAddress(const void* ptr,
>+ bool* result) GTEST_NO_INLINE_;
>+static void StackLowerThanAddress(const void* ptr, bool* result) {
> int dummy;
>- return &dummy < ptr;
>+ *result = (&dummy < ptr);
> }
> 
>-bool StackGrowsDown() {
>+// Make sure AddressSanitizer does not tamper with the stack here.
>+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
>+static bool StackGrowsDown() {
> int dummy;
>- return StackLowerThanAddress(&dummy);
>+ bool result;
>+ StackLowerThanAddress(&dummy, &result);
>+ return result;
> }
>-
>-// A threadsafe implementation of fork(2) for threadsafe-style death tests
>-// that uses clone(2). It dies with an error message if anything goes
>-// wrong.
>-static pid_t ExecDeathTestFork(char* const* argv, int close_fd) {
>+# endif // GTEST_HAS_CLONE
>+
>+// Spawns a child process with the same executable as the current process in
>+// a thread-safe manner and instructs it to run the death test. The
>+// implementation uses fork(2) + exec. On systems where clone(2) is
>+// available, it is used instead, being slightly more thread-safe. On QNX,
>+// fork supports only single-threaded environments, so this function uses
>+// spawn(2) there instead. The function dies with an error message if
>+// anything goes wrong.
>+static pid_t ExecDeathTestSpawnChild(char* const* argv, int close_fd) {
> ExecDeathTestArgs args = { argv, close_fd };
> pid_t child_pid = -1;
> 
>-#if GTEST_HAS_CLONE
>+# if GTEST_OS_QNX
>+ // Obtains the current directory and sets it to be closed in the child
>+ // process.
>+ const int cwd_fd = open(".", O_RDONLY);
>+ GTEST_DEATH_TEST_CHECK_(cwd_fd != -1);
>+ GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(cwd_fd, F_SETFD, FD_CLOEXEC));
>+ // We need to execute the test program in the same environment where
>+ // it was originally invoked. Therefore we change to the original
>+ // working directory first.
>+ const char* const original_dir =
>+ UnitTest::GetInstance()->original_working_dir();
>+ // We can safely call chdir() as it's a direct system call.
>+ if (chdir(original_dir) != 0) {
>+ DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " +
>+ GetLastErrnoDescription());
>+ return EXIT_FAILURE;
>+ }
>+
>+ int fd_flags;
>+ // Set close_fd to be closed after spawn.
>+ GTEST_DEATH_TEST_CHECK_SYSCALL_(fd_flags = fcntl(close_fd, F_GETFD));
>+ GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(close_fd, F_SETFD,
>+ fd_flags | FD_CLOEXEC));
>+ struct inheritance inherit = {0};
>+ // spawn is a system call.
>+ child_pid = spawn(args.argv[0], 0, NULL, &inherit, args.argv, GetEnviron());
>+ // Restores the current working directory.
>+ GTEST_DEATH_TEST_CHECK_(fchdir(cwd_fd) != -1);
>+ GTEST_DEATH_TEST_CHECK_SYSCALL_(close(cwd_fd));
>+
>+# else // GTEST_OS_QNX
>+# if GTEST_OS_LINUX
>+ // When a SIGPROF signal is received while fork() or clone() are executing,
>+ // the process may hang. To avoid this, we ignore SIGPROF here and re-enable
>+ // it after the call to fork()/clone() is complete.
>+ struct sigaction saved_sigprof_action;
>+ struct sigaction ignore_sigprof_action;
>+ memset(&ignore_sigprof_action, 0, sizeof(ignore_sigprof_action));
>+ sigemptyset(&ignore_sigprof_action.sa_mask);
>+ ignore_sigprof_action.sa_handler = SIG_IGN;
>+ GTEST_DEATH_TEST_CHECK_SYSCALL_(sigaction(
>+ SIGPROF, &ignore_sigprof_action, &saved_sigprof_action));
>+# endif // GTEST_OS_LINUX
>+
>+# if GTEST_HAS_CLONE
> const bool use_fork = GTEST_FLAG(death_test_use_fork);
> 
> if (!use_fork) {
>@@ -900,21 +1291,37 @@ static pid_t ExecDeathTestFork(char* const* argv, int close_fd) {
> void* const stack = mmap(NULL, stack_size, PROT_READ | PROT_WRITE,
> MAP_ANON | MAP_PRIVATE, -1, 0);
> GTEST_DEATH_TEST_CHECK_(stack != MAP_FAILED);
>+
>+ // Maximum stack alignment in bytes: For a downward-growing stack, this
>+ // amount is subtracted from size of the stack space to get an address
>+ // that is within the stack space and is aligned on all systems we care
>+ // about. As far as I know there is no ABI with stack alignment greater
>+ // than 64. We assume stack and stack_size already have alignment of
>+ // kMaxStackAlignment.
>+ const size_t kMaxStackAlignment = 64;
> void* const stack_top =
>- static_cast<char*>(stack) + (stack_grows_down ? stack_size : 0);
>+ static_cast<char*>(stack) +
>+ (stack_grows_down ? stack_size - kMaxStackAlignment : 0);
>+ GTEST_DEATH_TEST_CHECK_(stack_size > kMaxStackAlignment &&
>+ reinterpret_cast<intptr_t>(stack_top) % kMaxStackAlignment == 0);
> 
> child_pid = clone(&ExecDeathTestChildMain, stack_top, SIGCHLD, &args);
> 
> GTEST_DEATH_TEST_CHECK_(munmap(stack, stack_size) != -1);
> }
>-#else
>+# else
> const bool use_fork = true;
>-#endif // GTEST_HAS_CLONE
>+# endif // GTEST_HAS_CLONE
> 
> if (use_fork && (child_pid = fork()) == 0) {
> ExecDeathTestChildMain(&args);
> _exit(0);
> }
>+# endif // GTEST_OS_QNX
>+# if GTEST_OS_LINUX
>+ GTEST_DEATH_TEST_CHECK_SYSCALL_(
>+ sigaction(SIGPROF, &saved_sigprof_action, NULL));
>+# endif // GTEST_OS_LINUX
> 
> GTEST_DEATH_TEST_CHECK_(child_pid != -1);
> return child_pid;
>@@ -942,16 +1349,16 @@ DeathTest::TestRole ExecDeathTest::AssumeRole() {
> // it be closed when the child process does an exec:
> GTEST_DEATH_TEST_CHECK_(fcntl(pipe_fd[1], F_SETFD, 0) != -1);
> 
>- const String filter_flag =
>- String::Format("--%s%s=%s.%s",
>- GTEST_FLAG_PREFIX_, kFilterFlag,
>- info->test_case_name(), info->name());
>- const String internal_flag =
>- String::Format("--%s%s=%s|%d|%d|%d",
>- GTEST_FLAG_PREFIX_, kInternalRunDeathTestFlag,
>- file_, line_, death_test_index, pipe_fd[1]);
>+ const std::string filter_flag =
>+ std::string("--") + GTEST_FLAG_PREFIX_ + kFilterFlag + "="
>+ + info->test_case_name() + "." + info->name();
>+ const std::string internal_flag =
>+ std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "="
>+ + file_ + "|" + StreamableToString(line_) + "|"
>+ + StreamableToString(death_test_index) + "|"
>+ + StreamableToString(pipe_fd[1]);
> Arguments args;
>- args.AddArguments(GetArgvs());
>+ args.AddArguments(GetArgvsForDeathTestChildProcess());
> args.AddArgument(filter_flag.c_str());
> args.AddArgument(internal_flag.c_str());
> 
>@@ -962,7 +1369,7 @@ DeathTest::TestRole ExecDeathTest::AssumeRole() {
> // is necessary.
> FlushInfoLog();
> 
>- const pid_t child_pid = ExecDeathTestFork(args.Argv(), pipe_fd[0]);
>+ const pid_t child_pid = ExecDeathTestSpawnChild(args.Argv(), pipe_fd[0]);
> GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1]));
> set_child_pid(child_pid);
> set_read_fd(pipe_fd[0]);
>@@ -970,7 +1377,7 @@ DeathTest::TestRole ExecDeathTest::AssumeRole() {
> return OVERSEE_TEST;
> }
> 
>-#endif // !GTEST_OS_WINDOWS
>+# endif // !GTEST_OS_WINDOWS
> 
> // Creates a concrete DeathTest-derived class that depends on the
> // --gtest_death_test_style flag, and sets the pointer pointed to
>@@ -988,9 +1395,10 @@ bool DefaultDeathTestFactory::Create(const char* statement, const RE* regex,
> 
> if (flag != NULL) {
> if (death_test_index > flag->index()) {
>- DeathTest::set_last_death_test_message(String::Format(
>- "Death test count (%d) somehow exceeded expected maximum (%d)",
>- death_test_index, flag->index()));
>+ DeathTest::set_last_death_test_message(
>+ "Death test count (" + StreamableToString(death_test_index)
>+ + ") somehow exceeded expected maximum ("
>+ + StreamableToString(flag->index()) + ")");
> return false;
> }
> 
>@@ -1001,64 +1409,56 @@ bool DefaultDeathTestFactory::Create(const char* statement, const RE* regex,
> }
> }
> 
>-#if GTEST_OS_WINDOWS
>+# if GTEST_OS_WINDOWS
>+
> if (GTEST_FLAG(death_test_style) == "threadsafe" ||
> GTEST_FLAG(death_test_style) == "fast") {
> *test = new WindowsDeathTest(statement, regex, file, line);
> }
>-#else
>+
>+# elif GTEST_OS_FUCHSIA
>+
>+ if (GTEST_FLAG(death_test_style) == "threadsafe" ||
>+ GTEST_FLAG(death_test_style) == "fast") {
>+ *test = new FuchsiaDeathTest(statement, regex, file, line);
>+ }
>+
>+# else
>+
> if (GTEST_FLAG(death_test_style) == "threadsafe") {
> *test = new ExecDeathTest(statement, regex, file, line);
> } else if (GTEST_FLAG(death_test_style) == "fast") {
> *test = new NoExecDeathTest(statement, regex);
> }
>-#endif // GTEST_OS_WINDOWS
>+
>+# endif // GTEST_OS_WINDOWS
>+
> else { // NOLINT - this is more readable than unbalanced brackets inside #if.
>- DeathTest::set_last_death_test_message(String::Format(
>- "Unknown death test style \"%s\" encountered",
>- GTEST_FLAG(death_test_style).c_str()));
>+ DeathTest::set_last_death_test_message(
>+ "Unknown death test style \"" + GTEST_FLAG(death_test_style)
>+ + "\" encountered");
> return false;
> }
> 
> return true;
> }
> 
>-// Splits a given string on a given delimiter, populating a given
>-// vector with the fields. GTEST_HAS_DEATH_TEST implies that we have
>-// ::std::string, so we can use it here.
>-static void SplitString(const ::std::string& str, char delimiter,
>- ::std::vector< ::std::string>* dest) {
>- ::std::vector< ::std::string> parsed;
>- ::std::string::size_type pos = 0;
>- while (::testing::internal::AlwaysTrue()) {
>- const ::std::string::size_type colon = str.find(delimiter, pos);
>- if (colon == ::std::string::npos) {
>- parsed.push_back(str.substr(pos));
>- break;
>- } else {
>- parsed.push_back(str.substr(pos, colon - pos));
>- pos = colon + 1;
>- }
>- }
>- dest->swap(parsed);
>-}
>-
>-#if GTEST_OS_WINDOWS
>+# if GTEST_OS_WINDOWS
> // Recreates the pipe and event handles from the provided parameters,
> // signals the event, and returns a file descriptor wrapped around the pipe
> // handle. This function is called in the child process only.
>-int GetStatusFileDescriptor(unsigned int parent_process_id,
>+static int GetStatusFileDescriptor(unsigned int parent_process_id,
> size_t write_handle_as_size_t,
> size_t event_handle_as_size_t) {
> AutoHandle parent_process_handle(::OpenProcess(PROCESS_DUP_HANDLE,
> FALSE, // Non-inheritable.
> parent_process_id));
> if (parent_process_handle.Get() == INVALID_HANDLE_VALUE) {
>- DeathTestAbort(String::Format("Unable to open parent process %u",
>- parent_process_id));
>+ DeathTestAbort("Unable to open parent process " +
>+ StreamableToString(parent_process_id));
> }
> 
>- // TODO(vladl@google.com): Replace the following check with a
>+ // FIXME: Replace the following check with a
> // compile-time assertion when available.
> GTEST_CHECK_(sizeof(HANDLE) <= sizeof(size_t));
> 
>@@ -1066,7 +1466,7 @@ int GetStatusFileDescriptor(unsigned int parent_process_id,
> reinterpret_cast<HANDLE>(write_handle_as_size_t);
> HANDLE dup_write_handle;
> 
>- // The newly initialized handle is accessible only in in the parent
>+ // The newly initialized handle is accessible only in the parent
> // process. To obtain one accessible within the child, we need to use
> // DuplicateHandle.
> if (!::DuplicateHandle(parent_process_handle.Get(), write_handle,
>@@ -1075,9 +1475,10 @@ int GetStatusFileDescriptor(unsigned int parent_process_id,
> // DUPLICATE_SAME_ACCESS is used.
> FALSE, // Request non-inheritable handler.
> DUPLICATE_SAME_ACCESS)) {
>- DeathTestAbort(String::Format(
>- "Unable to duplicate the pipe handle %Iu from the parent process %u",
>- write_handle_as_size_t, parent_process_id));
>+ DeathTestAbort("Unable to duplicate the pipe handle " +
>+ StreamableToString(write_handle_as_size_t) +
>+ " from the parent process " +
>+ StreamableToString(parent_process_id));
> }
> 
> const HANDLE event_handle = reinterpret_cast<HANDLE>(event_handle_as_size_t);
>@@ -1088,17 +1489,18 @@ int GetStatusFileDescriptor(unsigned int parent_process_id,
> 0x0,
> FALSE,
> DUPLICATE_SAME_ACCESS)) {
>- DeathTestAbort(String::Format(
>- "Unable to duplicate the event handle %Iu from the parent process %u",
>- event_handle_as_size_t, parent_process_id));
>+ DeathTestAbort("Unable to duplicate the event handle " +
>+ StreamableToString(event_handle_as_size_t) +
>+ " from the parent process " +
>+ StreamableToString(parent_process_id));
> }
> 
> const int write_fd =
> ::_open_osfhandle(reinterpret_cast<intptr_t>(dup_write_handle), O_APPEND);
> if (write_fd == -1) {
>- DeathTestAbort(String::Format(
>- "Unable to convert pipe handle %Iu to a file descriptor",
>- write_handle_as_size_t));
>+ DeathTestAbort("Unable to convert pipe handle " +
>+ StreamableToString(write_handle_as_size_t) +
>+ " to a file descriptor");
> }
> 
> // Signals the parent that the write end of the pipe has been acquired
>@@ -1107,7 +1509,7 @@ int GetStatusFileDescriptor(unsigned int parent_process_id,
> 
> return write_fd;
> }
>-#endif // GTEST_OS_WINDOWS
>+# endif // GTEST_OS_WINDOWS
> 
> // Returns a newly created InternalRunDeathTestFlag object with fields
> // initialized from the GTEST_FLAG(internal_run_death_test) flag if
>@@ -1123,7 +1525,8 @@ InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag() {
> SplitString(GTEST_FLAG(internal_run_death_test).c_str(), '|', &fields);
> int write_fd = -1;
> 
>-#if GTEST_OS_WINDOWS
>+# if GTEST_OS_WINDOWS
>+
> unsigned int parent_process_id = 0;
> size_t write_handle_as_size_t = 0;
> size_t event_handle_as_size_t = 0;
>@@ -1134,23 +1537,34 @@ InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag() {
> || !ParseNaturalNumber(fields[3], &parent_process_id)
> || !ParseNaturalNumber(fields[4], &write_handle_as_size_t)
> || !ParseNaturalNumber(fields[5], &event_handle_as_size_t)) {
>- DeathTestAbort(String::Format(
>- "Bad --gtest_internal_run_death_test flag: %s",
>- GTEST_FLAG(internal_run_death_test).c_str()));
>+ DeathTestAbort("Bad --gtest_internal_run_death_test flag: " +
>+ GTEST_FLAG(internal_run_death_test));
> }
> write_fd = GetStatusFileDescriptor(parent_process_id,
> write_handle_as_size_t,
> event_handle_as_size_t);
>-#else
>+
>+# elif GTEST_OS_FUCHSIA
>+
>+ if (fields.size() != 3
>+ || !ParseNaturalNumber(fields[1], &line)
>+ || !ParseNaturalNumber(fields[2], &index)) {
>+ DeathTestAbort("Bad --gtest_internal_run_death_test flag: "
>+ + GTEST_FLAG(internal_run_death_test));
>+ }
>+
>+# else
>+
> if (fields.size() != 4
> || !ParseNaturalNumber(fields[1], &line)
> || !ParseNaturalNumber(fields[2], &index)
> || !ParseNaturalNumber(fields[3], &write_fd)) {
>- DeathTestAbort(String::Format(
>- "Bad --gtest_internal_run_death_test flag: %s",
>- GTEST_FLAG(internal_run_death_test).c_str()));
>+ DeathTestAbort("Bad --gtest_internal_run_death_test flag: "
>+ + GTEST_FLAG(internal_run_death_test));
> }
>-#endif // GTEST_OS_WINDOWS
>+
>+# endif // GTEST_OS_WINDOWS
>+
> return new InternalRunDeathTestFlag(fields[0], line, index, write_fd);
> }
> 
>diff --git a/Source/ThirdParty/gtest/src/gtest-filepath.cc b/Source/ThirdParty/gtest/src/gtest-filepath.cc
>index c1ef9188ad85ab8a047a33bf9945e1cd0cc73eff..a7e65c082a75fc6fb038a023d5b1d3e09e479f11 100644
>--- a/Source/ThirdParty/gtest/src/gtest-filepath.cc
>+++ b/Source/ThirdParty/gtest/src/gtest-filepath.cc
>@@ -26,39 +26,38 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Authors: keith.ray@gmail.com (Keith Ray)
> 
>-#include <gtest/internal/gtest-filepath.h>
>-#include <gtest/internal/gtest-port.h>
>+#include "gtest/internal/gtest-filepath.h"
> 
> #include <stdlib.h>
>+#include "gtest/internal/gtest-port.h"
>+#include "gtest/gtest-message.h"
> 
> #if GTEST_OS_WINDOWS_MOBILE
>-#include <windows.h>
>+# include <windows.h>
> #elif GTEST_OS_WINDOWS
>-#include <direct.h>
>-#include <io.h>
>+# include <direct.h>
>+# include <io.h>
> #elif GTEST_OS_SYMBIAN
> // Symbian OpenC has PATH_MAX in sys/syslimits.h
>-#include <sys/syslimits.h>
>+# include <sys/syslimits.h>
> #else
>-#include <limits.h>
>-#include <climits> // Some Linux distributions define PATH_MAX here.
>+# include <limits.h>
>+# include <climits> // Some Linux distributions define PATH_MAX here.
> #endif // GTEST_OS_WINDOWS_MOBILE
> 
>+#include "gtest/internal/gtest-string.h"
>+
> #if GTEST_OS_WINDOWS
>-#define GTEST_PATH_MAX_ _MAX_PATH
>+# define GTEST_PATH_MAX_ _MAX_PATH
> #elif defined(PATH_MAX)
>-#define GTEST_PATH_MAX_ PATH_MAX
>+# define GTEST_PATH_MAX_ PATH_MAX
> #elif defined(_XOPEN_PATH_MAX)
>-#define GTEST_PATH_MAX_ _XOPEN_PATH_MAX
>+# define GTEST_PATH_MAX_ _XOPEN_PATH_MAX
> #else
>-#define GTEST_PATH_MAX_ _POSIX_PATH_MAX
>+# define GTEST_PATH_MAX_ _POSIX_PATH_MAX
> #endif // GTEST_OS_WINDOWS
> 
>-#include <gtest/internal/gtest-string.h>
>-
> namespace testing {
> namespace internal {
> 
>@@ -69,21 +68,19 @@ namespace internal {
> // of them.
> const char kPathSeparator = '\\';
> const char kAlternatePathSeparator = '/';
>-const char kPathSeparatorString[] = "\\";
> const char kAlternatePathSeparatorString[] = "/";
>-#if GTEST_OS_WINDOWS_MOBILE
>+# if GTEST_OS_WINDOWS_MOBILE
> // Windows CE doesn't have a current directory. You should not use
> // the current directory in tests on Windows CE, but this at least
> // provides a reasonable fallback.
> const char kCurrentDirectoryString[] = "\\";
> // Windows CE doesn't define INVALID_FILE_ATTRIBUTES
> const DWORD kInvalidFileAttributes = 0xffffffff;
>-#else
>+# else
> const char kCurrentDirectoryString[] = ".\\";
>-#endif // GTEST_OS_WINDOWS_MOBILE
>+# endif // GTEST_OS_WINDOWS_MOBILE
> #else
> const char kPathSeparator = '/';
>-const char kPathSeparatorString[] = "/";
> const char kCurrentDirectoryString[] = "./";
> #endif // GTEST_OS_WINDOWS
> 
>@@ -98,7 +95,7 @@ static bool IsPathSeparator(char c) {
> 
> // Returns the current working directory, or "" if unsuccessful.
> FilePath FilePath::GetCurrentDir() {
>-#if GTEST_OS_WINDOWS_MOBILE
>+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT
> // Windows CE doesn't have a current directory, so we just return
> // something reasonable.
> return FilePath(kCurrentDirectoryString);
>@@ -107,7 +104,14 @@ FilePath FilePath::GetCurrentDir() {
> return FilePath(_getcwd(cwd, sizeof(cwd)) == NULL ? "" : cwd);
> #else
> char cwd[GTEST_PATH_MAX_ + 1] = { '\0' };
>- return FilePath(getcwd(cwd, sizeof(cwd)) == NULL ? "" : cwd);
>+ char* result = getcwd(cwd, sizeof(cwd));
>+# if GTEST_OS_NACL
>+ // getcwd will likely fail in NaCl due to the sandbox, so return something
>+ // reasonable. The user may have provided a shim implementation for getcwd,
>+ // however, so fallback only when failure is detected.
>+ return FilePath(result == NULL ? kCurrentDirectoryString : cwd);
>+# endif // GTEST_OS_NACL
>+ return FilePath(result == NULL ? "" : cwd);
> #endif // GTEST_OS_WINDOWS_MOBILE
> }
> 
>@@ -116,14 +120,15 @@ FilePath FilePath::GetCurrentDir() {
> // FilePath("dir/file"). If a case-insensitive extension is not
> // found, returns a copy of the original FilePath.
> FilePath FilePath::RemoveExtension(const char* extension) const {
>- String dot_extension(String::Format(".%s", extension));
>- if (pathname_.EndsWithCaseInsensitive(dot_extension.c_str())) {
>- return FilePath(String(pathname_.c_str(), pathname_.length() - 4));
>+ const std::string dot_extension = std::string(".") + extension;
>+ if (String::EndsWithCaseInsensitive(pathname_, dot_extension)) {
>+ return FilePath(pathname_.substr(
>+ 0, pathname_.length() - dot_extension.length()));
> }
> return *this;
> }
> 
>-// Returns a pointer to the last occurence of a valid path separator in
>+// Returns a pointer to the last occurrence of a valid path separator in
> // the FilePath. On Windows, for example, both '/' and '\' are valid path
> // separators. Returns NULL if no path separator was found.
> const char* FilePath::FindLastPathSeparator() const {
>@@ -147,7 +152,7 @@ const char* FilePath::FindLastPathSeparator() const {
> // On Windows platform, '\' is the path separator, otherwise it is '/'.
> FilePath FilePath::RemoveDirectoryName() const {
> const char* const last_sep = FindLastPathSeparator();
>- return last_sep ? FilePath(String(last_sep + 1)) : *this;
>+ return last_sep ? FilePath(last_sep + 1) : *this;
> }
> 
> // RemoveFileName returns the directory path with the filename removed.
>@@ -158,9 +163,9 @@ FilePath FilePath::RemoveDirectoryName() const {
> // On Windows platform, '\' is the path separator, otherwise it is '/'.
> FilePath FilePath::RemoveFileName() const {
> const char* const last_sep = FindLastPathSeparator();
>- String dir;
>+ std::string dir;
> if (last_sep) {
>- dir = String(c_str(), last_sep + 1 - c_str());
>+ dir = std::string(c_str(), last_sep + 1 - c_str());
> } else {
> dir = kCurrentDirectoryString;
> }
>@@ -177,11 +182,12 @@ FilePath FilePath::MakeFileName(const FilePath& directory,
> const FilePath& base_name,
> int number,
> const char* extension) {
>- String file;
>+ std::string file;
> if (number == 0) {
>- file = String::Format("%s.%s", base_name.c_str(), extension);
>+ file = base_name.string() + "." + extension;
> } else {
>- file = String::Format("%s_%d.%s", base_name.c_str(), number, extension);
>+ file = base_name.string() + "_" + StreamableToString(number)
>+ + "." + extension;
> }
> return ConcatPaths(directory, FilePath(file));
> }
>@@ -193,8 +199,7 @@ FilePath FilePath::ConcatPaths(const FilePath& directory,
> if (directory.IsEmpty())
> return relative_path;
> const FilePath dir(directory.RemoveTrailingPathSeparator());
>- return FilePath(String::Format("%s%c%s", dir.c_str(), kPathSeparator,
>- relative_path.c_str()));
>+ return FilePath(dir.string() + kPathSeparator + relative_path.string());
> }
> 
> // Returns true if pathname describes something findable in the file-system,
>@@ -245,7 +250,7 @@ bool FilePath::DirectoryExists() const {
> // root directory per disk drive.)
> bool FilePath::IsRootDirectory() const {
> #if GTEST_OS_WINDOWS
>- // TODO(wan@google.com): on Windows a network share like
>+ // FIXME: on Windows a network share like
> // \\server\share can be a root directory, although it cannot be the
> // current directory. Handle this properly.
> return pathname_.length() == 3 && IsAbsolutePath();
>@@ -338,14 +343,14 @@ bool FilePath::CreateFolder() const {
> // On Windows platform, uses \ as the separator, other platforms use /.
> FilePath FilePath::RemoveTrailingPathSeparator() const {
> return IsDirectory()
>- ? FilePath(String(pathname_.c_str(), pathname_.length() - 1))
>+ ? FilePath(pathname_.substr(0, pathname_.length() - 1))
> : *this;
> }
> 
> // Removes any redundant separators that might be in the pathname.
> // For example, "bar///foo" becomes "bar/foo". Does not eliminate other
> // redundancies that might be in a pathname involving "." or "..".
>-// TODO(wan@google.com): handle Windows network shares (e.g. \\server\share).
>+// FIXME: handle Windows network shares (e.g. \\server\share).
> void FilePath::Normalize() {
> if (pathname_.c_str() == NULL) {
> pathname_ = "";
>diff --git a/Source/ThirdParty/gtest/src/gtest-internal-inl.h b/Source/ThirdParty/gtest/src/gtest-internal-inl.h
>index 01415f7d959dca0709fac176610db7388f604559..479004149b48c28564e205e0210c6c4310418b5b 100644
>--- a/Source/ThirdParty/gtest/src/gtest-internal-inl.h
>+++ b/Source/ThirdParty/gtest/src/gtest-internal-inl.h
>@@ -27,26 +27,15 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
>-// Utility functions and classes used by the Google C++ testing framework.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>-//
>+// Utility functions and classes used by the Google C++ testing framework.//
> // This file contains purely Google Test's internal implementation. Please
> // DO NOT #INCLUDE IT IN A USER PROGRAM.
> 
> #ifndef GTEST_SRC_GTEST_INTERNAL_INL_H_
> #define GTEST_SRC_GTEST_INTERNAL_INL_H_
> 
>-// GTEST_IMPLEMENTATION_ is defined to 1 iff the current translation unit is
>-// part of Google Test's implementation; otherwise it's undefined.
>-#if !GTEST_IMPLEMENTATION_
>-// A user is trying to include this from his code - just say no.
>-#error "gtest-internal-inl.h is part of Google Test's internal implementation."
>-#error "It must not be included except by Google Test itself."
>-#endif // GTEST_IMPLEMENTATION_
>-
> #ifndef _WIN32_WCE
>-#include <errno.h>
>+# include <errno.h>
> #endif // !_WIN32_WCE
> #include <stddef.h>
> #include <stdlib.h> // For strtoll/_strtoul64/malloc/free.
>@@ -56,14 +45,22 @@
> #include <string>
> #include <vector>
> 
>-#include <gtest/internal/gtest-port.h>
>+#include "gtest/internal/gtest-port.h"
>+
>+#if GTEST_CAN_STREAM_RESULTS_
>+# include <arpa/inet.h> // NOLINT
>+# include <netdb.h> // NOLINT
>+#endif
> 
> #if GTEST_OS_WINDOWS
>-#include <windows.h> // For DWORD.
>+# include <windows.h> // NOLINT
> #endif // GTEST_OS_WINDOWS
> 
>-#include <gtest/gtest.h> // NOLINT
>-#include <gtest/gtest-spi.h>
>+#include "gtest/gtest.h"
>+#include "gtest/gtest-spi.h"
>+
>+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
>+/* class A needs to have dll-interface to be used by clients of class B */)
> 
> namespace testing {
> 
>@@ -89,11 +86,14 @@ const char kFilterFlag[] = "filter";
> const char kListTestsFlag[] = "list_tests";
> const char kOutputFlag[] = "output";
> const char kPrintTimeFlag[] = "print_time";
>+const char kPrintUTF8Flag[] = "print_utf8";
> const char kRandomSeedFlag[] = "random_seed";
> const char kRepeatFlag[] = "repeat";
> const char kShuffleFlag[] = "shuffle";
> const char kStackTraceDepthFlag[] = "stack_trace_depth";
>+const char kStreamResultToFlag[] = "stream_result_to";
> const char kThrowOnFailureFlag[] = "throw_on_failure";
>+const char kFlagfileFlag[] = "flagfile";
> 
> // A valid random seed must be in [1, kMaxRandomSeed].
> const int kMaxRandomSeed = 99999;
>@@ -111,6 +111,12 @@ GTEST_API_ bool ShouldUseColor(bool stdout_is_tty);
> // Formats the given time in milliseconds as seconds.
> GTEST_API_ std::string FormatTimeInMillisAsSeconds(TimeInMillis ms);
> 
>+// Converts the given time in milliseconds to a date string in the ISO 8601
>+// format, without the timezone information. N.B.: due to the use the
>+// non-reentrant localtime() function, this function is not thread safe. Do
>+// not use it in any code that can be called from multiple threads.
>+GTEST_API_ std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms);
>+
> // Parses a string for an Int32 flag, in the form of "--flag=value".
> //
> // On success, stores the value of the flag in *value, and returns
>@@ -161,10 +167,12 @@ class GTestFlagSaver {
> list_tests_ = GTEST_FLAG(list_tests);
> output_ = GTEST_FLAG(output);
> print_time_ = GTEST_FLAG(print_time);
>+ print_utf8_ = GTEST_FLAG(print_utf8);
> random_seed_ = GTEST_FLAG(random_seed);
> repeat_ = GTEST_FLAG(repeat);
> shuffle_ = GTEST_FLAG(shuffle);
> stack_trace_depth_ = GTEST_FLAG(stack_trace_depth);
>+ stream_result_to_ = GTEST_FLAG(stream_result_to);
> throw_on_failure_ = GTEST_FLAG(throw_on_failure);
> }
> 
>@@ -181,41 +189,44 @@ class GTestFlagSaver {
> GTEST_FLAG(list_tests) = list_tests_;
> GTEST_FLAG(output) = output_;
> GTEST_FLAG(print_time) = print_time_;
>+ GTEST_FLAG(print_utf8) = print_utf8_;
> GTEST_FLAG(random_seed) = random_seed_;
> GTEST_FLAG(repeat) = repeat_;
> GTEST_FLAG(shuffle) = shuffle_;
> GTEST_FLAG(stack_trace_depth) = stack_trace_depth_;
>+ GTEST_FLAG(stream_result_to) = stream_result_to_;
> GTEST_FLAG(throw_on_failure) = throw_on_failure_;
> }
>+
> private:
> // Fields for saving the original values of flags.
> bool also_run_disabled_tests_;
> bool break_on_failure_;
> bool catch_exceptions_;
>- String color_;
>- String death_test_style_;
>+ std::string color_;
>+ std::string death_test_style_;
> bool death_test_use_fork_;
>- String filter_;
>- String internal_run_death_test_;
>+ std::string filter_;
>+ std::string internal_run_death_test_;
> bool list_tests_;
>- String output_;
>+ std::string output_;
> bool print_time_;
>+ bool print_utf8_;
> internal::Int32 random_seed_;
> internal::Int32 repeat_;
> bool shuffle_;
> internal::Int32 stack_trace_depth_;
>+ std::string stream_result_to_;
> bool throw_on_failure_;
> } GTEST_ATTRIBUTE_UNUSED_;
> 
> // Converts a Unicode code point to a narrow string in UTF-8 encoding.
> // code_point parameter is of type UInt32 because wchar_t may not be
> // wide enough to contain a code point.
>-// The output buffer str must containt at least 32 characters.
>-// The function returns the address of the output buffer.
> // If the code_point is not a valid Unicode code point
>-// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be output
>-// as '(Invalid Unicode 0xXXXXXXXX)'.
>-GTEST_API_ char* CodePointToUtf8(UInt32 code_point, char* str);
>+// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted
>+// to "(Invalid Unicode 0xXXXXXXXX)".
>+GTEST_API_ std::string CodePointToUtf8(UInt32 code_point);
> 
> // Converts a wide string to a narrow string in UTF-8 encoding.
> // The wide string is assumed to have the following encoding:
>@@ -230,7 +241,7 @@ GTEST_API_ char* CodePointToUtf8(UInt32 code_point, char* str);
> // as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding
> // and contains invalid UTF-16 surrogate pairs, values in those pairs
> // will be encoded as individual Unicode characters from Basic Normal Plane.
>-GTEST_API_ String WideStringToUtf8(const wchar_t* str, int num_chars);
>+GTEST_API_ std::string WideStringToUtf8(const wchar_t* str, int num_chars);
> 
> // Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
> // if the variable is present. If a file already exists at this location, this
>@@ -266,7 +277,14 @@ GTEST_API_ bool ShouldRunTestOnShard(
> // the given predicate.
> template <class Container, typename Predicate>
> inline int CountIf(const Container& c, Predicate predicate) {
>- return static_cast<int>(std::count_if(c.begin(), c.end(), predicate));
>+ // Implemented as an explicit loop since std::count_if() in libCstd on
>+ // Solaris has a non-standard signature.
>+ int count = 0;
>+ for (typename Container::const_iterator it = c.begin(); it != c.end(); ++it) {
>+ if (predicate(*it))
>+ ++count;
>+ }
>+ return count;
> }
> 
> // Applies a function/functor to each element in the container.
>@@ -327,95 +345,15 @@ class TestPropertyKeyIs {
> // Constructor.
> //
> // TestPropertyKeyIs has NO default constructor.
>- explicit TestPropertyKeyIs(const char* key)
>- : key_(key) {}
>+ explicit TestPropertyKeyIs(const std::string& key) : key_(key) {}
> 
> // Returns true iff the test name of test property matches on key_.
> bool operator()(const TestProperty& test_property) const {
>- return String(test_property.key()).Compare(key_) == 0;
>- }
>-
>- private:
>- String key_;
>-};
>-
>-class TestInfoImpl {
>- public:
>- TestInfoImpl(TestInfo* parent, const char* test_case_name,
>- const char* name, const char* test_case_comment,
>- const char* comment, TypeId fixture_class_id,
>- internal::TestFactoryBase* factory);
>- ~TestInfoImpl();
>-
>- // Returns true if this test should run.
>- bool should_run() const { return should_run_; }
>-
>- // Sets the should_run member.
>- void set_should_run(bool should) { should_run_ = should; }
>-
>- // Returns true if this test is disabled. Disabled tests are not run.
>- bool is_disabled() const { return is_disabled_; }
>-
>- // Sets the is_disabled member.
>- void set_is_disabled(bool is) { is_disabled_ = is; }
>-
>- // Returns true if this test matches the filter specified by the user.
>- bool matches_filter() const { return matches_filter_; }
>-
>- // Sets the matches_filter member.
>- void set_matches_filter(bool matches) { matches_filter_ = matches; }
>-
>- // Returns the test case name.
>- const char* test_case_name() const { return test_case_name_.c_str(); }
>-
>- // Returns the test name.
>- const char* name() const { return name_.c_str(); }
>-
>- // Returns the test case comment.
>- const char* test_case_comment() const { return test_case_comment_.c_str(); }
>-
>- // Returns the test comment.
>- const char* comment() const { return comment_.c_str(); }
>-
>- // Returns the ID of the test fixture class.
>- TypeId fixture_class_id() const { return fixture_class_id_; }
>-
>- // Returns the test result.
>- TestResult* result() { return &result_; }
>- const TestResult* result() const { return &result_; }
>-
>- // Creates the test object, runs it, records its result, and then
>- // deletes it.
>- void Run();
>-
>- // Clears the test result.
>- void ClearResult() { result_.Clear(); }
>-
>- // Clears the test result in the given TestInfo object.
>- static void ClearTestResult(TestInfo * test_info) {
>- test_info->impl()->ClearResult();
>+ return test_property.key() == key_;
> }
> 
> private:
>- // These fields are immutable properties of the test.
>- TestInfo* const parent_; // The owner of this object
>- const String test_case_name_; // Test case name
>- const String name_; // Test name
>- const String test_case_comment_; // Test case comment
>- const String comment_; // Test comment
>- const TypeId fixture_class_id_; // ID of the test fixture class
>- bool should_run_; // True iff this test should run
>- bool is_disabled_; // True iff this test is disabled
>- bool matches_filter_; // True if this test matches the
>- // user-specified filter.
>- internal::TestFactoryBase* const factory_; // The factory that creates
>- // the test object
>-
>- // This field is mutable and needs to be reset before running the
>- // test for the second time.
>- TestResult result_;
>-
>- GTEST_DISALLOW_COPY_AND_ASSIGN_(TestInfoImpl);
>+ std::string key_;
> };
> 
> // Class UnitTestOptions.
>@@ -433,12 +371,12 @@ class GTEST_API_ UnitTestOptions {
> // Functions for processing the gtest_output flag.
> 
> // Returns the output format, or "" for normal printed output.
>- static String GetOutputFormat();
>+ static std::string GetOutputFormat();
> 
> // Returns the absolute path of the requested output file, or the
> // default (test_detail.xml in the original working directory) if
> // none was explicitly specified.
>- static String GetAbsolutePathToOutputFile();
>+ static std::string GetAbsolutePathToOutputFile();
> 
> // Functions for processing the gtest_filter flag.
> 
>@@ -451,8 +389,8 @@ class GTEST_API_ UnitTestOptions {
> 
> // Returns true iff the user-specified filter matches the test case
> // name and the test name.
>- static bool FilterMatchesTest(const String &test_case_name,
>- const String &test_name);
>+ static bool FilterMatchesTest(const std::string &test_case_name,
>+ const std::string &test_name);
> 
> #if GTEST_OS_WINDOWS
> // Function for supporting the gtest_catch_exception flag.
>@@ -465,7 +403,7 @@ class GTEST_API_ UnitTestOptions {
> 
> // Returns true if "name" matches the ':' separated list of glob-style
> // filters in "filter".
>- static bool MatchesFilter(const String& name, const char* filter);
>+ static bool MatchesFilter(const std::string& name, const char* filter);
> };
> 
> // Returns the current application's name, removing directory path if that
>@@ -478,19 +416,23 @@ class OsStackTraceGetterInterface {
> OsStackTraceGetterInterface() {}
> virtual ~OsStackTraceGetterInterface() {}
> 
>- // Returns the current OS stack trace as a String. Parameters:
>+ // Returns the current OS stack trace as an std::string. Parameters:
> //
> // max_depth - the maximum number of stack frames to be included
> // in the trace.
> // skip_count - the number of top frames to be skipped; doesn't count
> // against max_depth.
>- virtual String CurrentStackTrace(int max_depth, int skip_count) = 0;
>+ virtual std::string CurrentStackTrace(int max_depth, int skip_count) = 0;
> 
> // UponLeavingGTest() should be called immediately before Google Test calls
> // user code. It saves some information about the current stack that
> // CurrentStackTrace() will use to find and hide Google Test stack frames.
> virtual void UponLeavingGTest() = 0;
> 
>+ // This string is inserted in place of stack frames that are part of
>+ // Google Test's implementation.
>+ static const char* const kElidedFramesMarker;
>+
> private:
> GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetterInterface);
> };
>@@ -498,22 +440,21 @@ class OsStackTraceGetterInterface {
> // A working implementation of the OsStackTraceGetterInterface interface.
> class OsStackTraceGetter : public OsStackTraceGetterInterface {
> public:
>- OsStackTraceGetter() : caller_frame_(NULL) {}
>- virtual String CurrentStackTrace(int max_depth, int skip_count);
>- virtual void UponLeavingGTest();
>+ OsStackTraceGetter() {}
> 
>- // This string is inserted in place of stack frames that are part of
>- // Google Test's implementation.
>- static const char* const kElidedFramesMarker;
>+ virtual std::string CurrentStackTrace(int max_depth, int skip_count);
>+ virtual void UponLeavingGTest();
> 
> private:
>- Mutex mutex_; // protects all internal state
>+#if GTEST_HAS_ABSL
>+ Mutex mutex_; // Protects all internal state.
> 
> // We save the stack frame below the frame that calls user code.
> // We do this because the address of the frame immediately below
> // the user code changes between the call to UponLeavingGTest()
>- // and any calls to CurrentStackTrace() from within the user code.
>- void* caller_frame_;
>+ // and any calls to the stack trace code from within the user code.
>+ void* caller_frame_ = nullptr;
>+#endif // GTEST_HAS_ABSL
> 
> GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetter);
> };
>@@ -522,7 +463,7 @@ class OsStackTraceGetter : public OsStackTraceGetterInterface {
> struct TraceInfo {
> const char* file;
> int line;
>- String message;
>+ std::string message;
> };
> 
> // This is the default global test part result reporter used in UnitTestImpl.
>@@ -606,15 +547,25 @@ class GTEST_API_ UnitTestImpl {
> // Gets the number of failed tests.
> int failed_test_count() const;
> 
>+ // Gets the number of disabled tests that will be reported in the XML report.
>+ int reportable_disabled_test_count() const;
>+
> // Gets the number of disabled tests.
> int disabled_test_count() const;
> 
>+ // Gets the number of tests to be printed in the XML report.
>+ int reportable_test_count() const;
>+
> // Gets the number of all tests.
> int total_test_count() const;
> 
> // Gets the number of tests that should run.
> int test_to_run_count() const;
> 
>+ // Gets the time of the test program start, in ms from the start of the
>+ // UNIX epoch.
>+ TimeInMillis start_timestamp() const { return start_timestamp_; }
>+
> // Gets the elapsed time, in milliseconds.
> TimeInMillis elapsed_time() const { return elapsed_time_; }
> 
>@@ -663,7 +614,7 @@ class GTEST_API_ UnitTestImpl {
> // getter, and returns it.
> OsStackTraceGetterInterface* os_stack_trace_getter();
> 
>- // Returns the current OS stack trace as a String.
>+ // Returns the current OS stack trace as an std::string.
> //
> // The maximum number of stack frames to be included is specified by
> // the gtest_stack_trace_depth flag. The skip_count parameter
>@@ -673,7 +624,7 @@ class GTEST_API_ UnitTestImpl {
> // For example, if Foo() calls Bar(), which in turn calls
> // CurrentOsStackTraceExceptTop(1), Foo() will be included in the
> // trace but Bar() and CurrentOsStackTraceExceptTop() won't.
>- String CurrentOsStackTraceExceptTop(int skip_count);
>+ std::string CurrentOsStackTraceExceptTop(int skip_count) GTEST_NO_INLINE_;
> 
> // Finds and returns a TestCase with the given name. If one doesn't
> // exist, creates one and returns it.
>@@ -681,10 +632,12 @@ class GTEST_API_ UnitTestImpl {
> // Arguments:
> //
> // test_case_name: name of the test case
>+ // type_param: the name of the test's type parameter, or NULL if
>+ // this is not a typed or a type-parameterized test.
> // set_up_tc: pointer to the function that sets up the test case
> // tear_down_tc: pointer to the function that tears down the test case
> TestCase* GetTestCase(const char* test_case_name,
>- const char* comment,
>+ const char* type_param,
> Test::SetUpTestCaseFunc set_up_tc,
> Test::TearDownTestCaseFunc tear_down_tc);
> 
>@@ -697,7 +650,7 @@ class GTEST_API_ UnitTestImpl {
> // test_info: the TestInfo object
> void AddTestInfo(Test::SetUpTestCaseFunc set_up_tc,
> Test::TearDownTestCaseFunc tear_down_tc,
>- TestInfo * test_info) {
>+ TestInfo* test_info) {
> // In order to support thread-safe death tests, we need to
> // remember the original working directory when the test program
> // was first invoked. We cannot do this in RUN_ALL_TESTS(), as
>@@ -712,18 +665,16 @@ class GTEST_API_ UnitTestImpl {
> }
> 
> GetTestCase(test_info->test_case_name(),
>- test_info->test_case_comment(),
>+ test_info->type_param(),
> set_up_tc,
> tear_down_tc)->AddTestInfo(test_info);
> }
> 
>-#if GTEST_HAS_PARAM_TEST
> // Returns ParameterizedTestCaseRegistry object used to keep track of
> // value-parameterized tests and instantiate and register them.
> internal::ParameterizedTestCaseRegistry& parameterized_test_registry() {
> return parameterized_test_registry_;
> }
>-#endif // GTEST_HAS_PARAM_TEST
> 
> // Sets the TestCase object for the test that's currently running.
> void set_current_test_case(TestCase* a_current_test_case) {
>@@ -738,27 +689,35 @@ class GTEST_API_ UnitTestImpl {
> }
> 
> // Registers all parameterized tests defined using TEST_P and
>- // INSTANTIATE_TEST_P, creating regular tests for each test/parameter
>- // combination. This method can be called more then once; it has
>- // guards protecting from registering the tests more then once.
>- // If value-parameterized tests are disabled, RegisterParameterizedTests
>- // is present but does nothing.
>+ // INSTANTIATE_TEST_CASE_P, creating regular tests for each test/parameter
>+ // combination. This method can be called more then once; it has guards
>+ // protecting from registering the tests more then once. If
>+ // value-parameterized tests are disabled, RegisterParameterizedTests is
>+ // present but does nothing.
> void RegisterParameterizedTests();
> 
> // Runs all tests in this UnitTest object, prints the result, and
>- // returns 0 if all tests are successful, or 1 otherwise. If any
>- // exception is thrown during a test on Windows, this test is
>- // considered to be failed, but the rest of the tests will still be
>- // run. (We disable exceptions on Linux and Mac OS X, so the issue
>- // doesn't apply there.)
>- int RunAllTests();
>-
>- // Clears the results of all tests, including the ad hoc test.
>- void ClearResult() {
>+ // returns true if all tests are successful. If any exception is
>+ // thrown during a test, this test is considered to be failed, but
>+ // the rest of the tests will still be run.
>+ bool RunAllTests();
>+
>+ // Clears the results of all tests, except the ad hoc tests.
>+ void ClearNonAdHocTestResult() {
> ForEach(test_cases_, TestCase::ClearTestCaseResult);
>+ }
>+
>+ // Clears the results of ad-hoc test assertions.
>+ void ClearAdHocTestResult() {
> ad_hoc_test_result_.Clear();
> }
> 
>+ // Adds a TestProperty to the current TestResult object when invoked in a
>+ // context of a test or a test case, or to the global property set. If the
>+ // result already contains a property with the same key, the value will be
>+ // updated.
>+ void RecordProperty(const TestProperty& test_property);
>+
> enum ReactionToSharding {
> HONOR_SHARDING_PROTOCOL,
> IGNORE_SHARDING_PROTOCOL
>@@ -817,6 +776,12 @@ class GTEST_API_ UnitTestImpl {
> // UnitTestOptions. Must not be called before InitGoogleTest.
> void ConfigureXmlOutput();
> 
>+#if GTEST_CAN_STREAM_RESULTS_
>+ // Initializes the event listener for streaming test results to a socket.
>+ // Must not be called before InitGoogleTest.
>+ void ConfigureStreamingOutput();
>+#endif
>+
> // Performs initialization dependent upon flag values obtained in
> // ParseGoogleTestFlagsOnly. Is called from InitGoogleTest after the call to
> // ParseGoogleTestFlagsOnly. In case a user neglects to call InitGoogleTest
>@@ -837,9 +802,17 @@ class GTEST_API_ UnitTestImpl {
> // Restores the test cases and tests to their order before the first shuffle.
> void UnshuffleTests();
> 
>+ // Returns the value of GTEST_FLAG(catch_exceptions) at the moment
>+ // UnitTest::Run() starts.
>+ bool catch_exceptions() const { return catch_exceptions_; }
>+
> private:
> friend class ::testing::UnitTest;
> 
>+ // Used by UnitTest::Run() to capture the state of
>+ // GTEST_FLAG(catch_exceptions) at the moment it starts.
>+ void set_catch_exceptions(bool value) { catch_exceptions_ = value; }
>+
> // The UnitTest object that owns this implementation object.
> UnitTest* const parent_;
> 
>@@ -876,14 +849,12 @@ class GTEST_API_ UnitTestImpl {
> // shuffled order.
> std::vector<int> test_case_indices_;
> 
>-#if GTEST_HAS_PARAM_TEST
> // ParameterizedTestRegistry object used to register value-parameterized
> // tests.
> internal::ParameterizedTestCaseRegistry parameterized_test_registry_;
> 
> // Indicates whether RegisterParameterizedTests() has been called already.
> bool parameterized_tests_registered_;
>-#endif // GTEST_HAS_PARAM_TEST
> 
> // Index of the last death test case registered. Initially -1.
> int last_death_test_case_;
>@@ -929,6 +900,10 @@ class GTEST_API_ UnitTestImpl {
> // Our random number generator.
> internal::Random random_;
> 
>+ // The time of the test program start, in ms from the start of the
>+ // UNIX epoch.
>+ TimeInMillis start_timestamp_;
>+
> // How long the test took to run, in milliseconds.
> TimeInMillis elapsed_time_;
> 
>@@ -942,6 +917,10 @@ class GTEST_API_ UnitTestImpl {
> // A per-thread stack of traces created by the SCOPED_TRACE() macro.
> internal::ThreadLocal<std::vector<TraceInfo> > gtest_trace_stack_;
> 
>+ // The value of GTEST_FLAG(catch_exceptions) at the moment RunAllTests()
>+ // starts.
>+ bool catch_exceptions_;
>+
> GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTestImpl);
> }; // class UnitTestImpl
> 
>@@ -951,14 +930,16 @@ inline UnitTestImpl* GetUnitTestImpl() {
> return UnitTest::GetInstance()->impl();
> }
> 
>+#if GTEST_USES_SIMPLE_RE
>+
> // Internal helper functions for implementing the simple regular
> // expression matcher.
> GTEST_API_ bool IsInSet(char ch, const char* str);
>-GTEST_API_ bool IsDigit(char ch);
>-GTEST_API_ bool IsPunct(char ch);
>+GTEST_API_ bool IsAsciiDigit(char ch);
>+GTEST_API_ bool IsAsciiPunct(char ch);
> GTEST_API_ bool IsRepeat(char ch);
>-GTEST_API_ bool IsWhiteSpace(char ch);
>-GTEST_API_ bool IsWordChar(char ch);
>+GTEST_API_ bool IsAsciiWhiteSpace(char ch);
>+GTEST_API_ bool IsAsciiWordChar(char ch);
> GTEST_API_ bool IsValidEscape(char ch);
> GTEST_API_ bool AtomMatchesChar(bool escaped, char pattern, char ch);
> GTEST_API_ bool ValidateRegex(const char* regex);
>@@ -967,6 +948,8 @@ GTEST_API_ bool MatchRepetitionAndRegexAtHead(
> bool escaped, char ch, char repeat, const char* regex, const char* str);
> GTEST_API_ bool MatchRegexAnywhere(const char* regex, const char* str);
> 
>+#endif // GTEST_USES_SIMPLE_RE
>+
> // Parses the command line for Google Test flags, without initializing
> // other parts of Google Test.
> GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, char** argv);
>@@ -976,33 +959,7 @@ GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv);
> 
> // Returns the message describing the last system error, regardless of the
> // platform.
>-String GetLastErrnoDescription();
>-
>-#if GTEST_OS_WINDOWS
>-// Provides leak-safe Windows kernel handle ownership.
>-class AutoHandle {
>- public:
>- AutoHandle() : handle_(INVALID_HANDLE_VALUE) {}
>- explicit AutoHandle(HANDLE handle) : handle_(handle) {}
>-
>- ~AutoHandle() { Reset(); }
>-
>- HANDLE Get() const { return handle_; }
>- void Reset() { Reset(INVALID_HANDLE_VALUE); }
>- void Reset(HANDLE handle) {
>- if (handle != handle_) {
>- if (handle_ != INVALID_HANDLE_VALUE)
>- ::CloseHandle(handle_);
>- handle_ = handle;
>- }
>- }
>-
>- private:
>- HANDLE handle_;
>-
>- GTEST_DISALLOW_COPY_AND_ASSIGN_(AutoHandle);
>-};
>-#endif // GTEST_OS_WINDOWS
>+GTEST_API_ std::string GetLastErrnoDescription();
> 
> // Attempts to parse a string into a positive integer pointed to by the
> // number parameter. Returns true if that is possible.
>@@ -1013,7 +970,7 @@ bool ParseNaturalNumber(const ::std::string& str, Integer* number) {
> // Fail fast if the given string does not begin with a digit;
> // this bypasses strtoXXX's "optional leading whitespace and plus
> // or minus sign" semantics, which are undesirable here.
>- if (str.empty() || !isdigit(str[0])) {
>+ if (str.empty() || !IsDigit(str[0])) {
> return false;
> }
> errno = 0;
>@@ -1021,17 +978,23 @@ bool ParseNaturalNumber(const ::std::string& str, Integer* number) {
> char* end;
> // BiggestConvertible is the largest integer type that system-provided
> // string-to-number conversion routines can return.
>-#if GTEST_OS_WINDOWS && !defined(__GNUC__)
>+
>+# if GTEST_OS_WINDOWS && !defined(__GNUC__)
>+
> // MSVC and C++ Builder define __int64 instead of the standard long long.
> typedef unsigned __int64 BiggestConvertible;
> const BiggestConvertible parsed = _strtoui64(str.c_str(), &end, 10);
>-#else
>+
>+# else
>+
> typedef unsigned long long BiggestConvertible; // NOLINT
> const BiggestConvertible parsed = strtoull(str.c_str(), &end, 10);
>-#endif // GTEST_OS_WINDOWS && !defined(__GNUC__)
>+
>+# endif // GTEST_OS_WINDOWS && !defined(__GNUC__)
>+
> const bool parse_success = *end == '\0' && errno == 0;
> 
>- // TODO(vladl@google.com): Convert this to compile time assertion when it is
>+ // FIXME: Convert this to compile time assertion when it is
> // available.
> GTEST_CHECK_(sizeof(Integer) <= sizeof(parsed));
> 
>@@ -1053,8 +1016,9 @@ bool ParseNaturalNumber(const ::std::string& str, Integer* number) {
> class TestResultAccessor {
> public:
> static void RecordProperty(TestResult* test_result,
>+ const std::string& xml_element,
> const TestProperty& property) {
>- test_result->RecordProperty(property);
>+ test_result->RecordProperty(xml_element, property);
> }
> 
> static void ClearTestPartResults(TestResult* test_result) {
>@@ -1067,7 +1031,157 @@ class TestResultAccessor {
> }
> };
> 
>+#if GTEST_CAN_STREAM_RESULTS_
>+
>+// Streams test results to the given port on the given host machine.
>+class StreamingListener : public EmptyTestEventListener {
>+ public:
>+ // Abstract base class for writing strings to a socket.
>+ class AbstractSocketWriter {
>+ public:
>+ virtual ~AbstractSocketWriter() {}
>+
>+ // Sends a string to the socket.
>+ virtual void Send(const std::string& message) = 0;
>+
>+ // Closes the socket.
>+ virtual void CloseConnection() {}
>+
>+ // Sends a string and a newline to the socket.
>+ void SendLn(const std::string& message) { Send(message + "\n"); }
>+ };
>+
>+ // Concrete class for actually writing strings to a socket.
>+ class SocketWriter : public AbstractSocketWriter {
>+ public:
>+ SocketWriter(const std::string& host, const std::string& port)
>+ : sockfd_(-1), host_name_(host), port_num_(port) {
>+ MakeConnection();
>+ }
>+
>+ virtual ~SocketWriter() {
>+ if (sockfd_ != -1)
>+ CloseConnection();
>+ }
>+
>+ // Sends a string to the socket.
>+ virtual void Send(const std::string& message) {
>+ GTEST_CHECK_(sockfd_ != -1)
>+ << "Send() can be called only when there is a connection.";
>+
>+ const int len = static_cast<int>(message.length());
>+ if (write(sockfd_, message.c_str(), len) != len) {
>+ GTEST_LOG_(WARNING)
>+ << "stream_result_to: failed to stream to "
>+ << host_name_ << ":" << port_num_;
>+ }
>+ }
>+
>+ private:
>+ // Creates a client socket and connects to the server.
>+ void MakeConnection();
>+
>+ // Closes the socket.
>+ void CloseConnection() {
>+ GTEST_CHECK_(sockfd_ != -1)
>+ << "CloseConnection() can be called only when there is a connection.";
>+
>+ close(sockfd_);
>+ sockfd_ = -1;
>+ }
>+
>+ int sockfd_; // socket file descriptor
>+ const std::string host_name_;
>+ const std::string port_num_;
>+
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(SocketWriter);
>+ }; // class SocketWriter
>+
>+ // Escapes '=', '&', '%', and '\n' characters in str as "%xx".
>+ static std::string UrlEncode(const char* str);
>+
>+ StreamingListener(const std::string& host, const std::string& port)
>+ : socket_writer_(new SocketWriter(host, port)) {
>+ Start();
>+ }
>+
>+ explicit StreamingListener(AbstractSocketWriter* socket_writer)
>+ : socket_writer_(socket_writer) { Start(); }
>+
>+ void OnTestProgramStart(const UnitTest& /* unit_test */) {
>+ SendLn("event=TestProgramStart");
>+ }
>+
>+ void OnTestProgramEnd(const UnitTest& unit_test) {
>+ // Note that Google Test current only report elapsed time for each
>+ // test iteration, not for the entire test program.
>+ SendLn("event=TestProgramEnd&passed=" + FormatBool(unit_test.Passed()));
>+
>+ // Notify the streaming server to stop.
>+ socket_writer_->CloseConnection();
>+ }
>+
>+ void OnTestIterationStart(const UnitTest& /* unit_test */, int iteration) {
>+ SendLn("event=TestIterationStart&iteration=" +
>+ StreamableToString(iteration));
>+ }
>+
>+ void OnTestIterationEnd(const UnitTest& unit_test, int /* iteration */) {
>+ SendLn("event=TestIterationEnd&passed=" +
>+ FormatBool(unit_test.Passed()) + "&elapsed_time=" +
>+ StreamableToString(unit_test.elapsed_time()) + "ms");
>+ }
>+
>+ void OnTestCaseStart(const TestCase& test_case) {
>+ SendLn(std::string("event=TestCaseStart&name=") + test_case.name());
>+ }
>+
>+ void OnTestCaseEnd(const TestCase& test_case) {
>+ SendLn("event=TestCaseEnd&passed=" + FormatBool(test_case.Passed())
>+ + "&elapsed_time=" + StreamableToString(test_case.elapsed_time())
>+ + "ms");
>+ }
>+
>+ void OnTestStart(const TestInfo& test_info) {
>+ SendLn(std::string("event=TestStart&name=") + test_info.name());
>+ }
>+
>+ void OnTestEnd(const TestInfo& test_info) {
>+ SendLn("event=TestEnd&passed=" +
>+ FormatBool((test_info.result())->Passed()) +
>+ "&elapsed_time=" +
>+ StreamableToString((test_info.result())->elapsed_time()) + "ms");
>+ }
>+
>+ void OnTestPartResult(const TestPartResult& test_part_result) {
>+ const char* file_name = test_part_result.file_name();
>+ if (file_name == NULL)
>+ file_name = "";
>+ SendLn("event=TestPartResult&file=" + UrlEncode(file_name) +
>+ "&line=" + StreamableToString(test_part_result.line_number()) +
>+ "&message=" + UrlEncode(test_part_result.message()));
>+ }
>+
>+ private:
>+ // Sends the given message and a newline to the socket.
>+ void SendLn(const std::string& message) { socket_writer_->SendLn(message); }
>+
>+ // Called at the start of streaming to notify the receiver what
>+ // protocol we are using.
>+ void Start() { SendLn("gtest_streaming_protocol_version=1.0"); }
>+
>+ std::string FormatBool(bool value) { return value ? "1" : "0"; }
>+
>+ const scoped_ptr<AbstractSocketWriter> socket_writer_;
>+
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamingListener);
>+}; // class StreamingListener
>+
>+#endif // GTEST_CAN_STREAM_RESULTS_
>+
> } // namespace internal
> } // namespace testing
> 
>+GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251
>+
> #endif // GTEST_SRC_GTEST_INTERNAL_INL_H_
>diff --git a/Source/ThirdParty/gtest/src/gtest-port.cc b/Source/ThirdParty/gtest/src/gtest-port.cc
>index b9504f56ae6f93e126d2b568a7d97db517fb83e4..fecb5d11c21296a9181a11280226067b643edd05 100644
>--- a/Source/ThirdParty/gtest/src/gtest-port.cc
>+++ b/Source/ThirdParty/gtest/src/gtest-port.cc
>@@ -26,42 +26,52 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
> 
>-#include <gtest/internal/gtest-port.h>
>+
>+#include "gtest/internal/gtest-port.h"
> 
> #include <limits.h>
> #include <stdlib.h>
> #include <stdio.h>
>+#include <string.h>
>+#include <fstream>
> 
>-#if GTEST_OS_WINDOWS_MOBILE
>-#include <windows.h> // For TerminateProcess()
>-#elif GTEST_OS_WINDOWS
>-#include <io.h>
>-#include <sys/stat.h>
>+#if GTEST_OS_WINDOWS
>+# include <windows.h>
>+# include <io.h>
>+# include <sys/stat.h>
>+# include <map> // Used in ThreadLocal.
> #else
>-#include <unistd.h>
>-#endif // GTEST_OS_WINDOWS_MOBILE
>+# include <unistd.h>
>+#endif // GTEST_OS_WINDOWS
> 
> #if GTEST_OS_MAC
>-#include <mach/mach_init.h>
>-#include <mach/task.h>
>-#include <mach/vm_map.h>
>+# include <mach/mach_init.h>
>+# include <mach/task.h>
>+# include <mach/vm_map.h>
> #endif // GTEST_OS_MAC
> 
>-#include <gtest/gtest-spi.h>
>-#include <gtest/gtest-message.h>
>-#include <gtest/internal/gtest-string.h>
>-
>-// Indicates that this translation unit is part of Google Test's
>-// implementation. It must come before gtest-internal-inl.h is
>-// included, or there will be a compiler error. This trick is to
>-// prevent a user from accidentally including gtest-internal-inl.h in
>-// his code.
>-#define GTEST_IMPLEMENTATION_ 1
>+#if GTEST_OS_QNX
>+# include <devctl.h>
>+# include <fcntl.h>
>+# include <sys/procfs.h>
>+#endif // GTEST_OS_QNX
>+
>+#if GTEST_OS_AIX
>+# include <procinfo.h>
>+# include <sys/types.h>
>+#endif // GTEST_OS_AIX
>+
>+#if GTEST_OS_FUCHSIA
>+# include <zircon/process.h>
>+# include <zircon/syscalls.h>
>+#endif // GTEST_OS_FUCHSIA
>+
>+#include "gtest/gtest-spi.h"
>+#include "gtest/gtest-message.h"
>+#include "gtest/internal/gtest-internal.h"
>+#include "gtest/internal/gtest-string.h"
> #include "src/gtest-internal-inl.h"
>-#undef GTEST_IMPLEMENTATION_
> 
> namespace testing {
> namespace internal {
>@@ -75,10 +85,31 @@ const int kStdOutFileno = STDOUT_FILENO;
> const int kStdErrFileno = STDERR_FILENO;
> #endif // _MSC_VER
> 
>-#if GTEST_OS_MAC
>+#if GTEST_OS_LINUX
>+
>+namespace {
>+template <typename T>
>+T ReadProcFileField(const std::string& filename, int field) {
>+ std::string dummy;
>+ std::ifstream file(filename.c_str());
>+ while (field-- > 0) {
>+ file >> dummy;
>+ }
>+ T output = 0;
>+ file >> output;
>+ return output;
>+}
>+} // namespace
>+
>+// Returns the number of active threads, or 0 when there is an error.
>+size_t GetThreadCount() {
>+ const std::string filename =
>+ (Message() << "/proc/" << getpid() << "/stat").GetString();
>+ return ReadProcFileField<int>(filename, 19);
>+}
>+
>+#elif GTEST_OS_MAC
> 
>-// Returns the number of threads running in the process, or 0 to indicate that
>-// we cannot detect it.
> size_t GetThreadCount() {
> const task_t task = mach_task_self();
> mach_msg_type_number_t thread_count;
>@@ -96,6 +127,58 @@ size_t GetThreadCount() {
> }
> }
> 
>+#elif GTEST_OS_QNX
>+
>+// Returns the number of threads running in the process, or 0 to indicate that
>+// we cannot detect it.
>+size_t GetThreadCount() {
>+ const int fd = open("/proc/self/as", O_RDONLY);
>+ if (fd < 0) {
>+ return 0;
>+ }
>+ procfs_info process_info;
>+ const int status =
>+ devctl(fd, DCMD_PROC_INFO, &process_info, sizeof(process_info), NULL);
>+ close(fd);
>+ if (status == EOK) {
>+ return static_cast<size_t>(process_info.num_threads);
>+ } else {
>+ return 0;
>+ }
>+}
>+
>+#elif GTEST_OS_AIX
>+
>+size_t GetThreadCount() {
>+ struct procentry64 entry;
>+ pid_t pid = getpid();
>+ int status = getprocs64(&entry, sizeof(entry), NULL, 0, &pid, 1);
>+ if (status == 1) {
>+ return entry.pi_thcount;
>+ } else {
>+ return 0;
>+ }
>+}
>+
>+#elif GTEST_OS_FUCHSIA
>+
>+size_t GetThreadCount() {
>+ int dummy_buffer;
>+ size_t avail;
>+ zx_status_t status = zx_object_get_info(
>+ zx_process_self(),
>+ ZX_INFO_PROCESS_THREADS,
>+ &dummy_buffer,
>+ 0,
>+ nullptr,
>+ &avail);
>+ if (status == ZX_OK) {
>+ return avail;
>+ } else {
>+ return 0;
>+ }
>+}
>+
> #else
> 
> size_t GetThreadCount() {
>@@ -104,7 +187,432 @@ size_t GetThreadCount() {
> return 0;
> }
> 
>-#endif // GTEST_OS_MAC
>+#endif // GTEST_OS_LINUX
>+
>+#if GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS
>+
>+void SleepMilliseconds(int n) {
>+ ::Sleep(n);
>+}
>+
>+AutoHandle::AutoHandle()
>+ : handle_(INVALID_HANDLE_VALUE) {}
>+
>+AutoHandle::AutoHandle(Handle handle)
>+ : handle_(handle) {}
>+
>+AutoHandle::~AutoHandle() {
>+ Reset();
>+}
>+
>+AutoHandle::Handle AutoHandle::Get() const {
>+ return handle_;
>+}
>+
>+void AutoHandle::Reset() {
>+ Reset(INVALID_HANDLE_VALUE);
>+}
>+
>+void AutoHandle::Reset(HANDLE handle) {
>+ // Resetting with the same handle we already own is invalid.
>+ if (handle_ != handle) {
>+ if (IsCloseable()) {
>+ ::CloseHandle(handle_);
>+ }
>+ handle_ = handle;
>+ } else {
>+ GTEST_CHECK_(!IsCloseable())
>+ << "Resetting a valid handle to itself is likely a programmer error "
>+ "and thus not allowed.";
>+ }
>+}
>+
>+bool AutoHandle::IsCloseable() const {
>+ // Different Windows APIs may use either of these values to represent an
>+ // invalid handle.
>+ return handle_ != NULL && handle_ != INVALID_HANDLE_VALUE;
>+}
>+
>+Notification::Notification()
>+ : event_(::CreateEvent(NULL, // Default security attributes.
>+ TRUE, // Do not reset automatically.
>+ FALSE, // Initially unset.
>+ NULL)) { // Anonymous event.
>+ GTEST_CHECK_(event_.Get() != NULL);
>+}
>+
>+void Notification::Notify() {
>+ GTEST_CHECK_(::SetEvent(event_.Get()) != FALSE);
>+}
>+
>+void Notification::WaitForNotification() {
>+ GTEST_CHECK_(
>+ ::WaitForSingleObject(event_.Get(), INFINITE) == WAIT_OBJECT_0);
>+}
>+
>+Mutex::Mutex()
>+ : owner_thread_id_(0),
>+ type_(kDynamic),
>+ critical_section_init_phase_(0),
>+ critical_section_(new CRITICAL_SECTION) {
>+ ::InitializeCriticalSection(critical_section_);
>+}
>+
>+Mutex::~Mutex() {
>+ // Static mutexes are leaked intentionally. It is not thread-safe to try
>+ // to clean them up.
>+ // FIXME: Switch to Slim Reader/Writer (SRW) Locks, which requires
>+ // nothing to clean it up but is available only on Vista and later.
>+ // https://docs.microsoft.com/en-us/windows/desktop/Sync/slim-reader-writer--srw--locks
>+ if (type_ == kDynamic) {
>+ ::DeleteCriticalSection(critical_section_);
>+ delete critical_section_;
>+ critical_section_ = NULL;
>+ }
>+}
>+
>+void Mutex::Lock() {
>+ ThreadSafeLazyInit();
>+ ::EnterCriticalSection(critical_section_);
>+ owner_thread_id_ = ::GetCurrentThreadId();
>+}
>+
>+void Mutex::Unlock() {
>+ ThreadSafeLazyInit();
>+ // We don't protect writing to owner_thread_id_ here, as it's the
>+ // caller's responsibility to ensure that the current thread holds the
>+ // mutex when this is called.
>+ owner_thread_id_ = 0;
>+ ::LeaveCriticalSection(critical_section_);
>+}
>+
>+// Does nothing if the current thread holds the mutex. Otherwise, crashes
>+// with high probability.
>+void Mutex::AssertHeld() {
>+ ThreadSafeLazyInit();
>+ GTEST_CHECK_(owner_thread_id_ == ::GetCurrentThreadId())
>+ << "The current thread is not holding the mutex @" << this;
>+}
>+
>+namespace {
>+
>+// Use the RAII idiom to flag mem allocs that are intentionally never
>+// deallocated. The motivation is to silence the false positive mem leaks
>+// that are reported by the debug version of MS's CRT which can only detect
>+// if an alloc is missing a matching deallocation.
>+// Example:
>+// MemoryIsNotDeallocated memory_is_not_deallocated;
>+// critical_section_ = new CRITICAL_SECTION;
>+//
>+class MemoryIsNotDeallocated
>+{
>+ public:
>+ MemoryIsNotDeallocated() : old_crtdbg_flag_(0) {
>+#ifdef _MSC_VER
>+ old_crtdbg_flag_ = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
>+ // Set heap allocation block type to _IGNORE_BLOCK so that MS debug CRT
>+ // doesn't report mem leak if there's no matching deallocation.
>+ _CrtSetDbgFlag(old_crtdbg_flag_ & ~_CRTDBG_ALLOC_MEM_DF);
>+#endif // _MSC_VER
>+ }
>+
>+ ~MemoryIsNotDeallocated() {
>+#ifdef _MSC_VER
>+ // Restore the original _CRTDBG_ALLOC_MEM_DF flag
>+ _CrtSetDbgFlag(old_crtdbg_flag_);
>+#endif // _MSC_VER
>+ }
>+
>+ private:
>+ int old_crtdbg_flag_;
>+
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(MemoryIsNotDeallocated);
>+};
>+
>+} // namespace
>+
>+// Initializes owner_thread_id_ and critical_section_ in static mutexes.
>+void Mutex::ThreadSafeLazyInit() {
>+ // Dynamic mutexes are initialized in the constructor.
>+ if (type_ == kStatic) {
>+ switch (
>+ ::InterlockedCompareExchange(&critical_section_init_phase_, 1L, 0L)) {
>+ case 0:
>+ // If critical_section_init_phase_ was 0 before the exchange, we
>+ // are the first to test it and need to perform the initialization.
>+ owner_thread_id_ = 0;
>+ {
>+ // Use RAII to flag that following mem alloc is never deallocated.
>+ MemoryIsNotDeallocated memory_is_not_deallocated;
>+ critical_section_ = new CRITICAL_SECTION;
>+ }
>+ ::InitializeCriticalSection(critical_section_);
>+ // Updates the critical_section_init_phase_ to 2 to signal
>+ // initialization complete.
>+ GTEST_CHECK_(::InterlockedCompareExchange(
>+ &critical_section_init_phase_, 2L, 1L) ==
>+ 1L);
>+ break;
>+ case 1:
>+ // Somebody else is already initializing the mutex; spin until they
>+ // are done.
>+ while (::InterlockedCompareExchange(&critical_section_init_phase_,
>+ 2L,
>+ 2L) != 2L) {
>+ // Possibly yields the rest of the thread's time slice to other
>+ // threads.
>+ ::Sleep(0);
>+ }
>+ break;
>+
>+ case 2:
>+ break; // The mutex is already initialized and ready for use.
>+
>+ default:
>+ GTEST_CHECK_(false)
>+ << "Unexpected value of critical_section_init_phase_ "
>+ << "while initializing a static mutex.";
>+ }
>+ }
>+}
>+
>+namespace {
>+
>+class ThreadWithParamSupport : public ThreadWithParamBase {
>+ public:
>+ static HANDLE CreateThread(Runnable* runnable,
>+ Notification* thread_can_start) {
>+ ThreadMainParam* param = new ThreadMainParam(runnable, thread_can_start);
>+ DWORD thread_id;
>+ // FIXME: Consider to use _beginthreadex instead.
>+ HANDLE thread_handle = ::CreateThread(
>+ NULL, // Default security.
>+ 0, // Default stack size.
>+ &ThreadWithParamSupport::ThreadMain,
>+ param, // Parameter to ThreadMainStatic
>+ 0x0, // Default creation flags.
>+ &thread_id); // Need a valid pointer for the call to work under Win98.
>+ GTEST_CHECK_(thread_handle != NULL) << "CreateThread failed with error "
>+ << ::GetLastError() << ".";
>+ if (thread_handle == NULL) {
>+ delete param;
>+ }
>+ return thread_handle;
>+ }
>+
>+ private:
>+ struct ThreadMainParam {
>+ ThreadMainParam(Runnable* runnable, Notification* thread_can_start)
>+ : runnable_(runnable),
>+ thread_can_start_(thread_can_start) {
>+ }
>+ scoped_ptr<Runnable> runnable_;
>+ // Does not own.
>+ Notification* thread_can_start_;
>+ };
>+
>+ static DWORD WINAPI ThreadMain(void* ptr) {
>+ // Transfers ownership.
>+ scoped_ptr<ThreadMainParam> param(static_cast<ThreadMainParam*>(ptr));
>+ if (param->thread_can_start_ != NULL)
>+ param->thread_can_start_->WaitForNotification();
>+ param->runnable_->Run();
>+ return 0;
>+ }
>+
>+ // Prohibit instantiation.
>+ ThreadWithParamSupport();
>+
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParamSupport);
>+};
>+
>+} // namespace
>+
>+ThreadWithParamBase::ThreadWithParamBase(Runnable *runnable,
>+ Notification* thread_can_start)
>+ : thread_(ThreadWithParamSupport::CreateThread(runnable,
>+ thread_can_start)) {
>+}
>+
>+ThreadWithParamBase::~ThreadWithParamBase() {
>+ Join();
>+}
>+
>+void ThreadWithParamBase::Join() {
>+ GTEST_CHECK_(::WaitForSingleObject(thread_.Get(), INFINITE) == WAIT_OBJECT_0)
>+ << "Failed to join the thread with error " << ::GetLastError() << ".";
>+}
>+
>+// Maps a thread to a set of ThreadIdToThreadLocals that have values
>+// instantiated on that thread and notifies them when the thread exits. A
>+// ThreadLocal instance is expected to persist until all threads it has
>+// values on have terminated.
>+class ThreadLocalRegistryImpl {
>+ public:
>+ // Registers thread_local_instance as having value on the current thread.
>+ // Returns a value that can be used to identify the thread from other threads.
>+ static ThreadLocalValueHolderBase* GetValueOnCurrentThread(
>+ const ThreadLocalBase* thread_local_instance) {
>+ DWORD current_thread = ::GetCurrentThreadId();
>+ MutexLock lock(&mutex_);
>+ ThreadIdToThreadLocals* const thread_to_thread_locals =
>+ GetThreadLocalsMapLocked();
>+ ThreadIdToThreadLocals::iterator thread_local_pos =
>+ thread_to_thread_locals->find(current_thread);
>+ if (thread_local_pos == thread_to_thread_locals->end()) {
>+ thread_local_pos = thread_to_thread_locals->insert(
>+ std::make_pair(current_thread, ThreadLocalValues())).first;
>+ StartWatcherThreadFor(current_thread);
>+ }
>+ ThreadLocalValues& thread_local_values = thread_local_pos->second;
>+ ThreadLocalValues::iterator value_pos =
>+ thread_local_values.find(thread_local_instance);
>+ if (value_pos == thread_local_values.end()) {
>+ value_pos =
>+ thread_local_values
>+ .insert(std::make_pair(
>+ thread_local_instance,
>+ linked_ptr<ThreadLocalValueHolderBase>(
>+ thread_local_instance->NewValueForCurrentThread())))
>+ .first;
>+ }
>+ return value_pos->second.get();
>+ }
>+
>+ static void OnThreadLocalDestroyed(
>+ const ThreadLocalBase* thread_local_instance) {
>+ std::vector<linked_ptr<ThreadLocalValueHolderBase> > value_holders;
>+ // Clean up the ThreadLocalValues data structure while holding the lock, but
>+ // defer the destruction of the ThreadLocalValueHolderBases.
>+ {
>+ MutexLock lock(&mutex_);
>+ ThreadIdToThreadLocals* const thread_to_thread_locals =
>+ GetThreadLocalsMapLocked();
>+ for (ThreadIdToThreadLocals::iterator it =
>+ thread_to_thread_locals->begin();
>+ it != thread_to_thread_locals->end();
>+ ++it) {
>+ ThreadLocalValues& thread_local_values = it->second;
>+ ThreadLocalValues::iterator value_pos =
>+ thread_local_values.find(thread_local_instance);
>+ if (value_pos != thread_local_values.end()) {
>+ value_holders.push_back(value_pos->second);
>+ thread_local_values.erase(value_pos);
>+ // This 'if' can only be successful at most once, so theoretically we
>+ // could break out of the loop here, but we don't bother doing so.
>+ }
>+ }
>+ }
>+ // Outside the lock, let the destructor for 'value_holders' deallocate the
>+ // ThreadLocalValueHolderBases.
>+ }
>+
>+ static void OnThreadExit(DWORD thread_id) {
>+ GTEST_CHECK_(thread_id != 0) << ::GetLastError();
>+ std::vector<linked_ptr<ThreadLocalValueHolderBase> > value_holders;
>+ // Clean up the ThreadIdToThreadLocals data structure while holding the
>+ // lock, but defer the destruction of the ThreadLocalValueHolderBases.
>+ {
>+ MutexLock lock(&mutex_);
>+ ThreadIdToThreadLocals* const thread_to_thread_locals =
>+ GetThreadLocalsMapLocked();
>+ ThreadIdToThreadLocals::iterator thread_local_pos =
>+ thread_to_thread_locals->find(thread_id);
>+ if (thread_local_pos != thread_to_thread_locals->end()) {
>+ ThreadLocalValues& thread_local_values = thread_local_pos->second;
>+ for (ThreadLocalValues::iterator value_pos =
>+ thread_local_values.begin();
>+ value_pos != thread_local_values.end();
>+ ++value_pos) {
>+ value_holders.push_back(value_pos->second);
>+ }
>+ thread_to_thread_locals->erase(thread_local_pos);
>+ }
>+ }
>+ // Outside the lock, let the destructor for 'value_holders' deallocate the
>+ // ThreadLocalValueHolderBases.
>+ }
>+
>+ private:
>+ // In a particular thread, maps a ThreadLocal object to its value.
>+ typedef std::map<const ThreadLocalBase*,
>+ linked_ptr<ThreadLocalValueHolderBase> > ThreadLocalValues;
>+ // Stores all ThreadIdToThreadLocals having values in a thread, indexed by
>+ // thread's ID.
>+ typedef std::map<DWORD, ThreadLocalValues> ThreadIdToThreadLocals;
>+
>+ // Holds the thread id and thread handle that we pass from
>+ // StartWatcherThreadFor to WatcherThreadFunc.
>+ typedef std::pair<DWORD, HANDLE> ThreadIdAndHandle;
>+
>+ static void StartWatcherThreadFor(DWORD thread_id) {
>+ // The returned handle will be kept in thread_map and closed by
>+ // watcher_thread in WatcherThreadFunc.
>+ HANDLE thread = ::OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION,
>+ FALSE,
>+ thread_id);
>+ GTEST_CHECK_(thread != NULL);
>+ // We need to pass a valid thread ID pointer into CreateThread for it
>+ // to work correctly under Win98.
>+ DWORD watcher_thread_id;
>+ HANDLE watcher_thread = ::CreateThread(
>+ NULL, // Default security.
>+ 0, // Default stack size
>+ &ThreadLocalRegistryImpl::WatcherThreadFunc,
>+ reinterpret_cast<LPVOID>(new ThreadIdAndHandle(thread_id, thread)),
>+ CREATE_SUSPENDED,
>+ &watcher_thread_id);
>+ GTEST_CHECK_(watcher_thread != NULL);
>+ // Give the watcher thread the same priority as ours to avoid being
>+ // blocked by it.
>+ ::SetThreadPriority(watcher_thread,
>+ ::GetThreadPriority(::GetCurrentThread()));
>+ ::ResumeThread(watcher_thread);
>+ ::CloseHandle(watcher_thread);
>+ }
>+
>+ // Monitors exit from a given thread and notifies those
>+ // ThreadIdToThreadLocals about thread termination.
>+ static DWORD WINAPI WatcherThreadFunc(LPVOID param) {
>+ const ThreadIdAndHandle* tah =
>+ reinterpret_cast<const ThreadIdAndHandle*>(param);
>+ GTEST_CHECK_(
>+ ::WaitForSingleObject(tah->second, INFINITE) == WAIT_OBJECT_0);
>+ OnThreadExit(tah->first);
>+ ::CloseHandle(tah->second);
>+ delete tah;
>+ return 0;
>+ }
>+
>+ // Returns map of thread local instances.
>+ static ThreadIdToThreadLocals* GetThreadLocalsMapLocked() {
>+ mutex_.AssertHeld();
>+ MemoryIsNotDeallocated memory_is_not_deallocated;
>+ static ThreadIdToThreadLocals* map = new ThreadIdToThreadLocals();
>+ return map;
>+ }
>+
>+ // Protects access to GetThreadLocalsMapLocked() and its return value.
>+ static Mutex mutex_;
>+ // Protects access to GetThreadMapLocked() and its return value.
>+ static Mutex thread_map_mutex_;
>+};
>+
>+Mutex ThreadLocalRegistryImpl::mutex_(Mutex::kStaticMutex);
>+Mutex ThreadLocalRegistryImpl::thread_map_mutex_(Mutex::kStaticMutex);
>+
>+ThreadLocalValueHolderBase* ThreadLocalRegistry::GetValueOnCurrentThread(
>+ const ThreadLocalBase* thread_local_instance) {
>+ return ThreadLocalRegistryImpl::GetValueOnCurrentThread(
>+ thread_local_instance);
>+}
>+
>+void ThreadLocalRegistry::OnThreadLocalDestroyed(
>+ const ThreadLocalBase* thread_local_instance) {
>+ ThreadLocalRegistryImpl::OnThreadLocalDestroyed(thread_local_instance);
>+}
>+
>+#endif // GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS
> 
> #if GTEST_USES_POSIX_RE
> 
>@@ -180,20 +688,20 @@ bool IsInSet(char ch, const char* str) {
> // Returns true iff ch belongs to the given classification. Unlike
> // similar functions in <ctype.h>, these aren't affected by the
> // current locale.
>-bool IsDigit(char ch) { return '0' <= ch && ch <= '9'; }
>-bool IsPunct(char ch) {
>+bool IsAsciiDigit(char ch) { return '0' <= ch && ch <= '9'; }
>+bool IsAsciiPunct(char ch) {
> return IsInSet(ch, "^-!\"#$%&'()*+,./:;<=>?@[\\]_`{|}~");
> }
> bool IsRepeat(char ch) { return IsInSet(ch, "?*+"); }
>-bool IsWhiteSpace(char ch) { return IsInSet(ch, " \f\n\r\t\v"); }
>-bool IsWordChar(char ch) {
>+bool IsAsciiWhiteSpace(char ch) { return IsInSet(ch, " \f\n\r\t\v"); }
>+bool IsAsciiWordChar(char ch) {
> return ('a' <= ch && ch <= 'z') || ('A' <= ch && ch <= 'Z') ||
> ('0' <= ch && ch <= '9') || ch == '_';
> }
> 
> // Returns true iff "\\c" is a supported escape sequence.
> bool IsValidEscape(char c) {
>- return (IsPunct(c) || IsInSet(c, "dDfnrsStvwW"));
>+ return (IsAsciiPunct(c) || IsInSet(c, "dDfnrsStvwW"));
> }
> 
> // Returns true iff the given atom (specified by escaped and pattern)
>@@ -201,26 +709,26 @@ bool IsValidEscape(char c) {
> bool AtomMatchesChar(bool escaped, char pattern_char, char ch) {
> if (escaped) { // "\\p" where p is pattern_char.
> switch (pattern_char) {
>- case 'd': return IsDigit(ch);
>- case 'D': return !IsDigit(ch);
>+ case 'd': return IsAsciiDigit(ch);
>+ case 'D': return !IsAsciiDigit(ch);
> case 'f': return ch == '\f';
> case 'n': return ch == '\n';
> case 'r': return ch == '\r';
>- case 's': return IsWhiteSpace(ch);
>- case 'S': return !IsWhiteSpace(ch);
>+ case 's': return IsAsciiWhiteSpace(ch);
>+ case 'S': return !IsAsciiWhiteSpace(ch);
> case 't': return ch == '\t';
> case 'v': return ch == '\v';
>- case 'w': return IsWordChar(ch);
>- case 'W': return !IsWordChar(ch);
>+ case 'w': return IsAsciiWordChar(ch);
>+ case 'W': return !IsAsciiWordChar(ch);
> }
>- return IsPunct(pattern_char) && pattern_char == ch;
>+ return IsAsciiPunct(pattern_char) && pattern_char == ch;
> }
> 
> return (pattern_char == '.' && ch != '\n') || pattern_char == ch;
> }
> 
> // Helper function used by ValidateRegex() to format error messages.
>-String FormatRegexSyntaxError(const char* regex, int index) {
>+static std::string FormatRegexSyntaxError(const char* regex, int index) {
> return (Message() << "Syntax error at index " << index
> << " in simple regular expression \"" << regex << "\": ").GetString();
> }
>@@ -229,7 +737,7 @@ String FormatRegexSyntaxError(const char* regex, int index) {
> // otherwise returns true.
> bool ValidateRegex(const char* regex) {
> if (regex == NULL) {
>- // TODO(wan@google.com): fix the source file location in the
>+ // FIXME: fix the source file location in the
> // assertion failures to match where the regex is used in user
> // code.
> ADD_FAILURE() << "NULL is not a valid simple regular expression.";
>@@ -422,6 +930,37 @@ void RE::Init(const char* regex) {
> 
> #endif // GTEST_USES_POSIX_RE
> 
>+const char kUnknownFile[] = "unknown file";
>+
>+// Formats a source file path and a line number as they would appear
>+// in an error message from the compiler used to compile this code.
>+GTEST_API_ ::std::string FormatFileLocation(const char* file, int line) {
>+ const std::string file_name(file == NULL ? kUnknownFile : file);
>+
>+ if (line < 0) {
>+ return file_name + ":";
>+ }
>+#ifdef _MSC_VER
>+ return file_name + "(" + StreamableToString(line) + "):";
>+#else
>+ return file_name + ":" + StreamableToString(line) + ":";
>+#endif // _MSC_VER
>+}
>+
>+// Formats a file location for compiler-independent XML output.
>+// Although this function is not platform dependent, we put it next to
>+// FormatFileLocation in order to contrast the two functions.
>+// Note that FormatCompilerIndependentFileLocation() does NOT append colon
>+// to the file location it produces, unlike FormatFileLocation().
>+GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(
>+ const char* file, int line) {
>+ const std::string file_name(file == NULL ? kUnknownFile : file);
>+
>+ if (line < 0)
>+ return file_name;
>+ else
>+ return file_name + ":" + StreamableToString(line);
>+}
> 
> GTestLog::GTestLog(GTestLogSeverity severity, const char* file, int line)
> : severity_(severity) {
>@@ -441,21 +980,19 @@ GTestLog::~GTestLog() {
> posix::Abort();
> }
> }
>+
> // Disable Microsoft deprecation warnings for POSIX functions called from
> // this class (creat, dup, dup2, and close)
>-#ifdef _MSC_VER
>-#pragma warning(push)
>-#pragma warning(disable: 4996)
>-#endif // _MSC_VER
>+GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
> 
>-#if GTEST_HAS_STREAM_REDIRECTION_
>+#if GTEST_HAS_STREAM_REDIRECTION
> 
> // Object that captures an output stream (stdout/stderr).
> class CapturedStream {
> public:
> // The ctor redirects the stream to a temporary file.
>- CapturedStream(int fd) : fd_(fd), uncaptured_fd_(dup(fd)) {
>-#if GTEST_OS_WINDOWS
>+ explicit CapturedStream(int fd) : fd_(fd), uncaptured_fd_(dup(fd)) {
>+# if GTEST_OS_WINDOWS
> char temp_dir_path[MAX_PATH + 1] = { '\0' }; // NOLINT
> char temp_file_path[MAX_PATH + 1] = { '\0' }; // NOLINT
> 
>@@ -470,14 +1007,33 @@ class CapturedStream {
> GTEST_CHECK_(captured_fd != -1) << "Unable to open temporary file "
> << temp_file_path;
> filename_ = temp_file_path;
>-#else
>- // There's no guarantee that a test has write access to the
>- // current directory, so we create the temporary file in the /tmp
>- // directory instead.
>+# else
>+ // There's no guarantee that a test has write access to the current
>+ // directory, so we create the temporary file in the /tmp directory
>+ // instead. We use /tmp on most systems, and /sdcard on Android.
>+ // That's because Android doesn't have /tmp.
>+# if GTEST_OS_LINUX_ANDROID
>+ // Note: Android applications are expected to call the framework's
>+ // Context.getExternalStorageDirectory() method through JNI to get
>+ // the location of the world-writable SD Card directory. However,
>+ // this requires a Context handle, which cannot be retrieved
>+ // globally from native code. Doing so also precludes running the
>+ // code as part of a regular standalone executable, which doesn't
>+ // run in a Dalvik process (e.g. when running it through 'adb shell').
>+ //
>+ // The location /sdcard is directly accessible from native code
>+ // and is the only location (unofficially) supported by the Android
>+ // team. It's generally a symlink to the real SD Card mount point
>+ // which can be /mnt/sdcard, /mnt/sdcard0, /system/media/sdcard, or
>+ // other OEM-customized locations. Never rely on these, and always
>+ // use /sdcard.
>+ char name_template[] = "/sdcard/gtest_captured_stream.XXXXXX";
>+# else
> char name_template[] = "/tmp/captured_stream.XXXXXX";
>+# endif // GTEST_OS_LINUX_ANDROID
> const int captured_fd = mkstemp(name_template);
> filename_ = name_template;
>-#endif // GTEST_OS_WINDOWS
>+# endif // GTEST_OS_WINDOWS
> fflush(NULL);
> dup2(captured_fd, fd_);
> close(captured_fd);
>@@ -487,7 +1043,7 @@ class CapturedStream {
> remove(filename_.c_str());
> }
> 
>- String GetCapturedString() {
>+ std::string GetCapturedString() {
> if (uncaptured_fd_ != -1) {
> // Restores the original stream.
> fflush(NULL);
>@@ -497,18 +1053,12 @@ class CapturedStream {
> }
> 
> FILE* const file = posix::FOpen(filename_.c_str(), "r");
>- const String content = ReadEntireFile(file);
>+ const std::string content = ReadEntireFile(file);
> posix::FClose(file);
> return content;
> }
> 
> private:
>- // Reads the entire content of a file as a String.
>- static String ReadEntireFile(FILE* file);
>-
>- // Returns the size (in bytes) of a file.
>- static size_t GetFileSize(FILE* file);
>-
> const int fd_; // A stream to capture.
> int uncaptured_fd_;
> // Name of the temporary file holding the stderr output.
>@@ -517,44 +1067,14 @@ class CapturedStream {
> GTEST_DISALLOW_COPY_AND_ASSIGN_(CapturedStream);
> };
> 
>-// Returns the size (in bytes) of a file.
>-size_t CapturedStream::GetFileSize(FILE* file) {
>- fseek(file, 0, SEEK_END);
>- return static_cast<size_t>(ftell(file));
>-}
>-
>-// Reads the entire content of a file as a string.
>-String CapturedStream::ReadEntireFile(FILE* file) {
>- const size_t file_size = GetFileSize(file);
>- char* const buffer = new char[file_size];
>-
>- size_t bytes_last_read = 0; // # of bytes read in the last fread()
>- size_t bytes_read = 0; // # of bytes read so far
>-
>- fseek(file, 0, SEEK_SET);
>-
>- // Keeps reading the file until we cannot read further or the
>- // pre-determined file size is reached.
>- do {
>- bytes_last_read = fread(buffer+bytes_read, 1, file_size-bytes_read, file);
>- bytes_read += bytes_last_read;
>- } while (bytes_last_read > 0 && bytes_read < file_size);
>-
>- const String content(buffer, bytes_read);
>- delete[] buffer;
>-
>- return content;
>-}
>-
>-#ifdef _MSC_VER
>-#pragma warning(pop)
>-#endif // _MSC_VER
>+GTEST_DISABLE_MSC_DEPRECATED_POP_()
> 
> static CapturedStream* g_captured_stderr = NULL;
> static CapturedStream* g_captured_stdout = NULL;
> 
> // Starts capturing an output stream (stdout/stderr).
>-void CaptureStream(int fd, const char* stream_name, CapturedStream** stream) {
>+static void CaptureStream(int fd, const char* stream_name,
>+ CapturedStream** stream) {
> if (*stream != NULL) {
> GTEST_LOG_(FATAL) << "Only one " << stream_name
> << " capturer can exist at a time.";
>@@ -563,8 +1083,8 @@ void CaptureStream(int fd, const char* stream_name, CapturedStream** stream) {
> }
> 
> // Stops capturing the output stream and returns the captured string.
>-String GetCapturedStream(CapturedStream** captured_stream) {
>- const String content = (*captured_stream)->GetCapturedString();
>+static std::string GetCapturedStream(CapturedStream** captured_stream) {
>+ const std::string content = (*captured_stream)->GetCapturedString();
> 
> delete *captured_stream;
> *captured_stream = NULL;
>@@ -583,21 +1103,79 @@ void CaptureStderr() {
> }
> 
> // Stops capturing stdout and returns the captured string.
>-String GetCapturedStdout() { return GetCapturedStream(&g_captured_stdout); }
>+std::string GetCapturedStdout() {
>+ return GetCapturedStream(&g_captured_stdout);
>+}
> 
> // Stops capturing stderr and returns the captured string.
>-String GetCapturedStderr() { return GetCapturedStream(&g_captured_stderr); }
>+std::string GetCapturedStderr() {
>+ return GetCapturedStream(&g_captured_stderr);
>+}
> 
>-#endif // GTEST_HAS_STREAM_REDIRECTION_
>+#endif // GTEST_HAS_STREAM_REDIRECTION
>+
>+
>+
>+
>+
>+size_t GetFileSize(FILE* file) {
>+ fseek(file, 0, SEEK_END);
>+ return static_cast<size_t>(ftell(file));
>+}
>+
>+std::string ReadEntireFile(FILE* file) {
>+ const size_t file_size = GetFileSize(file);
>+ char* const buffer = new char[file_size];
>+
>+ size_t bytes_last_read = 0; // # of bytes read in the last fread()
>+ size_t bytes_read = 0; // # of bytes read so far
>+
>+ fseek(file, 0, SEEK_SET);
>+
>+ // Keeps reading the file until we cannot read further or the
>+ // pre-determined file size is reached.
>+ do {
>+ bytes_last_read = fread(buffer+bytes_read, 1, file_size-bytes_read, file);
>+ bytes_read += bytes_last_read;
>+ } while (bytes_last_read > 0 && bytes_read < file_size);
>+
>+ const std::string content(buffer, bytes_read);
>+ delete[] buffer;
>+
>+ return content;
>+}
> 
> #if GTEST_HAS_DEATH_TEST
>+static const std::vector<std::string>* g_injected_test_argvs = NULL; // Owned.
> 
>-// A copy of all command line arguments. Set by InitGoogleTest().
>-::std::vector<String> g_argvs;
>+std::vector<std::string> GetInjectableArgvs() {
>+ if (g_injected_test_argvs != NULL) {
>+ return *g_injected_test_argvs;
>+ }
>+ return GetArgvs();
>+}
>+
>+void SetInjectableArgvs(const std::vector<std::string>* new_argvs) {
>+ if (g_injected_test_argvs != new_argvs) delete g_injected_test_argvs;
>+ g_injected_test_argvs = new_argvs;
>+}
> 
>-// Returns the command line as a vector of strings.
>-const ::std::vector<String>& GetArgvs() { return g_argvs; }
>+void SetInjectableArgvs(const std::vector<std::string>& new_argvs) {
>+ SetInjectableArgvs(
>+ new std::vector<std::string>(new_argvs.begin(), new_argvs.end()));
>+}
>+
>+#if GTEST_HAS_GLOBAL_STRING
>+void SetInjectableArgvs(const std::vector< ::string>& new_argvs) {
>+ SetInjectableArgvs(
>+ new std::vector<std::string>(new_argvs.begin(), new_argvs.end()));
>+}
>+#endif // GTEST_HAS_GLOBAL_STRING
> 
>+void ClearInjectableArgvs() {
>+ delete g_injected_test_argvs;
>+ g_injected_test_argvs = NULL;
>+}
> #endif // GTEST_HAS_DEATH_TEST
> 
> #if GTEST_OS_WINDOWS_MOBILE
>@@ -612,13 +1190,13 @@ void Abort() {
> // Returns the name of the environment variable corresponding to the
> // given flag. For example, FlagToEnvVar("foo") will return
> // "GTEST_FOO" in the open-source version.
>-static String FlagToEnvVar(const char* flag) {
>- const String full_flag =
>+static std::string FlagToEnvVar(const char* flag) {
>+ const std::string full_flag =
> (Message() << GTEST_FLAG_PREFIX_ << flag).GetString();
> 
> Message env_var;
> for (size_t i = 0; i != full_flag.length(); i++) {
>- env_var << static_cast<char>(toupper(full_flag.c_str()[i]));
>+ env_var << ToUpper(full_flag.c_str()[i]);
> }
> 
> return env_var.GetString();
>@@ -670,17 +1248,24 @@ bool ParseInt32(const Message& src_text, const char* str, Int32* value) {
> //
> // The value is considered true iff it's not "0".
> bool BoolFromGTestEnv(const char* flag, bool default_value) {
>- const String env_var = FlagToEnvVar(flag);
>+#if defined(GTEST_GET_BOOL_FROM_ENV_)
>+ return GTEST_GET_BOOL_FROM_ENV_(flag, default_value);
>+#else
>+ const std::string env_var = FlagToEnvVar(flag);
> const char* const string_value = posix::GetEnv(env_var.c_str());
> return string_value == NULL ?
> default_value : strcmp(string_value, "0") != 0;
>+#endif // defined(GTEST_GET_BOOL_FROM_ENV_)
> }
> 
> // Reads and returns a 32-bit integer stored in the environment
> // variable corresponding to the given flag; if it isn't set or
> // doesn't represent a valid 32-bit integer, returns default_value.
> Int32 Int32FromGTestEnv(const char* flag, Int32 default_value) {
>- const String env_var = FlagToEnvVar(flag);
>+#if defined(GTEST_GET_INT32_FROM_ENV_)
>+ return GTEST_GET_INT32_FROM_ENV_(flag, default_value);
>+#else
>+ const std::string env_var = FlagToEnvVar(flag);
> const char* const string_value = posix::GetEnv(env_var.c_str());
> if (string_value == NULL) {
> // The environment variable is not set.
>@@ -697,14 +1282,36 @@ Int32 Int32FromGTestEnv(const char* flag, Int32 default_value) {
> }
> 
> return result;
>+#endif // defined(GTEST_GET_INT32_FROM_ENV_)
>+}
>+
>+// As a special case for the 'output' flag, if GTEST_OUTPUT is not
>+// set, we look for XML_OUTPUT_FILE, which is set by the Bazel build
>+// system. The value of XML_OUTPUT_FILE is a filename without the
>+// "xml:" prefix of GTEST_OUTPUT.
>+// Note that this is meant to be called at the call site so it does
>+// not check that the flag is 'output'
>+// In essence this checks an env variable called XML_OUTPUT_FILE
>+// and if it is set we prepend "xml:" to its value, if it not set we return ""
>+std::string OutputFlagAlsoCheckEnvVar(){
>+ std::string default_value_for_output_flag = "";
>+ const char* xml_output_file_env = posix::GetEnv("XML_OUTPUT_FILE");
>+ if (NULL != xml_output_file_env) {
>+ default_value_for_output_flag = std::string("xml:") + xml_output_file_env;
>+ }
>+ return default_value_for_output_flag;
> }
> 
> // Reads and returns the string environment variable corresponding to
> // the given flag; if it's not set, returns default_value.
> const char* StringFromGTestEnv(const char* flag, const char* default_value) {
>- const String env_var = FlagToEnvVar(flag);
>+#if defined(GTEST_GET_STRING_FROM_ENV_)
>+ return GTEST_GET_STRING_FROM_ENV_(flag, default_value);
>+#else
>+ const std::string env_var = FlagToEnvVar(flag);
> const char* const value = posix::GetEnv(env_var.c_str());
> return value == NULL ? default_value : value;
>+#endif // defined(GTEST_GET_STRING_FROM_ENV_)
> }
> 
> } // namespace internal
>diff --git a/Source/ThirdParty/gtest/src/gtest-printers.cc b/Source/ThirdParty/gtest/src/gtest-printers.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..de4d245e9fc8897af2137679d913d665fd8436e1
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/src/gtest-printers.cc
>@@ -0,0 +1,457 @@
>+// Copyright 2007, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+
>+// Google Test - The Google C++ Testing and Mocking Framework
>+//
>+// This file implements a universal value printer that can print a
>+// value of any type T:
>+//
>+// void ::testing::internal::UniversalPrinter<T>::Print(value, ostream_ptr);
>+//
>+// It uses the << operator when possible, and prints the bytes in the
>+// object otherwise. A user can override its behavior for a class
>+// type Foo by defining either operator<<(::std::ostream&, const Foo&)
>+// or void PrintTo(const Foo&, ::std::ostream*) in the namespace that
>+// defines Foo.
>+
>+#include "gtest/gtest-printers.h"
>+#include <stdio.h>
>+#include <cctype>
>+#include <cwchar>
>+#include <ostream> // NOLINT
>+#include <string>
>+#include "gtest/internal/gtest-port.h"
>+#include "src/gtest-internal-inl.h"
>+
>+namespace testing {
>+
>+namespace {
>+
>+using ::std::ostream;
>+
>+// Prints a segment of bytes in the given object.
>+GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
>+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
>+GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
>+void PrintByteSegmentInObjectTo(const unsigned char* obj_bytes, size_t start,
>+ size_t count, ostream* os) {
>+ char text[5] = "";
>+ for (size_t i = 0; i != count; i++) {
>+ const size_t j = start + i;
>+ if (i != 0) {
>+ // Organizes the bytes into groups of 2 for easy parsing by
>+ // human.
>+ if ((j % 2) == 0)
>+ *os << ' ';
>+ else
>+ *os << '-';
>+ }
>+ GTEST_SNPRINTF_(text, sizeof(text), "%02X", obj_bytes[j]);
>+ *os << text;
>+ }
>+}
>+
>+// Prints the bytes in the given value to the given ostream.
>+void PrintBytesInObjectToImpl(const unsigned char* obj_bytes, size_t count,
>+ ostream* os) {
>+ // Tells the user how big the object is.
>+ *os << count << "-byte object <";
>+
>+ const size_t kThreshold = 132;
>+ const size_t kChunkSize = 64;
>+ // If the object size is bigger than kThreshold, we'll have to omit
>+ // some details by printing only the first and the last kChunkSize
>+ // bytes.
>+ // FIXME: let the user control the threshold using a flag.
>+ if (count < kThreshold) {
>+ PrintByteSegmentInObjectTo(obj_bytes, 0, count, os);
>+ } else {
>+ PrintByteSegmentInObjectTo(obj_bytes, 0, kChunkSize, os);
>+ *os << " ... ";
>+ // Rounds up to 2-byte boundary.
>+ const size_t resume_pos = (count - kChunkSize + 1)/2*2;
>+ PrintByteSegmentInObjectTo(obj_bytes, resume_pos, count - resume_pos, os);
>+ }
>+ *os << ">";
>+}
>+
>+} // namespace
>+
>+namespace internal2 {
>+
>+// Delegates to PrintBytesInObjectToImpl() to print the bytes in the
>+// given object. The delegation simplifies the implementation, which
>+// uses the << operator and thus is easier done outside of the
>+// ::testing::internal namespace, which contains a << operator that
>+// sometimes conflicts with the one in STL.
>+void PrintBytesInObjectTo(const unsigned char* obj_bytes, size_t count,
>+ ostream* os) {
>+ PrintBytesInObjectToImpl(obj_bytes, count, os);
>+}
>+
>+} // namespace internal2
>+
>+namespace internal {
>+
>+// Depending on the value of a char (or wchar_t), we print it in one
>+// of three formats:
>+// - as is if it's a printable ASCII (e.g. 'a', '2', ' '),
>+// - as a hexadecimal escape sequence (e.g. '\x7F'), or
>+// - as a special escape sequence (e.g. '\r', '\n').
>+enum CharFormat {
>+ kAsIs,
>+ kHexEscape,
>+ kSpecialEscape
>+};
>+
>+// Returns true if c is a printable ASCII character. We test the
>+// value of c directly instead of calling isprint(), which is buggy on
>+// Windows Mobile.
>+inline bool IsPrintableAscii(wchar_t c) {
>+ return 0x20 <= c && c <= 0x7E;
>+}
>+
>+// Prints a wide or narrow char c as a character literal without the
>+// quotes, escaping it when necessary; returns how c was formatted.
>+// The template argument UnsignedChar is the unsigned version of Char,
>+// which is the type of c.
>+template <typename UnsignedChar, typename Char>
>+static CharFormat PrintAsCharLiteralTo(Char c, ostream* os) {
>+ switch (static_cast<wchar_t>(c)) {
>+ case L'\0':
>+ *os << "\\0";
>+ break;
>+ case L'\'':
>+ *os << "\\'";
>+ break;
>+ case L'\\':
>+ *os << "\\\\";
>+ break;
>+ case L'\a':
>+ *os << "\\a";
>+ break;
>+ case L'\b':
>+ *os << "\\b";
>+ break;
>+ case L'\f':
>+ *os << "\\f";
>+ break;
>+ case L'\n':
>+ *os << "\\n";
>+ break;
>+ case L'\r':
>+ *os << "\\r";
>+ break;
>+ case L'\t':
>+ *os << "\\t";
>+ break;
>+ case L'\v':
>+ *os << "\\v";
>+ break;
>+ default:
>+ if (IsPrintableAscii(c)) {
>+ *os << static_cast<char>(c);
>+ return kAsIs;
>+ } else {
>+ ostream::fmtflags flags = os->flags();
>+ *os << "\\x" << std::hex << std::uppercase
>+ << static_cast<int>(static_cast<UnsignedChar>(c));
>+ os->flags(flags);
>+ return kHexEscape;
>+ }
>+ }
>+ return kSpecialEscape;
>+}
>+
>+// Prints a wchar_t c as if it's part of a string literal, escaping it when
>+// necessary; returns how c was formatted.
>+static CharFormat PrintAsStringLiteralTo(wchar_t c, ostream* os) {
>+ switch (c) {
>+ case L'\'':
>+ *os << "'";
>+ return kAsIs;
>+ case L'"':
>+ *os << "\\\"";
>+ return kSpecialEscape;
>+ default:
>+ return PrintAsCharLiteralTo<wchar_t>(c, os);
>+ }
>+}
>+
>+// Prints a char c as if it's part of a string literal, escaping it when
>+// necessary; returns how c was formatted.
>+static CharFormat PrintAsStringLiteralTo(char c, ostream* os) {
>+ return PrintAsStringLiteralTo(
>+ static_cast<wchar_t>(static_cast<unsigned char>(c)), os);
>+}
>+
>+// Prints a wide or narrow character c and its code. '\0' is printed
>+// as "'\\0'", other unprintable characters are also properly escaped
>+// using the standard C++ escape sequence. The template argument
>+// UnsignedChar is the unsigned version of Char, which is the type of c.
>+template <typename UnsignedChar, typename Char>
>+void PrintCharAndCodeTo(Char c, ostream* os) {
>+ // First, print c as a literal in the most readable form we can find.
>+ *os << ((sizeof(c) > 1) ? "L'" : "'");
>+ const CharFormat format = PrintAsCharLiteralTo<UnsignedChar>(c, os);
>+ *os << "'";
>+
>+ // To aid user debugging, we also print c's code in decimal, unless
>+ // it's 0 (in which case c was printed as '\\0', making the code
>+ // obvious).
>+ if (c == 0)
>+ return;
>+ *os << " (" << static_cast<int>(c);
>+
>+ // For more convenience, we print c's code again in hexadecimal,
>+ // unless c was already printed in the form '\x##' or the code is in
>+ // [1, 9].
>+ if (format == kHexEscape || (1 <= c && c <= 9)) {
>+ // Do nothing.
>+ } else {
>+ *os << ", 0x" << String::FormatHexInt(static_cast<UnsignedChar>(c));
>+ }
>+ *os << ")";
>+}
>+
>+void PrintTo(unsigned char c, ::std::ostream* os) {
>+ PrintCharAndCodeTo<unsigned char>(c, os);
>+}
>+void PrintTo(signed char c, ::std::ostream* os) {
>+ PrintCharAndCodeTo<unsigned char>(c, os);
>+}
>+
>+// Prints a wchar_t as a symbol if it is printable or as its internal
>+// code otherwise and also as its code. L'\0' is printed as "L'\\0'".
>+void PrintTo(wchar_t wc, ostream* os) {
>+ PrintCharAndCodeTo<wchar_t>(wc, os);
>+}
>+
>+// Prints the given array of characters to the ostream. CharType must be either
>+// char or wchar_t.
>+// The array starts at begin, the length is len, it may include '\0' characters
>+// and may not be NUL-terminated.
>+template <typename CharType>
>+GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
>+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
>+GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
>+static CharFormat PrintCharsAsStringTo(
>+ const CharType* begin, size_t len, ostream* os) {
>+ const char* const kQuoteBegin = sizeof(CharType) == 1 ? "\"" : "L\"";
>+ *os << kQuoteBegin;
>+ bool is_previous_hex = false;
>+ CharFormat print_format = kAsIs;
>+ for (size_t index = 0; index < len; ++index) {
>+ const CharType cur = begin[index];
>+ if (is_previous_hex && IsXDigit(cur)) {
>+ // Previous character is of '\x..' form and this character can be
>+ // interpreted as another hexadecimal digit in its number. Break string to
>+ // disambiguate.
>+ *os << "\" " << kQuoteBegin;
>+ }
>+ is_previous_hex = PrintAsStringLiteralTo(cur, os) == kHexEscape;
>+ // Remember if any characters required hex escaping.
>+ if (is_previous_hex) {
>+ print_format = kHexEscape;
>+ }
>+ }
>+ *os << "\"";
>+ return print_format;
>+}
>+
>+// Prints a (const) char/wchar_t array of 'len' elements, starting at address
>+// 'begin'. CharType must be either char or wchar_t.
>+template <typename CharType>
>+GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
>+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
>+GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
>+static void UniversalPrintCharArray(
>+ const CharType* begin, size_t len, ostream* os) {
>+ // The code
>+ // const char kFoo[] = "foo";
>+ // generates an array of 4, not 3, elements, with the last one being '\0'.
>+ //
>+ // Therefore when printing a char array, we don't print the last element if
>+ // it's '\0', such that the output matches the string literal as it's
>+ // written in the source code.
>+ if (len > 0 && begin[len - 1] == '\0') {
>+ PrintCharsAsStringTo(begin, len - 1, os);
>+ return;
>+ }
>+
>+ // If, however, the last element in the array is not '\0', e.g.
>+ // const char kFoo[] = { 'f', 'o', 'o' };
>+ // we must print the entire array. We also print a message to indicate
>+ // that the array is not NUL-terminated.
>+ PrintCharsAsStringTo(begin, len, os);
>+ *os << " (no terminating NUL)";
>+}
>+
>+// Prints a (const) char array of 'len' elements, starting at address 'begin'.
>+void UniversalPrintArray(const char* begin, size_t len, ostream* os) {
>+ UniversalPrintCharArray(begin, len, os);
>+}
>+
>+// Prints a (const) wchar_t array of 'len' elements, starting at address
>+// 'begin'.
>+void UniversalPrintArray(const wchar_t* begin, size_t len, ostream* os) {
>+ UniversalPrintCharArray(begin, len, os);
>+}
>+
>+// Prints the given C string to the ostream.
>+void PrintTo(const char* s, ostream* os) {
>+ if (s == NULL) {
>+ *os << "NULL";
>+ } else {
>+ *os << ImplicitCast_<const void*>(s) << " pointing to ";
>+ PrintCharsAsStringTo(s, strlen(s), os);
>+ }
>+}
>+
>+// MSVC compiler can be configured to define whar_t as a typedef
>+// of unsigned short. Defining an overload for const wchar_t* in that case
>+// would cause pointers to unsigned shorts be printed as wide strings,
>+// possibly accessing more memory than intended and causing invalid
>+// memory accesses. MSVC defines _NATIVE_WCHAR_T_DEFINED symbol when
>+// wchar_t is implemented as a native type.
>+#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
>+// Prints the given wide C string to the ostream.
>+void PrintTo(const wchar_t* s, ostream* os) {
>+ if (s == NULL) {
>+ *os << "NULL";
>+ } else {
>+ *os << ImplicitCast_<const void*>(s) << " pointing to ";
>+ PrintCharsAsStringTo(s, std::wcslen(s), os);
>+ }
>+}
>+#endif // wchar_t is native
>+
>+namespace {
>+
>+bool ContainsUnprintableControlCodes(const char* str, size_t length) {
>+ const unsigned char *s = reinterpret_cast<const unsigned char *>(str);
>+
>+ for (size_t i = 0; i < length; i++) {
>+ unsigned char ch = *s++;
>+ if (std::iscntrl(ch)) {
>+ switch (ch) {
>+ case '\t':
>+ case '\n':
>+ case '\r':
>+ break;
>+ default:
>+ return true;
>+ }
>+ }
>+ }
>+ return false;
>+}
>+
>+bool IsUTF8TrailByte(unsigned char t) { return 0x80 <= t && t<= 0xbf; }
>+
>+bool IsValidUTF8(const char* str, size_t length) {
>+ const unsigned char *s = reinterpret_cast<const unsigned char *>(str);
>+
>+ for (size_t i = 0; i < length;) {
>+ unsigned char lead = s[i++];
>+
>+ if (lead <= 0x7f) {
>+ continue; // single-byte character (ASCII) 0..7F
>+ }
>+ if (lead < 0xc2) {
>+ return false; // trail byte or non-shortest form
>+ } else if (lead <= 0xdf && (i + 1) <= length && IsUTF8TrailByte(s[i])) {
>+ ++i; // 2-byte character
>+ } else if (0xe0 <= lead && lead <= 0xef && (i + 2) <= length &&
>+ IsUTF8TrailByte(s[i]) &&
>+ IsUTF8TrailByte(s[i + 1]) &&
>+ // check for non-shortest form and surrogate
>+ (lead != 0xe0 || s[i] >= 0xa0) &&
>+ (lead != 0xed || s[i] < 0xa0)) {
>+ i += 2; // 3-byte character
>+ } else if (0xf0 <= lead && lead <= 0xf4 && (i + 3) <= length &&
>+ IsUTF8TrailByte(s[i]) &&
>+ IsUTF8TrailByte(s[i + 1]) &&
>+ IsUTF8TrailByte(s[i + 2]) &&
>+ // check for non-shortest form
>+ (lead != 0xf0 || s[i] >= 0x90) &&
>+ (lead != 0xf4 || s[i] < 0x90)) {
>+ i += 3; // 4-byte character
>+ } else {
>+ return false;
>+ }
>+ }
>+ return true;
>+}
>+
>+void ConditionalPrintAsText(const char* str, size_t length, ostream* os) {
>+ if (!ContainsUnprintableControlCodes(str, length) &&
>+ IsValidUTF8(str, length)) {
>+ *os << "\n As Text: \"" << str << "\"";
>+ }
>+}
>+
>+} // anonymous namespace
>+
>+// Prints a ::string object.
>+#if GTEST_HAS_GLOBAL_STRING
>+void PrintStringTo(const ::string& s, ostream* os) {
>+ if (PrintCharsAsStringTo(s.data(), s.size(), os) == kHexEscape) {
>+ if (GTEST_FLAG(print_utf8)) {
>+ ConditionalPrintAsText(s.data(), s.size(), os);
>+ }
>+ }
>+}
>+#endif // GTEST_HAS_GLOBAL_STRING
>+
>+void PrintStringTo(const ::std::string& s, ostream* os) {
>+ if (PrintCharsAsStringTo(s.data(), s.size(), os) == kHexEscape) {
>+ if (GTEST_FLAG(print_utf8)) {
>+ ConditionalPrintAsText(s.data(), s.size(), os);
>+ }
>+ }
>+}
>+
>+// Prints a ::wstring object.
>+#if GTEST_HAS_GLOBAL_WSTRING
>+void PrintWideStringTo(const ::wstring& s, ostream* os) {
>+ PrintCharsAsStringTo(s.data(), s.size(), os);
>+}
>+#endif // GTEST_HAS_GLOBAL_WSTRING
>+
>+#if GTEST_HAS_STD_WSTRING
>+void PrintWideStringTo(const ::std::wstring& s, ostream* os) {
>+ PrintCharsAsStringTo(s.data(), s.size(), os);
>+}
>+#endif // GTEST_HAS_STD_WSTRING
>+
>+} // namespace internal
>+
>+} // namespace testing
>diff --git a/Source/ThirdParty/gtest/src/gtest-test-part.cc b/Source/ThirdParty/gtest/src/gtest-test-part.cc
>index 5d183a446f294ce9e1a8587c8b9120a9bec887dd..c88860d92385619ea67648845839d14583f11146 100644
>--- a/Source/ThirdParty/gtest/src/gtest-test-part.cc
>+++ b/Source/ThirdParty/gtest/src/gtest-test-part.cc
>@@ -26,21 +26,12 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: mheule@google.com (Markus Heule)
>-//
>-// The Google C++ Testing Framework (Google Test)
> 
>-#include <gtest/gtest-test-part.h>
>+//
>+// The Google C++ Testing and Mocking Framework (Google Test)
> 
>-// Indicates that this translation unit is part of Google Test's
>-// implementation. It must come before gtest-internal-inl.h is
>-// included, or there will be a compiler error. This trick is to
>-// prevent a user from accidentally including gtest-internal-inl.h in
>-// his code.
>-#define GTEST_IMPLEMENTATION_ 1
>+#include "gtest/gtest-test-part.h"
> #include "src/gtest-internal-inl.h"
>-#undef GTEST_IMPLEMENTATION_
> 
> namespace testing {
> 
>@@ -48,10 +39,10 @@ using internal::GetUnitTestImpl;
> 
> // Gets the summary of the failure message by omitting the stack trace
> // in it.
>-internal::String TestPartResult::ExtractSummary(const char* message) {
>+std::string TestPartResult::ExtractSummary(const char* message) {
> const char* const stack_trace = strstr(message, internal::kStackTraceMarker);
>- return stack_trace == NULL ? internal::String(message) :
>- internal::String(message, stack_trace - message);
>+ return stack_trace == NULL ? message :
>+ std::string(message, stack_trace);
> }
> 
> // Prints a TestPartResult object.
>diff --git a/Source/ThirdParty/gtest/src/gtest-typed-test.cc b/Source/ThirdParty/gtest/src/gtest-typed-test.cc
>index 3cc4b5de2aacb75989119c5f96c7f4f80ead5cae..1dc2ad38bab98bc146c16158a47da1e394bf385f 100644
>--- a/Source/ThirdParty/gtest/src/gtest-typed-test.cc
>+++ b/Source/ThirdParty/gtest/src/gtest-typed-test.cc
>@@ -26,11 +26,11 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
> 
>-#include <gtest/gtest-typed-test.h>
>-#include <gtest/gtest.h>
>+
>+#include "gtest/gtest-typed-test.h"
>+
>+#include "gtest/gtest.h"
> 
> namespace testing {
> namespace internal {
>@@ -40,38 +40,46 @@ namespace internal {
> // Skips to the first non-space char in str. Returns an empty string if str
> // contains only whitespace characters.
> static const char* SkipSpaces(const char* str) {
>- while (isspace(*str))
>+ while (IsSpace(*str))
> str++;
> return str;
> }
> 
>+static std::vector<std::string> SplitIntoTestNames(const char* src) {
>+ std::vector<std::string> name_vec;
>+ src = SkipSpaces(src);
>+ for (; src != NULL; src = SkipComma(src)) {
>+ name_vec.push_back(StripTrailingSpaces(GetPrefixUntilComma(src)));
>+ }
>+ return name_vec;
>+}
>+
> // Verifies that registered_tests match the test names in
>-// defined_test_names_; returns registered_tests if successful, or
>+// registered_tests_; returns registered_tests if successful, or
> // aborts the program otherwise.
> const char* TypedTestCasePState::VerifyRegisteredTestNames(
> const char* file, int line, const char* registered_tests) {
>- typedef ::std::set<const char*>::const_iterator DefinedTestIter;
>+ typedef RegisteredTestsMap::const_iterator RegisteredTestIter;
> registered_ = true;
> 
>- // Skip initial whitespace in registered_tests since some
>- // preprocessors prefix stringizied literals with whitespace.
>- registered_tests = SkipSpaces(registered_tests);
>+ std::vector<std::string> name_vec = SplitIntoTestNames(registered_tests);
> 
> Message errors;
>- ::std::set<String> tests;
>- for (const char* names = registered_tests; names != NULL;
>- names = SkipComma(names)) {
>- const String name = GetPrefixUntilComma(names);
>+
>+ std::set<std::string> tests;
>+ for (std::vector<std::string>::const_iterator name_it = name_vec.begin();
>+ name_it != name_vec.end(); ++name_it) {
>+ const std::string& name = *name_it;
> if (tests.count(name) != 0) {
> errors << "Test " << name << " is listed more than once.\n";
> continue;
> }
> 
> bool found = false;
>- for (DefinedTestIter it = defined_test_names_.begin();
>- it != defined_test_names_.end();
>+ for (RegisteredTestIter it = registered_tests_.begin();
>+ it != registered_tests_.end();
> ++it) {
>- if (name == *it) {
>+ if (name == it->first) {
> found = true;
> break;
> }
>@@ -85,15 +93,15 @@ const char* TypedTestCasePState::VerifyRegisteredTestNames(
> }
> }
> 
>- for (DefinedTestIter it = defined_test_names_.begin();
>- it != defined_test_names_.end();
>+ for (RegisteredTestIter it = registered_tests_.begin();
>+ it != registered_tests_.end();
> ++it) {
>- if (tests.count(*it) == 0) {
>- errors << "You forgot to list test " << *it << ".\n";
>+ if (tests.count(it->first) == 0) {
>+ errors << "You forgot to list test " << it->first << ".\n";
> }
> }
> 
>- const String& errors_str = errors.GetString();
>+ const std::string& errors_str = errors.GetString();
> if (errors_str != "") {
> fprintf(stderr, "%s %s", FormatFileLocation(file, line).c_str(),
> errors_str.c_str());
>diff --git a/Source/ThirdParty/gtest/src/gtest.cc b/Source/ThirdParty/gtest/src/gtest.cc
>index 5b871c0adb0a1c4cfa237554057d51608461950e..9796637749a7ada9403d6ad8d65c2a66755d4142 100644
>--- a/Source/ThirdParty/gtest/src/gtest.cc
>+++ b/Source/ThirdParty/gtest/src/gtest.cc
>@@ -26,112 +26,131 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
> //
>-// Author: wan@google.com (Zhanyong Wan)
>-//
>-// The Google C++ Testing Framework (Google Test)
>+// The Google C++ Testing and Mocking Framework (Google Test)
> 
>-#include <gtest/gtest.h>
>-#include <gtest/gtest-spi.h>
>+#include "gtest/gtest.h"
>+#include "gtest/internal/custom/gtest.h"
>+#include "gtest/gtest-spi.h"
> 
> #include <ctype.h>
> #include <math.h>
> #include <stdarg.h>
> #include <stdio.h>
> #include <stdlib.h>
>+#include <time.h>
> #include <wchar.h>
> #include <wctype.h>
> 
> #include <algorithm>
>-#include <ostream>
>+#include <iomanip>
>+#include <limits>
>+#include <list>
>+#include <map>
>+#include <ostream> // NOLINT
> #include <sstream>
> #include <vector>
> 
> #if GTEST_OS_LINUX
> 
>-// TODO(kenton@google.com): Use autoconf to detect availability of
>+// FIXME: Use autoconf to detect availability of
> // gettimeofday().
>-#define GTEST_HAS_GETTIMEOFDAY_ 1
>+# define GTEST_HAS_GETTIMEOFDAY_ 1
> 
>-#include <fcntl.h>
>-#include <limits.h>
>-#include <sched.h>
>+# include <fcntl.h> // NOLINT
>+# include <limits.h> // NOLINT
>+# include <sched.h> // NOLINT
> // Declares vsnprintf(). This header is not available on Windows.
>-#include <strings.h>
>-#include <sys/mman.h>
>-#include <sys/time.h>
>-#include <unistd.h>
>-#include <string>
>-#include <vector>
>+# include <strings.h> // NOLINT
>+# include <sys/mman.h> // NOLINT
>+# include <sys/time.h> // NOLINT
>+# include <unistd.h> // NOLINT
>+# include <string>
> 
> #elif GTEST_OS_SYMBIAN
>-#define GTEST_HAS_GETTIMEOFDAY_ 1
>-#include <sys/time.h> // NOLINT
>+# define GTEST_HAS_GETTIMEOFDAY_ 1
>+# include <sys/time.h> // NOLINT
> 
> #elif GTEST_OS_ZOS
>-#define GTEST_HAS_GETTIMEOFDAY_ 1
>-#include <sys/time.h> // NOLINT
>+# define GTEST_HAS_GETTIMEOFDAY_ 1
>+# include <sys/time.h> // NOLINT
> 
> // On z/OS we additionally need strings.h for strcasecmp.
>-#include <strings.h> // NOLINT
>+# include <strings.h> // NOLINT
> 
> #elif GTEST_OS_WINDOWS_MOBILE // We are on Windows CE.
> 
>-#include <windows.h> // NOLINT
>+# include <windows.h> // NOLINT
>+# undef min
> 
> #elif GTEST_OS_WINDOWS // We are on Windows proper.
> 
>-#include <io.h> // NOLINT
>-#include <sys/timeb.h> // NOLINT
>-#include <sys/types.h> // NOLINT
>-#include <sys/stat.h> // NOLINT
>+# include <io.h> // NOLINT
>+# include <sys/timeb.h> // NOLINT
>+# include <sys/types.h> // NOLINT
>+# include <sys/stat.h> // NOLINT
> 
>-#if GTEST_OS_WINDOWS_MINGW
>+# if GTEST_OS_WINDOWS_MINGW
> // MinGW has gettimeofday() but not _ftime64().
>-// TODO(kenton@google.com): Use autoconf to detect availability of
>+// FIXME: Use autoconf to detect availability of
> // gettimeofday().
>-// TODO(kenton@google.com): There are other ways to get the time on
>+// FIXME: There are other ways to get the time on
> // Windows, like GetTickCount() or GetSystemTimeAsFileTime(). MinGW
> // supports these. consider using them instead.
>-#define GTEST_HAS_GETTIMEOFDAY_ 1
>-#include <sys/time.h> // NOLINT
>-#endif // GTEST_OS_WINDOWS_MINGW
>+# define GTEST_HAS_GETTIMEOFDAY_ 1
>+# include <sys/time.h> // NOLINT
>+# endif // GTEST_OS_WINDOWS_MINGW
> 
> // cpplint thinks that the header is already included, so we want to
> // silence it.
>-#include <windows.h> // NOLINT
>+# include <windows.h> // NOLINT
>+# undef min
> 
> #else
> 
> // Assume other platforms have gettimeofday().
>-// TODO(kenton@google.com): Use autoconf to detect availability of
>+// FIXME: Use autoconf to detect availability of
> // gettimeofday().
>-#define GTEST_HAS_GETTIMEOFDAY_ 1
>+# define GTEST_HAS_GETTIMEOFDAY_ 1
> 
> // cpplint thinks that the header is already included, so we want to
> // silence it.
>-#include <sys/time.h> // NOLINT
>-#include <unistd.h> // NOLINT
>+# include <sys/time.h> // NOLINT
>+# include <unistd.h> // NOLINT
> 
> #endif // GTEST_OS_LINUX
> 
> #if GTEST_HAS_EXCEPTIONS
>-#include <stdexcept>
>+# include <stdexcept>
>+#endif
>+
>+#if GTEST_CAN_STREAM_RESULTS_
>+# include <arpa/inet.h> // NOLINT
>+# include <netdb.h> // NOLINT
>+# include <sys/socket.h> // NOLINT
>+# include <sys/types.h> // NOLINT
> #endif
> 
>-// Indicates that this translation unit is part of Google Test's
>-// implementation. It must come before gtest-internal-inl.h is
>-// included, or there will be a compiler error. This trick is to
>-// prevent a user from accidentally including gtest-internal-inl.h in
>-// his code.
>-#define GTEST_IMPLEMENTATION_ 1
> #include "src/gtest-internal-inl.h"
>-#undef GTEST_IMPLEMENTATION_
> 
> #if GTEST_OS_WINDOWS
>-#define vsnprintf _vsnprintf
>+# define vsnprintf _vsnprintf
> #endif // GTEST_OS_WINDOWS
> 
>+#if GTEST_OS_MAC
>+#ifndef GTEST_OS_IOS
>+#include <crt_externs.h>
>+#endif
>+#endif
>+
>+#if GTEST_HAS_ABSL
>+#include "absl/debugging/failure_signal_handler.h"
>+#include "absl/debugging/stacktrace.h"
>+#include "absl/debugging/symbolize.h"
>+#include "absl/strings/str_cat.h"
>+#endif // GTEST_HAS_ABSL
>+
> namespace testing {
> 
> using internal::CountIf;
>@@ -153,8 +172,10 @@ static const char kDeathTestCaseFilter[] = "*DeathTest:*DeathTest/*";
> // A test filter that matches everything.
> static const char kUniversalFilter[] = "*";
> 
>-// The default output file for XML output.
>-static const char kDefaultOutputFile[] = "test_detail.xml";
>+// The default output format.
>+static const char kDefaultOutputFormat[] = "xml";
>+// The default output file.
>+static const char kDefaultOutputFile[] = "test_detail";
> 
> // The environment variable name for the test shard index.
> static const char kTestShardIndex[] = "GTEST_SHARD_INDEX";
>@@ -173,8 +194,34 @@ const char kStackTraceMarker[] = "\nStack trace:\n";
> // specified on the command line.
> bool g_help_flag = false;
> 
>+// Utilty function to Open File for Writing
>+static FILE* OpenFileForWriting(const std::string& output_file) {
>+ FILE* fileout = NULL;
>+ FilePath output_file_path(output_file);
>+ FilePath output_dir(output_file_path.RemoveFileName());
>+
>+ if (output_dir.CreateDirectoriesRecursively()) {
>+ fileout = posix::FOpen(output_file.c_str(), "w");
>+ }
>+ if (fileout == NULL) {
>+ GTEST_LOG_(FATAL) << "Unable to open file \"" << output_file << "\"";
>+ }
>+ return fileout;
>+}
>+
> } // namespace internal
> 
>+// Bazel passes in the argument to '--test_filter' via the TESTBRIDGE_TEST_ONLY
>+// environment variable.
>+static const char* GetDefaultFilter() {
>+ const char* const testbridge_test_only =
>+ internal::posix::GetEnv("TESTBRIDGE_TEST_ONLY");
>+ if (testbridge_test_only != NULL) {
>+ return testbridge_test_only;
>+ }
>+ return kUniversalFilter;
>+}
>+
> GTEST_DEFINE_bool_(
> also_run_disabled_tests,
> internal::BoolFromGTestEnv("also_run_disabled_tests", false),
>@@ -187,7 +234,7 @@ GTEST_DEFINE_bool_(
> 
> GTEST_DEFINE_bool_(
> catch_exceptions,
>- internal::BoolFromGTestEnv("catch_exceptions", false),
>+ internal::BoolFromGTestEnv("catch_exceptions", true),
> "True iff " GTEST_NAME_
> " should catch exceptions and treat them as test failures.");
> 
>@@ -197,26 +244,39 @@ GTEST_DEFINE_string_(
> "Whether to use colors in the output. Valid values: yes, no, "
> "and auto. 'auto' means to use colors if the output is "
> "being sent to a terminal and the TERM environment variable "
>- "is set to xterm, xterm-color, xterm-256color, linux or cygwin.");
>+ "is set to a terminal type that supports colors.");
> 
> GTEST_DEFINE_string_(
> filter,
>- internal::StringFromGTestEnv("filter", kUniversalFilter),
>+ internal::StringFromGTestEnv("filter", GetDefaultFilter()),
> "A colon-separated list of glob (not regex) patterns "
> "for filtering the tests to run, optionally followed by a "
> "'-' and a : separated list of negative patterns (tests to "
> "exclude). A test is run if it matches one of the positive "
> "patterns and does not match any of the negative patterns.");
> 
>+GTEST_DEFINE_bool_(
>+ install_failure_signal_handler,
>+ internal::BoolFromGTestEnv("install_failure_signal_handler", false),
>+ "If true and supported on the current platform, " GTEST_NAME_ " should "
>+ "install a signal handler that dumps debugging information when fatal "
>+ "signals are raised.");
>+
> GTEST_DEFINE_bool_(list_tests, false,
> "List all tests without running them.");
> 
>+// The net priority order after flag processing is thus:
>+// --gtest_output command line flag
>+// GTEST_OUTPUT environment variable
>+// XML_OUTPUT_FILE environment variable
>+// ''
> GTEST_DEFINE_string_(
> output,
>- internal::StringFromGTestEnv("output", ""),
>- "A format (currently must be \"xml\"), optionally followed "
>- "by a colon and an output file name or directory. A directory "
>- "is indicated by a trailing pathname separator. "
>+ internal::StringFromGTestEnv("output",
>+ internal::OutputFlagAlsoCheckEnvVar().c_str()),
>+ "A format (defaults to \"xml\" but can be specified to be \"json\"), "
>+ "optionally followed by a colon and an output file name or directory. "
>+ "A directory is indicated by a trailing pathname separator. "
> "Examples: \"xml:filename.xml\", \"xml::directoryname/\". "
> "If a directory is specified, output files will be created "
> "within that directory, with file-names based on the test "
>@@ -229,6 +289,12 @@ GTEST_DEFINE_bool_(
> "True iff " GTEST_NAME_
> " should display elapsed time in text output.");
> 
>+GTEST_DEFINE_bool_(
>+ print_utf8,
>+ internal::BoolFromGTestEnv("print_utf8", true),
>+ "True iff " GTEST_NAME_
>+ " prints UTF8 characters as text.");
>+
> GTEST_DEFINE_int32_(
> random_seed,
> internal::Int32FromGTestEnv("random_seed", 0),
>@@ -258,12 +324,26 @@ GTEST_DEFINE_int32_(
> "The maximum number of stack frames to print when an "
> "assertion fails. The valid range is 0 through 100, inclusive.");
> 
>+GTEST_DEFINE_string_(
>+ stream_result_to,
>+ internal::StringFromGTestEnv("stream_result_to", ""),
>+ "This flag specifies the host name and the port number on which to stream "
>+ "test results. Example: \"localhost:555\". The flag is effective only on "
>+ "Linux.");
>+
> GTEST_DEFINE_bool_(
> throw_on_failure,
> internal::BoolFromGTestEnv("throw_on_failure", false),
> "When this flag is specified, a failed assertion will throw an exception "
> "if exceptions are enabled or exit the program with a non-zero code "
>- "otherwise.");
>+ "otherwise. For use with an external test framework.");
>+
>+#if GTEST_USE_OWN_FLAGFILE_FLAG_
>+GTEST_DEFINE_string_(
>+ flagfile,
>+ internal::StringFromGTestEnv("flagfile", ""),
>+ "This flag specifies the flagfile to read command-line flags from.");
>+#endif // GTEST_USE_OWN_FLAGFILE_FLAG_
> 
> namespace internal {
> 
>@@ -272,7 +352,8 @@ namespace internal {
> // than kMaxRange.
> UInt32 Random::Generate(UInt32 range) {
> // These constants are the same as are used in glibc's rand(3).
>- state_ = (1103515245U*state_ + 12345U) % kMaxRange;
>+ // Use wider types than necessary to prevent unsigned overflow diagnostics.
>+ state_ = static_cast<UInt32>(1103515245ULL*state_ + 12345U) % kMaxRange;
> 
> GTEST_CHECK_(range > 0)
> << "Cannot generate a number in the range [0, 0).";
>@@ -289,13 +370,7 @@ UInt32 Random::Generate(UInt32 range) {
> // GTestIsInitialized() returns true iff the user has initialized
> // Google Test. Useful for catching the user mistake of not initializing
> // Google Test before calling RUN_ALL_TESTS().
>-//
>-// A user must call testing::InitGoogleTest() to initialize Google
>-// Test. g_init_gtest_count is set to the number of times
>-// InitGoogleTest() has been called. We don't protect this variable
>-// under a mutex as it is only accessed in the main thread.
>-int g_init_gtest_count = 0;
>-static bool GTestIsInitialized() { return g_init_gtest_count != 0; }
>+static bool GTestIsInitialized() { return GetArgvs().size() > 0; }
> 
> // Iterates over a vector of TestCases, keeping a running sum of the
> // results of calling a given int-returning method on each.
>@@ -349,10 +424,21 @@ void AssertHelper::operator=(const Message& message) const {
> }
> 
> // Mutex for linked pointers.
>-GTEST_DEFINE_STATIC_MUTEX_(g_linked_ptr_mutex);
>+GTEST_API_ GTEST_DEFINE_STATIC_MUTEX_(g_linked_ptr_mutex);
> 
>-// Application pathname gotten in InitGoogleTest.
>-String g_executable_path;
>+// A copy of all command line arguments. Set by InitGoogleTest().
>+::std::vector<std::string> g_argvs;
>+
>+::std::vector<std::string> GetArgvs() {
>+#if defined(GTEST_CUSTOM_GET_ARGVS_)
>+ // GTEST_CUSTOM_GET_ARGVS_() may return a container of std::string or
>+ // ::string. This code converts it to the appropriate type.
>+ const auto& custom = GTEST_CUSTOM_GET_ARGVS_();
>+ return ::std::vector<std::string>(custom.begin(), custom.end());
>+#else // defined(GTEST_CUSTOM_GET_ARGVS_)
>+ return g_argvs;
>+#endif // defined(GTEST_CUSTOM_GET_ARGVS_)
>+}
> 
> // Returns the current application's name, removing directory path if that
> // is present.
>@@ -360,9 +446,9 @@ FilePath GetCurrentExecutableName() {
> FilePath result;
> 
> #if GTEST_OS_WINDOWS
>- result.Set(FilePath(g_executable_path).RemoveExtension("exe"));
>+ result.Set(FilePath(GetArgvs()[0]).RemoveExtension("exe"));
> #else
>- result.Set(FilePath(g_executable_path));
>+ result.Set(FilePath(GetArgvs()[0]));
> #endif // GTEST_OS_WINDOWS
> 
> return result.RemoveDirectoryName();
>@@ -371,33 +457,34 @@ FilePath GetCurrentExecutableName() {
> // Functions for processing the gtest_output flag.
> 
> // Returns the output format, or "" for normal printed output.
>-String UnitTestOptions::GetOutputFormat() {
>+std::string UnitTestOptions::GetOutputFormat() {
> const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
>- if (gtest_output_flag == NULL) return String("");
>-
> const char* const colon = strchr(gtest_output_flag, ':');
> return (colon == NULL) ?
>- String(gtest_output_flag) :
>- String(gtest_output_flag, colon - gtest_output_flag);
>+ std::string(gtest_output_flag) :
>+ std::string(gtest_output_flag, colon - gtest_output_flag);
> }
> 
> // Returns the name of the requested output file, or the default if none
> // was explicitly specified.
>-String UnitTestOptions::GetAbsolutePathToOutputFile() {
>+std::string UnitTestOptions::GetAbsolutePathToOutputFile() {
> const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
>- if (gtest_output_flag == NULL)
>- return String("");
>+
>+ std::string format = GetOutputFormat();
>+ if (format.empty())
>+ format = std::string(kDefaultOutputFormat);
> 
> const char* const colon = strchr(gtest_output_flag, ':');
> if (colon == NULL)
>- return String(internal::FilePath::ConcatPaths(
>- internal::FilePath(
>- UnitTest::GetInstance()->original_working_dir()),
>- internal::FilePath(kDefaultOutputFile)).ToString() );
>+ return internal::FilePath::MakeFileName(
>+ internal::FilePath(
>+ UnitTest::GetInstance()->original_working_dir()),
>+ internal::FilePath(kDefaultOutputFile), 0,
>+ format.c_str()).string();
> 
> internal::FilePath output_name(colon + 1);
> if (!output_name.IsAbsolutePath())
>- // TODO(wan@google.com): on Windows \some\path is not an absolute
>+ // FIXME: on Windows \some\path is not an absolute
> // path (as its meaning depends on the current drive), yet the
> // following logic for turning it into an absolute path is wrong.
> // Fix it.
>@@ -406,12 +493,12 @@ String UnitTestOptions::GetAbsolutePathToOutputFile() {
> internal::FilePath(colon + 1));
> 
> if (!output_name.IsDirectory())
>- return output_name.ToString();
>+ return output_name.string();
> 
> internal::FilePath result(internal::FilePath::GenerateUniqueFileName(
> output_name, internal::GetCurrentExecutableName(),
> GetOutputFormat().c_str()));
>- return result.ToString();
>+ return result.string();
> }
> 
> // Returns true iff the wildcard pattern matches the string. The
>@@ -436,7 +523,8 @@ bool UnitTestOptions::PatternMatchesString(const char *pattern,
> }
> }
> 
>-bool UnitTestOptions::MatchesFilter(const String& name, const char* filter) {
>+bool UnitTestOptions::MatchesFilter(
>+ const std::string& name, const char* filter) {
> const char *cur_pattern = filter;
> for (;;) {
> if (PatternMatchesString(cur_pattern, name.c_str())) {
>@@ -456,28 +544,24 @@ bool UnitTestOptions::MatchesFilter(const String& name, const char* filter) {
> }
> }
> 
>-// TODO(keithray): move String function implementations to gtest-string.cc.
>-
> // Returns true iff the user-specified filter matches the test case
> // name and the test name.
>-bool UnitTestOptions::FilterMatchesTest(const String &test_case_name,
>- const String &test_name) {
>- const String& full_name = String::Format("%s.%s",
>- test_case_name.c_str(),
>- test_name.c_str());
>+bool UnitTestOptions::FilterMatchesTest(const std::string &test_case_name,
>+ const std::string &test_name) {
>+ const std::string& full_name = test_case_name + "." + test_name.c_str();
> 
> // Split --gtest_filter at '-', if there is one, to separate into
> // positive filter and negative filter portions
> const char* const p = GTEST_FLAG(filter).c_str();
> const char* const dash = strchr(p, '-');
>- String positive;
>- String negative;
>+ std::string positive;
>+ std::string negative;
> if (dash == NULL) {
> positive = GTEST_FLAG(filter).c_str(); // Whole string is a positive filter
>- negative = String("");
>+ negative = "";
> } else {
>- positive = String(p, dash - p); // Everything up to the dash
>- negative = String(dash+1); // Everything after the dash
>+ positive = std::string(p, dash); // Everything up to the dash
>+ negative = std::string(dash + 1); // Everything after the dash
> if (positive.empty()) {
> // Treat '-test1' as the same as '*-test1'
> positive = kUniversalFilter;
>@@ -490,20 +574,33 @@ bool UnitTestOptions::FilterMatchesTest(const String &test_case_name,
> !MatchesFilter(full_name, negative.c_str()));
> }
> 
>-#if GTEST_OS_WINDOWS
>+#if GTEST_HAS_SEH
> // Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the
> // given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise.
> // This function is useful as an __except condition.
> int UnitTestOptions::GTestShouldProcessSEH(DWORD exception_code) {
>- // Google Test should handle an exception if:
>+ // Google Test should handle a SEH exception if:
> // 1. the user wants it to, AND
>- // 2. this is not a breakpoint exception.
>- return (GTEST_FLAG(catch_exceptions) &&
>- exception_code != EXCEPTION_BREAKPOINT) ?
>- EXCEPTION_EXECUTE_HANDLER :
>- EXCEPTION_CONTINUE_SEARCH;
>+ // 2. this is not a breakpoint exception, AND
>+ // 3. this is not a C++ exception (VC++ implements them via SEH,
>+ // apparently).
>+ //
>+ // SEH exception code for C++ exceptions.
>+ // (see http://support.microsoft.com/kb/185294 for more information).
>+ const DWORD kCxxExceptionCode = 0xe06d7363;
>+
>+ bool should_handle = true;
>+
>+ if (!GTEST_FLAG(catch_exceptions))
>+ should_handle = false;
>+ else if (exception_code == EXCEPTION_BREAKPOINT)
>+ should_handle = false;
>+ else if (exception_code == kCxxExceptionCode)
>+ should_handle = false;
>+
>+ return should_handle ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH;
> }
>-#endif // GTEST_OS_WINDOWS
>+#endif // GTEST_HAS_SEH
> 
> } // namespace internal
> 
>@@ -578,13 +675,13 @@ extern const TypeId kTestTypeIdInGoogleTest = GetTestTypeId();
> // This predicate-formatter checks that 'results' contains a test part
> // failure of the given type and that the failure message contains the
> // given substring.
>-AssertionResult HasOneFailure(const char* /* results_expr */,
>- const char* /* type_expr */,
>- const char* /* substr_expr */,
>- const TestPartResultArray& results,
>- TestPartResult::Type type,
>- const char* substr) {
>- const String expected(type == TestPartResult::kFatalFailure ?
>+static AssertionResult HasOneFailure(const char* /* results_expr */,
>+ const char* /* type_expr */,
>+ const char* /* substr_expr */,
>+ const TestPartResultArray& results,
>+ TestPartResult::Type type,
>+ const std::string& substr) {
>+ const std::string expected(type == TestPartResult::kFatalFailure ?
> "1 fatal failure" :
> "1 non-fatal failure");
> Message msg;
>@@ -594,23 +691,21 @@ AssertionResult HasOneFailure(const char* /* results_expr */,
> for (int i = 0; i < results.size(); i++) {
> msg << "\n" << results.GetTestPartResult(i);
> }
>- return AssertionFailure(msg);
>+ return AssertionFailure() << msg;
> }
> 
> const TestPartResult& r = results.GetTestPartResult(0);
> if (r.type() != type) {
>- msg << "Expected: " << expected << "\n"
>- << " Actual:\n"
>- << r;
>- return AssertionFailure(msg);
>+ return AssertionFailure() << "Expected: " << expected << "\n"
>+ << " Actual:\n"
>+ << r;
> }
> 
>- if (strstr(r.message(), substr) == NULL) {
>- msg << "Expected: " << expected << " containing \""
>- << substr << "\"\n"
>- << " Actual:\n"
>- << r;
>- return AssertionFailure(msg);
>+ if (strstr(r.message(), substr.c_str()) == NULL) {
>+ return AssertionFailure() << "Expected: " << expected << " containing \""
>+ << substr << "\"\n"
>+ << " Actual:\n"
>+ << r;
> }
> 
> return AssertionSuccess();
>@@ -619,20 +714,17 @@ AssertionResult HasOneFailure(const char* /* results_expr */,
> // The constructor of SingleFailureChecker remembers where to look up
> // test part results, what type of failure we expect, and what
> // substring the failure message should contain.
>-SingleFailureChecker:: SingleFailureChecker(
>- const TestPartResultArray* results,
>- TestPartResult::Type type,
>- const char* substr)
>- : results_(results),
>- type_(type),
>- substr_(substr) {}
>+SingleFailureChecker::SingleFailureChecker(const TestPartResultArray* results,
>+ TestPartResult::Type type,
>+ const std::string& substr)
>+ : results_(results), type_(type), substr_(substr) {}
> 
> // The destructor of SingleFailureChecker verifies that the given
> // TestPartResultArray contains exactly one failure that has the given
> // type and contains the given substring. If that's not the case, a
> // non-fatal failure will be generated.
> SingleFailureChecker::~SingleFailureChecker() {
>- EXPECT_PRED_FORMAT3(HasOneFailure, *results_, type_, substr_.c_str());
>+ EXPECT_PRED_FORMAT3(HasOneFailure, *results_, type_, substr_);
> }
> 
> DefaultGlobalTestPartResultReporter::DefaultGlobalTestPartResultReporter(
>@@ -709,11 +801,22 @@ int UnitTestImpl::failed_test_count() const {
> return SumOverTestCaseList(test_cases_, &TestCase::failed_test_count);
> }
> 
>+// Gets the number of disabled tests that will be reported in the XML report.
>+int UnitTestImpl::reportable_disabled_test_count() const {
>+ return SumOverTestCaseList(test_cases_,
>+ &TestCase::reportable_disabled_test_count);
>+}
>+
> // Gets the number of disabled tests.
> int UnitTestImpl::disabled_test_count() const {
> return SumOverTestCaseList(test_cases_, &TestCase::disabled_test_count);
> }
> 
>+// Gets the number of tests to be printed in the XML report.
>+int UnitTestImpl::reportable_test_count() const {
>+ return SumOverTestCaseList(test_cases_, &TestCase::reportable_test_count);
>+}
>+
> // Gets the number of all tests.
> int UnitTestImpl::total_test_count() const {
> return SumOverTestCaseList(test_cases_, &TestCase::total_test_count);
>@@ -724,7 +827,7 @@ int UnitTestImpl::test_to_run_count() const {
> return SumOverTestCaseList(test_cases_, &TestCase::test_to_run_count);
> }
> 
>-// Returns the current OS stack trace as a String.
>+// Returns the current OS stack trace as an std::string.
> //
> // The maximum number of stack frames to be included is specified by
> // the gtest_stack_trace_depth flag. The skip_count parameter
>@@ -734,9 +837,13 @@ int UnitTestImpl::test_to_run_count() const {
> // For example, if Foo() calls Bar(), which in turn calls
> // CurrentOsStackTraceExceptTop(1), Foo() will be included in the
> // trace but Bar() and CurrentOsStackTraceExceptTop() won't.
>-String UnitTestImpl::CurrentOsStackTraceExceptTop(int skip_count) {
>- (void)skip_count;
>- return String("");
>+std::string UnitTestImpl::CurrentOsStackTraceExceptTop(int skip_count) {
>+ return os_stack_trace_getter()->CurrentStackTrace(
>+ static_cast<int>(GTEST_FLAG(stack_trace_depth)),
>+ skip_count + 1
>+ // Skips the user-specified number of frames plus this function
>+ // itself.
>+ ); // NOLINT
> }
> 
> // Returns the current time in milliseconds.
>@@ -751,7 +858,7 @@ TimeInMillis GetTimeInMillis() {
> SYSTEMTIME now_systime;
> FILETIME now_filetime;
> ULARGE_INTEGER now_int64;
>- // TODO(kenton@google.com): Shouldn't this just use
>+ // FIXME: Shouldn't this just use
> // GetSystemTimeAsFileTime()?
> GetSystemTime(&now_systime);
> if (SystemTimeToFileTime(&now_systime, &now_filetime)) {
>@@ -764,65 +871,28 @@ TimeInMillis GetTimeInMillis() {
> return 0;
> #elif GTEST_OS_WINDOWS && !GTEST_HAS_GETTIMEOFDAY_
> __timeb64 now;
>-#ifdef _MSC_VER
>+
> // MSVC 8 deprecates _ftime64(), so we want to suppress warning 4996
> // (deprecated function) there.
>- // TODO(kenton@google.com): Use GetTickCount()? Or use
>+ // FIXME: Use GetTickCount()? Or use
> // SystemTimeToFileTime()
>-#pragma warning(push) // Saves the current warning state.
>-#pragma warning(disable:4996) // Temporarily disables warning 4996.
>+ GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
> _ftime64(&now);
>-#pragma warning(pop) // Restores the warning state.
>-#else
>- _ftime64(&now);
>-#endif // _MSC_VER
>+ GTEST_DISABLE_MSC_DEPRECATED_POP_()
>+
> return static_cast<TimeInMillis>(now.time) * 1000 + now.millitm;
> #elif GTEST_HAS_GETTIMEOFDAY_
> struct timeval now;
> gettimeofday(&now, NULL);
> return static_cast<TimeInMillis>(now.tv_sec) * 1000 + now.tv_usec / 1000;
> #else
>-#error "Don't know how to get the current time on your system."
>+# error "Don't know how to get the current time on your system."
> #endif
> }
> 
> // Utilities
> 
>-// class String
>-
>-// Returns the input enclosed in double quotes if it's not NULL;
>-// otherwise returns "(null)". For example, "\"Hello\"" is returned
>-// for input "Hello".
>-//
>-// This is useful for printing a C string in the syntax of a literal.
>-//
>-// Known issue: escape sequences are not handled yet.
>-String String::ShowCStringQuoted(const char* c_str) {
>- return c_str ? String::Format("\"%s\"", c_str) : String("(null)");
>-}
>-
>-// Copies at most length characters from str into a newly-allocated
>-// piece of memory of size length+1. The memory is allocated with new[].
>-// A terminating null byte is written to the memory, and a pointer to it
>-// is returned. If str is NULL, NULL is returned.
>-static char* CloneString(const char* str, size_t length) {
>- if (str == NULL) {
>- return NULL;
>- } else {
>- char* const clone = new char[length + 1];
>- posix::StrNCpy(clone, str, length);
>- clone[length] = '\0';
>- return clone;
>- }
>-}
>-
>-// Clones a 0-terminated C string, allocating memory using new. The
>-// caller is responsible for deleting[] the return value. Returns the
>-// cloned string, or NULL if the input is NULL.
>-const char * String::CloneCString(const char* c_str) {
>- return (c_str == NULL) ?
>- NULL : CloneString(c_str, strlen(c_str));
>-}
>+// class String.
> 
> #if GTEST_OS_WINDOWS_MOBILE
> // Creates a UTF-16 wide string from the given ANSI string, allocating
>@@ -879,11 +949,6 @@ bool String::CStringEquals(const char * lhs, const char * rhs) {
> // encoding, and streams the result to the given Message object.
> static void StreamWideCharsToMessage(const wchar_t* wstr, size_t length,
> Message* msg) {
>- // TODO(wan): consider allowing a testing::String object to
>- // contain '\0'. This will make it behave more like std::string,
>- // and will allow ToUtf8String() to return the correct encoding
>- // for '\0' s.t. we can get rid of the conditional here (and in
>- // several other places).
> for (size_t i = 0; i != length; ) { // NOLINT
> if (wstr[i] != L'\0') {
> *msg << WideStringToUtf8(wstr + i, static_cast<int>(length - i));
>@@ -898,8 +963,45 @@ static void StreamWideCharsToMessage(const wchar_t* wstr, size_t length,
> 
> #endif // GTEST_HAS_STD_WSTRING || GTEST_HAS_GLOBAL_WSTRING
> 
>+void SplitString(const ::std::string& str, char delimiter,
>+ ::std::vector< ::std::string>* dest) {
>+ ::std::vector< ::std::string> parsed;
>+ ::std::string::size_type pos = 0;
>+ while (::testing::internal::AlwaysTrue()) {
>+ const ::std::string::size_type colon = str.find(delimiter, pos);
>+ if (colon == ::std::string::npos) {
>+ parsed.push_back(str.substr(pos));
>+ break;
>+ } else {
>+ parsed.push_back(str.substr(pos, colon - pos));
>+ pos = colon + 1;
>+ }
>+ }
>+ dest->swap(parsed);
>+}
>+
> } // namespace internal
> 
>+// Constructs an empty Message.
>+// We allocate the stringstream separately because otherwise each use of
>+// ASSERT/EXPECT in a procedure adds over 200 bytes to the procedure's
>+// stack frame leading to huge stack frames in some cases; gcc does not reuse
>+// the stack space.
>+Message::Message() : ss_(new ::std::stringstream) {
>+ // By default, we want there to be enough precision when printing
>+ // a double to a Message.
>+ *ss_ << std::setprecision(std::numeric_limits<double>::digits10 + 2);
>+}
>+
>+// These two overloads allow streaming a wide C string to a Message
>+// using the UTF-8 encoding.
>+Message& Message::operator <<(const wchar_t* wide_c_str) {
>+ return *this << internal::String::ShowWideCString(wide_c_str);
>+}
>+Message& Message::operator <<(wchar_t* wide_c_str) {
>+ return *this << internal::String::ShowWideCString(wide_c_str);
>+}
>+
> #if GTEST_HAS_STD_WSTRING
> // Converts the given wide string to a narrow string using the UTF-8
> // encoding, and streams the result to this Message object.
>@@ -918,55 +1020,26 @@ Message& Message::operator <<(const ::wstring& wstr) {
> }
> #endif // GTEST_HAS_GLOBAL_WSTRING
> 
>-namespace internal {
>-
>-// Formats a value to be used in a failure message.
>-
>-// For a char value, we print it as a C++ char literal and as an
>-// unsigned integer (both in decimal and in hexadecimal).
>-String FormatForFailureMessage(char ch) {
>- const unsigned int ch_as_uint = ch;
>- // A String object cannot contain '\0', so we print "\\0" when ch is
>- // '\0'.
>- return String::Format("'%s' (%u, 0x%X)",
>- ch ? String::Format("%c", ch).c_str() : "\\0",
>- ch_as_uint, ch_as_uint);
>-}
>-
>-// For a wchar_t value, we print it as a C++ wchar_t literal and as an
>-// unsigned integer (both in decimal and in hexidecimal).
>-String FormatForFailureMessage(wchar_t wchar) {
>- // The C++ standard doesn't specify the exact size of the wchar_t
>- // type. It just says that it shall have the same size as another
>- // integral type, called its underlying type.
>- //
>- // Therefore, in order to print a wchar_t value in the numeric form,
>- // we first convert it to the largest integral type (UInt64) and
>- // then print the converted value.
>- //
>- // We use streaming to print the value as "%llu" doesn't work
>- // correctly with MSVC 7.1.
>- const UInt64 wchar_as_uint64 = wchar;
>- Message msg;
>- // A String object cannot contain '\0', so we print "\\0" when wchar is
>- // L'\0'.
>- char buffer[32]; // CodePointToUtf8 requires a buffer that big.
>- msg << "L'"
>- << (wchar ? CodePointToUtf8(static_cast<UInt32>(wchar), buffer) : "\\0")
>- << "' (" << wchar_as_uint64 << ", 0x" << ::std::setbase(16)
>- << wchar_as_uint64 << ")";
>- return msg.GetString();
>+// Gets the text streamed to this object so far as an std::string.
>+// Each '\0' character in the buffer is replaced with "\\0".
>+std::string Message::GetString() const {
>+ return internal::StringStreamToString(ss_.get());
> }
> 
>-} // namespace internal
>-
> // AssertionResult constructors.
> // Used in EXPECT_TRUE/FALSE(assertion_result).
> AssertionResult::AssertionResult(const AssertionResult& other)
> : success_(other.success_),
> message_(other.message_.get() != NULL ?
>- new internal::String(*other.message_) :
>- static_cast<internal::String*>(NULL)) {
>+ new ::std::string(*other.message_) :
>+ static_cast< ::std::string*>(NULL)) {
>+}
>+
>+// Swaps two AssertionResults.
>+void AssertionResult::swap(AssertionResult& other) {
>+ using std::swap;
>+ swap(success_, other.success_);
>+ swap(message_, other.message_);
> }
> 
> // Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
>@@ -995,6 +1068,276 @@ AssertionResult AssertionFailure(const Message& message) {
> 
> namespace internal {
> 
>+namespace edit_distance {
>+std::vector<EditType> CalculateOptimalEdits(const std::vector<size_t>& left,
>+ const std::vector<size_t>& right) {
>+ std::vector<std::vector<double> > costs(
>+ left.size() + 1, std::vector<double>(right.size() + 1));
>+ std::vector<std::vector<EditType> > best_move(
>+ left.size() + 1, std::vector<EditType>(right.size() + 1));
>+
>+ // Populate for empty right.
>+ for (size_t l_i = 0; l_i < costs.size(); ++l_i) {
>+ costs[l_i][0] = static_cast<double>(l_i);
>+ best_move[l_i][0] = kRemove;
>+ }
>+ // Populate for empty left.
>+ for (size_t r_i = 1; r_i < costs[0].size(); ++r_i) {
>+ costs[0][r_i] = static_cast<double>(r_i);
>+ best_move[0][r_i] = kAdd;
>+ }
>+
>+ for (size_t l_i = 0; l_i < left.size(); ++l_i) {
>+ for (size_t r_i = 0; r_i < right.size(); ++r_i) {
>+ if (left[l_i] == right[r_i]) {
>+ // Found a match. Consume it.
>+ costs[l_i + 1][r_i + 1] = costs[l_i][r_i];
>+ best_move[l_i + 1][r_i + 1] = kMatch;
>+ continue;
>+ }
>+
>+ const double add = costs[l_i + 1][r_i];
>+ const double remove = costs[l_i][r_i + 1];
>+ const double replace = costs[l_i][r_i];
>+ if (add < remove && add < replace) {
>+ costs[l_i + 1][r_i + 1] = add + 1;
>+ best_move[l_i + 1][r_i + 1] = kAdd;
>+ } else if (remove < add && remove < replace) {
>+ costs[l_i + 1][r_i + 1] = remove + 1;
>+ best_move[l_i + 1][r_i + 1] = kRemove;
>+ } else {
>+ // We make replace a little more expensive than add/remove to lower
>+ // their priority.
>+ costs[l_i + 1][r_i + 1] = replace + 1.00001;
>+ best_move[l_i + 1][r_i + 1] = kReplace;
>+ }
>+ }
>+ }
>+
>+ // Reconstruct the best path. We do it in reverse order.
>+ std::vector<EditType> best_path;
>+ for (size_t l_i = left.size(), r_i = right.size(); l_i > 0 || r_i > 0;) {
>+ EditType move = best_move[l_i][r_i];
>+ best_path.push_back(move);
>+ l_i -= move != kAdd;
>+ r_i -= move != kRemove;
>+ }
>+ std::reverse(best_path.begin(), best_path.end());
>+ return best_path;
>+}
>+
>+namespace {
>+
>+// Helper class to convert string into ids with deduplication.
>+class InternalStrings {
>+ public:
>+ size_t GetId(const std::string& str) {
>+ IdMap::iterator it = ids_.find(str);
>+ if (it != ids_.end()) return it->second;
>+ size_t id = ids_.size();
>+ return ids_[str] = id;
>+ }
>+
>+ private:
>+ typedef std::map<std::string, size_t> IdMap;
>+ IdMap ids_;
>+};
>+
>+} // namespace
>+
>+std::vector<EditType> CalculateOptimalEdits(
>+ const std::vector<std::string>& left,
>+ const std::vector<std::string>& right) {
>+ std::vector<size_t> left_ids, right_ids;
>+ {
>+ InternalStrings intern_table;
>+ for (size_t i = 0; i < left.size(); ++i) {
>+ left_ids.push_back(intern_table.GetId(left[i]));
>+ }
>+ for (size_t i = 0; i < right.size(); ++i) {
>+ right_ids.push_back(intern_table.GetId(right[i]));
>+ }
>+ }
>+ return CalculateOptimalEdits(left_ids, right_ids);
>+}
>+
>+namespace {
>+
>+// Helper class that holds the state for one hunk and prints it out to the
>+// stream.
>+// It reorders adds/removes when possible to group all removes before all
>+// adds. It also adds the hunk header before printint into the stream.
>+class Hunk {
>+ public:
>+ Hunk(size_t left_start, size_t right_start)
>+ : left_start_(left_start),
>+ right_start_(right_start),
>+ adds_(),
>+ removes_(),
>+ common_() {}
>+
>+ void PushLine(char edit, const char* line) {
>+ switch (edit) {
>+ case ' ':
>+ ++common_;
>+ FlushEdits();
>+ hunk_.push_back(std::make_pair(' ', line));
>+ break;
>+ case '-':
>+ ++removes_;
>+ hunk_removes_.push_back(std::make_pair('-', line));
>+ break;
>+ case '+':
>+ ++adds_;
>+ hunk_adds_.push_back(std::make_pair('+', line));
>+ break;
>+ }
>+ }
>+
>+ void PrintTo(std::ostream* os) {
>+ PrintHeader(os);
>+ FlushEdits();
>+ for (std::list<std::pair<char, const char*> >::const_iterator it =
>+ hunk_.begin();
>+ it != hunk_.end(); ++it) {
>+ *os << it->first << it->second << "\n";
>+ }
>+ }
>+
>+ bool has_edits() const { return adds_ || removes_; }
>+
>+ private:
>+ void FlushEdits() {
>+ hunk_.splice(hunk_.end(), hunk_removes_);
>+ hunk_.splice(hunk_.end(), hunk_adds_);
>+ }
>+
>+ // Print a unified diff header for one hunk.
>+ // The format is
>+ // "@@ -<left_start>,<left_length> +<right_start>,<right_length> @@"
>+ // where the left/right parts are omitted if unnecessary.
>+ void PrintHeader(std::ostream* ss) const {
>+ *ss << "@@ ";
>+ if (removes_) {
>+ *ss << "-" << left_start_ << "," << (removes_ + common_);
>+ }
>+ if (removes_ && adds_) {
>+ *ss << " ";
>+ }
>+ if (adds_) {
>+ *ss << "+" << right_start_ << "," << (adds_ + common_);
>+ }
>+ *ss << " @@\n";
>+ }
>+
>+ size_t left_start_, right_start_;
>+ size_t adds_, removes_, common_;
>+ std::list<std::pair<char, const char*> > hunk_, hunk_adds_, hunk_removes_;
>+};
>+
>+} // namespace
>+
>+// Create a list of diff hunks in Unified diff format.
>+// Each hunk has a header generated by PrintHeader above plus a body with
>+// lines prefixed with ' ' for no change, '-' for deletion and '+' for
>+// addition.
>+// 'context' represents the desired unchanged prefix/suffix around the diff.
>+// If two hunks are close enough that their contexts overlap, then they are
>+// joined into one hunk.
>+std::string CreateUnifiedDiff(const std::vector<std::string>& left,
>+ const std::vector<std::string>& right,
>+ size_t context) {
>+ const std::vector<EditType> edits = CalculateOptimalEdits(left, right);
>+
>+ size_t l_i = 0, r_i = 0, edit_i = 0;
>+ std::stringstream ss;
>+ while (edit_i < edits.size()) {
>+ // Find first edit.
>+ while (edit_i < edits.size() && edits[edit_i] == kMatch) {
>+ ++l_i;
>+ ++r_i;
>+ ++edit_i;
>+ }
>+
>+ // Find the first line to include in the hunk.
>+ const size_t prefix_context = std::min(l_i, context);
>+ Hunk hunk(l_i - prefix_context + 1, r_i - prefix_context + 1);
>+ for (size_t i = prefix_context; i > 0; --i) {
>+ hunk.PushLine(' ', left[l_i - i].c_str());
>+ }
>+
>+ // Iterate the edits until we found enough suffix for the hunk or the input
>+ // is over.
>+ size_t n_suffix = 0;
>+ for (; edit_i < edits.size(); ++edit_i) {
>+ if (n_suffix >= context) {
>+ // Continue only if the next hunk is very close.
>+ std::vector<EditType>::const_iterator it = edits.begin() + edit_i;
>+ while (it != edits.end() && *it == kMatch) ++it;
>+ if (it == edits.end() || (it - edits.begin()) - edit_i >= context) {
>+ // There is no next edit or it is too far away.
>+ break;
>+ }
>+ }
>+
>+ EditType edit = edits[edit_i];
>+ // Reset count when a non match is found.
>+ n_suffix = edit == kMatch ? n_suffix + 1 : 0;
>+
>+ if (edit == kMatch || edit == kRemove || edit == kReplace) {
>+ hunk.PushLine(edit == kMatch ? ' ' : '-', left[l_i].c_str());
>+ }
>+ if (edit == kAdd || edit == kReplace) {
>+ hunk.PushLine('+', right[r_i].c_str());
>+ }
>+
>+ // Advance indices, depending on edit type.
>+ l_i += edit != kAdd;
>+ r_i += edit != kRemove;
>+ }
>+
>+ if (!hunk.has_edits()) {
>+ // We are done. We don't want this hunk.
>+ break;
>+ }
>+
>+ hunk.PrintTo(&ss);
>+ }
>+ return ss.str();
>+}
>+
>+} // namespace edit_distance
>+
>+namespace {
>+
>+// The string representation of the values received in EqFailure() are already
>+// escaped. Split them on escaped '\n' boundaries. Leave all other escaped
>+// characters the same.
>+std::vector<std::string> SplitEscapedString(const std::string& str) {
>+ std::vector<std::string> lines;
>+ size_t start = 0, end = str.size();
>+ if (end > 2 && str[0] == '"' && str[end - 1] == '"') {
>+ ++start;
>+ --end;
>+ }
>+ bool escaped = false;
>+ for (size_t i = start; i + 1 < end; ++i) {
>+ if (escaped) {
>+ escaped = false;
>+ if (str[i] == 'n') {
>+ lines.push_back(str.substr(start, i - start - 1));
>+ start = i + 1;
>+ }
>+ } else {
>+ escaped = str[i] == '\\';
>+ }
>+ }
>+ lines.push_back(str.substr(start, end - start));
>+ return lines;
>+}
>+
>+} // namespace
>+
> // Constructs and returns the message for an equality assertion
> // (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure.
> //
>@@ -1002,41 +1345,54 @@ namespace internal {
> // and their values, as strings. For example, for ASSERT_EQ(foo, bar)
> // where foo is 5 and bar is 6, we have:
> //
>-// expected_expression: "foo"
>-// actual_expression: "bar"
>-// expected_value: "5"
>-// actual_value: "6"
>+// lhs_expression: "foo"
>+// rhs_expression: "bar"
>+// lhs_value: "5"
>+// rhs_value: "6"
> //
> // The ignoring_case parameter is true iff the assertion is a
>-// *_STRCASEEQ*. When it's true, the string " (ignoring case)" will
>+// *_STRCASEEQ*. When it's true, the string "Ignoring case" will
> // be inserted into the message.
>-AssertionResult EqFailure(const char* expected_expression,
>- const char* actual_expression,
>- const String& expected_value,
>- const String& actual_value,
>+AssertionResult EqFailure(const char* lhs_expression,
>+ const char* rhs_expression,
>+ const std::string& lhs_value,
>+ const std::string& rhs_value,
> bool ignoring_case) {
> Message msg;
>- msg << "Value of: " << actual_expression;
>- if (actual_value != actual_expression) {
>- msg << "\n Actual: " << actual_value;
>+ msg << "Expected equality of these values:";
>+ msg << "\n " << lhs_expression;
>+ if (lhs_value != lhs_expression) {
>+ msg << "\n Which is: " << lhs_value;
>+ }
>+ msg << "\n " << rhs_expression;
>+ if (rhs_value != rhs_expression) {
>+ msg << "\n Which is: " << rhs_value;
> }
> 
>- msg << "\nExpected: " << expected_expression;
> if (ignoring_case) {
>- msg << " (ignoring case)";
>+ msg << "\nIgnoring case";
> }
>- if (expected_value != expected_expression) {
>- msg << "\nWhich is: " << expected_value;
>+
>+ if (!lhs_value.empty() && !rhs_value.empty()) {
>+ const std::vector<std::string> lhs_lines =
>+ SplitEscapedString(lhs_value);
>+ const std::vector<std::string> rhs_lines =
>+ SplitEscapedString(rhs_value);
>+ if (lhs_lines.size() > 1 || rhs_lines.size() > 1) {
>+ msg << "\nWith diff:\n"
>+ << edit_distance::CreateUnifiedDiff(lhs_lines, rhs_lines);
>+ }
> }
> 
>- return AssertionFailure(msg);
>+ return AssertionFailure() << msg;
> }
> 
> // Constructs a failure message for Boolean assertions such as EXPECT_TRUE.
>-String GetBoolAssertionFailureMessage(const AssertionResult& assertion_result,
>- const char* expression_text,
>- const char* actual_predicate_value,
>- const char* expected_predicate_value) {
>+std::string GetBoolAssertionFailureMessage(
>+ const AssertionResult& assertion_result,
>+ const char* expression_text,
>+ const char* actual_predicate_value,
>+ const char* expected_predicate_value) {
> const char* actual_message = assertion_result.message();
> Message msg;
> msg << "Value of: " << expression_text
>@@ -1057,15 +1413,14 @@ AssertionResult DoubleNearPredFormat(const char* expr1,
> const double diff = fabs(val1 - val2);
> if (diff <= abs_error) return AssertionSuccess();
> 
>- // TODO(wan): do not print the value of an expression if it's
>+ // FIXME: do not print the value of an expression if it's
> // already a literal.
>- Message msg;
>- msg << "The difference between " << expr1 << " and " << expr2
>+ return AssertionFailure()
>+ << "The difference between " << expr1 << " and " << expr2
> << " is " << diff << ", which exceeds " << abs_error_expr << ", where\n"
> << expr1 << " evaluates to " << val1 << ",\n"
> << expr2 << " evaluates to " << val2 << ", and\n"
> << abs_error_expr << " evaluates to " << abs_error << ".";
>- return AssertionFailure(msg);
> }
> 
> 
>@@ -1090,20 +1445,18 @@ AssertionResult FloatingPointLE(const char* expr1,
> // val2 is NaN, as the IEEE floating-point standard requires that
> // any predicate involving a NaN must return false.
> 
>- StrStream val1_ss;
>+ ::std::stringstream val1_ss;
> val1_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
> << val1;
> 
>- StrStream val2_ss;
>+ ::std::stringstream val2_ss;
> val2_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
> << val2;
> 
>- Message msg;
>- msg << "Expected: (" << expr1 << ") <= (" << expr2 << ")\n"
>- << " Actual: " << StrStreamToString(&val1_ss) << " vs "
>- << StrStreamToString(&val2_ss);
>-
>- return AssertionFailure(msg);
>+ return AssertionFailure()
>+ << "Expected: (" << expr1 << ") <= (" << expr2 << ")\n"
>+ << " Actual: " << StringStreamToString(&val1_ss) << " vs "
>+ << StringStreamToString(&val2_ss);
> }
> 
> } // namespace internal
>@@ -1126,18 +1479,18 @@ namespace internal {
> 
> // The helper function for {ASSERT|EXPECT}_EQ with int or enum
> // arguments.
>-AssertionResult CmpHelperEQ(const char* expected_expression,
>- const char* actual_expression,
>- BiggestInt expected,
>- BiggestInt actual) {
>- if (expected == actual) {
>+AssertionResult CmpHelperEQ(const char* lhs_expression,
>+ const char* rhs_expression,
>+ BiggestInt lhs,
>+ BiggestInt rhs) {
>+ if (lhs == rhs) {
> return AssertionSuccess();
> }
> 
>- return EqFailure(expected_expression,
>- actual_expression,
>- FormatForComparisonFailureMessage(expected, actual),
>- FormatForComparisonFailureMessage(actual, expected),
>+ return EqFailure(lhs_expression,
>+ rhs_expression,
>+ FormatForComparisonFailureMessage(lhs, rhs),
>+ FormatForComparisonFailureMessage(rhs, lhs),
> false);
> }
> 
>@@ -1150,11 +1503,10 @@ AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \
> if (val1 op val2) {\
> return AssertionSuccess();\
> } else {\
>- Message msg;\
>- msg << "Expected: (" << expr1 << ") " #op " (" << expr2\
>+ return AssertionFailure() \
>+ << "Expected: (" << expr1 << ") " #op " (" << expr2\
> << "), actual: " << FormatForComparisonFailureMessage(val1, val2)\
> << " vs " << FormatForComparisonFailureMessage(val2, val1);\
>- return AssertionFailure(msg);\
> }\
> }
> 
>@@ -1177,34 +1529,34 @@ GTEST_IMPL_CMP_HELPER_(GT, > )
> #undef GTEST_IMPL_CMP_HELPER_
> 
> // The helper function for {ASSERT|EXPECT}_STREQ.
>-AssertionResult CmpHelperSTREQ(const char* expected_expression,
>- const char* actual_expression,
>- const char* expected,
>- const char* actual) {
>- if (String::CStringEquals(expected, actual)) {
>+AssertionResult CmpHelperSTREQ(const char* lhs_expression,
>+ const char* rhs_expression,
>+ const char* lhs,
>+ const char* rhs) {
>+ if (String::CStringEquals(lhs, rhs)) {
> return AssertionSuccess();
> }
> 
>- return EqFailure(expected_expression,
>- actual_expression,
>- String::ShowCStringQuoted(expected),
>- String::ShowCStringQuoted(actual),
>+ return EqFailure(lhs_expression,
>+ rhs_expression,
>+ PrintToString(lhs),
>+ PrintToString(rhs),
> false);
> }
> 
> // The helper function for {ASSERT|EXPECT}_STRCASEEQ.
>-AssertionResult CmpHelperSTRCASEEQ(const char* expected_expression,
>- const char* actual_expression,
>- const char* expected,
>- const char* actual) {
>- if (String::CaseInsensitiveCStringEquals(expected, actual)) {
>+AssertionResult CmpHelperSTRCASEEQ(const char* lhs_expression,
>+ const char* rhs_expression,
>+ const char* lhs,
>+ const char* rhs) {
>+ if (String::CaseInsensitiveCStringEquals(lhs, rhs)) {
> return AssertionSuccess();
> }
> 
>- return EqFailure(expected_expression,
>- actual_expression,
>- String::ShowCStringQuoted(expected),
>- String::ShowCStringQuoted(actual),
>+ return EqFailure(lhs_expression,
>+ rhs_expression,
>+ PrintToString(lhs),
>+ PrintToString(rhs),
> true);
> }
> 
>@@ -1216,11 +1568,9 @@ AssertionResult CmpHelperSTRNE(const char* s1_expression,
> if (!String::CStringEquals(s1, s2)) {
> return AssertionSuccess();
> } else {
>- Message msg;
>- msg << "Expected: (" << s1_expression << ") != ("
>- << s2_expression << "), actual: \""
>- << s1 << "\" vs \"" << s2 << "\"";
>- return AssertionFailure(msg);
>+ return AssertionFailure() << "Expected: (" << s1_expression << ") != ("
>+ << s2_expression << "), actual: \""
>+ << s1 << "\" vs \"" << s2 << "\"";
> }
> }
> 
>@@ -1232,11 +1582,10 @@ AssertionResult CmpHelperSTRCASENE(const char* s1_expression,
> if (!String::CaseInsensitiveCStringEquals(s1, s2)) {
> return AssertionSuccess();
> } else {
>- Message msg;
>- msg << "Expected: (" << s1_expression << ") != ("
>+ return AssertionFailure()
>+ << "Expected: (" << s1_expression << ") != ("
> << s2_expression << ") (ignoring case), actual: \""
> << s1 << "\" vs \"" << s2 << "\"";
>- return AssertionFailure(msg);
> }
> }
> 
>@@ -1285,13 +1634,12 @@ AssertionResult IsSubstringImpl(
> 
> const bool is_wide_string = sizeof(needle[0]) > 1;
> const char* const begin_string_quote = is_wide_string ? "L\"" : "\"";
>- return AssertionFailure(
>- Message()
>+ return AssertionFailure()
> << "Value of: " << needle_expr << "\n"
> << " Actual: " << begin_string_quote << needle << "\"\n"
> << "Expected: " << (expected_to_be_substring ? "" : "not ")
> << "a substring of " << haystack_expr << "\n"
>- << "Which is: " << begin_string_quote << haystack << "\"");
>+ << "Which is: " << begin_string_quote << haystack << "\"";
> }
> 
> } // namespace
>@@ -1360,16 +1708,19 @@ namespace {
> AssertionResult HRESULTFailureHelper(const char* expr,
> const char* expected,
> long hr) { // NOLINT
>-#if GTEST_OS_WINDOWS_MOBILE
>+# if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_TV_TITLE
>+
> // Windows CE doesn't support FormatMessage.
> const char error_text[] = "";
>-#else
>+
>+# else
>+
> // Looks up the human-readable system message for the HRESULT code
> // and since we're not passing any params to FormatMessage, we don't
> // want inserts expanded.
> const DWORD kFlags = FORMAT_MESSAGE_FROM_SYSTEM |
> FORMAT_MESSAGE_IGNORE_INSERTS;
>- const DWORD kBufSize = 4096; // String::Format can't exceed this length.
>+ const DWORD kBufSize = 4096;
> // Gets the system's human readable message string for this HRESULT.
> char error_text[kBufSize] = { '\0' };
> DWORD message_length = ::FormatMessageA(kFlags,
>@@ -1379,19 +1730,18 @@ AssertionResult HRESULTFailureHelper(const char* expr,
> error_text, // output buffer
> kBufSize, // buf size
> NULL); // no arguments for inserts
>- // Trims tailing white space (FormatMessage leaves a trailing cr-lf)
>- for (; message_length && isspace(error_text[message_length - 1]);
>+ // Trims tailing white space (FormatMessage leaves a trailing CR-LF)
>+ for (; message_length && IsSpace(error_text[message_length - 1]);
> --message_length) {
> error_text[message_length - 1] = '\0';
> }
>-#endif // GTEST_OS_WINDOWS_MOBILE
> 
>- const String error_hex(String::Format("0x%08X ", hr));
>- Message msg;
>- msg << "Expected: " << expr << " " << expected << ".\n"
>- << " Actual: " << error_hex << error_text << "\n";
>+# endif // GTEST_OS_WINDOWS_MOBILE
> 
>- return ::testing::AssertionFailure(msg);
>+ const std::string error_hex("0x" + String::FormatHexInt(hr));
>+ return ::testing::AssertionFailure()
>+ << "Expected: " << expr << " " << expected << ".\n"
>+ << " Actual: " << error_hex << " " << error_text << "\n";
> }
> 
> } // namespace
>@@ -1415,7 +1765,7 @@ AssertionResult IsHRESULTFailure(const char* expr, long hr) { // NOLINT
> // Utility functions for encoding Unicode text (wide strings) in
> // UTF-8.
> 
>-// A Unicode code-point can have upto 21 bits, and is encoded in UTF-8
>+// A Unicode code-point can have up to 21 bits, and is encoded in UTF-8
> // like this:
> //
> // Code-point length Encoding
>@@ -1448,12 +1798,15 @@ inline UInt32 ChopLowBits(UInt32* bits, int n) {
> // Converts a Unicode code point to a narrow string in UTF-8 encoding.
> // code_point parameter is of type UInt32 because wchar_t may not be
> // wide enough to contain a code point.
>-// The output buffer str must containt at least 32 characters.
>-// The function returns the address of the output buffer.
> // If the code_point is not a valid Unicode code point
>-// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be output
>-// as '(Invalid Unicode 0xXXXXXXXX)'.
>-char* CodePointToUtf8(UInt32 code_point, char* str) {
>+// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted
>+// to "(Invalid Unicode 0xXXXXXXXX)".
>+std::string CodePointToUtf8(UInt32 code_point) {
>+ if (code_point > kMaxCodePoint4) {
>+ return "(Invalid Unicode 0x" + String::FormatHexInt(code_point) + ")";
>+ }
>+
>+ char str[5]; // Big enough for the largest valid code point.
> if (code_point <= kMaxCodePoint1) {
> str[1] = '\0';
> str[0] = static_cast<char>(code_point); // 0xxxxxxx
>@@ -1466,27 +1819,17 @@ char* CodePointToUtf8(UInt32 code_point, char* str) {
> str[2] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx
> str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx
> str[0] = static_cast<char>(0xE0 | code_point); // 1110xxxx
>- } else if (code_point <= kMaxCodePoint4) {
>+ } else { // code_point <= kMaxCodePoint4
> str[4] = '\0';
> str[3] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx
> str[2] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx
> str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx
> str[0] = static_cast<char>(0xF0 | code_point); // 11110xxx
>- } else {
>- // The longest string String::Format can produce when invoked
>- // with these parameters is 28 character long (not including
>- // the terminating nul character). We are asking for 32 character
>- // buffer just in case. This is also enough for strncpy to
>- // null-terminate the destination string.
>- posix::StrNCpy(
>- str, String::Format("(Invalid Unicode 0x%X)", code_point).c_str(), 32);
>- str[31] = '\0'; // Makes sure no change in the format to strncpy leaves
>- // the result unterminated.
> }
> return str;
> }
> 
>-// The following two functions only make sense if the the system
>+// The following two functions only make sense if the system
> // uses UTF-16 for wide string encoding. All supported systems
> // with 16 bit wchar_t (Windows, Cygwin, Symbian OS) do use UTF-16.
> 
>@@ -1522,11 +1865,11 @@ inline UInt32 CreateCodePointFromUtf16SurrogatePair(wchar_t first,
> // as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding
> // and contains invalid UTF-16 surrogate pairs, values in those pairs
> // will be encoded as individual Unicode characters from Basic Normal Plane.
>-String WideStringToUtf8(const wchar_t* str, int num_chars) {
>+std::string WideStringToUtf8(const wchar_t* str, int num_chars) {
> if (num_chars == -1)
> num_chars = static_cast<int>(wcslen(str));
> 
>- StrStream stream;
>+ ::std::stringstream stream;
> for (int i = 0; i < num_chars; ++i) {
> UInt32 unicode_code_point;
> 
>@@ -1540,27 +1883,17 @@ String WideStringToUtf8(const wchar_t* str, int num_chars) {
> unicode_code_point = static_cast<UInt32>(str[i]);
> }
> 
>- char buffer[32]; // CodePointToUtf8 requires a buffer this big.
>- stream << CodePointToUtf8(unicode_code_point, buffer);
>+ stream << CodePointToUtf8(unicode_code_point);
> }
>- return StrStreamToString(&stream);
>+ return StringStreamToString(&stream);
> }
> 
>-// Converts a wide C string to a String using the UTF-8 encoding.
>+// Converts a wide C string to an std::string using the UTF-8 encoding.
> // NULL will be converted to "(null)".
>-String String::ShowWideCString(const wchar_t * wide_c_str) {
>- if (wide_c_str == NULL) return String("(null)");
>-
>- return String(internal::WideStringToUtf8(wide_c_str, -1).c_str());
>-}
>-
>-// Similar to ShowWideCString(), except that this function encloses
>-// the converted string in double quotes.
>-String String::ShowWideCStringQuoted(const wchar_t* wide_c_str) {
>- if (wide_c_str == NULL) return String("(null)");
>+std::string String::ShowWideCString(const wchar_t * wide_c_str) {
>+ if (wide_c_str == NULL) return "(null)";
> 
>- return String::Format("L\"%s\"",
>- String::ShowWideCString(wide_c_str).c_str());
>+ return internal::WideStringToUtf8(wide_c_str, -1);
> }
> 
> // Compares two wide C strings. Returns true iff they have the same
>@@ -1578,18 +1911,18 @@ bool String::WideCStringEquals(const wchar_t * lhs, const wchar_t * rhs) {
> }
> 
> // Helper function for *_STREQ on wide strings.
>-AssertionResult CmpHelperSTREQ(const char* expected_expression,
>- const char* actual_expression,
>- const wchar_t* expected,
>- const wchar_t* actual) {
>- if (String::WideCStringEquals(expected, actual)) {
>+AssertionResult CmpHelperSTREQ(const char* lhs_expression,
>+ const char* rhs_expression,
>+ const wchar_t* lhs,
>+ const wchar_t* rhs) {
>+ if (String::WideCStringEquals(lhs, rhs)) {
> return AssertionSuccess();
> }
> 
>- return EqFailure(expected_expression,
>- actual_expression,
>- String::ShowWideCStringQuoted(expected),
>- String::ShowWideCStringQuoted(actual),
>+ return EqFailure(lhs_expression,
>+ rhs_expression,
>+ PrintToString(lhs),
>+ PrintToString(rhs),
> false);
> }
> 
>@@ -1602,12 +1935,10 @@ AssertionResult CmpHelperSTRNE(const char* s1_expression,
> return AssertionSuccess();
> }
> 
>- Message msg;
>- msg << "Expected: (" << s1_expression << ") != ("
>- << s2_expression << "), actual: "
>- << String::ShowWideCStringQuoted(s1)
>- << " vs " << String::ShowWideCStringQuoted(s2);
>- return AssertionFailure(msg);
>+ return AssertionFailure() << "Expected: (" << s1_expression << ") != ("
>+ << s2_expression << "), actual: "
>+ << PrintToString(s1)
>+ << " vs " << PrintToString(s2);
> }
> 
> // Compares two C strings, ignoring case. Returns true iff they have
>@@ -1638,17 +1969,17 @@ bool String::CaseInsensitiveCStringEquals(const char * lhs, const char * rhs) {
> // current locale.
> bool String::CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
> const wchar_t* rhs) {
>- if ( lhs == NULL ) return rhs == NULL;
>+ if (lhs == NULL) return rhs == NULL;
> 
>- if ( rhs == NULL ) return false;
>+ if (rhs == NULL) return false;
> 
> #if GTEST_OS_WINDOWS
> return _wcsicmp(lhs, rhs) == 0;
>-#elif GTEST_OS_LINUX
>+#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID
> return wcscasecmp(lhs, rhs) == 0;
> #else
>- // Mac OS X and Cygwin don't define wcscasecmp. Other unknown OSes
>- // may not define it either.
>+ // Android, Mac OS X and Cygwin don't define wcscasecmp.
>+ // Other unknown OSes may not define it either.
> wint_t left, right;
> do {
> left = towlower(*lhs++);
>@@ -1658,133 +1989,69 @@ bool String::CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
> #endif // OS selector
> }
> 
>-// Compares this with another String.
>-// Returns < 0 if this is less than rhs, 0 if this is equal to rhs, or > 0
>-// if this is greater than rhs.
>-int String::Compare(const String & rhs) const {
>- const char* const lhs_c_str = c_str();
>- const char* const rhs_c_str = rhs.c_str();
>-
>- if (lhs_c_str == NULL) {
>- return rhs_c_str == NULL ? 0 : -1; // NULL < anything except NULL
>- } else if (rhs_c_str == NULL) {
>- return 1;
>- }
>-
>- const size_t shorter_str_len =
>- length() <= rhs.length() ? length() : rhs.length();
>- for (size_t i = 0; i != shorter_str_len; i++) {
>- if (lhs_c_str[i] < rhs_c_str[i]) {
>- return -1;
>- } else if (lhs_c_str[i] > rhs_c_str[i]) {
>- return 1;
>- }
>- }
>- return (length() < rhs.length()) ? -1 :
>- (length() > rhs.length()) ? 1 : 0;
>+// Returns true iff str ends with the given suffix, ignoring case.
>+// Any string is considered to end with an empty suffix.
>+bool String::EndsWithCaseInsensitive(
>+ const std::string& str, const std::string& suffix) {
>+ const size_t str_len = str.length();
>+ const size_t suffix_len = suffix.length();
>+ return (str_len >= suffix_len) &&
>+ CaseInsensitiveCStringEquals(str.c_str() + str_len - suffix_len,
>+ suffix.c_str());
> }
> 
>-// Returns true iff this String ends with the given suffix. *Any*
>-// String is considered to end with a NULL or empty suffix.
>-bool String::EndsWith(const char* suffix) const {
>- if (suffix == NULL || CStringEquals(suffix, "")) return true;
>-
>- if (c_str() == NULL) return false;
>-
>- const size_t this_len = strlen(c_str());
>- const size_t suffix_len = strlen(suffix);
>- return (this_len >= suffix_len) &&
>- CStringEquals(c_str() + this_len - suffix_len, suffix);
>+// Formats an int value as "%02d".
>+std::string String::FormatIntWidth2(int value) {
>+ std::stringstream ss;
>+ ss << std::setfill('0') << std::setw(2) << value;
>+ return ss.str();
> }
> 
>-// Returns true iff this String ends with the given suffix, ignoring case.
>-// Any String is considered to end with a NULL or empty suffix.
>-bool String::EndsWithCaseInsensitive(const char* suffix) const {
>- if (suffix == NULL || CStringEquals(suffix, "")) return true;
>-
>- if (c_str() == NULL) return false;
>-
>- const size_t this_len = strlen(c_str());
>- const size_t suffix_len = strlen(suffix);
>- return (this_len >= suffix_len) &&
>- CaseInsensitiveCStringEquals(c_str() + this_len - suffix_len, suffix);
>+// Formats an int value as "%X".
>+std::string String::FormatHexInt(int value) {
>+ std::stringstream ss;
>+ ss << std::hex << std::uppercase << value;
>+ return ss.str();
> }
> 
>-// Formats a list of arguments to a String, using the same format
>-// spec string as for printf.
>-//
>-// We do not use the StringPrintf class as it is not universally
>-// available.
>-//
>-// The result is limited to 4096 characters (including the tailing 0).
>-// If 4096 characters are not enough to format the input, or if
>-// there's an error, "<formatting error or buffer exceeded>" is
>-// returned.
>-String String::Format(const char * format, ...) {
>- va_list args;
>- va_start(args, format);
>-
>- char buffer[4096];
>- const int kBufferSize = sizeof(buffer)/sizeof(buffer[0]);
>-
>- // MSVC 8 deprecates vsnprintf(), so we want to suppress warning
>- // 4996 (deprecated function) there.
>-#ifdef _MSC_VER // We are using MSVC.
>-#pragma warning(push) // Saves the current warning state.
>-#pragma warning(disable:4996) // Temporarily disables warning 4996.
>- const int size = vsnprintf(buffer, kBufferSize, format, args);
>-#pragma warning(pop) // Restores the warning state.
>-#else // We are not using MSVC.
>- const int size = vsnprintf(buffer, kBufferSize, format, args);
>-#endif // _MSC_VER
>- va_end(args);
>-
>- // vsnprintf()'s behavior is not portable. When the buffer is not
>- // big enough, it returns a negative value in MSVC, and returns the
>- // needed buffer size on Linux. When there is an output error, it
>- // always returns a negative value. For simplicity, we lump the two
>- // error cases together.
>- if (size < 0 || size >= kBufferSize) {
>- return String("<formatting error or buffer exceeded>");
>- } else {
>- return String(buffer, size);
>- }
>+// Formats a byte as "%02X".
>+std::string String::FormatByte(unsigned char value) {
>+ std::stringstream ss;
>+ ss << std::setfill('0') << std::setw(2) << std::hex << std::uppercase
>+ << static_cast<unsigned int>(value);
>+ return ss.str();
> }
> 
>-// Converts the buffer in a StrStream to a String, converting NUL
>+// Converts the buffer in a stringstream to an std::string, converting NUL
> // bytes to "\\0" along the way.
>-String StrStreamToString(StrStream* ss) {
>+std::string StringStreamToString(::std::stringstream* ss) {
> const ::std::string& str = ss->str();
> const char* const start = str.c_str();
> const char* const end = start + str.length();
> 
>- // We need to use a helper StrStream to do this transformation
>- // because String doesn't support push_back().
>- StrStream helper;
>+ std::string result;
>+ result.reserve(2 * (end - start));
> for (const char* ch = start; ch != end; ++ch) {
> if (*ch == '\0') {
>- helper << "\\0"; // Replaces NUL with "\\0";
>+ result += "\\0"; // Replaces NUL with "\\0";
> } else {
>- helper.put(*ch);
>+ result += *ch;
> }
> }
> 
>- return String(helper.str().c_str());
>+ return result;
> }
> 
> // Appends the user-supplied message to the Google-Test-generated message.
>-String AppendUserMessage(const String& gtest_msg,
>- const Message& user_msg) {
>+std::string AppendUserMessage(const std::string& gtest_msg,
>+ const Message& user_msg) {
> // Appends the user message if it's non-empty.
>- const String user_msg_string = user_msg.GetString();
>+ const std::string user_msg_string = user_msg.GetString();
> if (user_msg_string.empty()) {
> return gtest_msg;
> }
> 
>- Message msg;
>- msg << gtest_msg << "\n" << user_msg_string;
>-
>- return msg.GetString();
>+ return gtest_msg + "\n" + user_msg_string;
> }
> 
> } // namespace internal
>@@ -1832,8 +2099,9 @@ void TestResult::AddTestPartResult(const TestPartResult& test_part_result) {
> // Adds a test property to the list. If a property with the same key as the
> // supplied property is already represented, the value of this test_property
> // replaces the old value for that key.
>-void TestResult::RecordProperty(const TestProperty& test_property) {
>- if (!ValidateTestProperty(test_property)) {
>+void TestResult::RecordProperty(const std::string& xml_element,
>+ const TestProperty& test_property) {
>+ if (!ValidateTestProperty(xml_element, test_property)) {
> return;
> }
> internal::MutexLock lock(&test_properites_mutex_);
>@@ -1847,21 +2115,90 @@ void TestResult::RecordProperty(const TestProperty& test_property) {
> property_with_matching_key->SetValue(test_property.value());
> }
> 
>-// Adds a failure if the key is a reserved attribute of Google Test
>-// testcase tags. Returns true if the property is valid.
>-bool TestResult::ValidateTestProperty(const TestProperty& test_property) {
>- internal::String key(test_property.key());
>- if (key == "name" || key == "status" || key == "time" || key == "classname") {
>- ADD_FAILURE()
>- << "Reserved key used in RecordProperty(): "
>- << key
>- << " ('name', 'status', 'time', and 'classname' are reserved by "
>- << GTEST_NAME_ << ")";
>+// The list of reserved attributes used in the <testsuites> element of XML
>+// output.
>+static const char* const kReservedTestSuitesAttributes[] = {
>+ "disabled",
>+ "errors",
>+ "failures",
>+ "name",
>+ "random_seed",
>+ "tests",
>+ "time",
>+ "timestamp"
>+};
>+
>+// The list of reserved attributes used in the <testsuite> element of XML
>+// output.
>+static const char* const kReservedTestSuiteAttributes[] = {
>+ "disabled",
>+ "errors",
>+ "failures",
>+ "name",
>+ "tests",
>+ "time"
>+};
>+
>+// The list of reserved attributes used in the <testcase> element of XML output.
>+static const char* const kReservedTestCaseAttributes[] = {
>+ "classname", "name", "status", "time",
>+ "type_param", "value_param", "file", "line"};
>+
>+template <int kSize>
>+std::vector<std::string> ArrayAsVector(const char* const (&array)[kSize]) {
>+ return std::vector<std::string>(array, array + kSize);
>+}
>+
>+static std::vector<std::string> GetReservedAttributesForElement(
>+ const std::string& xml_element) {
>+ if (xml_element == "testsuites") {
>+ return ArrayAsVector(kReservedTestSuitesAttributes);
>+ } else if (xml_element == "testsuite") {
>+ return ArrayAsVector(kReservedTestSuiteAttributes);
>+ } else if (xml_element == "testcase") {
>+ return ArrayAsVector(kReservedTestCaseAttributes);
>+ } else {
>+ GTEST_CHECK_(false) << "Unrecognized xml_element provided: " << xml_element;
>+ }
>+ // This code is unreachable but some compilers may not realizes that.
>+ return std::vector<std::string>();
>+}
>+
>+static std::string FormatWordList(const std::vector<std::string>& words) {
>+ Message word_list;
>+ for (size_t i = 0; i < words.size(); ++i) {
>+ if (i > 0 && words.size() > 2) {
>+ word_list << ", ";
>+ }
>+ if (i == words.size() - 1) {
>+ word_list << "and ";
>+ }
>+ word_list << "'" << words[i] << "'";
>+ }
>+ return word_list.GetString();
>+}
>+
>+static bool ValidateTestPropertyName(
>+ const std::string& property_name,
>+ const std::vector<std::string>& reserved_names) {
>+ if (std::find(reserved_names.begin(), reserved_names.end(), property_name) !=
>+ reserved_names.end()) {
>+ ADD_FAILURE() << "Reserved key used in RecordProperty(): " << property_name
>+ << " (" << FormatWordList(reserved_names)
>+ << " are reserved by " << GTEST_NAME_ << ")";
> return false;
> }
> return true;
> }
> 
>+// Adds a failure if the key is a reserved attribute of the element named
>+// xml_element. Returns true if the property is valid.
>+bool TestResult::ValidateTestProperty(const std::string& xml_element,
>+ const TestProperty& test_property) {
>+ return ValidateTestPropertyName(test_property.key(),
>+ GetReservedAttributesForElement(xml_element));
>+}
>+
> // Clears the object.
> void TestResult::Clear() {
> test_part_results_.clear();
>@@ -1914,14 +2251,15 @@ int TestResult::test_property_count() const {
> 
> // Creates a Test object.
> 
>-// The c'tor saves the values of all Google Test flags.
>+// The c'tor saves the states of all flags.
> Test::Test()
>- : gtest_flag_saver_(new internal::GTestFlagSaver) {
>+ : gtest_flag_saver_(new GTEST_FLAG_SAVER_) {
> }
> 
>-// The d'tor restores the values of all Google Test flags.
>+// The d'tor restores the states of all flags. The actual work is
>+// done by the d'tor of the gtest_flag_saver_ field, and thus not
>+// visible here.
> Test::~Test() {
>- delete gtest_flag_saver_;
> }
> 
> // Sets up the test fixture.
>@@ -1937,12 +2275,12 @@ void Test::TearDown() {
> }
> 
> // Allows user supplied key value pairs to be recorded for later output.
>-void Test::RecordProperty(const char* key, const char* value) {
>- UnitTest::GetInstance()->RecordPropertyForCurrentTest(key, value);
>+void Test::RecordProperty(const std::string& key, const std::string& value) {
>+ UnitTest::GetInstance()->RecordProperty(key, value);
> }
> 
> // Allows user supplied key value pairs to be recorded for later output.
>-void Test::RecordProperty(const char* key, int value) {
>+void Test::RecordProperty(const std::string& key, int value) {
> Message value_message;
> value_message << value;
> RecordProperty(key, value_message.GetString().c_str());
>@@ -1951,7 +2289,7 @@ void Test::RecordProperty(const char* key, int value) {
> namespace internal {
> 
> void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
>- const String& message) {
>+ const std::string& message) {
> // This function is a friend of UnitTest and as such has access to
> // AddTestPartResult.
> UnitTest::GetInstance()->AddTestPartResult(
>@@ -1959,27 +2297,11 @@ void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
> NULL, // No info about the source file where the exception occurred.
> -1, // We have no info on which line caused the exception.
> message,
>- String()); // No stack trace, either.
>+ ""); // No stack trace, either.
> }
> 
> } // namespace internal
> 
>-#if GTEST_OS_WINDOWS
>-// We are on Windows.
>-
>-// Adds an "exception thrown" fatal failure to the current test.
>-static void AddExceptionThrownFailure(DWORD exception_code,
>- const char* location) {
>- Message message;
>- message << "Exception thrown with code 0x" << std::setbase(16) <<
>- exception_code << std::setbase(10) << " in " << location << ".";
>-
>- internal::ReportFailureInUnknownLocation(TestPartResult::kFatalFailure,
>- message.GetString());
>-}
>-
>-#endif // GTEST_OS_WINDOWS
>-
> // Google Test requires all tests in the same test case to use the same test
> // fixture class. This function checks if the current test has the
> // same fixture class as the first test in the current test case. If
>@@ -1990,15 +2312,13 @@ bool Test::HasSameFixtureClass() {
> const TestCase* const test_case = impl->current_test_case();
> 
> // Info about the first test in the current test case.
>- const internal::TestInfoImpl* const first_test_info =
>- test_case->test_info_list()[0]->impl();
>- const internal::TypeId first_fixture_id = first_test_info->fixture_class_id();
>+ const TestInfo* const first_test_info = test_case->test_info_list()[0];
>+ const internal::TypeId first_fixture_id = first_test_info->fixture_class_id_;
> const char* const first_test_name = first_test_info->name();
> 
> // Info about the current test.
>- const internal::TestInfoImpl* const this_test_info =
>- impl->current_test_info()->impl();
>- const internal::TypeId this_fixture_id = this_test_info->fixture_class_id();
>+ const TestInfo* const this_test_info = impl->current_test_info();
>+ const internal::TypeId this_fixture_id = this_test_info->fixture_class_id_;
> const char* const this_test_name = this_test_info->name();
> 
> if (this_fixture_id != first_fixture_id) {
>@@ -2008,8 +2328,8 @@ bool Test::HasSameFixtureClass() {
> const bool this_is_TEST = this_fixture_id == internal::GetTestTypeId();
> 
> if (first_is_TEST || this_is_TEST) {
>- // The user mixed TEST and TEST_F in this test case - we'll tell
>- // him/her how to fix it.
>+ // Both TEST and TEST_F appear in same test case, which is incorrect.
>+ // Tell the user how to fix this.
> 
> // Gets the name of the TEST and the name of the TEST_F. Note
> // that first_is_TEST and this_is_TEST cannot both be true, as
>@@ -2029,8 +2349,8 @@ bool Test::HasSameFixtureClass() {
> << "want to change the TEST to TEST_F or move it to another test\n"
> << "case.";
> } else {
>- // The user defined two fixture classes with the same name in
>- // two namespaces - we'll tell him/her how to fix it.
>+ // Two fixture classes with the same name appear in two different
>+ // namespaces, which is not allowed. Tell the user how to fix this.
> ADD_FAILURE()
> << "All tests in the same test case must use the same test fixture\n"
> << "class. However, in test case "
>@@ -2048,62 +2368,164 @@ bool Test::HasSameFixtureClass() {
> return true;
> }
> 
>-// Runs the test and updates the test result.
>-void Test::Run() {
>- if (!HasSameFixtureClass()) return;
>-
>- internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
> #if GTEST_HAS_SEH
>- // Catch SEH-style exceptions.
>- impl->os_stack_trace_getter()->UponLeavingGTest();
>- __try {
>- SetUp();
>- } __except(internal::UnitTestOptions::GTestShouldProcessSEH(
>- GetExceptionCode())) {
>- AddExceptionThrownFailure(GetExceptionCode(), "SetUp()");
>- }
> 
>- // We will run the test only if SetUp() had no fatal failure.
>- if (!HasFatalFailure()) {
>- impl->os_stack_trace_getter()->UponLeavingGTest();
>- __try {
>- TestBody();
>- } __except(internal::UnitTestOptions::GTestShouldProcessSEH(
>- GetExceptionCode())) {
>- AddExceptionThrownFailure(GetExceptionCode(), "the test body");
>- }
>- }
>+// Adds an "exception thrown" fatal failure to the current test. This
>+// function returns its result via an output parameter pointer because VC++
>+// prohibits creation of objects with destructors on stack in functions
>+// using __try (see error C2712).
>+static std::string* FormatSehExceptionMessage(DWORD exception_code,
>+ const char* location) {
>+ Message message;
>+ message << "SEH exception with code 0x" << std::setbase(16) <<
>+ exception_code << std::setbase(10) << " thrown in " << location << ".";
> 
>- // However, we want to clean up as much as possible. Hence we will
>- // always call TearDown(), even if SetUp() or the test body has
>- // failed.
>- impl->os_stack_trace_getter()->UponLeavingGTest();
>+ return new std::string(message.GetString());
>+}
>+
>+#endif // GTEST_HAS_SEH
>+
>+namespace internal {
>+
>+#if GTEST_HAS_EXCEPTIONS
>+
>+// Adds an "exception thrown" fatal failure to the current test.
>+static std::string FormatCxxExceptionMessage(const char* description,
>+ const char* location) {
>+ Message message;
>+ if (description != NULL) {
>+ message << "C++ exception with description \"" << description << "\"";
>+ } else {
>+ message << "Unknown C++ exception";
>+ }
>+ message << " thrown in " << location << ".";
>+
>+ return message.GetString();
>+}
>+
>+static std::string PrintTestPartResultToString(
>+ const TestPartResult& test_part_result);
>+
>+GoogleTestFailureException::GoogleTestFailureException(
>+ const TestPartResult& failure)
>+ : ::std::runtime_error(PrintTestPartResultToString(failure).c_str()) {}
>+
>+#endif // GTEST_HAS_EXCEPTIONS
>+
>+// We put these helper functions in the internal namespace as IBM's xlC
>+// compiler rejects the code if they were declared static.
>+
>+// Runs the given method and handles SEH exceptions it throws, when
>+// SEH is supported; returns the 0-value for type Result in case of an
>+// SEH exception. (Microsoft compilers cannot handle SEH and C++
>+// exceptions in the same function. Therefore, we provide a separate
>+// wrapper function for handling SEH exceptions.)
>+template <class T, typename Result>
>+Result HandleSehExceptionsInMethodIfSupported(
>+ T* object, Result (T::*method)(), const char* location) {
>+#if GTEST_HAS_SEH
> __try {
>- TearDown();
>- } __except(internal::UnitTestOptions::GTestShouldProcessSEH(
>+ return (object->*method)();
>+ } __except (internal::UnitTestOptions::GTestShouldProcessSEH( // NOLINT
> GetExceptionCode())) {
>- AddExceptionThrownFailure(GetExceptionCode(), "TearDown()");
>+ // We create the exception message on the heap because VC++ prohibits
>+ // creation of objects with destructors on stack in functions using __try
>+ // (see error C2712).
>+ std::string* exception_message = FormatSehExceptionMessage(
>+ GetExceptionCode(), location);
>+ internal::ReportFailureInUnknownLocation(TestPartResult::kFatalFailure,
>+ *exception_message);
>+ delete exception_message;
>+ return static_cast<Result>(0);
> }
>+#else
>+ (void)location;
>+ return (object->*method)();
>+#endif // GTEST_HAS_SEH
>+}
> 
>-#else // We are on a compiler or platform that doesn't support SEH.
>- impl->os_stack_trace_getter()->UponLeavingGTest();
>- SetUp();
>+// Runs the given method and catches and reports C++ and/or SEH-style
>+// exceptions, if they are supported; returns the 0-value for type
>+// Result in case of an SEH exception.
>+template <class T, typename Result>
>+Result HandleExceptionsInMethodIfSupported(
>+ T* object, Result (T::*method)(), const char* location) {
>+ // NOTE: The user code can affect the way in which Google Test handles
>+ // exceptions by setting GTEST_FLAG(catch_exceptions), but only before
>+ // RUN_ALL_TESTS() starts. It is technically possible to check the flag
>+ // after the exception is caught and either report or re-throw the
>+ // exception based on the flag's value:
>+ //
>+ // try {
>+ // // Perform the test method.
>+ // } catch (...) {
>+ // if (GTEST_FLAG(catch_exceptions))
>+ // // Report the exception as failure.
>+ // else
>+ // throw; // Re-throws the original exception.
>+ // }
>+ //
>+ // However, the purpose of this flag is to allow the program to drop into
>+ // the debugger when the exception is thrown. On most platforms, once the
>+ // control enters the catch block, the exception origin information is
>+ // lost and the debugger will stop the program at the point of the
>+ // re-throw in this function -- instead of at the point of the original
>+ // throw statement in the code under test. For this reason, we perform
>+ // the check early, sacrificing the ability to affect Google Test's
>+ // exception handling in the method where the exception is thrown.
>+ if (internal::GetUnitTestImpl()->catch_exceptions()) {
>+#if GTEST_HAS_EXCEPTIONS
>+ try {
>+ return HandleSehExceptionsInMethodIfSupported(object, method, location);
>+ } catch (const AssertionException&) { // NOLINT
>+ // This failure was reported already.
>+ } catch (const internal::GoogleTestFailureException&) { // NOLINT
>+ // This exception type can only be thrown by a failed Google
>+ // Test assertion with the intention of letting another testing
>+ // framework catch it. Therefore we just re-throw it.
>+ throw;
>+ } catch (const std::exception& e) { // NOLINT
>+ internal::ReportFailureInUnknownLocation(
>+ TestPartResult::kFatalFailure,
>+ FormatCxxExceptionMessage(e.what(), location));
>+ } catch (...) { // NOLINT
>+ internal::ReportFailureInUnknownLocation(
>+ TestPartResult::kFatalFailure,
>+ FormatCxxExceptionMessage(NULL, location));
>+ }
>+ return static_cast<Result>(0);
>+#else
>+ return HandleSehExceptionsInMethodIfSupported(object, method, location);
>+#endif // GTEST_HAS_EXCEPTIONS
>+ } else {
>+ return (object->*method)();
>+ }
>+}
>+
>+} // namespace internal
> 
>+// Runs the test and updates the test result.
>+void Test::Run() {
>+ if (!HasSameFixtureClass()) return;
>+
>+ internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
>+ impl->os_stack_trace_getter()->UponLeavingGTest();
>+ internal::HandleExceptionsInMethodIfSupported(this, &Test::SetUp, "SetUp()");
> // We will run the test only if SetUp() was successful.
> if (!HasFatalFailure()) {
> impl->os_stack_trace_getter()->UponLeavingGTest();
>- TestBody();
>+ internal::HandleExceptionsInMethodIfSupported(
>+ this, &Test::TestBody, "the test body");
> }
> 
> // However, we want to clean up as much as possible. Hence we will
> // always call TearDown(), even if SetUp() or the test body has
> // failed.
> impl->os_stack_trace_getter()->UponLeavingGTest();
>- TearDown();
>-#endif // GTEST_HAS_SEH
>+ internal::HandleExceptionsInMethodIfSupported(
>+ this, &Test::TearDown, "TearDown()");
> }
> 
>-
> // Returns true iff the current test has a fatal failure.
> bool Test::HasFatalFailure() {
> return internal::GetUnitTestImpl()->current_test_result()->HasFatalFailure();
>@@ -2118,22 +2540,28 @@ bool Test::HasNonfatalFailure() {
> // class TestInfo
> 
> // Constructs a TestInfo object. It assumes ownership of the test factory
>-// object via impl_.
>-TestInfo::TestInfo(const char* a_test_case_name,
>- const char* a_name,
>- const char* a_test_case_comment,
>- const char* a_comment,
>+// object.
>+TestInfo::TestInfo(const std::string& a_test_case_name,
>+ const std::string& a_name,
>+ const char* a_type_param,
>+ const char* a_value_param,
>+ internal::CodeLocation a_code_location,
> internal::TypeId fixture_class_id,
>- internal::TestFactoryBase* factory) {
>- impl_ = new internal::TestInfoImpl(this, a_test_case_name, a_name,
>- a_test_case_comment, a_comment,
>- fixture_class_id, factory);
>-}
>+ internal::TestFactoryBase* factory)
>+ : test_case_name_(a_test_case_name),
>+ name_(a_name),
>+ type_param_(a_type_param ? new std::string(a_type_param) : NULL),
>+ value_param_(a_value_param ? new std::string(a_value_param) : NULL),
>+ location_(a_code_location),
>+ fixture_class_id_(fixture_class_id),
>+ should_run_(false),
>+ is_disabled_(false),
>+ matches_filter_(false),
>+ factory_(factory),
>+ result_() {}
> 
> // Destructs a TestInfo object.
>-TestInfo::~TestInfo() {
>- delete impl_;
>-}
>+TestInfo::~TestInfo() { delete factory_; }
> 
> namespace internal {
> 
>@@ -2144,10 +2572,11 @@ namespace internal {
> //
> // test_case_name: name of the test case
> // name: name of the test
>-// test_case_comment: a comment on the test case that will be included in
>-// the test output
>-// comment: a comment on the test that will be included in the
>-// test output
>+// type_param: the name of the test's type parameter, or NULL if
>+// this is not a typed or a type-parameterized test.
>+// value_param: text representation of the test's value parameter,
>+// or NULL if this is not a value-parameterized test.
>+// code_location: code location where the test is defined
> // fixture_class_id: ID of the test fixture class
> // set_up_tc: pointer to the function that sets up the test case
> // tear_down_tc: pointer to the function that tears down the test case
>@@ -2155,22 +2584,24 @@ namespace internal {
> // The newly created TestInfo instance will assume
> // ownership of the factory object.
> TestInfo* MakeAndRegisterTestInfo(
>- const char* test_case_name, const char* name,
>- const char* test_case_comment, const char* comment,
>+ const char* test_case_name,
>+ const char* name,
>+ const char* type_param,
>+ const char* value_param,
>+ CodeLocation code_location,
> TypeId fixture_class_id,
> SetUpTestCaseFunc set_up_tc,
> TearDownTestCaseFunc tear_down_tc,
> TestFactoryBase* factory) {
> TestInfo* const test_info =
>- new TestInfo(test_case_name, name, test_case_comment, comment,
>- fixture_class_id, factory);
>+ new TestInfo(test_case_name, name, type_param, value_param,
>+ code_location, fixture_class_id, factory);
> GetUnitTestImpl()->AddTestInfo(set_up_tc, tear_down_tc, test_info);
> return test_info;
> }
> 
>-#if GTEST_HAS_PARAM_TEST
> void ReportInvalidTestCaseType(const char* test_case_name,
>- const char* file, int line) {
>+ CodeLocation code_location) {
> Message errors;
> errors
> << "Attempted redefinition of test case " << test_case_name << ".\n"
>@@ -2182,48 +2613,12 @@ void ReportInvalidTestCaseType(const char* test_case_name,
> << "probably rename one of the classes to put the tests into different\n"
> << "test cases.";
> 
>- fprintf(stderr, "%s %s", FormatFileLocation(file, line).c_str(),
>- errors.GetString().c_str());
>+ GTEST_LOG_(ERROR) << FormatFileLocation(code_location.file.c_str(),
>+ code_location.line)
>+ << " " << errors.GetString();
> }
>-#endif // GTEST_HAS_PARAM_TEST
>-
> } // namespace internal
> 
>-// Returns the test case name.
>-const char* TestInfo::test_case_name() const {
>- return impl_->test_case_name();
>-}
>-
>-// Returns the test name.
>-const char* TestInfo::name() const {
>- return impl_->name();
>-}
>-
>-// Returns the test case comment.
>-const char* TestInfo::test_case_comment() const {
>- return impl_->test_case_comment();
>-}
>-
>-// Returns the test comment.
>-const char* TestInfo::comment() const {
>- return impl_->comment();
>-}
>-
>-// Returns true if this test should run.
>-bool TestInfo::should_run() const { return impl_->should_run(); }
>-
>-// Returns true if this test matches the user-specified filter.
>-bool TestInfo::matches_filter() const { return impl_->matches_filter(); }
>-
>-// Returns the result of the test.
>-const TestResult* TestInfo::result() const { return impl_->result(); }
>-
>-// Increments the number of death tests encountered in this test so
>-// far.
>-int TestInfo::increment_death_test_count() {
>- return impl_->result()->increment_death_test_count();
>-}
>-
> namespace {
> 
> // A predicate that checks the test name of a TestInfo against a known
>@@ -2244,11 +2639,11 @@ class TestNameIs {
> 
> // Returns true iff the test name of test_info matches name_.
> bool operator()(const TestInfo * test_info) const {
>- return test_info && internal::String(test_info->name()).Compare(name_) == 0;
>+ return test_info && test_info->name() == name_;
> }
> 
> private:
>- internal::String name_;
>+ std::string name_;
> };
> 
> } // namespace
>@@ -2259,78 +2654,60 @@ namespace internal {
> // and INSTANTIATE_TEST_CASE_P into regular tests and registers those.
> // This will be done just once during the program runtime.
> void UnitTestImpl::RegisterParameterizedTests() {
>-#if GTEST_HAS_PARAM_TEST
> if (!parameterized_tests_registered_) {
> parameterized_test_registry_.RegisterTests();
> parameterized_tests_registered_ = true;
> }
>-#endif
> }
> 
>+} // namespace internal
>+
> // Creates the test object, runs it, records its result, and then
> // deletes it.
>-void TestInfoImpl::Run() {
>+void TestInfo::Run() {
> if (!should_run_) return;
> 
> // Tells UnitTest where to store test result.
>- UnitTestImpl* const impl = internal::GetUnitTestImpl();
>- impl->set_current_test_info(parent_);
>+ internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
>+ impl->set_current_test_info(this);
> 
> TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
> 
> // Notifies the unit test event listeners that a test is about to start.
>- repeater->OnTestStart(*parent_);
>+ repeater->OnTestStart(*this);
> 
>- const TimeInMillis start = GetTimeInMillis();
>+ const TimeInMillis start = internal::GetTimeInMillis();
> 
> impl->os_stack_trace_getter()->UponLeavingGTest();
>-#if GTEST_HAS_SEH
>- // Catch SEH-style exceptions.
>- Test* test = NULL;
>-
>- __try {
>- // Creates the test object.
>- test = factory_->CreateTest();
>- } __except(internal::UnitTestOptions::GTestShouldProcessSEH(
>- GetExceptionCode())) {
>- AddExceptionThrownFailure(GetExceptionCode(),
>- "the test fixture's constructor");
>- return;
>- }
>-#else // We are on a compiler or platform that doesn't support SEH.
>-
>- // TODO(wan): If test->Run() throws, test won't be deleted. This is
>- // not a problem now as we don't use exceptions. If we were to
>- // enable exceptions, we should revise the following to be
>- // exception-safe.
> 
> // Creates the test object.
>- Test* test = factory_->CreateTest();
>-#endif // GTEST_HAS_SEH
>+ Test* const test = internal::HandleExceptionsInMethodIfSupported(
>+ factory_, &internal::TestFactoryBase::CreateTest,
>+ "the test fixture's constructor");
> 
>- // Runs the test only if the constructor of the test fixture didn't
>- // generate a fatal failure.
>+ // Runs the test if the constructor didn't generate a fatal failure.
>+ // Note that the object will not be null
> if (!Test::HasFatalFailure()) {
>+ // This doesn't throw as all user code that can throw are wrapped into
>+ // exception handling code.
> test->Run();
> }
> 
>- // Deletes the test object.
>- impl->os_stack_trace_getter()->UponLeavingGTest();
>- delete test;
>- test = NULL;
>+ // Deletes the test object.
>+ impl->os_stack_trace_getter()->UponLeavingGTest();
>+ internal::HandleExceptionsInMethodIfSupported(
>+ test, &Test::DeleteSelf_, "the test fixture's destructor");
> 
>- result_.set_elapsed_time(GetTimeInMillis() - start);
>+ result_.set_elapsed_time(internal::GetTimeInMillis() - start);
> 
> // Notifies the unit test event listener that a test has just finished.
>- repeater->OnTestEnd(*parent_);
>+ repeater->OnTestEnd(*this);
> 
> // Tells UnitTest to stop associating assertion results to this
> // test.
> impl->set_current_test_info(NULL);
> }
> 
>-} // namespace internal
>-
> // class TestCase
> 
> // Gets the number of successful tests in this test case.
>@@ -2343,10 +2720,21 @@ int TestCase::failed_test_count() const {
> return CountIf(test_info_list_, TestFailed);
> }
> 
>+// Gets the number of disabled tests that will be reported in the XML report.
>+int TestCase::reportable_disabled_test_count() const {
>+ return CountIf(test_info_list_, TestReportableDisabled);
>+}
>+
>+// Gets the number of disabled tests in this test case.
> int TestCase::disabled_test_count() const {
> return CountIf(test_info_list_, TestDisabled);
> }
> 
>+// Gets the number of tests to be printed in the XML report.
>+int TestCase::reportable_test_count() const {
>+ return CountIf(test_info_list_, TestReportable);
>+}
>+
> // Get the number of tests in this test case that should run.
> int TestCase::test_to_run_count() const {
> return CountIf(test_info_list_, ShouldRunTest);
>@@ -2362,13 +2750,15 @@ int TestCase::total_test_count() const {
> // Arguments:
> //
> // name: name of the test case
>+// a_type_param: the name of the test case's type parameter, or NULL if
>+// this is not a typed or a type-parameterized test case.
> // set_up_tc: pointer to the function that sets up the test case
> // tear_down_tc: pointer to the function that tears down the test case
>-TestCase::TestCase(const char* a_name, const char* a_comment,
>+TestCase::TestCase(const char* a_name, const char* a_type_param,
> Test::SetUpTestCaseFunc set_up_tc,
> Test::TearDownTestCaseFunc tear_down_tc)
> : name_(a_name),
>- comment_(a_comment),
>+ type_param_(a_type_param ? new std::string(a_type_param) : NULL),
> set_up_tc_(set_up_tc),
> tear_down_tc_(tear_down_tc),
> should_run_(false),
>@@ -2413,45 +2803,27 @@ void TestCase::Run() {
> 
> repeater->OnTestCaseStart(*this);
> impl->os_stack_trace_getter()->UponLeavingGTest();
>- set_up_tc_();
>+ internal::HandleExceptionsInMethodIfSupported(
>+ this, &TestCase::RunSetUpTestCase, "SetUpTestCase()");
> 
> const internal::TimeInMillis start = internal::GetTimeInMillis();
> for (int i = 0; i < total_test_count(); i++) {
>- GetMutableTestInfo(i)->impl()->Run();
>+ GetMutableTestInfo(i)->Run();
> }
> elapsed_time_ = internal::GetTimeInMillis() - start;
> 
> impl->os_stack_trace_getter()->UponLeavingGTest();
>- tear_down_tc_();
>+ internal::HandleExceptionsInMethodIfSupported(
>+ this, &TestCase::RunTearDownTestCase, "TearDownTestCase()");
>+
> repeater->OnTestCaseEnd(*this);
> impl->set_current_test_case(NULL);
> }
> 
> // Clears the results of all tests in this test case.
> void TestCase::ClearResult() {
>- ForEach(test_info_list_, internal::TestInfoImpl::ClearTestResult);
>-}
>-
>-// Returns true iff test passed.
>-bool TestCase::TestPassed(const TestInfo * test_info) {
>- const internal::TestInfoImpl* const impl = test_info->impl();
>- return impl->should_run() && impl->result()->Passed();
>-}
>-
>-// Returns true iff test failed.
>-bool TestCase::TestFailed(const TestInfo * test_info) {
>- const internal::TestInfoImpl* const impl = test_info->impl();
>- return impl->should_run() && impl->result()->Failed();
>-}
>-
>-// Returns true iff test is disabled.
>-bool TestCase::TestDisabled(const TestInfo * test_info) {
>- return test_info->impl()->is_disabled();
>-}
>-
>-// Returns true if the given test should run.
>-bool TestCase::ShouldRunTest(const TestInfo *test_info) {
>- return test_info->impl()->should_run();
>+ ad_hoc_test_result_.Clear();
>+ ForEach(test_info_list_, TestInfo::ClearTestResult);
> }
> 
> // Shuffles the tests in this test case.
>@@ -2471,20 +2843,20 @@ void TestCase::UnshuffleTests() {
> //
> // FormatCountableNoun(1, "formula", "formuli") returns "1 formula".
> // FormatCountableNoun(5, "book", "books") returns "5 books".
>-static internal::String FormatCountableNoun(int count,
>- const char * singular_form,
>- const char * plural_form) {
>- return internal::String::Format("%d %s", count,
>- count == 1 ? singular_form : plural_form);
>+static std::string FormatCountableNoun(int count,
>+ const char * singular_form,
>+ const char * plural_form) {
>+ return internal::StreamableToString(count) + " " +
>+ (count == 1 ? singular_form : plural_form);
> }
> 
> // Formats the count of tests.
>-static internal::String FormatTestCount(int test_count) {
>+static std::string FormatTestCount(int test_count) {
> return FormatCountableNoun(test_count, "test", "tests");
> }
> 
> // Formats the count of test cases.
>-static internal::String FormatTestCaseCount(int test_case_count) {
>+static std::string FormatTestCaseCount(int test_case_count) {
> return FormatCountableNoun(test_case_count, "test case", "test cases");
> }
> 
>@@ -2504,13 +2876,15 @@ static const char * TestPartResultTypeToString(TestPartResult::Type type) {
> #else
> return "Failure\n";
> #endif
>+ default:
>+ return "Unknown result type";
> }
>-
>- return "Unknown result type";
> }
> 
>-// Prints a TestPartResult to a String.
>-static internal::String PrintTestPartResultToString(
>+namespace internal {
>+
>+// Prints a TestPartResult to an std::string.
>+static std::string PrintTestPartResultToString(
> const TestPartResult& test_part_result) {
> return (Message()
> << internal::FormatFileLocation(test_part_result.file_name(),
>@@ -2521,7 +2895,7 @@ static internal::String PrintTestPartResultToString(
> 
> // Prints a TestPartResult.
> static void PrintTestPartResult(const TestPartResult& test_part_result) {
>- const internal::String& result =
>+ const std::string& result =
> PrintTestPartResultToString(test_part_result);
> printf("%s\n", result.c_str());
> fflush(stdout);
>@@ -2540,8 +2914,6 @@ static void PrintTestPartResult(const TestPartResult& test_part_result) {
> 
> // class PrettyUnitTestResultPrinter
> 
>-namespace internal {
>-
> enum GTestColor {
> COLOR_DEFAULT,
> COLOR_RED,
>@@ -2549,10 +2921,11 @@ enum GTestColor {
> COLOR_YELLOW
> };
> 
>-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
>+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \
>+ !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW
> 
> // Returns the character attribute for the given color.
>-WORD GetColorAttribute(GTestColor color) {
>+static WORD GetColorAttribute(GTestColor color) {
> switch (color) {
> case COLOR_RED: return FOREGROUND_RED;
> case COLOR_GREEN: return FOREGROUND_GREEN;
>@@ -2561,11 +2934,42 @@ WORD GetColorAttribute(GTestColor color) {
> }
> }
> 
>+static int GetBitOffset(WORD color_mask) {
>+ if (color_mask == 0) return 0;
>+
>+ int bitOffset = 0;
>+ while ((color_mask & 1) == 0) {
>+ color_mask >>= 1;
>+ ++bitOffset;
>+ }
>+ return bitOffset;
>+}
>+
>+static WORD GetNewColor(GTestColor color, WORD old_color_attrs) {
>+ // Let's reuse the BG
>+ static const WORD background_mask = BACKGROUND_BLUE | BACKGROUND_GREEN |
>+ BACKGROUND_RED | BACKGROUND_INTENSITY;
>+ static const WORD foreground_mask = FOREGROUND_BLUE | FOREGROUND_GREEN |
>+ FOREGROUND_RED | FOREGROUND_INTENSITY;
>+ const WORD existing_bg = old_color_attrs & background_mask;
>+
>+ WORD new_color =
>+ GetColorAttribute(color) | existing_bg | FOREGROUND_INTENSITY;
>+ static const int bg_bitOffset = GetBitOffset(background_mask);
>+ static const int fg_bitOffset = GetBitOffset(foreground_mask);
>+
>+ if (((new_color & background_mask) >> bg_bitOffset) ==
>+ ((new_color & foreground_mask) >> fg_bitOffset)) {
>+ new_color ^= FOREGROUND_INTENSITY; // invert intensity
>+ }
>+ return new_color;
>+}
>+
> #else
> 
> // Returns the ANSI color code for the given color. COLOR_DEFAULT is
> // an invalid input.
>-const char* GetAnsiColorCode(GTestColor color) {
>+static const char* GetAnsiColorCode(GTestColor color) {
> switch (color) {
> case COLOR_RED: return "1";
> case COLOR_GREEN: return "2";
>@@ -2581,7 +2985,7 @@ bool ShouldUseColor(bool stdout_is_tty) {
> const char* const gtest_color = GTEST_FLAG(color).c_str();
> 
> if (String::CaseInsensitiveCStringEquals(gtest_color, "auto")) {
>-#if GTEST_OS_WINDOWS
>+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
> // On Windows the TERM variable is usually not set, but the
> // console there does support colors.
> return stdout_is_tty;
>@@ -2592,6 +2996,12 @@ bool ShouldUseColor(bool stdout_is_tty) {
> String::CStringEquals(term, "xterm") ||
> String::CStringEquals(term, "xterm-color") ||
> String::CStringEquals(term, "xterm-256color") ||
>+ String::CStringEquals(term, "screen") ||
>+ String::CStringEquals(term, "screen-256color") ||
>+ String::CStringEquals(term, "tmux") ||
>+ String::CStringEquals(term, "tmux-256color") ||
>+ String::CStringEquals(term, "rxvt-unicode") ||
>+ String::CStringEquals(term, "rxvt-unicode-256color") ||
> String::CStringEquals(term, "linux") ||
> String::CStringEquals(term, "cygwin");
> return stdout_is_tty && term_supports_color;
>@@ -2611,12 +3021,13 @@ bool ShouldUseColor(bool stdout_is_tty) {
> // cannot simply emit special characters and have the terminal change colors.
> // This routine must actually emit the characters rather than return a string
> // that would be colored when printed, as can be done on Linux.
>-void ColoredPrintf(GTestColor color, const char* fmt, ...) {
>+static void ColoredPrintf(GTestColor color, const char* fmt, ...) {
> va_list args;
> va_start(args, fmt);
> 
>-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN || GTEST_OS_ZOS
>- const bool use_color = false;
>+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN || GTEST_OS_ZOS || \
>+ GTEST_OS_IOS || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT
>+ const bool use_color = AlwaysFalse();
> #else
> static const bool in_color_mode =
> ShouldUseColor(posix::IsATTY(posix::FileNo(stdout)) != 0);
>@@ -2630,20 +3041,22 @@ void ColoredPrintf(GTestColor color, const char* fmt, ...) {
> return;
> }
> 
>-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
>+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \
>+ !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW
> const HANDLE stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE);
> 
> // Gets the current text color.
> CONSOLE_SCREEN_BUFFER_INFO buffer_info;
> GetConsoleScreenBufferInfo(stdout_handle, &buffer_info);
> const WORD old_color_attrs = buffer_info.wAttributes;
>+ const WORD new_color = GetNewColor(color, old_color_attrs);
> 
> // We need to flush the stream buffers into the console before each
> // SetConsoleTextAttribute call lest it affect the text that is already
> // printed but has not yet reached the console.
> fflush(stdout);
>- SetConsoleTextAttribute(stdout_handle,
>- GetColorAttribute(color) | FOREGROUND_INTENSITY);
>+ SetConsoleTextAttribute(stdout_handle, new_color);
>+
> vprintf(fmt, args);
> 
> fflush(stdout);
>@@ -2657,6 +3070,28 @@ void ColoredPrintf(GTestColor color, const char* fmt, ...) {
> va_end(args);
> }
> 
>+// Text printed in Google Test's text output and --gtest_list_tests
>+// output to label the type parameter and value parameter for a test.
>+static const char kTypeParamLabel[] = "TypeParam";
>+static const char kValueParamLabel[] = "GetParam()";
>+
>+static void PrintFullTestCommentIfPresent(const TestInfo& test_info) {
>+ const char* const type_param = test_info.type_param();
>+ const char* const value_param = test_info.value_param();
>+
>+ if (type_param != NULL || value_param != NULL) {
>+ printf(", where ");
>+ if (type_param != NULL) {
>+ printf("%s = %s", kTypeParamLabel, type_param);
>+ if (value_param != NULL)
>+ printf(" and ");
>+ }
>+ if (value_param != NULL) {
>+ printf("%s = %s", kValueParamLabel, value_param);
>+ }
>+ }
>+}
>+
> // This class implements the TestEventListener interface.
> //
> // Class PrettyUnitTestResultPrinter is copyable.
>@@ -2684,8 +3119,6 @@ class PrettyUnitTestResultPrinter : public TestEventListener {
> 
> private:
> static void PrintFailedTests(const UnitTest& unit_test);
>-
>- internal::String test_case_name_;
> };
> 
> // Fired before each iteration of tests starts.
>@@ -2698,15 +3131,16 @@ void PrettyUnitTestResultPrinter::OnTestIterationStart(
> 
> // Prints the filter if it's not *. This reminds the user that some
> // tests may be skipped.
>- if (!internal::String::CStringEquals(filter, kUniversalFilter)) {
>+ if (!String::CStringEquals(filter, kUniversalFilter)) {
> ColoredPrintf(COLOR_YELLOW,
> "Note: %s filter = %s\n", GTEST_NAME_, filter);
> }
> 
> if (internal::ShouldShard(kTestTotalShards, kTestShardIndex, false)) {
>+ const Int32 shard_index = Int32FromEnvOrDie(kTestShardIndex, -1);
> ColoredPrintf(COLOR_YELLOW,
>- "Note: This is test shard %s of %s.\n",
>- internal::posix::GetEnv(kTestShardIndex),
>+ "Note: This is test shard %d of %s.\n",
>+ static_cast<int>(shard_index) + 1,
> internal::posix::GetEnv(kTestTotalShards));
> }
> 
>@@ -2731,27 +3165,22 @@ void PrettyUnitTestResultPrinter::OnEnvironmentsSetUpStart(
> }
> 
> void PrettyUnitTestResultPrinter::OnTestCaseStart(const TestCase& test_case) {
>- test_case_name_ = test_case.name();
>- const internal::String counts =
>+ const std::string counts =
> FormatCountableNoun(test_case.test_to_run_count(), "test", "tests");
> ColoredPrintf(COLOR_GREEN, "[----------] ");
>- printf("%s from %s", counts.c_str(), test_case_name_.c_str());
>- if (test_case.comment()[0] == '\0') {
>+ printf("%s from %s", counts.c_str(), test_case.name());
>+ if (test_case.type_param() == NULL) {
> printf("\n");
> } else {
>- printf(", where %s\n", test_case.comment());
>+ printf(", where %s = %s\n", kTypeParamLabel, test_case.type_param());
> }
> fflush(stdout);
> }
> 
> void PrettyUnitTestResultPrinter::OnTestStart(const TestInfo& test_info) {
> ColoredPrintf(COLOR_GREEN, "[ RUN ] ");
>- PrintTestName(test_case_name_.c_str(), test_info.name());
>- if (test_info.comment()[0] == '\0') {
>- printf("\n");
>- } else {
>- printf(", where %s\n", test_info.comment());
>- }
>+ PrintTestName(test_info.test_case_name(), test_info.name());
>+ printf("\n");
> fflush(stdout);
> }
> 
>@@ -2773,7 +3202,10 @@ void PrettyUnitTestResultPrinter::OnTestEnd(const TestInfo& test_info) {
> } else {
> ColoredPrintf(COLOR_RED, "[ FAILED ] ");
> }
>- PrintTestName(test_case_name_.c_str(), test_info.name());
>+ PrintTestName(test_info.test_case_name(), test_info.name());
>+ if (test_info.result()->Failed())
>+ PrintFullTestCommentIfPresent(test_info);
>+
> if (GTEST_FLAG(print_time)) {
> printf(" (%s ms)\n", internal::StreamableToString(
> test_info.result()->elapsed_time()).c_str());
>@@ -2786,12 +3218,11 @@ void PrettyUnitTestResultPrinter::OnTestEnd(const TestInfo& test_info) {
> void PrettyUnitTestResultPrinter::OnTestCaseEnd(const TestCase& test_case) {
> if (!GTEST_FLAG(print_time)) return;
> 
>- test_case_name_ = test_case.name();
>- const internal::String counts =
>+ const std::string counts =
> FormatCountableNoun(test_case.test_to_run_count(), "test", "tests");
> ColoredPrintf(COLOR_GREEN, "[----------] ");
> printf("%s from %s (%s ms total)\n\n",
>- counts.c_str(), test_case_name_.c_str(),
>+ counts.c_str(), test_case.name(),
> internal::StreamableToString(test_case.elapsed_time()).c_str());
> fflush(stdout);
> }
>@@ -2822,21 +3253,14 @@ void PrettyUnitTestResultPrinter::PrintFailedTests(const UnitTest& unit_test) {
> }
> ColoredPrintf(COLOR_RED, "[ FAILED ] ");
> printf("%s.%s", test_case.name(), test_info.name());
>- if (test_case.comment()[0] != '\0' ||
>- test_info.comment()[0] != '\0') {
>- printf(", where %s", test_case.comment());
>- if (test_case.comment()[0] != '\0' &&
>- test_info.comment()[0] != '\0') {
>- printf(" and ");
>- }
>- }
>- printf("%s\n", test_info.comment());
>+ PrintFullTestCommentIfPresent(test_info);
>+ printf("\n");
> }
> }
> }
> 
>- void PrettyUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
>- int /*iteration*/) {
>+void PrettyUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
>+ int /*iteration*/) {
> ColoredPrintf(COLOR_GREEN, "[==========] ");
> printf("%s from %s ran.",
> FormatTestCount(unit_test.test_to_run_count()).c_str(),
>@@ -2859,7 +3283,7 @@ void PrettyUnitTestResultPrinter::PrintFailedTests(const UnitTest& unit_test) {
> num_failures == 1 ? "TEST" : "TESTS");
> }
> 
>- int num_disabled = unit_test.disabled_test_count();
>+ int num_disabled = unit_test.reportable_disabled_test_count();
> if (num_disabled && !GTEST_FLAG(also_run_disabled_tests)) {
> if (!num_failures) {
> printf("\n"); // Add a spacer if no FAILURE banner is displayed.
>@@ -2922,7 +3346,7 @@ void TestEventRepeater::Append(TestEventListener *listener) {
> listeners_.push_back(listener);
> }
> 
>-// TODO(vladl@google.com): Factor the search functionality into Vector::Find.
>+// FIXME: Factor the search functionality into Vector::Find.
> TestEventListener* TestEventRepeater::Release(TestEventListener *listener) {
> for (size_t i = 0; i < listeners_.size(); ++i) {
> if (listeners_[i] == listener) {
>@@ -2996,6 +3420,11 @@ class XmlUnitTestResultPrinter : public EmptyTestEventListener {
> explicit XmlUnitTestResultPrinter(const char* output_file);
> 
> virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration);
>+ void ListTestsMatchingFilter(const std::vector<TestCase*>& test_cases);
>+
>+ // Prints an XML summary of all unit tests.
>+ static void PrintXmlTestsList(std::ostream* stream,
>+ const std::vector<TestCase*>& test_cases);
> 
> private:
> // Is c a whitespace character that is normalized to a space character
>@@ -3013,18 +3442,27 @@ class XmlUnitTestResultPrinter : public EmptyTestEventListener {
> // is_attribute is true, the text is meant to appear as an attribute
> // value, and normalizable whitespace is preserved by replacing it
> // with character references.
>- static String EscapeXml(const char* str, bool is_attribute);
>+ static std::string EscapeXml(const std::string& str, bool is_attribute);
> 
> // Returns the given string with all characters invalid in XML removed.
>- static String RemoveInvalidXmlCharacters(const char* str);
>+ static std::string RemoveInvalidXmlCharacters(const std::string& str);
> 
> // Convenience wrapper around EscapeXml when str is an attribute value.
>- static String EscapeXmlAttribute(const char* str) {
>+ static std::string EscapeXmlAttribute(const std::string& str) {
> return EscapeXml(str, true);
> }
> 
> // Convenience wrapper around EscapeXml when str is not an attribute value.
>- static String EscapeXmlText(const char* str) { return EscapeXml(str, false); }
>+ static std::string EscapeXmlText(const char* str) {
>+ return EscapeXml(str, false);
>+ }
>+
>+ // Verifies that the given attribute belongs to the given element and
>+ // streams the attribute as XML.
>+ static void OutputXmlAttribute(std::ostream* stream,
>+ const std::string& element_name,
>+ const std::string& name,
>+ const std::string& value);
> 
> // Streams an XML CDATA section, escaping invalid CDATA sequences as needed.
> static void OutputXmlCDataSection(::std::ostream* stream, const char* data);
>@@ -3035,19 +3473,26 @@ class XmlUnitTestResultPrinter : public EmptyTestEventListener {
> const TestInfo& test_info);
> 
> // Prints an XML representation of a TestCase object
>- static void PrintXmlTestCase(FILE* out, const TestCase& test_case);
>+ static void PrintXmlTestCase(::std::ostream* stream,
>+ const TestCase& test_case);
> 
> // Prints an XML summary of unit_test to output stream out.
>- static void PrintXmlUnitTest(FILE* out, const UnitTest& unit_test);
>+ static void PrintXmlUnitTest(::std::ostream* stream,
>+ const UnitTest& unit_test);
> 
> // Produces a string representing the test properties in a result as space
> // delimited XML attributes based on the property key="value" pairs.
>- // When the String is not empty, it includes a space at the beginning,
>+ // When the std::string is not empty, it includes a space at the beginning,
> // to delimit this attribute from prior attributes.
>- static String TestPropertiesAsXmlAttributes(const TestResult& result);
>+ static std::string TestPropertiesAsXmlAttributes(const TestResult& result);
>+
>+ // Streams an XML representation of the test properties of a TestResult
>+ // object.
>+ static void OutputXmlTestProperties(std::ostream* stream,
>+ const TestResult& result);
> 
> // The output file.
>- const String output_file_;
>+ const std::string output_file_;
> 
> GTEST_DISALLOW_COPY_AND_ASSIGN_(XmlUnitTestResultPrinter);
> };
>@@ -3055,41 +3500,27 @@ class XmlUnitTestResultPrinter : public EmptyTestEventListener {
> // Creates a new XmlUnitTestResultPrinter.
> XmlUnitTestResultPrinter::XmlUnitTestResultPrinter(const char* output_file)
> : output_file_(output_file) {
>- if (output_file_.c_str() == NULL || output_file_.empty()) {
>- fprintf(stderr, "XML output file may not be null\n");
>- fflush(stderr);
>- exit(EXIT_FAILURE);
>+ if (output_file_.empty()) {
>+ GTEST_LOG_(FATAL) << "XML output file may not be null";
> }
> }
> 
> // Called after the unit test ends.
> void XmlUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
> int /*iteration*/) {
>- FILE* xmlout = NULL;
>- FilePath output_file(output_file_);
>- FilePath output_dir(output_file.RemoveFileName());
>+ FILE* xmlout = OpenFileForWriting(output_file_);
>+ std::stringstream stream;
>+ PrintXmlUnitTest(&stream, unit_test);
>+ fprintf(xmlout, "%s", StringStreamToString(&stream).c_str());
>+ fclose(xmlout);
>+}
> 
>- if (output_dir.CreateDirectoriesRecursively()) {
>- xmlout = posix::FOpen(output_file_.c_str(), "w");
>- }
>- if (xmlout == NULL) {
>- // TODO(wan): report the reason of the failure.
>- //
>- // We don't do it for now as:
>- //
>- // 1. There is no urgent need for it.
>- // 2. It's a bit involved to make the errno variable thread-safe on
>- // all three operating systems (Linux, Windows, and Mac OS).
>- // 3. To interpret the meaning of errno in a thread-safe way,
>- // we need the strerror_r() function, which is not available on
>- // Windows.
>- fprintf(stderr,
>- "Unable to open file \"%s\"\n",
>- output_file_.c_str());
>- fflush(stderr);
>- exit(EXIT_FAILURE);
>- }
>- PrintXmlUnitTest(xmlout, unit_test);
>+void XmlUnitTestResultPrinter::ListTestsMatchingFilter(
>+ const std::vector<TestCase*>& test_cases) {
>+ FILE* xmlout = OpenFileForWriting(output_file_);
>+ std::stringstream stream;
>+ PrintXmlTestsList(&stream, test_cases);
>+ fprintf(xmlout, "%s", StringStreamToString(&stream).c_str());
> fclose(xmlout);
> }
> 
>@@ -3103,44 +3534,45 @@ void XmlUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
> // module will consist of ordinary English text.
> // If this module is ever modified to produce version 1.1 XML output,
> // most invalid characters can be retained using character references.
>-// TODO(wan): It might be nice to have a minimally invasive, human-readable
>+// FIXME: It might be nice to have a minimally invasive, human-readable
> // escaping scheme for invalid characters, rather than dropping them.
>-String XmlUnitTestResultPrinter::EscapeXml(const char* str, bool is_attribute) {
>+std::string XmlUnitTestResultPrinter::EscapeXml(
>+ const std::string& str, bool is_attribute) {
> Message m;
> 
>- if (str != NULL) {
>- for (const char* src = str; *src; ++src) {
>- switch (*src) {
>- case '<':
>- m << "&lt;";
>- break;
>- case '>':
>- m << "&gt;";
>- break;
>- case '&':
>- m << "&amp;";
>- break;
>- case '\'':
>- if (is_attribute)
>- m << "&apos;";
>- else
>- m << '\'';
>- break;
>- case '"':
>- if (is_attribute)
>- m << "&quot;";
>+ for (size_t i = 0; i < str.size(); ++i) {
>+ const char ch = str[i];
>+ switch (ch) {
>+ case '<':
>+ m << "&lt;";
>+ break;
>+ case '>':
>+ m << "&gt;";
>+ break;
>+ case '&':
>+ m << "&amp;";
>+ break;
>+ case '\'':
>+ if (is_attribute)
>+ m << "&apos;";
>+ else
>+ m << '\'';
>+ break;
>+ case '"':
>+ if (is_attribute)
>+ m << "&quot;";
>+ else
>+ m << '"';
>+ break;
>+ default:
>+ if (IsValidXmlCharacter(ch)) {
>+ if (is_attribute && IsNormalizableWhitespace(ch))
>+ m << "&#x" << String::FormatByte(static_cast<unsigned char>(ch))
>+ << ";";
> else
>- m << '"';
>- break;
>- default:
>- if (IsValidXmlCharacter(*src)) {
>- if (is_attribute && IsNormalizableWhitespace(*src))
>- m << String::Format("&#x%02X;", unsigned(*src));
>- else
>- m << *src;
>- }
>- break;
>- }
>+ m << ch;
>+ }
>+ break;
> }
> }
> 
>@@ -3150,21 +3582,20 @@ String XmlUnitTestResultPrinter::EscapeXml(const char* str, bool is_attribute) {
> // Returns the given string with all characters invalid in XML removed.
> // Currently invalid characters are dropped from the string. An
> // alternative is to replace them with certain characters such as . or ?.
>-String XmlUnitTestResultPrinter::RemoveInvalidXmlCharacters(const char* str) {
>- char* const output = new char[strlen(str) + 1];
>- char* appender = output;
>- for (char ch = *str; ch != '\0'; ch = *++str)
>- if (IsValidXmlCharacter(ch))
>- *appender++ = ch;
>- *appender = '\0';
>+std::string XmlUnitTestResultPrinter::RemoveInvalidXmlCharacters(
>+ const std::string& str) {
>+ std::string output;
>+ output.reserve(str.size());
>+ for (std::string::const_iterator it = str.begin(); it != str.end(); ++it)
>+ if (IsValidXmlCharacter(*it))
>+ output.push_back(*it);
> 
>- String ret_value(output);
>- delete[] output;
>- return ret_value;
>+ return output;
> }
> 
> // The following routines generate an XML representation of a UnitTest
> // object.
>+// GOOGLETEST_CM0009 DO NOT DELETE
> //
> // This is how Google Test concepts map to the DTD:
> //
>@@ -3182,10 +3613,41 @@ String XmlUnitTestResultPrinter::RemoveInvalidXmlCharacters(const char* str) {
> // Formats the given time in milliseconds as seconds.
> std::string FormatTimeInMillisAsSeconds(TimeInMillis ms) {
> ::std::stringstream ss;
>- ss << ms/1000.0;
>+ ss << (static_cast<double>(ms) * 1e-3);
> return ss.str();
> }
> 
>+static bool PortableLocaltime(time_t seconds, struct tm* out) {
>+#if defined(_MSC_VER)
>+ return localtime_s(out, &seconds) == 0;
>+#elif defined(__MINGW32__) || defined(__MINGW64__)
>+ // MINGW <time.h> provides neither localtime_r nor localtime_s, but uses
>+ // Windows' localtime(), which has a thread-local tm buffer.
>+ struct tm* tm_ptr = localtime(&seconds); // NOLINT
>+ if (tm_ptr == NULL)
>+ return false;
>+ *out = *tm_ptr;
>+ return true;
>+#else
>+ return localtime_r(&seconds, out) != NULL;
>+#endif
>+}
>+
>+// Converts the given epoch time in milliseconds to a date string in the ISO
>+// 8601 format, without the timezone information.
>+std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms) {
>+ struct tm time_struct;
>+ if (!PortableLocaltime(static_cast<time_t>(ms / 1000), &time_struct))
>+ return "";
>+ // YYYY-MM-DDThh:mm:ss
>+ return StreamableToString(time_struct.tm_year + 1900) + "-" +
>+ String::FormatIntWidth2(time_struct.tm_mon + 1) + "-" +
>+ String::FormatIntWidth2(time_struct.tm_mday) + "T" +
>+ String::FormatIntWidth2(time_struct.tm_hour) + ":" +
>+ String::FormatIntWidth2(time_struct.tm_min) + ":" +
>+ String::FormatIntWidth2(time_struct.tm_sec);
>+}
>+
> // Streams an XML CDATA section, escaping invalid CDATA sequences as needed.
> void XmlUnitTestResultPrinter::OutputXmlCDataSection(::std::ostream* stream,
> const char* data) {
>@@ -3206,89 +3668,179 @@ void XmlUnitTestResultPrinter::OutputXmlCDataSection(::std::ostream* stream,
> *stream << "]]>";
> }
> 
>+void XmlUnitTestResultPrinter::OutputXmlAttribute(
>+ std::ostream* stream,
>+ const std::string& element_name,
>+ const std::string& name,
>+ const std::string& value) {
>+ const std::vector<std::string>& allowed_names =
>+ GetReservedAttributesForElement(element_name);
>+
>+ GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
>+ allowed_names.end())
>+ << "Attribute " << name << " is not allowed for element <" << element_name
>+ << ">.";
>+
>+ *stream << " " << name << "=\"" << EscapeXmlAttribute(value) << "\"";
>+}
>+
> // Prints an XML representation of a TestInfo object.
>-// TODO(wan): There is also value in printing properties with the plain printer.
>+// FIXME: There is also value in printing properties with the plain printer.
> void XmlUnitTestResultPrinter::OutputXmlTestInfo(::std::ostream* stream,
> const char* test_case_name,
> const TestInfo& test_info) {
> const TestResult& result = *test_info.result();
>- *stream << " <testcase name=\""
>- << EscapeXmlAttribute(test_info.name()).c_str()
>- << "\" status=\""
>- << (test_info.should_run() ? "run" : "notrun")
>- << "\" time=\""
>- << FormatTimeInMillisAsSeconds(result.elapsed_time())
>- << "\" classname=\"" << EscapeXmlAttribute(test_case_name).c_str()
>- << "\"" << TestPropertiesAsXmlAttributes(result).c_str();
>+ const std::string kTestcase = "testcase";
>+
>+ if (test_info.is_in_another_shard()) {
>+ return;
>+ }
>+
>+ *stream << " <testcase";
>+ OutputXmlAttribute(stream, kTestcase, "name", test_info.name());
>+
>+ if (test_info.value_param() != NULL) {
>+ OutputXmlAttribute(stream, kTestcase, "value_param",
>+ test_info.value_param());
>+ }
>+ if (test_info.type_param() != NULL) {
>+ OutputXmlAttribute(stream, kTestcase, "type_param", test_info.type_param());
>+ }
>+ if (GTEST_FLAG(list_tests)) {
>+ OutputXmlAttribute(stream, kTestcase, "file", test_info.file());
>+ OutputXmlAttribute(stream, kTestcase, "line",
>+ StreamableToString(test_info.line()));
>+ *stream << " />\n";
>+ return;
>+ }
>+
>+ OutputXmlAttribute(stream, kTestcase, "status",
>+ test_info.should_run() ? "run" : "notrun");
>+ OutputXmlAttribute(stream, kTestcase, "time",
>+ FormatTimeInMillisAsSeconds(result.elapsed_time()));
>+ OutputXmlAttribute(stream, kTestcase, "classname", test_case_name);
> 
> int failures = 0;
> for (int i = 0; i < result.total_part_count(); ++i) {
> const TestPartResult& part = result.GetTestPartResult(i);
> if (part.failed()) {
>- if (++failures == 1)
>+ if (++failures == 1) {
> *stream << ">\n";
>+ }
>+ const std::string location =
>+ internal::FormatCompilerIndependentFileLocation(part.file_name(),
>+ part.line_number());
>+ const std::string summary = location + "\n" + part.summary();
> *stream << " <failure message=\""
>- << EscapeXmlAttribute(part.summary()).c_str()
>+ << EscapeXmlAttribute(summary.c_str())
> << "\" type=\"\">";
>- const String message = RemoveInvalidXmlCharacters(String::Format(
>- "%s:%d\n%s",
>- part.file_name(), part.line_number(),
>- part.message()).c_str());
>- OutputXmlCDataSection(stream, message.c_str());
>+ const std::string detail = location + "\n" + part.message();
>+ OutputXmlCDataSection(stream, RemoveInvalidXmlCharacters(detail).c_str());
> *stream << "</failure>\n";
> }
> }
> 
>- if (failures == 0)
>+ if (failures == 0 && result.test_property_count() == 0) {
> *stream << " />\n";
>- else
>+ } else {
>+ if (failures == 0) {
>+ *stream << ">\n";
>+ }
>+ OutputXmlTestProperties(stream, result);
> *stream << " </testcase>\n";
>+ }
> }
> 
> // Prints an XML representation of a TestCase object
>-void XmlUnitTestResultPrinter::PrintXmlTestCase(FILE* out,
>+void XmlUnitTestResultPrinter::PrintXmlTestCase(std::ostream* stream,
> const TestCase& test_case) {
>- fprintf(out,
>- " <testsuite name=\"%s\" tests=\"%d\" failures=\"%d\" "
>- "disabled=\"%d\" ",
>- EscapeXmlAttribute(test_case.name()).c_str(),
>- test_case.total_test_count(),
>- test_case.failed_test_count(),
>- test_case.disabled_test_count());
>- fprintf(out,
>- "errors=\"0\" time=\"%s\">\n",
>- FormatTimeInMillisAsSeconds(test_case.elapsed_time()).c_str());
>+ const std::string kTestsuite = "testsuite";
>+ *stream << " <" << kTestsuite;
>+ OutputXmlAttribute(stream, kTestsuite, "name", test_case.name());
>+ OutputXmlAttribute(stream, kTestsuite, "tests",
>+ StreamableToString(test_case.reportable_test_count()));
>+ if (!GTEST_FLAG(list_tests)) {
>+ OutputXmlAttribute(stream, kTestsuite, "failures",
>+ StreamableToString(test_case.failed_test_count()));
>+ OutputXmlAttribute(
>+ stream, kTestsuite, "disabled",
>+ StreamableToString(test_case.reportable_disabled_test_count()));
>+ OutputXmlAttribute(stream, kTestsuite, "errors", "0");
>+ OutputXmlAttribute(stream, kTestsuite, "time",
>+ FormatTimeInMillisAsSeconds(test_case.elapsed_time()));
>+ *stream << TestPropertiesAsXmlAttributes(test_case.ad_hoc_test_result());
>+ }
>+ *stream << ">\n";
> for (int i = 0; i < test_case.total_test_count(); ++i) {
>- StrStream stream;
>- OutputXmlTestInfo(&stream, test_case.name(), *test_case.GetTestInfo(i));
>- fprintf(out, "%s", StrStreamToString(&stream).c_str());
>+ if (test_case.GetTestInfo(i)->is_reportable())
>+ OutputXmlTestInfo(stream, test_case.name(), *test_case.GetTestInfo(i));
> }
>- fprintf(out, " </testsuite>\n");
>+ *stream << " </" << kTestsuite << ">\n";
> }
> 
> // Prints an XML summary of unit_test to output stream out.
>-void XmlUnitTestResultPrinter::PrintXmlUnitTest(FILE* out,
>+void XmlUnitTestResultPrinter::PrintXmlUnitTest(std::ostream* stream,
> const UnitTest& unit_test) {
>- fprintf(out, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
>- fprintf(out,
>- "<testsuites tests=\"%d\" failures=\"%d\" disabled=\"%d\" "
>- "errors=\"0\" time=\"%s\" ",
>- unit_test.total_test_count(),
>- unit_test.failed_test_count(),
>- unit_test.disabled_test_count(),
>- FormatTimeInMillisAsSeconds(unit_test.elapsed_time()).c_str());
>+ const std::string kTestsuites = "testsuites";
>+
>+ *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
>+ *stream << "<" << kTestsuites;
>+
>+ OutputXmlAttribute(stream, kTestsuites, "tests",
>+ StreamableToString(unit_test.reportable_test_count()));
>+ OutputXmlAttribute(stream, kTestsuites, "failures",
>+ StreamableToString(unit_test.failed_test_count()));
>+ OutputXmlAttribute(
>+ stream, kTestsuites, "disabled",
>+ StreamableToString(unit_test.reportable_disabled_test_count()));
>+ OutputXmlAttribute(stream, kTestsuites, "errors", "0");
>+ OutputXmlAttribute(
>+ stream, kTestsuites, "timestamp",
>+ FormatEpochTimeInMillisAsIso8601(unit_test.start_timestamp()));
>+ OutputXmlAttribute(stream, kTestsuites, "time",
>+ FormatTimeInMillisAsSeconds(unit_test.elapsed_time()));
>+
> if (GTEST_FLAG(shuffle)) {
>- fprintf(out, "random_seed=\"%d\" ", unit_test.random_seed());
>+ OutputXmlAttribute(stream, kTestsuites, "random_seed",
>+ StreamableToString(unit_test.random_seed()));
>+ }
>+ *stream << TestPropertiesAsXmlAttributes(unit_test.ad_hoc_test_result());
>+
>+ OutputXmlAttribute(stream, kTestsuites, "name", "AllTests");
>+ *stream << ">\n";
>+
>+ for (int i = 0; i < unit_test.total_test_case_count(); ++i) {
>+ if (unit_test.GetTestCase(i)->reportable_test_count() > 0)
>+ PrintXmlTestCase(stream, *unit_test.GetTestCase(i));
> }
>- fprintf(out, "name=\"AllTests\">\n");
>- for (int i = 0; i < unit_test.total_test_case_count(); ++i)
>- PrintXmlTestCase(out, *unit_test.GetTestCase(i));
>- fprintf(out, "</testsuites>\n");
>+ *stream << "</" << kTestsuites << ">\n";
>+}
>+
>+void XmlUnitTestResultPrinter::PrintXmlTestsList(
>+ std::ostream* stream, const std::vector<TestCase*>& test_cases) {
>+ const std::string kTestsuites = "testsuites";
>+
>+ *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
>+ *stream << "<" << kTestsuites;
>+
>+ int total_tests = 0;
>+ for (size_t i = 0; i < test_cases.size(); ++i) {
>+ total_tests += test_cases[i]->total_test_count();
>+ }
>+ OutputXmlAttribute(stream, kTestsuites, "tests",
>+ StreamableToString(total_tests));
>+ OutputXmlAttribute(stream, kTestsuites, "name", "AllTests");
>+ *stream << ">\n";
>+
>+ for (size_t i = 0; i < test_cases.size(); ++i) {
>+ PrintXmlTestCase(stream, *test_cases[i]);
>+ }
>+ *stream << "</" << kTestsuites << ">\n";
> }
> 
> // Produces a string representing the test properties in a result as space
> // delimited XML attributes based on the property key="value" pairs.
>-String XmlUnitTestResultPrinter::TestPropertiesAsXmlAttributes(
>+std::string XmlUnitTestResultPrinter::TestPropertiesAsXmlAttributes(
> const TestResult& result) {
> Message attributes;
> for (int i = 0; i < result.test_property_count(); ++i) {
>@@ -3299,52 +3851,562 @@ String XmlUnitTestResultPrinter::TestPropertiesAsXmlAttributes(
> return attributes.GetString();
> }
> 
>+void XmlUnitTestResultPrinter::OutputXmlTestProperties(
>+ std::ostream* stream, const TestResult& result) {
>+ const std::string kProperties = "properties";
>+ const std::string kProperty = "property";
>+
>+ if (result.test_property_count() <= 0) {
>+ return;
>+ }
>+
>+ *stream << "<" << kProperties << ">\n";
>+ for (int i = 0; i < result.test_property_count(); ++i) {
>+ const TestProperty& property = result.GetTestProperty(i);
>+ *stream << "<" << kProperty;
>+ *stream << " name=\"" << EscapeXmlAttribute(property.key()) << "\"";
>+ *stream << " value=\"" << EscapeXmlAttribute(property.value()) << "\"";
>+ *stream << "/>\n";
>+ }
>+ *stream << "</" << kProperties << ">\n";
>+}
>+
> // End XmlUnitTestResultPrinter
> 
>-// Class ScopedTrace
>+// This class generates an JSON output file.
>+class JsonUnitTestResultPrinter : public EmptyTestEventListener {
>+ public:
>+ explicit JsonUnitTestResultPrinter(const char* output_file);
> 
>-// Pushes the given source file location and message onto a per-thread
>-// trace stack maintained by Google Test.
>-// L < UnitTest::mutex_
>-ScopedTrace::ScopedTrace(const char* file, int line, const Message& message) {
>- TraceInfo trace;
>- trace.file = file;
>- trace.line = line;
>- trace.message = message.GetString();
>+ virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration);
> 
>- UnitTest::GetInstance()->PushGTestTrace(trace);
>+ // Prints an JSON summary of all unit tests.
>+ static void PrintJsonTestList(::std::ostream* stream,
>+ const std::vector<TestCase*>& test_cases);
>+
>+ private:
>+ // Returns an JSON-escaped copy of the input string str.
>+ static std::string EscapeJson(const std::string& str);
>+
>+ //// Verifies that the given attribute belongs to the given element and
>+ //// streams the attribute as JSON.
>+ static void OutputJsonKey(std::ostream* stream,
>+ const std::string& element_name,
>+ const std::string& name,
>+ const std::string& value,
>+ const std::string& indent,
>+ bool comma = true);
>+ static void OutputJsonKey(std::ostream* stream,
>+ const std::string& element_name,
>+ const std::string& name,
>+ int value,
>+ const std::string& indent,
>+ bool comma = true);
>+
>+ // Streams a JSON representation of a TestInfo object.
>+ static void OutputJsonTestInfo(::std::ostream* stream,
>+ const char* test_case_name,
>+ const TestInfo& test_info);
>+
>+ // Prints a JSON representation of a TestCase object
>+ static void PrintJsonTestCase(::std::ostream* stream,
>+ const TestCase& test_case);
>+
>+ // Prints a JSON summary of unit_test to output stream out.
>+ static void PrintJsonUnitTest(::std::ostream* stream,
>+ const UnitTest& unit_test);
>+
>+ // Produces a string representing the test properties in a result as
>+ // a JSON dictionary.
>+ static std::string TestPropertiesAsJson(const TestResult& result,
>+ const std::string& indent);
>+
>+ // The output file.
>+ const std::string output_file_;
>+
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(JsonUnitTestResultPrinter);
>+};
>+
>+// Creates a new JsonUnitTestResultPrinter.
>+JsonUnitTestResultPrinter::JsonUnitTestResultPrinter(const char* output_file)
>+ : output_file_(output_file) {
>+ if (output_file_.empty()) {
>+ GTEST_LOG_(FATAL) << "JSON output file may not be null";
>+ }
> }
> 
>-// Pops the info pushed by the c'tor.
>-// L < UnitTest::mutex_
>-ScopedTrace::~ScopedTrace() {
>- UnitTest::GetInstance()->PopGTestTrace();
>+void JsonUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
>+ int /*iteration*/) {
>+ FILE* jsonout = OpenFileForWriting(output_file_);
>+ std::stringstream stream;
>+ PrintJsonUnitTest(&stream, unit_test);
>+ fprintf(jsonout, "%s", StringStreamToString(&stream).c_str());
>+ fclose(jsonout);
> }
> 
>+// Returns an JSON-escaped copy of the input string str.
>+std::string JsonUnitTestResultPrinter::EscapeJson(const std::string& str) {
>+ Message m;
> 
>-// class OsStackTraceGetter
>+ for (size_t i = 0; i < str.size(); ++i) {
>+ const char ch = str[i];
>+ switch (ch) {
>+ case '\\':
>+ case '"':
>+ case '/':
>+ m << '\\' << ch;
>+ break;
>+ case '\b':
>+ m << "\\b";
>+ break;
>+ case '\t':
>+ m << "\\t";
>+ break;
>+ case '\n':
>+ m << "\\n";
>+ break;
>+ case '\f':
>+ m << "\\f";
>+ break;
>+ case '\r':
>+ m << "\\r";
>+ break;
>+ default:
>+ if (ch < ' ') {
>+ m << "\\u00" << String::FormatByte(static_cast<unsigned char>(ch));
>+ } else {
>+ m << ch;
>+ }
>+ break;
>+ }
>+ }
> 
>-// Returns the current OS stack trace as a String. Parameters:
>-//
>-// max_depth - the maximum number of stack frames to be included
>-// in the trace.
>-// skip_count - the number of top frames to be skipped; doesn't count
>-// against max_depth.
>-//
>-// L < mutex_
>-// We use "L < mutex_" to denote that the function may acquire mutex_.
>-String OsStackTraceGetter::CurrentStackTrace(int, int) {
>- return String("");
>+ return m.GetString();
> }
> 
>-// L < mutex_
>-void OsStackTraceGetter::UponLeavingGTest() {
>+// The following routines generate an JSON representation of a UnitTest
>+// object.
>+
>+// Formats the given time in milliseconds as seconds.
>+static std::string FormatTimeInMillisAsDuration(TimeInMillis ms) {
>+ ::std::stringstream ss;
>+ ss << (static_cast<double>(ms) * 1e-3) << "s";
>+ return ss.str();
> }
> 
>-const char* const
>-OsStackTraceGetter::kElidedFramesMarker =
>+// Converts the given epoch time in milliseconds to a date string in the
>+// RFC3339 format, without the timezone information.
>+static std::string FormatEpochTimeInMillisAsRFC3339(TimeInMillis ms) {
>+ struct tm time_struct;
>+ if (!PortableLocaltime(static_cast<time_t>(ms / 1000), &time_struct))
>+ return "";
>+ // YYYY-MM-DDThh:mm:ss
>+ return StreamableToString(time_struct.tm_year + 1900) + "-" +
>+ String::FormatIntWidth2(time_struct.tm_mon + 1) + "-" +
>+ String::FormatIntWidth2(time_struct.tm_mday) + "T" +
>+ String::FormatIntWidth2(time_struct.tm_hour) + ":" +
>+ String::FormatIntWidth2(time_struct.tm_min) + ":" +
>+ String::FormatIntWidth2(time_struct.tm_sec) + "Z";
>+}
>+
>+static inline std::string Indent(int width) {
>+ return std::string(width, ' ');
>+}
>+
>+void JsonUnitTestResultPrinter::OutputJsonKey(
>+ std::ostream* stream,
>+ const std::string& element_name,
>+ const std::string& name,
>+ const std::string& value,
>+ const std::string& indent,
>+ bool comma) {
>+ const std::vector<std::string>& allowed_names =
>+ GetReservedAttributesForElement(element_name);
>+
>+ GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
>+ allowed_names.end())
>+ << "Key \"" << name << "\" is not allowed for value \"" << element_name
>+ << "\".";
>+
>+ *stream << indent << "\"" << name << "\": \"" << EscapeJson(value) << "\"";
>+ if (comma)
>+ *stream << ",\n";
>+}
>+
>+void JsonUnitTestResultPrinter::OutputJsonKey(
>+ std::ostream* stream,
>+ const std::string& element_name,
>+ const std::string& name,
>+ int value,
>+ const std::string& indent,
>+ bool comma) {
>+ const std::vector<std::string>& allowed_names =
>+ GetReservedAttributesForElement(element_name);
>+
>+ GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
>+ allowed_names.end())
>+ << "Key \"" << name << "\" is not allowed for value \"" << element_name
>+ << "\".";
>+
>+ *stream << indent << "\"" << name << "\": " << StreamableToString(value);
>+ if (comma)
>+ *stream << ",\n";
>+}
>+
>+// Prints a JSON representation of a TestInfo object.
>+void JsonUnitTestResultPrinter::OutputJsonTestInfo(::std::ostream* stream,
>+ const char* test_case_name,
>+ const TestInfo& test_info) {
>+ const TestResult& result = *test_info.result();
>+ const std::string kTestcase = "testcase";
>+ const std::string kIndent = Indent(10);
>+
>+ *stream << Indent(8) << "{\n";
>+ OutputJsonKey(stream, kTestcase, "name", test_info.name(), kIndent);
>+
>+ if (test_info.value_param() != NULL) {
>+ OutputJsonKey(stream, kTestcase, "value_param",
>+ test_info.value_param(), kIndent);
>+ }
>+ if (test_info.type_param() != NULL) {
>+ OutputJsonKey(stream, kTestcase, "type_param", test_info.type_param(),
>+ kIndent);
>+ }
>+ if (GTEST_FLAG(list_tests)) {
>+ OutputJsonKey(stream, kTestcase, "file", test_info.file(), kIndent);
>+ OutputJsonKey(stream, kTestcase, "line", test_info.line(), kIndent, false);
>+ *stream << "\n" << Indent(8) << "}";
>+ return;
>+ }
>+
>+ OutputJsonKey(stream, kTestcase, "status",
>+ test_info.should_run() ? "RUN" : "NOTRUN", kIndent);
>+ OutputJsonKey(stream, kTestcase, "time",
>+ FormatTimeInMillisAsDuration(result.elapsed_time()), kIndent);
>+ OutputJsonKey(stream, kTestcase, "classname", test_case_name, kIndent, false);
>+ *stream << TestPropertiesAsJson(result, kIndent);
>+
>+ int failures = 0;
>+ for (int i = 0; i < result.total_part_count(); ++i) {
>+ const TestPartResult& part = result.GetTestPartResult(i);
>+ if (part.failed()) {
>+ *stream << ",\n";
>+ if (++failures == 1) {
>+ *stream << kIndent << "\"" << "failures" << "\": [\n";
>+ }
>+ const std::string location =
>+ internal::FormatCompilerIndependentFileLocation(part.file_name(),
>+ part.line_number());
>+ const std::string message = EscapeJson(location + "\n" + part.message());
>+ *stream << kIndent << " {\n"
>+ << kIndent << " \"failure\": \"" << message << "\",\n"
>+ << kIndent << " \"type\": \"\"\n"
>+ << kIndent << " }";
>+ }
>+ }
>+
>+ if (failures > 0)
>+ *stream << "\n" << kIndent << "]";
>+ *stream << "\n" << Indent(8) << "}";
>+}
>+
>+// Prints an JSON representation of a TestCase object
>+void JsonUnitTestResultPrinter::PrintJsonTestCase(std::ostream* stream,
>+ const TestCase& test_case) {
>+ const std::string kTestsuite = "testsuite";
>+ const std::string kIndent = Indent(6);
>+
>+ *stream << Indent(4) << "{\n";
>+ OutputJsonKey(stream, kTestsuite, "name", test_case.name(), kIndent);
>+ OutputJsonKey(stream, kTestsuite, "tests", test_case.reportable_test_count(),
>+ kIndent);
>+ if (!GTEST_FLAG(list_tests)) {
>+ OutputJsonKey(stream, kTestsuite, "failures", test_case.failed_test_count(),
>+ kIndent);
>+ OutputJsonKey(stream, kTestsuite, "disabled",
>+ test_case.reportable_disabled_test_count(), kIndent);
>+ OutputJsonKey(stream, kTestsuite, "errors", 0, kIndent);
>+ OutputJsonKey(stream, kTestsuite, "time",
>+ FormatTimeInMillisAsDuration(test_case.elapsed_time()),
>+ kIndent, false);
>+ *stream << TestPropertiesAsJson(test_case.ad_hoc_test_result(), kIndent)
>+ << ",\n";
>+ }
>+
>+ *stream << kIndent << "\"" << kTestsuite << "\": [\n";
>+
>+ bool comma = false;
>+ for (int i = 0; i < test_case.total_test_count(); ++i) {
>+ if (test_case.GetTestInfo(i)->is_reportable()) {
>+ if (comma) {
>+ *stream << ",\n";
>+ } else {
>+ comma = true;
>+ }
>+ OutputJsonTestInfo(stream, test_case.name(), *test_case.GetTestInfo(i));
>+ }
>+ }
>+ *stream << "\n" << kIndent << "]\n" << Indent(4) << "}";
>+}
>+
>+// Prints a JSON summary of unit_test to output stream out.
>+void JsonUnitTestResultPrinter::PrintJsonUnitTest(std::ostream* stream,
>+ const UnitTest& unit_test) {
>+ const std::string kTestsuites = "testsuites";
>+ const std::string kIndent = Indent(2);
>+ *stream << "{\n";
>+
>+ OutputJsonKey(stream, kTestsuites, "tests", unit_test.reportable_test_count(),
>+ kIndent);
>+ OutputJsonKey(stream, kTestsuites, "failures", unit_test.failed_test_count(),
>+ kIndent);
>+ OutputJsonKey(stream, kTestsuites, "disabled",
>+ unit_test.reportable_disabled_test_count(), kIndent);
>+ OutputJsonKey(stream, kTestsuites, "errors", 0, kIndent);
>+ if (GTEST_FLAG(shuffle)) {
>+ OutputJsonKey(stream, kTestsuites, "random_seed", unit_test.random_seed(),
>+ kIndent);
>+ }
>+ OutputJsonKey(stream, kTestsuites, "timestamp",
>+ FormatEpochTimeInMillisAsRFC3339(unit_test.start_timestamp()),
>+ kIndent);
>+ OutputJsonKey(stream, kTestsuites, "time",
>+ FormatTimeInMillisAsDuration(unit_test.elapsed_time()), kIndent,
>+ false);
>+
>+ *stream << TestPropertiesAsJson(unit_test.ad_hoc_test_result(), kIndent)
>+ << ",\n";
>+
>+ OutputJsonKey(stream, kTestsuites, "name", "AllTests", kIndent);
>+ *stream << kIndent << "\"" << kTestsuites << "\": [\n";
>+
>+ bool comma = false;
>+ for (int i = 0; i < unit_test.total_test_case_count(); ++i) {
>+ if (unit_test.GetTestCase(i)->reportable_test_count() > 0) {
>+ if (comma) {
>+ *stream << ",\n";
>+ } else {
>+ comma = true;
>+ }
>+ PrintJsonTestCase(stream, *unit_test.GetTestCase(i));
>+ }
>+ }
>+
>+ *stream << "\n" << kIndent << "]\n" << "}\n";
>+}
>+
>+void JsonUnitTestResultPrinter::PrintJsonTestList(
>+ std::ostream* stream, const std::vector<TestCase*>& test_cases) {
>+ const std::string kTestsuites = "testsuites";
>+ const std::string kIndent = Indent(2);
>+ *stream << "{\n";
>+ int total_tests = 0;
>+ for (size_t i = 0; i < test_cases.size(); ++i) {
>+ total_tests += test_cases[i]->total_test_count();
>+ }
>+ OutputJsonKey(stream, kTestsuites, "tests", total_tests, kIndent);
>+
>+ OutputJsonKey(stream, kTestsuites, "name", "AllTests", kIndent);
>+ *stream << kIndent << "\"" << kTestsuites << "\": [\n";
>+
>+ for (size_t i = 0; i < test_cases.size(); ++i) {
>+ if (i != 0) {
>+ *stream << ",\n";
>+ }
>+ PrintJsonTestCase(stream, *test_cases[i]);
>+ }
>+
>+ *stream << "\n"
>+ << kIndent << "]\n"
>+ << "}\n";
>+}
>+// Produces a string representing the test properties in a result as
>+// a JSON dictionary.
>+std::string JsonUnitTestResultPrinter::TestPropertiesAsJson(
>+ const TestResult& result, const std::string& indent) {
>+ Message attributes;
>+ for (int i = 0; i < result.test_property_count(); ++i) {
>+ const TestProperty& property = result.GetTestProperty(i);
>+ attributes << ",\n" << indent << "\"" << property.key() << "\": "
>+ << "\"" << EscapeJson(property.value()) << "\"";
>+ }
>+ return attributes.GetString();
>+}
>+
>+// End JsonUnitTestResultPrinter
>+
>+#if GTEST_CAN_STREAM_RESULTS_
>+
>+// Checks if str contains '=', '&', '%' or '\n' characters. If yes,
>+// replaces them by "%xx" where xx is their hexadecimal value. For
>+// example, replaces "=" with "%3D". This algorithm is O(strlen(str))
>+// in both time and space -- important as the input str may contain an
>+// arbitrarily long test failure message and stack trace.
>+std::string StreamingListener::UrlEncode(const char* str) {
>+ std::string result;
>+ result.reserve(strlen(str) + 1);
>+ for (char ch = *str; ch != '\0'; ch = *++str) {
>+ switch (ch) {
>+ case '%':
>+ case '=':
>+ case '&':
>+ case '\n':
>+ result.append("%" + String::FormatByte(static_cast<unsigned char>(ch)));
>+ break;
>+ default:
>+ result.push_back(ch);
>+ break;
>+ }
>+ }
>+ return result;
>+}
>+
>+void StreamingListener::SocketWriter::MakeConnection() {
>+ GTEST_CHECK_(sockfd_ == -1)
>+ << "MakeConnection() can't be called when there is already a connection.";
>+
>+ addrinfo hints;
>+ memset(&hints, 0, sizeof(hints));
>+ hints.ai_family = AF_UNSPEC; // To allow both IPv4 and IPv6 addresses.
>+ hints.ai_socktype = SOCK_STREAM;
>+ addrinfo* servinfo = NULL;
>+
>+ // Use the getaddrinfo() to get a linked list of IP addresses for
>+ // the given host name.
>+ const int error_num = getaddrinfo(
>+ host_name_.c_str(), port_num_.c_str(), &hints, &servinfo);
>+ if (error_num != 0) {
>+ GTEST_LOG_(WARNING) << "stream_result_to: getaddrinfo() failed: "
>+ << gai_strerror(error_num);
>+ }
>+
>+ // Loop through all the results and connect to the first we can.
>+ for (addrinfo* cur_addr = servinfo; sockfd_ == -1 && cur_addr != NULL;
>+ cur_addr = cur_addr->ai_next) {
>+ sockfd_ = socket(
>+ cur_addr->ai_family, cur_addr->ai_socktype, cur_addr->ai_protocol);
>+ if (sockfd_ != -1) {
>+ // Connect the client socket to the server socket.
>+ if (connect(sockfd_, cur_addr->ai_addr, cur_addr->ai_addrlen) == -1) {
>+ close(sockfd_);
>+ sockfd_ = -1;
>+ }
>+ }
>+ }
>+
>+ freeaddrinfo(servinfo); // all done with this structure
>+
>+ if (sockfd_ == -1) {
>+ GTEST_LOG_(WARNING) << "stream_result_to: failed to connect to "
>+ << host_name_ << ":" << port_num_;
>+ }
>+}
>+
>+// End of class Streaming Listener
>+#endif // GTEST_CAN_STREAM_RESULTS__
>+
>+// class OsStackTraceGetter
>+
>+const char* const OsStackTraceGetterInterface::kElidedFramesMarker =
> "... " GTEST_NAME_ " internal frames ...";
> 
>+std::string OsStackTraceGetter::CurrentStackTrace(int max_depth, int skip_count)
>+ GTEST_LOCK_EXCLUDED_(mutex_) {
>+#if GTEST_HAS_ABSL
>+ std::string result;
>+
>+ if (max_depth <= 0) {
>+ return result;
>+ }
>+
>+ max_depth = std::min(max_depth, kMaxStackTraceDepth);
>+
>+ std::vector<void*> raw_stack(max_depth);
>+ // Skips the frames requested by the caller, plus this function.
>+ const int raw_stack_size =
>+ absl::GetStackTrace(&raw_stack[0], max_depth, skip_count + 1);
>+
>+ void* caller_frame = nullptr;
>+ {
>+ MutexLock lock(&mutex_);
>+ caller_frame = caller_frame_;
>+ }
>+
>+ for (int i = 0; i < raw_stack_size; ++i) {
>+ if (raw_stack[i] == caller_frame &&
>+ !GTEST_FLAG(show_internal_stack_frames)) {
>+ // Add a marker to the trace and stop adding frames.
>+ absl::StrAppend(&result, kElidedFramesMarker, "\n");
>+ break;
>+ }
>+
>+ char tmp[1024];
>+ const char* symbol = "(unknown)";
>+ if (absl::Symbolize(raw_stack[i], tmp, sizeof(tmp))) {
>+ symbol = tmp;
>+ }
>+
>+ char line[1024];
>+ snprintf(line, sizeof(line), " %p: %s\n", raw_stack[i], symbol);
>+ result += line;
>+ }
>+
>+ return result;
>+
>+#else // !GTEST_HAS_ABSL
>+ static_cast<void>(max_depth);
>+ static_cast<void>(skip_count);
>+ return "";
>+#endif // GTEST_HAS_ABSL
>+}
>+
>+void OsStackTraceGetter::UponLeavingGTest() GTEST_LOCK_EXCLUDED_(mutex_) {
>+#if GTEST_HAS_ABSL
>+ void* caller_frame = nullptr;
>+ if (absl::GetStackTrace(&caller_frame, 1, 3) <= 0) {
>+ caller_frame = nullptr;
>+ }
>+
>+ MutexLock lock(&mutex_);
>+ caller_frame_ = caller_frame;
>+#endif // GTEST_HAS_ABSL
>+}
>+
>+// A helper class that creates the premature-exit file in its
>+// constructor and deletes the file in its destructor.
>+class ScopedPrematureExitFile {
>+ public:
>+ explicit ScopedPrematureExitFile(const char* premature_exit_filepath)
>+ : premature_exit_filepath_(premature_exit_filepath ?
>+ premature_exit_filepath : "") {
>+ // If a path to the premature-exit file is specified...
>+ if (!premature_exit_filepath_.empty()) {
>+ // create the file with a single "0" character in it. I/O
>+ // errors are ignored as there's nothing better we can do and we
>+ // don't want to fail the test because of this.
>+ FILE* pfile = posix::FOpen(premature_exit_filepath, "w");
>+ fwrite("0", 1, 1, pfile);
>+ fclose(pfile);
>+ }
>+ }
>+
>+ ~ScopedPrematureExitFile() {
>+ if (!premature_exit_filepath_.empty()) {
>+ int retval = remove(premature_exit_filepath_.c_str());
>+ if (retval) {
>+ GTEST_LOG_(ERROR) << "Failed to remove premature exit filepath \""
>+ << premature_exit_filepath_ << "\" with error "
>+ << retval;
>+ }
>+ }
>+ }
>+
>+ private:
>+ const std::string premature_exit_filepath_;
>+
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedPrematureExitFile);
>+};
>+
> } // namespace internal
> 
> // class TestEventListeners
>@@ -3431,7 +4493,7 @@ void TestEventListeners::SuppressEventForwarding() {
> // We don't protect this under mutex_ as a user is not supposed to
> // call this before main() starts, from which point on the return
> // value will never change.
>-UnitTest * UnitTest::GetInstance() {
>+UnitTest* UnitTest::GetInstance() {
> // When compiled with MSVC 7.1 in optimized mode, destroying the
> // UnitTest object upon exiting the program messes up the exit code,
> // causing successful tests to appear failed. We have to use a
>@@ -3481,17 +4543,33 @@ int UnitTest::successful_test_count() const {
> // Gets the number of failed tests.
> int UnitTest::failed_test_count() const { return impl()->failed_test_count(); }
> 
>+// Gets the number of disabled tests that will be reported in the XML report.
>+int UnitTest::reportable_disabled_test_count() const {
>+ return impl()->reportable_disabled_test_count();
>+}
>+
> // Gets the number of disabled tests.
> int UnitTest::disabled_test_count() const {
> return impl()->disabled_test_count();
> }
> 
>+// Gets the number of tests to be printed in the XML report.
>+int UnitTest::reportable_test_count() const {
>+ return impl()->reportable_test_count();
>+}
>+
> // Gets the number of all tests.
> int UnitTest::total_test_count() const { return impl()->total_test_count(); }
> 
> // Gets the number of tests that should run.
> int UnitTest::test_to_run_count() const { return impl()->test_to_run_count(); }
> 
>+// Gets the time of the test program start, in ms from the start of the
>+// UNIX epoch.
>+internal::TimeInMillis UnitTest::start_timestamp() const {
>+ return impl()->start_timestamp();
>+}
>+
> // Gets the elapsed time, in milliseconds.
> internal::TimeInMillis UnitTest::elapsed_time() const {
> return impl()->elapsed_time();
>@@ -3510,6 +4588,12 @@ const TestCase* UnitTest::GetTestCase(int i) const {
> return impl()->GetTestCase(i);
> }
> 
>+// Returns the TestResult containing information on test failures and
>+// properties logged outside of individual test cases.
>+const TestResult& UnitTest::ad_hoc_test_result() const {
>+ return *impl()->ad_hoc_test_result();
>+}
>+
> // Gets the i-th test case among all the test cases. i can range from 0 to
> // total_test_case_count() - 1. If i is not in that range, returns NULL.
> TestCase* UnitTest::GetMutableTestCase(int i) {
>@@ -3541,29 +4625,16 @@ Environment* UnitTest::AddEnvironment(Environment* env) {
> return env;
> }
> 
>-#if GTEST_HAS_EXCEPTIONS
>-// A failed Google Test assertion will throw an exception of this type
>-// when exceptions are enabled. We derive it from std::runtime_error,
>-// which is for errors presumably detectable only at run time. Since
>-// std::runtime_error inherits from std::exception, many testing
>-// frameworks know how to extract and print the message inside it.
>-class GoogleTestFailureException : public ::std::runtime_error {
>- public:
>- explicit GoogleTestFailureException(const TestPartResult& failure)
>- : ::std::runtime_error(PrintTestPartResultToString(failure).c_str()) {}
>-};
>-#endif
>-
> // Adds a TestPartResult to the current TestResult object. All Google Test
> // assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc) eventually call
> // this to report their results. The user code should use the
> // assertion macros instead of calling this directly.
>-// L < mutex_
>-void UnitTest::AddTestPartResult(TestPartResult::Type result_type,
>- const char* file_name,
>- int line_number,
>- const internal::String& message,
>- const internal::String& os_stack_trace) {
>+void UnitTest::AddTestPartResult(
>+ TestPartResult::Type result_type,
>+ const char* file_name,
>+ int line_number,
>+ const std::string& message,
>+ const std::string& os_stack_trace) GTEST_LOCK_EXCLUDED_(mutex_) {
> Message msg;
> msg << message;
> 
>@@ -3596,17 +4667,26 @@ void UnitTest::AddTestPartResult(TestPartResult::Type result_type,
> // with another testing framework) and specify the former on the
> // command line for debugging.
> if (GTEST_FLAG(break_on_failure)) {
>-#if GTEST_OS_WINDOWS
>+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
> // Using DebugBreak on Windows allows gtest to still break into a debugger
> // when a failure happens and both the --gtest_break_on_failure and
> // the --gtest_catch_exceptions flags are specified.
> DebugBreak();
>+#elif (!defined(__native_client__)) && \
>+ ((defined(__clang__) || defined(__GNUC__)) && \
>+ (defined(__x86_64__) || defined(__i386__)))
>+ // with clang/gcc we can achieve the same effect on x86 by invoking int3
>+ asm("int3");
> #else
>+ // Dereference NULL through a volatile pointer to prevent the compiler
>+ // from removing. We use this rather than abort() or __builtin_trap() for
>+ // portability: Symbian doesn't implement abort() well, and some debuggers
>+ // don't correctly trap abort().
> *static_cast<volatile int*>(NULL) = 1;
> #endif // GTEST_OS_WINDOWS
> } else if (GTEST_FLAG(throw_on_failure)) {
> #if GTEST_HAS_EXCEPTIONS
>- throw GoogleTestFailureException(result);
>+ throw internal::GoogleTestFailureException(result);
> #else
> // We cannot call abort() as it generates a pop-up in debug mode
> // that cannot be suppressed in VC 7.1 or below.
>@@ -3616,12 +4696,14 @@ void UnitTest::AddTestPartResult(TestPartResult::Type result_type,
> }
> }
> 
>-// Creates and adds a property to the current TestResult. If a property matching
>-// the supplied value already exists, updates its value instead.
>-void UnitTest::RecordPropertyForCurrentTest(const char* key,
>- const char* value) {
>- const TestProperty test_property(key, value);
>- impl_->current_test_result()->RecordProperty(test_property);
>+// Adds a TestProperty to the current TestResult object when invoked from
>+// inside a test, to current TestCase's ad_hoc_test_result_ when invoked
>+// from SetUpTestCase or TearDownTestCase, or to the global property set
>+// when invoked elsewhere. If the result already contains a property with
>+// the same key, the value will be updated.
>+void UnitTest::RecordProperty(const std::string& key,
>+ const std::string& value) {
>+ impl_->RecordProperty(TestProperty(key, value));
> }
> 
> // Runs all tests in this UnitTest object and prints the result.
>@@ -3630,31 +4712,58 @@ void UnitTest::RecordPropertyForCurrentTest(const char* key,
> // We don't protect this under mutex_, as we only support calling it
> // from the main thread.
> int UnitTest::Run() {
>-#if GTEST_HAS_SEH
>- // Catch SEH-style exceptions.
>-
> const bool in_death_test_child_process =
> internal::GTEST_FLAG(internal_run_death_test).length() > 0;
> 
>+ // Google Test implements this protocol for catching that a test
>+ // program exits before returning control to Google Test:
>+ //
>+ // 1. Upon start, Google Test creates a file whose absolute path
>+ // is specified by the environment variable
>+ // TEST_PREMATURE_EXIT_FILE.
>+ // 2. When Google Test has finished its work, it deletes the file.
>+ //
>+ // This allows a test runner to set TEST_PREMATURE_EXIT_FILE before
>+ // running a Google-Test-based test program and check the existence
>+ // of the file at the end of the test execution to see if it has
>+ // exited prematurely.
>+
>+ // If we are in the child process of a death test, don't
>+ // create/delete the premature exit file, as doing so is unnecessary
>+ // and will confuse the parent process. Otherwise, create/delete
>+ // the file upon entering/leaving this function. If the program
>+ // somehow exits before this function has a chance to return, the
>+ // premature-exit file will be left undeleted, causing a test runner
>+ // that understands the premature-exit-file protocol to report the
>+ // test as having failed.
>+ const internal::ScopedPrematureExitFile premature_exit_file(
>+ in_death_test_child_process ?
>+ NULL : internal::posix::GetEnv("TEST_PREMATURE_EXIT_FILE"));
>+
>+ // Captures the value of GTEST_FLAG(catch_exceptions). This value will be
>+ // used for the duration of the program.
>+ impl()->set_catch_exceptions(GTEST_FLAG(catch_exceptions));
>+
>+#if GTEST_OS_WINDOWS
> // Either the user wants Google Test to catch exceptions thrown by the
> // tests or this is executing in the context of death test child
> // process. In either case the user does not want to see pop-up dialogs
>- // about crashes - they are expected..
>- if (GTEST_FLAG(catch_exceptions) || in_death_test_child_process) {
>-#if !GTEST_OS_WINDOWS_MOBILE
>+ // about crashes - they are expected.
>+ if (impl()->catch_exceptions() || in_death_test_child_process) {
>+# if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
> // SetErrorMode doesn't exist on CE.
> SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOALIGNMENTFAULTEXCEPT |
> SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX);
>-#endif // !GTEST_OS_WINDOWS_MOBILE
>+# endif // !GTEST_OS_WINDOWS_MOBILE
> 
>-#if (defined(_MSC_VER) || GTEST_OS_WINDOWS_MINGW) && !GTEST_OS_WINDOWS_MOBILE
>+# if (defined(_MSC_VER) || GTEST_OS_WINDOWS_MINGW) && !GTEST_OS_WINDOWS_MOBILE
> // Death test children can be terminated with _abort(). On Windows,
> // _abort() can show a dialog with a warning message. This forces the
> // abort message to go to stderr instead.
> _set_error_mode(_OUT_TO_STDERR);
>-#endif
>+# endif
> 
>-#if _MSC_VER >= 1400 && !GTEST_OS_WINDOWS_MOBILE
>+# if _MSC_VER >= 1400 && !GTEST_OS_WINDOWS_MOBILE
> // In the debug version, Visual Studio pops up a separate dialog
> // offering a choice to debug the aborted program. We need to suppress
> // this dialog or it will pop up for every EXPECT/ASSERT_DEATH statement
>@@ -3664,28 +4773,20 @@ int UnitTest::Run() {
> // VC++ doesn't define _set_abort_behavior() prior to the version 8.0.
> // Users of prior VC versions shall suffer the agony and pain of
> // clicking through the countless debug dialogs.
>- // TODO(vladl@google.com): find a way to suppress the abort dialog() in the
>+ // FIXME: find a way to suppress the abort dialog() in the
> // debug mode when compiled with VC 7.1 or lower.
> if (!GTEST_FLAG(break_on_failure))
> _set_abort_behavior(
> 0x0, // Clear the following flags:
> _WRITE_ABORT_MSG | _CALL_REPORTFAULT); // pop-up window, core dump.
>-#endif
>+# endif
> }
>+#endif // GTEST_OS_WINDOWS
> 
>- __try {
>- return impl_->RunAllTests();
>- } __except(internal::UnitTestOptions::GTestShouldProcessSEH(
>- GetExceptionCode())) {
>- printf("Exception thrown with code 0x%x.\nFAIL\n", GetExceptionCode());
>- fflush(stdout);
>- return 1;
>- }
>-
>-#else // We are on a compiler or platform that doesn't support SEH.
>-
>- return impl_->RunAllTests();
>-#endif // GTEST_HAS_SEH
>+ return internal::HandleExceptionsInMethodIfSupported(
>+ impl(),
>+ &internal::UnitTestImpl::RunAllTests,
>+ "auxiliary test code (environments or event listeners)") ? 0 : 1;
> }
> 
> // Returns the working directory when the first TEST() or TEST_F() was
>@@ -3696,16 +4797,16 @@ const char* UnitTest::original_working_dir() const {
> 
> // Returns the TestCase object for the test that's currently running,
> // or NULL if no test is running.
>-// L < mutex_
>-const TestCase* UnitTest::current_test_case() const {
>+const TestCase* UnitTest::current_test_case() const
>+ GTEST_LOCK_EXCLUDED_(mutex_) {
> internal::MutexLock lock(&mutex_);
> return impl_->current_test_case();
> }
> 
> // Returns the TestInfo object for the test that's currently running,
> // or NULL if no test is running.
>-// L < mutex_
>-const TestInfo* UnitTest::current_test_info() const {
>+const TestInfo* UnitTest::current_test_info() const
>+ GTEST_LOCK_EXCLUDED_(mutex_) {
> internal::MutexLock lock(&mutex_);
> return impl_->current_test_info();
> }
>@@ -3713,15 +4814,13 @@ const TestInfo* UnitTest::current_test_info() const {
> // Returns the random seed used at the start of the current test run.
> int UnitTest::random_seed() const { return impl_->random_seed(); }
> 
>-#if GTEST_HAS_PARAM_TEST
> // Returns ParameterizedTestCaseRegistry object used to keep track of
> // value-parameterized tests and instantiate and register them.
>-// L < mutex_
> internal::ParameterizedTestCaseRegistry&
>- UnitTest::parameterized_test_registry() {
>+ UnitTest::parameterized_test_registry()
>+ GTEST_LOCK_EXCLUDED_(mutex_) {
> return impl_->parameterized_test_registry();
> }
>-#endif // GTEST_HAS_PARAM_TEST
> 
> // Creates an empty UnitTest.
> UnitTest::UnitTest() {
>@@ -3735,15 +4834,15 @@ UnitTest::~UnitTest() {
> 
> // Pushes a trace defined by SCOPED_TRACE() on to the per-thread
> // Google Test trace stack.
>-// L < mutex_
>-void UnitTest::PushGTestTrace(const internal::TraceInfo& trace) {
>+void UnitTest::PushGTestTrace(const internal::TraceInfo& trace)
>+ GTEST_LOCK_EXCLUDED_(mutex_) {
> internal::MutexLock lock(&mutex_);
> impl_->gtest_trace_stack().push_back(trace);
> }
> 
> // Pops a trace from the per-thread Google Test trace stack.
>-// L < mutex_
>-void UnitTest::PopGTestTrace() {
>+void UnitTest::PopGTestTrace()
>+ GTEST_LOCK_EXCLUDED_(mutex_) {
> internal::MutexLock lock(&mutex_);
> impl_->gtest_trace_stack().pop_back();
> }
>@@ -3752,25 +4851,16 @@ namespace internal {
> 
> UnitTestImpl::UnitTestImpl(UnitTest* parent)
> : parent_(parent),
>-#ifdef _MSC_VER
>-#pragma warning(push) // Saves the current warning state.
>-#pragma warning(disable:4355) // Temporarily disables warning 4355
>- // (using this in initializer).
>- default_global_test_part_result_reporter_(this),
>- default_per_thread_test_part_result_reporter_(this),
>-#pragma warning(pop) // Restores the warning state again.
>-#else
>+ GTEST_DISABLE_MSC_WARNINGS_PUSH_(4355 /* using this in initializer */)
> default_global_test_part_result_reporter_(this),
> default_per_thread_test_part_result_reporter_(this),
>-#endif // _MSC_VER
>+ GTEST_DISABLE_MSC_WARNINGS_POP_()
> global_test_part_result_repoter_(
> &default_global_test_part_result_reporter_),
> per_thread_test_part_result_reporter_(
> &default_per_thread_test_part_result_reporter_),
>-#if GTEST_HAS_PARAM_TEST
> parameterized_test_registry_(),
> parameterized_tests_registered_(false),
>-#endif // GTEST_HAS_PARAM_TEST
> last_death_test_case_(-1),
> current_test_case_(NULL),
> current_test_info_(NULL),
>@@ -3779,13 +4869,13 @@ UnitTestImpl::UnitTestImpl(UnitTest* parent)
> post_flag_parse_init_performed_(false),
> random_seed_(0), // Will be overridden by the flag before first use.
> random_(0), // Will be reseeded before first use.
>-#if GTEST_HAS_DEATH_TEST
>+ start_timestamp_(0),
> elapsed_time_(0),
>- internal_run_death_test_flag_(NULL),
>- death_test_factory_(new DefaultDeathTestFactory) {
>-#else
>- elapsed_time_(0) {
>-#endif // GTEST_HAS_DEATH_TEST
>+#if GTEST_HAS_DEATH_TEST
>+ death_test_factory_(new DefaultDeathTestFactory),
>+#endif
>+ // Will be overridden by the flag before first use.
>+ catch_exceptions_(false) {
> listeners()->SetDefaultResultPrinter(new PrettyUnitTestResultPrinter);
> }
> 
>@@ -3799,6 +4889,28 @@ UnitTestImpl::~UnitTestImpl() {
> delete os_stack_trace_getter_;
> }
> 
>+// Adds a TestProperty to the current TestResult object when invoked in a
>+// context of a test, to current test case's ad_hoc_test_result when invoke
>+// from SetUpTestCase/TearDownTestCase, or to the global property set
>+// otherwise. If the result already contains a property with the same key,
>+// the value will be updated.
>+void UnitTestImpl::RecordProperty(const TestProperty& test_property) {
>+ std::string xml_element;
>+ TestResult* test_result; // TestResult appropriate for property recording.
>+
>+ if (current_test_info_ != NULL) {
>+ xml_element = "testcase";
>+ test_result = &(current_test_info_->result_);
>+ } else if (current_test_case_ != NULL) {
>+ xml_element = "testsuite";
>+ test_result = &(current_test_case_->ad_hoc_test_result_);
>+ } else {
>+ xml_element = "testsuites";
>+ test_result = &ad_hoc_test_result_;
>+ }
>+ test_result->RecordProperty(xml_element, test_property);
>+}
>+
> #if GTEST_HAS_DEATH_TEST
> // Disables event forwarding if the control is currently in a death test
> // subprocess. Must not be called before InitGoogleTest.
>@@ -3811,17 +4923,37 @@ void UnitTestImpl::SuppressTestEventsIfInSubprocess() {
> // Initializes event listeners performing XML output as specified by
> // UnitTestOptions. Must not be called before InitGoogleTest.
> void UnitTestImpl::ConfigureXmlOutput() {
>- const String& output_format = UnitTestOptions::GetOutputFormat();
>+ const std::string& output_format = UnitTestOptions::GetOutputFormat();
> if (output_format == "xml") {
> listeners()->SetDefaultXmlGenerator(new XmlUnitTestResultPrinter(
> UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
>+ } else if (output_format == "json") {
>+ listeners()->SetDefaultXmlGenerator(new JsonUnitTestResultPrinter(
>+ UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
> } else if (output_format != "") {
>- printf("WARNING: unrecognized output format \"%s\" ignored.\n",
>- output_format.c_str());
>- fflush(stdout);
>+ GTEST_LOG_(WARNING) << "WARNING: unrecognized output format \""
>+ << output_format << "\" ignored.";
> }
> }
> 
>+#if GTEST_CAN_STREAM_RESULTS_
>+// Initializes event listeners for streaming test results in string form.
>+// Must not be called before InitGoogleTest.
>+void UnitTestImpl::ConfigureStreamingOutput() {
>+ const std::string& target = GTEST_FLAG(stream_result_to);
>+ if (!target.empty()) {
>+ const size_t pos = target.find(':');
>+ if (pos != std::string::npos) {
>+ listeners()->Append(new StreamingListener(target.substr(0, pos),
>+ target.substr(pos+1)));
>+ } else {
>+ GTEST_LOG_(WARNING) << "unrecognized streaming target \"" << target
>+ << "\" ignored.";
>+ }
>+ }
>+}
>+#endif // GTEST_CAN_STREAM_RESULTS_
>+
> // Performs initialization dependent upon flag values obtained in
> // ParseGoogleTestFlagsOnly. Is called from InitGoogleTest after the call to
> // ParseGoogleTestFlagsOnly. In case a user neglects to call InitGoogleTest
>@@ -3832,6 +4964,11 @@ void UnitTestImpl::PostFlagParsingInit() {
> if (!post_flag_parse_init_performed_) {
> post_flag_parse_init_performed_ = true;
> 
>+#if defined(GTEST_CUSTOM_TEST_EVENT_LISTENER_)
>+ // Register to send notifications about key process state changes.
>+ listeners()->Append(new GTEST_CUSTOM_TEST_EVENT_LISTENER_());
>+#endif // defined(GTEST_CUSTOM_TEST_EVENT_LISTENER_)
>+
> #if GTEST_HAS_DEATH_TEST
> InitDeathTestSubprocessControlInfo();
> SuppressTestEventsIfInSubprocess();
>@@ -3845,6 +4982,18 @@ void UnitTestImpl::PostFlagParsingInit() {
> // Configures listeners for XML output. This makes it possible for users
> // to shut down the default XML output before invoking RUN_ALL_TESTS.
> ConfigureXmlOutput();
>+
>+#if GTEST_CAN_STREAM_RESULTS_
>+ // Configures listeners for streaming test results to the specified server.
>+ ConfigureStreamingOutput();
>+#endif // GTEST_CAN_STREAM_RESULTS_
>+
>+#if GTEST_HAS_ABSL
>+ if (GTEST_FLAG(install_failure_signal_handler)) {
>+ absl::FailureSignalHandlerOptions options;
>+ absl::InstallFailureSignalHandler(options);
>+ }
>+#endif // GTEST_HAS_ABSL
> }
> }
> 
>@@ -3859,7 +5008,7 @@ void UnitTestImpl::PostFlagParsingInit() {
> class TestCaseNameIs {
> public:
> // Constructor.
>- explicit TestCaseNameIs(const String& name)
>+ explicit TestCaseNameIs(const std::string& name)
> : name_(name) {}
> 
> // Returns true iff the name of test_case matches name_.
>@@ -3868,7 +5017,7 @@ class TestCaseNameIs {
> }
> 
> private:
>- String name_;
>+ std::string name_;
> };
> 
> // Finds and returns a TestCase with the given name. If one doesn't
>@@ -3879,26 +5028,28 @@ class TestCaseNameIs {
> // Arguments:
> //
> // test_case_name: name of the test case
>+// type_param: the name of the test case's type parameter, or NULL if
>+// this is not a typed or a type-parameterized test case.
> // set_up_tc: pointer to the function that sets up the test case
> // tear_down_tc: pointer to the function that tears down the test case
> TestCase* UnitTestImpl::GetTestCase(const char* test_case_name,
>- const char* comment,
>+ const char* type_param,
> Test::SetUpTestCaseFunc set_up_tc,
> Test::TearDownTestCaseFunc tear_down_tc) {
> // Can we find a TestCase with the given name?
>- const std::vector<TestCase*>::const_iterator test_case =
>- std::find_if(test_cases_.begin(), test_cases_.end(),
>+ const std::vector<TestCase*>::const_reverse_iterator test_case =
>+ std::find_if(test_cases_.rbegin(), test_cases_.rend(),
> TestCaseNameIs(test_case_name));
> 
>- if (test_case != test_cases_.end())
>+ if (test_case != test_cases_.rend())
> return *test_case;
> 
> // No. Let's create one.
> TestCase* const new_test_case =
>- new TestCase(test_case_name, comment, set_up_tc, tear_down_tc);
>+ new TestCase(test_case_name, type_param, set_up_tc, tear_down_tc);
> 
> // Is this a death test case?
>- if (internal::UnitTestOptions::MatchesFilter(String(test_case_name),
>+ if (internal::UnitTestOptions::MatchesFilter(test_case_name,
> kDeathTestCaseFilter)) {
> // Yes. Inserts the test case after the last death test case
> // defined so far. This only works when the test cases haven't
>@@ -3922,27 +5073,21 @@ static void SetUpEnvironment(Environment* env) { env->SetUp(); }
> static void TearDownEnvironment(Environment* env) { env->TearDown(); }
> 
> // Runs all tests in this UnitTest object, prints the result, and
>-// returns 0 if all tests are successful, or 1 otherwise. If any
>-// exception is thrown during a test on Windows, this test is
>-// considered to be failed, but the rest of the tests will still be
>-// run. (We disable exceptions on Linux and Mac OS X, so the issue
>-// doesn't apply there.)
>+// returns true if all tests are successful. If any exception is
>+// thrown during a test, the test is considered to be failed, but the
>+// rest of the tests will still be run.
>+//
> // When parameterized tests are enabled, it expands and registers
> // parameterized tests first in RegisterParameterizedTests().
> // All other functions called from RunAllTests() may safely assume that
> // parameterized tests are ready to be counted and run.
>-int UnitTestImpl::RunAllTests() {
>- // Makes sure InitGoogleTest() was called.
>- if (!GTestIsInitialized()) {
>- printf("%s",
>- "\nThis test program did NOT call ::testing::InitGoogleTest "
>- "before calling RUN_ALL_TESTS(). Please fix it.\n");
>- return 1;
>- }
>+bool UnitTestImpl::RunAllTests() {
>+ // True iff Google Test is initialized before RUN_ALL_TESTS() is called.
>+ const bool gtest_is_initialized_before_run_all_tests = GTestIsInitialized();
> 
> // Do not run any test if the --help flag was specified.
> if (g_help_flag)
>- return 0;
>+ return true;
> 
> // Repeats the call to the post-flag parsing initialization in case the
> // user didn't call InitGoogleTest.
>@@ -3959,6 +5104,11 @@ int UnitTestImpl::RunAllTests() {
> 
> #if GTEST_HAS_DEATH_TEST
> in_subprocess_for_death_test = (internal_run_death_test_flag_.get() != NULL);
>+# if defined(GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_)
>+ if (in_subprocess_for_death_test) {
>+ GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_();
>+ }
>+# endif // defined(GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_)
> #endif // GTEST_HAS_DEATH_TEST
> 
> const bool should_shard = ShouldShard(kTestTotalShards, kTestShardIndex,
>@@ -3974,7 +5124,7 @@ int UnitTestImpl::RunAllTests() {
> if (GTEST_FLAG(list_tests)) {
> // This must be called *after* FilterTests() has been called.
> ListTestsMatchingFilter();
>- return 0;
>+ return true;
> }
> 
> random_seed_ = GTEST_FLAG(shuffle) ?
>@@ -3985,6 +5135,7 @@ int UnitTestImpl::RunAllTests() {
> 
> TestEventListener* repeater = listeners()->repeater();
> 
>+ start_timestamp_ = GetTimeInMillis();
> repeater->OnTestProgramStart(*parent_);
> 
> // How many times to repeat the tests? We don't want to repeat them
>@@ -3993,7 +5144,9 @@ int UnitTestImpl::RunAllTests() {
> // Repeats forever if the repeat count is negative.
> const bool forever = repeat < 0;
> for (int i = 0; forever || i != repeat; i++) {
>- ClearResult();
>+ // We want to preserve failures generated by ad-hoc test
>+ // assertions executed before RUN_ALL_TESTS().
>+ ClearNonAdHocTestResult();
> 
> const TimeInMillis start = GetTimeInMillis();
> 
>@@ -4058,8 +5211,21 @@ int UnitTestImpl::RunAllTests() {
> 
> repeater->OnTestProgramEnd(*parent_);
> 
>- // Returns 0 if all tests passed, or 1 other wise.
>- return failed ? 1 : 0;
>+ if (!gtest_is_initialized_before_run_all_tests) {
>+ ColoredPrintf(
>+ COLOR_RED,
>+ "\nIMPORTANT NOTICE - DO NOT IGNORE:\n"
>+ "This test program did NOT call " GTEST_INIT_GOOGLE_TEST_NAME_
>+ "() before calling RUN_ALL_TESTS(). This is INVALID. Soon " GTEST_NAME_
>+ " will start to enforce the valid usage. "
>+ "Please fix it ASAP, or IT WILL START TO FAIL.\n"); // NOLINT
>+#if GTEST_FOR_GOOGLE_
>+ ColoredPrintf(COLOR_RED,
>+ "For more details, see http://wiki/Main/ValidGUnitMain.\n");
>+#endif // GTEST_FOR_GOOGLE_
>+ }
>+
>+ return !failed;
> }
> 
> // Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
>@@ -4133,7 +5299,7 @@ bool ShouldShard(const char* total_shards_env,
> // Parses the environment variable var as an Int32. If it is unset,
> // returns default_val. If it is not an Int32, prints an error
> // and aborts.
>-Int32 Int32FromEnvOrDie(const char* const var, Int32 default_val) {
>+Int32 Int32FromEnvOrDie(const char* var, Int32 default_val) {
> const char* str_val = posix::GetEnv(var);
> if (str_val == NULL) {
> return default_val;
>@@ -4160,8 +5326,8 @@ bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) {
> // each TestCase and TestInfo object.
> // If shard_tests == true, further filters tests based on sharding
> // variables in the environment - see
>-// http://code.google.com/p/googletest/wiki/GoogleTestAdvancedGuide.
>-// Returns the number of tests that should run.
>+// https://github.com/google/googletest/blob/master/googletest/docs/advanced.md
>+// . Returns the number of tests that should run.
> int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) {
> const Int32 total_shards = shard_tests == HONOR_SHARDING_PROTOCOL ?
> Int32FromEnvOrDie(kTestTotalShards, -1) : -1;
>@@ -4176,12 +5342,12 @@ int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) {
> int num_selected_tests = 0;
> for (size_t i = 0; i < test_cases_.size(); i++) {
> TestCase* const test_case = test_cases_[i];
>- const String &test_case_name = test_case->name();
>+ const std::string &test_case_name = test_case->name();
> test_case->set_should_run(false);
> 
> for (size_t j = 0; j < test_case->test_info_list().size(); j++) {
> TestInfo* const test_info = test_case->test_info_list()[j];
>- const String test_name(test_info->name());
>+ const std::string test_name(test_info->name());
> // A test is disabled if test case name or test name matches
> // kDisableTestFilter.
> const bool is_disabled =
>@@ -4189,34 +5355,60 @@ int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) {
> kDisableTestFilter) ||
> internal::UnitTestOptions::MatchesFilter(test_name,
> kDisableTestFilter);
>- test_info->impl()->set_is_disabled(is_disabled);
>+ test_info->is_disabled_ = is_disabled;
> 
> const bool matches_filter =
> internal::UnitTestOptions::FilterMatchesTest(test_case_name,
> test_name);
>- test_info->impl()->set_matches_filter(matches_filter);
>+ test_info->matches_filter_ = matches_filter;
> 
> const bool is_runnable =
> (GTEST_FLAG(also_run_disabled_tests) || !is_disabled) &&
> matches_filter;
> 
>- const bool is_selected = is_runnable &&
>- (shard_tests == IGNORE_SHARDING_PROTOCOL ||
>- ShouldRunTestOnShard(total_shards, shard_index,
>- num_runnable_tests));
>+ const bool is_in_another_shard =
>+ shard_tests != IGNORE_SHARDING_PROTOCOL &&
>+ !ShouldRunTestOnShard(total_shards, shard_index, num_runnable_tests);
>+ test_info->is_in_another_shard_ = is_in_another_shard;
>+ const bool is_selected = is_runnable && !is_in_another_shard;
> 
> num_runnable_tests += is_runnable;
> num_selected_tests += is_selected;
> 
>- test_info->impl()->set_should_run(is_selected);
>+ test_info->should_run_ = is_selected;
> test_case->set_should_run(test_case->should_run() || is_selected);
> }
> }
> return num_selected_tests;
> }
> 
>+// Prints the given C-string on a single line by replacing all '\n'
>+// characters with string "\\n". If the output takes more than
>+// max_length characters, only prints the first max_length characters
>+// and "...".
>+static void PrintOnOneLine(const char* str, int max_length) {
>+ if (str != NULL) {
>+ for (int i = 0; *str != '\0'; ++str) {
>+ if (i >= max_length) {
>+ printf("...");
>+ break;
>+ }
>+ if (*str == '\n') {
>+ printf("\\n");
>+ i += 2;
>+ } else {
>+ printf("%c", *str);
>+ ++i;
>+ }
>+ }
>+ }
>+}
>+
> // Prints the names of the tests matching the user-specified filter flag.
> void UnitTestImpl::ListTestsMatchingFilter() {
>+ // Print at most this many characters for each type/value parameter.
>+ const int kMaxParamLength = 250;
>+
> for (size_t i = 0; i < test_cases_.size(); i++) {
> const TestCase* const test_case = test_cases_[i];
> bool printed_test_case_name = false;
>@@ -4224,16 +5416,47 @@ void UnitTestImpl::ListTestsMatchingFilter() {
> for (size_t j = 0; j < test_case->test_info_list().size(); j++) {
> const TestInfo* const test_info =
> test_case->test_info_list()[j];
>- if (test_info->matches_filter()) {
>+ if (test_info->matches_filter_) {
> if (!printed_test_case_name) {
> printed_test_case_name = true;
>- printf("%s.\n", test_case->name());
>+ printf("%s.", test_case->name());
>+ if (test_case->type_param() != NULL) {
>+ printf(" # %s = ", kTypeParamLabel);
>+ // We print the type parameter on a single line to make
>+ // the output easy to parse by a program.
>+ PrintOnOneLine(test_case->type_param(), kMaxParamLength);
>+ }
>+ printf("\n");
>+ }
>+ printf(" %s", test_info->name());
>+ if (test_info->value_param() != NULL) {
>+ printf(" # %s = ", kValueParamLabel);
>+ // We print the value parameter on a single line to make the
>+ // output easy to parse by a program.
>+ PrintOnOneLine(test_info->value_param(), kMaxParamLength);
> }
>- printf(" %s\n", test_info->name());
>+ printf("\n");
> }
> }
> }
> fflush(stdout);
>+ const std::string& output_format = UnitTestOptions::GetOutputFormat();
>+ if (output_format == "xml" || output_format == "json") {
>+ FILE* fileout = OpenFileForWriting(
>+ UnitTestOptions::GetAbsolutePathToOutputFile().c_str());
>+ std::stringstream stream;
>+ if (output_format == "xml") {
>+ XmlUnitTestResultPrinter(
>+ UnitTestOptions::GetAbsolutePathToOutputFile().c_str())
>+ .PrintXmlTestsList(&stream, test_cases_);
>+ } else if (output_format == "json") {
>+ JsonUnitTestResultPrinter(
>+ UnitTestOptions::GetAbsolutePathToOutputFile().c_str())
>+ .PrintJsonTestList(&stream, test_cases_);
>+ }
>+ fprintf(fileout, "%s", StringStreamToString(&stream).c_str());
>+ fclose(fileout);
>+ }
> }
> 
> // Sets the OS stack trace getter.
>@@ -4254,17 +5477,25 @@ void UnitTestImpl::set_os_stack_trace_getter(
> // getter, and returns it.
> OsStackTraceGetterInterface* UnitTestImpl::os_stack_trace_getter() {
> if (os_stack_trace_getter_ == NULL) {
>+#ifdef GTEST_OS_STACK_TRACE_GETTER_
>+ os_stack_trace_getter_ = new GTEST_OS_STACK_TRACE_GETTER_;
>+#else
> os_stack_trace_getter_ = new OsStackTraceGetter;
>+#endif // GTEST_OS_STACK_TRACE_GETTER_
> }
> 
> return os_stack_trace_getter_;
> }
> 
>-// Returns the TestResult for the test that's currently running, or
>-// the TestResult for the ad hoc test if no test is running.
>+// Returns the most specific TestResult currently running.
> TestResult* UnitTestImpl::current_test_result() {
>- return current_test_info_ ?
>- current_test_info_->impl()->result() : &ad_hoc_test_result_;
>+ if (current_test_info_ != NULL) {
>+ return &current_test_info_->result_;
>+ }
>+ if (current_test_case_ != NULL) {
>+ return &current_test_case_->ad_hoc_test_result_;
>+ }
>+ return &ad_hoc_test_result_;
> }
> 
> // Shuffles all test cases, and the tests within each test case,
>@@ -4293,33 +5524,7 @@ void UnitTestImpl::UnshuffleTests() {
> }
> }
> 
>-// TestInfoImpl constructor. The new instance assumes ownership of the test
>-// factory object.
>-TestInfoImpl::TestInfoImpl(TestInfo* parent,
>- const char* a_test_case_name,
>- const char* a_name,
>- const char* a_test_case_comment,
>- const char* a_comment,
>- TypeId a_fixture_class_id,
>- internal::TestFactoryBase* factory) :
>- parent_(parent),
>- test_case_name_(String(a_test_case_name)),
>- name_(String(a_name)),
>- test_case_comment_(String(a_test_case_comment)),
>- comment_(String(a_comment)),
>- fixture_class_id_(a_fixture_class_id),
>- should_run_(false),
>- is_disabled_(false),
>- matches_filter_(false),
>- factory_(factory) {
>-}
>-
>-// TestInfoImpl destructor.
>-TestInfoImpl::~TestInfoImpl() {
>- delete factory_;
>-}
>-
>-// Returns the current OS stack trace as a String.
>+// Returns the current OS stack trace as an std::string.
> //
> // The maximum number of stack frames to be included is specified by
> // the gtest_stack_trace_depth flag. The skip_count parameter
>@@ -4329,15 +5534,15 @@ TestInfoImpl::~TestInfoImpl() {
> // For example, if Foo() calls Bar(), which in turn calls
> // GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
> // the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
>-String GetCurrentOsStackTraceExceptTop(UnitTest* /*unit_test*/,
>- int skip_count) {
>+std::string GetCurrentOsStackTraceExceptTop(UnitTest* /*unit_test*/,
>+ int skip_count) {
> // We pass skip_count + 1 to skip this wrapper function in addition
> // to what the user really wants to skip.
> return GetUnitTestImpl()->CurrentOsStackTraceExceptTop(skip_count + 1);
> }
> 
>-// Used by the GTEST_HIDE_UNREACHABLE_CODE_ macro to suppress unreachable
>-// code warnings.
>+// Used by the GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_ macro to
>+// suppress unreachable code warnings.
> namespace {
> class ClassUniqueToAlwaysTrue {};
> }
>@@ -4371,14 +5576,13 @@ bool SkipPrefix(const char* prefix, const char** pstr) {
> // part can be omitted.
> //
> // Returns the value of the flag, or NULL if the parsing failed.
>-const char* ParseFlagValue(const char* str,
>- const char* flag,
>- bool def_optional) {
>+static const char* ParseFlagValue(const char* str, const char* flag,
>+ bool def_optional) {
> // str and flag must not be NULL.
> if (str == NULL || flag == NULL) return NULL;
> 
> // The flag must start with "--" followed by GTEST_FLAG_PREFIX_.
>- const String flag_str = String::Format("--%s%s", GTEST_FLAG_PREFIX_, flag);
>+ const std::string flag_str = std::string("--") + GTEST_FLAG_PREFIX_ + flag;
> const size_t flag_len = flag_str.length();
> if (strncmp(str, flag_str.c_str(), flag_len) != 0) return NULL;
> 
>@@ -4409,7 +5613,7 @@ const char* ParseFlagValue(const char* str,
> //
> // On success, stores the value of the flag in *value, and returns
> // true. On failure, returns false without changing *value.
>-bool ParseBoolFlag(const char* str, const char* flag, bool* value) {
>+static bool ParseBoolFlag(const char* str, const char* flag, bool* value) {
> // Gets the value of the flag as a string.
> const char* const value_str = ParseFlagValue(str, flag, true);
> 
>@@ -4443,7 +5647,8 @@ bool ParseInt32Flag(const char* str, const char* flag, Int32* value) {
> //
> // On success, stores the value of the flag in *value, and returns
> // true. On failure, returns false without changing *value.
>-bool ParseStringFlag(const char* str, const char* flag, String* value) {
>+template <typename String>
>+static bool ParseStringFlag(const char* str, const char* flag, String* value) {
> // Gets the value of the flag as a string.
> const char* const value_str = ParseFlagValue(str, flag, false);
> 
>@@ -4479,7 +5684,7 @@ static bool HasGoogleTestFlagPrefix(const char* str) {
> // @Y changes the color to yellow.
> // @D changes to the default terminal text color.
> //
>-// TODO(wan@google.com): Write tests for this once we add stdout
>+// FIXME: Write tests for this once we add stdout
> // capturing to Google Test.
> static void PrintColorEncoded(const char* str) {
> GTestColor color = COLOR_DEFAULT; // The current color.
>@@ -4495,7 +5700,7 @@ static void PrintColorEncoded(const char* str) {
> return;
> }
> 
>- ColoredPrintf(color, "%s", String(str, p - str).c_str());
>+ ColoredPrintf(color, "%s", std::string(str, p).c_str());
> 
> const char ch = p[1];
> str = p + 2;
>@@ -4545,24 +5750,28 @@ static const char kColorEncodedHelpMessage[] =
> " Enable/disable colored output. The default is @Gauto@D.\n"
> " -@G-" GTEST_FLAG_PREFIX_ "print_time=0@D\n"
> " Don't print the elapsed time of each test.\n"
>-" @G--" GTEST_FLAG_PREFIX_ "output=xml@Y[@G:@YDIRECTORY_PATH@G"
>+" @G--" GTEST_FLAG_PREFIX_ "output=@Y(@Gjson@Y|@Gxml@Y)[@G:@YDIRECTORY_PATH@G"
> GTEST_PATH_SEP_ "@Y|@G:@YFILE_PATH]@D\n"
>-" Generate an XML report in the given directory or with the given file\n"
>-" name. @YFILE_PATH@D defaults to @Gtest_details.xml@D.\n"
>+" Generate a JSON or XML report in the given directory or with the given\n"
>+" file name. @YFILE_PATH@D defaults to @Gtest_details.xml@D.\n"
>+# if GTEST_CAN_STREAM_RESULTS_
>+" @G--" GTEST_FLAG_PREFIX_ "stream_result_to=@YHOST@G:@YPORT@D\n"
>+" Stream test results to the given server.\n"
>+# endif // GTEST_CAN_STREAM_RESULTS_
> "\n"
> "Assertion Behavior:\n"
>-#if GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
>+# if GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
> " @G--" GTEST_FLAG_PREFIX_ "death_test_style=@Y(@Gfast@Y|@Gthreadsafe@Y)@D\n"
> " Set the default death test style.\n"
>-#endif // GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
>+# endif // GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
> " @G--" GTEST_FLAG_PREFIX_ "break_on_failure@D\n"
> " Turn assertion failures into debugger break-points.\n"
> " @G--" GTEST_FLAG_PREFIX_ "throw_on_failure@D\n"
>-" Turn assertion failures into C++ exceptions.\n"
>-#if GTEST_OS_WINDOWS
>-" @G--" GTEST_FLAG_PREFIX_ "catch_exceptions@D\n"
>-" Suppress pop-ups caused by exceptions.\n"
>-#endif // GTEST_OS_WINDOWS
>+" Turn assertion failures into C++ exceptions for use by an external\n"
>+" test framework.\n"
>+" @G--" GTEST_FLAG_PREFIX_ "catch_exceptions=0@D\n"
>+" Do not report exceptions as test failures. Instead, allow them\n"
>+" to crash the program or throw a pop-up (on Windows).\n"
> "\n"
> "Except for @G--" GTEST_FLAG_PREFIX_ "list_tests@D, you can alternatively set "
> "the corresponding\n"
>@@ -4576,45 +5785,87 @@ static const char kColorEncodedHelpMessage[] =
> "(not one in your own code or tests), please report it to\n"
> "@G<" GTEST_DEV_EMAIL_ ">@D.\n";
> 
>+static bool ParseGoogleTestFlag(const char* const arg) {
>+ return ParseBoolFlag(arg, kAlsoRunDisabledTestsFlag,
>+ &GTEST_FLAG(also_run_disabled_tests)) ||
>+ ParseBoolFlag(arg, kBreakOnFailureFlag,
>+ &GTEST_FLAG(break_on_failure)) ||
>+ ParseBoolFlag(arg, kCatchExceptionsFlag,
>+ &GTEST_FLAG(catch_exceptions)) ||
>+ ParseStringFlag(arg, kColorFlag, &GTEST_FLAG(color)) ||
>+ ParseStringFlag(arg, kDeathTestStyleFlag,
>+ &GTEST_FLAG(death_test_style)) ||
>+ ParseBoolFlag(arg, kDeathTestUseFork,
>+ &GTEST_FLAG(death_test_use_fork)) ||
>+ ParseStringFlag(arg, kFilterFlag, &GTEST_FLAG(filter)) ||
>+ ParseStringFlag(arg, kInternalRunDeathTestFlag,
>+ &GTEST_FLAG(internal_run_death_test)) ||
>+ ParseBoolFlag(arg, kListTestsFlag, &GTEST_FLAG(list_tests)) ||
>+ ParseStringFlag(arg, kOutputFlag, &GTEST_FLAG(output)) ||
>+ ParseBoolFlag(arg, kPrintTimeFlag, &GTEST_FLAG(print_time)) ||
>+ ParseBoolFlag(arg, kPrintUTF8Flag, &GTEST_FLAG(print_utf8)) ||
>+ ParseInt32Flag(arg, kRandomSeedFlag, &GTEST_FLAG(random_seed)) ||
>+ ParseInt32Flag(arg, kRepeatFlag, &GTEST_FLAG(repeat)) ||
>+ ParseBoolFlag(arg, kShuffleFlag, &GTEST_FLAG(shuffle)) ||
>+ ParseInt32Flag(arg, kStackTraceDepthFlag,
>+ &GTEST_FLAG(stack_trace_depth)) ||
>+ ParseStringFlag(arg, kStreamResultToFlag,
>+ &GTEST_FLAG(stream_result_to)) ||
>+ ParseBoolFlag(arg, kThrowOnFailureFlag,
>+ &GTEST_FLAG(throw_on_failure));
>+}
>+
>+#if GTEST_USE_OWN_FLAGFILE_FLAG_
>+static void LoadFlagsFromFile(const std::string& path) {
>+ FILE* flagfile = posix::FOpen(path.c_str(), "r");
>+ if (!flagfile) {
>+ GTEST_LOG_(FATAL) << "Unable to open file \"" << GTEST_FLAG(flagfile)
>+ << "\"";
>+ }
>+ std::string contents(ReadEntireFile(flagfile));
>+ posix::FClose(flagfile);
>+ std::vector<std::string> lines;
>+ SplitString(contents, '\n', &lines);
>+ for (size_t i = 0; i < lines.size(); ++i) {
>+ if (lines[i].empty())
>+ continue;
>+ if (!ParseGoogleTestFlag(lines[i].c_str()))
>+ g_help_flag = true;
>+ }
>+}
>+#endif // GTEST_USE_OWN_FLAGFILE_FLAG_
>+
> // Parses the command line for Google Test flags, without initializing
> // other parts of Google Test. The type parameter CharType can be
> // instantiated to either char or wchar_t.
> template <typename CharType>
> void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
> for (int i = 1; i < *argc; i++) {
>- const String arg_string = StreamableToString(argv[i]);
>+ const std::string arg_string = StreamableToString(argv[i]);
> const char* const arg = arg_string.c_str();
> 
> using internal::ParseBoolFlag;
> using internal::ParseInt32Flag;
> using internal::ParseStringFlag;
> 
>- // Do we see a Google Test flag?
>- if (ParseBoolFlag(arg, kAlsoRunDisabledTestsFlag,
>- &GTEST_FLAG(also_run_disabled_tests)) ||
>- ParseBoolFlag(arg, kBreakOnFailureFlag,
>- &GTEST_FLAG(break_on_failure)) ||
>- ParseBoolFlag(arg, kCatchExceptionsFlag,
>- &GTEST_FLAG(catch_exceptions)) ||
>- ParseStringFlag(arg, kColorFlag, &GTEST_FLAG(color)) ||
>- ParseStringFlag(arg, kDeathTestStyleFlag,
>- &GTEST_FLAG(death_test_style)) ||
>- ParseBoolFlag(arg, kDeathTestUseFork,
>- &GTEST_FLAG(death_test_use_fork)) ||
>- ParseStringFlag(arg, kFilterFlag, &GTEST_FLAG(filter)) ||
>- ParseStringFlag(arg, kInternalRunDeathTestFlag,
>- &GTEST_FLAG(internal_run_death_test)) ||
>- ParseBoolFlag(arg, kListTestsFlag, &GTEST_FLAG(list_tests)) ||
>- ParseStringFlag(arg, kOutputFlag, &GTEST_FLAG(output)) ||
>- ParseBoolFlag(arg, kPrintTimeFlag, &GTEST_FLAG(print_time)) ||
>- ParseInt32Flag(arg, kRandomSeedFlag, &GTEST_FLAG(random_seed)) ||
>- ParseInt32Flag(arg, kRepeatFlag, &GTEST_FLAG(repeat)) ||
>- ParseBoolFlag(arg, kShuffleFlag, &GTEST_FLAG(shuffle)) ||
>- ParseInt32Flag(arg, kStackTraceDepthFlag,
>- &GTEST_FLAG(stack_trace_depth)) ||
>- ParseBoolFlag(arg, kThrowOnFailureFlag, &GTEST_FLAG(throw_on_failure))
>- ) {
>- // Yes. Shift the remainder of the argv list left by one. Note
>+ bool remove_flag = false;
>+ if (ParseGoogleTestFlag(arg)) {
>+ remove_flag = true;
>+#if GTEST_USE_OWN_FLAGFILE_FLAG_
>+ } else if (ParseStringFlag(arg, kFlagfileFlag, &GTEST_FLAG(flagfile))) {
>+ LoadFlagsFromFile(GTEST_FLAG(flagfile));
>+ remove_flag = true;
>+#endif // GTEST_USE_OWN_FLAGFILE_FLAG_
>+ } else if (arg_string == "--help" || arg_string == "-h" ||
>+ arg_string == "-?" || arg_string == "/?" ||
>+ HasGoogleTestFlagPrefix(arg)) {
>+ // Both help flag and unrecognized Google Test flags (excluding
>+ // internal ones) trigger help display.
>+ g_help_flag = true;
>+ }
>+
>+ if (remove_flag) {
>+ // Shift the remainder of the argv list left by one. Note
> // that argv has (*argc + 1) elements, the last one always being
> // NULL. The following loop moves the trailing NULL element as
> // well.
>@@ -4628,12 +5879,6 @@ void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
> // We also need to decrement the iterator as we just removed
> // an element.
> i--;
>- } else if (arg_string == "--help" || arg_string == "-h" ||
>- arg_string == "-?" || arg_string == "/?" ||
>- HasGoogleTestFlagPrefix(arg)) {
>- // Both help flag and unrecognized Google Test flags (excluding
>- // internal ones) trigger help display.
>- g_help_flag = true;
> }
> }
> 
>@@ -4649,6 +5894,17 @@ void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
> // other parts of Google Test.
> void ParseGoogleTestFlagsOnly(int* argc, char** argv) {
> ParseGoogleTestFlagsOnlyImpl(argc, argv);
>+
>+ // Fix the value of *_NSGetArgc() on macOS, but iff
>+ // *_NSGetArgv() == argv
>+ // Only applicable to char** version of argv
>+#if GTEST_OS_MAC
>+#ifndef GTEST_OS_IOS
>+ if (*_NSGetArgv() == argv) {
>+ *_NSGetArgc() = *argc;
>+ }
>+#endif
>+#endif
> }
> void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv) {
> ParseGoogleTestFlagsOnlyImpl(argc, argv);
>@@ -4660,21 +5916,19 @@ void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv) {
> // wchar_t.
> template <typename CharType>
> void InitGoogleTestImpl(int* argc, CharType** argv) {
>- g_init_gtest_count++;
>-
> // We don't want to run the initialization code twice.
>- if (g_init_gtest_count != 1) return;
>+ if (GTestIsInitialized()) return;
> 
> if (*argc <= 0) return;
> 
>- internal::g_executable_path = internal::StreamableToString(argv[0]);
>-
>-#if GTEST_HAS_DEATH_TEST
> g_argvs.clear();
> for (int i = 0; i != *argc; i++) {
> g_argvs.push_back(StreamableToString(argv[i]));
> }
>-#endif // GTEST_HAS_DEATH_TEST
>+
>+#if GTEST_HAS_ABSL
>+ absl::InitializeSymbolizer(g_argvs[0].c_str());
>+#endif // GTEST_HAS_ABSL
> 
> ParseGoogleTestFlagsOnly(argc, argv);
> GetUnitTestImpl()->PostFlagParsingInit();
>@@ -4692,13 +5946,62 @@ void InitGoogleTestImpl(int* argc, CharType** argv) {
> //
> // Calling the function for the second time has no user-visible effect.
> void InitGoogleTest(int* argc, char** argv) {
>+#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
>+ GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(argc, argv);
>+#else // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
> internal::InitGoogleTestImpl(argc, argv);
>+#endif // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
> }
> 
> // This overloaded version can be used in Windows programs compiled in
> // UNICODE mode.
> void InitGoogleTest(int* argc, wchar_t** argv) {
>+#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
>+ GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(argc, argv);
>+#else // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
> internal::InitGoogleTestImpl(argc, argv);
>+#endif // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
>+}
>+
>+std::string TempDir() {
>+#if defined(GTEST_CUSTOM_TEMPDIR_FUNCTION_)
>+ return GTEST_CUSTOM_TEMPDIR_FUNCTION_();
>+#endif
>+
>+#if GTEST_OS_WINDOWS_MOBILE
>+ return "\\temp\\";
>+#elif GTEST_OS_WINDOWS
>+ const char* temp_dir = internal::posix::GetEnv("TEMP");
>+ if (temp_dir == NULL || temp_dir[0] == '\0')
>+ return "\\temp\\";
>+ else if (temp_dir[strlen(temp_dir) - 1] == '\\')
>+ return temp_dir;
>+ else
>+ return std::string(temp_dir) + "\\";
>+#elif GTEST_OS_LINUX_ANDROID
>+ return "/sdcard/";
>+#else
>+ return "/tmp/";
>+#endif // GTEST_OS_WINDOWS_MOBILE
>+}
>+
>+// Class ScopedTrace
>+
>+// Pushes the given source file location and message onto a per-thread
>+// trace stack maintained by Google Test.
>+void ScopedTrace::PushTrace(const char* file, int line, std::string message) {
>+ internal::TraceInfo trace;
>+ trace.file = file;
>+ trace.line = line;
>+ trace.message.swap(message);
>+
>+ UnitTest::GetInstance()->PushGTestTrace(trace);
>+}
>+
>+// Pops the info pushed by the c'tor.
>+ScopedTrace::~ScopedTrace()
>+ GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) {
>+ UnitTest::GetInstance()->PopGTestTrace();
> }
> 
> } // namespace testing
>diff --git a/Source/ThirdParty/gtest/src/gtest_main.cc b/Source/ThirdParty/gtest/src/gtest_main.cc
>index d20c02fdfb0a9461dcc2a2789c4922b5b3056352..2113f621e65430e5570dfb2015884a2d4f4cf0b3 100644
>--- a/Source/ThirdParty/gtest/src/gtest_main.cc
>+++ b/Source/ThirdParty/gtest/src/gtest_main.cc
>@@ -27,13 +27,11 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
>-#include <iostream>
>-
>-#include <gtest/gtest.h>
>-
>-int main(int argc, char **argv) {
>- std::cout << "Running main() from gtest_main.cc\n";
>+#include <stdio.h>
>+#include "gtest/gtest.h"
> 
>+GTEST_API_ int main(int argc, char **argv) {
>+ printf("Running main() from %s\n", __FILE__);
> testing::InitGoogleTest(&argc, argv);
> return RUN_ALL_TESTS();
> }
>diff --git a/Source/ThirdParty/gtest/test/BUILD.bazel b/Source/ThirdParty/gtest/test/BUILD.bazel
>new file mode 100644
>index 0000000000000000000000000000000000000000..a930d65e0440144416ae88ab2758fd9340a0937b
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/BUILD.bazel
>@@ -0,0 +1,527 @@
>+# Copyright 2017 Google Inc.
>+# All Rights Reserved.
>+#
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+#
>+# Author: misterg@google.com (Gennadiy Civil)
>+#
>+# Bazel BUILD for The Google C++ Testing Framework (Google Test)
>+
>+licenses(["notice"])
>+
>+config_setting(
>+ name = "windows",
>+ values = {"cpu": "x64_windows"},
>+)
>+
>+config_setting(
>+ name = "windows_msvc",
>+ values = {"cpu": "x64_windows_msvc"},
>+)
>+
>+config_setting(
>+ name = "has_absl",
>+ values = {"define": "absl=1"},
>+)
>+
>+#on windows exclude gtest-tuple.h and googletest-tuple-test.cc
>+cc_test(
>+ name = "gtest_all_test",
>+ size = "small",
>+ srcs = glob(
>+ include = [
>+ "gtest-*.cc",
>+ "googletest-*.cc",
>+ "*.h",
>+ "googletest/include/gtest/**/*.h",
>+ ],
>+ exclude = [
>+ "gtest-unittest-api_test.cc",
>+ "googletest-tuple-test.cc",
>+ "googletest/src/gtest-all.cc",
>+ "gtest_all_test.cc",
>+ "gtest-death-test_ex_test.cc",
>+ "gtest-listener_test.cc",
>+ "gtest-unittest-api_test.cc",
>+ "googletest-param-test-test.cc",
>+ "googletest-catch-exceptions-test_.cc",
>+ "googletest-color-test_.cc",
>+ "googletest-env-var-test_.cc",
>+ "googletest-filter-unittest_.cc",
>+ "googletest-break-on-failure-unittest_.cc",
>+ "googletest-listener-test.cc",
>+ "googletest-output-test_.cc",
>+ "googletest-list-tests-unittest_.cc",
>+ "googletest-shuffle-test_.cc",
>+ "googletest-uninitialized-test_.cc",
>+ "googletest-death-test_ex_test.cc",
>+ "googletest-param-test-test",
>+ "googletest-throw-on-failure-test_.cc",
>+ "googletest-param-test-invalid-name1-test_.cc",
>+ "googletest-param-test-invalid-name2-test_.cc",
>+
>+ ],
>+ ) + select({
>+ "//:windows": [],
>+ "//:windows_msvc": [],
>+ "//conditions:default": [
>+ "googletest-tuple-test.cc",
>+ ],
>+ }),
>+ copts = select({
>+ "//:windows": ["-DGTEST_USE_OWN_TR1_TUPLE=0"],
>+ "//:windows_msvc": ["-DGTEST_USE_OWN_TR1_TUPLE=0"],
>+ "//conditions:default": ["-DGTEST_USE_OWN_TR1_TUPLE=1"],
>+ }),
>+ includes = [
>+ "googletest",
>+ "googletest/include",
>+ "googletest/include/internal",
>+ "googletest/test",
>+ ],
>+ linkopts = select({
>+ "//:windows": [],
>+ "//:windows_msvc": [],
>+ "//conditions:default": [
>+ "-pthread",
>+ ],
>+ }),
>+ deps = ["//:gtest_main"],
>+)
>+
>+
>+# Tests death tests.
>+cc_test(
>+ name = "googletest-death-test-test",
>+ size = "medium",
>+ srcs = ["googletest-death-test-test.cc"],
>+ deps = ["//:gtest_main"],
>+)
>+
>+cc_test(
>+ name = "gtest_test_macro_stack_footprint_test",
>+ size = "small",
>+ srcs = ["gtest_test_macro_stack_footprint_test.cc"],
>+ deps = ["//:gtest"],
>+)
>+
>+#These googletest tests have their own main()
>+cc_test(
>+ name = "googletest-listener-test",
>+ size = "small",
>+ srcs = ["googletest-listener-test.cc"],
>+ deps = ["//:gtest_main"],
>+)
>+
>+cc_test(
>+ name = "gtest-unittest-api_test",
>+ size = "small",
>+ srcs = [
>+ "gtest-unittest-api_test.cc",
>+ ],
>+ deps = [
>+ "//:gtest",
>+ ],
>+)
>+
>+cc_test(
>+ name = "googletest-param-test-test",
>+ size = "small",
>+ srcs = [
>+ "googletest-param-test-test.cc",
>+ "googletest-param-test-test.h",
>+ "googletest-param-test2-test.cc",
>+ ],
>+ deps = ["//:gtest"],
>+)
>+
>+cc_test(
>+ name = "gtest_unittest",
>+ size = "small",
>+ srcs = ["gtest_unittest.cc"],
>+ args = ["--heap_check=strict"],
>+ shard_count = 2,
>+ deps = ["//:gtest_main"],
>+)
>+
>+# Py tests
>+
>+py_library(
>+ name = "gtest_test_utils",
>+ testonly = 1,
>+ srcs = ["gtest_test_utils.py"],
>+)
>+
>+cc_binary(
>+ name = "gtest_help_test_",
>+ testonly = 1,
>+ srcs = ["gtest_help_test_.cc"],
>+ deps = ["//:gtest_main"],
>+)
>+
>+py_test(
>+ name = "gtest_help_test",
>+ size = "small",
>+ srcs = ["gtest_help_test.py"],
>+ data = [":gtest_help_test_"],
>+ deps = [":gtest_test_utils"],
>+)
>+
>+cc_binary(
>+ name = "googletest-output-test_",
>+ testonly = 1,
>+ srcs = ["googletest-output-test_.cc"],
>+ deps = ["//:gtest"],
>+)
>+
>+
>+py_test(
>+ name = "googletest-output-test",
>+ size = "small",
>+ srcs = ["googletest-output-test.py"],
>+ args = select({
>+ ":has_absl": [],
>+ "//conditions:default": ["--no_stacktrace_support"],
>+ }),
>+ data = [
>+ "googletest-output-test-golden-lin.txt",
>+ ":googletest-output-test_",
>+ ],
>+ deps = [":gtest_test_utils"],
>+)
>+
>+cc_binary(
>+ name = "googletest-color-test_",
>+ testonly = 1,
>+ srcs = ["googletest-color-test_.cc"],
>+ deps = ["//:gtest"],
>+)
>+
>+py_test(
>+ name = "googletest-color-test",
>+ size = "small",
>+ srcs = ["googletest-color-test.py"],
>+ data = [":googletest-color-test_"],
>+ deps = [":gtest_test_utils"],
>+)
>+
>+cc_binary(
>+ name = "googletest-env-var-test_",
>+ testonly = 1,
>+ srcs = ["googletest-env-var-test_.cc"],
>+ deps = ["//:gtest"],
>+)
>+
>+py_test(
>+ name = "googletest-env-var-test",
>+ size = "medium",
>+ srcs = ["googletest-env-var-test.py"],
>+ data = [":googletest-env-var-test_"],
>+ deps = [":gtest_test_utils"],
>+)
>+
>+cc_binary(
>+ name = "googletest-filter-unittest_",
>+ testonly = 1,
>+ srcs = ["googletest-filter-unittest_.cc"],
>+ deps = ["//:gtest"],
>+)
>+
>+py_test(
>+ name = "googletest-filter-unittest",
>+ size = "medium",
>+ srcs = ["googletest-filter-unittest.py"],
>+ data = [":googletest-filter-unittest_"],
>+ deps = [":gtest_test_utils"],
>+)
>+
>+
>+cc_binary(
>+ name = "googletest-break-on-failure-unittest_",
>+ testonly = 1,
>+ srcs = ["googletest-break-on-failure-unittest_.cc"],
>+ deps = ["//:gtest"],
>+)
>+
>+
>+
>+py_test(
>+ name = "googletest-break-on-failure-unittest",
>+ size = "small",
>+ srcs = ["googletest-break-on-failure-unittest.py"],
>+ data = [":googletest-break-on-failure-unittest_"],
>+ deps = [":gtest_test_utils"],
>+)
>+
>+
>+cc_test(
>+ name = "gtest_assert_by_exception_test",
>+ size = "small",
>+ srcs = ["gtest_assert_by_exception_test.cc"],
>+ deps = ["//:gtest"],
>+)
>+
>+
>+
>+cc_binary(
>+ name = "googletest-throw-on-failure-test_",
>+ testonly = 1,
>+ srcs = ["googletest-throw-on-failure-test_.cc"],
>+ deps = ["//:gtest"],
>+)
>+
>+py_test(
>+ name = "googletest-throw-on-failure-test",
>+ size = "small",
>+ srcs = ["googletest-throw-on-failure-test.py"],
>+ data = [":googletest-throw-on-failure-test_"],
>+ deps = [":gtest_test_utils"],
>+)
>+
>+
>+cc_binary(
>+ name = "googletest-list-tests-unittest_",
>+ testonly = 1,
>+ srcs = ["googletest-list-tests-unittest_.cc"],
>+ deps = ["//:gtest"],
>+)
>+
>+py_test(
>+ name = "googletest-list-tests-unittest",
>+ size = "small",
>+ srcs = ["googletest-list-tests-unittest.py"],
>+ data = [":googletest-list-tests-unittest_"],
>+ deps = [":gtest_test_utils"],
>+)
>+
>+cc_binary(
>+ name = "googletest-shuffle-test_",
>+ srcs = ["googletest-shuffle-test_.cc"],
>+ deps = ["//:gtest"],
>+)
>+
>+py_test(
>+ name = "googletest-shuffle-test",
>+ size = "small",
>+ srcs = ["googletest-shuffle-test.py"],
>+ data = [":googletest-shuffle-test_"],
>+ deps = [":gtest_test_utils"],
>+)
>+
>+cc_binary(
>+ name = "googletest-catch-exceptions-no-ex-test_",
>+ testonly = 1,
>+ srcs = ["googletest-catch-exceptions-test_.cc"],
>+ deps = ["//:gtest_main"],
>+)
>+
>+cc_binary(
>+ name = "googletest-catch-exceptions-ex-test_",
>+ testonly = 1,
>+ srcs = ["googletest-catch-exceptions-test_.cc"],
>+ copts = ["-fexceptions"],
>+ deps = ["//:gtest_main"],
>+)
>+
>+py_test(
>+ name = "googletest-catch-exceptions-test",
>+ size = "small",
>+ srcs = ["googletest-catch-exceptions-test.py"],
>+ data = [
>+ ":googletest-catch-exceptions-ex-test_",
>+ ":googletest-catch-exceptions-no-ex-test_",
>+ ],
>+ deps = [":gtest_test_utils"],
>+)
>+
>+cc_binary(
>+ name = "gtest_xml_output_unittest_",
>+ testonly = 1,
>+ srcs = ["gtest_xml_output_unittest_.cc"],
>+ deps = ["//:gtest"],
>+)
>+
>+cc_test(
>+ name = "gtest_no_test_unittest",
>+ size = "small",
>+ srcs = ["gtest_no_test_unittest.cc"],
>+ deps = ["//:gtest"],
>+)
>+
>+py_test(
>+ name = "gtest_xml_output_unittest",
>+ size = "small",
>+ srcs = [
>+ "gtest_xml_output_unittest.py",
>+ "gtest_xml_test_utils.py",
>+ ],
>+ args = select({
>+ ":has_absl": [],
>+ "//conditions:default": ["--no_stacktrace_support"],
>+ }),
>+ data = [
>+ # We invoke gtest_no_test_unittest to verify the XML output
>+ # when the test program contains no test definition.
>+ ":gtest_no_test_unittest",
>+ ":gtest_xml_output_unittest_",
>+ ],
>+ deps = [":gtest_test_utils"],
>+)
>+
>+cc_binary(
>+ name = "gtest_xml_outfile1_test_",
>+ testonly = 1,
>+ srcs = ["gtest_xml_outfile1_test_.cc"],
>+ deps = ["//:gtest_main"],
>+)
>+
>+cc_binary(
>+ name = "gtest_xml_outfile2_test_",
>+ testonly = 1,
>+ srcs = ["gtest_xml_outfile2_test_.cc"],
>+ deps = ["//:gtest_main"],
>+)
>+
>+py_test(
>+ name = "gtest_xml_outfiles_test",
>+ size = "small",
>+ srcs = [
>+ "gtest_xml_outfiles_test.py",
>+ "gtest_xml_test_utils.py",
>+ ],
>+ data = [
>+ ":gtest_xml_outfile1_test_",
>+ ":gtest_xml_outfile2_test_",
>+ ],
>+ deps = [":gtest_test_utils"],
>+)
>+
>+cc_binary(
>+ name = "googletest-uninitialized-test_",
>+ testonly = 1,
>+ srcs = ["googletest-uninitialized-test_.cc"],
>+ deps = ["//:gtest"],
>+)
>+
>+py_test(
>+ name = "googletest-uninitialized-test",
>+ size = "medium",
>+ srcs = ["googletest-uninitialized-test.py"],
>+ data = ["googletest-uninitialized-test_"],
>+ deps = [":gtest_test_utils"],
>+)
>+
>+cc_binary(
>+ name = "gtest_testbridge_test_",
>+ testonly = 1,
>+ srcs = ["gtest_testbridge_test_.cc"],
>+ deps = ["//:gtest_main"],
>+)
>+
>+# Tests that filtering via testbridge works
>+py_test(
>+ name = "gtest_testbridge_test",
>+ size = "small",
>+ srcs = ["gtest_testbridge_test.py"],
>+ data = [":gtest_testbridge_test_"],
>+ deps = [":gtest_test_utils"],
>+)
>+
>+
>+py_test(
>+ name = "googletest-json-outfiles-test",
>+ size = "small",
>+ srcs = [
>+ "googletest-json-outfiles-test.py",
>+ "gtest_json_test_utils.py",
>+ ],
>+ data = [
>+ ":gtest_xml_outfile1_test_",
>+ ":gtest_xml_outfile2_test_",
>+ ],
>+ deps = [":gtest_test_utils"],
>+)
>+
>+py_test(
>+ name = "googletest-json-output-unittest",
>+ size = "medium",
>+ srcs = [
>+ "googletest-json-output-unittest.py",
>+ "gtest_json_test_utils.py",
>+ ],
>+ data = [
>+ # We invoke gtest_no_test_unittest to verify the JSON output
>+ # when the test program contains no test definition.
>+ ":gtest_no_test_unittest",
>+ ":gtest_xml_output_unittest_",
>+ ],
>+ args = select({
>+ ":has_absl": [],
>+ "//conditions:default": ["--no_stacktrace_support"],
>+ }),
>+ deps = [":gtest_test_utils"],
>+)
>+# Verifies interaction of death tests and exceptions.
>+cc_test(
>+ name = "googletest-death-test_ex_catch_test",
>+ size = "medium",
>+ srcs = ["googletest-death-test_ex_test.cc"],
>+ copts = ["-fexceptions"],
>+ defines = ["GTEST_ENABLE_CATCH_EXCEPTIONS_=1"],
>+ deps = ["//:gtest"],
>+)
>+
>+cc_binary(
>+ name = "googletest-param-test-invalid-name1-test_",
>+ testonly = 1,
>+ srcs = ["googletest-param-test-invalid-name1-test_.cc"],
>+ deps = ["//:gtest"],
>+)
>+
>+cc_binary(
>+ name = "googletest-param-test-invalid-name2-test_",
>+ testonly = 1,
>+ srcs = ["googletest-param-test-invalid-name2-test_.cc"],
>+ deps = ["//:gtest"],
>+)
>+
>+py_test(
>+ name = "googletest-param-test-invalid-name1-test",
>+ size = "small",
>+ srcs = ["googletest-param-test-invalid-name1-test.py"],
>+ data = [":googletest-param-test-invalid-name1-test_"],
>+ deps = [":gtest_test_utils"],
>+)
>+
>+py_test(
>+ name = "googletest-param-test-invalid-name2-test",
>+ size = "small",
>+ srcs = ["googletest-param-test-invalid-name2-test.py"],
>+ data = [":googletest-param-test-invalid-name2-test_"],
>+ deps = [":gtest_test_utils"],
>+)
>diff --git a/Source/ThirdParty/gtest/test/googletest-break-on-failure-unittest.py b/Source/ThirdParty/gtest/test/googletest-break-on-failure-unittest.py
>new file mode 100755
>index 0000000000000000000000000000000000000000..a5dfbc693b43a1b19e3847dcbcab886d2f4d28e6
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-break-on-failure-unittest.py
>@@ -0,0 +1,208 @@
>+#!/usr/bin/env python
>+#
>+# Copyright 2006, Google Inc.
>+# All rights reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+"""Unit test for Google Test's break-on-failure mode.
>+
>+A user can ask Google Test to seg-fault when an assertion fails, using
>+either the GTEST_BREAK_ON_FAILURE environment variable or the
>+--gtest_break_on_failure flag. This script tests such functionality
>+by invoking googletest-break-on-failure-unittest_ (a program written with
>+Google Test) with different environments and command line flags.
>+"""
>+
>+import os
>+import gtest_test_utils
>+
>+# Constants.
>+
>+IS_WINDOWS = os.name == 'nt'
>+
>+# The environment variable for enabling/disabling the break-on-failure mode.
>+BREAK_ON_FAILURE_ENV_VAR = 'GTEST_BREAK_ON_FAILURE'
>+
>+# The command line flag for enabling/disabling the break-on-failure mode.
>+BREAK_ON_FAILURE_FLAG = 'gtest_break_on_failure'
>+
>+# The environment variable for enabling/disabling the throw-on-failure mode.
>+THROW_ON_FAILURE_ENV_VAR = 'GTEST_THROW_ON_FAILURE'
>+
>+# The environment variable for enabling/disabling the catch-exceptions mode.
>+CATCH_EXCEPTIONS_ENV_VAR = 'GTEST_CATCH_EXCEPTIONS'
>+
>+# Path to the googletest-break-on-failure-unittest_ program.
>+EXE_PATH = gtest_test_utils.GetTestExecutablePath(
>+ 'googletest-break-on-failure-unittest_')
>+
>+
>+environ = gtest_test_utils.environ
>+SetEnvVar = gtest_test_utils.SetEnvVar
>+
>+# Tests in this file run a Google-Test-based test program and expect it
>+# to terminate prematurely. Therefore they are incompatible with
>+# the premature-exit-file protocol by design. Unset the
>+# premature-exit filepath to prevent Google Test from creating
>+# the file.
>+SetEnvVar(gtest_test_utils.PREMATURE_EXIT_FILE_ENV_VAR, None)
>+
>+
>+def Run(command):
>+ """Runs a command; returns 1 if it was killed by a signal, or 0 otherwise."""
>+
>+ p = gtest_test_utils.Subprocess(command, env=environ)
>+ if p.terminated_by_signal:
>+ return 1
>+ else:
>+ return 0
>+
>+
>+# The tests.
>+
>+
>+class GTestBreakOnFailureUnitTest(gtest_test_utils.TestCase):
>+ """Tests using the GTEST_BREAK_ON_FAILURE environment variable or
>+ the --gtest_break_on_failure flag to turn assertion failures into
>+ segmentation faults.
>+ """
>+
>+ def RunAndVerify(self, env_var_value, flag_value, expect_seg_fault):
>+ """Runs googletest-break-on-failure-unittest_ and verifies that it does
>+ (or does not) have a seg-fault.
>+
>+ Args:
>+ env_var_value: value of the GTEST_BREAK_ON_FAILURE environment
>+ variable; None if the variable should be unset.
>+ flag_value: value of the --gtest_break_on_failure flag;
>+ None if the flag should not be present.
>+ expect_seg_fault: 1 if the program is expected to generate a seg-fault;
>+ 0 otherwise.
>+ """
>+
>+ SetEnvVar(BREAK_ON_FAILURE_ENV_VAR, env_var_value)
>+
>+ if env_var_value is None:
>+ env_var_value_msg = ' is not set'
>+ else:
>+ env_var_value_msg = '=' + env_var_value
>+
>+ if flag_value is None:
>+ flag = ''
>+ elif flag_value == '0':
>+ flag = '--%s=0' % BREAK_ON_FAILURE_FLAG
>+ else:
>+ flag = '--%s' % BREAK_ON_FAILURE_FLAG
>+
>+ command = [EXE_PATH]
>+ if flag:
>+ command.append(flag)
>+
>+ if expect_seg_fault:
>+ should_or_not = 'should'
>+ else:
>+ should_or_not = 'should not'
>+
>+ has_seg_fault = Run(command)
>+
>+ SetEnvVar(BREAK_ON_FAILURE_ENV_VAR, None)
>+
>+ msg = ('when %s%s, an assertion failure in "%s" %s cause a seg-fault.' %
>+ (BREAK_ON_FAILURE_ENV_VAR, env_var_value_msg, ' '.join(command),
>+ should_or_not))
>+ self.assert_(has_seg_fault == expect_seg_fault, msg)
>+
>+ def testDefaultBehavior(self):
>+ """Tests the behavior of the default mode."""
>+
>+ self.RunAndVerify(env_var_value=None,
>+ flag_value=None,
>+ expect_seg_fault=0)
>+
>+ def testEnvVar(self):
>+ """Tests using the GTEST_BREAK_ON_FAILURE environment variable."""
>+
>+ self.RunAndVerify(env_var_value='0',
>+ flag_value=None,
>+ expect_seg_fault=0)
>+ self.RunAndVerify(env_var_value='1',
>+ flag_value=None,
>+ expect_seg_fault=1)
>+
>+ def testFlag(self):
>+ """Tests using the --gtest_break_on_failure flag."""
>+
>+ self.RunAndVerify(env_var_value=None,
>+ flag_value='0',
>+ expect_seg_fault=0)
>+ self.RunAndVerify(env_var_value=None,
>+ flag_value='1',
>+ expect_seg_fault=1)
>+
>+ def testFlagOverridesEnvVar(self):
>+ """Tests that the flag overrides the environment variable."""
>+
>+ self.RunAndVerify(env_var_value='0',
>+ flag_value='0',
>+ expect_seg_fault=0)
>+ self.RunAndVerify(env_var_value='0',
>+ flag_value='1',
>+ expect_seg_fault=1)
>+ self.RunAndVerify(env_var_value='1',
>+ flag_value='0',
>+ expect_seg_fault=0)
>+ self.RunAndVerify(env_var_value='1',
>+ flag_value='1',
>+ expect_seg_fault=1)
>+
>+ def testBreakOnFailureOverridesThrowOnFailure(self):
>+ """Tests that gtest_break_on_failure overrides gtest_throw_on_failure."""
>+
>+ SetEnvVar(THROW_ON_FAILURE_ENV_VAR, '1')
>+ try:
>+ self.RunAndVerify(env_var_value=None,
>+ flag_value='1',
>+ expect_seg_fault=1)
>+ finally:
>+ SetEnvVar(THROW_ON_FAILURE_ENV_VAR, None)
>+
>+ if IS_WINDOWS:
>+ def testCatchExceptionsDoesNotInterfere(self):
>+ """Tests that gtest_catch_exceptions doesn't interfere."""
>+
>+ SetEnvVar(CATCH_EXCEPTIONS_ENV_VAR, '1')
>+ try:
>+ self.RunAndVerify(env_var_value='1',
>+ flag_value='1',
>+ expect_seg_fault=1)
>+ finally:
>+ SetEnvVar(CATCH_EXCEPTIONS_ENV_VAR, None)
>+
>+
>+if __name__ == '__main__':
>+ gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/googletest-break-on-failure-unittest_.cc b/Source/ThirdParty/gtest/test/googletest-break-on-failure-unittest_.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..f84957a2d03b56260c8e2c0ae8f5a27beb6f6378
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-break-on-failure-unittest_.cc
>@@ -0,0 +1,86 @@
>+// Copyright 2006, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+
>+// Unit test for Google Test's break-on-failure mode.
>+//
>+// A user can ask Google Test to seg-fault when an assertion fails, using
>+// either the GTEST_BREAK_ON_FAILURE environment variable or the
>+// --gtest_break_on_failure flag. This file is used for testing such
>+// functionality.
>+//
>+// This program will be invoked from a Python unit test. It is
>+// expected to fail. Don't run it directly.
>+
>+#include "gtest/gtest.h"
>+
>+#if GTEST_OS_WINDOWS
>+# include <windows.h>
>+# include <stdlib.h>
>+#endif
>+
>+namespace {
>+
>+// A test that's expected to fail.
>+TEST(Foo, Bar) {
>+ EXPECT_EQ(2, 3);
>+}
>+
>+#if GTEST_HAS_SEH && !GTEST_OS_WINDOWS_MOBILE
>+// On Windows Mobile global exception handlers are not supported.
>+LONG WINAPI ExitWithExceptionCode(
>+ struct _EXCEPTION_POINTERS* exception_pointers) {
>+ exit(exception_pointers->ExceptionRecord->ExceptionCode);
>+}
>+#endif
>+
>+} // namespace
>+
>+int main(int argc, char **argv) {
>+#if GTEST_OS_WINDOWS
>+ // Suppresses display of the Windows error dialog upon encountering
>+ // a general protection fault (segment violation).
>+ SetErrorMode(SEM_NOGPFAULTERRORBOX | SEM_FAILCRITICALERRORS);
>+
>+# if GTEST_HAS_SEH && !GTEST_OS_WINDOWS_MOBILE
>+
>+ // The default unhandled exception filter does not always exit
>+ // with the exception code as exit code - for example it exits with
>+ // 0 for EXCEPTION_ACCESS_VIOLATION and 1 for EXCEPTION_BREAKPOINT
>+ // if the application is compiled in debug mode. Thus we use our own
>+ // filter which always exits with the exception code for unhandled
>+ // exceptions.
>+ SetUnhandledExceptionFilter(ExitWithExceptionCode);
>+
>+# endif
>+#endif // GTEST_OS_WINDOWS
>+ testing::InitGoogleTest(&argc, argv);
>+
>+ return RUN_ALL_TESTS();
>+}
>diff --git a/Source/ThirdParty/gtest/test/googletest-catch-exceptions-test.py b/Source/ThirdParty/gtest/test/googletest-catch-exceptions-test.py
>new file mode 100755
>index 0000000000000000000000000000000000000000..5d49c1023c50ef16833e6b8e2a8e620248432ac3
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-catch-exceptions-test.py
>@@ -0,0 +1,233 @@
>+#!/usr/bin/env python
>+#
>+# Copyright 2010 Google Inc. All Rights Reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+"""Tests Google Test's exception catching behavior.
>+
>+This script invokes googletest-catch-exceptions-test_ and
>+googletest-catch-exceptions-ex-test_ (programs written with
>+Google Test) and verifies their output.
>+"""
>+
>+import gtest_test_utils
>+
>+# Constants.
>+FLAG_PREFIX = '--gtest_'
>+LIST_TESTS_FLAG = FLAG_PREFIX + 'list_tests'
>+NO_CATCH_EXCEPTIONS_FLAG = FLAG_PREFIX + 'catch_exceptions=0'
>+FILTER_FLAG = FLAG_PREFIX + 'filter'
>+
>+# Path to the googletest-catch-exceptions-ex-test_ binary, compiled with
>+# exceptions enabled.
>+EX_EXE_PATH = gtest_test_utils.GetTestExecutablePath(
>+ 'googletest-catch-exceptions-ex-test_')
>+
>+# Path to the googletest-catch-exceptions-test_ binary, compiled with
>+# exceptions disabled.
>+EXE_PATH = gtest_test_utils.GetTestExecutablePath(
>+ 'googletest-catch-exceptions-no-ex-test_')
>+
>+environ = gtest_test_utils.environ
>+SetEnvVar = gtest_test_utils.SetEnvVar
>+
>+# Tests in this file run a Google-Test-based test program and expect it
>+# to terminate prematurely. Therefore they are incompatible with
>+# the premature-exit-file protocol by design. Unset the
>+# premature-exit filepath to prevent Google Test from creating
>+# the file.
>+SetEnvVar(gtest_test_utils.PREMATURE_EXIT_FILE_ENV_VAR, None)
>+
>+TEST_LIST = gtest_test_utils.Subprocess(
>+ [EXE_PATH, LIST_TESTS_FLAG], env=environ).output
>+
>+SUPPORTS_SEH_EXCEPTIONS = 'ThrowsSehException' in TEST_LIST
>+
>+if SUPPORTS_SEH_EXCEPTIONS:
>+ BINARY_OUTPUT = gtest_test_utils.Subprocess([EXE_PATH], env=environ).output
>+
>+EX_BINARY_OUTPUT = gtest_test_utils.Subprocess(
>+ [EX_EXE_PATH], env=environ).output
>+
>+
>+# The tests.
>+if SUPPORTS_SEH_EXCEPTIONS:
>+ # pylint:disable-msg=C6302
>+ class CatchSehExceptionsTest(gtest_test_utils.TestCase):
>+ """Tests exception-catching behavior."""
>+
>+
>+ def TestSehExceptions(self, test_output):
>+ self.assert_('SEH exception with code 0x2a thrown '
>+ 'in the test fixture\'s constructor'
>+ in test_output)
>+ self.assert_('SEH exception with code 0x2a thrown '
>+ 'in the test fixture\'s destructor'
>+ in test_output)
>+ self.assert_('SEH exception with code 0x2a thrown in SetUpTestCase()'
>+ in test_output)
>+ self.assert_('SEH exception with code 0x2a thrown in TearDownTestCase()'
>+ in test_output)
>+ self.assert_('SEH exception with code 0x2a thrown in SetUp()'
>+ in test_output)
>+ self.assert_('SEH exception with code 0x2a thrown in TearDown()'
>+ in test_output)
>+ self.assert_('SEH exception with code 0x2a thrown in the test body'
>+ in test_output)
>+
>+ def testCatchesSehExceptionsWithCxxExceptionsEnabled(self):
>+ self.TestSehExceptions(EX_BINARY_OUTPUT)
>+
>+ def testCatchesSehExceptionsWithCxxExceptionsDisabled(self):
>+ self.TestSehExceptions(BINARY_OUTPUT)
>+
>+
>+class CatchCxxExceptionsTest(gtest_test_utils.TestCase):
>+ """Tests C++ exception-catching behavior.
>+
>+ Tests in this test case verify that:
>+ * C++ exceptions are caught and logged as C++ (not SEH) exceptions
>+ * Exception thrown affect the remainder of the test work flow in the
>+ expected manner.
>+ """
>+
>+ def testCatchesCxxExceptionsInFixtureConstructor(self):
>+ self.assert_('C++ exception with description '
>+ '"Standard C++ exception" thrown '
>+ 'in the test fixture\'s constructor'
>+ in EX_BINARY_OUTPUT)
>+ self.assert_('unexpected' not in EX_BINARY_OUTPUT,
>+ 'This failure belongs in this test only if '
>+ '"CxxExceptionInConstructorTest" (no quotes) '
>+ 'appears on the same line as words "called unexpectedly"')
>+
>+ if ('CxxExceptionInDestructorTest.ThrowsExceptionInDestructor' in
>+ EX_BINARY_OUTPUT):
>+
>+ def testCatchesCxxExceptionsInFixtureDestructor(self):
>+ self.assert_('C++ exception with description '
>+ '"Standard C++ exception" thrown '
>+ 'in the test fixture\'s destructor'
>+ in EX_BINARY_OUTPUT)
>+ self.assert_('CxxExceptionInDestructorTest::TearDownTestCase() '
>+ 'called as expected.'
>+ in EX_BINARY_OUTPUT)
>+
>+ def testCatchesCxxExceptionsInSetUpTestCase(self):
>+ self.assert_('C++ exception with description "Standard C++ exception"'
>+ ' thrown in SetUpTestCase()'
>+ in EX_BINARY_OUTPUT)
>+ self.assert_('CxxExceptionInConstructorTest::TearDownTestCase() '
>+ 'called as expected.'
>+ in EX_BINARY_OUTPUT)
>+ self.assert_('CxxExceptionInSetUpTestCaseTest constructor '
>+ 'called as expected.'
>+ in EX_BINARY_OUTPUT)
>+ self.assert_('CxxExceptionInSetUpTestCaseTest destructor '
>+ 'called as expected.'
>+ in EX_BINARY_OUTPUT)
>+ self.assert_('CxxExceptionInSetUpTestCaseTest::SetUp() '
>+ 'called as expected.'
>+ in EX_BINARY_OUTPUT)
>+ self.assert_('CxxExceptionInSetUpTestCaseTest::TearDown() '
>+ 'called as expected.'
>+ in EX_BINARY_OUTPUT)
>+ self.assert_('CxxExceptionInSetUpTestCaseTest test body '
>+ 'called as expected.'
>+ in EX_BINARY_OUTPUT)
>+
>+ def testCatchesCxxExceptionsInTearDownTestCase(self):
>+ self.assert_('C++ exception with description "Standard C++ exception"'
>+ ' thrown in TearDownTestCase()'
>+ in EX_BINARY_OUTPUT)
>+
>+ def testCatchesCxxExceptionsInSetUp(self):
>+ self.assert_('C++ exception with description "Standard C++ exception"'
>+ ' thrown in SetUp()'
>+ in EX_BINARY_OUTPUT)
>+ self.assert_('CxxExceptionInSetUpTest::TearDownTestCase() '
>+ 'called as expected.'
>+ in EX_BINARY_OUTPUT)
>+ self.assert_('CxxExceptionInSetUpTest destructor '
>+ 'called as expected.'
>+ in EX_BINARY_OUTPUT)
>+ self.assert_('CxxExceptionInSetUpTest::TearDown() '
>+ 'called as expected.'
>+ in EX_BINARY_OUTPUT)
>+ self.assert_('unexpected' not in EX_BINARY_OUTPUT,
>+ 'This failure belongs in this test only if '
>+ '"CxxExceptionInSetUpTest" (no quotes) '
>+ 'appears on the same line as words "called unexpectedly"')
>+
>+ def testCatchesCxxExceptionsInTearDown(self):
>+ self.assert_('C++ exception with description "Standard C++ exception"'
>+ ' thrown in TearDown()'
>+ in EX_BINARY_OUTPUT)
>+ self.assert_('CxxExceptionInTearDownTest::TearDownTestCase() '
>+ 'called as expected.'
>+ in EX_BINARY_OUTPUT)
>+ self.assert_('CxxExceptionInTearDownTest destructor '
>+ 'called as expected.'
>+ in EX_BINARY_OUTPUT)
>+
>+ def testCatchesCxxExceptionsInTestBody(self):
>+ self.assert_('C++ exception with description "Standard C++ exception"'
>+ ' thrown in the test body'
>+ in EX_BINARY_OUTPUT)
>+ self.assert_('CxxExceptionInTestBodyTest::TearDownTestCase() '
>+ 'called as expected.'
>+ in EX_BINARY_OUTPUT)
>+ self.assert_('CxxExceptionInTestBodyTest destructor '
>+ 'called as expected.'
>+ in EX_BINARY_OUTPUT)
>+ self.assert_('CxxExceptionInTestBodyTest::TearDown() '
>+ 'called as expected.'
>+ in EX_BINARY_OUTPUT)
>+
>+ def testCatchesNonStdCxxExceptions(self):
>+ self.assert_('Unknown C++ exception thrown in the test body'
>+ in EX_BINARY_OUTPUT)
>+
>+ def testUnhandledCxxExceptionsAbortTheProgram(self):
>+ # Filters out SEH exception tests on Windows. Unhandled SEH exceptions
>+ # cause tests to show pop-up windows there.
>+ FITLER_OUT_SEH_TESTS_FLAG = FILTER_FLAG + '=-*Seh*'
>+ # By default, Google Test doesn't catch the exceptions.
>+ uncaught_exceptions_ex_binary_output = gtest_test_utils.Subprocess(
>+ [EX_EXE_PATH,
>+ NO_CATCH_EXCEPTIONS_FLAG,
>+ FITLER_OUT_SEH_TESTS_FLAG],
>+ env=environ).output
>+
>+ self.assert_('Unhandled C++ exception terminating the program'
>+ in uncaught_exceptions_ex_binary_output)
>+ self.assert_('unexpected' not in uncaught_exceptions_ex_binary_output)
>+
>+
>+if __name__ == '__main__':
>+ gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/googletest-catch-exceptions-test_.cc b/Source/ThirdParty/gtest/test/googletest-catch-exceptions-test_.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..09dae70030a33aeaba060aaef97a979a8f5804ae
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-catch-exceptions-test_.cc
>@@ -0,0 +1,311 @@
>+// Copyright 2010, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+//
>+// Tests for Google Test itself. Tests in this file throw C++ or SEH
>+// exceptions, and the output is verified by
>+// googletest-catch-exceptions-test.py.
>+
>+#include <stdio.h> // NOLINT
>+#include <stdlib.h> // For exit().
>+
>+#include "gtest/gtest.h"
>+
>+#if GTEST_HAS_SEH
>+# include <windows.h>
>+#endif
>+
>+#if GTEST_HAS_EXCEPTIONS
>+# include <exception> // For set_terminate().
>+# include <stdexcept>
>+#endif
>+
>+using testing::Test;
>+
>+#if GTEST_HAS_SEH
>+
>+class SehExceptionInConstructorTest : public Test {
>+ public:
>+ SehExceptionInConstructorTest() { RaiseException(42, 0, 0, NULL); }
>+};
>+
>+TEST_F(SehExceptionInConstructorTest, ThrowsExceptionInConstructor) {}
>+
>+class SehExceptionInDestructorTest : public Test {
>+ public:
>+ ~SehExceptionInDestructorTest() { RaiseException(42, 0, 0, NULL); }
>+};
>+
>+TEST_F(SehExceptionInDestructorTest, ThrowsExceptionInDestructor) {}
>+
>+class SehExceptionInSetUpTestCaseTest : public Test {
>+ public:
>+ static void SetUpTestCase() { RaiseException(42, 0, 0, NULL); }
>+};
>+
>+TEST_F(SehExceptionInSetUpTestCaseTest, ThrowsExceptionInSetUpTestCase) {}
>+
>+class SehExceptionInTearDownTestCaseTest : public Test {
>+ public:
>+ static void TearDownTestCase() { RaiseException(42, 0, 0, NULL); }
>+};
>+
>+TEST_F(SehExceptionInTearDownTestCaseTest, ThrowsExceptionInTearDownTestCase) {}
>+
>+class SehExceptionInSetUpTest : public Test {
>+ protected:
>+ virtual void SetUp() { RaiseException(42, 0, 0, NULL); }
>+};
>+
>+TEST_F(SehExceptionInSetUpTest, ThrowsExceptionInSetUp) {}
>+
>+class SehExceptionInTearDownTest : public Test {
>+ protected:
>+ virtual void TearDown() { RaiseException(42, 0, 0, NULL); }
>+};
>+
>+TEST_F(SehExceptionInTearDownTest, ThrowsExceptionInTearDown) {}
>+
>+TEST(SehExceptionTest, ThrowsSehException) {
>+ RaiseException(42, 0, 0, NULL);
>+}
>+
>+#endif // GTEST_HAS_SEH
>+
>+#if GTEST_HAS_EXCEPTIONS
>+
>+class CxxExceptionInConstructorTest : public Test {
>+ public:
>+ CxxExceptionInConstructorTest() {
>+ // Without this macro VC++ complains about unreachable code at the end of
>+ // the constructor.
>+ GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(
>+ throw std::runtime_error("Standard C++ exception"));
>+ }
>+
>+ static void TearDownTestCase() {
>+ printf("%s",
>+ "CxxExceptionInConstructorTest::TearDownTestCase() "
>+ "called as expected.\n");
>+ }
>+
>+ protected:
>+ ~CxxExceptionInConstructorTest() {
>+ ADD_FAILURE() << "CxxExceptionInConstructorTest destructor "
>+ << "called unexpectedly.";
>+ }
>+
>+ virtual void SetUp() {
>+ ADD_FAILURE() << "CxxExceptionInConstructorTest::SetUp() "
>+ << "called unexpectedly.";
>+ }
>+
>+ virtual void TearDown() {
>+ ADD_FAILURE() << "CxxExceptionInConstructorTest::TearDown() "
>+ << "called unexpectedly.";
>+ }
>+};
>+
>+TEST_F(CxxExceptionInConstructorTest, ThrowsExceptionInConstructor) {
>+ ADD_FAILURE() << "CxxExceptionInConstructorTest test body "
>+ << "called unexpectedly.";
>+}
>+
>+// Exceptions in destructors are not supported in C++11.
>+#if !GTEST_LANG_CXX11
>+class CxxExceptionInDestructorTest : public Test {
>+ public:
>+ static void TearDownTestCase() {
>+ printf("%s",
>+ "CxxExceptionInDestructorTest::TearDownTestCase() "
>+ "called as expected.\n");
>+ }
>+
>+ protected:
>+ ~CxxExceptionInDestructorTest() {
>+ GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(
>+ throw std::runtime_error("Standard C++ exception"));
>+ }
>+};
>+
>+TEST_F(CxxExceptionInDestructorTest, ThrowsExceptionInDestructor) {}
>+#endif // C++11 mode
>+
>+class CxxExceptionInSetUpTestCaseTest : public Test {
>+ public:
>+ CxxExceptionInSetUpTestCaseTest() {
>+ printf("%s",
>+ "CxxExceptionInSetUpTestCaseTest constructor "
>+ "called as expected.\n");
>+ }
>+
>+ static void SetUpTestCase() {
>+ throw std::runtime_error("Standard C++ exception");
>+ }
>+
>+ static void TearDownTestCase() {
>+ printf("%s",
>+ "CxxExceptionInSetUpTestCaseTest::TearDownTestCase() "
>+ "called as expected.\n");
>+ }
>+
>+ protected:
>+ ~CxxExceptionInSetUpTestCaseTest() {
>+ printf("%s",
>+ "CxxExceptionInSetUpTestCaseTest destructor "
>+ "called as expected.\n");
>+ }
>+
>+ virtual void SetUp() {
>+ printf("%s",
>+ "CxxExceptionInSetUpTestCaseTest::SetUp() "
>+ "called as expected.\n");
>+ }
>+
>+ virtual void TearDown() {
>+ printf("%s",
>+ "CxxExceptionInSetUpTestCaseTest::TearDown() "
>+ "called as expected.\n");
>+ }
>+};
>+
>+TEST_F(CxxExceptionInSetUpTestCaseTest, ThrowsExceptionInSetUpTestCase) {
>+ printf("%s",
>+ "CxxExceptionInSetUpTestCaseTest test body "
>+ "called as expected.\n");
>+}
>+
>+class CxxExceptionInTearDownTestCaseTest : public Test {
>+ public:
>+ static void TearDownTestCase() {
>+ throw std::runtime_error("Standard C++ exception");
>+ }
>+};
>+
>+TEST_F(CxxExceptionInTearDownTestCaseTest, ThrowsExceptionInTearDownTestCase) {}
>+
>+class CxxExceptionInSetUpTest : public Test {
>+ public:
>+ static void TearDownTestCase() {
>+ printf("%s",
>+ "CxxExceptionInSetUpTest::TearDownTestCase() "
>+ "called as expected.\n");
>+ }
>+
>+ protected:
>+ ~CxxExceptionInSetUpTest() {
>+ printf("%s",
>+ "CxxExceptionInSetUpTest destructor "
>+ "called as expected.\n");
>+ }
>+
>+ virtual void SetUp() { throw std::runtime_error("Standard C++ exception"); }
>+
>+ virtual void TearDown() {
>+ printf("%s",
>+ "CxxExceptionInSetUpTest::TearDown() "
>+ "called as expected.\n");
>+ }
>+};
>+
>+TEST_F(CxxExceptionInSetUpTest, ThrowsExceptionInSetUp) {
>+ ADD_FAILURE() << "CxxExceptionInSetUpTest test body "
>+ << "called unexpectedly.";
>+}
>+
>+class CxxExceptionInTearDownTest : public Test {
>+ public:
>+ static void TearDownTestCase() {
>+ printf("%s",
>+ "CxxExceptionInTearDownTest::TearDownTestCase() "
>+ "called as expected.\n");
>+ }
>+
>+ protected:
>+ ~CxxExceptionInTearDownTest() {
>+ printf("%s",
>+ "CxxExceptionInTearDownTest destructor "
>+ "called as expected.\n");
>+ }
>+
>+ virtual void TearDown() {
>+ throw std::runtime_error("Standard C++ exception");
>+ }
>+};
>+
>+TEST_F(CxxExceptionInTearDownTest, ThrowsExceptionInTearDown) {}
>+
>+class CxxExceptionInTestBodyTest : public Test {
>+ public:
>+ static void TearDownTestCase() {
>+ printf("%s",
>+ "CxxExceptionInTestBodyTest::TearDownTestCase() "
>+ "called as expected.\n");
>+ }
>+
>+ protected:
>+ ~CxxExceptionInTestBodyTest() {
>+ printf("%s",
>+ "CxxExceptionInTestBodyTest destructor "
>+ "called as expected.\n");
>+ }
>+
>+ virtual void TearDown() {
>+ printf("%s",
>+ "CxxExceptionInTestBodyTest::TearDown() "
>+ "called as expected.\n");
>+ }
>+};
>+
>+TEST_F(CxxExceptionInTestBodyTest, ThrowsStdCxxException) {
>+ throw std::runtime_error("Standard C++ exception");
>+}
>+
>+TEST(CxxExceptionTest, ThrowsNonStdCxxException) {
>+ throw "C-string";
>+}
>+
>+// This terminate handler aborts the program using exit() rather than abort().
>+// This avoids showing pop-ups on Windows systems and core dumps on Unix-like
>+// ones.
>+void TerminateHandler() {
>+ fprintf(stderr, "%s\n", "Unhandled C++ exception terminating the program.");
>+ fflush(NULL);
>+ exit(3);
>+}
>+
>+#endif // GTEST_HAS_EXCEPTIONS
>+
>+int main(int argc, char** argv) {
>+#if GTEST_HAS_EXCEPTIONS
>+ std::set_terminate(&TerminateHandler);
>+#endif
>+ testing::InitGoogleTest(&argc, argv);
>+ return RUN_ALL_TESTS();
>+}
>diff --git a/Source/ThirdParty/gtest/test/googletest-color-test.py b/Source/ThirdParty/gtest/test/googletest-color-test.py
>new file mode 100755
>index 0000000000000000000000000000000000000000..f3b7c9990bcf44a65036c253e7a01845af9c3717
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-color-test.py
>@@ -0,0 +1,127 @@
>+#!/usr/bin/env python
>+#
>+# Copyright 2008, Google Inc.
>+# All rights reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+"""Verifies that Google Test correctly determines whether to use colors."""
>+
>+import os
>+import gtest_test_utils
>+
>+IS_WINDOWS = os.name == 'nt'
>+
>+COLOR_ENV_VAR = 'GTEST_COLOR'
>+COLOR_FLAG = 'gtest_color'
>+COMMAND = gtest_test_utils.GetTestExecutablePath('googletest-color-test_')
>+
>+
>+def SetEnvVar(env_var, value):
>+ """Sets the env variable to 'value'; unsets it when 'value' is None."""
>+
>+ if value is not None:
>+ os.environ[env_var] = value
>+ elif env_var in os.environ:
>+ del os.environ[env_var]
>+
>+
>+def UsesColor(term, color_env_var, color_flag):
>+ """Runs googletest-color-test_ and returns its exit code."""
>+
>+ SetEnvVar('TERM', term)
>+ SetEnvVar(COLOR_ENV_VAR, color_env_var)
>+
>+ if color_flag is None:
>+ args = []
>+ else:
>+ args = ['--%s=%s' % (COLOR_FLAG, color_flag)]
>+ p = gtest_test_utils.Subprocess([COMMAND] + args)
>+ return not p.exited or p.exit_code
>+
>+
>+class GTestColorTest(gtest_test_utils.TestCase):
>+ def testNoEnvVarNoFlag(self):
>+ """Tests the case when there's neither GTEST_COLOR nor --gtest_color."""
>+
>+ if not IS_WINDOWS:
>+ self.assert_(not UsesColor('dumb', None, None))
>+ self.assert_(not UsesColor('emacs', None, None))
>+ self.assert_(not UsesColor('xterm-mono', None, None))
>+ self.assert_(not UsesColor('unknown', None, None))
>+ self.assert_(not UsesColor(None, None, None))
>+ self.assert_(UsesColor('linux', None, None))
>+ self.assert_(UsesColor('cygwin', None, None))
>+ self.assert_(UsesColor('xterm', None, None))
>+ self.assert_(UsesColor('xterm-color', None, None))
>+ self.assert_(UsesColor('xterm-256color', None, None))
>+
>+ def testFlagOnly(self):
>+ """Tests the case when there's --gtest_color but not GTEST_COLOR."""
>+
>+ self.assert_(not UsesColor('dumb', None, 'no'))
>+ self.assert_(not UsesColor('xterm-color', None, 'no'))
>+ if not IS_WINDOWS:
>+ self.assert_(not UsesColor('emacs', None, 'auto'))
>+ self.assert_(UsesColor('xterm', None, 'auto'))
>+ self.assert_(UsesColor('dumb', None, 'yes'))
>+ self.assert_(UsesColor('xterm', None, 'yes'))
>+
>+ def testEnvVarOnly(self):
>+ """Tests the case when there's GTEST_COLOR but not --gtest_color."""
>+
>+ self.assert_(not UsesColor('dumb', 'no', None))
>+ self.assert_(not UsesColor('xterm-color', 'no', None))
>+ if not IS_WINDOWS:
>+ self.assert_(not UsesColor('dumb', 'auto', None))
>+ self.assert_(UsesColor('xterm-color', 'auto', None))
>+ self.assert_(UsesColor('dumb', 'yes', None))
>+ self.assert_(UsesColor('xterm-color', 'yes', None))
>+
>+ def testEnvVarAndFlag(self):
>+ """Tests the case when there are both GTEST_COLOR and --gtest_color."""
>+
>+ self.assert_(not UsesColor('xterm-color', 'no', 'no'))
>+ self.assert_(UsesColor('dumb', 'no', 'yes'))
>+ self.assert_(UsesColor('xterm-color', 'no', 'auto'))
>+
>+ def testAliasesOfYesAndNo(self):
>+ """Tests using aliases in specifying --gtest_color."""
>+
>+ self.assert_(UsesColor('dumb', None, 'true'))
>+ self.assert_(UsesColor('dumb', None, 'YES'))
>+ self.assert_(UsesColor('dumb', None, 'T'))
>+ self.assert_(UsesColor('dumb', None, '1'))
>+
>+ self.assert_(not UsesColor('xterm', None, 'f'))
>+ self.assert_(not UsesColor('xterm', None, 'false'))
>+ self.assert_(not UsesColor('xterm', None, '0'))
>+ self.assert_(not UsesColor('xterm', None, 'unknown'))
>+
>+
>+if __name__ == '__main__':
>+ gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/googletest-color-test_.cc b/Source/ThirdParty/gtest/test/googletest-color-test_.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..220a3a00548fdb1e935a3da16df563a50e179a8a
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-color-test_.cc
>@@ -0,0 +1,62 @@
>+// Copyright 2008, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+
>+// A helper program for testing how Google Test determines whether to use
>+// colors in the output. It prints "YES" and returns 1 if Google Test
>+// decides to use colors, and prints "NO" and returns 0 otherwise.
>+
>+#include <stdio.h>
>+
>+#include "gtest/gtest.h"
>+#include "src/gtest-internal-inl.h"
>+
>+using testing::internal::ShouldUseColor;
>+
>+// The purpose of this is to ensure that the UnitTest singleton is
>+// created before main() is entered, and thus that ShouldUseColor()
>+// works the same way as in a real Google-Test-based test. We don't actual
>+// run the TEST itself.
>+TEST(GTestColorTest, Dummy) {
>+}
>+
>+int main(int argc, char** argv) {
>+ testing::InitGoogleTest(&argc, argv);
>+
>+ if (ShouldUseColor(true)) {
>+ // Google Test decides to use colors in the output (assuming it
>+ // goes to a TTY).
>+ printf("YES\n");
>+ return 1;
>+ } else {
>+ // Google Test decides not to use colors in the output.
>+ printf("NO\n");
>+ return 0;
>+ }
>+}
>diff --git a/Source/ThirdParty/gtest/test/googletest-death-test-test.cc b/Source/ThirdParty/gtest/test/googletest-death-test-test.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..c0c3026fb5895660ad2c9d65fbd99b5faf9ad48c
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-death-test-test.cc
>@@ -0,0 +1,1423 @@
>+// Copyright 2005, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+//
>+// Tests for death tests.
>+
>+#include "gtest/gtest-death-test.h"
>+#include "gtest/gtest.h"
>+#include "gtest/internal/gtest-filepath.h"
>+
>+using testing::internal::AlwaysFalse;
>+using testing::internal::AlwaysTrue;
>+
>+#if GTEST_HAS_DEATH_TEST
>+
>+# if GTEST_OS_WINDOWS
>+# include <direct.h> // For chdir().
>+# else
>+# include <unistd.h>
>+# include <sys/wait.h> // For waitpid.
>+# endif // GTEST_OS_WINDOWS
>+
>+# include <limits.h>
>+# include <signal.h>
>+# include <stdio.h>
>+
>+# if GTEST_OS_LINUX
>+# include <sys/time.h>
>+# endif // GTEST_OS_LINUX
>+
>+# include "gtest/gtest-spi.h"
>+# include "src/gtest-internal-inl.h"
>+
>+namespace posix = ::testing::internal::posix;
>+
>+using testing::Message;
>+using testing::internal::DeathTest;
>+using testing::internal::DeathTestFactory;
>+using testing::internal::FilePath;
>+using testing::internal::GetLastErrnoDescription;
>+using testing::internal::GetUnitTestImpl;
>+using testing::internal::InDeathTestChild;
>+using testing::internal::ParseNaturalNumber;
>+
>+namespace testing {
>+namespace internal {
>+
>+// A helper class whose objects replace the death test factory for a
>+// single UnitTest object during their lifetimes.
>+class ReplaceDeathTestFactory {
>+ public:
>+ explicit ReplaceDeathTestFactory(DeathTestFactory* new_factory)
>+ : unit_test_impl_(GetUnitTestImpl()) {
>+ old_factory_ = unit_test_impl_->death_test_factory_.release();
>+ unit_test_impl_->death_test_factory_.reset(new_factory);
>+ }
>+
>+ ~ReplaceDeathTestFactory() {
>+ unit_test_impl_->death_test_factory_.release();
>+ unit_test_impl_->death_test_factory_.reset(old_factory_);
>+ }
>+ private:
>+ // Prevents copying ReplaceDeathTestFactory objects.
>+ ReplaceDeathTestFactory(const ReplaceDeathTestFactory&);
>+ void operator=(const ReplaceDeathTestFactory&);
>+
>+ UnitTestImpl* unit_test_impl_;
>+ DeathTestFactory* old_factory_;
>+};
>+
>+} // namespace internal
>+} // namespace testing
>+
>+void DieWithMessage(const ::std::string& message) {
>+ fprintf(stderr, "%s", message.c_str());
>+ fflush(stderr); // Make sure the text is printed before the process exits.
>+
>+ // We call _exit() instead of exit(), as the former is a direct
>+ // system call and thus safer in the presence of threads. exit()
>+ // will invoke user-defined exit-hooks, which may do dangerous
>+ // things that conflict with death tests.
>+ //
>+ // Some compilers can recognize that _exit() never returns and issue the
>+ // 'unreachable code' warning for code following this function, unless
>+ // fooled by a fake condition.
>+ if (AlwaysTrue())
>+ _exit(1);
>+}
>+
>+void DieInside(const ::std::string& function) {
>+ DieWithMessage("death inside " + function + "().");
>+}
>+
>+// Tests that death tests work.
>+
>+class TestForDeathTest : public testing::Test {
>+ protected:
>+ TestForDeathTest() : original_dir_(FilePath::GetCurrentDir()) {}
>+
>+ virtual ~TestForDeathTest() {
>+ posix::ChDir(original_dir_.c_str());
>+ }
>+
>+ // A static member function that's expected to die.
>+ static void StaticMemberFunction() { DieInside("StaticMemberFunction"); }
>+
>+ // A method of the test fixture that may die.
>+ void MemberFunction() {
>+ if (should_die_)
>+ DieInside("MemberFunction");
>+ }
>+
>+ // True iff MemberFunction() should die.
>+ bool should_die_;
>+ const FilePath original_dir_;
>+};
>+
>+// A class with a member function that may die.
>+class MayDie {
>+ public:
>+ explicit MayDie(bool should_die) : should_die_(should_die) {}
>+
>+ // A member function that may die.
>+ void MemberFunction() const {
>+ if (should_die_)
>+ DieInside("MayDie::MemberFunction");
>+ }
>+
>+ private:
>+ // True iff MemberFunction() should die.
>+ bool should_die_;
>+};
>+
>+// A global function that's expected to die.
>+void GlobalFunction() { DieInside("GlobalFunction"); }
>+
>+// A non-void function that's expected to die.
>+int NonVoidFunction() {
>+ DieInside("NonVoidFunction");
>+ return 1;
>+}
>+
>+// A unary function that may die.
>+void DieIf(bool should_die) {
>+ if (should_die)
>+ DieInside("DieIf");
>+}
>+
>+// A binary function that may die.
>+bool DieIfLessThan(int x, int y) {
>+ if (x < y) {
>+ DieInside("DieIfLessThan");
>+ }
>+ return true;
>+}
>+
>+// Tests that ASSERT_DEATH can be used outside a TEST, TEST_F, or test fixture.
>+void DeathTestSubroutine() {
>+ EXPECT_DEATH(GlobalFunction(), "death.*GlobalFunction");
>+ ASSERT_DEATH(GlobalFunction(), "death.*GlobalFunction");
>+}
>+
>+// Death in dbg, not opt.
>+int DieInDebugElse12(int* sideeffect) {
>+ if (sideeffect) *sideeffect = 12;
>+
>+# ifndef NDEBUG
>+
>+ DieInside("DieInDebugElse12");
>+
>+# endif // NDEBUG
>+
>+ return 12;
>+}
>+
>+# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
>+
>+// Tests the ExitedWithCode predicate.
>+TEST(ExitStatusPredicateTest, ExitedWithCode) {
>+ // On Windows, the process's exit code is the same as its exit status,
>+ // so the predicate just compares the its input with its parameter.
>+ EXPECT_TRUE(testing::ExitedWithCode(0)(0));
>+ EXPECT_TRUE(testing::ExitedWithCode(1)(1));
>+ EXPECT_TRUE(testing::ExitedWithCode(42)(42));
>+ EXPECT_FALSE(testing::ExitedWithCode(0)(1));
>+ EXPECT_FALSE(testing::ExitedWithCode(1)(0));
>+}
>+
>+# else
>+
>+// Returns the exit status of a process that calls _exit(2) with a
>+// given exit code. This is a helper function for the
>+// ExitStatusPredicateTest test suite.
>+static int NormalExitStatus(int exit_code) {
>+ pid_t child_pid = fork();
>+ if (child_pid == 0) {
>+ _exit(exit_code);
>+ }
>+ int status;
>+ waitpid(child_pid, &status, 0);
>+ return status;
>+}
>+
>+// Returns the exit status of a process that raises a given signal.
>+// If the signal does not cause the process to die, then it returns
>+// instead the exit status of a process that exits normally with exit
>+// code 1. This is a helper function for the ExitStatusPredicateTest
>+// test suite.
>+static int KilledExitStatus(int signum) {
>+ pid_t child_pid = fork();
>+ if (child_pid == 0) {
>+ raise(signum);
>+ _exit(1);
>+ }
>+ int status;
>+ waitpid(child_pid, &status, 0);
>+ return status;
>+}
>+
>+// Tests the ExitedWithCode predicate.
>+TEST(ExitStatusPredicateTest, ExitedWithCode) {
>+ const int status0 = NormalExitStatus(0);
>+ const int status1 = NormalExitStatus(1);
>+ const int status42 = NormalExitStatus(42);
>+ const testing::ExitedWithCode pred0(0);
>+ const testing::ExitedWithCode pred1(1);
>+ const testing::ExitedWithCode pred42(42);
>+ EXPECT_PRED1(pred0, status0);
>+ EXPECT_PRED1(pred1, status1);
>+ EXPECT_PRED1(pred42, status42);
>+ EXPECT_FALSE(pred0(status1));
>+ EXPECT_FALSE(pred42(status0));
>+ EXPECT_FALSE(pred1(status42));
>+}
>+
>+// Tests the KilledBySignal predicate.
>+TEST(ExitStatusPredicateTest, KilledBySignal) {
>+ const int status_segv = KilledExitStatus(SIGSEGV);
>+ const int status_kill = KilledExitStatus(SIGKILL);
>+ const testing::KilledBySignal pred_segv(SIGSEGV);
>+ const testing::KilledBySignal pred_kill(SIGKILL);
>+ EXPECT_PRED1(pred_segv, status_segv);
>+ EXPECT_PRED1(pred_kill, status_kill);
>+ EXPECT_FALSE(pred_segv(status_kill));
>+ EXPECT_FALSE(pred_kill(status_segv));
>+}
>+
>+# endif // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA
>+
>+// Tests that the death test macros expand to code which may or may not
>+// be followed by operator<<, and that in either case the complete text
>+// comprises only a single C++ statement.
>+TEST_F(TestForDeathTest, SingleStatement) {
>+ if (AlwaysFalse())
>+ // This would fail if executed; this is a compilation test only
>+ ASSERT_DEATH(return, "");
>+
>+ if (AlwaysTrue())
>+ EXPECT_DEATH(_exit(1), "");
>+ else
>+ // This empty "else" branch is meant to ensure that EXPECT_DEATH
>+ // doesn't expand into an "if" statement without an "else"
>+ ;
>+
>+ if (AlwaysFalse())
>+ ASSERT_DEATH(return, "") << "did not die";
>+
>+ if (AlwaysFalse())
>+ ;
>+ else
>+ EXPECT_DEATH(_exit(1), "") << 1 << 2 << 3;
>+}
>+
>+void DieWithEmbeddedNul() {
>+ fprintf(stderr, "Hello%cmy null world.\n", '\0');
>+ fflush(stderr);
>+ _exit(1);
>+}
>+
>+# if GTEST_USES_PCRE
>+
>+// Tests that EXPECT_DEATH and ASSERT_DEATH work when the error
>+// message has a NUL character in it.
>+TEST_F(TestForDeathTest, EmbeddedNulInMessage) {
>+ EXPECT_DEATH(DieWithEmbeddedNul(), "my null world");
>+ ASSERT_DEATH(DieWithEmbeddedNul(), "my null world");
>+}
>+
>+# endif // GTEST_USES_PCRE
>+
>+// Tests that death test macros expand to code which interacts well with switch
>+// statements.
>+TEST_F(TestForDeathTest, SwitchStatement) {
>+ // Microsoft compiler usually complains about switch statements without
>+ // case labels. We suppress that warning for this test.
>+ GTEST_DISABLE_MSC_WARNINGS_PUSH_(4065)
>+
>+ switch (0)
>+ default:
>+ ASSERT_DEATH(_exit(1), "") << "exit in default switch handler";
>+
>+ switch (0)
>+ case 0:
>+ EXPECT_DEATH(_exit(1), "") << "exit in switch case";
>+
>+ GTEST_DISABLE_MSC_WARNINGS_POP_()
>+}
>+
>+// Tests that a static member function can be used in a "fast" style
>+// death test.
>+TEST_F(TestForDeathTest, StaticMemberFunctionFastStyle) {
>+ testing::GTEST_FLAG(death_test_style) = "fast";
>+ ASSERT_DEATH(StaticMemberFunction(), "death.*StaticMember");
>+}
>+
>+// Tests that a method of the test fixture can be used in a "fast"
>+// style death test.
>+TEST_F(TestForDeathTest, MemberFunctionFastStyle) {
>+ testing::GTEST_FLAG(death_test_style) = "fast";
>+ should_die_ = true;
>+ EXPECT_DEATH(MemberFunction(), "inside.*MemberFunction");
>+}
>+
>+void ChangeToRootDir() { posix::ChDir(GTEST_PATH_SEP_); }
>+
>+// Tests that death tests work even if the current directory has been
>+// changed.
>+TEST_F(TestForDeathTest, FastDeathTestInChangedDir) {
>+ testing::GTEST_FLAG(death_test_style) = "fast";
>+
>+ ChangeToRootDir();
>+ EXPECT_EXIT(_exit(1), testing::ExitedWithCode(1), "");
>+
>+ ChangeToRootDir();
>+ ASSERT_DEATH(_exit(1), "");
>+}
>+
>+# if GTEST_OS_LINUX
>+void SigprofAction(int, siginfo_t*, void*) { /* no op */ }
>+
>+// Sets SIGPROF action and ITIMER_PROF timer (interval: 1ms).
>+void SetSigprofActionAndTimer() {
>+ struct itimerval timer;
>+ timer.it_interval.tv_sec = 0;
>+ timer.it_interval.tv_usec = 1;
>+ timer.it_value = timer.it_interval;
>+ ASSERT_EQ(0, setitimer(ITIMER_PROF, &timer, NULL));
>+ struct sigaction signal_action;
>+ memset(&signal_action, 0, sizeof(signal_action));
>+ sigemptyset(&signal_action.sa_mask);
>+ signal_action.sa_sigaction = SigprofAction;
>+ signal_action.sa_flags = SA_RESTART | SA_SIGINFO;
>+ ASSERT_EQ(0, sigaction(SIGPROF, &signal_action, NULL));
>+}
>+
>+// Disables ITIMER_PROF timer and ignores SIGPROF signal.
>+void DisableSigprofActionAndTimer(struct sigaction* old_signal_action) {
>+ struct itimerval timer;
>+ timer.it_interval.tv_sec = 0;
>+ timer.it_interval.tv_usec = 0;
>+ timer.it_value = timer.it_interval;
>+ ASSERT_EQ(0, setitimer(ITIMER_PROF, &timer, NULL));
>+ struct sigaction signal_action;
>+ memset(&signal_action, 0, sizeof(signal_action));
>+ sigemptyset(&signal_action.sa_mask);
>+ signal_action.sa_handler = SIG_IGN;
>+ ASSERT_EQ(0, sigaction(SIGPROF, &signal_action, old_signal_action));
>+}
>+
>+// Tests that death tests work when SIGPROF handler and timer are set.
>+TEST_F(TestForDeathTest, FastSigprofActionSet) {
>+ testing::GTEST_FLAG(death_test_style) = "fast";
>+ SetSigprofActionAndTimer();
>+ EXPECT_DEATH(_exit(1), "");
>+ struct sigaction old_signal_action;
>+ DisableSigprofActionAndTimer(&old_signal_action);
>+ EXPECT_TRUE(old_signal_action.sa_sigaction == SigprofAction);
>+}
>+
>+TEST_F(TestForDeathTest, ThreadSafeSigprofActionSet) {
>+ testing::GTEST_FLAG(death_test_style) = "threadsafe";
>+ SetSigprofActionAndTimer();
>+ EXPECT_DEATH(_exit(1), "");
>+ struct sigaction old_signal_action;
>+ DisableSigprofActionAndTimer(&old_signal_action);
>+ EXPECT_TRUE(old_signal_action.sa_sigaction == SigprofAction);
>+}
>+# endif // GTEST_OS_LINUX
>+
>+// Repeats a representative sample of death tests in the "threadsafe" style:
>+
>+TEST_F(TestForDeathTest, StaticMemberFunctionThreadsafeStyle) {
>+ testing::GTEST_FLAG(death_test_style) = "threadsafe";
>+ ASSERT_DEATH(StaticMemberFunction(), "death.*StaticMember");
>+}
>+
>+TEST_F(TestForDeathTest, MemberFunctionThreadsafeStyle) {
>+ testing::GTEST_FLAG(death_test_style) = "threadsafe";
>+ should_die_ = true;
>+ EXPECT_DEATH(MemberFunction(), "inside.*MemberFunction");
>+}
>+
>+TEST_F(TestForDeathTest, ThreadsafeDeathTestInLoop) {
>+ testing::GTEST_FLAG(death_test_style) = "threadsafe";
>+
>+ for (int i = 0; i < 3; ++i)
>+ EXPECT_EXIT(_exit(i), testing::ExitedWithCode(i), "") << ": i = " << i;
>+}
>+
>+TEST_F(TestForDeathTest, ThreadsafeDeathTestInChangedDir) {
>+ testing::GTEST_FLAG(death_test_style) = "threadsafe";
>+
>+ ChangeToRootDir();
>+ EXPECT_EXIT(_exit(1), testing::ExitedWithCode(1), "");
>+
>+ ChangeToRootDir();
>+ ASSERT_DEATH(_exit(1), "");
>+}
>+
>+TEST_F(TestForDeathTest, MixedStyles) {
>+ testing::GTEST_FLAG(death_test_style) = "threadsafe";
>+ EXPECT_DEATH(_exit(1), "");
>+ testing::GTEST_FLAG(death_test_style) = "fast";
>+ EXPECT_DEATH(_exit(1), "");
>+}
>+
>+# if GTEST_HAS_CLONE && GTEST_HAS_PTHREAD
>+
>+namespace {
>+
>+bool pthread_flag;
>+
>+void SetPthreadFlag() {
>+ pthread_flag = true;
>+}
>+
>+} // namespace
>+
>+TEST_F(TestForDeathTest, DoesNotExecuteAtforkHooks) {
>+ if (!testing::GTEST_FLAG(death_test_use_fork)) {
>+ testing::GTEST_FLAG(death_test_style) = "threadsafe";
>+ pthread_flag = false;
>+ ASSERT_EQ(0, pthread_atfork(&SetPthreadFlag, NULL, NULL));
>+ ASSERT_DEATH(_exit(1), "");
>+ ASSERT_FALSE(pthread_flag);
>+ }
>+}
>+
>+# endif // GTEST_HAS_CLONE && GTEST_HAS_PTHREAD
>+
>+// Tests that a method of another class can be used in a death test.
>+TEST_F(TestForDeathTest, MethodOfAnotherClass) {
>+ const MayDie x(true);
>+ ASSERT_DEATH(x.MemberFunction(), "MayDie\\:\\:MemberFunction");
>+}
>+
>+// Tests that a global function can be used in a death test.
>+TEST_F(TestForDeathTest, GlobalFunction) {
>+ EXPECT_DEATH(GlobalFunction(), "GlobalFunction");
>+}
>+
>+// Tests that any value convertible to an RE works as a second
>+// argument to EXPECT_DEATH.
>+TEST_F(TestForDeathTest, AcceptsAnythingConvertibleToRE) {
>+ static const char regex_c_str[] = "GlobalFunction";
>+ EXPECT_DEATH(GlobalFunction(), regex_c_str);
>+
>+ const testing::internal::RE regex(regex_c_str);
>+ EXPECT_DEATH(GlobalFunction(), regex);
>+
>+# if GTEST_HAS_GLOBAL_STRING
>+
>+ const ::string regex_str(regex_c_str);
>+ EXPECT_DEATH(GlobalFunction(), regex_str);
>+
>+# endif // GTEST_HAS_GLOBAL_STRING
>+
>+# if !GTEST_USES_PCRE
>+
>+ const ::std::string regex_std_str(regex_c_str);
>+ EXPECT_DEATH(GlobalFunction(), regex_std_str);
>+
>+# endif // !GTEST_USES_PCRE
>+}
>+
>+// Tests that a non-void function can be used in a death test.
>+TEST_F(TestForDeathTest, NonVoidFunction) {
>+ ASSERT_DEATH(NonVoidFunction(), "NonVoidFunction");
>+}
>+
>+// Tests that functions that take parameter(s) can be used in a death test.
>+TEST_F(TestForDeathTest, FunctionWithParameter) {
>+ EXPECT_DEATH(DieIf(true), "DieIf\$\$");
>+ EXPECT_DEATH(DieIfLessThan(2, 3), "DieIfLessThan");
>+}
>+
>+// Tests that ASSERT_DEATH can be used outside a TEST, TEST_F, or test fixture.
>+TEST_F(TestForDeathTest, OutsideFixture) {
>+ DeathTestSubroutine();
>+}
>+
>+// Tests that death tests can be done inside a loop.
>+TEST_F(TestForDeathTest, InsideLoop) {
>+ for (int i = 0; i < 5; i++) {
>+ EXPECT_DEATH(DieIfLessThan(-1, i), "DieIfLessThan") << "where i == " << i;
>+ }
>+}
>+
>+// Tests that a compound statement can be used in a death test.
>+TEST_F(TestForDeathTest, CompoundStatement) {
>+ EXPECT_DEATH({ // NOLINT
>+ const int x = 2;
>+ const int y = x + 1;
>+ DieIfLessThan(x, y);
>+ },
>+ "DieIfLessThan");
>+}
>+
>+// Tests that code that doesn't die causes a death test to fail.
>+TEST_F(TestForDeathTest, DoesNotDie) {
>+ EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(DieIf(false), "DieIf"),
>+ "failed to die");
>+}
>+
>+// Tests that a death test fails when the error message isn't expected.
>+TEST_F(TestForDeathTest, ErrorMessageMismatch) {
>+ EXPECT_NONFATAL_FAILURE({ // NOLINT
>+ EXPECT_DEATH(DieIf(true), "DieIfLessThan") << "End of death test message.";
>+ }, "died but not with expected error");
>+}
>+
>+// On exit, *aborted will be true iff the EXPECT_DEATH() statement
>+// aborted the function.
>+void ExpectDeathTestHelper(bool* aborted) {
>+ *aborted = true;
>+ EXPECT_DEATH(DieIf(false), "DieIf"); // This assertion should fail.
>+ *aborted = false;
>+}
>+
>+// Tests that EXPECT_DEATH doesn't abort the test on failure.
>+TEST_F(TestForDeathTest, EXPECT_DEATH) {
>+ bool aborted = true;
>+ EXPECT_NONFATAL_FAILURE(ExpectDeathTestHelper(&aborted),
>+ "failed to die");
>+ EXPECT_FALSE(aborted);
>+}
>+
>+// Tests that ASSERT_DEATH does abort the test on failure.
>+TEST_F(TestForDeathTest, ASSERT_DEATH) {
>+ static bool aborted;
>+ EXPECT_FATAL_FAILURE({ // NOLINT
>+ aborted = true;
>+ ASSERT_DEATH(DieIf(false), "DieIf"); // This assertion should fail.
>+ aborted = false;
>+ }, "failed to die");
>+ EXPECT_TRUE(aborted);
>+}
>+
>+// Tests that EXPECT_DEATH evaluates the arguments exactly once.
>+TEST_F(TestForDeathTest, SingleEvaluation) {
>+ int x = 3;
>+ EXPECT_DEATH(DieIf((++x) == 4), "DieIf");
>+
>+ const char* regex = "DieIf";
>+ const char* regex_save = regex;
>+ EXPECT_DEATH(DieIfLessThan(3, 4), regex++);
>+ EXPECT_EQ(regex_save + 1, regex);
>+}
>+
>+// Tests that run-away death tests are reported as failures.
>+TEST_F(TestForDeathTest, RunawayIsFailure) {
>+ EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(static_cast<void>(0), "Foo"),
>+ "failed to die.");
>+}
>+
>+// Tests that death tests report executing 'return' in the statement as
>+// failure.
>+TEST_F(TestForDeathTest, ReturnIsFailure) {
>+ EXPECT_FATAL_FAILURE(ASSERT_DEATH(return, "Bar"),
>+ "illegal return in test statement.");
>+}
>+
>+// Tests that EXPECT_DEBUG_DEATH works as expected, that is, you can stream a
>+// message to it, and in debug mode it:
>+// 1. Asserts on death.
>+// 2. Has no side effect.
>+//
>+// And in opt mode, it:
>+// 1. Has side effects but does not assert.
>+TEST_F(TestForDeathTest, TestExpectDebugDeath) {
>+ int sideeffect = 0;
>+
>+ // Put the regex in a local variable to make sure we don't get an "unused"
>+ // warning in opt mode.
>+ const char* regex = "death.*DieInDebugElse12";
>+
>+ EXPECT_DEBUG_DEATH(DieInDebugElse12(&sideeffect), regex)
>+ << "Must accept a streamed message";
>+
>+# ifdef NDEBUG
>+
>+ // Checks that the assignment occurs in opt mode (sideeffect).
>+ EXPECT_EQ(12, sideeffect);
>+
>+# else
>+
>+ // Checks that the assignment does not occur in dbg mode (no sideeffect).
>+ EXPECT_EQ(0, sideeffect);
>+
>+# endif
>+}
>+
>+// Tests that ASSERT_DEBUG_DEATH works as expected, that is, you can stream a
>+// message to it, and in debug mode it:
>+// 1. Asserts on death.
>+// 2. Has no side effect.
>+//
>+// And in opt mode, it:
>+// 1. Has side effects but does not assert.
>+TEST_F(TestForDeathTest, TestAssertDebugDeath) {
>+ int sideeffect = 0;
>+
>+ ASSERT_DEBUG_DEATH(DieInDebugElse12(&sideeffect), "death.*DieInDebugElse12")
>+ << "Must accept a streamed message";
>+
>+# ifdef NDEBUG
>+
>+ // Checks that the assignment occurs in opt mode (sideeffect).
>+ EXPECT_EQ(12, sideeffect);
>+
>+# else
>+
>+ // Checks that the assignment does not occur in dbg mode (no sideeffect).
>+ EXPECT_EQ(0, sideeffect);
>+
>+# endif
>+}
>+
>+# ifndef NDEBUG
>+
>+void ExpectDebugDeathHelper(bool* aborted) {
>+ *aborted = true;
>+ EXPECT_DEBUG_DEATH(return, "") << "This is expected to fail.";
>+ *aborted = false;
>+}
>+
>+# if GTEST_OS_WINDOWS
>+TEST(PopUpDeathTest, DoesNotShowPopUpOnAbort) {
>+ printf("This test should be considered failing if it shows "
>+ "any pop-up dialogs.\n");
>+ fflush(stdout);
>+
>+ EXPECT_DEATH({
>+ testing::GTEST_FLAG(catch_exceptions) = false;
>+ abort();
>+ }, "");
>+}
>+# endif // GTEST_OS_WINDOWS
>+
>+// Tests that EXPECT_DEBUG_DEATH in debug mode does not abort
>+// the function.
>+TEST_F(TestForDeathTest, ExpectDebugDeathDoesNotAbort) {
>+ bool aborted = true;
>+ EXPECT_NONFATAL_FAILURE(ExpectDebugDeathHelper(&aborted), "");
>+ EXPECT_FALSE(aborted);
>+}
>+
>+void AssertDebugDeathHelper(bool* aborted) {
>+ *aborted = true;
>+ GTEST_LOG_(INFO) << "Before ASSERT_DEBUG_DEATH";
>+ ASSERT_DEBUG_DEATH(GTEST_LOG_(INFO) << "In ASSERT_DEBUG_DEATH"; return, "")
>+ << "This is expected to fail.";
>+ GTEST_LOG_(INFO) << "After ASSERT_DEBUG_DEATH";
>+ *aborted = false;
>+}
>+
>+// Tests that ASSERT_DEBUG_DEATH in debug mode aborts the function on
>+// failure.
>+TEST_F(TestForDeathTest, AssertDebugDeathAborts) {
>+ static bool aborted;
>+ aborted = false;
>+ EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
>+ EXPECT_TRUE(aborted);
>+}
>+
>+TEST_F(TestForDeathTest, AssertDebugDeathAborts2) {
>+ static bool aborted;
>+ aborted = false;
>+ EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
>+ EXPECT_TRUE(aborted);
>+}
>+
>+TEST_F(TestForDeathTest, AssertDebugDeathAborts3) {
>+ static bool aborted;
>+ aborted = false;
>+ EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
>+ EXPECT_TRUE(aborted);
>+}
>+
>+TEST_F(TestForDeathTest, AssertDebugDeathAborts4) {
>+ static bool aborted;
>+ aborted = false;
>+ EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
>+ EXPECT_TRUE(aborted);
>+}
>+
>+TEST_F(TestForDeathTest, AssertDebugDeathAborts5) {
>+ static bool aborted;
>+ aborted = false;
>+ EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
>+ EXPECT_TRUE(aborted);
>+}
>+
>+TEST_F(TestForDeathTest, AssertDebugDeathAborts6) {
>+ static bool aborted;
>+ aborted = false;
>+ EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
>+ EXPECT_TRUE(aborted);
>+}
>+
>+TEST_F(TestForDeathTest, AssertDebugDeathAborts7) {
>+ static bool aborted;
>+ aborted = false;
>+ EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
>+ EXPECT_TRUE(aborted);
>+}
>+
>+TEST_F(TestForDeathTest, AssertDebugDeathAborts8) {
>+ static bool aborted;
>+ aborted = false;
>+ EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
>+ EXPECT_TRUE(aborted);
>+}
>+
>+TEST_F(TestForDeathTest, AssertDebugDeathAborts9) {
>+ static bool aborted;
>+ aborted = false;
>+ EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
>+ EXPECT_TRUE(aborted);
>+}
>+
>+TEST_F(TestForDeathTest, AssertDebugDeathAborts10) {
>+ static bool aborted;
>+ aborted = false;
>+ EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
>+ EXPECT_TRUE(aborted);
>+}
>+
>+# endif // _NDEBUG
>+
>+// Tests the *_EXIT family of macros, using a variety of predicates.
>+static void TestExitMacros() {
>+ EXPECT_EXIT(_exit(1), testing::ExitedWithCode(1), "");
>+ ASSERT_EXIT(_exit(42), testing::ExitedWithCode(42), "");
>+
>+# if GTEST_OS_WINDOWS
>+
>+ // Of all signals effects on the process exit code, only those of SIGABRT
>+ // are documented on Windows.
>+ // See https://msdn.microsoft.com/en-us/query-bi/m/dwwzkt4c.
>+ EXPECT_EXIT(raise(SIGABRT), testing::ExitedWithCode(3), "") << "b_ar";
>+
>+# elif !GTEST_OS_FUCHSIA
>+
>+ // Fuchsia has no unix signals.
>+ EXPECT_EXIT(raise(SIGKILL), testing::KilledBySignal(SIGKILL), "") << "foo";
>+ ASSERT_EXIT(raise(SIGUSR2), testing::KilledBySignal(SIGUSR2), "") << "bar";
>+
>+ EXPECT_FATAL_FAILURE({ // NOLINT
>+ ASSERT_EXIT(_exit(0), testing::KilledBySignal(SIGSEGV), "")
>+ << "This failure is expected, too.";
>+ }, "This failure is expected, too.");
>+
>+# endif // GTEST_OS_WINDOWS
>+
>+ EXPECT_NONFATAL_FAILURE({ // NOLINT
>+ EXPECT_EXIT(raise(SIGSEGV), testing::ExitedWithCode(0), "")
>+ << "This failure is expected.";
>+ }, "This failure is expected.");
>+}
>+
>+TEST_F(TestForDeathTest, ExitMacros) {
>+ TestExitMacros();
>+}
>+
>+TEST_F(TestForDeathTest, ExitMacrosUsingFork) {
>+ testing::GTEST_FLAG(death_test_use_fork) = true;
>+ TestExitMacros();
>+}
>+
>+TEST_F(TestForDeathTest, InvalidStyle) {
>+ testing::GTEST_FLAG(death_test_style) = "rococo";
>+ EXPECT_NONFATAL_FAILURE({ // NOLINT
>+ EXPECT_DEATH(_exit(0), "") << "This failure is expected.";
>+ }, "This failure is expected.");
>+}
>+
>+TEST_F(TestForDeathTest, DeathTestFailedOutput) {
>+ testing::GTEST_FLAG(death_test_style) = "fast";
>+ EXPECT_NONFATAL_FAILURE(
>+ EXPECT_DEATH(DieWithMessage("death\n"),
>+ "expected message"),
>+ "Actual msg:\n"
>+ "[ DEATH ] death\n");
>+}
>+
>+TEST_F(TestForDeathTest, DeathTestUnexpectedReturnOutput) {
>+ testing::GTEST_FLAG(death_test_style) = "fast";
>+ EXPECT_NONFATAL_FAILURE(
>+ EXPECT_DEATH({
>+ fprintf(stderr, "returning\n");
>+ fflush(stderr);
>+ return;
>+ }, ""),
>+ " Result: illegal return in test statement.\n"
>+ " Error msg:\n"
>+ "[ DEATH ] returning\n");
>+}
>+
>+TEST_F(TestForDeathTest, DeathTestBadExitCodeOutput) {
>+ testing::GTEST_FLAG(death_test_style) = "fast";
>+ EXPECT_NONFATAL_FAILURE(
>+ EXPECT_EXIT(DieWithMessage("exiting with rc 1\n"),
>+ testing::ExitedWithCode(3),
>+ "expected message"),
>+ " Result: died but not with expected exit code:\n"
>+ " Exited with exit status 1\n"
>+ "Actual msg:\n"
>+ "[ DEATH ] exiting with rc 1\n");
>+}
>+
>+TEST_F(TestForDeathTest, DeathTestMultiLineMatchFail) {
>+ testing::GTEST_FLAG(death_test_style) = "fast";
>+ EXPECT_NONFATAL_FAILURE(
>+ EXPECT_DEATH(DieWithMessage("line 1\nline 2\nline 3\n"),
>+ "line 1\nxyz\nline 3\n"),
>+ "Actual msg:\n"
>+ "[ DEATH ] line 1\n"
>+ "[ DEATH ] line 2\n"
>+ "[ DEATH ] line 3\n");
>+}
>+
>+TEST_F(TestForDeathTest, DeathTestMultiLineMatchPass) {
>+ testing::GTEST_FLAG(death_test_style) = "fast";
>+ EXPECT_DEATH(DieWithMessage("line 1\nline 2\nline 3\n"),
>+ "line 1\nline 2\nline 3\n");
>+}
>+
>+// A DeathTestFactory that returns MockDeathTests.
>+class MockDeathTestFactory : public DeathTestFactory {
>+ public:
>+ MockDeathTestFactory();
>+ virtual bool Create(const char* statement,
>+ const ::testing::internal::RE* regex,
>+ const char* file, int line, DeathTest** test);
>+
>+ // Sets the parameters for subsequent calls to Create.
>+ void SetParameters(bool create, DeathTest::TestRole role,
>+ int status, bool passed);
>+
>+ // Accessors.
>+ int AssumeRoleCalls() const { return assume_role_calls_; }
>+ int WaitCalls() const { return wait_calls_; }
>+ size_t PassedCalls() const { return passed_args_.size(); }
>+ bool PassedArgument(int n) const { return passed_args_[n]; }
>+ size_t AbortCalls() const { return abort_args_.size(); }
>+ DeathTest::AbortReason AbortArgument(int n) const {
>+ return abort_args_[n];
>+ }
>+ bool TestDeleted() const { return test_deleted_; }
>+
>+ private:
>+ friend class MockDeathTest;
>+ // If true, Create will return a MockDeathTest; otherwise it returns
>+ // NULL.
>+ bool create_;
>+ // The value a MockDeathTest will return from its AssumeRole method.
>+ DeathTest::TestRole role_;
>+ // The value a MockDeathTest will return from its Wait method.
>+ int status_;
>+ // The value a MockDeathTest will return from its Passed method.
>+ bool passed_;
>+
>+ // Number of times AssumeRole was called.
>+ int assume_role_calls_;
>+ // Number of times Wait was called.
>+ int wait_calls_;
>+ // The arguments to the calls to Passed since the last call to
>+ // SetParameters.
>+ std::vector<bool> passed_args_;
>+ // The arguments to the calls to Abort since the last call to
>+ // SetParameters.
>+ std::vector<DeathTest::AbortReason> abort_args_;
>+ // True if the last MockDeathTest returned by Create has been
>+ // deleted.
>+ bool test_deleted_;
>+};
>+
>+
>+// A DeathTest implementation useful in testing. It returns values set
>+// at its creation from its various inherited DeathTest methods, and
>+// reports calls to those methods to its parent MockDeathTestFactory
>+// object.
>+class MockDeathTest : public DeathTest {
>+ public:
>+ MockDeathTest(MockDeathTestFactory *parent,
>+ TestRole role, int status, bool passed) :
>+ parent_(parent), role_(role), status_(status), passed_(passed) {
>+ }
>+ virtual ~MockDeathTest() {
>+ parent_->test_deleted_ = true;
>+ }
>+ virtual TestRole AssumeRole() {
>+ ++parent_->assume_role_calls_;
>+ return role_;
>+ }
>+ virtual int Wait() {
>+ ++parent_->wait_calls_;
>+ return status_;
>+ }
>+ virtual bool Passed(bool exit_status_ok) {
>+ parent_->passed_args_.push_back(exit_status_ok);
>+ return passed_;
>+ }
>+ virtual void Abort(AbortReason reason) {
>+ parent_->abort_args_.push_back(reason);
>+ }
>+
>+ private:
>+ MockDeathTestFactory* const parent_;
>+ const TestRole role_;
>+ const int status_;
>+ const bool passed_;
>+};
>+
>+
>+// MockDeathTestFactory constructor.
>+MockDeathTestFactory::MockDeathTestFactory()
>+ : create_(true),
>+ role_(DeathTest::OVERSEE_TEST),
>+ status_(0),
>+ passed_(true),
>+ assume_role_calls_(0),
>+ wait_calls_(0),
>+ passed_args_(),
>+ abort_args_() {
>+}
>+
>+
>+// Sets the parameters for subsequent calls to Create.
>+void MockDeathTestFactory::SetParameters(bool create,
>+ DeathTest::TestRole role,
>+ int status, bool passed) {
>+ create_ = create;
>+ role_ = role;
>+ status_ = status;
>+ passed_ = passed;
>+
>+ assume_role_calls_ = 0;
>+ wait_calls_ = 0;
>+ passed_args_.clear();
>+ abort_args_.clear();
>+}
>+
>+
>+// Sets test to NULL (if create_ is false) or to the address of a new
>+// MockDeathTest object with parameters taken from the last call
>+// to SetParameters (if create_ is true). Always returns true.
>+bool MockDeathTestFactory::Create(const char* /*statement*/,
>+ const ::testing::internal::RE* /*regex*/,
>+ const char* /*file*/,
>+ int /*line*/,
>+ DeathTest** test) {
>+ test_deleted_ = false;
>+ if (create_) {
>+ *test = new MockDeathTest(this, role_, status_, passed_);
>+ } else {
>+ *test = NULL;
>+ }
>+ return true;
>+}
>+
>+// A test fixture for testing the logic of the GTEST_DEATH_TEST_ macro.
>+// It installs a MockDeathTestFactory that is used for the duration
>+// of the test case.
>+class MacroLogicDeathTest : public testing::Test {
>+ protected:
>+ static testing::internal::ReplaceDeathTestFactory* replacer_;
>+ static MockDeathTestFactory* factory_;
>+
>+ static void SetUpTestCase() {
>+ factory_ = new MockDeathTestFactory;
>+ replacer_ = new testing::internal::ReplaceDeathTestFactory(factory_);
>+ }
>+
>+ static void TearDownTestCase() {
>+ delete replacer_;
>+ replacer_ = NULL;
>+ delete factory_;
>+ factory_ = NULL;
>+ }
>+
>+ // Runs a death test that breaks the rules by returning. Such a death
>+ // test cannot be run directly from a test routine that uses a
>+ // MockDeathTest, or the remainder of the routine will not be executed.
>+ static void RunReturningDeathTest(bool* flag) {
>+ ASSERT_DEATH({ // NOLINT
>+ *flag = true;
>+ return;
>+ }, "");
>+ }
>+};
>+
>+testing::internal::ReplaceDeathTestFactory* MacroLogicDeathTest::replacer_
>+ = NULL;
>+MockDeathTestFactory* MacroLogicDeathTest::factory_ = NULL;
>+
>+
>+// Test that nothing happens when the factory doesn't return a DeathTest:
>+TEST_F(MacroLogicDeathTest, NothingHappens) {
>+ bool flag = false;
>+ factory_->SetParameters(false, DeathTest::OVERSEE_TEST, 0, true);
>+ EXPECT_DEATH(flag = true, "");
>+ EXPECT_FALSE(flag);
>+ EXPECT_EQ(0, factory_->AssumeRoleCalls());
>+ EXPECT_EQ(0, factory_->WaitCalls());
>+ EXPECT_EQ(0U, factory_->PassedCalls());
>+ EXPECT_EQ(0U, factory_->AbortCalls());
>+ EXPECT_FALSE(factory_->TestDeleted());
>+}
>+
>+// Test that the parent process doesn't run the death test code,
>+// and that the Passed method returns false when the (simulated)
>+// child process exits with status 0:
>+TEST_F(MacroLogicDeathTest, ChildExitsSuccessfully) {
>+ bool flag = false;
>+ factory_->SetParameters(true, DeathTest::OVERSEE_TEST, 0, true);
>+ EXPECT_DEATH(flag = true, "");
>+ EXPECT_FALSE(flag);
>+ EXPECT_EQ(1, factory_->AssumeRoleCalls());
>+ EXPECT_EQ(1, factory_->WaitCalls());
>+ ASSERT_EQ(1U, factory_->PassedCalls());
>+ EXPECT_FALSE(factory_->PassedArgument(0));
>+ EXPECT_EQ(0U, factory_->AbortCalls());
>+ EXPECT_TRUE(factory_->TestDeleted());
>+}
>+
>+// Tests that the Passed method was given the argument "true" when
>+// the (simulated) child process exits with status 1:
>+TEST_F(MacroLogicDeathTest, ChildExitsUnsuccessfully) {
>+ bool flag = false;
>+ factory_->SetParameters(true, DeathTest::OVERSEE_TEST, 1, true);
>+ EXPECT_DEATH(flag = true, "");
>+ EXPECT_FALSE(flag);
>+ EXPECT_EQ(1, factory_->AssumeRoleCalls());
>+ EXPECT_EQ(1, factory_->WaitCalls());
>+ ASSERT_EQ(1U, factory_->PassedCalls());
>+ EXPECT_TRUE(factory_->PassedArgument(0));
>+ EXPECT_EQ(0U, factory_->AbortCalls());
>+ EXPECT_TRUE(factory_->TestDeleted());
>+}
>+
>+// Tests that the (simulated) child process executes the death test
>+// code, and is aborted with the correct AbortReason if it
>+// executes a return statement.
>+TEST_F(MacroLogicDeathTest, ChildPerformsReturn) {
>+ bool flag = false;
>+ factory_->SetParameters(true, DeathTest::EXECUTE_TEST, 0, true);
>+ RunReturningDeathTest(&flag);
>+ EXPECT_TRUE(flag);
>+ EXPECT_EQ(1, factory_->AssumeRoleCalls());
>+ EXPECT_EQ(0, factory_->WaitCalls());
>+ EXPECT_EQ(0U, factory_->PassedCalls());
>+ EXPECT_EQ(1U, factory_->AbortCalls());
>+ EXPECT_EQ(DeathTest::TEST_ENCOUNTERED_RETURN_STATEMENT,
>+ factory_->AbortArgument(0));
>+ EXPECT_TRUE(factory_->TestDeleted());
>+}
>+
>+// Tests that the (simulated) child process is aborted with the
>+// correct AbortReason if it does not die.
>+TEST_F(MacroLogicDeathTest, ChildDoesNotDie) {
>+ bool flag = false;
>+ factory_->SetParameters(true, DeathTest::EXECUTE_TEST, 0, true);
>+ EXPECT_DEATH(flag = true, "");
>+ EXPECT_TRUE(flag);
>+ EXPECT_EQ(1, factory_->AssumeRoleCalls());
>+ EXPECT_EQ(0, factory_->WaitCalls());
>+ EXPECT_EQ(0U, factory_->PassedCalls());
>+ // This time there are two calls to Abort: one since the test didn't
>+ // die, and another from the ReturnSentinel when it's destroyed. The
>+ // sentinel normally isn't destroyed if a test doesn't die, since
>+ // _exit(2) is called in that case by ForkingDeathTest, but not by
>+ // our MockDeathTest.
>+ ASSERT_EQ(2U, factory_->AbortCalls());
>+ EXPECT_EQ(DeathTest::TEST_DID_NOT_DIE,
>+ factory_->AbortArgument(0));
>+ EXPECT_EQ(DeathTest::TEST_ENCOUNTERED_RETURN_STATEMENT,
>+ factory_->AbortArgument(1));
>+ EXPECT_TRUE(factory_->TestDeleted());
>+}
>+
>+// Tests that a successful death test does not register a successful
>+// test part.
>+TEST(SuccessRegistrationDeathTest, NoSuccessPart) {
>+ EXPECT_DEATH(_exit(1), "");
>+ EXPECT_EQ(0, GetUnitTestImpl()->current_test_result()->total_part_count());
>+}
>+
>+TEST(StreamingAssertionsDeathTest, DeathTest) {
>+ EXPECT_DEATH(_exit(1), "") << "unexpected failure";
>+ ASSERT_DEATH(_exit(1), "") << "unexpected failure";
>+ EXPECT_NONFATAL_FAILURE({ // NOLINT
>+ EXPECT_DEATH(_exit(0), "") << "expected failure";
>+ }, "expected failure");
>+ EXPECT_FATAL_FAILURE({ // NOLINT
>+ ASSERT_DEATH(_exit(0), "") << "expected failure";
>+ }, "expected failure");
>+}
>+
>+// Tests that GetLastErrnoDescription returns an empty string when the
>+// last error is 0 and non-empty string when it is non-zero.
>+TEST(GetLastErrnoDescription, GetLastErrnoDescriptionWorks) {
>+ errno = ENOENT;
>+ EXPECT_STRNE("", GetLastErrnoDescription().c_str());
>+ errno = 0;
>+ EXPECT_STREQ("", GetLastErrnoDescription().c_str());
>+}
>+
>+# if GTEST_OS_WINDOWS
>+TEST(AutoHandleTest, AutoHandleWorks) {
>+ HANDLE handle = ::CreateEvent(NULL, FALSE, FALSE, NULL);
>+ ASSERT_NE(INVALID_HANDLE_VALUE, handle);
>+
>+ // Tests that the AutoHandle is correctly initialized with a handle.
>+ testing::internal::AutoHandle auto_handle(handle);
>+ EXPECT_EQ(handle, auto_handle.Get());
>+
>+ // Tests that Reset assigns INVALID_HANDLE_VALUE.
>+ // Note that this cannot verify whether the original handle is closed.
>+ auto_handle.Reset();
>+ EXPECT_EQ(INVALID_HANDLE_VALUE, auto_handle.Get());
>+
>+ // Tests that Reset assigns the new handle.
>+ // Note that this cannot verify whether the original handle is closed.
>+ handle = ::CreateEvent(NULL, FALSE, FALSE, NULL);
>+ ASSERT_NE(INVALID_HANDLE_VALUE, handle);
>+ auto_handle.Reset(handle);
>+ EXPECT_EQ(handle, auto_handle.Get());
>+
>+ // Tests that AutoHandle contains INVALID_HANDLE_VALUE by default.
>+ testing::internal::AutoHandle auto_handle2;
>+ EXPECT_EQ(INVALID_HANDLE_VALUE, auto_handle2.Get());
>+}
>+# endif // GTEST_OS_WINDOWS
>+
>+# if GTEST_OS_WINDOWS
>+typedef unsigned __int64 BiggestParsable;
>+typedef signed __int64 BiggestSignedParsable;
>+# else
>+typedef unsigned long long BiggestParsable;
>+typedef signed long long BiggestSignedParsable;
>+# endif // GTEST_OS_WINDOWS
>+
>+// We cannot use std::numeric_limits<T>::max() as it clashes with the
>+// max() macro defined by <windows.h>.
>+const BiggestParsable kBiggestParsableMax = ULLONG_MAX;
>+const BiggestSignedParsable kBiggestSignedParsableMax = LLONG_MAX;
>+
>+TEST(ParseNaturalNumberTest, RejectsInvalidFormat) {
>+ BiggestParsable result = 0;
>+
>+ // Rejects non-numbers.
>+ EXPECT_FALSE(ParseNaturalNumber("non-number string", &result));
>+
>+ // Rejects numbers with whitespace prefix.
>+ EXPECT_FALSE(ParseNaturalNumber(" 123", &result));
>+
>+ // Rejects negative numbers.
>+ EXPECT_FALSE(ParseNaturalNumber("-123", &result));
>+
>+ // Rejects numbers starting with a plus sign.
>+ EXPECT_FALSE(ParseNaturalNumber("+123", &result));
>+ errno = 0;
>+}
>+
>+TEST(ParseNaturalNumberTest, RejectsOverflownNumbers) {
>+ BiggestParsable result = 0;
>+
>+ EXPECT_FALSE(ParseNaturalNumber("99999999999999999999999", &result));
>+
>+ signed char char_result = 0;
>+ EXPECT_FALSE(ParseNaturalNumber("200", &char_result));
>+ errno = 0;
>+}
>+
>+TEST(ParseNaturalNumberTest, AcceptsValidNumbers) {
>+ BiggestParsable result = 0;
>+
>+ result = 0;
>+ ASSERT_TRUE(ParseNaturalNumber("123", &result));
>+ EXPECT_EQ(123U, result);
>+
>+ // Check 0 as an edge case.
>+ result = 1;
>+ ASSERT_TRUE(ParseNaturalNumber("0", &result));
>+ EXPECT_EQ(0U, result);
>+
>+ result = 1;
>+ ASSERT_TRUE(ParseNaturalNumber("00000", &result));
>+ EXPECT_EQ(0U, result);
>+}
>+
>+TEST(ParseNaturalNumberTest, AcceptsTypeLimits) {
>+ Message msg;
>+ msg << kBiggestParsableMax;
>+
>+ BiggestParsable result = 0;
>+ EXPECT_TRUE(ParseNaturalNumber(msg.GetString(), &result));
>+ EXPECT_EQ(kBiggestParsableMax, result);
>+
>+ Message msg2;
>+ msg2 << kBiggestSignedParsableMax;
>+
>+ BiggestSignedParsable signed_result = 0;
>+ EXPECT_TRUE(ParseNaturalNumber(msg2.GetString(), &signed_result));
>+ EXPECT_EQ(kBiggestSignedParsableMax, signed_result);
>+
>+ Message msg3;
>+ msg3 << INT_MAX;
>+
>+ int int_result = 0;
>+ EXPECT_TRUE(ParseNaturalNumber(msg3.GetString(), &int_result));
>+ EXPECT_EQ(INT_MAX, int_result);
>+
>+ Message msg4;
>+ msg4 << UINT_MAX;
>+
>+ unsigned int uint_result = 0;
>+ EXPECT_TRUE(ParseNaturalNumber(msg4.GetString(), &uint_result));
>+ EXPECT_EQ(UINT_MAX, uint_result);
>+}
>+
>+TEST(ParseNaturalNumberTest, WorksForShorterIntegers) {
>+ short short_result = 0;
>+ ASSERT_TRUE(ParseNaturalNumber("123", &short_result));
>+ EXPECT_EQ(123, short_result);
>+
>+ signed char char_result = 0;
>+ ASSERT_TRUE(ParseNaturalNumber("123", &char_result));
>+ EXPECT_EQ(123, char_result);
>+}
>+
>+# if GTEST_OS_WINDOWS
>+TEST(EnvironmentTest, HandleFitsIntoSizeT) {
>+ // FIXME: Remove this test after this condition is verified
>+ // in a static assertion in gtest-death-test.cc in the function
>+ // GetStatusFileDescriptor.
>+ ASSERT_TRUE(sizeof(HANDLE) <= sizeof(size_t));
>+}
>+# endif // GTEST_OS_WINDOWS
>+
>+// Tests that EXPECT_DEATH_IF_SUPPORTED/ASSERT_DEATH_IF_SUPPORTED trigger
>+// failures when death tests are available on the system.
>+TEST(ConditionalDeathMacrosDeathTest, ExpectsDeathWhenDeathTestsAvailable) {
>+ EXPECT_DEATH_IF_SUPPORTED(DieInside("CondDeathTestExpectMacro"),
>+ "death inside CondDeathTestExpectMacro");
>+ ASSERT_DEATH_IF_SUPPORTED(DieInside("CondDeathTestAssertMacro"),
>+ "death inside CondDeathTestAssertMacro");
>+
>+ // Empty statement will not crash, which must trigger a failure.
>+ EXPECT_NONFATAL_FAILURE(EXPECT_DEATH_IF_SUPPORTED(;, ""), "");
>+ EXPECT_FATAL_FAILURE(ASSERT_DEATH_IF_SUPPORTED(;, ""), "");
>+}
>+
>+TEST(InDeathTestChildDeathTest, ReportsDeathTestCorrectlyInFastStyle) {
>+ testing::GTEST_FLAG(death_test_style) = "fast";
>+ EXPECT_FALSE(InDeathTestChild());
>+ EXPECT_DEATH({
>+ fprintf(stderr, InDeathTestChild() ? "Inside" : "Outside");
>+ fflush(stderr);
>+ _exit(1);
>+ }, "Inside");
>+}
>+
>+TEST(InDeathTestChildDeathTest, ReportsDeathTestCorrectlyInThreadSafeStyle) {
>+ testing::GTEST_FLAG(death_test_style) = "threadsafe";
>+ EXPECT_FALSE(InDeathTestChild());
>+ EXPECT_DEATH({
>+ fprintf(stderr, InDeathTestChild() ? "Inside" : "Outside");
>+ fflush(stderr);
>+ _exit(1);
>+ }, "Inside");
>+}
>+
>+#else // !GTEST_HAS_DEATH_TEST follows
>+
>+using testing::internal::CaptureStderr;
>+using testing::internal::GetCapturedStderr;
>+
>+// Tests that EXPECT_DEATH_IF_SUPPORTED/ASSERT_DEATH_IF_SUPPORTED are still
>+// defined but do not trigger failures when death tests are not available on
>+// the system.
>+TEST(ConditionalDeathMacrosTest, WarnsWhenDeathTestsNotAvailable) {
>+ // Empty statement will not crash, but that should not trigger a failure
>+ // when death tests are not supported.
>+ CaptureStderr();
>+ EXPECT_DEATH_IF_SUPPORTED(;, "");
>+ std::string output = GetCapturedStderr();
>+ ASSERT_TRUE(NULL != strstr(output.c_str(),
>+ "Death tests are not supported on this platform"));
>+ ASSERT_TRUE(NULL != strstr(output.c_str(), ";"));
>+
>+ // The streamed message should not be printed as there is no test failure.
>+ CaptureStderr();
>+ EXPECT_DEATH_IF_SUPPORTED(;, "") << "streamed message";
>+ output = GetCapturedStderr();
>+ ASSERT_TRUE(NULL == strstr(output.c_str(), "streamed message"));
>+
>+ CaptureStderr();
>+ ASSERT_DEATH_IF_SUPPORTED(;, ""); // NOLINT
>+ output = GetCapturedStderr();
>+ ASSERT_TRUE(NULL != strstr(output.c_str(),
>+ "Death tests are not supported on this platform"));
>+ ASSERT_TRUE(NULL != strstr(output.c_str(), ";"));
>+
>+ CaptureStderr();
>+ ASSERT_DEATH_IF_SUPPORTED(;, "") << "streamed message"; // NOLINT
>+ output = GetCapturedStderr();
>+ ASSERT_TRUE(NULL == strstr(output.c_str(), "streamed message"));
>+}
>+
>+void FuncWithAssert(int* n) {
>+ ASSERT_DEATH_IF_SUPPORTED(return;, "");
>+ (*n)++;
>+}
>+
>+// Tests that ASSERT_DEATH_IF_SUPPORTED does not return from the current
>+// function (as ASSERT_DEATH does) if death tests are not supported.
>+TEST(ConditionalDeathMacrosTest, AssertDeatDoesNotReturnhIfUnsupported) {
>+ int n = 0;
>+ FuncWithAssert(&n);
>+ EXPECT_EQ(1, n);
>+}
>+
>+#endif // !GTEST_HAS_DEATH_TEST
>+
>+// Tests that the death test macros expand to code which may or may not
>+// be followed by operator<<, and that in either case the complete text
>+// comprises only a single C++ statement.
>+//
>+// The syntax should work whether death tests are available or not.
>+TEST(ConditionalDeathMacrosSyntaxDeathTest, SingleStatement) {
>+ if (AlwaysFalse())
>+ // This would fail if executed; this is a compilation test only
>+ ASSERT_DEATH_IF_SUPPORTED(return, "");
>+
>+ if (AlwaysTrue())
>+ EXPECT_DEATH_IF_SUPPORTED(_exit(1), "");
>+ else
>+ // This empty "else" branch is meant to ensure that EXPECT_DEATH
>+ // doesn't expand into an "if" statement without an "else"
>+ ; // NOLINT
>+
>+ if (AlwaysFalse())
>+ ASSERT_DEATH_IF_SUPPORTED(return, "") << "did not die";
>+
>+ if (AlwaysFalse())
>+ ; // NOLINT
>+ else
>+ EXPECT_DEATH_IF_SUPPORTED(_exit(1), "") << 1 << 2 << 3;
>+}
>+
>+// Tests that conditional death test macros expand to code which interacts
>+// well with switch statements.
>+TEST(ConditionalDeathMacrosSyntaxDeathTest, SwitchStatement) {
>+ // Microsoft compiler usually complains about switch statements without
>+ // case labels. We suppress that warning for this test.
>+ GTEST_DISABLE_MSC_WARNINGS_PUSH_(4065)
>+
>+ switch (0)
>+ default:
>+ ASSERT_DEATH_IF_SUPPORTED(_exit(1), "")
>+ << "exit in default switch handler";
>+
>+ switch (0)
>+ case 0:
>+ EXPECT_DEATH_IF_SUPPORTED(_exit(1), "") << "exit in switch case";
>+
>+ GTEST_DISABLE_MSC_WARNINGS_POP_()
>+}
>+
>+// Tests that a test case whose name ends with "DeathTest" works fine
>+// on Windows.
>+TEST(NotADeathTest, Test) {
>+ SUCCEED();
>+}
>diff --git a/Source/ThirdParty/gtest/test/googletest-death-test_ex_test.cc b/Source/ThirdParty/gtest/test/googletest-death-test_ex_test.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..b8b9470fc88ad17aaeb664d47c270cfcaa731bef
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-death-test_ex_test.cc
>@@ -0,0 +1,92 @@
>+// Copyright 2010, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+//
>+// Tests that verify interaction of exceptions and death tests.
>+
>+#include "gtest/gtest-death-test.h"
>+#include "gtest/gtest.h"
>+
>+#if GTEST_HAS_DEATH_TEST
>+
>+# if GTEST_HAS_SEH
>+# include <windows.h> // For RaiseException().
>+# endif
>+
>+# include "gtest/gtest-spi.h"
>+
>+# if GTEST_HAS_EXCEPTIONS
>+
>+# include <exception> // For std::exception.
>+
>+// Tests that death tests report thrown exceptions as failures and that the
>+// exceptions do not escape death test macros.
>+TEST(CxxExceptionDeathTest, ExceptionIsFailure) {
>+ try {
>+ EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(throw 1, ""), "threw an exception");
>+ } catch (...) { // NOLINT
>+ FAIL() << "An exception escaped a death test macro invocation "
>+ << "with catch_exceptions "
>+ << (testing::GTEST_FLAG(catch_exceptions) ? "enabled" : "disabled");
>+ }
>+}
>+
>+class TestException : public std::exception {
>+ public:
>+ virtual const char* what() const throw() { return "exceptional message"; }
>+};
>+
>+TEST(CxxExceptionDeathTest, PrintsMessageForStdExceptions) {
>+ // Verifies that the exception message is quoted in the failure text.
>+ EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(throw TestException(), ""),
>+ "exceptional message");
>+ // Verifies that the location is mentioned in the failure text.
>+ EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(throw TestException(), ""),
>+ "googletest-death-test_ex_test.cc");
>+}
>+# endif // GTEST_HAS_EXCEPTIONS
>+
>+# if GTEST_HAS_SEH
>+// Tests that enabling interception of SEH exceptions with the
>+// catch_exceptions flag does not interfere with SEH exceptions being
>+// treated as death by death tests.
>+TEST(SehExceptionDeasTest, CatchExceptionsDoesNotInterfere) {
>+ EXPECT_DEATH(RaiseException(42, 0x0, 0, NULL), "")
>+ << "with catch_exceptions "
>+ << (testing::GTEST_FLAG(catch_exceptions) ? "enabled" : "disabled");
>+}
>+# endif
>+
>+#endif // GTEST_HAS_DEATH_TEST
>+
>+int main(int argc, char** argv) {
>+ testing::InitGoogleTest(&argc, argv);
>+ testing::GTEST_FLAG(catch_exceptions) = GTEST_ENABLE_CATCH_EXCEPTIONS_ != 0;
>+ return RUN_ALL_TESTS();
>+}
>diff --git a/Source/ThirdParty/gtest/test/googletest-env-var-test.py b/Source/ThirdParty/gtest/test/googletest-env-var-test.py
>new file mode 100755
>index 0000000000000000000000000000000000000000..e1efeee1eab8c6dacb5d2926f4b5c9080938db13
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-env-var-test.py
>@@ -0,0 +1,117 @@
>+#!/usr/bin/env python
>+#
>+# Copyright 2008, Google Inc.
>+# All rights reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+"""Verifies that Google Test correctly parses environment variables."""
>+
>+import os
>+import gtest_test_utils
>+
>+
>+IS_WINDOWS = os.name == 'nt'
>+IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
>+
>+COMMAND = gtest_test_utils.GetTestExecutablePath('googletest-env-var-test_')
>+
>+environ = os.environ.copy()
>+
>+
>+def AssertEq(expected, actual):
>+ if expected != actual:
>+ print 'Expected: %s' % (expected,)
>+ print ' Actual: %s' % (actual,)
>+ raise AssertionError
>+
>+
>+def SetEnvVar(env_var, value):
>+ """Sets the env variable to 'value'; unsets it when 'value' is None."""
>+
>+ if value is not None:
>+ environ[env_var] = value
>+ elif env_var in environ:
>+ del environ[env_var]
>+
>+
>+def GetFlag(flag):
>+ """Runs googletest-env-var-test_ and returns its output."""
>+
>+ args = [COMMAND]
>+ if flag is not None:
>+ args += [flag]
>+ return gtest_test_utils.Subprocess(args, env=environ).output
>+
>+
>+def TestFlag(flag, test_val, default_val):
>+ """Verifies that the given flag is affected by the corresponding env var."""
>+
>+ env_var = 'GTEST_' + flag.upper()
>+ SetEnvVar(env_var, test_val)
>+ AssertEq(test_val, GetFlag(flag))
>+ SetEnvVar(env_var, None)
>+ AssertEq(default_val, GetFlag(flag))
>+
>+
>+class GTestEnvVarTest(gtest_test_utils.TestCase):
>+
>+ def testEnvVarAffectsFlag(self):
>+ """Tests that environment variable should affect the corresponding flag."""
>+
>+ TestFlag('break_on_failure', '1', '0')
>+ TestFlag('color', 'yes', 'auto')
>+ TestFlag('filter', 'FooTest.Bar', '*')
>+ SetEnvVar('XML_OUTPUT_FILE', None) # For 'output' test
>+ TestFlag('output', 'xml:tmp/foo.xml', '')
>+ TestFlag('print_time', '0', '1')
>+ TestFlag('repeat', '999', '1')
>+ TestFlag('throw_on_failure', '1', '0')
>+ TestFlag('death_test_style', 'threadsafe', 'fast')
>+ TestFlag('catch_exceptions', '0', '1')
>+
>+ if IS_LINUX:
>+ TestFlag('death_test_use_fork', '1', '0')
>+ TestFlag('stack_trace_depth', '0', '100')
>+
>+
>+ def testXmlOutputFile(self):
>+ """Tests that $XML_OUTPUT_FILE affects the output flag."""
>+
>+ SetEnvVar('GTEST_OUTPUT', None)
>+ SetEnvVar('XML_OUTPUT_FILE', 'tmp/bar.xml')
>+ AssertEq('xml:tmp/bar.xml', GetFlag('output'))
>+
>+ def testXmlOutputFileOverride(self):
>+ """Tests that $XML_OUTPUT_FILE is overridden by $GTEST_OUTPUT."""
>+
>+ SetEnvVar('GTEST_OUTPUT', 'xml:tmp/foo.xml')
>+ SetEnvVar('XML_OUTPUT_FILE', 'tmp/bar.xml')
>+ AssertEq('xml:tmp/foo.xml', GetFlag('output'))
>+
>+if __name__ == '__main__':
>+ gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/googletest-env-var-test_.cc b/Source/ThirdParty/gtest/test/googletest-env-var-test_.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..fd2aa82f74faa21201e79ae0e5c3b568553df337
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-env-var-test_.cc
>@@ -0,0 +1,122 @@
>+// Copyright 2008, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+
>+// A helper program for testing that Google Test parses the environment
>+// variables correctly.
>+
>+#include <iostream>
>+
>+#include "gtest/gtest.h"
>+#include "src/gtest-internal-inl.h"
>+
>+using ::std::cout;
>+
>+namespace testing {
>+
>+// The purpose of this is to make the test more realistic by ensuring
>+// that the UnitTest singleton is created before main() is entered.
>+// We don't actual run the TEST itself.
>+TEST(GTestEnvVarTest, Dummy) {
>+}
>+
>+void PrintFlag(const char* flag) {
>+ if (strcmp(flag, "break_on_failure") == 0) {
>+ cout << GTEST_FLAG(break_on_failure);
>+ return;
>+ }
>+
>+ if (strcmp(flag, "catch_exceptions") == 0) {
>+ cout << GTEST_FLAG(catch_exceptions);
>+ return;
>+ }
>+
>+ if (strcmp(flag, "color") == 0) {
>+ cout << GTEST_FLAG(color);
>+ return;
>+ }
>+
>+ if (strcmp(flag, "death_test_style") == 0) {
>+ cout << GTEST_FLAG(death_test_style);
>+ return;
>+ }
>+
>+ if (strcmp(flag, "death_test_use_fork") == 0) {
>+ cout << GTEST_FLAG(death_test_use_fork);
>+ return;
>+ }
>+
>+ if (strcmp(flag, "filter") == 0) {
>+ cout << GTEST_FLAG(filter);
>+ return;
>+ }
>+
>+ if (strcmp(flag, "output") == 0) {
>+ cout << GTEST_FLAG(output);
>+ return;
>+ }
>+
>+ if (strcmp(flag, "print_time") == 0) {
>+ cout << GTEST_FLAG(print_time);
>+ return;
>+ }
>+
>+ if (strcmp(flag, "repeat") == 0) {
>+ cout << GTEST_FLAG(repeat);
>+ return;
>+ }
>+
>+ if (strcmp(flag, "stack_trace_depth") == 0) {
>+ cout << GTEST_FLAG(stack_trace_depth);
>+ return;
>+ }
>+
>+ if (strcmp(flag, "throw_on_failure") == 0) {
>+ cout << GTEST_FLAG(throw_on_failure);
>+ return;
>+ }
>+
>+ cout << "Invalid flag name " << flag
>+ << ". Valid names are break_on_failure, color, filter, etc.\n";
>+ exit(1);
>+}
>+
>+} // namespace testing
>+
>+int main(int argc, char** argv) {
>+ testing::InitGoogleTest(&argc, argv);
>+
>+ if (argc != 2) {
>+ cout << "Usage: googletest-env-var-test_ NAME_OF_FLAG\n";
>+ return 1;
>+ }
>+
>+ testing::PrintFlag(argv[1]);
>+ return 0;
>+}
>diff --git a/Source/ThirdParty/gtest/test/googletest-filepath-test.cc b/Source/ThirdParty/gtest/test/googletest-filepath-test.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..37f02fb4bd7797d14d383a05fa197c36b31825f2
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-filepath-test.cc
>@@ -0,0 +1,651 @@
>+// Copyright 2008, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+//
>+// Google Test filepath utilities
>+//
>+// This file tests classes and functions used internally by
>+// Google Test. They are subject to change without notice.
>+//
>+// This file is #included from gtest-internal.h.
>+// Do not #include this file anywhere else!
>+
>+#include "gtest/internal/gtest-filepath.h"
>+#include "gtest/gtest.h"
>+#include "src/gtest-internal-inl.h"
>+
>+#if GTEST_OS_WINDOWS_MOBILE
>+# include <windows.h> // NOLINT
>+#elif GTEST_OS_WINDOWS
>+# include <direct.h> // NOLINT
>+#endif // GTEST_OS_WINDOWS_MOBILE
>+
>+namespace testing {
>+namespace internal {
>+namespace {
>+
>+#if GTEST_OS_WINDOWS_MOBILE
>+// FIXME: Move these to the POSIX adapter section in
>+// gtest-port.h.
>+
>+// Windows CE doesn't have the remove C function.
>+int remove(const char* path) {
>+ LPCWSTR wpath = String::AnsiToUtf16(path);
>+ int ret = DeleteFile(wpath) ? 0 : -1;
>+ delete [] wpath;
>+ return ret;
>+}
>+// Windows CE doesn't have the _rmdir C function.
>+int _rmdir(const char* path) {
>+ FilePath filepath(path);
>+ LPCWSTR wpath = String::AnsiToUtf16(
>+ filepath.RemoveTrailingPathSeparator().c_str());
>+ int ret = RemoveDirectory(wpath) ? 0 : -1;
>+ delete [] wpath;
>+ return ret;
>+}
>+
>+#else
>+
>+TEST(GetCurrentDirTest, ReturnsCurrentDir) {
>+ const FilePath original_dir = FilePath::GetCurrentDir();
>+ EXPECT_FALSE(original_dir.IsEmpty());
>+
>+ posix::ChDir(GTEST_PATH_SEP_);
>+ const FilePath cwd = FilePath::GetCurrentDir();
>+ posix::ChDir(original_dir.c_str());
>+
>+# if GTEST_OS_WINDOWS
>+
>+ // Skips the ":".
>+ const char* const cwd_without_drive = strchr(cwd.c_str(), ':');
>+ ASSERT_TRUE(cwd_without_drive != NULL);
>+ EXPECT_STREQ(GTEST_PATH_SEP_, cwd_without_drive + 1);
>+
>+# else
>+
>+ EXPECT_EQ(GTEST_PATH_SEP_, cwd.string());
>+
>+# endif
>+}
>+
>+#endif // GTEST_OS_WINDOWS_MOBILE
>+
>+TEST(IsEmptyTest, ReturnsTrueForEmptyPath) {
>+ EXPECT_TRUE(FilePath("").IsEmpty());
>+}
>+
>+TEST(IsEmptyTest, ReturnsFalseForNonEmptyPath) {
>+ EXPECT_FALSE(FilePath("a").IsEmpty());
>+ EXPECT_FALSE(FilePath(".").IsEmpty());
>+ EXPECT_FALSE(FilePath("a/b").IsEmpty());
>+ EXPECT_FALSE(FilePath("a\\b\\").IsEmpty());
>+}
>+
>+// RemoveDirectoryName "" -> ""
>+TEST(RemoveDirectoryNameTest, WhenEmptyName) {
>+ EXPECT_EQ("", FilePath("").RemoveDirectoryName().string());
>+}
>+
>+// RemoveDirectoryName "afile" -> "afile"
>+TEST(RemoveDirectoryNameTest, ButNoDirectory) {
>+ EXPECT_EQ("afile",
>+ FilePath("afile").RemoveDirectoryName().string());
>+}
>+
>+// RemoveDirectoryName "/afile" -> "afile"
>+TEST(RemoveDirectoryNameTest, RootFileShouldGiveFileName) {
>+ EXPECT_EQ("afile",
>+ FilePath(GTEST_PATH_SEP_ "afile").RemoveDirectoryName().string());
>+}
>+
>+// RemoveDirectoryName "adir/" -> ""
>+TEST(RemoveDirectoryNameTest, WhereThereIsNoFileName) {
>+ EXPECT_EQ("",
>+ FilePath("adir" GTEST_PATH_SEP_).RemoveDirectoryName().string());
>+}
>+
>+// RemoveDirectoryName "adir/afile" -> "afile"
>+TEST(RemoveDirectoryNameTest, ShouldGiveFileName) {
>+ EXPECT_EQ("afile",
>+ FilePath("adir" GTEST_PATH_SEP_ "afile").RemoveDirectoryName().string());
>+}
>+
>+// RemoveDirectoryName "adir/subdir/afile" -> "afile"
>+TEST(RemoveDirectoryNameTest, ShouldAlsoGiveFileName) {
>+ EXPECT_EQ("afile",
>+ FilePath("adir" GTEST_PATH_SEP_ "subdir" GTEST_PATH_SEP_ "afile")
>+ .RemoveDirectoryName().string());
>+}
>+
>+#if GTEST_HAS_ALT_PATH_SEP_
>+
>+// Tests that RemoveDirectoryName() works with the alternate separator
>+// on Windows.
>+
>+// RemoveDirectoryName("/afile") -> "afile"
>+TEST(RemoveDirectoryNameTest, RootFileShouldGiveFileNameForAlternateSeparator) {
>+ EXPECT_EQ("afile", FilePath("/afile").RemoveDirectoryName().string());
>+}
>+
>+// RemoveDirectoryName("adir/") -> ""
>+TEST(RemoveDirectoryNameTest, WhereThereIsNoFileNameForAlternateSeparator) {
>+ EXPECT_EQ("", FilePath("adir/").RemoveDirectoryName().string());
>+}
>+
>+// RemoveDirectoryName("adir/afile") -> "afile"
>+TEST(RemoveDirectoryNameTest, ShouldGiveFileNameForAlternateSeparator) {
>+ EXPECT_EQ("afile", FilePath("adir/afile").RemoveDirectoryName().string());
>+}
>+
>+// RemoveDirectoryName("adir/subdir/afile") -> "afile"
>+TEST(RemoveDirectoryNameTest, ShouldAlsoGiveFileNameForAlternateSeparator) {
>+ EXPECT_EQ("afile",
>+ FilePath("adir/subdir/afile").RemoveDirectoryName().string());
>+}
>+
>+#endif
>+
>+// RemoveFileName "" -> "./"
>+TEST(RemoveFileNameTest, EmptyName) {
>+#if GTEST_OS_WINDOWS_MOBILE
>+ // On Windows CE, we use the root as the current directory.
>+ EXPECT_EQ(GTEST_PATH_SEP_, FilePath("").RemoveFileName().string());
>+#else
>+ EXPECT_EQ("." GTEST_PATH_SEP_, FilePath("").RemoveFileName().string());
>+#endif
>+}
>+
>+// RemoveFileName "adir/" -> "adir/"
>+TEST(RemoveFileNameTest, ButNoFile) {
>+ EXPECT_EQ("adir" GTEST_PATH_SEP_,
>+ FilePath("adir" GTEST_PATH_SEP_).RemoveFileName().string());
>+}
>+
>+// RemoveFileName "adir/afile" -> "adir/"
>+TEST(RemoveFileNameTest, GivesDirName) {
>+ EXPECT_EQ("adir" GTEST_PATH_SEP_,
>+ FilePath("adir" GTEST_PATH_SEP_ "afile").RemoveFileName().string());
>+}
>+
>+// RemoveFileName "adir/subdir/afile" -> "adir/subdir/"
>+TEST(RemoveFileNameTest, GivesDirAndSubDirName) {
>+ EXPECT_EQ("adir" GTEST_PATH_SEP_ "subdir" GTEST_PATH_SEP_,
>+ FilePath("adir" GTEST_PATH_SEP_ "subdir" GTEST_PATH_SEP_ "afile")
>+ .RemoveFileName().string());
>+}
>+
>+// RemoveFileName "/afile" -> "/"
>+TEST(RemoveFileNameTest, GivesRootDir) {
>+ EXPECT_EQ(GTEST_PATH_SEP_,
>+ FilePath(GTEST_PATH_SEP_ "afile").RemoveFileName().string());
>+}
>+
>+#if GTEST_HAS_ALT_PATH_SEP_
>+
>+// Tests that RemoveFileName() works with the alternate separator on
>+// Windows.
>+
>+// RemoveFileName("adir/") -> "adir/"
>+TEST(RemoveFileNameTest, ButNoFileForAlternateSeparator) {
>+ EXPECT_EQ("adir" GTEST_PATH_SEP_,
>+ FilePath("adir/").RemoveFileName().string());
>+}
>+
>+// RemoveFileName("adir/afile") -> "adir/"
>+TEST(RemoveFileNameTest, GivesDirNameForAlternateSeparator) {
>+ EXPECT_EQ("adir" GTEST_PATH_SEP_,
>+ FilePath("adir/afile").RemoveFileName().string());
>+}
>+
>+// RemoveFileName("adir/subdir/afile") -> "adir/subdir/"
>+TEST(RemoveFileNameTest, GivesDirAndSubDirNameForAlternateSeparator) {
>+ EXPECT_EQ("adir" GTEST_PATH_SEP_ "subdir" GTEST_PATH_SEP_,
>+ FilePath("adir/subdir/afile").RemoveFileName().string());
>+}
>+
>+// RemoveFileName("/afile") -> "\"
>+TEST(RemoveFileNameTest, GivesRootDirForAlternateSeparator) {
>+ EXPECT_EQ(GTEST_PATH_SEP_, FilePath("/afile").RemoveFileName().string());
>+}
>+
>+#endif
>+
>+TEST(MakeFileNameTest, GenerateWhenNumberIsZero) {
>+ FilePath actual = FilePath::MakeFileName(FilePath("foo"), FilePath("bar"),
>+ 0, "xml");
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar.xml", actual.string());
>+}
>+
>+TEST(MakeFileNameTest, GenerateFileNameNumberGtZero) {
>+ FilePath actual = FilePath::MakeFileName(FilePath("foo"), FilePath("bar"),
>+ 12, "xml");
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar_12.xml", actual.string());
>+}
>+
>+TEST(MakeFileNameTest, GenerateFileNameWithSlashNumberIsZero) {
>+ FilePath actual = FilePath::MakeFileName(FilePath("foo" GTEST_PATH_SEP_),
>+ FilePath("bar"), 0, "xml");
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar.xml", actual.string());
>+}
>+
>+TEST(MakeFileNameTest, GenerateFileNameWithSlashNumberGtZero) {
>+ FilePath actual = FilePath::MakeFileName(FilePath("foo" GTEST_PATH_SEP_),
>+ FilePath("bar"), 12, "xml");
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar_12.xml", actual.string());
>+}
>+
>+TEST(MakeFileNameTest, GenerateWhenNumberIsZeroAndDirIsEmpty) {
>+ FilePath actual = FilePath::MakeFileName(FilePath(""), FilePath("bar"),
>+ 0, "xml");
>+ EXPECT_EQ("bar.xml", actual.string());
>+}
>+
>+TEST(MakeFileNameTest, GenerateWhenNumberIsNotZeroAndDirIsEmpty) {
>+ FilePath actual = FilePath::MakeFileName(FilePath(""), FilePath("bar"),
>+ 14, "xml");
>+ EXPECT_EQ("bar_14.xml", actual.string());
>+}
>+
>+TEST(ConcatPathsTest, WorksWhenDirDoesNotEndWithPathSep) {
>+ FilePath actual = FilePath::ConcatPaths(FilePath("foo"),
>+ FilePath("bar.xml"));
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar.xml", actual.string());
>+}
>+
>+TEST(ConcatPathsTest, WorksWhenPath1EndsWithPathSep) {
>+ FilePath actual = FilePath::ConcatPaths(FilePath("foo" GTEST_PATH_SEP_),
>+ FilePath("bar.xml"));
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar.xml", actual.string());
>+}
>+
>+TEST(ConcatPathsTest, Path1BeingEmpty) {
>+ FilePath actual = FilePath::ConcatPaths(FilePath(""),
>+ FilePath("bar.xml"));
>+ EXPECT_EQ("bar.xml", actual.string());
>+}
>+
>+TEST(ConcatPathsTest, Path2BeingEmpty) {
>+ FilePath actual = FilePath::ConcatPaths(FilePath("foo"), FilePath(""));
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_, actual.string());
>+}
>+
>+TEST(ConcatPathsTest, BothPathBeingEmpty) {
>+ FilePath actual = FilePath::ConcatPaths(FilePath(""),
>+ FilePath(""));
>+ EXPECT_EQ("", actual.string());
>+}
>+
>+TEST(ConcatPathsTest, Path1ContainsPathSep) {
>+ FilePath actual = FilePath::ConcatPaths(FilePath("foo" GTEST_PATH_SEP_ "bar"),
>+ FilePath("foobar.xml"));
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar" GTEST_PATH_SEP_ "foobar.xml",
>+ actual.string());
>+}
>+
>+TEST(ConcatPathsTest, Path2ContainsPathSep) {
>+ FilePath actual = FilePath::ConcatPaths(
>+ FilePath("foo" GTEST_PATH_SEP_),
>+ FilePath("bar" GTEST_PATH_SEP_ "bar.xml"));
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar" GTEST_PATH_SEP_ "bar.xml",
>+ actual.string());
>+}
>+
>+TEST(ConcatPathsTest, Path2EndsWithPathSep) {
>+ FilePath actual = FilePath::ConcatPaths(FilePath("foo"),
>+ FilePath("bar" GTEST_PATH_SEP_));
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar" GTEST_PATH_SEP_, actual.string());
>+}
>+
>+// RemoveTrailingPathSeparator "" -> ""
>+TEST(RemoveTrailingPathSeparatorTest, EmptyString) {
>+ EXPECT_EQ("", FilePath("").RemoveTrailingPathSeparator().string());
>+}
>+
>+// RemoveTrailingPathSeparator "foo" -> "foo"
>+TEST(RemoveTrailingPathSeparatorTest, FileNoSlashString) {
>+ EXPECT_EQ("foo", FilePath("foo").RemoveTrailingPathSeparator().string());
>+}
>+
>+// RemoveTrailingPathSeparator "foo/" -> "foo"
>+TEST(RemoveTrailingPathSeparatorTest, ShouldRemoveTrailingSeparator) {
>+ EXPECT_EQ("foo",
>+ FilePath("foo" GTEST_PATH_SEP_).RemoveTrailingPathSeparator().string());
>+#if GTEST_HAS_ALT_PATH_SEP_
>+ EXPECT_EQ("foo", FilePath("foo/").RemoveTrailingPathSeparator().string());
>+#endif
>+}
>+
>+// RemoveTrailingPathSeparator "foo/bar/" -> "foo/bar/"
>+TEST(RemoveTrailingPathSeparatorTest, ShouldRemoveLastSeparator) {
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar",
>+ FilePath("foo" GTEST_PATH_SEP_ "bar" GTEST_PATH_SEP_)
>+ .RemoveTrailingPathSeparator().string());
>+}
>+
>+// RemoveTrailingPathSeparator "foo/bar" -> "foo/bar"
>+TEST(RemoveTrailingPathSeparatorTest, ShouldReturnUnmodified) {
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar",
>+ FilePath("foo" GTEST_PATH_SEP_ "bar")
>+ .RemoveTrailingPathSeparator().string());
>+}
>+
>+TEST(DirectoryTest, RootDirectoryExists) {
>+#if GTEST_OS_WINDOWS // We are on Windows.
>+ char current_drive[_MAX_PATH]; // NOLINT
>+ current_drive[0] = static_cast<char>(_getdrive() + 'A' - 1);
>+ current_drive[1] = ':';
>+ current_drive[2] = '\\';
>+ current_drive[3] = '\0';
>+ EXPECT_TRUE(FilePath(current_drive).DirectoryExists());
>+#else
>+ EXPECT_TRUE(FilePath("/").DirectoryExists());
>+#endif // GTEST_OS_WINDOWS
>+}
>+
>+#if GTEST_OS_WINDOWS
>+TEST(DirectoryTest, RootOfWrongDriveDoesNotExists) {
>+ const int saved_drive_ = _getdrive();
>+ // Find a drive that doesn't exist. Start with 'Z' to avoid common ones.
>+ for (char drive = 'Z'; drive >= 'A'; drive--)
>+ if (_chdrive(drive - 'A' + 1) == -1) {
>+ char non_drive[_MAX_PATH]; // NOLINT
>+ non_drive[0] = drive;
>+ non_drive[1] = ':';
>+ non_drive[2] = '\\';
>+ non_drive[3] = '\0';
>+ EXPECT_FALSE(FilePath(non_drive).DirectoryExists());
>+ break;
>+ }
>+ _chdrive(saved_drive_);
>+}
>+#endif // GTEST_OS_WINDOWS
>+
>+#if !GTEST_OS_WINDOWS_MOBILE
>+// Windows CE _does_ consider an empty directory to exist.
>+TEST(DirectoryTest, EmptyPathDirectoryDoesNotExist) {
>+ EXPECT_FALSE(FilePath("").DirectoryExists());
>+}
>+#endif // !GTEST_OS_WINDOWS_MOBILE
>+
>+TEST(DirectoryTest, CurrentDirectoryExists) {
>+#if GTEST_OS_WINDOWS // We are on Windows.
>+# ifndef _WIN32_CE // Windows CE doesn't have a current directory.
>+
>+ EXPECT_TRUE(FilePath(".").DirectoryExists());
>+ EXPECT_TRUE(FilePath(".\\").DirectoryExists());
>+
>+# endif // _WIN32_CE
>+#else
>+ EXPECT_TRUE(FilePath(".").DirectoryExists());
>+ EXPECT_TRUE(FilePath("./").DirectoryExists());
>+#endif // GTEST_OS_WINDOWS
>+}
>+
>+// "foo/bar" == foo//bar" == "foo///bar"
>+TEST(NormalizeTest, MultipleConsecutiveSepaparatorsInMidstring) {
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar",
>+ FilePath("foo" GTEST_PATH_SEP_ "bar").string());
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar",
>+ FilePath("foo" GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar").string());
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar",
>+ FilePath("foo" GTEST_PATH_SEP_ GTEST_PATH_SEP_
>+ GTEST_PATH_SEP_ "bar").string());
>+}
>+
>+// "/bar" == //bar" == "///bar"
>+TEST(NormalizeTest, MultipleConsecutiveSepaparatorsAtStringStart) {
>+ EXPECT_EQ(GTEST_PATH_SEP_ "bar",
>+ FilePath(GTEST_PATH_SEP_ "bar").string());
>+ EXPECT_EQ(GTEST_PATH_SEP_ "bar",
>+ FilePath(GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar").string());
>+ EXPECT_EQ(GTEST_PATH_SEP_ "bar",
>+ FilePath(GTEST_PATH_SEP_ GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar").string());
>+}
>+
>+// "foo/" == foo//" == "foo///"
>+TEST(NormalizeTest, MultipleConsecutiveSepaparatorsAtStringEnd) {
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_,
>+ FilePath("foo" GTEST_PATH_SEP_).string());
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_,
>+ FilePath("foo" GTEST_PATH_SEP_ GTEST_PATH_SEP_).string());
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_,
>+ FilePath("foo" GTEST_PATH_SEP_ GTEST_PATH_SEP_ GTEST_PATH_SEP_).string());
>+}
>+
>+#if GTEST_HAS_ALT_PATH_SEP_
>+
>+// Tests that separators at the end of the string are normalized
>+// regardless of their combination (e.g. "foo\" =="foo/\" ==
>+// "foo\\/").
>+TEST(NormalizeTest, MixAlternateSeparatorAtStringEnd) {
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_,
>+ FilePath("foo/").string());
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_,
>+ FilePath("foo" GTEST_PATH_SEP_ "/").string());
>+ EXPECT_EQ("foo" GTEST_PATH_SEP_,
>+ FilePath("foo//" GTEST_PATH_SEP_).string());
>+}
>+
>+#endif
>+
>+TEST(AssignmentOperatorTest, DefaultAssignedToNonDefault) {
>+ FilePath default_path;
>+ FilePath non_default_path("path");
>+ non_default_path = default_path;
>+ EXPECT_EQ("", non_default_path.string());
>+ EXPECT_EQ("", default_path.string()); // RHS var is unchanged.
>+}
>+
>+TEST(AssignmentOperatorTest, NonDefaultAssignedToDefault) {
>+ FilePath non_default_path("path");
>+ FilePath default_path;
>+ default_path = non_default_path;
>+ EXPECT_EQ("path", default_path.string());
>+ EXPECT_EQ("path", non_default_path.string()); // RHS var is unchanged.
>+}
>+
>+TEST(AssignmentOperatorTest, ConstAssignedToNonConst) {
>+ const FilePath const_default_path("const_path");
>+ FilePath non_default_path("path");
>+ non_default_path = const_default_path;
>+ EXPECT_EQ("const_path", non_default_path.string());
>+}
>+
>+class DirectoryCreationTest : public Test {
>+ protected:
>+ virtual void SetUp() {
>+ testdata_path_.Set(FilePath(
>+ TempDir() + GetCurrentExecutableName().string() +
>+ "_directory_creation" GTEST_PATH_SEP_ "test" GTEST_PATH_SEP_));
>+ testdata_file_.Set(testdata_path_.RemoveTrailingPathSeparator());
>+
>+ unique_file0_.Set(FilePath::MakeFileName(testdata_path_, FilePath("unique"),
>+ 0, "txt"));
>+ unique_file1_.Set(FilePath::MakeFileName(testdata_path_, FilePath("unique"),
>+ 1, "txt"));
>+
>+ remove(testdata_file_.c_str());
>+ remove(unique_file0_.c_str());
>+ remove(unique_file1_.c_str());
>+ posix::RmDir(testdata_path_.c_str());
>+ }
>+
>+ virtual void TearDown() {
>+ remove(testdata_file_.c_str());
>+ remove(unique_file0_.c_str());
>+ remove(unique_file1_.c_str());
>+ posix::RmDir(testdata_path_.c_str());
>+ }
>+
>+ void CreateTextFile(const char* filename) {
>+ FILE* f = posix::FOpen(filename, "w");
>+ fprintf(f, "text\n");
>+ fclose(f);
>+ }
>+
>+ // Strings representing a directory and a file, with identical paths
>+ // except for the trailing separator character that distinquishes
>+ // a directory named 'test' from a file named 'test'. Example names:
>+ FilePath testdata_path_; // "/tmp/directory_creation/test/"
>+ FilePath testdata_file_; // "/tmp/directory_creation/test"
>+ FilePath unique_file0_; // "/tmp/directory_creation/test/unique.txt"
>+ FilePath unique_file1_; // "/tmp/directory_creation/test/unique_1.txt"
>+};
>+
>+TEST_F(DirectoryCreationTest, CreateDirectoriesRecursively) {
>+ EXPECT_FALSE(testdata_path_.DirectoryExists()) << testdata_path_.string();
>+ EXPECT_TRUE(testdata_path_.CreateDirectoriesRecursively());
>+ EXPECT_TRUE(testdata_path_.DirectoryExists());
>+}
>+
>+TEST_F(DirectoryCreationTest, CreateDirectoriesForAlreadyExistingPath) {
>+ EXPECT_FALSE(testdata_path_.DirectoryExists()) << testdata_path_.string();
>+ EXPECT_TRUE(testdata_path_.CreateDirectoriesRecursively());
>+ // Call 'create' again... should still succeed.
>+ EXPECT_TRUE(testdata_path_.CreateDirectoriesRecursively());
>+}
>+
>+TEST_F(DirectoryCreationTest, CreateDirectoriesAndUniqueFilename) {
>+ FilePath file_path(FilePath::GenerateUniqueFileName(testdata_path_,
>+ FilePath("unique"), "txt"));
>+ EXPECT_EQ(unique_file0_.string(), file_path.string());
>+ EXPECT_FALSE(file_path.FileOrDirectoryExists()); // file not there
>+
>+ testdata_path_.CreateDirectoriesRecursively();
>+ EXPECT_FALSE(file_path.FileOrDirectoryExists()); // file still not there
>+ CreateTextFile(file_path.c_str());
>+ EXPECT_TRUE(file_path.FileOrDirectoryExists());
>+
>+ FilePath file_path2(FilePath::GenerateUniqueFileName(testdata_path_,
>+ FilePath("unique"), "txt"));
>+ EXPECT_EQ(unique_file1_.string(), file_path2.string());
>+ EXPECT_FALSE(file_path2.FileOrDirectoryExists()); // file not there
>+ CreateTextFile(file_path2.c_str());
>+ EXPECT_TRUE(file_path2.FileOrDirectoryExists());
>+}
>+
>+TEST_F(DirectoryCreationTest, CreateDirectoriesFail) {
>+ // force a failure by putting a file where we will try to create a directory.
>+ CreateTextFile(testdata_file_.c_str());
>+ EXPECT_TRUE(testdata_file_.FileOrDirectoryExists());
>+ EXPECT_FALSE(testdata_file_.DirectoryExists());
>+ EXPECT_FALSE(testdata_file_.CreateDirectoriesRecursively());
>+}
>+
>+TEST(NoDirectoryCreationTest, CreateNoDirectoriesForDefaultXmlFile) {
>+ const FilePath test_detail_xml("test_detail.xml");
>+ EXPECT_FALSE(test_detail_xml.CreateDirectoriesRecursively());
>+}
>+
>+TEST(FilePathTest, DefaultConstructor) {
>+ FilePath fp;
>+ EXPECT_EQ("", fp.string());
>+}
>+
>+TEST(FilePathTest, CharAndCopyConstructors) {
>+ const FilePath fp("spicy");
>+ EXPECT_EQ("spicy", fp.string());
>+
>+ const FilePath fp_copy(fp);
>+ EXPECT_EQ("spicy", fp_copy.string());
>+}
>+
>+TEST(FilePathTest, StringConstructor) {
>+ const FilePath fp(std::string("cider"));
>+ EXPECT_EQ("cider", fp.string());
>+}
>+
>+TEST(FilePathTest, Set) {
>+ const FilePath apple("apple");
>+ FilePath mac("mac");
>+ mac.Set(apple); // Implement Set() since overloading operator= is forbidden.
>+ EXPECT_EQ("apple", mac.string());
>+ EXPECT_EQ("apple", apple.string());
>+}
>+
>+TEST(FilePathTest, ToString) {
>+ const FilePath file("drink");
>+ EXPECT_EQ("drink", file.string());
>+}
>+
>+TEST(FilePathTest, RemoveExtension) {
>+ EXPECT_EQ("app", FilePath("app.cc").RemoveExtension("cc").string());
>+ EXPECT_EQ("app", FilePath("app.exe").RemoveExtension("exe").string());
>+ EXPECT_EQ("APP", FilePath("APP.EXE").RemoveExtension("exe").string());
>+}
>+
>+TEST(FilePathTest, RemoveExtensionWhenThereIsNoExtension) {
>+ EXPECT_EQ("app", FilePath("app").RemoveExtension("exe").string());
>+}
>+
>+TEST(FilePathTest, IsDirectory) {
>+ EXPECT_FALSE(FilePath("cola").IsDirectory());
>+ EXPECT_TRUE(FilePath("koala" GTEST_PATH_SEP_).IsDirectory());
>+#if GTEST_HAS_ALT_PATH_SEP_
>+ EXPECT_TRUE(FilePath("koala/").IsDirectory());
>+#endif
>+}
>+
>+TEST(FilePathTest, IsAbsolutePath) {
>+ EXPECT_FALSE(FilePath("is" GTEST_PATH_SEP_ "relative").IsAbsolutePath());
>+ EXPECT_FALSE(FilePath("").IsAbsolutePath());
>+#if GTEST_OS_WINDOWS
>+ EXPECT_TRUE(FilePath("c:\\" GTEST_PATH_SEP_ "is_not"
>+ GTEST_PATH_SEP_ "relative").IsAbsolutePath());
>+ EXPECT_FALSE(FilePath("c:foo" GTEST_PATH_SEP_ "bar").IsAbsolutePath());
>+ EXPECT_TRUE(FilePath("c:/" GTEST_PATH_SEP_ "is_not"
>+ GTEST_PATH_SEP_ "relative").IsAbsolutePath());
>+#else
>+ EXPECT_TRUE(FilePath(GTEST_PATH_SEP_ "is_not" GTEST_PATH_SEP_ "relative")
>+ .IsAbsolutePath());
>+#endif // GTEST_OS_WINDOWS
>+}
>+
>+TEST(FilePathTest, IsRootDirectory) {
>+#if GTEST_OS_WINDOWS
>+ EXPECT_TRUE(FilePath("a:\\").IsRootDirectory());
>+ EXPECT_TRUE(FilePath("Z:/").IsRootDirectory());
>+ EXPECT_TRUE(FilePath("e://").IsRootDirectory());
>+ EXPECT_FALSE(FilePath("").IsRootDirectory());
>+ EXPECT_FALSE(FilePath("b:").IsRootDirectory());
>+ EXPECT_FALSE(FilePath("b:a").IsRootDirectory());
>+ EXPECT_FALSE(FilePath("8:/").IsRootDirectory());
>+ EXPECT_FALSE(FilePath("c|/").IsRootDirectory());
>+#else
>+ EXPECT_TRUE(FilePath("/").IsRootDirectory());
>+ EXPECT_TRUE(FilePath("//").IsRootDirectory());
>+ EXPECT_FALSE(FilePath("").IsRootDirectory());
>+ EXPECT_FALSE(FilePath("\\").IsRootDirectory());
>+ EXPECT_FALSE(FilePath("/x").IsRootDirectory());
>+#endif
>+}
>+
>+} // namespace
>+} // namespace internal
>+} // namespace testing
>diff --git a/Source/ThirdParty/gtest/test/googletest-filter-unittest.py b/Source/ThirdParty/gtest/test/googletest-filter-unittest.py
>new file mode 100755
>index 0000000000000000000000000000000000000000..dc0b5bd9a5cfc5bfe8c68af1b647899e1febda67
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-filter-unittest.py
>@@ -0,0 +1,636 @@
>+#!/usr/bin/env python
>+#
>+# Copyright 2005 Google Inc. All Rights Reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+"""Unit test for Google Test test filters.
>+
>+A user can specify which test(s) in a Google Test program to run via either
>+the GTEST_FILTER environment variable or the --gtest_filter flag.
>+This script tests such functionality by invoking
>+googletest-filter-unittest_ (a program written with Google Test) with different
>+environments and command line flags.
>+
>+Note that test sharding may also influence which tests are filtered. Therefore,
>+we test that here also.
>+"""
>+
>+import os
>+import re
>+import sets
>+import sys
>+import gtest_test_utils
>+
>+# Constants.
>+
>+# Checks if this platform can pass empty environment variables to child
>+# processes. We set an env variable to an empty string and invoke a python
>+# script in a subprocess to print whether the variable is STILL in
>+# os.environ. We then use 'eval' to parse the child's output so that an
>+# exception is thrown if the input is anything other than 'True' nor 'False'.
>+CAN_PASS_EMPTY_ENV = False
>+if sys.executable:
>+ os.environ['EMPTY_VAR'] = ''
>+ child = gtest_test_utils.Subprocess(
>+ [sys.executable, '-c', 'import os; print \'EMPTY_VAR\' in os.environ'])
>+ CAN_PASS_EMPTY_ENV = eval(child.output)
>+
>+
>+# Check if this platform can unset environment variables in child processes.
>+# We set an env variable to a non-empty string, unset it, and invoke
>+# a python script in a subprocess to print whether the variable
>+# is NO LONGER in os.environ.
>+# We use 'eval' to parse the child's output so that an exception
>+# is thrown if the input is neither 'True' nor 'False'.
>+CAN_UNSET_ENV = False
>+if sys.executable:
>+ os.environ['UNSET_VAR'] = 'X'
>+ del os.environ['UNSET_VAR']
>+ child = gtest_test_utils.Subprocess(
>+ [sys.executable, '-c', 'import os; print \'UNSET_VAR\' not in os.environ'
>+ ])
>+ CAN_UNSET_ENV = eval(child.output)
>+
>+
>+# Checks if we should test with an empty filter. This doesn't
>+# make sense on platforms that cannot pass empty env variables (Win32)
>+# and on platforms that cannot unset variables (since we cannot tell
>+# the difference between "" and NULL -- Borland and Solaris < 5.10)
>+CAN_TEST_EMPTY_FILTER = (CAN_PASS_EMPTY_ENV and CAN_UNSET_ENV)
>+
>+
>+# The environment variable for specifying the test filters.
>+FILTER_ENV_VAR = 'GTEST_FILTER'
>+
>+# The environment variables for test sharding.
>+TOTAL_SHARDS_ENV_VAR = 'GTEST_TOTAL_SHARDS'
>+SHARD_INDEX_ENV_VAR = 'GTEST_SHARD_INDEX'
>+SHARD_STATUS_FILE_ENV_VAR = 'GTEST_SHARD_STATUS_FILE'
>+
>+# The command line flag for specifying the test filters.
>+FILTER_FLAG = 'gtest_filter'
>+
>+# The command line flag for including disabled tests.
>+ALSO_RUN_DISABLED_TESTS_FLAG = 'gtest_also_run_disabled_tests'
>+
>+# Command to run the googletest-filter-unittest_ program.
>+COMMAND = gtest_test_utils.GetTestExecutablePath('googletest-filter-unittest_')
>+
>+# Regex for determining whether parameterized tests are enabled in the binary.
>+PARAM_TEST_REGEX = re.compile(r'/ParamTest')
>+
>+# Regex for parsing test case names from Google Test's output.
>+TEST_CASE_REGEX = re.compile(r'^\[\-+\] \d+ tests? from (\w+(/\w+)?)')
>+
>+# Regex for parsing test names from Google Test's output.
>+TEST_REGEX = re.compile(r'^\[\s*RUN\s*\].*\.(\w+(/\w+)?)')
>+
>+# The command line flag to tell Google Test to output the list of tests it
>+# will run.
>+LIST_TESTS_FLAG = '--gtest_list_tests'
>+
>+# Indicates whether Google Test supports death tests.
>+SUPPORTS_DEATH_TESTS = 'HasDeathTest' in gtest_test_utils.Subprocess(
>+ [COMMAND, LIST_TESTS_FLAG]).output
>+
>+# Full names of all tests in googletest-filter-unittests_.
>+PARAM_TESTS = [
>+ 'SeqP/ParamTest.TestX/0',
>+ 'SeqP/ParamTest.TestX/1',
>+ 'SeqP/ParamTest.TestY/0',
>+ 'SeqP/ParamTest.TestY/1',
>+ 'SeqQ/ParamTest.TestX/0',
>+ 'SeqQ/ParamTest.TestX/1',
>+ 'SeqQ/ParamTest.TestY/0',
>+ 'SeqQ/ParamTest.TestY/1',
>+ ]
>+
>+DISABLED_TESTS = [
>+ 'BarTest.DISABLED_TestFour',
>+ 'BarTest.DISABLED_TestFive',
>+ 'BazTest.DISABLED_TestC',
>+ 'DISABLED_FoobarTest.Test1',
>+ 'DISABLED_FoobarTest.DISABLED_Test2',
>+ 'DISABLED_FoobarbazTest.TestA',
>+ ]
>+
>+if SUPPORTS_DEATH_TESTS:
>+ DEATH_TESTS = [
>+ 'HasDeathTest.Test1',
>+ 'HasDeathTest.Test2',
>+ ]
>+else:
>+ DEATH_TESTS = []
>+
>+# All the non-disabled tests.
>+ACTIVE_TESTS = [
>+ 'FooTest.Abc',
>+ 'FooTest.Xyz',
>+
>+ 'BarTest.TestOne',
>+ 'BarTest.TestTwo',
>+ 'BarTest.TestThree',
>+
>+ 'BazTest.TestOne',
>+ 'BazTest.TestA',
>+ 'BazTest.TestB',
>+ ] + DEATH_TESTS + PARAM_TESTS
>+
>+param_tests_present = None
>+
>+# Utilities.
>+
>+environ = os.environ.copy()
>+
>+
>+def SetEnvVar(env_var, value):
>+ """Sets the env variable to 'value'; unsets it when 'value' is None."""
>+
>+ if value is not None:
>+ environ[env_var] = value
>+ elif env_var in environ:
>+ del environ[env_var]
>+
>+
>+def RunAndReturnOutput(args = None):
>+ """Runs the test program and returns its output."""
>+
>+ return gtest_test_utils.Subprocess([COMMAND] + (args or []),
>+ env=environ).output
>+
>+
>+def RunAndExtractTestList(args = None):
>+ """Runs the test program and returns its exit code and a list of tests run."""
>+
>+ p = gtest_test_utils.Subprocess([COMMAND] + (args or []), env=environ)
>+ tests_run = []
>+ test_case = ''
>+ test = ''
>+ for line in p.output.split('\n'):
>+ match = TEST_CASE_REGEX.match(line)
>+ if match is not None:
>+ test_case = match.group(1)
>+ else:
>+ match = TEST_REGEX.match(line)
>+ if match is not None:
>+ test = match.group(1)
>+ tests_run.append(test_case + '.' + test)
>+ return (tests_run, p.exit_code)
>+
>+
>+def InvokeWithModifiedEnv(extra_env, function, *args, **kwargs):
>+ """Runs the given function and arguments in a modified environment."""
>+ try:
>+ original_env = environ.copy()
>+ environ.update(extra_env)
>+ return function(*args, **kwargs)
>+ finally:
>+ environ.clear()
>+ environ.update(original_env)
>+
>+
>+def RunWithSharding(total_shards, shard_index, command):
>+ """Runs a test program shard and returns exit code and a list of tests run."""
>+
>+ extra_env = {SHARD_INDEX_ENV_VAR: str(shard_index),
>+ TOTAL_SHARDS_ENV_VAR: str(total_shards)}
>+ return InvokeWithModifiedEnv(extra_env, RunAndExtractTestList, command)
>+
>+# The unit test.
>+
>+
>+class GTestFilterUnitTest(gtest_test_utils.TestCase):
>+ """Tests the env variable or the command line flag to filter tests."""
>+
>+ # Utilities.
>+
>+ def AssertSetEqual(self, lhs, rhs):
>+ """Asserts that two sets are equal."""
>+
>+ for elem in lhs:
>+ self.assert_(elem in rhs, '%s in %s' % (elem, rhs))
>+
>+ for elem in rhs:
>+ self.assert_(elem in lhs, '%s in %s' % (elem, lhs))
>+
>+ def AssertPartitionIsValid(self, set_var, list_of_sets):
>+ """Asserts that list_of_sets is a valid partition of set_var."""
>+
>+ full_partition = []
>+ for slice_var in list_of_sets:
>+ full_partition.extend(slice_var)
>+ self.assertEqual(len(set_var), len(full_partition))
>+ self.assertEqual(sets.Set(set_var), sets.Set(full_partition))
>+
>+ def AdjustForParameterizedTests(self, tests_to_run):
>+ """Adjust tests_to_run in case value parameterized tests are disabled."""
>+
>+ global param_tests_present
>+ if not param_tests_present:
>+ return list(sets.Set(tests_to_run) - sets.Set(PARAM_TESTS))
>+ else:
>+ return tests_to_run
>+
>+ def RunAndVerify(self, gtest_filter, tests_to_run):
>+ """Checks that the binary runs correct set of tests for a given filter."""
>+
>+ tests_to_run = self.AdjustForParameterizedTests(tests_to_run)
>+
>+ # First, tests using the environment variable.
>+
>+ # Windows removes empty variables from the environment when passing it
>+ # to a new process. This means it is impossible to pass an empty filter
>+ # into a process using the environment variable. However, we can still
>+ # test the case when the variable is not supplied (i.e., gtest_filter is
>+ # None).
>+ # pylint: disable-msg=C6403
>+ if CAN_TEST_EMPTY_FILTER or gtest_filter != '':
>+ SetEnvVar(FILTER_ENV_VAR, gtest_filter)
>+ tests_run = RunAndExtractTestList()[0]
>+ SetEnvVar(FILTER_ENV_VAR, None)
>+ self.AssertSetEqual(tests_run, tests_to_run)
>+ # pylint: enable-msg=C6403
>+
>+ # Next, tests using the command line flag.
>+
>+ if gtest_filter is None:
>+ args = []
>+ else:
>+ args = ['--%s=%s' % (FILTER_FLAG, gtest_filter)]
>+
>+ tests_run = RunAndExtractTestList(args)[0]
>+ self.AssertSetEqual(tests_run, tests_to_run)
>+
>+ def RunAndVerifyWithSharding(self, gtest_filter, total_shards, tests_to_run,
>+ args=None, check_exit_0=False):
>+ """Checks that binary runs correct tests for the given filter and shard.
>+
>+ Runs all shards of googletest-filter-unittest_ with the given filter, and
>+ verifies that the right set of tests were run. The union of tests run
>+ on each shard should be identical to tests_to_run, without duplicates.
>+ If check_exit_0, .
>+
>+ Args:
>+ gtest_filter: A filter to apply to the tests.
>+ total_shards: A total number of shards to split test run into.
>+ tests_to_run: A set of tests expected to run.
>+ args : Arguments to pass to the to the test binary.
>+ check_exit_0: When set to a true value, make sure that all shards
>+ return 0.
>+ """
>+
>+ tests_to_run = self.AdjustForParameterizedTests(tests_to_run)
>+
>+ # Windows removes empty variables from the environment when passing it
>+ # to a new process. This means it is impossible to pass an empty filter
>+ # into a process using the environment variable. However, we can still
>+ # test the case when the variable is not supplied (i.e., gtest_filter is
>+ # None).
>+ # pylint: disable-msg=C6403
>+ if CAN_TEST_EMPTY_FILTER or gtest_filter != '':
>+ SetEnvVar(FILTER_ENV_VAR, gtest_filter)
>+ partition = []
>+ for i in range(0, total_shards):
>+ (tests_run, exit_code) = RunWithSharding(total_shards, i, args)
>+ if check_exit_0:
>+ self.assertEqual(0, exit_code)
>+ partition.append(tests_run)
>+
>+ self.AssertPartitionIsValid(tests_to_run, partition)
>+ SetEnvVar(FILTER_ENV_VAR, None)
>+ # pylint: enable-msg=C6403
>+
>+ def RunAndVerifyAllowingDisabled(self, gtest_filter, tests_to_run):
>+ """Checks that the binary runs correct set of tests for the given filter.
>+
>+ Runs googletest-filter-unittest_ with the given filter, and enables
>+ disabled tests. Verifies that the right set of tests were run.
>+
>+ Args:
>+ gtest_filter: A filter to apply to the tests.
>+ tests_to_run: A set of tests expected to run.
>+ """
>+
>+ tests_to_run = self.AdjustForParameterizedTests(tests_to_run)
>+
>+ # Construct the command line.
>+ args = ['--%s' % ALSO_RUN_DISABLED_TESTS_FLAG]
>+ if gtest_filter is not None:
>+ args.append('--%s=%s' % (FILTER_FLAG, gtest_filter))
>+
>+ tests_run = RunAndExtractTestList(args)[0]
>+ self.AssertSetEqual(tests_run, tests_to_run)
>+
>+ def setUp(self):
>+ """Sets up test case.
>+
>+ Determines whether value-parameterized tests are enabled in the binary and
>+ sets the flags accordingly.
>+ """
>+
>+ global param_tests_present
>+ if param_tests_present is None:
>+ param_tests_present = PARAM_TEST_REGEX.search(
>+ RunAndReturnOutput()) is not None
>+
>+ def testDefaultBehavior(self):
>+ """Tests the behavior of not specifying the filter."""
>+
>+ self.RunAndVerify(None, ACTIVE_TESTS)
>+
>+ def testDefaultBehaviorWithShards(self):
>+ """Tests the behavior without the filter, with sharding enabled."""
>+
>+ self.RunAndVerifyWithSharding(None, 1, ACTIVE_TESTS)
>+ self.RunAndVerifyWithSharding(None, 2, ACTIVE_TESTS)
>+ self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS) - 1, ACTIVE_TESTS)
>+ self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS), ACTIVE_TESTS)
>+ self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS) + 1, ACTIVE_TESTS)
>+
>+ def testEmptyFilter(self):
>+ """Tests an empty filter."""
>+
>+ self.RunAndVerify('', [])
>+ self.RunAndVerifyWithSharding('', 1, [])
>+ self.RunAndVerifyWithSharding('', 2, [])
>+
>+ def testBadFilter(self):
>+ """Tests a filter that matches nothing."""
>+
>+ self.RunAndVerify('BadFilter', [])
>+ self.RunAndVerifyAllowingDisabled('BadFilter', [])
>+
>+ def testFullName(self):
>+ """Tests filtering by full name."""
>+
>+ self.RunAndVerify('FooTest.Xyz', ['FooTest.Xyz'])
>+ self.RunAndVerifyAllowingDisabled('FooTest.Xyz', ['FooTest.Xyz'])
>+ self.RunAndVerifyWithSharding('FooTest.Xyz', 5, ['FooTest.Xyz'])
>+
>+ def testUniversalFilters(self):
>+ """Tests filters that match everything."""
>+
>+ self.RunAndVerify('*', ACTIVE_TESTS)
>+ self.RunAndVerify('*.*', ACTIVE_TESTS)
>+ self.RunAndVerifyWithSharding('*.*', len(ACTIVE_TESTS) - 3, ACTIVE_TESTS)
>+ self.RunAndVerifyAllowingDisabled('*', ACTIVE_TESTS + DISABLED_TESTS)
>+ self.RunAndVerifyAllowingDisabled('*.*', ACTIVE_TESTS + DISABLED_TESTS)
>+
>+ def testFilterByTestCase(self):
>+ """Tests filtering by test case name."""
>+
>+ self.RunAndVerify('FooTest.*', ['FooTest.Abc', 'FooTest.Xyz'])
>+
>+ BAZ_TESTS = ['BazTest.TestOne', 'BazTest.TestA', 'BazTest.TestB']
>+ self.RunAndVerify('BazTest.*', BAZ_TESTS)
>+ self.RunAndVerifyAllowingDisabled('BazTest.*',
>+ BAZ_TESTS + ['BazTest.DISABLED_TestC'])
>+
>+ def testFilterByTest(self):
>+ """Tests filtering by test name."""
>+
>+ self.RunAndVerify('*.TestOne', ['BarTest.TestOne', 'BazTest.TestOne'])
>+
>+ def testFilterDisabledTests(self):
>+ """Select only the disabled tests to run."""
>+
>+ self.RunAndVerify('DISABLED_FoobarTest.Test1', [])
>+ self.RunAndVerifyAllowingDisabled('DISABLED_FoobarTest.Test1',
>+ ['DISABLED_FoobarTest.Test1'])
>+
>+ self.RunAndVerify('*DISABLED_*', [])
>+ self.RunAndVerifyAllowingDisabled('*DISABLED_*', DISABLED_TESTS)
>+
>+ self.RunAndVerify('*.DISABLED_*', [])
>+ self.RunAndVerifyAllowingDisabled('*.DISABLED_*', [
>+ 'BarTest.DISABLED_TestFour',
>+ 'BarTest.DISABLED_TestFive',
>+ 'BazTest.DISABLED_TestC',
>+ 'DISABLED_FoobarTest.DISABLED_Test2',
>+ ])
>+
>+ self.RunAndVerify('DISABLED_*', [])
>+ self.RunAndVerifyAllowingDisabled('DISABLED_*', [
>+ 'DISABLED_FoobarTest.Test1',
>+ 'DISABLED_FoobarTest.DISABLED_Test2',
>+ 'DISABLED_FoobarbazTest.TestA',
>+ ])
>+
>+ def testWildcardInTestCaseName(self):
>+ """Tests using wildcard in the test case name."""
>+
>+ self.RunAndVerify('*a*.*', [
>+ 'BarTest.TestOne',
>+ 'BarTest.TestTwo',
>+ 'BarTest.TestThree',
>+
>+ 'BazTest.TestOne',
>+ 'BazTest.TestA',
>+ 'BazTest.TestB', ] + DEATH_TESTS + PARAM_TESTS)
>+
>+ def testWildcardInTestName(self):
>+ """Tests using wildcard in the test name."""
>+
>+ self.RunAndVerify('*.*A*', ['FooTest.Abc', 'BazTest.TestA'])
>+
>+ def testFilterWithoutDot(self):
>+ """Tests a filter that has no '.' in it."""
>+
>+ self.RunAndVerify('*z*', [
>+ 'FooTest.Xyz',
>+
>+ 'BazTest.TestOne',
>+ 'BazTest.TestA',
>+ 'BazTest.TestB',
>+ ])
>+
>+ def testTwoPatterns(self):
>+ """Tests filters that consist of two patterns."""
>+
>+ self.RunAndVerify('Foo*.*:*A*', [
>+ 'FooTest.Abc',
>+ 'FooTest.Xyz',
>+
>+ 'BazTest.TestA',
>+ ])
>+
>+ # An empty pattern + a non-empty one
>+ self.RunAndVerify(':*A*', ['FooTest.Abc', 'BazTest.TestA'])
>+
>+ def testThreePatterns(self):
>+ """Tests filters that consist of three patterns."""
>+
>+ self.RunAndVerify('*oo*:*A*:*One', [
>+ 'FooTest.Abc',
>+ 'FooTest.Xyz',
>+
>+ 'BarTest.TestOne',
>+
>+ 'BazTest.TestOne',
>+ 'BazTest.TestA',
>+ ])
>+
>+ # The 2nd pattern is empty.
>+ self.RunAndVerify('*oo*::*One', [
>+ 'FooTest.Abc',
>+ 'FooTest.Xyz',
>+
>+ 'BarTest.TestOne',
>+
>+ 'BazTest.TestOne',
>+ ])
>+
>+ # The last 2 patterns are empty.
>+ self.RunAndVerify('*oo*::', [
>+ 'FooTest.Abc',
>+ 'FooTest.Xyz',
>+ ])
>+
>+ def testNegativeFilters(self):
>+ self.RunAndVerify('*-BazTest.TestOne', [
>+ 'FooTest.Abc',
>+ 'FooTest.Xyz',
>+
>+ 'BarTest.TestOne',
>+ 'BarTest.TestTwo',
>+ 'BarTest.TestThree',
>+
>+ 'BazTest.TestA',
>+ 'BazTest.TestB',
>+ ] + DEATH_TESTS + PARAM_TESTS)
>+
>+ self.RunAndVerify('*-FooTest.Abc:BazTest.*', [
>+ 'FooTest.Xyz',
>+
>+ 'BarTest.TestOne',
>+ 'BarTest.TestTwo',
>+ 'BarTest.TestThree',
>+ ] + DEATH_TESTS + PARAM_TESTS)
>+
>+ self.RunAndVerify('BarTest.*-BarTest.TestOne', [
>+ 'BarTest.TestTwo',
>+ 'BarTest.TestThree',
>+ ])
>+
>+ # Tests without leading '*'.
>+ self.RunAndVerify('-FooTest.Abc:FooTest.Xyz:BazTest.*', [
>+ 'BarTest.TestOne',
>+ 'BarTest.TestTwo',
>+ 'BarTest.TestThree',
>+ ] + DEATH_TESTS + PARAM_TESTS)
>+
>+ # Value parameterized tests.
>+ self.RunAndVerify('*/*', PARAM_TESTS)
>+
>+ # Value parameterized tests filtering by the sequence name.
>+ self.RunAndVerify('SeqP/*', [
>+ 'SeqP/ParamTest.TestX/0',
>+ 'SeqP/ParamTest.TestX/1',
>+ 'SeqP/ParamTest.TestY/0',
>+ 'SeqP/ParamTest.TestY/1',
>+ ])
>+
>+ # Value parameterized tests filtering by the test name.
>+ self.RunAndVerify('*/0', [
>+ 'SeqP/ParamTest.TestX/0',
>+ 'SeqP/ParamTest.TestY/0',
>+ 'SeqQ/ParamTest.TestX/0',
>+ 'SeqQ/ParamTest.TestY/0',
>+ ])
>+
>+ def testFlagOverridesEnvVar(self):
>+ """Tests that the filter flag overrides the filtering env. variable."""
>+
>+ SetEnvVar(FILTER_ENV_VAR, 'Foo*')
>+ args = ['--%s=%s' % (FILTER_FLAG, '*One')]
>+ tests_run = RunAndExtractTestList(args)[0]
>+ SetEnvVar(FILTER_ENV_VAR, None)
>+
>+ self.AssertSetEqual(tests_run, ['BarTest.TestOne', 'BazTest.TestOne'])
>+
>+ def testShardStatusFileIsCreated(self):
>+ """Tests that the shard file is created if specified in the environment."""
>+
>+ shard_status_file = os.path.join(gtest_test_utils.GetTempDir(),
>+ 'shard_status_file')
>+ self.assert_(not os.path.exists(shard_status_file))
>+
>+ extra_env = {SHARD_STATUS_FILE_ENV_VAR: shard_status_file}
>+ try:
>+ InvokeWithModifiedEnv(extra_env, RunAndReturnOutput)
>+ finally:
>+ self.assert_(os.path.exists(shard_status_file))
>+ os.remove(shard_status_file)
>+
>+ def testShardStatusFileIsCreatedWithListTests(self):
>+ """Tests that the shard file is created with the "list_tests" flag."""
>+
>+ shard_status_file = os.path.join(gtest_test_utils.GetTempDir(),
>+ 'shard_status_file2')
>+ self.assert_(not os.path.exists(shard_status_file))
>+
>+ extra_env = {SHARD_STATUS_FILE_ENV_VAR: shard_status_file}
>+ try:
>+ output = InvokeWithModifiedEnv(extra_env,
>+ RunAndReturnOutput,
>+ [LIST_TESTS_FLAG])
>+ finally:
>+ # This assertion ensures that Google Test enumerated the tests as
>+ # opposed to running them.
>+ self.assert_('[==========]' not in output,
>+ 'Unexpected output during test enumeration.\n'
>+ 'Please ensure that LIST_TESTS_FLAG is assigned the\n'
>+ 'correct flag value for listing Google Test tests.')
>+
>+ self.assert_(os.path.exists(shard_status_file))
>+ os.remove(shard_status_file)
>+
>+ if SUPPORTS_DEATH_TESTS:
>+ def testShardingWorksWithDeathTests(self):
>+ """Tests integration with death tests and sharding."""
>+
>+ gtest_filter = 'HasDeathTest.*:SeqP/*'
>+ expected_tests = [
>+ 'HasDeathTest.Test1',
>+ 'HasDeathTest.Test2',
>+
>+ 'SeqP/ParamTest.TestX/0',
>+ 'SeqP/ParamTest.TestX/1',
>+ 'SeqP/ParamTest.TestY/0',
>+ 'SeqP/ParamTest.TestY/1',
>+ ]
>+
>+ for flag in ['--gtest_death_test_style=threadsafe',
>+ '--gtest_death_test_style=fast']:
>+ self.RunAndVerifyWithSharding(gtest_filter, 3, expected_tests,
>+ check_exit_0=True, args=[flag])
>+ self.RunAndVerifyWithSharding(gtest_filter, 5, expected_tests,
>+ check_exit_0=True, args=[flag])
>+
>+if __name__ == '__main__':
>+ gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/googletest-filter-unittest_.cc b/Source/ThirdParty/gtest/test/googletest-filter-unittest_.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..d335b60391d1d468a41161b38c14eccbf1d13805
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-filter-unittest_.cc
>@@ -0,0 +1,137 @@
>+// Copyright 2005, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+
>+// Unit test for Google Test test filters.
>+//
>+// A user can specify which test(s) in a Google Test program to run via
>+// either the GTEST_FILTER environment variable or the --gtest_filter
>+// flag. This is used for testing such functionality.
>+//
>+// The program will be invoked from a Python unit test. Don't run it
>+// directly.
>+
>+#include "gtest/gtest.h"
>+
>+namespace {
>+
>+// Test case FooTest.
>+
>+class FooTest : public testing::Test {
>+};
>+
>+TEST_F(FooTest, Abc) {
>+}
>+
>+TEST_F(FooTest, Xyz) {
>+ FAIL() << "Expected failure.";
>+}
>+
>+// Test case BarTest.
>+
>+TEST(BarTest, TestOne) {
>+}
>+
>+TEST(BarTest, TestTwo) {
>+}
>+
>+TEST(BarTest, TestThree) {
>+}
>+
>+TEST(BarTest, DISABLED_TestFour) {
>+ FAIL() << "Expected failure.";
>+}
>+
>+TEST(BarTest, DISABLED_TestFive) {
>+ FAIL() << "Expected failure.";
>+}
>+
>+// Test case BazTest.
>+
>+TEST(BazTest, TestOne) {
>+ FAIL() << "Expected failure.";
>+}
>+
>+TEST(BazTest, TestA) {
>+}
>+
>+TEST(BazTest, TestB) {
>+}
>+
>+TEST(BazTest, DISABLED_TestC) {
>+ FAIL() << "Expected failure.";
>+}
>+
>+// Test case HasDeathTest
>+
>+TEST(HasDeathTest, Test1) {
>+ EXPECT_DEATH_IF_SUPPORTED(exit(1), ".*");
>+}
>+
>+// We need at least two death tests to make sure that the all death tests
>+// aren't on the first shard.
>+TEST(HasDeathTest, Test2) {
>+ EXPECT_DEATH_IF_SUPPORTED(exit(1), ".*");
>+}
>+
>+// Test case FoobarTest
>+
>+TEST(DISABLED_FoobarTest, Test1) {
>+ FAIL() << "Expected failure.";
>+}
>+
>+TEST(DISABLED_FoobarTest, DISABLED_Test2) {
>+ FAIL() << "Expected failure.";
>+}
>+
>+// Test case FoobarbazTest
>+
>+TEST(DISABLED_FoobarbazTest, TestA) {
>+ FAIL() << "Expected failure.";
>+}
>+
>+class ParamTest : public testing::TestWithParam<int> {
>+};
>+
>+TEST_P(ParamTest, TestX) {
>+}
>+
>+TEST_P(ParamTest, TestY) {
>+}
>+
>+INSTANTIATE_TEST_CASE_P(SeqP, ParamTest, testing::Values(1, 2));
>+INSTANTIATE_TEST_CASE_P(SeqQ, ParamTest, testing::Values(5, 6));
>+
>+} // namespace
>+
>+int main(int argc, char **argv) {
>+ ::testing::InitGoogleTest(&argc, argv);
>+
>+ return RUN_ALL_TESTS();
>+}
>diff --git a/Source/ThirdParty/gtest/test/googletest-json-outfiles-test.py b/Source/ThirdParty/gtest/test/googletest-json-outfiles-test.py
>new file mode 100644
>index 0000000000000000000000000000000000000000..c99be48e8ac36509ed32ea2fb8e4fa1ea7fc8364
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-json-outfiles-test.py
>@@ -0,0 +1,162 @@
>+#!/usr/bin/env python
>+# Copyright 2018, Google Inc.
>+# All rights reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+"""Unit test for the gtest_json_output module."""
>+
>+import json
>+import os
>+import gtest_json_test_utils
>+import gtest_test_utils
>+
>+GTEST_OUTPUT_SUBDIR = 'json_outfiles'
>+GTEST_OUTPUT_1_TEST = 'gtest_xml_outfile1_test_'
>+GTEST_OUTPUT_2_TEST = 'gtest_xml_outfile2_test_'
>+
>+EXPECTED_1 = {
>+ u'tests': 1,
>+ u'failures': 0,
>+ u'disabled': 0,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'timestamp': u'*',
>+ u'name': u'AllTests',
>+ u'testsuites': [{
>+ u'name': u'PropertyOne',
>+ u'tests': 1,
>+ u'failures': 0,
>+ u'disabled': 0,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'testsuite': [{
>+ u'name': u'TestSomeProperties',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'PropertyOne',
>+ u'SetUpProp': u'1',
>+ u'TestSomeProperty': u'1',
>+ u'TearDownProp': u'1',
>+ }],
>+ }],
>+}
>+
>+EXPECTED_2 = {
>+ u'tests': 1,
>+ u'failures': 0,
>+ u'disabled': 0,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'timestamp': u'*',
>+ u'name': u'AllTests',
>+ u'testsuites': [{
>+ u'name': u'PropertyTwo',
>+ u'tests': 1,
>+ u'failures': 0,
>+ u'disabled': 0,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'testsuite': [{
>+ u'name': u'TestSomeProperties',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'PropertyTwo',
>+ u'SetUpProp': u'2',
>+ u'TestSomeProperty': u'2',
>+ u'TearDownProp': u'2',
>+ }],
>+ }],
>+}
>+
>+
>+class GTestJsonOutFilesTest(gtest_test_utils.TestCase):
>+ """Unit test for Google Test's JSON output functionality."""
>+
>+ def setUp(self):
>+ # We want the trailing '/' that the last "" provides in os.path.join, for
>+ # telling Google Test to create an output directory instead of a single file
>+ # for xml output.
>+ self.output_dir_ = os.path.join(gtest_test_utils.GetTempDir(),
>+ GTEST_OUTPUT_SUBDIR, '')
>+ self.DeleteFilesAndDir()
>+
>+ def tearDown(self):
>+ self.DeleteFilesAndDir()
>+
>+ def DeleteFilesAndDir(self):
>+ try:
>+ os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_1_TEST + '.json'))
>+ except os.error:
>+ pass
>+ try:
>+ os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_2_TEST + '.json'))
>+ except os.error:
>+ pass
>+ try:
>+ os.rmdir(self.output_dir_)
>+ except os.error:
>+ pass
>+
>+ def testOutfile1(self):
>+ self._TestOutFile(GTEST_OUTPUT_1_TEST, EXPECTED_1)
>+
>+ def testOutfile2(self):
>+ self._TestOutFile(GTEST_OUTPUT_2_TEST, EXPECTED_2)
>+
>+ def _TestOutFile(self, test_name, expected):
>+ gtest_prog_path = gtest_test_utils.GetTestExecutablePath(test_name)
>+ command = [gtest_prog_path, '--gtest_output=json:%s' % self.output_dir_]
>+ p = gtest_test_utils.Subprocess(command,
>+ working_dir=gtest_test_utils.GetTempDir())
>+ self.assert_(p.exited)
>+ self.assertEquals(0, p.exit_code)
>+
>+ # FIXME: libtool causes the built test binary to be
>+ # named lt-gtest_xml_outfiles_test_ instead of
>+ # gtest_xml_outfiles_test_. To account for this possibility, we
>+ # allow both names in the following code. We should remove this
>+ # when libtool replacement tool is ready.
>+ output_file_name1 = test_name + '.json'
>+ output_file1 = os.path.join(self.output_dir_, output_file_name1)
>+ output_file_name2 = 'lt-' + output_file_name1
>+ output_file2 = os.path.join(self.output_dir_, output_file_name2)
>+ self.assert_(os.path.isfile(output_file1) or os.path.isfile(output_file2),
>+ output_file1)
>+
>+ if os.path.isfile(output_file1):
>+ with open(output_file1) as f:
>+ actual = json.load(f)
>+ else:
>+ with open(output_file2) as f:
>+ actual = json.load(f)
>+ self.assertEqual(expected, gtest_json_test_utils.normalize(actual))
>+
>+
>+if __name__ == '__main__':
>+ os.environ['GTEST_STACK_TRACE_DEPTH'] = '0'
>+ gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/googletest-json-output-unittest.py b/Source/ThirdParty/gtest/test/googletest-json-output-unittest.py
>new file mode 100644
>index 0000000000000000000000000000000000000000..57dcd5fa1c4639f152fb54e50fb9c0598a0e46a0
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-json-output-unittest.py
>@@ -0,0 +1,618 @@
>+#!/usr/bin/env python
>+# Copyright 2018, Google Inc.
>+# All rights reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+"""Unit test for the gtest_json_output module."""
>+
>+import datetime
>+import errno
>+import json
>+import os
>+import re
>+import sys
>+
>+import gtest_json_test_utils
>+import gtest_test_utils
>+
>+GTEST_FILTER_FLAG = '--gtest_filter'
>+GTEST_LIST_TESTS_FLAG = '--gtest_list_tests'
>+GTEST_OUTPUT_FLAG = '--gtest_output'
>+GTEST_DEFAULT_OUTPUT_FILE = 'test_detail.json'
>+GTEST_PROGRAM_NAME = 'gtest_xml_output_unittest_'
>+
>+# The flag indicating stacktraces are not supported
>+NO_STACKTRACE_SUPPORT_FLAG = '--no_stacktrace_support'
>+
>+SUPPORTS_STACK_TRACES = NO_STACKTRACE_SUPPORT_FLAG not in sys.argv
>+
>+if SUPPORTS_STACK_TRACES:
>+ STACK_TRACE_TEMPLATE = '\nStack trace:\n*'
>+else:
>+ STACK_TRACE_TEMPLATE = ''
>+
>+EXPECTED_NON_EMPTY = {
>+ u'tests': 23,
>+ u'failures': 4,
>+ u'disabled': 2,
>+ u'errors': 0,
>+ u'timestamp': u'*',
>+ u'time': u'*',
>+ u'ad_hoc_property': u'42',
>+ u'name': u'AllTests',
>+ u'testsuites': [
>+ {
>+ u'name': u'SuccessfulTest',
>+ u'tests': 1,
>+ u'failures': 0,
>+ u'disabled': 0,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'testsuite': [
>+ {
>+ u'name': u'Succeeds',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'SuccessfulTest'
>+ }
>+ ]
>+ },
>+ {
>+ u'name': u'FailedTest',
>+ u'tests': 1,
>+ u'failures': 1,
>+ u'disabled': 0,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'testsuite': [
>+ {
>+ u'name': u'Fails',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'FailedTest',
>+ u'failures': [
>+ {
>+ u'failure':
>+ u'gtest_xml_output_unittest_.cc:*\n'
>+ u'Expected equality of these values:\n'
>+ u' 1\n 2' + STACK_TRACE_TEMPLATE,
>+ u'type': u''
>+ }
>+ ]
>+ }
>+ ]
>+ },
>+ {
>+ u'name': u'DisabledTest',
>+ u'tests': 1,
>+ u'failures': 0,
>+ u'disabled': 1,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'testsuite': [
>+ {
>+ u'name': u'DISABLED_test_not_run',
>+ u'status': u'NOTRUN',
>+ u'time': u'*',
>+ u'classname': u'DisabledTest'
>+ }
>+ ]
>+ },
>+ {
>+ u'name': u'MixedResultTest',
>+ u'tests': 3,
>+ u'failures': 1,
>+ u'disabled': 1,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'testsuite': [
>+ {
>+ u'name': u'Succeeds',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'MixedResultTest'
>+ },
>+ {
>+ u'name': u'Fails',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'MixedResultTest',
>+ u'failures': [
>+ {
>+ u'failure':
>+ u'gtest_xml_output_unittest_.cc:*\n'
>+ u'Expected equality of these values:\n'
>+ u' 1\n 2' + STACK_TRACE_TEMPLATE,
>+ u'type': u''
>+ },
>+ {
>+ u'failure':
>+ u'gtest_xml_output_unittest_.cc:*\n'
>+ u'Expected equality of these values:\n'
>+ u' 2\n 3' + STACK_TRACE_TEMPLATE,
>+ u'type': u''
>+ }
>+ ]
>+ },
>+ {
>+ u'name': u'DISABLED_test',
>+ u'status': u'NOTRUN',
>+ u'time': u'*',
>+ u'classname': u'MixedResultTest'
>+ }
>+ ]
>+ },
>+ {
>+ u'name': u'XmlQuotingTest',
>+ u'tests': 1,
>+ u'failures': 1,
>+ u'disabled': 0,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'testsuite': [
>+ {
>+ u'name': u'OutputsCData',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'XmlQuotingTest',
>+ u'failures': [
>+ {
>+ u'failure':
>+ u'gtest_xml_output_unittest_.cc:*\n'
>+ u'Failed\nXML output: <?xml encoding="utf-8">'
>+ u'<top><![CDATA[cdata text]]></top>' +
>+ STACK_TRACE_TEMPLATE,
>+ u'type': u''
>+ }
>+ ]
>+ }
>+ ]
>+ },
>+ {
>+ u'name': u'InvalidCharactersTest',
>+ u'tests': 1,
>+ u'failures': 1,
>+ u'disabled': 0,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'testsuite': [
>+ {
>+ u'name': u'InvalidCharactersInMessage',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'InvalidCharactersTest',
>+ u'failures': [
>+ {
>+ u'failure':
>+ u'gtest_xml_output_unittest_.cc:*\n'
>+ u'Failed\nInvalid characters in brackets'
>+ u' [\x01\x02]' + STACK_TRACE_TEMPLATE,
>+ u'type': u''
>+ }
>+ ]
>+ }
>+ ]
>+ },
>+ {
>+ u'name': u'PropertyRecordingTest',
>+ u'tests': 4,
>+ u'failures': 0,
>+ u'disabled': 0,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'SetUpTestCase': u'yes',
>+ u'TearDownTestCase': u'aye',
>+ u'testsuite': [
>+ {
>+ u'name': u'OneProperty',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'PropertyRecordingTest',
>+ u'key_1': u'1'
>+ },
>+ {
>+ u'name': u'IntValuedProperty',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'PropertyRecordingTest',
>+ u'key_int': u'1'
>+ },
>+ {
>+ u'name': u'ThreeProperties',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'PropertyRecordingTest',
>+ u'key_1': u'1',
>+ u'key_2': u'2',
>+ u'key_3': u'3'
>+ },
>+ {
>+ u'name': u'TwoValuesForOneKeyUsesLastValue',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'PropertyRecordingTest',
>+ u'key_1': u'2'
>+ }
>+ ]
>+ },
>+ {
>+ u'name': u'NoFixtureTest',
>+ u'tests': 3,
>+ u'failures': 0,
>+ u'disabled': 0,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'testsuite': [
>+ {
>+ u'name': u'RecordProperty',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'NoFixtureTest',
>+ u'key': u'1'
>+ },
>+ {
>+ u'name': u'ExternalUtilityThatCallsRecordIntValuedProperty',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'NoFixtureTest',
>+ u'key_for_utility_int': u'1'
>+ },
>+ {
>+ u'name':
>+ u'ExternalUtilityThatCallsRecordStringValuedProperty',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'NoFixtureTest',
>+ u'key_for_utility_string': u'1'
>+ }
>+ ]
>+ },
>+ {
>+ u'name': u'TypedTest/0',
>+ u'tests': 1,
>+ u'failures': 0,
>+ u'disabled': 0,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'testsuite': [
>+ {
>+ u'name': u'HasTypeParamAttribute',
>+ u'type_param': u'int',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'TypedTest/0'
>+ }
>+ ]
>+ },
>+ {
>+ u'name': u'TypedTest/1',
>+ u'tests': 1,
>+ u'failures': 0,
>+ u'disabled': 0,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'testsuite': [
>+ {
>+ u'name': u'HasTypeParamAttribute',
>+ u'type_param': u'long',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'TypedTest/1'
>+ }
>+ ]
>+ },
>+ {
>+ u'name': u'Single/TypeParameterizedTestCase/0',
>+ u'tests': 1,
>+ u'failures': 0,
>+ u'disabled': 0,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'testsuite': [
>+ {
>+ u'name': u'HasTypeParamAttribute',
>+ u'type_param': u'int',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'Single/TypeParameterizedTestCase/0'
>+ }
>+ ]
>+ },
>+ {
>+ u'name': u'Single/TypeParameterizedTestCase/1',
>+ u'tests': 1,
>+ u'failures': 0,
>+ u'disabled': 0,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'testsuite': [
>+ {
>+ u'name': u'HasTypeParamAttribute',
>+ u'type_param': u'long',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'Single/TypeParameterizedTestCase/1'
>+ }
>+ ]
>+ },
>+ {
>+ u'name': u'Single/ValueParamTest',
>+ u'tests': 4,
>+ u'failures': 0,
>+ u'disabled': 0,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'testsuite': [
>+ {
>+ u'name': u'HasValueParamAttribute/0',
>+ u'value_param': u'33',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'Single/ValueParamTest'
>+ },
>+ {
>+ u'name': u'HasValueParamAttribute/1',
>+ u'value_param': u'42',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'Single/ValueParamTest'
>+ },
>+ {
>+ u'name': u'AnotherTestThatHasValueParamAttribute/0',
>+ u'value_param': u'33',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'Single/ValueParamTest'
>+ },
>+ {
>+ u'name': u'AnotherTestThatHasValueParamAttribute/1',
>+ u'value_param': u'42',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'Single/ValueParamTest'
>+ }
>+ ]
>+ }
>+ ]
>+}
>+
>+EXPECTED_FILTERED = {
>+ u'tests': 1,
>+ u'failures': 0,
>+ u'disabled': 0,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'timestamp': u'*',
>+ u'name': u'AllTests',
>+ u'ad_hoc_property': u'42',
>+ u'testsuites': [{
>+ u'name': u'SuccessfulTest',
>+ u'tests': 1,
>+ u'failures': 0,
>+ u'disabled': 0,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'testsuite': [{
>+ u'name': u'Succeeds',
>+ u'status': u'RUN',
>+ u'time': u'*',
>+ u'classname': u'SuccessfulTest',
>+ }]
>+ }],
>+}
>+
>+EXPECTED_EMPTY = {
>+ u'tests': 0,
>+ u'failures': 0,
>+ u'disabled': 0,
>+ u'errors': 0,
>+ u'time': u'*',
>+ u'timestamp': u'*',
>+ u'name': u'AllTests',
>+ u'testsuites': [],
>+}
>+
>+GTEST_PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath(GTEST_PROGRAM_NAME)
>+
>+SUPPORTS_TYPED_TESTS = 'TypedTest' in gtest_test_utils.Subprocess(
>+ [GTEST_PROGRAM_PATH, GTEST_LIST_TESTS_FLAG], capture_stderr=False).output
>+
>+
>+class GTestJsonOutputUnitTest(gtest_test_utils.TestCase):
>+ """Unit test for Google Test's JSON output functionality.
>+ """
>+
>+ # This test currently breaks on platforms that do not support typed and
>+ # type-parameterized tests, so we don't run it under them.
>+ if SUPPORTS_TYPED_TESTS:
>+
>+ def testNonEmptyJsonOutput(self):
>+ """Verifies JSON output for a Google Test binary with non-empty output.
>+
>+ Runs a test program that generates a non-empty JSON output, and
>+ tests that the JSON output is expected.
>+ """
>+ self._TestJsonOutput(GTEST_PROGRAM_NAME, EXPECTED_NON_EMPTY, 1)
>+
>+ def testEmptyJsonOutput(self):
>+ """Verifies JSON output for a Google Test binary without actual tests.
>+
>+ Runs a test program that generates an empty JSON output, and
>+ tests that the JSON output is expected.
>+ """
>+
>+ self._TestJsonOutput('gtest_no_test_unittest', EXPECTED_EMPTY, 0)
>+
>+ def testTimestampValue(self):
>+ """Checks whether the timestamp attribute in the JSON output is valid.
>+
>+ Runs a test program that generates an empty JSON output, and checks if
>+ the timestamp attribute in the testsuites tag is valid.
>+ """
>+ actual = self._GetJsonOutput('gtest_no_test_unittest', [], 0)
>+ date_time_str = actual['timestamp']
>+ # datetime.strptime() is only available in Python 2.5+ so we have to
>+ # parse the expected datetime manually.
>+ match = re.match(r'(\d+)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)', date_time_str)
>+ self.assertTrue(
>+ re.match,
>+ 'JSON datettime string %s has incorrect format' % date_time_str)
>+ date_time_from_json = datetime.datetime(
>+ year=int(match.group(1)), month=int(match.group(2)),
>+ day=int(match.group(3)), hour=int(match.group(4)),
>+ minute=int(match.group(5)), second=int(match.group(6)))
>+
>+ time_delta = abs(datetime.datetime.now() - date_time_from_json)
>+ # timestamp value should be near the current local time
>+ self.assertTrue(time_delta < datetime.timedelta(seconds=600),
>+ 'time_delta is %s' % time_delta)
>+
>+ def testDefaultOutputFile(self):
>+ """Verifies the default output file name.
>+
>+ Confirms that Google Test produces an JSON output file with the expected
>+ default name if no name is explicitly specified.
>+ """
>+ output_file = os.path.join(gtest_test_utils.GetTempDir(),
>+ GTEST_DEFAULT_OUTPUT_FILE)
>+ gtest_prog_path = gtest_test_utils.GetTestExecutablePath(
>+ 'gtest_no_test_unittest')
>+ try:
>+ os.remove(output_file)
>+ except OSError:
>+ e = sys.exc_info()[1]
>+ if e.errno != errno.ENOENT:
>+ raise
>+
>+ p = gtest_test_utils.Subprocess(
>+ [gtest_prog_path, '%s=json' % GTEST_OUTPUT_FLAG],
>+ working_dir=gtest_test_utils.GetTempDir())
>+ self.assert_(p.exited)
>+ self.assertEquals(0, p.exit_code)
>+ self.assert_(os.path.isfile(output_file))
>+
>+ def testSuppressedJsonOutput(self):
>+ """Verifies that no JSON output is generated.
>+
>+ Tests that no JSON file is generated if the default JSON listener is
>+ shut down before RUN_ALL_TESTS is invoked.
>+ """
>+
>+ json_path = os.path.join(gtest_test_utils.GetTempDir(),
>+ GTEST_PROGRAM_NAME + 'out.json')
>+ if os.path.isfile(json_path):
>+ os.remove(json_path)
>+
>+ command = [GTEST_PROGRAM_PATH,
>+ '%s=json:%s' % (GTEST_OUTPUT_FLAG, json_path),
>+ '--shut_down_xml']
>+ p = gtest_test_utils.Subprocess(command)
>+ if p.terminated_by_signal:
>+ # p.signal is available only if p.terminated_by_signal is True.
>+ self.assertFalse(
>+ p.terminated_by_signal,
>+ '%s was killed by signal %d' % (GTEST_PROGRAM_NAME, p.signal))
>+ else:
>+ self.assert_(p.exited)
>+ self.assertEquals(1, p.exit_code,
>+ "'%s' exited with code %s, which doesn't match "
>+ 'the expected exit code %s.'
>+ % (command, p.exit_code, 1))
>+
>+ self.assert_(not os.path.isfile(json_path))
>+
>+ def testFilteredTestJsonOutput(self):
>+ """Verifies JSON output when a filter is applied.
>+
>+ Runs a test program that executes only some tests and verifies that
>+ non-selected tests do not show up in the JSON output.
>+ """
>+
>+ self._TestJsonOutput(GTEST_PROGRAM_NAME, EXPECTED_FILTERED, 0,
>+ extra_args=['%s=SuccessfulTest.*' % GTEST_FILTER_FLAG])
>+
>+ def _GetJsonOutput(self, gtest_prog_name, extra_args, expected_exit_code):
>+ """Returns the JSON output generated by running the program gtest_prog_name.
>+
>+ Furthermore, the program's exit code must be expected_exit_code.
>+
>+ Args:
>+ gtest_prog_name: Google Test binary name.
>+ extra_args: extra arguments to binary invocation.
>+ expected_exit_code: program's exit code.
>+ """
>+ json_path = os.path.join(gtest_test_utils.GetTempDir(),
>+ gtest_prog_name + 'out.json')
>+ gtest_prog_path = gtest_test_utils.GetTestExecutablePath(gtest_prog_name)
>+
>+ command = (
>+ [gtest_prog_path, '%s=json:%s' % (GTEST_OUTPUT_FLAG, json_path)] +
>+ extra_args
>+ )
>+ p = gtest_test_utils.Subprocess(command)
>+ if p.terminated_by_signal:
>+ self.assert_(False,
>+ '%s was killed by signal %d' % (gtest_prog_name, p.signal))
>+ else:
>+ self.assert_(p.exited)
>+ self.assertEquals(expected_exit_code, p.exit_code,
>+ "'%s' exited with code %s, which doesn't match "
>+ 'the expected exit code %s.'
>+ % (command, p.exit_code, expected_exit_code))
>+ with open(json_path) as f:
>+ actual = json.load(f)
>+ return actual
>+
>+ def _TestJsonOutput(self, gtest_prog_name, expected,
>+ expected_exit_code, extra_args=None):
>+ """Checks the JSON output generated by the Google Test binary.
>+
>+ Asserts that the JSON document generated by running the program
>+ gtest_prog_name matches expected_json, a string containing another
>+ JSON document. Furthermore, the program's exit code must be
>+ expected_exit_code.
>+
>+ Args:
>+ gtest_prog_name: Google Test binary name.
>+ expected: expected output.
>+ expected_exit_code: program's exit code.
>+ extra_args: extra arguments to binary invocation.
>+ """
>+
>+ actual = self._GetJsonOutput(gtest_prog_name, extra_args or [],
>+ expected_exit_code)
>+ self.assertEqual(expected, gtest_json_test_utils.normalize(actual))
>+
>+
>+if __name__ == '__main__':
>+ if NO_STACKTRACE_SUPPORT_FLAG in sys.argv:
>+ # unittest.main() can't handle unknown flags
>+ sys.argv.remove(NO_STACKTRACE_SUPPORT_FLAG)
>+
>+ os.environ['GTEST_STACK_TRACE_DEPTH'] = '1'
>+ gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/googletest-linked-ptr-test.cc b/Source/ThirdParty/gtest/test/googletest-linked-ptr-test.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..fa00f34296bd5794c164479f22a88dd4f736001d
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-linked-ptr-test.cc
>@@ -0,0 +1,151 @@
>+// Copyright 2003, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+#include <stdlib.h>
>+
>+#include "gtest/internal/gtest-linked_ptr.h"
>+#include "gtest/gtest.h"
>+
>+namespace {
>+
>+using testing::Message;
>+using testing::internal::linked_ptr;
>+
>+int num;
>+Message* history = NULL;
>+
>+// Class which tracks allocation/deallocation
>+class A {
>+ public:
>+ A(): mynum(num++) { *history << "A" << mynum << " ctor\n"; }
>+ virtual ~A() { *history << "A" << mynum << " dtor\n"; }
>+ virtual void Use() { *history << "A" << mynum << " use\n"; }
>+ protected:
>+ int mynum;
>+};
>+
>+// Subclass
>+class B : public A {
>+ public:
>+ B() { *history << "B" << mynum << " ctor\n"; }
>+ ~B() { *history << "B" << mynum << " dtor\n"; }
>+ virtual void Use() { *history << "B" << mynum << " use\n"; }
>+};
>+
>+class LinkedPtrTest : public testing::Test {
>+ public:
>+ LinkedPtrTest() {
>+ num = 0;
>+ history = new Message;
>+ }
>+
>+ virtual ~LinkedPtrTest() {
>+ delete history;
>+ history = NULL;
>+ }
>+};
>+
>+TEST_F(LinkedPtrTest, GeneralTest) {
>+ {
>+ linked_ptr<A> a0, a1, a2;
>+ // Use explicit function call notation here to suppress self-assign warning.
>+ a0.operator=(a0);
>+ a1 = a2;
>+ ASSERT_EQ(a0.get(), static_cast<A*>(NULL));
>+ ASSERT_EQ(a1.get(), static_cast<A*>(NULL));
>+ ASSERT_EQ(a2.get(), static_cast<A*>(NULL));
>+ ASSERT_TRUE(a0 == NULL);
>+ ASSERT_TRUE(a1 == NULL);
>+ ASSERT_TRUE(a2 == NULL);
>+
>+ {
>+ linked_ptr<A> a3(new A);
>+ a0 = a3;
>+ ASSERT_TRUE(a0 == a3);
>+ ASSERT_TRUE(a0 != NULL);
>+ ASSERT_TRUE(a0.get() == a3);
>+ ASSERT_TRUE(a0 == a3.get());
>+ linked_ptr<A> a4(a0);
>+ a1 = a4;
>+ linked_ptr<A> a5(new A);
>+ ASSERT_TRUE(a5.get() != a3);
>+ ASSERT_TRUE(a5 != a3.get());
>+ a2 = a5;
>+ linked_ptr b0(new B);
>+ linked_ptr<A> a6(b0);
>+ ASSERT_TRUE(b0 == a6);
>+ ASSERT_TRUE(a6 == b0);
>+ ASSERT_TRUE(b0 != NULL);
>+ a5 = b0;
>+ a5 = b0;
>+ a3->Use();
>+ a4->Use();
>+ a5->Use();
>+ a6->Use();
>+ b0->Use();
>+ (*b0).Use();
>+ b0.get()->Use();
>+ }
>+
>+ a0->Use();
>+ a1->Use();
>+ a2->Use();
>+
>+ a1 = a2;
>+ a2.reset(new A);
>+ a0.reset();
>+
>+ linked_ptr<A> a7;
>+ }
>+
>+ ASSERT_STREQ(
>+ "A0 ctor\n"
>+ "A1 ctor\n"
>+ "A2 ctor\n"
>+ "B2 ctor\n"
>+ "A0 use\n"
>+ "A0 use\n"
>+ "B2 use\n"
>+ "B2 use\n"
>+ "B2 use\n"
>+ "B2 use\n"
>+ "B2 use\n"
>+ "B2 dtor\n"
>+ "A2 dtor\n"
>+ "A0 use\n"
>+ "A0 use\n"
>+ "A1 use\n"
>+ "A3 ctor\n"
>+ "A0 dtor\n"
>+ "A3 dtor\n"
>+ "A1 dtor\n",
>+ history->GetString().c_str());
>+}
>+
>+} // Unnamed namespace
>diff --git a/Source/ThirdParty/gtest/test/googletest-list-tests-unittest.py b/Source/ThirdParty/gtest/test/googletest-list-tests-unittest.py
>new file mode 100755
>index 0000000000000000000000000000000000000000..81423a339e8fd28aa2b4253013b3c23ce3533749
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-list-tests-unittest.py
>@@ -0,0 +1,205 @@
>+#!/usr/bin/env python
>+#
>+# Copyright 2006, Google Inc.
>+# All rights reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+"""Unit test for Google Test's --gtest_list_tests flag.
>+
>+A user can ask Google Test to list all tests by specifying the
>+--gtest_list_tests flag. This script tests such functionality
>+by invoking googletest-list-tests-unittest_ (a program written with
>+Google Test) the command line flags.
>+"""
>+
>+import re
>+import gtest_test_utils
>+
>+# Constants.
>+
>+# The command line flag for enabling/disabling listing all tests.
>+LIST_TESTS_FLAG = 'gtest_list_tests'
>+
>+# Path to the googletest-list-tests-unittest_ program.
>+EXE_PATH = gtest_test_utils.GetTestExecutablePath('googletest-list-tests-unittest_')
>+
>+# The expected output when running googletest-list-tests-unittest_ with
>+# --gtest_list_tests
>+EXPECTED_OUTPUT_NO_FILTER_RE = re.compile(r"""FooDeathTest\.
>+ Test1
>+Foo\.
>+ Bar1
>+ Bar2
>+ DISABLED_Bar3
>+Abc\.
>+ Xyz
>+ Def
>+FooBar\.
>+ Baz
>+FooTest\.
>+ Test1
>+ DISABLED_Test2
>+ Test3
>+TypedTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\.
>+ TestA
>+ TestB
>+TypedTest/1\. # TypeParam = int\s*\*( __ptr64)?
>+ TestA
>+ TestB
>+TypedTest/2\. # TypeParam = .*MyArray<bool,\s*42>
>+ TestA
>+ TestB
>+My/TypeParamTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\.
>+ TestA
>+ TestB
>+My/TypeParamTest/1\. # TypeParam = int\s*\*( __ptr64)?
>+ TestA
>+ TestB
>+My/TypeParamTest/2\. # TypeParam = .*MyArray<bool,\s*42>
>+ TestA
>+ TestB
>+MyInstantiation/ValueParamTest\.
>+ TestA/0 # GetParam = one line
>+ TestA/1 # GetParam = two\\nlines
>+ TestA/2 # GetParam = a very\\nlo{241}\.\.\.
>+ TestB/0 # GetParam = one line
>+ TestB/1 # GetParam = two\\nlines
>+ TestB/2 # GetParam = a very\\nlo{241}\.\.\.
>+""")
>+
>+# The expected output when running googletest-list-tests-unittest_ with
>+# --gtest_list_tests and --gtest_filter=Foo*.
>+EXPECTED_OUTPUT_FILTER_FOO_RE = re.compile(r"""FooDeathTest\.
>+ Test1
>+Foo\.
>+ Bar1
>+ Bar2
>+ DISABLED_Bar3
>+FooBar\.
>+ Baz
>+FooTest\.
>+ Test1
>+ DISABLED_Test2
>+ Test3
>+""")
>+
>+# Utilities.
>+
>+
>+def Run(args):
>+ """Runs googletest-list-tests-unittest_ and returns the list of tests printed."""
>+
>+ return gtest_test_utils.Subprocess([EXE_PATH] + args,
>+ capture_stderr=False).output
>+
>+
>+# The unit test.
>+
>+
>+class GTestListTestsUnitTest(gtest_test_utils.TestCase):
>+ """Tests using the --gtest_list_tests flag to list all tests."""
>+
>+ def RunAndVerify(self, flag_value, expected_output_re, other_flag):
>+ """Runs googletest-list-tests-unittest_ and verifies that it prints
>+ the correct tests.
>+
>+ Args:
>+ flag_value: value of the --gtest_list_tests flag;
>+ None if the flag should not be present.
>+ expected_output_re: regular expression that matches the expected
>+ output after running command;
>+ other_flag: a different flag to be passed to command
>+ along with gtest_list_tests;
>+ None if the flag should not be present.
>+ """
>+
>+ if flag_value is None:
>+ flag = ''
>+ flag_expression = 'not set'
>+ elif flag_value == '0':
>+ flag = '--%s=0' % LIST_TESTS_FLAG
>+ flag_expression = '0'
>+ else:
>+ flag = '--%s' % LIST_TESTS_FLAG
>+ flag_expression = '1'
>+
>+ args = [flag]
>+
>+ if other_flag is not None:
>+ args += [other_flag]
>+
>+ output = Run(args)
>+
>+ if expected_output_re:
>+ self.assert_(
>+ expected_output_re.match(output),
>+ ('when %s is %s, the output of "%s" is "%s",\n'
>+ 'which does not match regex "%s"' %
>+ (LIST_TESTS_FLAG, flag_expression, ' '.join(args), output,
>+ expected_output_re.pattern)))
>+ else:
>+ self.assert_(
>+ not EXPECTED_OUTPUT_NO_FILTER_RE.match(output),
>+ ('when %s is %s, the output of "%s" is "%s"'%
>+ (LIST_TESTS_FLAG, flag_expression, ' '.join(args), output)))
>+
>+ def testDefaultBehavior(self):
>+ """Tests the behavior of the default mode."""
>+
>+ self.RunAndVerify(flag_value=None,
>+ expected_output_re=None,
>+ other_flag=None)
>+
>+ def testFlag(self):
>+ """Tests using the --gtest_list_tests flag."""
>+
>+ self.RunAndVerify(flag_value='0',
>+ expected_output_re=None,
>+ other_flag=None)
>+ self.RunAndVerify(flag_value='1',
>+ expected_output_re=EXPECTED_OUTPUT_NO_FILTER_RE,
>+ other_flag=None)
>+
>+ def testOverrideNonFilterFlags(self):
>+ """Tests that --gtest_list_tests overrides the non-filter flags."""
>+
>+ self.RunAndVerify(flag_value='1',
>+ expected_output_re=EXPECTED_OUTPUT_NO_FILTER_RE,
>+ other_flag='--gtest_break_on_failure')
>+
>+ def testWithFilterFlags(self):
>+ """Tests that --gtest_list_tests takes into account the
>+ --gtest_filter flag."""
>+
>+ self.RunAndVerify(flag_value='1',
>+ expected_output_re=EXPECTED_OUTPUT_FILTER_FOO_RE,
>+ other_flag='--gtest_filter=Foo*')
>+
>+
>+if __name__ == '__main__':
>+ gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/googletest-list-tests-unittest_.cc b/Source/ThirdParty/gtest/test/googletest-list-tests-unittest_.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..f473c7d1a45f1f196b137483b053ca598007d288
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-list-tests-unittest_.cc
>@@ -0,0 +1,156 @@
>+// Copyright 2006, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+
>+// Unit test for Google Test's --gtest_list_tests flag.
>+//
>+// A user can ask Google Test to list all tests that will run
>+// so that when using a filter, a user will know what
>+// tests to look for. The tests will not be run after listing.
>+//
>+// This program will be invoked from a Python unit test.
>+// Don't run it directly.
>+
>+#include "gtest/gtest.h"
>+
>+// Several different test cases and tests that will be listed.
>+TEST(Foo, Bar1) {
>+}
>+
>+TEST(Foo, Bar2) {
>+}
>+
>+TEST(Foo, DISABLED_Bar3) {
>+}
>+
>+TEST(Abc, Xyz) {
>+}
>+
>+TEST(Abc, Def) {
>+}
>+
>+TEST(FooBar, Baz) {
>+}
>+
>+class FooTest : public testing::Test {
>+};
>+
>+TEST_F(FooTest, Test1) {
>+}
>+
>+TEST_F(FooTest, DISABLED_Test2) {
>+}
>+
>+TEST_F(FooTest, Test3) {
>+}
>+
>+TEST(FooDeathTest, Test1) {
>+}
>+
>+// A group of value-parameterized tests.
>+
>+class MyType {
>+ public:
>+ explicit MyType(const std::string& a_value) : value_(a_value) {}
>+
>+ const std::string& value() const { return value_; }
>+
>+ private:
>+ std::string value_;
>+};
>+
>+// Teaches Google Test how to print a MyType.
>+void PrintTo(const MyType& x, std::ostream* os) {
>+ *os << x.value();
>+}
>+
>+class ValueParamTest : public testing::TestWithParam<MyType> {
>+};
>+
>+TEST_P(ValueParamTest, TestA) {
>+}
>+
>+TEST_P(ValueParamTest, TestB) {
>+}
>+
>+INSTANTIATE_TEST_CASE_P(
>+ MyInstantiation, ValueParamTest,
>+ testing::Values(MyType("one line"),
>+ MyType("two\nlines"),
>+ MyType("a very\nloooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong line"))); // NOLINT
>+
>+// A group of typed tests.
>+
>+// A deliberately long type name for testing the line-truncating
>+// behavior when printing a type parameter.
>+class VeryLoooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooogName { // NOLINT
>+};
>+
>+template <typename T>
>+class TypedTest : public testing::Test {
>+};
>+
>+template <typename T, int kSize>
>+class MyArray {
>+};
>+
>+typedef testing::Types<VeryLoooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooogName, // NOLINT
>+ int*, MyArray<bool, 42> > MyTypes;
>+
>+TYPED_TEST_CASE(TypedTest, MyTypes);
>+
>+TYPED_TEST(TypedTest, TestA) {
>+}
>+
>+TYPED_TEST(TypedTest, TestB) {
>+}
>+
>+// A group of type-parameterized tests.
>+
>+template <typename T>
>+class TypeParamTest : public testing::Test {
>+};
>+
>+TYPED_TEST_CASE_P(TypeParamTest);
>+
>+TYPED_TEST_P(TypeParamTest, TestA) {
>+}
>+
>+TYPED_TEST_P(TypeParamTest, TestB) {
>+}
>+
>+REGISTER_TYPED_TEST_CASE_P(TypeParamTest, TestA, TestB);
>+
>+INSTANTIATE_TYPED_TEST_CASE_P(My, TypeParamTest, MyTypes);
>+
>+int main(int argc, char **argv) {
>+ ::testing::InitGoogleTest(&argc, argv);
>+
>+ return RUN_ALL_TESTS();
>+}
>diff --git a/Source/ThirdParty/gtest/test/googletest-listener-test.cc b/Source/ThirdParty/gtest/test/googletest-listener-test.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..8355597151d09d6c315671f42db66cc4bd4850fd
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-listener-test.cc
>@@ -0,0 +1,311 @@
>+// Copyright 2009 Google Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+//
>+// The Google C++ Testing and Mocking Framework (Google Test)
>+//
>+// This file verifies Google Test event listeners receive events at the
>+// right times.
>+
>+#include <vector>
>+
>+#include "gtest/gtest.h"
>+
>+using ::testing::AddGlobalTestEnvironment;
>+using ::testing::Environment;
>+using ::testing::InitGoogleTest;
>+using ::testing::Test;
>+using ::testing::TestCase;
>+using ::testing::TestEventListener;
>+using ::testing::TestInfo;
>+using ::testing::TestPartResult;
>+using ::testing::UnitTest;
>+
>+// Used by tests to register their events.
>+std::vector<std::string>* g_events = NULL;
>+
>+namespace testing {
>+namespace internal {
>+
>+class EventRecordingListener : public TestEventListener {
>+ public:
>+ explicit EventRecordingListener(const char* name) : name_(name) {}
>+
>+ protected:
>+ virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {
>+ g_events->push_back(GetFullMethodName("OnTestProgramStart"));
>+ }
>+
>+ virtual void OnTestIterationStart(const UnitTest& /*unit_test*/,
>+ int iteration) {
>+ Message message;
>+ message << GetFullMethodName("OnTestIterationStart")
>+ << "(" << iteration << ")";
>+ g_events->push_back(message.GetString());
>+ }
>+
>+ virtual void OnEnvironmentsSetUpStart(const UnitTest& /*unit_test*/) {
>+ g_events->push_back(GetFullMethodName("OnEnvironmentsSetUpStart"));
>+ }
>+
>+ virtual void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) {
>+ g_events->push_back(GetFullMethodName("OnEnvironmentsSetUpEnd"));
>+ }
>+
>+ virtual void OnTestCaseStart(const TestCase& /*test_case*/) {
>+ g_events->push_back(GetFullMethodName("OnTestCaseStart"));
>+ }
>+
>+ virtual void OnTestStart(const TestInfo& /*test_info*/) {
>+ g_events->push_back(GetFullMethodName("OnTestStart"));
>+ }
>+
>+ virtual void OnTestPartResult(const TestPartResult& /*test_part_result*/) {
>+ g_events->push_back(GetFullMethodName("OnTestPartResult"));
>+ }
>+
>+ virtual void OnTestEnd(const TestInfo& /*test_info*/) {
>+ g_events->push_back(GetFullMethodName("OnTestEnd"));
>+ }
>+
>+ virtual void OnTestCaseEnd(const TestCase& /*test_case*/) {
>+ g_events->push_back(GetFullMethodName("OnTestCaseEnd"));
>+ }
>+
>+ virtual void OnEnvironmentsTearDownStart(const UnitTest& /*unit_test*/) {
>+ g_events->push_back(GetFullMethodName("OnEnvironmentsTearDownStart"));
>+ }
>+
>+ virtual void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) {
>+ g_events->push_back(GetFullMethodName("OnEnvironmentsTearDownEnd"));
>+ }
>+
>+ virtual void OnTestIterationEnd(const UnitTest& /*unit_test*/,
>+ int iteration) {
>+ Message message;
>+ message << GetFullMethodName("OnTestIterationEnd")
>+ << "(" << iteration << ")";
>+ g_events->push_back(message.GetString());
>+ }
>+
>+ virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) {
>+ g_events->push_back(GetFullMethodName("OnTestProgramEnd"));
>+ }
>+
>+ private:
>+ std::string GetFullMethodName(const char* name) {
>+ return name_ + "." + name;
>+ }
>+
>+ std::string name_;
>+};
>+
>+class EnvironmentInvocationCatcher : public Environment {
>+ protected:
>+ virtual void SetUp() {
>+ g_events->push_back("Environment::SetUp");
>+ }
>+
>+ virtual void TearDown() {
>+ g_events->push_back("Environment::TearDown");
>+ }
>+};
>+
>+class ListenerTest : public Test {
>+ protected:
>+ static void SetUpTestCase() {
>+ g_events->push_back("ListenerTest::SetUpTestCase");
>+ }
>+
>+ static void TearDownTestCase() {
>+ g_events->push_back("ListenerTest::TearDownTestCase");
>+ }
>+
>+ virtual void SetUp() {
>+ g_events->push_back("ListenerTest::SetUp");
>+ }
>+
>+ virtual void TearDown() {
>+ g_events->push_back("ListenerTest::TearDown");
>+ }
>+};
>+
>+TEST_F(ListenerTest, DoesFoo) {
>+ // Test execution order within a test case is not guaranteed so we are not
>+ // recording the test name.
>+ g_events->push_back("ListenerTest::* Test Body");
>+ SUCCEED(); // Triggers OnTestPartResult.
>+}
>+
>+TEST_F(ListenerTest, DoesBar) {
>+ g_events->push_back("ListenerTest::* Test Body");
>+ SUCCEED(); // Triggers OnTestPartResult.
>+}
>+
>+} // namespace internal
>+
>+} // namespace testing
>+
>+using ::testing::internal::EnvironmentInvocationCatcher;
>+using ::testing::internal::EventRecordingListener;
>+
>+void VerifyResults(const std::vector<std::string>& data,
>+ const char* const* expected_data,
>+ size_t expected_data_size) {
>+ const size_t actual_size = data.size();
>+ // If the following assertion fails, a new entry will be appended to
>+ // data. Hence we save data.size() first.
>+ EXPECT_EQ(expected_data_size, actual_size);
>+
>+ // Compares the common prefix.
>+ const size_t shorter_size = expected_data_size <= actual_size ?
>+ expected_data_size : actual_size;
>+ size_t i = 0;
>+ for (; i < shorter_size; ++i) {
>+ ASSERT_STREQ(expected_data[i], data[i].c_str())
>+ << "at position " << i;
>+ }
>+
>+ // Prints extra elements in the actual data.
>+ for (; i < actual_size; ++i) {
>+ printf(" Actual event #%lu: %s\n",
>+ static_cast<unsigned long>(i), data[i].c_str());
>+ }
>+}
>+
>+int main(int argc, char **argv) {
>+ std::vector<std::string> events;
>+ g_events = &events;
>+ InitGoogleTest(&argc, argv);
>+
>+ UnitTest::GetInstance()->listeners().Append(
>+ new EventRecordingListener("1st"));
>+ UnitTest::GetInstance()->listeners().Append(
>+ new EventRecordingListener("2nd"));
>+
>+ AddGlobalTestEnvironment(new EnvironmentInvocationCatcher);
>+
>+ GTEST_CHECK_(events.size() == 0)
>+ << "AddGlobalTestEnvironment should not generate any events itself.";
>+
>+ ::testing::GTEST_FLAG(repeat) = 2;
>+ int ret_val = RUN_ALL_TESTS();
>+
>+ const char* const expected_events[] = {
>+ "1st.OnTestProgramStart",
>+ "2nd.OnTestProgramStart",
>+ "1st.OnTestIterationStart(0)",
>+ "2nd.OnTestIterationStart(0)",
>+ "1st.OnEnvironmentsSetUpStart",
>+ "2nd.OnEnvironmentsSetUpStart",
>+ "Environment::SetUp",
>+ "2nd.OnEnvironmentsSetUpEnd",
>+ "1st.OnEnvironmentsSetUpEnd",
>+ "1st.OnTestCaseStart",
>+ "2nd.OnTestCaseStart",
>+ "ListenerTest::SetUpTestCase",
>+ "1st.OnTestStart",
>+ "2nd.OnTestStart",
>+ "ListenerTest::SetUp",
>+ "ListenerTest::* Test Body",
>+ "1st.OnTestPartResult",
>+ "2nd.OnTestPartResult",
>+ "ListenerTest::TearDown",
>+ "2nd.OnTestEnd",
>+ "1st.OnTestEnd",
>+ "1st.OnTestStart",
>+ "2nd.OnTestStart",
>+ "ListenerTest::SetUp",
>+ "ListenerTest::* Test Body",
>+ "1st.OnTestPartResult",
>+ "2nd.OnTestPartResult",
>+ "ListenerTest::TearDown",
>+ "2nd.OnTestEnd",
>+ "1st.OnTestEnd",
>+ "ListenerTest::TearDownTestCase",
>+ "2nd.OnTestCaseEnd",
>+ "1st.OnTestCaseEnd",
>+ "1st.OnEnvironmentsTearDownStart",
>+ "2nd.OnEnvironmentsTearDownStart",
>+ "Environment::TearDown",
>+ "2nd.OnEnvironmentsTearDownEnd",
>+ "1st.OnEnvironmentsTearDownEnd",
>+ "2nd.OnTestIterationEnd(0)",
>+ "1st.OnTestIterationEnd(0)",
>+ "1st.OnTestIterationStart(1)",
>+ "2nd.OnTestIterationStart(1)",
>+ "1st.OnEnvironmentsSetUpStart",
>+ "2nd.OnEnvironmentsSetUpStart",
>+ "Environment::SetUp",
>+ "2nd.OnEnvironmentsSetUpEnd",
>+ "1st.OnEnvironmentsSetUpEnd",
>+ "1st.OnTestCaseStart",
>+ "2nd.OnTestCaseStart",
>+ "ListenerTest::SetUpTestCase",
>+ "1st.OnTestStart",
>+ "2nd.OnTestStart",
>+ "ListenerTest::SetUp",
>+ "ListenerTest::* Test Body",
>+ "1st.OnTestPartResult",
>+ "2nd.OnTestPartResult",
>+ "ListenerTest::TearDown",
>+ "2nd.OnTestEnd",
>+ "1st.OnTestEnd",
>+ "1st.OnTestStart",
>+ "2nd.OnTestStart",
>+ "ListenerTest::SetUp",
>+ "ListenerTest::* Test Body",
>+ "1st.OnTestPartResult",
>+ "2nd.OnTestPartResult",
>+ "ListenerTest::TearDown",
>+ "2nd.OnTestEnd",
>+ "1st.OnTestEnd",
>+ "ListenerTest::TearDownTestCase",
>+ "2nd.OnTestCaseEnd",
>+ "1st.OnTestCaseEnd",
>+ "1st.OnEnvironmentsTearDownStart",
>+ "2nd.OnEnvironmentsTearDownStart",
>+ "Environment::TearDown",
>+ "2nd.OnEnvironmentsTearDownEnd",
>+ "1st.OnEnvironmentsTearDownEnd",
>+ "2nd.OnTestIterationEnd(1)",
>+ "1st.OnTestIterationEnd(1)",
>+ "2nd.OnTestProgramEnd",
>+ "1st.OnTestProgramEnd"
>+ };
>+ VerifyResults(events,
>+ expected_events,
>+ sizeof(expected_events)/sizeof(expected_events[0]));
>+
>+ // We need to check manually for ad hoc test failures that happen after
>+ // RUN_ALL_TESTS finishes.
>+ if (UnitTest::GetInstance()->Failed())
>+ ret_val = 1;
>+
>+ return ret_val;
>+}
>diff --git a/Source/ThirdParty/gtest/test/googletest-message-test.cc b/Source/ThirdParty/gtest/test/googletest-message-test.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..c6445853e433d3c14345257391a6b988a9d380ef
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-message-test.cc
>@@ -0,0 +1,158 @@
>+// Copyright 2005, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+//
>+// Tests for the Message class.
>+
>+#include "gtest/gtest-message.h"
>+
>+#include "gtest/gtest.h"
>+
>+namespace {
>+
>+using ::testing::Message;
>+
>+// Tests the testing::Message class
>+
>+// Tests the default constructor.
>+TEST(MessageTest, DefaultConstructor) {
>+ const Message msg;
>+ EXPECT_EQ("", msg.GetString());
>+}
>+
>+// Tests the copy constructor.
>+TEST(MessageTest, CopyConstructor) {
>+ const Message msg1("Hello");
>+ const Message msg2(msg1);
>+ EXPECT_EQ("Hello", msg2.GetString());
>+}
>+
>+// Tests constructing a Message from a C-string.
>+TEST(MessageTest, ConstructsFromCString) {
>+ Message msg("Hello");
>+ EXPECT_EQ("Hello", msg.GetString());
>+}
>+
>+// Tests streaming a float.
>+TEST(MessageTest, StreamsFloat) {
>+ const std::string s = (Message() << 1.23456F << " " << 2.34567F).GetString();
>+ // Both numbers should be printed with enough precision.
>+ EXPECT_PRED_FORMAT2(testing::IsSubstring, "1.234560", s.c_str());
>+ EXPECT_PRED_FORMAT2(testing::IsSubstring, " 2.345669", s.c_str());
>+}
>+
>+// Tests streaming a double.
>+TEST(MessageTest, StreamsDouble) {
>+ const std::string s = (Message() << 1260570880.4555497 << " "
>+ << 1260572265.1954534).GetString();
>+ // Both numbers should be printed with enough precision.
>+ EXPECT_PRED_FORMAT2(testing::IsSubstring, "1260570880.45", s.c_str());
>+ EXPECT_PRED_FORMAT2(testing::IsSubstring, " 1260572265.19", s.c_str());
>+}
>+
>+// Tests streaming a non-char pointer.
>+TEST(MessageTest, StreamsPointer) {
>+ int n = 0;
>+ int* p = &n;
>+ EXPECT_NE("(null)", (Message() << p).GetString());
>+}
>+
>+// Tests streaming a NULL non-char pointer.
>+TEST(MessageTest, StreamsNullPointer) {
>+ int* p = NULL;
>+ EXPECT_EQ("(null)", (Message() << p).GetString());
>+}
>+
>+// Tests streaming a C string.
>+TEST(MessageTest, StreamsCString) {
>+ EXPECT_EQ("Foo", (Message() << "Foo").GetString());
>+}
>+
>+// Tests streaming a NULL C string.
>+TEST(MessageTest, StreamsNullCString) {
>+ char* p = NULL;
>+ EXPECT_EQ("(null)", (Message() << p).GetString());
>+}
>+
>+// Tests streaming std::string.
>+TEST(MessageTest, StreamsString) {
>+ const ::std::string str("Hello");
>+ EXPECT_EQ("Hello", (Message() << str).GetString());
>+}
>+
>+// Tests that we can output strings containing embedded NULs.
>+TEST(MessageTest, StreamsStringWithEmbeddedNUL) {
>+ const char char_array_with_nul[] =
>+ "Here's a NUL\0 and some more string";
>+ const ::std::string string_with_nul(char_array_with_nul,
>+ sizeof(char_array_with_nul) - 1);
>+ EXPECT_EQ("Here's a NUL\\0 and some more string",
>+ (Message() << string_with_nul).GetString());
>+}
>+
>+// Tests streaming a NUL char.
>+TEST(MessageTest, StreamsNULChar) {
>+ EXPECT_EQ("\\0", (Message() << '\0').GetString());
>+}
>+
>+// Tests streaming int.
>+TEST(MessageTest, StreamsInt) {
>+ EXPECT_EQ("123", (Message() << 123).GetString());
>+}
>+
>+// Tests that basic IO manipulators (endl, ends, and flush) can be
>+// streamed to Message.
>+TEST(MessageTest, StreamsBasicIoManip) {
>+ EXPECT_EQ("Line 1.\nA NUL char \\0 in line 2.",
>+ (Message() << "Line 1." << std::endl
>+ << "A NUL char " << std::ends << std::flush
>+ << " in line 2.").GetString());
>+}
>+
>+// Tests Message::GetString()
>+TEST(MessageTest, GetString) {
>+ Message msg;
>+ msg << 1 << " lamb";
>+ EXPECT_EQ("1 lamb", msg.GetString());
>+}
>+
>+// Tests streaming a Message object to an ostream.
>+TEST(MessageTest, StreamsToOStream) {
>+ Message msg("Hello");
>+ ::std::stringstream ss;
>+ ss << msg;
>+ EXPECT_EQ("Hello", testing::internal::StringStreamToString(&ss));
>+}
>+
>+// Tests that a Message object doesn't take up too much stack space.
>+TEST(MessageTest, DoesNotTakeUpMuchStackSpace) {
>+ EXPECT_LE(sizeof(Message), 16U);
>+}
>+
>+} // namespace
>diff --git a/Source/ThirdParty/gtest/test/googletest-options-test.cc b/Source/ThirdParty/gtest/test/googletest-options-test.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..edd4eba3bd31095950a8d98cf3daf6f34d64969f
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-options-test.cc
>@@ -0,0 +1,211 @@
>+// Copyright 2008, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+//
>+// Google Test UnitTestOptions tests
>+//
>+// This file tests classes and functions used internally by
>+// Google Test. They are subject to change without notice.
>+//
>+// This file is #included from gtest.cc, to avoid changing build or
>+// make-files on Windows and other platforms. Do not #include this file
>+// anywhere else!
>+
>+#include "gtest/gtest.h"
>+
>+#if GTEST_OS_WINDOWS_MOBILE
>+# include <windows.h>
>+#elif GTEST_OS_WINDOWS
>+# include <direct.h>
>+#endif // GTEST_OS_WINDOWS_MOBILE
>+
>+#include "src/gtest-internal-inl.h"
>+
>+namespace testing {
>+namespace internal {
>+namespace {
>+
>+// Turns the given relative path into an absolute path.
>+FilePath GetAbsolutePathOf(const FilePath& relative_path) {
>+ return FilePath::ConcatPaths(FilePath::GetCurrentDir(), relative_path);
>+}
>+
>+// Testing UnitTestOptions::GetOutputFormat/GetOutputFile.
>+
>+TEST(XmlOutputTest, GetOutputFormatDefault) {
>+ GTEST_FLAG(output) = "";
>+ EXPECT_STREQ("", UnitTestOptions::GetOutputFormat().c_str());
>+}
>+
>+TEST(XmlOutputTest, GetOutputFormat) {
>+ GTEST_FLAG(output) = "xml:filename";
>+ EXPECT_STREQ("xml", UnitTestOptions::GetOutputFormat().c_str());
>+}
>+
>+TEST(XmlOutputTest, GetOutputFileDefault) {
>+ GTEST_FLAG(output) = "";
>+ EXPECT_EQ(GetAbsolutePathOf(FilePath("test_detail.xml")).string(),
>+ UnitTestOptions::GetAbsolutePathToOutputFile());
>+}
>+
>+TEST(XmlOutputTest, GetOutputFileSingleFile) {
>+ GTEST_FLAG(output) = "xml:filename.abc";
>+ EXPECT_EQ(GetAbsolutePathOf(FilePath("filename.abc")).string(),
>+ UnitTestOptions::GetAbsolutePathToOutputFile());
>+}
>+
>+TEST(XmlOutputTest, GetOutputFileFromDirectoryPath) {
>+ GTEST_FLAG(output) = "xml:path" GTEST_PATH_SEP_;
>+ const std::string expected_output_file =
>+ GetAbsolutePathOf(
>+ FilePath(std::string("path") + GTEST_PATH_SEP_ +
>+ GetCurrentExecutableName().string() + ".xml")).string();
>+ const std::string& output_file =
>+ UnitTestOptions::GetAbsolutePathToOutputFile();
>+#if GTEST_OS_WINDOWS
>+ EXPECT_STRCASEEQ(expected_output_file.c_str(), output_file.c_str());
>+#else
>+ EXPECT_EQ(expected_output_file, output_file.c_str());
>+#endif
>+}
>+
>+TEST(OutputFileHelpersTest, GetCurrentExecutableName) {
>+ const std::string exe_str = GetCurrentExecutableName().string();
>+#if GTEST_OS_WINDOWS
>+ const bool success =
>+ _strcmpi("googletest-options-test", exe_str.c_str()) == 0 ||
>+ _strcmpi("gtest-options-ex_test", exe_str.c_str()) == 0 ||
>+ _strcmpi("gtest_all_test", exe_str.c_str()) == 0 ||
>+ _strcmpi("gtest_dll_test", exe_str.c_str()) == 0;
>+#elif GTEST_OS_FUCHSIA
>+ const bool success = exe_str == "app";
>+#else
>+ // FIXME: remove the hard-coded "lt-" prefix when libtool replacement is ready
>+ const bool success =
>+ exe_str == "googletest-options-test" ||
>+ exe_str == "gtest_all_test" ||
>+ exe_str == "lt-gtest_all_test" ||
>+ exe_str == "gtest_dll_test";
>+#endif // GTEST_OS_WINDOWS
>+ if (!success)
>+ FAIL() << "GetCurrentExecutableName() returns " << exe_str;
>+}
>+
>+#if !GTEST_OS_FUCHSIA
>+
>+class XmlOutputChangeDirTest : public Test {
>+ protected:
>+ virtual void SetUp() {
>+ original_working_dir_ = FilePath::GetCurrentDir();
>+ posix::ChDir("..");
>+ // This will make the test fail if run from the root directory.
>+ EXPECT_NE(original_working_dir_.string(),
>+ FilePath::GetCurrentDir().string());
>+ }
>+
>+ virtual void TearDown() {
>+ posix::ChDir(original_working_dir_.string().c_str());
>+ }
>+
>+ FilePath original_working_dir_;
>+};
>+
>+TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithDefault) {
>+ GTEST_FLAG(output) = "";
>+ EXPECT_EQ(FilePath::ConcatPaths(original_working_dir_,
>+ FilePath("test_detail.xml")).string(),
>+ UnitTestOptions::GetAbsolutePathToOutputFile());
>+}
>+
>+TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithDefaultXML) {
>+ GTEST_FLAG(output) = "xml";
>+ EXPECT_EQ(FilePath::ConcatPaths(original_working_dir_,
>+ FilePath("test_detail.xml")).string(),
>+ UnitTestOptions::GetAbsolutePathToOutputFile());
>+}
>+
>+TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithRelativeFile) {
>+ GTEST_FLAG(output) = "xml:filename.abc";
>+ EXPECT_EQ(FilePath::ConcatPaths(original_working_dir_,
>+ FilePath("filename.abc")).string(),
>+ UnitTestOptions::GetAbsolutePathToOutputFile());
>+}
>+
>+TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithRelativePath) {
>+ GTEST_FLAG(output) = "xml:path" GTEST_PATH_SEP_;
>+ const std::string expected_output_file =
>+ FilePath::ConcatPaths(
>+ original_working_dir_,
>+ FilePath(std::string("path") + GTEST_PATH_SEP_ +
>+ GetCurrentExecutableName().string() + ".xml")).string();
>+ const std::string& output_file =
>+ UnitTestOptions::GetAbsolutePathToOutputFile();
>+#if GTEST_OS_WINDOWS
>+ EXPECT_STRCASEEQ(expected_output_file.c_str(), output_file.c_str());
>+#else
>+ EXPECT_EQ(expected_output_file, output_file.c_str());
>+#endif
>+}
>+
>+TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithAbsoluteFile) {
>+#if GTEST_OS_WINDOWS
>+ GTEST_FLAG(output) = "xml:c:\\tmp\\filename.abc";
>+ EXPECT_EQ(FilePath("c:\\tmp\\filename.abc").string(),
>+ UnitTestOptions::GetAbsolutePathToOutputFile());
>+#else
>+ GTEST_FLAG(output) ="xml:/tmp/filename.abc";
>+ EXPECT_EQ(FilePath("/tmp/filename.abc").string(),
>+ UnitTestOptions::GetAbsolutePathToOutputFile());
>+#endif
>+}
>+
>+TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithAbsolutePath) {
>+#if GTEST_OS_WINDOWS
>+ const std::string path = "c:\\tmp\\";
>+#else
>+ const std::string path = "/tmp/";
>+#endif
>+
>+ GTEST_FLAG(output) = "xml:" + path;
>+ const std::string expected_output_file =
>+ path + GetCurrentExecutableName().string() + ".xml";
>+ const std::string& output_file =
>+ UnitTestOptions::GetAbsolutePathToOutputFile();
>+
>+#if GTEST_OS_WINDOWS
>+ EXPECT_STRCASEEQ(expected_output_file.c_str(), output_file.c_str());
>+#else
>+ EXPECT_EQ(expected_output_file, output_file.c_str());
>+#endif
>+}
>+
>+#endif // !GTEST_OS_FUCHSIA
>+
>+} // namespace
>+} // namespace internal
>+} // namespace testing
>diff --git a/Source/ThirdParty/gtest/test/googletest-output-test-golden-lin.txt b/Source/ThirdParty/gtest/test/googletest-output-test-golden-lin.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..7711cdc68ae538cce9e3984bce1b7ab65aa62a53
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-output-test-golden-lin.txt
>@@ -0,0 +1,1047 @@
>+The non-test part of the code is expected to have 2 failures.
>+
>+googletest-output-test_.cc:#: Failure
>+Value of: false
>+ Actual: false
>+Expected: true
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ 2
>+ 3
>+Stack trace: (omitted)
>+
>+[0;32m[==========] [mRunning 76 tests from 34 test cases.
>+[0;32m[----------] [mGlobal test environment set-up.
>+FooEnvironment::SetUp() called.
>+BarEnvironment::SetUp() called.
>+[0;32m[----------] [m1 test from ADeathTest
>+[0;32m[ RUN ] [mADeathTest.ShouldRunFirst
>+[0;32m[ OK ] [mADeathTest.ShouldRunFirst
>+[0;32m[----------] [m1 test from ATypedDeathTest/0, where TypeParam = int
>+[0;32m[ RUN ] [mATypedDeathTest/0.ShouldRunFirst
>+[0;32m[ OK ] [mATypedDeathTest/0.ShouldRunFirst
>+[0;32m[----------] [m1 test from ATypedDeathTest/1, where TypeParam = double
>+[0;32m[ RUN ] [mATypedDeathTest/1.ShouldRunFirst
>+[0;32m[ OK ] [mATypedDeathTest/1.ShouldRunFirst
>+[0;32m[----------] [m1 test from My/ATypeParamDeathTest/0, where TypeParam = int
>+[0;32m[ RUN ] [mMy/ATypeParamDeathTest/0.ShouldRunFirst
>+[0;32m[ OK ] [mMy/ATypeParamDeathTest/0.ShouldRunFirst
>+[0;32m[----------] [m1 test from My/ATypeParamDeathTest/1, where TypeParam = double
>+[0;32m[ RUN ] [mMy/ATypeParamDeathTest/1.ShouldRunFirst
>+[0;32m[ OK ] [mMy/ATypeParamDeathTest/1.ShouldRunFirst
>+[0;32m[----------] [m2 tests from PassingTest
>+[0;32m[ RUN ] [mPassingTest.PassingTest1
>+[0;32m[ OK ] [mPassingTest.PassingTest1
>+[0;32m[ RUN ] [mPassingTest.PassingTest2
>+[0;32m[ OK ] [mPassingTest.PassingTest2
>+[0;32m[----------] [m2 tests from NonfatalFailureTest
>+[0;32m[ RUN ] [mNonfatalFailureTest.EscapesStringOperands
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ kGoldenString
>+ Which is: "\"Line"
>+ actual
>+ Which is: "actual \"string\""
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ golden
>+ Which is: "\"Line"
>+ actual
>+ Which is: "actual \"string\""
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mNonfatalFailureTest.EscapesStringOperands
>+[0;32m[ RUN ] [mNonfatalFailureTest.DiffForLongStrings
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ golden_str
>+ Which is: "\"Line\0 1\"\nLine 2"
>+ "Line 2"
>+With diff:
>+@@ -1,2 @@
>+-\"Line\0 1\"
>+ Line 2
>+
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mNonfatalFailureTest.DiffForLongStrings
>+[0;32m[----------] [m3 tests from FatalFailureTest
>+[0;32m[ RUN ] [mFatalFailureTest.FatalFailureInSubroutine
>+(expecting a failure that x should be 1)
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ 1
>+ x
>+ Which is: 2
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mFatalFailureTest.FatalFailureInSubroutine
>+[0;32m[ RUN ] [mFatalFailureTest.FatalFailureInNestedSubroutine
>+(expecting a failure that x should be 1)
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ 1
>+ x
>+ Which is: 2
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mFatalFailureTest.FatalFailureInNestedSubroutine
>+[0;32m[ RUN ] [mFatalFailureTest.NonfatalFailureInSubroutine
>+(expecting a failure on false)
>+googletest-output-test_.cc:#: Failure
>+Value of: false
>+ Actual: false
>+Expected: true
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mFatalFailureTest.NonfatalFailureInSubroutine
>+[0;32m[----------] [m1 test from LoggingTest
>+[0;32m[ RUN ] [mLoggingTest.InterleavingLoggingAndAssertions
>+(expecting 2 failures on (3) >= (a[i]))
>+i == 0
>+i == 1
>+googletest-output-test_.cc:#: Failure
>+Expected: (3) >= (a[i]), actual: 3 vs 9
>+Stack trace: (omitted)
>+
>+i == 2
>+i == 3
>+googletest-output-test_.cc:#: Failure
>+Expected: (3) >= (a[i]), actual: 3 vs 6
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mLoggingTest.InterleavingLoggingAndAssertions
>+[0;32m[----------] [m7 tests from SCOPED_TRACETest
>+[0;32m[ RUN ] [mSCOPED_TRACETest.AcceptedValues
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Just checking that all these values work fine.
>+Google Test trace:
>+googletest-output-test_.cc:#: (null)
>+googletest-output-test_.cc:#: 1337
>+googletest-output-test_.cc:#: std::string
>+googletest-output-test_.cc:#: literal string
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mSCOPED_TRACETest.AcceptedValues
>+[0;32m[ RUN ] [mSCOPED_TRACETest.ObeysScopes
>+(expected to fail)
>+googletest-output-test_.cc:#: Failure
>+Failed
>+This failure is expected, and shouldn't have a trace.
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+This failure is expected, and should have a trace.
>+Google Test trace:
>+googletest-output-test_.cc:#: Expected trace
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+This failure is expected, and shouldn't have a trace.
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mSCOPED_TRACETest.ObeysScopes
>+[0;32m[ RUN ] [mSCOPED_TRACETest.WorksInLoop
>+(expected to fail)
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ 2
>+ n
>+ Which is: 1
>+Google Test trace:
>+googletest-output-test_.cc:#: i = 1
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ 1
>+ n
>+ Which is: 2
>+Google Test trace:
>+googletest-output-test_.cc:#: i = 2
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mSCOPED_TRACETest.WorksInLoop
>+[0;32m[ RUN ] [mSCOPED_TRACETest.WorksInSubroutine
>+(expected to fail)
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ 2
>+ n
>+ Which is: 1
>+Google Test trace:
>+googletest-output-test_.cc:#: n = 1
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ 1
>+ n
>+ Which is: 2
>+Google Test trace:
>+googletest-output-test_.cc:#: n = 2
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mSCOPED_TRACETest.WorksInSubroutine
>+[0;32m[ RUN ] [mSCOPED_TRACETest.CanBeNested
>+(expected to fail)
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ 1
>+ n
>+ Which is: 2
>+Google Test trace:
>+googletest-output-test_.cc:#: n = 2
>+googletest-output-test_.cc:#: 
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mSCOPED_TRACETest.CanBeNested
>+[0;32m[ RUN ] [mSCOPED_TRACETest.CanBeRepeated
>+(expected to fail)
>+googletest-output-test_.cc:#: Failure
>+Failed
>+This failure is expected, and should contain trace point A.
>+Google Test trace:
>+googletest-output-test_.cc:#: A
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+This failure is expected, and should contain trace point A and B.
>+Google Test trace:
>+googletest-output-test_.cc:#: B
>+googletest-output-test_.cc:#: A
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+This failure is expected, and should contain trace point A, B, and C.
>+Google Test trace:
>+googletest-output-test_.cc:#: C
>+googletest-output-test_.cc:#: B
>+googletest-output-test_.cc:#: A
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+This failure is expected, and should contain trace point A, B, and D.
>+Google Test trace:
>+googletest-output-test_.cc:#: D
>+googletest-output-test_.cc:#: B
>+googletest-output-test_.cc:#: A
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mSCOPED_TRACETest.CanBeRepeated
>+[0;32m[ RUN ] [mSCOPED_TRACETest.WorksConcurrently
>+(expecting 6 failures)
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #1 (in thread B, only trace B alive).
>+Google Test trace:
>+googletest-output-test_.cc:#: Trace B
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #2 (in thread A, trace A & B both alive).
>+Google Test trace:
>+googletest-output-test_.cc:#: Trace A
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #3 (in thread B, trace A & B both alive).
>+Google Test trace:
>+googletest-output-test_.cc:#: Trace B
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #4 (in thread B, only trace A alive).
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #5 (in thread A, only trace A alive).
>+Google Test trace:
>+googletest-output-test_.cc:#: Trace A
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #6 (in thread A, no trace alive).
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mSCOPED_TRACETest.WorksConcurrently
>+[0;32m[----------] [m1 test from ScopedTraceTest
>+[0;32m[ RUN ] [mScopedTraceTest.WithExplicitFileAndLine
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Check that the trace is attached to a particular location.
>+Google Test trace:
>+explicit_file.cc:123: expected trace message
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mScopedTraceTest.WithExplicitFileAndLine
>+[0;32m[----------] [m1 test from NonFatalFailureInFixtureConstructorTest
>+[0;32m[ RUN ] [mNonFatalFailureInFixtureConstructorTest.FailureInConstructor
>+(expecting 5 failures)
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #1, in the test fixture c'tor.
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #2, in SetUp().
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #3, in the test body.
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #4, in TearDown.
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #5, in the test fixture d'tor.
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mNonFatalFailureInFixtureConstructorTest.FailureInConstructor
>+[0;32m[----------] [m1 test from FatalFailureInFixtureConstructorTest
>+[0;32m[ RUN ] [mFatalFailureInFixtureConstructorTest.FailureInConstructor
>+(expecting 2 failures)
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #1, in the test fixture c'tor.
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #2, in the test fixture d'tor.
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mFatalFailureInFixtureConstructorTest.FailureInConstructor
>+[0;32m[----------] [m1 test from NonFatalFailureInSetUpTest
>+[0;32m[ RUN ] [mNonFatalFailureInSetUpTest.FailureInSetUp
>+(expecting 4 failures)
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #1, in SetUp().
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #2, in the test function.
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #3, in TearDown().
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #4, in the test fixture d'tor.
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mNonFatalFailureInSetUpTest.FailureInSetUp
>+[0;32m[----------] [m1 test from FatalFailureInSetUpTest
>+[0;32m[ RUN ] [mFatalFailureInSetUpTest.FailureInSetUp
>+(expecting 3 failures)
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #1, in SetUp().
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #2, in TearDown().
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected failure #3, in the test fixture d'tor.
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mFatalFailureInSetUpTest.FailureInSetUp
>+[0;32m[----------] [m1 test from AddFailureAtTest
>+[0;32m[ RUN ] [mAddFailureAtTest.MessageContainsSpecifiedFileAndLineNumber
>+foo.cc:42: Failure
>+Failed
>+Expected failure in foo.cc
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mAddFailureAtTest.MessageContainsSpecifiedFileAndLineNumber
>+[0;32m[----------] [m4 tests from MixedUpTestCaseTest
>+[0;32m[ RUN ] [mMixedUpTestCaseTest.FirstTestFromNamespaceFoo
>+[0;32m[ OK ] [mMixedUpTestCaseTest.FirstTestFromNamespaceFoo
>+[0;32m[ RUN ] [mMixedUpTestCaseTest.SecondTestFromNamespaceFoo
>+[0;32m[ OK ] [mMixedUpTestCaseTest.SecondTestFromNamespaceFoo
>+[0;32m[ RUN ] [mMixedUpTestCaseTest.ThisShouldFail
>+gtest.cc:#: Failure
>+Failed
>+All tests in the same test case must use the same test fixture
>+class. However, in test case MixedUpTestCaseTest,
>+you defined test FirstTestFromNamespaceFoo and test ThisShouldFail
>+using two different test fixture classes. This can happen if
>+the two classes are from different namespaces or translation
>+units and have the same name. You should probably rename one
>+of the classes to put the tests into different test cases.
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mMixedUpTestCaseTest.ThisShouldFail
>+[0;32m[ RUN ] [mMixedUpTestCaseTest.ThisShouldFailToo
>+gtest.cc:#: Failure
>+Failed
>+All tests in the same test case must use the same test fixture
>+class. However, in test case MixedUpTestCaseTest,
>+you defined test FirstTestFromNamespaceFoo and test ThisShouldFailToo
>+using two different test fixture classes. This can happen if
>+the two classes are from different namespaces or translation
>+units and have the same name. You should probably rename one
>+of the classes to put the tests into different test cases.
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mMixedUpTestCaseTest.ThisShouldFailToo
>+[0;32m[----------] [m2 tests from MixedUpTestCaseWithSameTestNameTest
>+[0;32m[ RUN ] [mMixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
>+[0;32m[ OK ] [mMixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
>+[0;32m[ RUN ] [mMixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
>+gtest.cc:#: Failure
>+Failed
>+All tests in the same test case must use the same test fixture
>+class. However, in test case MixedUpTestCaseWithSameTestNameTest,
>+you defined test TheSecondTestWithThisNameShouldFail and test TheSecondTestWithThisNameShouldFail
>+using two different test fixture classes. This can happen if
>+the two classes are from different namespaces or translation
>+units and have the same name. You should probably rename one
>+of the classes to put the tests into different test cases.
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mMixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
>+[0;32m[----------] [m2 tests from TEST_F_before_TEST_in_same_test_case
>+[0;32m[ RUN ] [mTEST_F_before_TEST_in_same_test_case.DefinedUsingTEST_F
>+[0;32m[ OK ] [mTEST_F_before_TEST_in_same_test_case.DefinedUsingTEST_F
>+[0;32m[ RUN ] [mTEST_F_before_TEST_in_same_test_case.DefinedUsingTESTAndShouldFail
>+gtest.cc:#: Failure
>+Failed
>+All tests in the same test case must use the same test fixture
>+class, so mixing TEST_F and TEST in the same test case is
>+illegal. In test case TEST_F_before_TEST_in_same_test_case,
>+test DefinedUsingTEST_F is defined using TEST_F but
>+test DefinedUsingTESTAndShouldFail is defined using TEST. You probably
>+want to change the TEST to TEST_F or move it to another test
>+case.
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mTEST_F_before_TEST_in_same_test_case.DefinedUsingTESTAndShouldFail
>+[0;32m[----------] [m2 tests from TEST_before_TEST_F_in_same_test_case
>+[0;32m[ RUN ] [mTEST_before_TEST_F_in_same_test_case.DefinedUsingTEST
>+[0;32m[ OK ] [mTEST_before_TEST_F_in_same_test_case.DefinedUsingTEST
>+[0;32m[ RUN ] [mTEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail
>+gtest.cc:#: Failure
>+Failed
>+All tests in the same test case must use the same test fixture
>+class, so mixing TEST_F and TEST in the same test case is
>+illegal. In test case TEST_before_TEST_F_in_same_test_case,
>+test DefinedUsingTEST_FAndShouldFail is defined using TEST_F but
>+test DefinedUsingTEST is defined using TEST. You probably
>+want to change the TEST to TEST_F or move it to another test
>+case.
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mTEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail
>+[0;32m[----------] [m8 tests from ExpectNonfatalFailureTest
>+[0;32m[ RUN ] [mExpectNonfatalFailureTest.CanReferenceGlobalVariables
>+[0;32m[ OK ] [mExpectNonfatalFailureTest.CanReferenceGlobalVariables
>+[0;32m[ RUN ] [mExpectNonfatalFailureTest.CanReferenceLocalVariables
>+[0;32m[ OK ] [mExpectNonfatalFailureTest.CanReferenceLocalVariables
>+[0;32m[ RUN ] [mExpectNonfatalFailureTest.SucceedsWhenThereIsOneNonfatalFailure
>+[0;32m[ OK ] [mExpectNonfatalFailureTest.SucceedsWhenThereIsOneNonfatalFailure
>+[0;32m[ RUN ] [mExpectNonfatalFailureTest.FailsWhenThereIsNoNonfatalFailure
>+(expecting a failure)
>+gtest.cc:#: Failure
>+Expected: 1 non-fatal failure
>+ Actual: 0 failures
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenThereIsNoNonfatalFailure
>+[0;32m[ RUN ] [mExpectNonfatalFailureTest.FailsWhenThereAreTwoNonfatalFailures
>+(expecting a failure)
>+gtest.cc:#: Failure
>+Expected: 1 non-fatal failure
>+ Actual: 2 failures
>+googletest-output-test_.cc:#: Non-fatal failure:
>+Failed
>+Expected non-fatal failure 1.
>+Stack trace: (omitted)
>+
>+
>+googletest-output-test_.cc:#: Non-fatal failure:
>+Failed
>+Expected non-fatal failure 2.
>+Stack trace: (omitted)
>+
>+
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenThereAreTwoNonfatalFailures
>+[0;32m[ RUN ] [mExpectNonfatalFailureTest.FailsWhenThereIsOneFatalFailure
>+(expecting a failure)
>+gtest.cc:#: Failure
>+Expected: 1 non-fatal failure
>+ Actual:
>+googletest-output-test_.cc:#: Fatal failure:
>+Failed
>+Expected fatal failure.
>+Stack trace: (omitted)
>+
>+
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenThereIsOneFatalFailure
>+[0;32m[ RUN ] [mExpectNonfatalFailureTest.FailsWhenStatementReturns
>+(expecting a failure)
>+gtest.cc:#: Failure
>+Expected: 1 non-fatal failure
>+ Actual: 0 failures
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenStatementReturns
>+[0;32m[ RUN ] [mExpectNonfatalFailureTest.FailsWhenStatementThrows
>+(expecting a failure)
>+gtest.cc:#: Failure
>+Expected: 1 non-fatal failure
>+ Actual: 0 failures
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenStatementThrows
>+[0;32m[----------] [m8 tests from ExpectFatalFailureTest
>+[0;32m[ RUN ] [mExpectFatalFailureTest.CanReferenceGlobalVariables
>+[0;32m[ OK ] [mExpectFatalFailureTest.CanReferenceGlobalVariables
>+[0;32m[ RUN ] [mExpectFatalFailureTest.CanReferenceLocalStaticVariables
>+[0;32m[ OK ] [mExpectFatalFailureTest.CanReferenceLocalStaticVariables
>+[0;32m[ RUN ] [mExpectFatalFailureTest.SucceedsWhenThereIsOneFatalFailure
>+[0;32m[ OK ] [mExpectFatalFailureTest.SucceedsWhenThereIsOneFatalFailure
>+[0;32m[ RUN ] [mExpectFatalFailureTest.FailsWhenThereIsNoFatalFailure
>+(expecting a failure)
>+gtest.cc:#: Failure
>+Expected: 1 fatal failure
>+ Actual: 0 failures
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenThereIsNoFatalFailure
>+[0;32m[ RUN ] [mExpectFatalFailureTest.FailsWhenThereAreTwoFatalFailures
>+(expecting a failure)
>+gtest.cc:#: Failure
>+Expected: 1 fatal failure
>+ Actual: 2 failures
>+googletest-output-test_.cc:#: Fatal failure:
>+Failed
>+Expected fatal failure.
>+Stack trace: (omitted)
>+
>+
>+googletest-output-test_.cc:#: Fatal failure:
>+Failed
>+Expected fatal failure.
>+Stack trace: (omitted)
>+
>+
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenThereAreTwoFatalFailures
>+[0;32m[ RUN ] [mExpectFatalFailureTest.FailsWhenThereIsOneNonfatalFailure
>+(expecting a failure)
>+gtest.cc:#: Failure
>+Expected: 1 fatal failure
>+ Actual:
>+googletest-output-test_.cc:#: Non-fatal failure:
>+Failed
>+Expected non-fatal failure.
>+Stack trace: (omitted)
>+
>+
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenThereIsOneNonfatalFailure
>+[0;32m[ RUN ] [mExpectFatalFailureTest.FailsWhenStatementReturns
>+(expecting a failure)
>+gtest.cc:#: Failure
>+Expected: 1 fatal failure
>+ Actual: 0 failures
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenStatementReturns
>+[0;32m[ RUN ] [mExpectFatalFailureTest.FailsWhenStatementThrows
>+(expecting a failure)
>+gtest.cc:#: Failure
>+Expected: 1 fatal failure
>+ Actual: 0 failures
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenStatementThrows
>+[0;32m[----------] [m2 tests from TypedTest/0, where TypeParam = int
>+[0;32m[ RUN ] [mTypedTest/0.Success
>+[0;32m[ OK ] [mTypedTest/0.Success
>+[0;32m[ RUN ] [mTypedTest/0.Failure
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ 1
>+ TypeParam()
>+ Which is: 0
>+Expected failure
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mTypedTest/0.Failure, where TypeParam = int
>+[0;32m[----------] [m2 tests from TypedTestWithNames/char_0, where TypeParam = char
>+[0;32m[ RUN ] [mTypedTestWithNames/char_0.Success
>+[0;32m[ OK ] [mTypedTestWithNames/char_0.Success
>+[0;32m[ RUN ] [mTypedTestWithNames/char_0.Failure
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mTypedTestWithNames/char_0.Failure, where TypeParam = char
>+[0;32m[----------] [m2 tests from TypedTestWithNames/int_1, where TypeParam = int
>+[0;32m[ RUN ] [mTypedTestWithNames/int_1.Success
>+[0;32m[ OK ] [mTypedTestWithNames/int_1.Success
>+[0;32m[ RUN ] [mTypedTestWithNames/int_1.Failure
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mTypedTestWithNames/int_1.Failure, where TypeParam = int
>+[0;32m[----------] [m2 tests from Unsigned/TypedTestP/0, where TypeParam = unsigned char
>+[0;32m[ RUN ] [mUnsigned/TypedTestP/0.Success
>+[0;32m[ OK ] [mUnsigned/TypedTestP/0.Success
>+[0;32m[ RUN ] [mUnsigned/TypedTestP/0.Failure
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ 1U
>+ Which is: 1
>+ TypeParam()
>+ Which is: '\0'
>+Expected failure
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mUnsigned/TypedTestP/0.Failure, where TypeParam = unsigned char
>+[0;32m[----------] [m2 tests from Unsigned/TypedTestP/1, where TypeParam = unsigned int
>+[0;32m[ RUN ] [mUnsigned/TypedTestP/1.Success
>+[0;32m[ OK ] [mUnsigned/TypedTestP/1.Success
>+[0;32m[ RUN ] [mUnsigned/TypedTestP/1.Failure
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ 1U
>+ Which is: 1
>+ TypeParam()
>+ Which is: 0
>+Expected failure
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mUnsigned/TypedTestP/1.Failure, where TypeParam = unsigned int
>+[0;32m[----------] [m2 tests from UnsignedCustomName/TypedTestP/unsigned_char_0, where TypeParam = unsigned char
>+[0;32m[ RUN ] [mUnsignedCustomName/TypedTestP/unsigned_char_0.Success
>+[0;32m[ OK ] [mUnsignedCustomName/TypedTestP/unsigned_char_0.Success
>+[0;32m[ RUN ] [mUnsignedCustomName/TypedTestP/unsigned_char_0.Failure
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ 1U
>+ Which is: 1
>+ TypeParam()
>+ Which is: '\0'
>+Expected failure
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mUnsignedCustomName/TypedTestP/unsigned_char_0.Failure, where TypeParam = unsigned char
>+[0;32m[----------] [m2 tests from UnsignedCustomName/TypedTestP/unsigned_int_1, where TypeParam = unsigned int
>+[0;32m[ RUN ] [mUnsignedCustomName/TypedTestP/unsigned_int_1.Success
>+[0;32m[ OK ] [mUnsignedCustomName/TypedTestP/unsigned_int_1.Success
>+[0;32m[ RUN ] [mUnsignedCustomName/TypedTestP/unsigned_int_1.Failure
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ 1U
>+ Which is: 1
>+ TypeParam()
>+ Which is: 0
>+Expected failure
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mUnsignedCustomName/TypedTestP/unsigned_int_1.Failure, where TypeParam = unsigned int
>+[0;32m[----------] [m4 tests from ExpectFailureTest
>+[0;32m[ RUN ] [mExpectFailureTest.ExpectFatalFailure
>+(expecting 1 failure)
>+gtest.cc:#: Failure
>+Expected: 1 fatal failure
>+ Actual:
>+googletest-output-test_.cc:#: Success:
>+Succeeded
>+Stack trace: (omitted)
>+
>+
>+Stack trace: (omitted)
>+
>+(expecting 1 failure)
>+gtest.cc:#: Failure
>+Expected: 1 fatal failure
>+ Actual:
>+googletest-output-test_.cc:#: Non-fatal failure:
>+Failed
>+Expected non-fatal failure.
>+Stack trace: (omitted)
>+
>+
>+Stack trace: (omitted)
>+
>+(expecting 1 failure)
>+gtest.cc:#: Failure
>+Expected: 1 fatal failure containing "Some other fatal failure expected."
>+ Actual:
>+googletest-output-test_.cc:#: Fatal failure:
>+Failed
>+Expected fatal failure.
>+Stack trace: (omitted)
>+
>+
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mExpectFailureTest.ExpectFatalFailure
>+[0;32m[ RUN ] [mExpectFailureTest.ExpectNonFatalFailure
>+(expecting 1 failure)
>+gtest.cc:#: Failure
>+Expected: 1 non-fatal failure
>+ Actual:
>+googletest-output-test_.cc:#: Success:
>+Succeeded
>+Stack trace: (omitted)
>+
>+
>+Stack trace: (omitted)
>+
>+(expecting 1 failure)
>+gtest.cc:#: Failure
>+Expected: 1 non-fatal failure
>+ Actual:
>+googletest-output-test_.cc:#: Fatal failure:
>+Failed
>+Expected fatal failure.
>+Stack trace: (omitted)
>+
>+
>+Stack trace: (omitted)
>+
>+(expecting 1 failure)
>+gtest.cc:#: Failure
>+Expected: 1 non-fatal failure containing "Some other non-fatal failure."
>+ Actual:
>+googletest-output-test_.cc:#: Non-fatal failure:
>+Failed
>+Expected non-fatal failure.
>+Stack trace: (omitted)
>+
>+
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mExpectFailureTest.ExpectNonFatalFailure
>+[0;32m[ RUN ] [mExpectFailureTest.ExpectFatalFailureOnAllThreads
>+(expecting 1 failure)
>+gtest.cc:#: Failure
>+Expected: 1 fatal failure
>+ Actual:
>+googletest-output-test_.cc:#: Success:
>+Succeeded
>+Stack trace: (omitted)
>+
>+
>+Stack trace: (omitted)
>+
>+(expecting 1 failure)
>+gtest.cc:#: Failure
>+Expected: 1 fatal failure
>+ Actual:
>+googletest-output-test_.cc:#: Non-fatal failure:
>+Failed
>+Expected non-fatal failure.
>+Stack trace: (omitted)
>+
>+
>+Stack trace: (omitted)
>+
>+(expecting 1 failure)
>+gtest.cc:#: Failure
>+Expected: 1 fatal failure containing "Some other fatal failure expected."
>+ Actual:
>+googletest-output-test_.cc:#: Fatal failure:
>+Failed
>+Expected fatal failure.
>+Stack trace: (omitted)
>+
>+
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mExpectFailureTest.ExpectFatalFailureOnAllThreads
>+[0;32m[ RUN ] [mExpectFailureTest.ExpectNonFatalFailureOnAllThreads
>+(expecting 1 failure)
>+gtest.cc:#: Failure
>+Expected: 1 non-fatal failure
>+ Actual:
>+googletest-output-test_.cc:#: Success:
>+Succeeded
>+Stack trace: (omitted)
>+
>+
>+Stack trace: (omitted)
>+
>+(expecting 1 failure)
>+gtest.cc:#: Failure
>+Expected: 1 non-fatal failure
>+ Actual:
>+googletest-output-test_.cc:#: Fatal failure:
>+Failed
>+Expected fatal failure.
>+Stack trace: (omitted)
>+
>+
>+Stack trace: (omitted)
>+
>+(expecting 1 failure)
>+gtest.cc:#: Failure
>+Expected: 1 non-fatal failure containing "Some other non-fatal failure."
>+ Actual:
>+googletest-output-test_.cc:#: Non-fatal failure:
>+Failed
>+Expected non-fatal failure.
>+Stack trace: (omitted)
>+
>+
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mExpectFailureTest.ExpectNonFatalFailureOnAllThreads
>+[0;32m[----------] [m2 tests from ExpectFailureWithThreadsTest
>+[0;32m[ RUN ] [mExpectFailureWithThreadsTest.ExpectFatalFailure
>+(expecting 2 failures)
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected fatal failure.
>+Stack trace: (omitted)
>+
>+gtest.cc:#: Failure
>+Expected: 1 fatal failure
>+ Actual: 0 failures
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mExpectFailureWithThreadsTest.ExpectFatalFailure
>+[0;32m[ RUN ] [mExpectFailureWithThreadsTest.ExpectNonFatalFailure
>+(expecting 2 failures)
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected non-fatal failure.
>+Stack trace: (omitted)
>+
>+gtest.cc:#: Failure
>+Expected: 1 non-fatal failure
>+ Actual: 0 failures
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mExpectFailureWithThreadsTest.ExpectNonFatalFailure
>+[0;32m[----------] [m1 test from ScopedFakeTestPartResultReporterTest
>+[0;32m[ RUN ] [mScopedFakeTestPartResultReporterTest.InterceptOnlyCurrentThread
>+(expecting 2 failures)
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected fatal failure.
>+Stack trace: (omitted)
>+
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected non-fatal failure.
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mScopedFakeTestPartResultReporterTest.InterceptOnlyCurrentThread
>+[0;32m[----------] [m1 test from PrintingFailingParams/FailingParamTest
>+[0;32m[ RUN ] [mPrintingFailingParams/FailingParamTest.Fails/0
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ 1
>+ GetParam()
>+ Which is: 2
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mPrintingFailingParams/FailingParamTest.Fails/0, where GetParam() = 2
>+[0;32m[----------] [m2 tests from PrintingStrings/ParamTest
>+[0;32m[ RUN ] [mPrintingStrings/ParamTest.Success/a
>+[0;32m[ OK ] [mPrintingStrings/ParamTest.Success/a
>+[0;32m[ RUN ] [mPrintingStrings/ParamTest.Failure/a
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ "b"
>+ GetParam()
>+ Which is: "a"
>+Expected failure
>+Stack trace: (omitted)
>+
>+[0;31m[ FAILED ] [mPrintingStrings/ParamTest.Failure/a, where GetParam() = "a"
>+[0;32m[----------] [mGlobal test environment tear-down
>+BarEnvironment::TearDown() called.
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected non-fatal failure.
>+Stack trace: (omitted)
>+
>+FooEnvironment::TearDown() called.
>+googletest-output-test_.cc:#: Failure
>+Failed
>+Expected fatal failure.
>+Stack trace: (omitted)
>+
>+[0;32m[==========] [m76 tests from 34 test cases ran.
>+[0;32m[ PASSED ] [m26 tests.
>+[0;31m[ FAILED ] [m50 tests, listed below:
>+[0;31m[ FAILED ] [mNonfatalFailureTest.EscapesStringOperands
>+[0;31m[ FAILED ] [mNonfatalFailureTest.DiffForLongStrings
>+[0;31m[ FAILED ] [mFatalFailureTest.FatalFailureInSubroutine
>+[0;31m[ FAILED ] [mFatalFailureTest.FatalFailureInNestedSubroutine
>+[0;31m[ FAILED ] [mFatalFailureTest.NonfatalFailureInSubroutine
>+[0;31m[ FAILED ] [mLoggingTest.InterleavingLoggingAndAssertions
>+[0;31m[ FAILED ] [mSCOPED_TRACETest.AcceptedValues
>+[0;31m[ FAILED ] [mSCOPED_TRACETest.ObeysScopes
>+[0;31m[ FAILED ] [mSCOPED_TRACETest.WorksInLoop
>+[0;31m[ FAILED ] [mSCOPED_TRACETest.WorksInSubroutine
>+[0;31m[ FAILED ] [mSCOPED_TRACETest.CanBeNested
>+[0;31m[ FAILED ] [mSCOPED_TRACETest.CanBeRepeated
>+[0;31m[ FAILED ] [mSCOPED_TRACETest.WorksConcurrently
>+[0;31m[ FAILED ] [mScopedTraceTest.WithExplicitFileAndLine
>+[0;31m[ FAILED ] [mNonFatalFailureInFixtureConstructorTest.FailureInConstructor
>+[0;31m[ FAILED ] [mFatalFailureInFixtureConstructorTest.FailureInConstructor
>+[0;31m[ FAILED ] [mNonFatalFailureInSetUpTest.FailureInSetUp
>+[0;31m[ FAILED ] [mFatalFailureInSetUpTest.FailureInSetUp
>+[0;31m[ FAILED ] [mAddFailureAtTest.MessageContainsSpecifiedFileAndLineNumber
>+[0;31m[ FAILED ] [mMixedUpTestCaseTest.ThisShouldFail
>+[0;31m[ FAILED ] [mMixedUpTestCaseTest.ThisShouldFailToo
>+[0;31m[ FAILED ] [mMixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
>+[0;31m[ FAILED ] [mTEST_F_before_TEST_in_same_test_case.DefinedUsingTESTAndShouldFail
>+[0;31m[ FAILED ] [mTEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail
>+[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenThereIsNoNonfatalFailure
>+[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenThereAreTwoNonfatalFailures
>+[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenThereIsOneFatalFailure
>+[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenStatementReturns
>+[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenStatementThrows
>+[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenThereIsNoFatalFailure
>+[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenThereAreTwoFatalFailures
>+[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenThereIsOneNonfatalFailure
>+[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenStatementReturns
>+[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenStatementThrows
>+[0;31m[ FAILED ] [mTypedTest/0.Failure, where TypeParam = int
>+[0;31m[ FAILED ] [mTypedTestWithNames/char_0.Failure, where TypeParam = char
>+[0;31m[ FAILED ] [mTypedTestWithNames/int_1.Failure, where TypeParam = int
>+[0;31m[ FAILED ] [mUnsigned/TypedTestP/0.Failure, where TypeParam = unsigned char
>+[0;31m[ FAILED ] [mUnsigned/TypedTestP/1.Failure, where TypeParam = unsigned int
>+[0;31m[ FAILED ] [mUnsignedCustomName/TypedTestP/unsigned_char_0.Failure, where TypeParam = unsigned char
>+[0;31m[ FAILED ] [mUnsignedCustomName/TypedTestP/unsigned_int_1.Failure, where TypeParam = unsigned int
>+[0;31m[ FAILED ] [mExpectFailureTest.ExpectFatalFailure
>+[0;31m[ FAILED ] [mExpectFailureTest.ExpectNonFatalFailure
>+[0;31m[ FAILED ] [mExpectFailureTest.ExpectFatalFailureOnAllThreads
>+[0;31m[ FAILED ] [mExpectFailureTest.ExpectNonFatalFailureOnAllThreads
>+[0;31m[ FAILED ] [mExpectFailureWithThreadsTest.ExpectFatalFailure
>+[0;31m[ FAILED ] [mExpectFailureWithThreadsTest.ExpectNonFatalFailure
>+[0;31m[ FAILED ] [mScopedFakeTestPartResultReporterTest.InterceptOnlyCurrentThread
>+[0;31m[ FAILED ] [mPrintingFailingParams/FailingParamTest.Fails/0, where GetParam() = 2
>+[0;31m[ FAILED ] [mPrintingStrings/ParamTest.Failure/a, where GetParam() = "a"
>+
>+50 FAILED TESTS
>+[0;33m YOU HAVE 1 DISABLED TEST
>+
>+[mNote: Google Test filter = FatalFailureTest.*:LoggingTest.*
>+[==========] Running 4 tests from 2 test cases.
>+[----------] Global test environment set-up.
>+[----------] 3 tests from FatalFailureTest
>+[ RUN ] FatalFailureTest.FatalFailureInSubroutine
>+(expecting a failure that x should be 1)
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ 1
>+ x
>+ Which is: 2
>+Stack trace: (omitted)
>+
>+[ FAILED ] FatalFailureTest.FatalFailureInSubroutine (? ms)
>+[ RUN ] FatalFailureTest.FatalFailureInNestedSubroutine
>+(expecting a failure that x should be 1)
>+googletest-output-test_.cc:#: Failure
>+Expected equality of these values:
>+ 1
>+ x
>+ Which is: 2
>+Stack trace: (omitted)
>+
>+[ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine (? ms)
>+[ RUN ] FatalFailureTest.NonfatalFailureInSubroutine
>+(expecting a failure on false)
>+googletest-output-test_.cc:#: Failure
>+Value of: false
>+ Actual: false
>+Expected: true
>+Stack trace: (omitted)
>+
>+[ FAILED ] FatalFailureTest.NonfatalFailureInSubroutine (? ms)
>+[----------] 3 tests from FatalFailureTest (? ms total)
>+
>+[----------] 1 test from LoggingTest
>+[ RUN ] LoggingTest.InterleavingLoggingAndAssertions
>+(expecting 2 failures on (3) >= (a[i]))
>+i == 0
>+i == 1
>+googletest-output-test_.cc:#: Failure
>+Expected: (3) >= (a[i]), actual: 3 vs 9
>+Stack trace: (omitted)
>+
>+i == 2
>+i == 3
>+googletest-output-test_.cc:#: Failure
>+Expected: (3) >= (a[i]), actual: 3 vs 6
>+Stack trace: (omitted)
>+
>+[ FAILED ] LoggingTest.InterleavingLoggingAndAssertions (? ms)
>+[----------] 1 test from LoggingTest (? ms total)
>+
>+[----------] Global test environment tear-down
>+[==========] 4 tests from 2 test cases ran. (? ms total)
>+[ PASSED ] 0 tests.
>+[ FAILED ] 4 tests, listed below:
>+[ FAILED ] FatalFailureTest.FatalFailureInSubroutine
>+[ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine
>+[ FAILED ] FatalFailureTest.NonfatalFailureInSubroutine
>+[ FAILED ] LoggingTest.InterleavingLoggingAndAssertions
>+
>+ 4 FAILED TESTS
>+Note: Google Test filter = *DISABLED_*
>+[==========] Running 1 test from 1 test case.
>+[----------] Global test environment set-up.
>+[----------] 1 test from DisabledTestsWarningTest
>+[ RUN ] DisabledTestsWarningTest.DISABLED_AlsoRunDisabledTestsFlagSuppressesWarning
>+[ OK ] DisabledTestsWarningTest.DISABLED_AlsoRunDisabledTestsFlagSuppressesWarning
>+[----------] Global test environment tear-down
>+[==========] 1 test from 1 test case ran.
>+[ PASSED ] 1 test.
>+Note: Google Test filter = PassingTest.*
>+Note: This is test shard 2 of 2.
>+[==========] Running 1 test from 1 test case.
>+[----------] Global test environment set-up.
>+[----------] 1 test from PassingTest
>+[ RUN ] PassingTest.PassingTest2
>+[ OK ] PassingTest.PassingTest2
>+[----------] Global test environment tear-down
>+[==========] 1 test from 1 test case ran.
>+[ PASSED ] 1 test.
>diff --git a/Source/ThirdParty/gtest/test/googletest-output-test.py b/Source/ThirdParty/gtest/test/googletest-output-test.py
>new file mode 100755
>index 0000000000000000000000000000000000000000..2d69e353a19e36946533bf5f7e0a2c9246f7dce7
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-output-test.py
>@@ -0,0 +1,347 @@
>+#!/usr/bin/env python
>+#
>+# Copyright 2008, Google Inc.
>+# All rights reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+"""Tests the text output of Google C++ Testing and Mocking Framework.
>+
>+To update the golden file:
>+googletest_output_test.py --build_dir=BUILD/DIR --gengolden
>+where BUILD/DIR contains the built googletest-output-test_ file.
>+googletest_output_test.py --gengolden
>+googletest_output_test.py
>+"""
>+
>+import difflib
>+import os
>+import re
>+import sys
>+import gtest_test_utils
>+
>+
>+# The flag for generating the golden file
>+GENGOLDEN_FLAG = '--gengolden'
>+CATCH_EXCEPTIONS_ENV_VAR_NAME = 'GTEST_CATCH_EXCEPTIONS'
>+
>+# The flag indicating stacktraces are not supported
>+NO_STACKTRACE_SUPPORT_FLAG = '--no_stacktrace_support'
>+
>+IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
>+IS_WINDOWS = os.name == 'nt'
>+
>+# FIXME: remove the _lin suffix.
>+GOLDEN_NAME = 'googletest-output-test-golden-lin.txt'
>+
>+PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath('googletest-output-test_')
>+
>+# At least one command we exercise must not have the
>+# 'internal_skip_environment_and_ad_hoc_tests' argument.
>+COMMAND_LIST_TESTS = ({}, [PROGRAM_PATH, '--gtest_list_tests'])
>+COMMAND_WITH_COLOR = ({}, [PROGRAM_PATH, '--gtest_color=yes'])
>+COMMAND_WITH_TIME = ({}, [PROGRAM_PATH,
>+ '--gtest_print_time',
>+ 'internal_skip_environment_and_ad_hoc_tests',
>+ '--gtest_filter=FatalFailureTest.*:LoggingTest.*'])
>+COMMAND_WITH_DISABLED = (
>+ {}, [PROGRAM_PATH,
>+ '--gtest_also_run_disabled_tests',
>+ 'internal_skip_environment_and_ad_hoc_tests',
>+ '--gtest_filter=*DISABLED_*'])
>+COMMAND_WITH_SHARDING = (
>+ {'GTEST_SHARD_INDEX': '1', 'GTEST_TOTAL_SHARDS': '2'},
>+ [PROGRAM_PATH,
>+ 'internal_skip_environment_and_ad_hoc_tests',
>+ '--gtest_filter=PassingTest.*'])
>+
>+GOLDEN_PATH = os.path.join(gtest_test_utils.GetSourceDir(), GOLDEN_NAME)
>+
>+
>+def ToUnixLineEnding(s):
>+ """Changes all Windows/Mac line endings in s to UNIX line endings."""
>+
>+ return s.replace('\r\n', '\n').replace('\r', '\n')
>+
>+
>+def RemoveLocations(test_output):
>+ """Removes all file location info from a Google Test program's output.
>+
>+ Args:
>+ test_output: the output of a Google Test program.
>+
>+ Returns:
>+ output with all file location info (in the form of
>+ 'DIRECTORY/FILE_NAME:LINE_NUMBER: 'or
>+ 'DIRECTORY\\FILE_NAME(LINE_NUMBER): ') replaced by
>+ 'FILE_NAME:#: '.
>+ """
>+
>+ return re.sub(r'.*[/\\]((googletest-output-test_|gtest).cc)(\:\d+|$\d+$)\: ',
>+ r'\1:#: ', test_output)
>+
>+
>+def RemoveStackTraceDetails(output):
>+ """Removes all stack traces from a Google Test program's output."""
>+
>+ # *? means "find the shortest string that matches".
>+ return re.sub(r'Stack trace:(.|\n)*?\n\n',
>+ 'Stack trace: (omitted)\n\n', output)
>+
>+
>+def RemoveStackTraces(output):
>+ """Removes all traces of stack traces from a Google Test program's output."""
>+
>+ # *? means "find the shortest string that matches".
>+ return re.sub(r'Stack trace:(.|\n)*?\n\n', '', output)
>+
>+
>+def RemoveTime(output):
>+ """Removes all time information from a Google Test program's output."""
>+
>+ return re.sub(r'$\d+ ms', '(? ms', output)
>+
>+
>+def RemoveTypeInfoDetails(test_output):
>+ """Removes compiler-specific type info from Google Test program's output.
>+
>+ Args:
>+ test_output: the output of a Google Test program.
>+
>+ Returns:
>+ output with type information normalized to canonical form.
>+ """
>+
>+ # some compilers output the name of type 'unsigned int' as 'unsigned'
>+ return re.sub(r'unsigned int', 'unsigned', test_output)
>+
>+
>+def NormalizeToCurrentPlatform(test_output):
>+ """Normalizes platform specific output details for easier comparison."""
>+
>+ if IS_WINDOWS:
>+ # Removes the color information that is not present on Windows.
>+ test_output = re.sub('\x1b\\[(0;3\d)?m', '', test_output)
>+ # Changes failure message headers into the Windows format.
>+ test_output = re.sub(r': Failure\n', r': error: ', test_output)
>+ # Changes file(line_number) to file:line_number.
>+ test_output = re.sub(r'((\w|\.)+)\((\d+)$:', r'\1:\3:', test_output)
>+
>+ return test_output
>+
>+
>+def RemoveTestCounts(output):
>+ """Removes test counts from a Google Test program's output."""
>+
>+ output = re.sub(r'\d+ tests?, listed below',
>+ '? tests, listed below', output)
>+ output = re.sub(r'\d+ FAILED TESTS',
>+ '? FAILED TESTS', output)
>+ output = re.sub(r'\d+ tests? from \d+ test cases?',
>+ '? tests from ? test cases', output)
>+ output = re.sub(r'\d+ tests? from ([a-zA-Z_])',
>+ r'? tests from \1', output)
>+ return re.sub(r'\d+ tests?\.', '? tests.', output)
>+
>+
>+def RemoveMatchingTests(test_output, pattern):
>+ """Removes output of specified tests from a Google Test program's output.
>+
>+ This function strips not only the beginning and the end of a test but also
>+ all output in between.
>+
>+ Args:
>+ test_output: A string containing the test output.
>+ pattern: A regex string that matches names of test cases or
>+ tests to remove.
>+
>+ Returns:
>+ Contents of test_output with tests whose names match pattern removed.
>+ """
>+
>+ test_output = re.sub(
>+ r'.*\[ RUN \] .*%s(.|\n)*?\[( FAILED | OK )\] .*%s.*\n' % (
>+ pattern, pattern),
>+ '',
>+ test_output)
>+ return re.sub(r'.*%s.*\n' % pattern, '', test_output)
>+
>+
>+def NormalizeOutput(output):
>+ """Normalizes output (the output of googletest-output-test_.exe)."""
>+
>+ output = ToUnixLineEnding(output)
>+ output = RemoveLocations(output)
>+ output = RemoveStackTraceDetails(output)
>+ output = RemoveTime(output)
>+ return output
>+
>+
>+def GetShellCommandOutput(env_cmd):
>+ """Runs a command in a sub-process, and returns its output in a string.
>+
>+ Args:
>+ env_cmd: The shell command. A 2-tuple where element 0 is a dict of extra
>+ environment variables to set, and element 1 is a string with
>+ the command and any flags.
>+
>+ Returns:
>+ A string with the command's combined standard and diagnostic output.
>+ """
>+
>+ # Spawns cmd in a sub-process, and gets its standard I/O file objects.
>+ # Set and save the environment properly.
>+ environ = os.environ.copy()
>+ environ.update(env_cmd[0])
>+ p = gtest_test_utils.Subprocess(env_cmd[1], env=environ)
>+
>+ return p.output
>+
>+
>+def GetCommandOutput(env_cmd):
>+ """Runs a command and returns its output with all file location
>+ info stripped off.
>+
>+ Args:
>+ env_cmd: The shell command. A 2-tuple where element 0 is a dict of extra
>+ environment variables to set, and element 1 is a string with
>+ the command and any flags.
>+ """
>+
>+ # Disables exception pop-ups on Windows.
>+ environ, cmdline = env_cmd
>+ environ = dict(environ) # Ensures we are modifying a copy.
>+ environ[CATCH_EXCEPTIONS_ENV_VAR_NAME] = '1'
>+ return NormalizeOutput(GetShellCommandOutput((environ, cmdline)))
>+
>+
>+def GetOutputOfAllCommands():
>+ """Returns concatenated output from several representative commands."""
>+
>+ return (GetCommandOutput(COMMAND_WITH_COLOR) +
>+ GetCommandOutput(COMMAND_WITH_TIME) +
>+ GetCommandOutput(COMMAND_WITH_DISABLED) +
>+ GetCommandOutput(COMMAND_WITH_SHARDING))
>+
>+
>+test_list = GetShellCommandOutput(COMMAND_LIST_TESTS)
>+SUPPORTS_DEATH_TESTS = 'DeathTest' in test_list
>+SUPPORTS_TYPED_TESTS = 'TypedTest' in test_list
>+SUPPORTS_THREADS = 'ExpectFailureWithThreadsTest' in test_list
>+SUPPORTS_STACK_TRACES = NO_STACKTRACE_SUPPORT_FLAG not in sys.argv
>+
>+CAN_GENERATE_GOLDEN_FILE = (SUPPORTS_DEATH_TESTS and
>+ SUPPORTS_TYPED_TESTS and
>+ SUPPORTS_THREADS and
>+ SUPPORTS_STACK_TRACES)
>+
>+class GTestOutputTest(gtest_test_utils.TestCase):
>+ def RemoveUnsupportedTests(self, test_output):
>+ if not SUPPORTS_DEATH_TESTS:
>+ test_output = RemoveMatchingTests(test_output, 'DeathTest')
>+ if not SUPPORTS_TYPED_TESTS:
>+ test_output = RemoveMatchingTests(test_output, 'TypedTest')
>+ test_output = RemoveMatchingTests(test_output, 'TypedDeathTest')
>+ test_output = RemoveMatchingTests(test_output, 'TypeParamDeathTest')
>+ if not SUPPORTS_THREADS:
>+ test_output = RemoveMatchingTests(test_output,
>+ 'ExpectFailureWithThreadsTest')
>+ test_output = RemoveMatchingTests(test_output,
>+ 'ScopedFakeTestPartResultReporterTest')
>+ test_output = RemoveMatchingTests(test_output,
>+ 'WorksConcurrently')
>+ if not SUPPORTS_STACK_TRACES:
>+ test_output = RemoveStackTraces(test_output)
>+
>+ return test_output
>+
>+ def testOutput(self):
>+ output = GetOutputOfAllCommands()
>+
>+ golden_file = open(GOLDEN_PATH, 'rb')
>+ # A mis-configured source control system can cause \r appear in EOL
>+ # sequences when we read the golden file irrespective of an operating
>+ # system used. Therefore, we need to strip those \r's from newlines
>+ # unconditionally.
>+ golden = ToUnixLineEnding(golden_file.read())
>+ golden_file.close()
>+
>+ # We want the test to pass regardless of certain features being
>+ # supported or not.
>+
>+ # We still have to remove type name specifics in all cases.
>+ normalized_actual = RemoveTypeInfoDetails(output)
>+ normalized_golden = RemoveTypeInfoDetails(golden)
>+
>+ if CAN_GENERATE_GOLDEN_FILE:
>+ self.assertEqual(normalized_golden, normalized_actual,
>+ '\n'.join(difflib.unified_diff(
>+ normalized_golden.split('\n'),
>+ normalized_actual.split('\n'),
>+ 'golden', 'actual')))
>+ else:
>+ normalized_actual = NormalizeToCurrentPlatform(
>+ RemoveTestCounts(normalized_actual))
>+ normalized_golden = NormalizeToCurrentPlatform(
>+ RemoveTestCounts(self.RemoveUnsupportedTests(normalized_golden)))
>+
>+ # This code is very handy when debugging golden file differences:
>+ if os.getenv('DEBUG_GTEST_OUTPUT_TEST'):
>+ open(os.path.join(
>+ gtest_test_utils.GetSourceDir(),
>+ '_googletest-output-test_normalized_actual.txt'), 'wb').write(
>+ normalized_actual)
>+ open(os.path.join(
>+ gtest_test_utils.GetSourceDir(),
>+ '_googletest-output-test_normalized_golden.txt'), 'wb').write(
>+ normalized_golden)
>+
>+ self.assertEqual(normalized_golden, normalized_actual)
>+
>+
>+if __name__ == '__main__':
>+ if NO_STACKTRACE_SUPPORT_FLAG in sys.argv:
>+ # unittest.main() can't handle unknown flags
>+ sys.argv.remove(NO_STACKTRACE_SUPPORT_FLAG)
>+
>+ if GENGOLDEN_FLAG in sys.argv:
>+ if CAN_GENERATE_GOLDEN_FILE:
>+ output = GetOutputOfAllCommands()
>+ golden_file = open(GOLDEN_PATH, 'wb')
>+ golden_file.write(output)
>+ golden_file.close()
>+ else:
>+ message = (
>+ """Unable to write a golden file when compiled in an environment
>+that does not support all the required features (death tests,
>+typed tests, stack traces, and multiple threads).
>+Please build this test and generate the golden file using Blaze on Linux.""")
>+
>+ sys.stderr.write(message)
>+ sys.exit(1)
>+ else:
>+ gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/googletest-output-test_.cc b/Source/ThirdParty/gtest/test/googletest-output-test_.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..180630e282b038a7e99c6f2315236f1383da91a7
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-output-test_.cc
>@@ -0,0 +1,1109 @@
>+// Copyright 2005, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+//
>+// The purpose of this file is to generate Google Test output under
>+// various conditions. The output will then be verified by
>+// googletest-output-test.py to ensure that Google Test generates the
>+// desired messages. Therefore, most tests in this file are MEANT TO
>+// FAIL.
>+
>+#include "gtest/gtest-spi.h"
>+#include "gtest/gtest.h"
>+#include "src/gtest-internal-inl.h"
>+
>+#include <stdlib.h>
>+
>+#if _MSC_VER
>+ GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127 /* conditional expression is constant */)
>+#endif // . _MSC_VER 
>+
>+#if GTEST_IS_THREADSAFE
>+using testing::ScopedFakeTestPartResultReporter;
>+using testing::TestPartResultArray;
>+
>+using testing::internal::Notification;
>+using testing::internal::ThreadWithParam;
>+#endif
>+
>+namespace posix = ::testing::internal::posix;
>+
>+// Tests catching fatal failures.
>+
>+// A subroutine used by the following test.
>+void TestEq1(int x) {
>+ ASSERT_EQ(1, x);
>+}
>+
>+// This function calls a test subroutine, catches the fatal failure it
>+// generates, and then returns early.
>+void TryTestSubroutine() {
>+ // Calls a subrountine that yields a fatal failure.
>+ TestEq1(2);
>+
>+ // Catches the fatal failure and aborts the test.
>+ //
>+ // The testing::Test:: prefix is necessary when calling
>+ // HasFatalFailure() outside of a TEST, TEST_F, or test fixture.
>+ if (testing::Test::HasFatalFailure()) return;
>+
>+ // If we get here, something is wrong.
>+ FAIL() << "This should never be reached.";
>+}
>+
>+TEST(PassingTest, PassingTest1) {
>+}
>+
>+TEST(PassingTest, PassingTest2) {
>+}
>+
>+// Tests that parameters of failing parameterized tests are printed in the
>+// failing test summary.
>+class FailingParamTest : public testing::TestWithParam<int> {};
>+
>+TEST_P(FailingParamTest, Fails) {
>+ EXPECT_EQ(1, GetParam());
>+}
>+
>+// This generates a test which will fail. Google Test is expected to print
>+// its parameter when it outputs the list of all failed tests.
>+INSTANTIATE_TEST_CASE_P(PrintingFailingParams,
>+ FailingParamTest,
>+ testing::Values(2));
>+
>+static const char kGoldenString[] = "\"Line\0 1\"\nLine 2";
>+
>+TEST(NonfatalFailureTest, EscapesStringOperands) {
>+ std::string actual = "actual \"string\"";
>+ EXPECT_EQ(kGoldenString, actual);
>+
>+ const char* golden = kGoldenString;
>+ EXPECT_EQ(golden, actual);
>+}
>+
>+TEST(NonfatalFailureTest, DiffForLongStrings) {
>+ std::string golden_str(kGoldenString, sizeof(kGoldenString) - 1);
>+ EXPECT_EQ(golden_str, "Line 2");
>+}
>+
>+// Tests catching a fatal failure in a subroutine.
>+TEST(FatalFailureTest, FatalFailureInSubroutine) {
>+ printf("(expecting a failure that x should be 1)\n");
>+
>+ TryTestSubroutine();
>+}
>+
>+// Tests catching a fatal failure in a nested subroutine.
>+TEST(FatalFailureTest, FatalFailureInNestedSubroutine) {
>+ printf("(expecting a failure that x should be 1)\n");
>+
>+ // Calls a subrountine that yields a fatal failure.
>+ TryTestSubroutine();
>+
>+ // Catches the fatal failure and aborts the test.
>+ //
>+ // When calling HasFatalFailure() inside a TEST, TEST_F, or test
>+ // fixture, the testing::Test:: prefix is not needed.
>+ if (HasFatalFailure()) return;
>+
>+ // If we get here, something is wrong.
>+ FAIL() << "This should never be reached.";
>+}
>+
>+// Tests HasFatalFailure() after a failed EXPECT check.
>+TEST(FatalFailureTest, NonfatalFailureInSubroutine) {
>+ printf("(expecting a failure on false)\n");
>+ EXPECT_TRUE(false); // Generates a nonfatal failure
>+ ASSERT_FALSE(HasFatalFailure()); // This should succeed.
>+}
>+
>+// Tests interleaving user logging and Google Test assertions.
>+TEST(LoggingTest, InterleavingLoggingAndAssertions) {
>+ static const int a[4] = {
>+ 3, 9, 2, 6
>+ };
>+
>+ printf("(expecting 2 failures on (3) >= (a[i]))\n");
>+ for (int i = 0; i < static_cast<int>(sizeof(a)/sizeof(*a)); i++) {
>+ printf("i == %d\n", i);
>+ EXPECT_GE(3, a[i]);
>+ }
>+}
>+
>+// Tests the SCOPED_TRACE macro.
>+
>+// A helper function for testing SCOPED_TRACE.
>+void SubWithoutTrace(int n) {
>+ EXPECT_EQ(1, n);
>+ ASSERT_EQ(2, n);
>+}
>+
>+// Another helper function for testing SCOPED_TRACE.
>+void SubWithTrace(int n) {
>+ SCOPED_TRACE(testing::Message() << "n = " << n);
>+
>+ SubWithoutTrace(n);
>+}
>+
>+TEST(SCOPED_TRACETest, AcceptedValues) {
>+ SCOPED_TRACE("literal string");
>+ SCOPED_TRACE(std::string("std::string"));
>+ SCOPED_TRACE(1337); // streamable type
>+ const char* null_value = NULL;
>+ SCOPED_TRACE(null_value);
>+
>+ ADD_FAILURE() << "Just checking that all these values work fine.";
>+}
>+
>+// Tests that SCOPED_TRACE() obeys lexical scopes.
>+TEST(SCOPED_TRACETest, ObeysScopes) {
>+ printf("(expected to fail)\n");
>+
>+ // There should be no trace before SCOPED_TRACE() is invoked.
>+ ADD_FAILURE() << "This failure is expected, and shouldn't have a trace.";
>+
>+ {
>+ SCOPED_TRACE("Expected trace");
>+ // After SCOPED_TRACE(), a failure in the current scope should contain
>+ // the trace.
>+ ADD_FAILURE() << "This failure is expected, and should have a trace.";
>+ }
>+
>+ // Once the control leaves the scope of the SCOPED_TRACE(), there
>+ // should be no trace again.
>+ ADD_FAILURE() << "This failure is expected, and shouldn't have a trace.";
>+}
>+
>+// Tests that SCOPED_TRACE works inside a loop.
>+TEST(SCOPED_TRACETest, WorksInLoop) {
>+ printf("(expected to fail)\n");
>+
>+ for (int i = 1; i <= 2; i++) {
>+ SCOPED_TRACE(testing::Message() << "i = " << i);
>+
>+ SubWithoutTrace(i);
>+ }
>+}
>+
>+// Tests that SCOPED_TRACE works in a subroutine.
>+TEST(SCOPED_TRACETest, WorksInSubroutine) {
>+ printf("(expected to fail)\n");
>+
>+ SubWithTrace(1);
>+ SubWithTrace(2);
>+}
>+
>+// Tests that SCOPED_TRACE can be nested.
>+TEST(SCOPED_TRACETest, CanBeNested) {
>+ printf("(expected to fail)\n");
>+
>+ SCOPED_TRACE(""); // A trace without a message.
>+
>+ SubWithTrace(2);
>+}
>+
>+// Tests that multiple SCOPED_TRACEs can be used in the same scope.
>+TEST(SCOPED_TRACETest, CanBeRepeated) {
>+ printf("(expected to fail)\n");
>+
>+ SCOPED_TRACE("A");
>+ ADD_FAILURE()
>+ << "This failure is expected, and should contain trace point A.";
>+
>+ SCOPED_TRACE("B");
>+ ADD_FAILURE()
>+ << "This failure is expected, and should contain trace point A and B.";
>+
>+ {
>+ SCOPED_TRACE("C");
>+ ADD_FAILURE() << "This failure is expected, and should "
>+ << "contain trace point A, B, and C.";
>+ }
>+
>+ SCOPED_TRACE("D");
>+ ADD_FAILURE() << "This failure is expected, and should "
>+ << "contain trace point A, B, and D.";
>+}
>+
>+#if GTEST_IS_THREADSAFE
>+// Tests that SCOPED_TRACE()s can be used concurrently from multiple
>+// threads. Namely, an assertion should be affected by
>+// SCOPED_TRACE()s in its own thread only.
>+
>+// Here's the sequence of actions that happen in the test:
>+//
>+// Thread A (main) | Thread B (spawned)
>+// ===============================|================================
>+// spawns thread B |
>+// -------------------------------+--------------------------------
>+// waits for n1 | SCOPED_TRACE("Trace B");
>+// | generates failure #1
>+// | notifies n1
>+// -------------------------------+--------------------------------
>+// SCOPED_TRACE("Trace A"); | waits for n2
>+// generates failure #2 |
>+// notifies n2 |
>+// -------------------------------|--------------------------------
>+// waits for n3 | generates failure #3
>+// | trace B dies
>+// | generates failure #4
>+// | notifies n3
>+// -------------------------------|--------------------------------
>+// generates failure #5 | finishes
>+// trace A dies |
>+// generates failure #6 |
>+// -------------------------------|--------------------------------
>+// waits for thread B to finish |
>+
>+struct CheckPoints {
>+ Notification n1;
>+ Notification n2;
>+ Notification n3;
>+};
>+
>+static void ThreadWithScopedTrace(CheckPoints* check_points) {
>+ {
>+ SCOPED_TRACE("Trace B");
>+ ADD_FAILURE()
>+ << "Expected failure #1 (in thread B, only trace B alive).";
>+ check_points->n1.Notify();
>+ check_points->n2.WaitForNotification();
>+
>+ ADD_FAILURE()
>+ << "Expected failure #3 (in thread B, trace A & B both alive).";
>+ } // Trace B dies here.
>+ ADD_FAILURE()
>+ << "Expected failure #4 (in thread B, only trace A alive).";
>+ check_points->n3.Notify();
>+}
>+
>+TEST(SCOPED_TRACETest, WorksConcurrently) {
>+ printf("(expecting 6 failures)\n");
>+
>+ CheckPoints check_points;
>+ ThreadWithParam<CheckPoints*> thread(&ThreadWithScopedTrace,
>+ &check_points,
>+ NULL);
>+ check_points.n1.WaitForNotification();
>+
>+ {
>+ SCOPED_TRACE("Trace A");
>+ ADD_FAILURE()
>+ << "Expected failure #2 (in thread A, trace A & B both alive).";
>+ check_points.n2.Notify();
>+ check_points.n3.WaitForNotification();
>+
>+ ADD_FAILURE()
>+ << "Expected failure #5 (in thread A, only trace A alive).";
>+ } // Trace A dies here.
>+ ADD_FAILURE()
>+ << "Expected failure #6 (in thread A, no trace alive).";
>+ thread.Join();
>+}
>+#endif // GTEST_IS_THREADSAFE
>+
>+// Tests basic functionality of the ScopedTrace utility (most of its features
>+// are already tested in SCOPED_TRACETest).
>+TEST(ScopedTraceTest, WithExplicitFileAndLine) {
>+ testing::ScopedTrace trace("explicit_file.cc", 123, "expected trace message");
>+ ADD_FAILURE() << "Check that the trace is attached to a particular location.";
>+}
>+
>+TEST(DisabledTestsWarningTest,
>+ DISABLED_AlsoRunDisabledTestsFlagSuppressesWarning) {
>+ // This test body is intentionally empty. Its sole purpose is for
>+ // verifying that the --gtest_also_run_disabled_tests flag
>+ // suppresses the "YOU HAVE 12 DISABLED TESTS" warning at the end of
>+ // the test output.
>+}
>+
>+// Tests using assertions outside of TEST and TEST_F.
>+//
>+// This function creates two failures intentionally.
>+void AdHocTest() {
>+ printf("The non-test part of the code is expected to have 2 failures.\n\n");
>+ EXPECT_TRUE(false);
>+ EXPECT_EQ(2, 3);
>+}
>+
>+// Runs all TESTs, all TEST_Fs, and the ad hoc test.
>+int RunAllTests() {
>+ AdHocTest();
>+ return RUN_ALL_TESTS();
>+}
>+
>+// Tests non-fatal failures in the fixture constructor.
>+class NonFatalFailureInFixtureConstructorTest : public testing::Test {
>+ protected:
>+ NonFatalFailureInFixtureConstructorTest() {
>+ printf("(expecting 5 failures)\n");
>+ ADD_FAILURE() << "Expected failure #1, in the test fixture c'tor.";
>+ }
>+
>+ ~NonFatalFailureInFixtureConstructorTest() {
>+ ADD_FAILURE() << "Expected failure #5, in the test fixture d'tor.";
>+ }
>+
>+ virtual void SetUp() {
>+ ADD_FAILURE() << "Expected failure #2, in SetUp().";
>+ }
>+
>+ virtual void TearDown() {
>+ ADD_FAILURE() << "Expected failure #4, in TearDown.";
>+ }
>+};
>+
>+TEST_F(NonFatalFailureInFixtureConstructorTest, FailureInConstructor) {
>+ ADD_FAILURE() << "Expected failure #3, in the test body.";
>+}
>+
>+// Tests fatal failures in the fixture constructor.
>+class FatalFailureInFixtureConstructorTest : public testing::Test {
>+ protected:
>+ FatalFailureInFixtureConstructorTest() {
>+ printf("(expecting 2 failures)\n");
>+ Init();
>+ }
>+
>+ ~FatalFailureInFixtureConstructorTest() {
>+ ADD_FAILURE() << "Expected failure #2, in the test fixture d'tor.";
>+ }
>+
>+ virtual void SetUp() {
>+ ADD_FAILURE() << "UNEXPECTED failure in SetUp(). "
>+ << "We should never get here, as the test fixture c'tor "
>+ << "had a fatal failure.";
>+ }
>+
>+ virtual void TearDown() {
>+ ADD_FAILURE() << "UNEXPECTED failure in TearDown(). "
>+ << "We should never get here, as the test fixture c'tor "
>+ << "had a fatal failure.";
>+ }
>+
>+ private:
>+ void Init() {
>+ FAIL() << "Expected failure #1, in the test fixture c'tor.";
>+ }
>+};
>+
>+TEST_F(FatalFailureInFixtureConstructorTest, FailureInConstructor) {
>+ ADD_FAILURE() << "UNEXPECTED failure in the test body. "
>+ << "We should never get here, as the test fixture c'tor "
>+ << "had a fatal failure.";
>+}
>+
>+// Tests non-fatal failures in SetUp().
>+class NonFatalFailureInSetUpTest : public testing::Test {
>+ protected:
>+ virtual ~NonFatalFailureInSetUpTest() {
>+ Deinit();
>+ }
>+
>+ virtual void SetUp() {
>+ printf("(expecting 4 failures)\n");
>+ ADD_FAILURE() << "Expected failure #1, in SetUp().";
>+ }
>+
>+ virtual void TearDown() {
>+ FAIL() << "Expected failure #3, in TearDown().";
>+ }
>+ private:
>+ void Deinit() {
>+ FAIL() << "Expected failure #4, in the test fixture d'tor.";
>+ }
>+};
>+
>+TEST_F(NonFatalFailureInSetUpTest, FailureInSetUp) {
>+ FAIL() << "Expected failure #2, in the test function.";
>+}
>+
>+// Tests fatal failures in SetUp().
>+class FatalFailureInSetUpTest : public testing::Test {
>+ protected:
>+ virtual ~FatalFailureInSetUpTest() {
>+ Deinit();
>+ }
>+
>+ virtual void SetUp() {
>+ printf("(expecting 3 failures)\n");
>+ FAIL() << "Expected failure #1, in SetUp().";
>+ }
>+
>+ virtual void TearDown() {
>+ FAIL() << "Expected failure #2, in TearDown().";
>+ }
>+ private:
>+ void Deinit() {
>+ FAIL() << "Expected failure #3, in the test fixture d'tor.";
>+ }
>+};
>+
>+TEST_F(FatalFailureInSetUpTest, FailureInSetUp) {
>+ FAIL() << "UNEXPECTED failure in the test function. "
>+ << "We should never get here, as SetUp() failed.";
>+}
>+
>+TEST(AddFailureAtTest, MessageContainsSpecifiedFileAndLineNumber) {
>+ ADD_FAILURE_AT("foo.cc", 42) << "Expected failure in foo.cc";
>+}
>+
>+#if GTEST_IS_THREADSAFE
>+
>+// A unary function that may die.
>+void DieIf(bool should_die) {
>+ GTEST_CHECK_(!should_die) << " - death inside DieIf().";
>+}
>+
>+// Tests running death tests in a multi-threaded context.
>+
>+// Used for coordination between the main and the spawn thread.
>+struct SpawnThreadNotifications {
>+ SpawnThreadNotifications() {}
>+
>+ Notification spawn_thread_started;
>+ Notification spawn_thread_ok_to_terminate;
>+
>+ private:
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(SpawnThreadNotifications);
>+};
>+
>+// The function to be executed in the thread spawn by the
>+// MultipleThreads test (below).
>+static void ThreadRoutine(SpawnThreadNotifications* notifications) {
>+ // Signals the main thread that this thread has started.
>+ notifications->spawn_thread_started.Notify();
>+
>+ // Waits for permission to finish from the main thread.
>+ notifications->spawn_thread_ok_to_terminate.WaitForNotification();
>+}
>+
>+// This is a death-test test, but it's not named with a DeathTest
>+// suffix. It starts threads which might interfere with later
>+// death tests, so it must run after all other death tests.
>+class DeathTestAndMultiThreadsTest : public testing::Test {
>+ protected:
>+ // Starts a thread and waits for it to begin.
>+ virtual void SetUp() {
>+ thread_.reset(new ThreadWithParam<SpawnThreadNotifications*>(
>+ &ThreadRoutine, &notifications_, NULL));
>+ notifications_.spawn_thread_started.WaitForNotification();
>+ }
>+ // Tells the thread to finish, and reaps it.
>+ // Depending on the version of the thread library in use,
>+ // a manager thread might still be left running that will interfere
>+ // with later death tests. This is unfortunate, but this class
>+ // cleans up after itself as best it can.
>+ virtual void TearDown() {
>+ notifications_.spawn_thread_ok_to_terminate.Notify();
>+ }
>+
>+ private:
>+ SpawnThreadNotifications notifications_;
>+ testing::internal::scoped_ptr<ThreadWithParam<SpawnThreadNotifications*> >
>+ thread_;
>+};
>+
>+#endif // GTEST_IS_THREADSAFE
>+
>+// The MixedUpTestCaseTest test case verifies that Google Test will fail a
>+// test if it uses a different fixture class than what other tests in
>+// the same test case use. It deliberately contains two fixture
>+// classes with the same name but defined in different namespaces.
>+
>+// The MixedUpTestCaseWithSameTestNameTest test case verifies that
>+// when the user defines two tests with the same test case name AND
>+// same test name (but in different namespaces), the second test will
>+// fail.
>+
>+namespace foo {
>+
>+class MixedUpTestCaseTest : public testing::Test {
>+};
>+
>+TEST_F(MixedUpTestCaseTest, FirstTestFromNamespaceFoo) {}
>+TEST_F(MixedUpTestCaseTest, SecondTestFromNamespaceFoo) {}
>+
>+class MixedUpTestCaseWithSameTestNameTest : public testing::Test {
>+};
>+
>+TEST_F(MixedUpTestCaseWithSameTestNameTest,
>+ TheSecondTestWithThisNameShouldFail) {}
>+
>+} // namespace foo
>+
>+namespace bar {
>+
>+class MixedUpTestCaseTest : public testing::Test {
>+};
>+
>+// The following two tests are expected to fail. We rely on the
>+// golden file to check that Google Test generates the right error message.
>+TEST_F(MixedUpTestCaseTest, ThisShouldFail) {}
>+TEST_F(MixedUpTestCaseTest, ThisShouldFailToo) {}
>+
>+class MixedUpTestCaseWithSameTestNameTest : public testing::Test {
>+};
>+
>+// Expected to fail. We rely on the golden file to check that Google Test
>+// generates the right error message.
>+TEST_F(MixedUpTestCaseWithSameTestNameTest,
>+ TheSecondTestWithThisNameShouldFail) {}
>+
>+} // namespace bar
>+
>+// The following two test cases verify that Google Test catches the user
>+// error of mixing TEST and TEST_F in the same test case. The first
>+// test case checks the scenario where TEST_F appears before TEST, and
>+// the second one checks where TEST appears before TEST_F.
>+
>+class TEST_F_before_TEST_in_same_test_case : public testing::Test {
>+};
>+
>+TEST_F(TEST_F_before_TEST_in_same_test_case, DefinedUsingTEST_F) {}
>+
>+// Expected to fail. We rely on the golden file to check that Google Test
>+// generates the right error message.
>+TEST(TEST_F_before_TEST_in_same_test_case, DefinedUsingTESTAndShouldFail) {}
>+
>+class TEST_before_TEST_F_in_same_test_case : public testing::Test {
>+};
>+
>+TEST(TEST_before_TEST_F_in_same_test_case, DefinedUsingTEST) {}
>+
>+// Expected to fail. We rely on the golden file to check that Google Test
>+// generates the right error message.
>+TEST_F(TEST_before_TEST_F_in_same_test_case, DefinedUsingTEST_FAndShouldFail) {
>+}
>+
>+// Used for testing EXPECT_NONFATAL_FAILURE() and EXPECT_FATAL_FAILURE().
>+int global_integer = 0;
>+
>+// Tests that EXPECT_NONFATAL_FAILURE() can reference global variables.
>+TEST(ExpectNonfatalFailureTest, CanReferenceGlobalVariables) {
>+ global_integer = 0;
>+ EXPECT_NONFATAL_FAILURE({
>+ EXPECT_EQ(1, global_integer) << "Expected non-fatal failure.";
>+ }, "Expected non-fatal failure.");
>+}
>+
>+// Tests that EXPECT_NONFATAL_FAILURE() can reference local variables
>+// (static or not).
>+TEST(ExpectNonfatalFailureTest, CanReferenceLocalVariables) {
>+ int m = 0;
>+ static int n;
>+ n = 1;
>+ EXPECT_NONFATAL_FAILURE({
>+ EXPECT_EQ(m, n) << "Expected non-fatal failure.";
>+ }, "Expected non-fatal failure.");
>+}
>+
>+// Tests that EXPECT_NONFATAL_FAILURE() succeeds when there is exactly
>+// one non-fatal failure and no fatal failure.
>+TEST(ExpectNonfatalFailureTest, SucceedsWhenThereIsOneNonfatalFailure) {
>+ EXPECT_NONFATAL_FAILURE({
>+ ADD_FAILURE() << "Expected non-fatal failure.";
>+ }, "Expected non-fatal failure.");
>+}
>+
>+// Tests that EXPECT_NONFATAL_FAILURE() fails when there is no
>+// non-fatal failure.
>+TEST(ExpectNonfatalFailureTest, FailsWhenThereIsNoNonfatalFailure) {
>+ printf("(expecting a failure)\n");
>+ EXPECT_NONFATAL_FAILURE({
>+ }, "");
>+}
>+
>+// Tests that EXPECT_NONFATAL_FAILURE() fails when there are two
>+// non-fatal failures.
>+TEST(ExpectNonfatalFailureTest, FailsWhenThereAreTwoNonfatalFailures) {
>+ printf("(expecting a failure)\n");
>+ EXPECT_NONFATAL_FAILURE({
>+ ADD_FAILURE() << "Expected non-fatal failure 1.";
>+ ADD_FAILURE() << "Expected non-fatal failure 2.";
>+ }, "");
>+}
>+
>+// Tests that EXPECT_NONFATAL_FAILURE() fails when there is one fatal
>+// failure.
>+TEST(ExpectNonfatalFailureTest, FailsWhenThereIsOneFatalFailure) {
>+ printf("(expecting a failure)\n");
>+ EXPECT_NONFATAL_FAILURE({
>+ FAIL() << "Expected fatal failure.";
>+ }, "");
>+}
>+
>+// Tests that EXPECT_NONFATAL_FAILURE() fails when the statement being
>+// tested returns.
>+TEST(ExpectNonfatalFailureTest, FailsWhenStatementReturns) {
>+ printf("(expecting a failure)\n");
>+ EXPECT_NONFATAL_FAILURE({
>+ return;
>+ }, "");
>+}
>+
>+#if GTEST_HAS_EXCEPTIONS
>+
>+// Tests that EXPECT_NONFATAL_FAILURE() fails when the statement being
>+// tested throws.
>+TEST(ExpectNonfatalFailureTest, FailsWhenStatementThrows) {
>+ printf("(expecting a failure)\n");
>+ try {
>+ EXPECT_NONFATAL_FAILURE({
>+ throw 0;
>+ }, "");
>+ } catch(int) { // NOLINT
>+ }
>+}
>+
>+#endif // GTEST_HAS_EXCEPTIONS
>+
>+// Tests that EXPECT_FATAL_FAILURE() can reference global variables.
>+TEST(ExpectFatalFailureTest, CanReferenceGlobalVariables) {
>+ global_integer = 0;
>+ EXPECT_FATAL_FAILURE({
>+ ASSERT_EQ(1, global_integer) << "Expected fatal failure.";
>+ }, "Expected fatal failure.");
>+}
>+
>+// Tests that EXPECT_FATAL_FAILURE() can reference local static
>+// variables.
>+TEST(ExpectFatalFailureTest, CanReferenceLocalStaticVariables) {
>+ static int n;
>+ n = 1;
>+ EXPECT_FATAL_FAILURE({
>+ ASSERT_EQ(0, n) << "Expected fatal failure.";
>+ }, "Expected fatal failure.");
>+}
>+
>+// Tests that EXPECT_FATAL_FAILURE() succeeds when there is exactly
>+// one fatal failure and no non-fatal failure.
>+TEST(ExpectFatalFailureTest, SucceedsWhenThereIsOneFatalFailure) {
>+ EXPECT_FATAL_FAILURE({
>+ FAIL() << "Expected fatal failure.";
>+ }, "Expected fatal failure.");
>+}
>+
>+// Tests that EXPECT_FATAL_FAILURE() fails when there is no fatal
>+// failure.
>+TEST(ExpectFatalFailureTest, FailsWhenThereIsNoFatalFailure) {
>+ printf("(expecting a failure)\n");
>+ EXPECT_FATAL_FAILURE({
>+ }, "");
>+}
>+
>+// A helper for generating a fatal failure.
>+void FatalFailure() {
>+ FAIL() << "Expected fatal failure.";
>+}
>+
>+// Tests that EXPECT_FATAL_FAILURE() fails when there are two
>+// fatal failures.
>+TEST(ExpectFatalFailureTest, FailsWhenThereAreTwoFatalFailures) {
>+ printf("(expecting a failure)\n");
>+ EXPECT_FATAL_FAILURE({
>+ FatalFailure();
>+ FatalFailure();
>+ }, "");
>+}
>+
>+// Tests that EXPECT_FATAL_FAILURE() fails when there is one non-fatal
>+// failure.
>+TEST(ExpectFatalFailureTest, FailsWhenThereIsOneNonfatalFailure) {
>+ printf("(expecting a failure)\n");
>+ EXPECT_FATAL_FAILURE({
>+ ADD_FAILURE() << "Expected non-fatal failure.";
>+ }, "");
>+}
>+
>+// Tests that EXPECT_FATAL_FAILURE() fails when the statement being
>+// tested returns.
>+TEST(ExpectFatalFailureTest, FailsWhenStatementReturns) {
>+ printf("(expecting a failure)\n");
>+ EXPECT_FATAL_FAILURE({
>+ return;
>+ }, "");
>+}
>+
>+#if GTEST_HAS_EXCEPTIONS
>+
>+// Tests that EXPECT_FATAL_FAILURE() fails when the statement being
>+// tested throws.
>+TEST(ExpectFatalFailureTest, FailsWhenStatementThrows) {
>+ printf("(expecting a failure)\n");
>+ try {
>+ EXPECT_FATAL_FAILURE({
>+ throw 0;
>+ }, "");
>+ } catch(int) { // NOLINT
>+ }
>+}
>+
>+#endif // GTEST_HAS_EXCEPTIONS
>+
>+// This #ifdef block tests the output of value-parameterized tests.
>+
>+std::string ParamNameFunc(const testing::TestParamInfo<std::string>& info) {
>+ return info.param;
>+}
>+
>+class ParamTest : public testing::TestWithParam<std::string> {
>+};
>+
>+TEST_P(ParamTest, Success) {
>+ EXPECT_EQ("a", GetParam());
>+}
>+
>+TEST_P(ParamTest, Failure) {
>+ EXPECT_EQ("b", GetParam()) << "Expected failure";
>+}
>+
>+INSTANTIATE_TEST_CASE_P(PrintingStrings,
>+ ParamTest,
>+ testing::Values(std::string("a")),
>+ ParamNameFunc);
>+
>+// This #ifdef block tests the output of typed tests.
>+#if GTEST_HAS_TYPED_TEST
>+
>+template <typename T>
>+class TypedTest : public testing::Test {
>+};
>+
>+TYPED_TEST_CASE(TypedTest, testing::Types<int>);
>+
>+TYPED_TEST(TypedTest, Success) {
>+ EXPECT_EQ(0, TypeParam());
>+}
>+
>+TYPED_TEST(TypedTest, Failure) {
>+ EXPECT_EQ(1, TypeParam()) << "Expected failure";
>+}
>+
>+typedef testing::Types<char, int> TypesForTestWithNames;
>+
>+template <typename T>
>+class TypedTestWithNames : public testing::Test {};
>+
>+class TypedTestNames {
>+ public:
>+ template <typename T>
>+ static std::string GetName(int i) {
>+ if (testing::internal::IsSame<T, char>::value)
>+ return std::string("char_") + ::testing::PrintToString(i);
>+ if (testing::internal::IsSame<T, int>::value)
>+ return std::string("int_") + ::testing::PrintToString(i);
>+ }
>+};
>+
>+TYPED_TEST_CASE(TypedTestWithNames, TypesForTestWithNames, TypedTestNames);
>+
>+TYPED_TEST(TypedTestWithNames, Success) {}
>+
>+TYPED_TEST(TypedTestWithNames, Failure) { FAIL(); }
>+
>+#endif // GTEST_HAS_TYPED_TEST
>+
>+// This #ifdef block tests the output of type-parameterized tests.
>+#if GTEST_HAS_TYPED_TEST_P
>+
>+template <typename T>
>+class TypedTestP : public testing::Test {
>+};
>+
>+TYPED_TEST_CASE_P(TypedTestP);
>+
>+TYPED_TEST_P(TypedTestP, Success) {
>+ EXPECT_EQ(0U, TypeParam());
>+}
>+
>+TYPED_TEST_P(TypedTestP, Failure) {
>+ EXPECT_EQ(1U, TypeParam()) << "Expected failure";
>+}
>+
>+REGISTER_TYPED_TEST_CASE_P(TypedTestP, Success, Failure);
>+
>+typedef testing::Types<unsigned char, unsigned int> UnsignedTypes;
>+INSTANTIATE_TYPED_TEST_CASE_P(Unsigned, TypedTestP, UnsignedTypes);
>+
>+class TypedTestPNames {
>+ public:
>+ template <typename T>
>+ static std::string GetName(int i) {
>+ if (testing::internal::IsSame<T, unsigned char>::value) {
>+ return std::string("unsigned_char_") + ::testing::PrintToString(i);
>+ }
>+ if (testing::internal::IsSame<T, unsigned int>::value) {
>+ return std::string("unsigned_int_") + ::testing::PrintToString(i);
>+ }
>+ }
>+};
>+
>+INSTANTIATE_TYPED_TEST_CASE_P(UnsignedCustomName, TypedTestP, UnsignedTypes,
>+ TypedTestPNames);
>+
>+#endif // GTEST_HAS_TYPED_TEST_P
>+
>+#if GTEST_HAS_DEATH_TEST
>+
>+// We rely on the golden file to verify that tests whose test case
>+// name ends with DeathTest are run first.
>+
>+TEST(ADeathTest, ShouldRunFirst) {
>+}
>+
>+# if GTEST_HAS_TYPED_TEST
>+
>+// We rely on the golden file to verify that typed tests whose test
>+// case name ends with DeathTest are run first.
>+
>+template <typename T>
>+class ATypedDeathTest : public testing::Test {
>+};
>+
>+typedef testing::Types<int, double> NumericTypes;
>+TYPED_TEST_CASE(ATypedDeathTest, NumericTypes);
>+
>+TYPED_TEST(ATypedDeathTest, ShouldRunFirst) {
>+}
>+
>+# endif // GTEST_HAS_TYPED_TEST
>+
>+# if GTEST_HAS_TYPED_TEST_P
>+
>+
>+// We rely on the golden file to verify that type-parameterized tests
>+// whose test case name ends with DeathTest are run first.
>+
>+template <typename T>
>+class ATypeParamDeathTest : public testing::Test {
>+};
>+
>+TYPED_TEST_CASE_P(ATypeParamDeathTest);
>+
>+TYPED_TEST_P(ATypeParamDeathTest, ShouldRunFirst) {
>+}
>+
>+REGISTER_TYPED_TEST_CASE_P(ATypeParamDeathTest, ShouldRunFirst);
>+
>+INSTANTIATE_TYPED_TEST_CASE_P(My, ATypeParamDeathTest, NumericTypes);
>+
>+# endif // GTEST_HAS_TYPED_TEST_P
>+
>+#endif // GTEST_HAS_DEATH_TEST
>+
>+// Tests various failure conditions of
>+// EXPECT_{,NON}FATAL_FAILURE{,_ON_ALL_THREADS}.
>+class ExpectFailureTest : public testing::Test {
>+ public: // Must be public and not protected due to a bug in g++ 3.4.2.
>+ enum FailureMode {
>+ FATAL_FAILURE,
>+ NONFATAL_FAILURE
>+ };
>+ static void AddFailure(FailureMode failure) {
>+ if (failure == FATAL_FAILURE) {
>+ FAIL() << "Expected fatal failure.";
>+ } else {
>+ ADD_FAILURE() << "Expected non-fatal failure.";
>+ }
>+ }
>+};
>+
>+TEST_F(ExpectFailureTest, ExpectFatalFailure) {
>+ // Expected fatal failure, but succeeds.
>+ printf("(expecting 1 failure)\n");
>+ EXPECT_FATAL_FAILURE(SUCCEED(), "Expected fatal failure.");
>+ // Expected fatal failure, but got a non-fatal failure.
>+ printf("(expecting 1 failure)\n");
>+ EXPECT_FATAL_FAILURE(AddFailure(NONFATAL_FAILURE), "Expected non-fatal "
>+ "failure.");
>+ // Wrong message.
>+ printf("(expecting 1 failure)\n");
>+ EXPECT_FATAL_FAILURE(AddFailure(FATAL_FAILURE), "Some other fatal failure "
>+ "expected.");
>+}
>+
>+TEST_F(ExpectFailureTest, ExpectNonFatalFailure) {
>+ // Expected non-fatal failure, but succeeds.
>+ printf("(expecting 1 failure)\n");
>+ EXPECT_NONFATAL_FAILURE(SUCCEED(), "Expected non-fatal failure.");
>+ // Expected non-fatal failure, but got a fatal failure.
>+ printf("(expecting 1 failure)\n");
>+ EXPECT_NONFATAL_FAILURE(AddFailure(FATAL_FAILURE), "Expected fatal failure.");
>+ // Wrong message.
>+ printf("(expecting 1 failure)\n");
>+ EXPECT_NONFATAL_FAILURE(AddFailure(NONFATAL_FAILURE), "Some other non-fatal "
>+ "failure.");
>+}
>+
>+#if GTEST_IS_THREADSAFE
>+
>+class ExpectFailureWithThreadsTest : public ExpectFailureTest {
>+ protected:
>+ static void AddFailureInOtherThread(FailureMode failure) {
>+ ThreadWithParam<FailureMode> thread(&AddFailure, failure, NULL);
>+ thread.Join();
>+ }
>+};
>+
>+TEST_F(ExpectFailureWithThreadsTest, ExpectFatalFailure) {
>+ // We only intercept the current thread.
>+ printf("(expecting 2 failures)\n");
>+ EXPECT_FATAL_FAILURE(AddFailureInOtherThread(FATAL_FAILURE),
>+ "Expected fatal failure.");
>+}
>+
>+TEST_F(ExpectFailureWithThreadsTest, ExpectNonFatalFailure) {
>+ // We only intercept the current thread.
>+ printf("(expecting 2 failures)\n");
>+ EXPECT_NONFATAL_FAILURE(AddFailureInOtherThread(NONFATAL_FAILURE),
>+ "Expected non-fatal failure.");
>+}
>+
>+typedef ExpectFailureWithThreadsTest ScopedFakeTestPartResultReporterTest;
>+
>+// Tests that the ScopedFakeTestPartResultReporter only catches failures from
>+// the current thread if it is instantiated with INTERCEPT_ONLY_CURRENT_THREAD.
>+TEST_F(ScopedFakeTestPartResultReporterTest, InterceptOnlyCurrentThread) {
>+ printf("(expecting 2 failures)\n");
>+ TestPartResultArray results;
>+ {
>+ ScopedFakeTestPartResultReporter reporter(
>+ ScopedFakeTestPartResultReporter::INTERCEPT_ONLY_CURRENT_THREAD,
>+ &results);
>+ AddFailureInOtherThread(FATAL_FAILURE);
>+ AddFailureInOtherThread(NONFATAL_FAILURE);
>+ }
>+ // The two failures should not have been intercepted.
>+ EXPECT_EQ(0, results.size()) << "This shouldn't fail.";
>+}
>+
>+#endif // GTEST_IS_THREADSAFE
>+
>+TEST_F(ExpectFailureTest, ExpectFatalFailureOnAllThreads) {
>+ // Expected fatal failure, but succeeds.
>+ printf("(expecting 1 failure)\n");
>+ EXPECT_FATAL_FAILURE_ON_ALL_THREADS(SUCCEED(), "Expected fatal failure.");
>+ // Expected fatal failure, but got a non-fatal failure.
>+ printf("(expecting 1 failure)\n");
>+ EXPECT_FATAL_FAILURE_ON_ALL_THREADS(AddFailure(NONFATAL_FAILURE),
>+ "Expected non-fatal failure.");
>+ // Wrong message.
>+ printf("(expecting 1 failure)\n");
>+ EXPECT_FATAL_FAILURE_ON_ALL_THREADS(AddFailure(FATAL_FAILURE),
>+ "Some other fatal failure expected.");
>+}
>+
>+TEST_F(ExpectFailureTest, ExpectNonFatalFailureOnAllThreads) {
>+ // Expected non-fatal failure, but succeeds.
>+ printf("(expecting 1 failure)\n");
>+ EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(SUCCEED(), "Expected non-fatal "
>+ "failure.");
>+ // Expected non-fatal failure, but got a fatal failure.
>+ printf("(expecting 1 failure)\n");
>+ EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(AddFailure(FATAL_FAILURE),
>+ "Expected fatal failure.");
>+ // Wrong message.
>+ printf("(expecting 1 failure)\n");
>+ EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(AddFailure(NONFATAL_FAILURE),
>+ "Some other non-fatal failure.");
>+}
>+
>+
>+// Two test environments for testing testing::AddGlobalTestEnvironment().
>+
>+class FooEnvironment : public testing::Environment {
>+ public:
>+ virtual void SetUp() {
>+ printf("%s", "FooEnvironment::SetUp() called.\n");
>+ }
>+
>+ virtual void TearDown() {
>+ printf("%s", "FooEnvironment::TearDown() called.\n");
>+ FAIL() << "Expected fatal failure.";
>+ }
>+};
>+
>+class BarEnvironment : public testing::Environment {
>+ public:
>+ virtual void SetUp() {
>+ printf("%s", "BarEnvironment::SetUp() called.\n");
>+ }
>+
>+ virtual void TearDown() {
>+ printf("%s", "BarEnvironment::TearDown() called.\n");
>+ ADD_FAILURE() << "Expected non-fatal failure.";
>+ }
>+};
>+
>+// The main function.
>+//
>+// The idea is to use Google Test to run all the tests we have defined (some
>+// of them are intended to fail), and then compare the test results
>+// with the "golden" file.
>+int main(int argc, char **argv) {
>+ testing::GTEST_FLAG(print_time) = false;
>+
>+ // We just run the tests, knowing some of them are intended to fail.
>+ // We will use a separate Python script to compare the output of
>+ // this program with the golden file.
>+
>+ // It's hard to test InitGoogleTest() directly, as it has many
>+ // global side effects. The following line serves as a sanity test
>+ // for it.
>+ testing::InitGoogleTest(&argc, argv);
>+ bool internal_skip_environment_and_ad_hoc_tests =
>+ std::count(argv, argv + argc,
>+ std::string("internal_skip_environment_and_ad_hoc_tests")) > 0;
>+
>+#if GTEST_HAS_DEATH_TEST
>+ if (testing::internal::GTEST_FLAG(internal_run_death_test) != "") {
>+ // Skip the usual output capturing if we're running as the child
>+ // process of an threadsafe-style death test.
>+# if GTEST_OS_WINDOWS
>+ posix::FReopen("nul:", "w", stdout);
>+# else
>+ posix::FReopen("/dev/null", "w", stdout);
>+# endif // GTEST_OS_WINDOWS
>+ return RUN_ALL_TESTS();
>+ }
>+#endif // GTEST_HAS_DEATH_TEST
>+
>+ if (internal_skip_environment_and_ad_hoc_tests)
>+ return RUN_ALL_TESTS();
>+
>+ // Registers two global test environments.
>+ // The golden file verifies that they are set up in the order they
>+ // are registered, and torn down in the reverse order.
>+ testing::AddGlobalTestEnvironment(new FooEnvironment);
>+ testing::AddGlobalTestEnvironment(new BarEnvironment);
>+#if _MSC_VER
>+ GTEST_DISABLE_MSC_WARNINGS_POP_() // 4127
>+#endif // . _MSC_VER 
>+ return RunAllTests();
>+}
>diff --git a/Source/ThirdParty/gtest/test/googletest-param-test-invalid-name1-test.py b/Source/ThirdParty/gtest/test/googletest-param-test-invalid-name1-test.py
>new file mode 100644
>index 0000000000000000000000000000000000000000..2a08477a77ebdf0aa55f23444abd6b839d90ba43
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-param-test-invalid-name1-test.py
>@@ -0,0 +1,63 @@
>+#!/usr/bin/env python
>+#
>+# Copyright 2015 Google Inc. All rights reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+"""Verifies that Google Test warns the user when not initialized properly."""
>+
>+import gtest_test_utils
>+
>+binary_name = 'googletest-param-test-invalid-name1-test_'
>+COMMAND = gtest_test_utils.GetTestExecutablePath(binary_name)
>+
>+
>+def Assert(condition):
>+ if not condition:
>+ raise AssertionError
>+
>+
>+def TestExitCodeAndOutput(command):
>+ """Runs the given command and verifies its exit code and output."""
>+
>+ err = ('Parameterized test name \'"InvalidWithQuotes"\' is invalid')
>+
>+ p = gtest_test_utils.Subprocess(command)
>+ Assert(p.terminated_by_signal)
>+
>+ # Verify the output message contains appropriate output
>+ Assert(err in p.output)
>+
>+
>+class GTestParamTestInvalidName1Test(gtest_test_utils.TestCase):
>+
>+ def testExitCodeAndOutput(self):
>+ TestExitCodeAndOutput(COMMAND)
>+
>+
>+if __name__ == '__main__':
>+ gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/googletest-param-test-invalid-name1-test_.cc b/Source/ThirdParty/gtest/test/googletest-param-test-invalid-name1-test_.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..5a95155b23a7871db5d2549a0e9f905075a93994
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-param-test-invalid-name1-test_.cc
>@@ -0,0 +1,50 @@
>+// Copyright 2015, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+
>+#include "gtest/gtest.h"
>+
>+namespace {
>+class DummyTest : public ::testing::TestWithParam<const char *> {};
>+
>+TEST_P(DummyTest, Dummy) {
>+}
>+
>+INSTANTIATE_TEST_CASE_P(InvalidTestName,
>+ DummyTest,
>+ ::testing::Values("InvalidWithQuotes"),
>+ ::testing::PrintToStringParamName());
>+
>+} // namespace
>+
>+int main(int argc, char *argv[]) {
>+ testing::InitGoogleTest(&argc, argv);
>+ return RUN_ALL_TESTS();
>+}
>+
>diff --git a/Source/ThirdParty/gtest/test/googletest-param-test-invalid-name2-test.py b/Source/ThirdParty/gtest/test/googletest-param-test-invalid-name2-test.py
>new file mode 100644
>index 0000000000000000000000000000000000000000..ab838f4632291d1cb78e4a11ec3ab0c773b94d5c
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-param-test-invalid-name2-test.py
>@@ -0,0 +1,62 @@
>+#!/usr/bin/env python
>+#
>+# Copyright 2015 Google Inc. All rights reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+"""Verifies that Google Test warns the user when not initialized properly."""
>+
>+import gtest_test_utils
>+
>+binary_name = 'googletest-param-test-invalid-name2-test_'
>+COMMAND = gtest_test_utils.GetTestExecutablePath(binary_name)
>+
>+
>+def Assert(condition):
>+ if not condition:
>+ raise AssertionError
>+
>+
>+def TestExitCodeAndOutput(command):
>+ """Runs the given command and verifies its exit code and output."""
>+
>+ err = ('Duplicate parameterized test name \'a\'')
>+
>+ p = gtest_test_utils.Subprocess(command)
>+ Assert(p.terminated_by_signal)
>+
>+ # Check for appropriate output
>+ Assert(err in p.output)
>+
>+
>+class GTestParamTestInvalidName2Test(gtest_test_utils.TestCase):
>+
>+ def testExitCodeAndOutput(self):
>+ TestExitCodeAndOutput(COMMAND)
>+
>+if __name__ == '__main__':
>+ gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/googletest-param-test-invalid-name2-test_.cc b/Source/ThirdParty/gtest/test/googletest-param-test-invalid-name2-test_.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..ef093490e9da2f02ed28a2d0712445e2417cbda3
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-param-test-invalid-name2-test_.cc
>@@ -0,0 +1,55 @@
>+// Copyright 2015, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+
>+#include "gtest/gtest.h"
>+
>+namespace {
>+class DummyTest : public ::testing::TestWithParam<const char *> {};
>+
>+std::string StringParamTestSuffix(
>+ const testing::TestParamInfo<const char*>& info) {
>+ return std::string(info.param);
>+}
>+
>+TEST_P(DummyTest, Dummy) {
>+}
>+
>+INSTANTIATE_TEST_CASE_P(DuplicateTestNames,
>+ DummyTest,
>+ ::testing::Values("a", "b", "a", "c"),
>+ StringParamTestSuffix);
>+} // namespace
>+
>+int main(int argc, char *argv[]) {
>+ testing::InitGoogleTest(&argc, argv);
>+ return RUN_ALL_TESTS();
>+}
>+
>+
>diff --git a/Source/ThirdParty/gtest/test/googletest-param-test-test.cc b/Source/ThirdParty/gtest/test/googletest-param-test-test.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..f789cab2707414c4648496d7b9fbab4fe531f0b7
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-param-test-test.cc
>@@ -0,0 +1,1109 @@
>+// Copyright 2008, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+//
>+// Tests for Google Test itself. This file verifies that the parameter
>+// generators objects produce correct parameter sequences and that
>+// Google Test runtime instantiates correct tests from those sequences.
>+
>+#include "gtest/gtest.h"
>+
>+# include <algorithm>
>+# include <iostream>
>+# include <list>
>+# include <sstream>
>+# include <string>
>+# include <vector>
>+
>+# include "src/gtest-internal-inl.h" // for UnitTestOptions
>+# include "test/googletest-param-test-test.h"
>+
>+using ::std::vector;
>+using ::std::sort;
>+
>+using ::testing::AddGlobalTestEnvironment;
>+using ::testing::Bool;
>+using ::testing::Message;
>+using ::testing::Range;
>+using ::testing::TestWithParam;
>+using ::testing::Values;
>+using ::testing::ValuesIn;
>+
>+# if GTEST_HAS_COMBINE
>+using ::testing::Combine;
>+using ::testing::get;
>+using ::testing::make_tuple;
>+using ::testing::tuple;
>+# endif // GTEST_HAS_COMBINE
>+
>+using ::testing::internal::ParamGenerator;
>+using ::testing::internal::UnitTestOptions;
>+
>+// Prints a value to a string.
>+//
>+// FIXME: remove PrintValue() when we move matchers and
>+// EXPECT_THAT() from Google Mock to Google Test. At that time, we
>+// can write EXPECT_THAT(x, Eq(y)) to compare two tuples x and y, as
>+// EXPECT_THAT() and the matchers know how to print tuples.
>+template <typename T>
>+::std::string PrintValue(const T& value) {
>+ ::std::stringstream stream;
>+ stream << value;
>+ return stream.str();
>+}
>+
>+# if GTEST_HAS_COMBINE
>+
>+// These overloads allow printing tuples in our tests. We cannot
>+// define an operator<< for tuples, as that definition needs to be in
>+// the std namespace in order to be picked up by Google Test via
>+// Argument-Dependent Lookup, yet defining anything in the std
>+// namespace in non-STL code is undefined behavior.
>+
>+template <typename T1, typename T2>
>+::std::string PrintValue(const tuple<T1, T2>& value) {
>+ ::std::stringstream stream;
>+ stream << "(" << get<0>(value) << ", " << get<1>(value) << ")";
>+ return stream.str();
>+}
>+
>+template <typename T1, typename T2, typename T3>
>+::std::string PrintValue(const tuple<T1, T2, T3>& value) {
>+ ::std::stringstream stream;
>+ stream << "(" << get<0>(value) << ", " << get<1>(value)
>+ << ", "<< get<2>(value) << ")";
>+ return stream.str();
>+}
>+
>+template <typename T1, typename T2, typename T3, typename T4, typename T5,
>+ typename T6, typename T7, typename T8, typename T9, typename T10>
>+::std::string PrintValue(
>+ const tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>& value) {
>+ ::std::stringstream stream;
>+ stream << "(" << get<0>(value) << ", " << get<1>(value)
>+ << ", "<< get<2>(value) << ", " << get<3>(value)
>+ << ", "<< get<4>(value) << ", " << get<5>(value)
>+ << ", "<< get<6>(value) << ", " << get<7>(value)
>+ << ", "<< get<8>(value) << ", " << get<9>(value) << ")";
>+ return stream.str();
>+}
>+
>+# endif // GTEST_HAS_COMBINE
>+
>+// Verifies that a sequence generated by the generator and accessed
>+// via the iterator object matches the expected one using Google Test
>+// assertions.
>+template <typename T, size_t N>
>+void VerifyGenerator(const ParamGenerator<T>& generator,
>+ const T (&expected_values)[N]) {
>+ typename ParamGenerator<T>::iterator it = generator.begin();
>+ for (size_t i = 0; i < N; ++i) {
>+ ASSERT_FALSE(it == generator.end())
>+ << "At element " <+ << "created with the copy constructor.\n";
>+ // We cannot use EXPECT_EQ() here as the values may be tuples,
>+ // which don't support <<.
>+ EXPECT_TRUE(expected_values[i] == *it)
>+ << "where i is " <+ << ", expected_values[i] is " << PrintValue(expected_values[i])
>+ << ", *it is " << PrintValue(*it)
>+ << ", and 'it' is an iterator created with the copy constructor.\n";
>+ ++it;
>+ }
>+ EXPECT_TRUE(it == generator.end())
>+ << "At the presumed end of sequence when accessing via an iterator "
>+ << "created with the copy constructor.\n";
>+
>+ // Test the iterator assignment. The following lines verify that
>+ // the sequence accessed via an iterator initialized via the
>+ // assignment operator (as opposed to a copy constructor) matches
>+ // just the same.
>+ it = generator.begin();
>+ for (size_t i = 0; i < N; ++i) {
>+ ASSERT_FALSE(it == generator.end())
>+ << "At element " <+ << "created with the assignment operator.\n";
>+ EXPECT_TRUE(expected_values[i] == *it)
>+ << "where i is " <+ << ", expected_values[i] is " << PrintValue(expected_values[i])
>+ << ", *it is " << PrintValue(*it)
>+ << ", and 'it' is an iterator created with the copy constructor.\n";
>+ ++it;
>+ }
>+ EXPECT_TRUE(it == generator.end())
>+ << "At the presumed end of sequence when accessing via an iterator "
>+ << "created with the assignment operator.\n";
>+}
>+
>+template <typename T>
>+void VerifyGeneratorIsEmpty(const ParamGenerator<T>& generator) {
>+ typename ParamGenerator<T>::iterator it = generator.begin();
>+ EXPECT_TRUE(it == generator.end());
>+
>+ it = generator.begin();
>+ EXPECT_TRUE(it == generator.end());
>+}
>+
>+// Generator tests. They test that each of the provided generator functions
>+// generates an expected sequence of values. The general test pattern
>+// instantiates a generator using one of the generator functions,
>+// checks the sequence produced by the generator using its iterator API,
>+// and then resets the iterator back to the beginning of the sequence
>+// and checks the sequence again.
>+
>+// Tests that iterators produced by generator functions conform to the
>+// ForwardIterator concept.
>+TEST(IteratorTest, ParamIteratorConformsToForwardIteratorConcept) {
>+ const ParamGenerator<int> gen = Range(0, 10);
>+ ParamGenerator<int>::iterator it = gen.begin();
>+
>+ // Verifies that iterator initialization works as expected.
>+ ParamGenerator<int>::iterator it2 = it;
>+ EXPECT_TRUE(*it == *it2) << "Initialized iterators must point to the "
>+ << "element same as its source points to";
>+
>+ // Verifies that iterator assignment works as expected.
>+ ++it;
>+ EXPECT_FALSE(*it == *it2);
>+ it2 = it;
>+ EXPECT_TRUE(*it == *it2) << "Assigned iterators must point to the "
>+ << "element same as its source points to";
>+
>+ // Verifies that prefix operator++() returns *this.
>+ EXPECT_EQ(&it, &(++it)) << "Result of the prefix operator++ must be "
>+ << "refer to the original object";
>+
>+ // Verifies that the result of the postfix operator++ points to the value
>+ // pointed to by the original iterator.
>+ int original_value = *it; // Have to compute it outside of macro call to be
>+ // unaffected by the parameter evaluation order.
>+ EXPECT_EQ(original_value, *(it++));
>+
>+ // Verifies that prefix and postfix operator++() advance an iterator
>+ // all the same.
>+ it2 = it;
>+ ++it;
>+ ++it2;
>+ EXPECT_TRUE(*it == *it2);
>+}
>+
>+// Tests that Range() generates the expected sequence.
>+TEST(RangeTest, IntRangeWithDefaultStep) {
>+ const ParamGenerator<int> gen = Range(0, 3);
>+ const int expected_values[] = {0, 1, 2};
>+ VerifyGenerator(gen, expected_values);
>+}
>+
>+// Edge case. Tests that Range() generates the single element sequence
>+// as expected when provided with range limits that are equal.
>+TEST(RangeTest, IntRangeSingleValue) {
>+ const ParamGenerator<int> gen = Range(0, 1);
>+ const int expected_values[] = {0};
>+ VerifyGenerator(gen, expected_values);
>+}
>+
>+// Edge case. Tests that Range() with generates empty sequence when
>+// supplied with an empty range.
>+TEST(RangeTest, IntRangeEmpty) {
>+ const ParamGenerator<int> gen = Range(0, 0);
>+ VerifyGeneratorIsEmpty(gen);
>+}
>+
>+// Tests that Range() with custom step (greater then one) generates
>+// the expected sequence.
>+TEST(RangeTest, IntRangeWithCustomStep) {
>+ const ParamGenerator<int> gen = Range(0, 9, 3);
>+ const int expected_values[] = {0, 3, 6};
>+ VerifyGenerator(gen, expected_values);
>+}
>+
>+// Tests that Range() with custom step (greater then one) generates
>+// the expected sequence when the last element does not fall on the
>+// upper range limit. Sequences generated by Range() must not have
>+// elements beyond the range limits.
>+TEST(RangeTest, IntRangeWithCustomStepOverUpperBound) {
>+ const ParamGenerator<int> gen = Range(0, 4, 3);
>+ const int expected_values[] = {0, 3};
>+ VerifyGenerator(gen, expected_values);
>+}
>+
>+// Verifies that Range works with user-defined types that define
>+// copy constructor, operator=(), operator+(), and operator<().
>+class DogAdder {
>+ public:
>+ explicit DogAdder(const char* a_value) : value_(a_value) {}
>+ DogAdder(const DogAdder& other) : value_(other.value_.c_str()) {}
>+
>+ DogAdder operator=(const DogAdder& other) {
>+ if (this != &other)
>+ value_ = other.value_;
>+ return *this;
>+ }
>+ DogAdder operator+(const DogAdder& other) const {
>+ Message msg;
>+ msg << value_.c_str() << other.value_.c_str();
>+ return DogAdder(msg.GetString().c_str());
>+ }
>+ bool operator<(const DogAdder& other) const {
>+ return value_ < other.value_;
>+ }
>+ const std::string& value() const { return value_; }
>+
>+ private:
>+ std::string value_;
>+};
>+
>+TEST(RangeTest, WorksWithACustomType) {
>+ const ParamGenerator<DogAdder> gen =
>+ Range(DogAdder("cat"), DogAdder("catdogdog"), DogAdder("dog"));
>+ ParamGenerator<DogAdder>::iterator it = gen.begin();
>+
>+ ASSERT_FALSE(it == gen.end());
>+ EXPECT_STREQ("cat", it->value().c_str());
>+
>+ ASSERT_FALSE(++it == gen.end());
>+ EXPECT_STREQ("catdog", it->value().c_str());
>+
>+ EXPECT_TRUE(++it == gen.end());
>+}
>+
>+class IntWrapper {
>+ public:
>+ explicit IntWrapper(int a_value) : value_(a_value) {}
>+ IntWrapper(const IntWrapper& other) : value_(other.value_) {}
>+
>+ IntWrapper operator=(const IntWrapper& other) {
>+ value_ = other.value_;
>+ return *this;
>+ }
>+ // operator+() adds a different type.
>+ IntWrapper operator+(int other) const { return IntWrapper(value_ + other); }
>+ bool operator<(const IntWrapper& other) const {
>+ return value_ < other.value_;
>+ }
>+ int value() const { return value_; }
>+
>+ private:
>+ int value_;
>+};
>+
>+TEST(RangeTest, WorksWithACustomTypeWithDifferentIncrementType) {
>+ const ParamGenerator<IntWrapper> gen = Range(IntWrapper(0), IntWrapper(2));
>+ ParamGenerator<IntWrapper>::iterator it = gen.begin();
>+
>+ ASSERT_FALSE(it == gen.end());
>+ EXPECT_EQ(0, it->value());
>+
>+ ASSERT_FALSE(++it == gen.end());
>+ EXPECT_EQ(1, it->value());
>+
>+ EXPECT_TRUE(++it == gen.end());
>+}
>+
>+// Tests that ValuesIn() with an array parameter generates
>+// the expected sequence.
>+TEST(ValuesInTest, ValuesInArray) {
>+ int array[] = {3, 5, 8};
>+ const ParamGenerator<int> gen = ValuesIn(array);
>+ VerifyGenerator(gen, array);
>+}
>+
>+// Tests that ValuesIn() with a const array parameter generates
>+// the expected sequence.
>+TEST(ValuesInTest, ValuesInConstArray) {
>+ const int array[] = {3, 5, 8};
>+ const ParamGenerator<int> gen = ValuesIn(array);
>+ VerifyGenerator(gen, array);
>+}
>+
>+// Edge case. Tests that ValuesIn() with an array parameter containing a
>+// single element generates the single element sequence.
>+TEST(ValuesInTest, ValuesInSingleElementArray) {
>+ int array[] = {42};
>+ const ParamGenerator<int> gen = ValuesIn(array);
>+ VerifyGenerator(gen, array);
>+}
>+
>+// Tests that ValuesIn() generates the expected sequence for an STL
>+// container (vector).
>+TEST(ValuesInTest, ValuesInVector) {
>+ typedef ::std::vector<int> ContainerType;
>+ ContainerType values;
>+ values.push_back(3);
>+ values.push_back(5);
>+ values.push_back(8);
>+ const ParamGenerator<int> gen = ValuesIn(values);
>+
>+ const int expected_values[] = {3, 5, 8};
>+ VerifyGenerator(gen, expected_values);
>+}
>+
>+// Tests that ValuesIn() generates the expected sequence.
>+TEST(ValuesInTest, ValuesInIteratorRange) {
>+ typedef ::std::vector<int> ContainerType;
>+ ContainerType values;
>+ values.push_back(3);
>+ values.push_back(5);
>+ values.push_back(8);
>+ const ParamGenerator<int> gen = ValuesIn(values.begin(), values.end());
>+
>+ const int expected_values[] = {3, 5, 8};
>+ VerifyGenerator(gen, expected_values);
>+}
>+
>+// Edge case. Tests that ValuesIn() provided with an iterator range specifying a
>+// single value generates a single-element sequence.
>+TEST(ValuesInTest, ValuesInSingleElementIteratorRange) {
>+ typedef ::std::vector<int> ContainerType;
>+ ContainerType values;
>+ values.push_back(42);
>+ const ParamGenerator<int> gen = ValuesIn(values.begin(), values.end());
>+
>+ const int expected_values[] = {42};
>+ VerifyGenerator(gen, expected_values);
>+}
>+
>+// Edge case. Tests that ValuesIn() provided with an empty iterator range
>+// generates an empty sequence.
>+TEST(ValuesInTest, ValuesInEmptyIteratorRange) {
>+ typedef ::std::vector<int> ContainerType;
>+ ContainerType values;
>+ const ParamGenerator<int> gen = ValuesIn(values.begin(), values.end());
>+
>+ VerifyGeneratorIsEmpty(gen);
>+}
>+
>+// Tests that the Values() generates the expected sequence.
>+TEST(ValuesTest, ValuesWorks) {
>+ const ParamGenerator<int> gen = Values(3, 5, 8);
>+
>+ const int expected_values[] = {3, 5, 8};
>+ VerifyGenerator(gen, expected_values);
>+}
>+
>+// Tests that Values() generates the expected sequences from elements of
>+// different types convertible to ParamGenerator's parameter type.
>+TEST(ValuesTest, ValuesWorksForValuesOfCompatibleTypes) {
>+ const ParamGenerator<double> gen = Values(3, 5.0f, 8.0);
>+
>+ const double expected_values[] = {3.0, 5.0, 8.0};
>+ VerifyGenerator(gen, expected_values);
>+}
>+
>+TEST(ValuesTest, ValuesWorksForMaxLengthList) {
>+ const ParamGenerator<int> gen = Values(
>+ 10, 20, 30, 40, 50, 60, 70, 80, 90, 100,
>+ 110, 120, 130, 140, 150, 160, 170, 180, 190, 200,
>+ 210, 220, 230, 240, 250, 260, 270, 280, 290, 300,
>+ 310, 320, 330, 340, 350, 360, 370, 380, 390, 400,
>+ 410, 420, 430, 440, 450, 460, 470, 480, 490, 500);
>+
>+ const int expected_values[] = {
>+ 10, 20, 30, 40, 50, 60, 70, 80, 90, 100,
>+ 110, 120, 130, 140, 150, 160, 170, 180, 190, 200,
>+ 210, 220, 230, 240, 250, 260, 270, 280, 290, 300,
>+ 310, 320, 330, 340, 350, 360, 370, 380, 390, 400,
>+ 410, 420, 430, 440, 450, 460, 470, 480, 490, 500};
>+ VerifyGenerator(gen, expected_values);
>+}
>+
>+// Edge case test. Tests that single-parameter Values() generates the sequence
>+// with the single value.
>+TEST(ValuesTest, ValuesWithSingleParameter) {
>+ const ParamGenerator<int> gen = Values(42);
>+
>+ const int expected_values[] = {42};
>+ VerifyGenerator(gen, expected_values);
>+}
>+
>+// Tests that Bool() generates sequence (false, true).
>+TEST(BoolTest, BoolWorks) {
>+ const ParamGenerator<bool> gen = Bool();
>+
>+ const bool expected_values[] = {false, true};
>+ VerifyGenerator(gen, expected_values);
>+}
>+
>+# if GTEST_HAS_COMBINE
>+
>+// Tests that Combine() with two parameters generates the expected sequence.
>+TEST(CombineTest, CombineWithTwoParameters) {
>+ const char* foo = "foo";
>+ const char* bar = "bar";
>+ const ParamGenerator<tuple<const char*, int> > gen =
>+ Combine(Values(foo, bar), Values(3, 4));
>+
>+ tuple<const char*, int> expected_values[] = {
>+ make_tuple(foo, 3), make_tuple(foo, 4),
>+ make_tuple(bar, 3), make_tuple(bar, 4)};
>+ VerifyGenerator(gen, expected_values);
>+}
>+
>+// Tests that Combine() with three parameters generates the expected sequence.
>+TEST(CombineTest, CombineWithThreeParameters) {
>+ const ParamGenerator<tuple<int, int, int> > gen = Combine(Values(0, 1),
>+ Values(3, 4),
>+ Values(5, 6));
>+ tuple<int, int, int> expected_values[] = {
>+ make_tuple(0, 3, 5), make_tuple(0, 3, 6),
>+ make_tuple(0, 4, 5), make_tuple(0, 4, 6),
>+ make_tuple(1, 3, 5), make_tuple(1, 3, 6),
>+ make_tuple(1, 4, 5), make_tuple(1, 4, 6)};
>+ VerifyGenerator(gen, expected_values);
>+}
>+
>+// Tests that the Combine() with the first parameter generating a single value
>+// sequence generates a sequence with the number of elements equal to the
>+// number of elements in the sequence generated by the second parameter.
>+TEST(CombineTest, CombineWithFirstParameterSingleValue) {
>+ const ParamGenerator<tuple<int, int> > gen = Combine(Values(42),
>+ Values(0, 1));
>+
>+ tuple<int, int> expected_values[] = {make_tuple(42, 0), make_tuple(42, 1)};
>+ VerifyGenerator(gen, expected_values);
>+}
>+
>+// Tests that the Combine() with the second parameter generating a single value
>+// sequence generates a sequence with the number of elements equal to the
>+// number of elements in the sequence generated by the first parameter.
>+TEST(CombineTest, CombineWithSecondParameterSingleValue) {
>+ const ParamGenerator<tuple<int, int> > gen = Combine(Values(0, 1),
>+ Values(42));
>+
>+ tuple<int, int> expected_values[] = {make_tuple(0, 42), make_tuple(1, 42)};
>+ VerifyGenerator(gen, expected_values);
>+}
>+
>+// Tests that when the first parameter produces an empty sequence,
>+// Combine() produces an empty sequence, too.
>+TEST(CombineTest, CombineWithFirstParameterEmptyRange) {
>+ const ParamGenerator<tuple<int, int> > gen = Combine(Range(0, 0),
>+ Values(0, 1));
>+ VerifyGeneratorIsEmpty(gen);
>+}
>+
>+// Tests that when the second parameter produces an empty sequence,
>+// Combine() produces an empty sequence, too.
>+TEST(CombineTest, CombineWithSecondParameterEmptyRange) {
>+ const ParamGenerator<tuple<int, int> > gen = Combine(Values(0, 1),
>+ Range(1, 1));
>+ VerifyGeneratorIsEmpty(gen);
>+}
>+
>+// Edge case. Tests that combine works with the maximum number
>+// of parameters supported by Google Test (currently 10).
>+TEST(CombineTest, CombineWithMaxNumberOfParameters) {
>+ const char* foo = "foo";
>+ const char* bar = "bar";
>+ const ParamGenerator<tuple<const char*, int, int, int, int, int, int, int,
>+ int, int> > gen = Combine(Values(foo, bar),
>+ Values(1), Values(2),
>+ Values(3), Values(4),
>+ Values(5), Values(6),
>+ Values(7), Values(8),
>+ Values(9));
>+
>+ tuple<const char*, int, int, int, int, int, int, int, int, int>
>+ expected_values[] = {make_tuple(foo, 1, 2, 3, 4, 5, 6, 7, 8, 9),
>+ make_tuple(bar, 1, 2, 3, 4, 5, 6, 7, 8, 9)};
>+ VerifyGenerator(gen, expected_values);
>+}
>+
>+#if GTEST_LANG_CXX11
>+
>+class NonDefaultConstructAssignString {
>+ public:
>+ NonDefaultConstructAssignString(const std::string& s) : str_(s) {}
>+
>+ const std::string& str() const { return str_; }
>+
>+ private:
>+ std::string str_;
>+
>+ // Not default constructible
>+ NonDefaultConstructAssignString();
>+ // Not assignable
>+ void operator=(const NonDefaultConstructAssignString&);
>+};
>+
>+TEST(CombineTest, NonDefaultConstructAssign) {
>+ const ParamGenerator<tuple<int, NonDefaultConstructAssignString> > gen =
>+ Combine(Values(0, 1), Values(NonDefaultConstructAssignString("A"),
>+ NonDefaultConstructAssignString("B")));
>+
>+ ParamGenerator<tuple<int, NonDefaultConstructAssignString> >::iterator it =
>+ gen.begin();
>+
>+ EXPECT_EQ(0, std::get<0>(*it));
>+ EXPECT_EQ("A", std::get<1>(*it).str());
>+ ++it;
>+
>+ EXPECT_EQ(0, std::get<0>(*it));
>+ EXPECT_EQ("B", std::get<1>(*it).str());
>+ ++it;
>+
>+ EXPECT_EQ(1, std::get<0>(*it));
>+ EXPECT_EQ("A", std::get<1>(*it).str());
>+ ++it;
>+
>+ EXPECT_EQ(1, std::get<0>(*it));
>+ EXPECT_EQ("B", std::get<1>(*it).str());
>+ ++it;
>+
>+ EXPECT_TRUE(it == gen.end());
>+}
>+
>+#endif // GTEST_LANG_CXX11
>+# endif // GTEST_HAS_COMBINE
>+
>+// Tests that an generator produces correct sequence after being
>+// assigned from another generator.
>+TEST(ParamGeneratorTest, AssignmentWorks) {
>+ ParamGenerator<int> gen = Values(1, 2);
>+ const ParamGenerator<int> gen2 = Values(3, 4);
>+ gen = gen2;
>+
>+ const int expected_values[] = {3, 4};
>+ VerifyGenerator(gen, expected_values);
>+}
>+
>+// This test verifies that the tests are expanded and run as specified:
>+// one test per element from the sequence produced by the generator
>+// specified in INSTANTIATE_TEST_CASE_P. It also verifies that the test's
>+// fixture constructor, SetUp(), and TearDown() have run and have been
>+// supplied with the correct parameters.
>+
>+// The use of environment object allows detection of the case where no test
>+// case functionality is run at all. In this case TestCaseTearDown will not
>+// be able to detect missing tests, naturally.
>+template <int kExpectedCalls>
>+class TestGenerationEnvironment : public ::testing::Environment {
>+ public:
>+ static TestGenerationEnvironment* Instance() {
>+ static TestGenerationEnvironment* instance = new TestGenerationEnvironment;
>+ return instance;
>+ }
>+
>+ void FixtureConstructorExecuted() { fixture_constructor_count_++; }
>+ void SetUpExecuted() { set_up_count_++; }
>+ void TearDownExecuted() { tear_down_count_++; }
>+ void TestBodyExecuted() { test_body_count_++; }
>+
>+ virtual void TearDown() {
>+ // If all MultipleTestGenerationTest tests have been de-selected
>+ // by the filter flag, the following checks make no sense.
>+ bool perform_check = false;
>+
>+ for (int i = 0; i < kExpectedCalls; ++i) {
>+ Message msg;
>+ msg << "TestsExpandedAndRun/" << i;
>+ if (UnitTestOptions::FilterMatchesTest(
>+ "TestExpansionModule/MultipleTestGenerationTest",
>+ msg.GetString().c_str())) {
>+ perform_check = true;
>+ }
>+ }
>+ if (perform_check) {
>+ EXPECT_EQ(kExpectedCalls, fixture_constructor_count_)
>+ << "Fixture constructor of ParamTestGenerationTest test case "
>+ << "has not been run as expected.";
>+ EXPECT_EQ(kExpectedCalls, set_up_count_)
>+ << "Fixture SetUp method of ParamTestGenerationTest test case "
>+ << "has not been run as expected.";
>+ EXPECT_EQ(kExpectedCalls, tear_down_count_)
>+ << "Fixture TearDown method of ParamTestGenerationTest test case "
>+ << "has not been run as expected.";
>+ EXPECT_EQ(kExpectedCalls, test_body_count_)
>+ << "Test in ParamTestGenerationTest test case "
>+ << "has not been run as expected.";
>+ }
>+ }
>+
>+ private:
>+ TestGenerationEnvironment() : fixture_constructor_count_(0), set_up_count_(0),
>+ tear_down_count_(0), test_body_count_(0) {}
>+
>+ int fixture_constructor_count_;
>+ int set_up_count_;
>+ int tear_down_count_;
>+ int test_body_count_;
>+
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(TestGenerationEnvironment);
>+};
>+
>+const int test_generation_params[] = {36, 42, 72};
>+
>+class TestGenerationTest : public TestWithParam<int> {
>+ public:
>+ enum {
>+ PARAMETER_COUNT =
>+ sizeof(test_generation_params)/sizeof(test_generation_params[0])
>+ };
>+
>+ typedef TestGenerationEnvironment<PARAMETER_COUNT> Environment;
>+
>+ TestGenerationTest() {
>+ Environment::Instance()->FixtureConstructorExecuted();
>+ current_parameter_ = GetParam();
>+ }
>+ virtual void SetUp() {
>+ Environment::Instance()->SetUpExecuted();
>+ EXPECT_EQ(current_parameter_, GetParam());
>+ }
>+ virtual void TearDown() {
>+ Environment::Instance()->TearDownExecuted();
>+ EXPECT_EQ(current_parameter_, GetParam());
>+ }
>+
>+ static void SetUpTestCase() {
>+ bool all_tests_in_test_case_selected = true;
>+
>+ for (int i = 0; i < PARAMETER_COUNT; ++i) {
>+ Message test_name;
>+ test_name << "TestsExpandedAndRun/" << i;
>+ if ( !UnitTestOptions::FilterMatchesTest(
>+ "TestExpansionModule/MultipleTestGenerationTest",
>+ test_name.GetString())) {
>+ all_tests_in_test_case_selected = false;
>+ }
>+ }
>+ EXPECT_TRUE(all_tests_in_test_case_selected)
>+ << "When running the TestGenerationTest test case all of its tests\n"
>+ << "must be selected by the filter flag for the test case to pass.\n"
>+ << "If not all of them are enabled, we can't reliably conclude\n"
>+ << "that the correct number of tests have been generated.";
>+
>+ collected_parameters_.clear();
>+ }
>+
>+ static void TearDownTestCase() {
>+ vector<int> expected_values(test_generation_params,
>+ test_generation_params + PARAMETER_COUNT);
>+ // Test execution order is not guaranteed by Google Test,
>+ // so the order of values in collected_parameters_ can be
>+ // different and we have to sort to compare.
>+ sort(expected_values.begin(), expected_values.end());
>+ sort(collected_parameters_.begin(), collected_parameters_.end());
>+
>+ EXPECT_TRUE(collected_parameters_ == expected_values);
>+ }
>+
>+ protected:
>+ int current_parameter_;
>+ static vector<int> collected_parameters_;
>+
>+ private:
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(TestGenerationTest);
>+};
>+vector<int> TestGenerationTest::collected_parameters_;
>+
>+TEST_P(TestGenerationTest, TestsExpandedAndRun) {
>+ Environment::Instance()->TestBodyExecuted();
>+ EXPECT_EQ(current_parameter_, GetParam());
>+ collected_parameters_.push_back(GetParam());
>+}
>+INSTANTIATE_TEST_CASE_P(TestExpansionModule, TestGenerationTest,
>+ ValuesIn(test_generation_params));
>+
>+// This test verifies that the element sequence (third parameter of
>+// INSTANTIATE_TEST_CASE_P) is evaluated in InitGoogleTest() and neither at
>+// the call site of INSTANTIATE_TEST_CASE_P nor in RUN_ALL_TESTS(). For
>+// that, we declare param_value_ to be a static member of
>+// GeneratorEvaluationTest and initialize it to 0. We set it to 1 in
>+// main(), just before invocation of InitGoogleTest(). After calling
>+// InitGoogleTest(), we set the value to 2. If the sequence is evaluated
>+// before or after InitGoogleTest, INSTANTIATE_TEST_CASE_P will create a
>+// test with parameter other than 1, and the test body will fail the
>+// assertion.
>+class GeneratorEvaluationTest : public TestWithParam<int> {
>+ public:
>+ static int param_value() { return param_value_; }
>+ static void set_param_value(int param_value) { param_value_ = param_value; }
>+
>+ private:
>+ static int param_value_;
>+};
>+int GeneratorEvaluationTest::param_value_ = 0;
>+
>+TEST_P(GeneratorEvaluationTest, GeneratorsEvaluatedInMain) {
>+ EXPECT_EQ(1, GetParam());
>+}
>+INSTANTIATE_TEST_CASE_P(GenEvalModule,
>+ GeneratorEvaluationTest,
>+ Values(GeneratorEvaluationTest::param_value()));
>+
>+// Tests that generators defined in a different translation unit are
>+// functional. Generator extern_gen is defined in gtest-param-test_test2.cc.
>+extern ParamGenerator<int> extern_gen;
>+class ExternalGeneratorTest : public TestWithParam<int> {};
>+TEST_P(ExternalGeneratorTest, ExternalGenerator) {
>+ // Sequence produced by extern_gen contains only a single value
>+ // which we verify here.
>+ EXPECT_EQ(GetParam(), 33);
>+}
>+INSTANTIATE_TEST_CASE_P(ExternalGeneratorModule,
>+ ExternalGeneratorTest,
>+ extern_gen);
>+
>+// Tests that a parameterized test case can be defined in one translation
>+// unit and instantiated in another. This test will be instantiated in
>+// gtest-param-test_test2.cc. ExternalInstantiationTest fixture class is
>+// defined in gtest-param-test_test.h.
>+TEST_P(ExternalInstantiationTest, IsMultipleOf33) {
>+ EXPECT_EQ(0, GetParam() % 33);
>+}
>+
>+// Tests that a parameterized test case can be instantiated with multiple
>+// generators.
>+class MultipleInstantiationTest : public TestWithParam<int> {};
>+TEST_P(MultipleInstantiationTest, AllowsMultipleInstances) {
>+}
>+INSTANTIATE_TEST_CASE_P(Sequence1, MultipleInstantiationTest, Values(1, 2));
>+INSTANTIATE_TEST_CASE_P(Sequence2, MultipleInstantiationTest, Range(3, 5));
>+
>+// Tests that a parameterized test case can be instantiated
>+// in multiple translation units. This test will be instantiated
>+// here and in gtest-param-test_test2.cc.
>+// InstantiationInMultipleTranslationUnitsTest fixture class
>+// is defined in gtest-param-test_test.h.
>+TEST_P(InstantiationInMultipleTranslaionUnitsTest, IsMultipleOf42) {
>+ EXPECT_EQ(0, GetParam() % 42);
>+}
>+INSTANTIATE_TEST_CASE_P(Sequence1,
>+ InstantiationInMultipleTranslaionUnitsTest,
>+ Values(42, 42*2));
>+
>+// Tests that each iteration of parameterized test runs in a separate test
>+// object.
>+class SeparateInstanceTest : public TestWithParam<int> {
>+ public:
>+ SeparateInstanceTest() : count_(0) {}
>+
>+ static void TearDownTestCase() {
>+ EXPECT_GE(global_count_, 2)
>+ << "If some (but not all) SeparateInstanceTest tests have been "
>+ << "filtered out this test will fail. Make sure that all "
>+ << "GeneratorEvaluationTest are selected or de-selected together "
>+ << "by the test filter.";
>+ }
>+
>+ protected:
>+ int count_;
>+ static int global_count_;
>+};
>+int SeparateInstanceTest::global_count_ = 0;
>+
>+TEST_P(SeparateInstanceTest, TestsRunInSeparateInstances) {
>+ EXPECT_EQ(0, count_++);
>+ global_count_++;
>+}
>+INSTANTIATE_TEST_CASE_P(FourElemSequence, SeparateInstanceTest, Range(1, 4));
>+
>+// Tests that all instantiations of a test have named appropriately. Test
>+// defined with TEST_P(TestCaseName, TestName) and instantiated with
>+// INSTANTIATE_TEST_CASE_P(SequenceName, TestCaseName, generator) must be named
>+// SequenceName/TestCaseName.TestName/i, where i is the 0-based index of the
>+// sequence element used to instantiate the test.
>+class NamingTest : public TestWithParam<int> {};
>+
>+TEST_P(NamingTest, TestsReportCorrectNamesAndParameters) {
>+ const ::testing::TestInfo* const test_info =
>+ ::testing::UnitTest::GetInstance()->current_test_info();
>+
>+ EXPECT_STREQ("ZeroToFiveSequence/NamingTest", test_info->test_case_name());
>+
>+ Message index_stream;
>+ index_stream << "TestsReportCorrectNamesAndParameters/" << GetParam();
>+ EXPECT_STREQ(index_stream.GetString().c_str(), test_info->name());
>+
>+ EXPECT_EQ(::testing::PrintToString(GetParam()), test_info->value_param());
>+}
>+
>+INSTANTIATE_TEST_CASE_P(ZeroToFiveSequence, NamingTest, Range(0, 5));
>+
>+// Tests that macros in test names are expanded correctly.
>+class MacroNamingTest : public TestWithParam<int> {};
>+
>+#define PREFIX_WITH_FOO(test_name) Foo##test_name
>+#define PREFIX_WITH_MACRO(test_name) Macro##test_name
>+
>+TEST_P(PREFIX_WITH_MACRO(NamingTest), PREFIX_WITH_FOO(SomeTestName)) {
>+ const ::testing::TestInfo* const test_info =
>+ ::testing::UnitTest::GetInstance()->current_test_info();
>+
>+ EXPECT_STREQ("FortyTwo/MacroNamingTest", test_info->test_case_name());
>+ EXPECT_STREQ("FooSomeTestName", test_info->name());
>+}
>+
>+INSTANTIATE_TEST_CASE_P(FortyTwo, MacroNamingTest, Values(42));
>+
>+// Tests the same thing for non-parametrized tests.
>+class MacroNamingTestNonParametrized : public ::testing::Test {};
>+
>+TEST_F(PREFIX_WITH_MACRO(NamingTestNonParametrized),
>+ PREFIX_WITH_FOO(SomeTestName)) {
>+ const ::testing::TestInfo* const test_info =
>+ ::testing::UnitTest::GetInstance()->current_test_info();
>+
>+ EXPECT_STREQ("MacroNamingTestNonParametrized", test_info->test_case_name());
>+ EXPECT_STREQ("FooSomeTestName", test_info->name());
>+}
>+
>+// Tests that user supplied custom parameter names are working correctly.
>+// Runs the test with a builtin helper method which uses PrintToString,
>+// as well as a custom function and custom functor to ensure all possible
>+// uses work correctly.
>+class CustomFunctorNamingTest : public TestWithParam<std::string> {};
>+TEST_P(CustomFunctorNamingTest, CustomTestNames) {}
>+
>+struct CustomParamNameFunctor {
>+ std::string operator()(const ::testing::TestParamInfo<std::string>& inf) {
>+ return inf.param;
>+ }
>+};
>+
>+INSTANTIATE_TEST_CASE_P(CustomParamNameFunctor,
>+ CustomFunctorNamingTest,
>+ Values(std::string("FunctorName")),
>+ CustomParamNameFunctor());
>+
>+INSTANTIATE_TEST_CASE_P(AllAllowedCharacters,
>+ CustomFunctorNamingTest,
>+ Values("abcdefghijklmnopqrstuvwxyz",
>+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
>+ "01234567890_"),
>+ CustomParamNameFunctor());
>+
>+inline std::string CustomParamNameFunction(
>+ const ::testing::TestParamInfo<std::string>& inf) {
>+ return inf.param;
>+}
>+
>+class CustomFunctionNamingTest : public TestWithParam<std::string> {};
>+TEST_P(CustomFunctionNamingTest, CustomTestNames) {}
>+
>+INSTANTIATE_TEST_CASE_P(CustomParamNameFunction,
>+ CustomFunctionNamingTest,
>+ Values(std::string("FunctionName")),
>+ CustomParamNameFunction);
>+
>+#if GTEST_LANG_CXX11
>+
>+// Test custom naming with a lambda
>+
>+class CustomLambdaNamingTest : public TestWithParam<std::string> {};
>+TEST_P(CustomLambdaNamingTest, CustomTestNames) {}
>+
>+INSTANTIATE_TEST_CASE_P(CustomParamNameLambda, CustomLambdaNamingTest,
>+ Values(std::string("LambdaName")),
>+ [](const ::testing::TestParamInfo<std::string>& inf) {
>+ return inf.param;
>+ });
>+
>+#endif // GTEST_LANG_CXX11
>+
>+TEST(CustomNamingTest, CheckNameRegistry) {
>+ ::testing::UnitTest* unit_test = ::testing::UnitTest::GetInstance();
>+ std::set<std::string> test_names;
>+ for (int case_num = 0;
>+ case_num < unit_test->total_test_case_count();
>+ ++case_num) {
>+ const ::testing::TestCase* test_case = unit_test->GetTestCase(case_num);
>+ for (int test_num = 0;
>+ test_num < test_case->total_test_count();
>+ ++test_num) {
>+ const ::testing::TestInfo* test_info = test_case->GetTestInfo(test_num);
>+ test_names.insert(std::string(test_info->name()));
>+ }
>+ }
>+ EXPECT_EQ(1u, test_names.count("CustomTestNames/FunctorName"));
>+ EXPECT_EQ(1u, test_names.count("CustomTestNames/FunctionName"));
>+#if GTEST_LANG_CXX11
>+ EXPECT_EQ(1u, test_names.count("CustomTestNames/LambdaName"));
>+#endif // GTEST_LANG_CXX11
>+}
>+
>+// Test a numeric name to ensure PrintToStringParamName works correctly.
>+
>+class CustomIntegerNamingTest : public TestWithParam<int> {};
>+
>+TEST_P(CustomIntegerNamingTest, TestsReportCorrectNames) {
>+ const ::testing::TestInfo* const test_info =
>+ ::testing::UnitTest::GetInstance()->current_test_info();
>+ Message test_name_stream;
>+ test_name_stream << "TestsReportCorrectNames/" << GetParam();
>+ EXPECT_STREQ(test_name_stream.GetString().c_str(), test_info->name());
>+}
>+
>+INSTANTIATE_TEST_CASE_P(PrintToString,
>+ CustomIntegerNamingTest,
>+ Range(0, 5),
>+ ::testing::PrintToStringParamName());
>+
>+// Test a custom struct with PrintToString.
>+
>+struct CustomStruct {
>+ explicit CustomStruct(int value) : x(value) {}
>+ int x;
>+};
>+
>+std::ostream& operator<<(std::ostream& stream, const CustomStruct& val) {
>+ stream << val.x;
>+ return stream;
>+}
>+
>+class CustomStructNamingTest : public TestWithParam<CustomStruct> {};
>+
>+TEST_P(CustomStructNamingTest, TestsReportCorrectNames) {
>+ const ::testing::TestInfo* const test_info =
>+ ::testing::UnitTest::GetInstance()->current_test_info();
>+ Message test_name_stream;
>+ test_name_stream << "TestsReportCorrectNames/" << GetParam();
>+ EXPECT_STREQ(test_name_stream.GetString().c_str(), test_info->name());
>+}
>+
>+INSTANTIATE_TEST_CASE_P(PrintToString,
>+ CustomStructNamingTest,
>+ Values(CustomStruct(0), CustomStruct(1)),
>+ ::testing::PrintToStringParamName());
>+
>+// Test that using a stateful parameter naming function works as expected.
>+
>+struct StatefulNamingFunctor {
>+ StatefulNamingFunctor() : sum(0) {}
>+ std::string operator()(const ::testing::TestParamInfo<int>& info) {
>+ int value = info.param + sum;
>+ sum += info.param;
>+ return ::testing::PrintToString(value);
>+ }
>+ int sum;
>+};
>+
>+class StatefulNamingTest : public ::testing::TestWithParam<int> {
>+ protected:
>+ StatefulNamingTest() : sum_(0) {}
>+ int sum_;
>+};
>+
>+TEST_P(StatefulNamingTest, TestsReportCorrectNames) {
>+ const ::testing::TestInfo* const test_info =
>+ ::testing::UnitTest::GetInstance()->current_test_info();
>+ sum_ += GetParam();
>+ Message test_name_stream;
>+ test_name_stream << "TestsReportCorrectNames/" << sum_;
>+ EXPECT_STREQ(test_name_stream.GetString().c_str(), test_info->name());
>+}
>+
>+INSTANTIATE_TEST_CASE_P(StatefulNamingFunctor,
>+ StatefulNamingTest,
>+ Range(0, 5),
>+ StatefulNamingFunctor());
>+
>+// Class that cannot be streamed into an ostream. It needs to be copyable
>+// (and, in case of MSVC, also assignable) in order to be a test parameter
>+// type. Its default copy constructor and assignment operator do exactly
>+// what we need.
>+class Unstreamable {
>+ public:
>+ explicit Unstreamable(int value) : value_(value) {}
>+
>+ private:
>+ int value_;
>+};
>+
>+class CommentTest : public TestWithParam<Unstreamable> {};
>+
>+TEST_P(CommentTest, TestsCorrectlyReportUnstreamableParams) {
>+ const ::testing::TestInfo* const test_info =
>+ ::testing::UnitTest::GetInstance()->current_test_info();
>+
>+ EXPECT_EQ(::testing::PrintToString(GetParam()), test_info->value_param());
>+}
>+
>+INSTANTIATE_TEST_CASE_P(InstantiationWithComments,
>+ CommentTest,
>+ Values(Unstreamable(1)));
>+
>+// Verify that we can create a hierarchy of test fixtures, where the base
>+// class fixture is not parameterized and the derived class is. In this case
>+// ParameterizedDerivedTest inherits from NonParameterizedBaseTest. We
>+// perform simple tests on both.
>+class NonParameterizedBaseTest : public ::testing::Test {
>+ public:
>+ NonParameterizedBaseTest() : n_(17) { }
>+ protected:
>+ int n_;
>+};
>+
>+class ParameterizedDerivedTest : public NonParameterizedBaseTest,
>+ public ::testing::WithParamInterface<int> {
>+ protected:
>+ ParameterizedDerivedTest() : count_(0) { }
>+ int count_;
>+ static int global_count_;
>+};
>+
>+int ParameterizedDerivedTest::global_count_ = 0;
>+
>+TEST_F(NonParameterizedBaseTest, FixtureIsInitialized) {
>+ EXPECT_EQ(17, n_);
>+}
>+
>+TEST_P(ParameterizedDerivedTest, SeesSequence) {
>+ EXPECT_EQ(17, n_);
>+ EXPECT_EQ(0, count_++);
>+ EXPECT_EQ(GetParam(), global_count_++);
>+}
>+
>+class ParameterizedDeathTest : public ::testing::TestWithParam<int> { };
>+
>+TEST_F(ParameterizedDeathTest, GetParamDiesFromTestF) {
>+ EXPECT_DEATH_IF_SUPPORTED(GetParam(),
>+ ".* value-parameterized test .*");
>+}
>+
>+INSTANTIATE_TEST_CASE_P(RangeZeroToFive, ParameterizedDerivedTest, Range(0, 5));
>+
>+
>+int main(int argc, char **argv) {
>+ // Used in TestGenerationTest test case.
>+ AddGlobalTestEnvironment(TestGenerationTest::Environment::Instance());
>+ // Used in GeneratorEvaluationTest test case. Tests that the updated value
>+ // will be picked up for instantiating tests in GeneratorEvaluationTest.
>+ GeneratorEvaluationTest::set_param_value(1);
>+
>+ ::testing::InitGoogleTest(&argc, argv);
>+
>+ // Used in GeneratorEvaluationTest test case. Tests that value updated
>+ // here will NOT be used for instantiating tests in
>+ // GeneratorEvaluationTest.
>+ GeneratorEvaluationTest::set_param_value(2);
>+
>+ return RUN_ALL_TESTS();
>+}
>diff --git a/Source/ThirdParty/gtest/test/googletest-param-test-test.h b/Source/ThirdParty/gtest/test/googletest-param-test-test.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..632a61f4926ba9225159db469810e41cac0d20c7
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-param-test-test.h
>@@ -0,0 +1,51 @@
>+// Copyright 2008, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+//
>+// The Google C++ Testing and Mocking Framework (Google Test)
>+//
>+// This header file provides classes and functions used internally
>+// for testing Google Test itself.
>+
>+#ifndef GTEST_TEST_GTEST_PARAM_TEST_TEST_H_
>+#define GTEST_TEST_GTEST_PARAM_TEST_TEST_H_
>+
>+#include "gtest/gtest.h"
>+
>+// Test fixture for testing definition and instantiation of a test
>+// in separate translation units.
>+class ExternalInstantiationTest : public ::testing::TestWithParam<int> {
>+};
>+
>+// Test fixture for testing instantiation of a test in multiple
>+// translation units.
>+class InstantiationInMultipleTranslaionUnitsTest
>+ : public ::testing::TestWithParam<int> {
>+};
>+
>+#endif // GTEST_TEST_GTEST_PARAM_TEST_TEST_H_
>diff --git a/Source/ThirdParty/gtest/test/googletest-param-test2-test.cc b/Source/ThirdParty/gtest/test/googletest-param-test2-test.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..25bb945c2f8ed29fd90856b23e03c01e2a843060
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-param-test2-test.cc
>@@ -0,0 +1,61 @@
>+// Copyright 2008, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+//
>+// Tests for Google Test itself. This verifies that the basic constructs of
>+// Google Test work.
>+
>+#include "gtest/gtest.h"
>+#include "test/googletest-param-test-test.h"
>+
>+using ::testing::Values;
>+using ::testing::internal::ParamGenerator;
>+
>+// Tests that generators defined in a different translation unit
>+// are functional. The test using extern_gen is defined
>+// in googletest-param-test-test.cc.
>+ParamGenerator<int> extern_gen = Values(33);
>+
>+// Tests that a parameterized test case can be defined in one translation unit
>+// and instantiated in another. The test is defined in
>+// googletest-param-test-test.cc and ExternalInstantiationTest fixture class is
>+// defined in gtest-param-test_test.h.
>+INSTANTIATE_TEST_CASE_P(MultiplesOf33,
>+ ExternalInstantiationTest,
>+ Values(33, 66));
>+
>+// Tests that a parameterized test case can be instantiated
>+// in multiple translation units. Another instantiation is defined
>+// in googletest-param-test-test.cc and
>+// InstantiationInMultipleTranslaionUnitsTest fixture is defined in
>+// gtest-param-test_test.h
>+INSTANTIATE_TEST_CASE_P(Sequence2,
>+ InstantiationInMultipleTranslaionUnitsTest,
>+ Values(42*3, 42*4, 42*5));
>+
>diff --git a/Source/ThirdParty/gtest/test/googletest-port-test.cc b/Source/ThirdParty/gtest/test/googletest-port-test.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..399316f95b637aca92fb5a1544ec7fc27c2efb27
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-port-test.cc
>@@ -0,0 +1,1300 @@
>+// Copyright 2008, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+//
>+// This file tests the internal cross-platform support utilities.
>+#include <stdio.h>
>+
>+#include "gtest/internal/gtest-port.h"
>+
>+#if GTEST_OS_MAC
>+# include <time.h>
>+#endif // GTEST_OS_MAC
>+
>+#include <list>
>+#include <utility> // For std::pair and std::make_pair.
>+#include <vector>
>+
>+#include "gtest/gtest.h"
>+#include "gtest/gtest-spi.h"
>+#include "src/gtest-internal-inl.h"
>+
>+using std::make_pair;
>+using std::pair;
>+
>+namespace testing {
>+namespace internal {
>+
>+TEST(IsXDigitTest, WorksForNarrowAscii) {
>+ EXPECT_TRUE(IsXDigit('0'));
>+ EXPECT_TRUE(IsXDigit('9'));
>+ EXPECT_TRUE(IsXDigit('A'));
>+ EXPECT_TRUE(IsXDigit('F'));
>+ EXPECT_TRUE(IsXDigit('a'));
>+ EXPECT_TRUE(IsXDigit('f'));
>+
>+ EXPECT_FALSE(IsXDigit('-'));
>+ EXPECT_FALSE(IsXDigit('g'));
>+ EXPECT_FALSE(IsXDigit('G'));
>+}
>+
>+TEST(IsXDigitTest, ReturnsFalseForNarrowNonAscii) {
>+ EXPECT_FALSE(IsXDigit(static_cast<char>('\x80')));
>+ EXPECT_FALSE(IsXDigit(static_cast<char>('0' | '\x80')));
>+}
>+
>+TEST(IsXDigitTest, WorksForWideAscii) {
>+ EXPECT_TRUE(IsXDigit(L'0'));
>+ EXPECT_TRUE(IsXDigit(L'9'));
>+ EXPECT_TRUE(IsXDigit(L'A'));
>+ EXPECT_TRUE(IsXDigit(L'F'));
>+ EXPECT_TRUE(IsXDigit(L'a'));
>+ EXPECT_TRUE(IsXDigit(L'f'));
>+
>+ EXPECT_FALSE(IsXDigit(L'-'));
>+ EXPECT_FALSE(IsXDigit(L'g'));
>+ EXPECT_FALSE(IsXDigit(L'G'));
>+}
>+
>+TEST(IsXDigitTest, ReturnsFalseForWideNonAscii) {
>+ EXPECT_FALSE(IsXDigit(static_cast<wchar_t>(0x80)));
>+ EXPECT_FALSE(IsXDigit(static_cast<wchar_t>(L'0' | 0x80)));
>+ EXPECT_FALSE(IsXDigit(static_cast<wchar_t>(L'0' | 0x100)));
>+}
>+
>+class Base {
>+ public:
>+ // Copy constructor and assignment operator do exactly what we need, so we
>+ // use them.
>+ Base() : member_(0) {}
>+ explicit Base(int n) : member_(n) {}
>+ virtual ~Base() {}
>+ int member() { return member_; }
>+
>+ private:
>+ int member_;
>+};
>+
>+class Derived : public Base {
>+ public:
>+ explicit Derived(int n) : Base(n) {}
>+};
>+
>+TEST(ImplicitCastTest, ConvertsPointers) {
>+ Derived derived(0);
>+ EXPECT_TRUE(&derived == ::testing::internal::ImplicitCast_<Base*>(&derived));
>+}
>+
>+TEST(ImplicitCastTest, CanUseInheritance) {
>+ Derived derived(1);
>+ Base base = ::testing::internal::ImplicitCast_<Base>(derived);
>+ EXPECT_EQ(derived.member(), base.member());
>+}
>+
>+class Castable {
>+ public:
>+ explicit Castable(bool* converted) : converted_(converted) {}
>+ operator Base() {
>+ *converted_ = true;
>+ return Base();
>+ }
>+
>+ private:
>+ bool* converted_;
>+};
>+
>+TEST(ImplicitCastTest, CanUseNonConstCastOperator) {
>+ bool converted = false;
>+ Castable castable(&converted);
>+ Base base = ::testing::internal::ImplicitCast_<Base>(castable);
>+ EXPECT_TRUE(converted);
>+}
>+
>+class ConstCastable {
>+ public:
>+ explicit ConstCastable(bool* converted) : converted_(converted) {}
>+ operator Base() const {
>+ *converted_ = true;
>+ return Base();
>+ }
>+
>+ private:
>+ bool* converted_;
>+};
>+
>+TEST(ImplicitCastTest, CanUseConstCastOperatorOnConstValues) {
>+ bool converted = false;
>+ const ConstCastable const_castable(&converted);
>+ Base base = ::testing::internal::ImplicitCast_<Base>(const_castable);
>+ EXPECT_TRUE(converted);
>+}
>+
>+class ConstAndNonConstCastable {
>+ public:
>+ ConstAndNonConstCastable(bool* converted, bool* const_converted)
>+ : converted_(converted), const_converted_(const_converted) {}
>+ operator Base() {
>+ *converted_ = true;
>+ return Base();
>+ }
>+ operator Base() const {
>+ *const_converted_ = true;
>+ return Base();
>+ }
>+
>+ private:
>+ bool* converted_;
>+ bool* const_converted_;
>+};
>+
>+TEST(ImplicitCastTest, CanSelectBetweenConstAndNonConstCasrAppropriately) {
>+ bool converted = false;
>+ bool const_converted = false;
>+ ConstAndNonConstCastable castable(&converted, &const_converted);
>+ Base base = ::testing::internal::ImplicitCast_<Base>(castable);
>+ EXPECT_TRUE(converted);
>+ EXPECT_FALSE(const_converted);
>+
>+ converted = false;
>+ const_converted = false;
>+ const ConstAndNonConstCastable const_castable(&converted, &const_converted);
>+ base = ::testing::internal::ImplicitCast_<Base>(const_castable);
>+ EXPECT_FALSE(converted);
>+ EXPECT_TRUE(const_converted);
>+}
>+
>+class To {
>+ public:
>+ To(bool* converted) { *converted = true; } // NOLINT
>+};
>+
>+TEST(ImplicitCastTest, CanUseImplicitConstructor) {
>+ bool converted = false;
>+ To to = ::testing::internal::ImplicitCast_<To>(&converted);
>+ (void)to;
>+ EXPECT_TRUE(converted);
>+}
>+
>+TEST(IteratorTraitsTest, WorksForSTLContainerIterators) {
>+ StaticAssertTypeEq<int,
>+ IteratorTraits< ::std::vector<int>::const_iterator>::value_type>();
>+ StaticAssertTypeEq<bool,
>+ IteratorTraits< ::std::list<bool>::iterator>::value_type>();
>+}
>+
>+TEST(IteratorTraitsTest, WorksForPointerToNonConst) {
>+ StaticAssertTypeEq<char, IteratorTraits<char*>::value_type>();
>+ StaticAssertTypeEq<const void*, IteratorTraits<const void**>::value_type>();
>+}
>+
>+TEST(IteratorTraitsTest, WorksForPointerToConst) {
>+ StaticAssertTypeEq<char, IteratorTraits<const char*>::value_type>();
>+ StaticAssertTypeEq<const void*,
>+ IteratorTraits<const void* const*>::value_type>();
>+}
>+
>+// Tests that the element_type typedef is available in scoped_ptr and refers
>+// to the parameter type.
>+TEST(ScopedPtrTest, DefinesElementType) {
>+ StaticAssertTypeEq<int, ::testing::internal::scoped_ptr<int>::element_type>();
>+}
>+
>+// FIXME: Implement THE REST of scoped_ptr tests.
>+
>+TEST(GtestCheckSyntaxTest, BehavesLikeASingleStatement) {
>+ if (AlwaysFalse())
>+ GTEST_CHECK_(false) << "This should never be executed; "
>+ "It's a compilation test only.";
>+
>+ if (AlwaysTrue())
>+ GTEST_CHECK_(true);
>+ else
>+ ; // NOLINT
>+
>+ if (AlwaysFalse())
>+ ; // NOLINT
>+ else
>+ GTEST_CHECK_(true) << "";
>+}
>+
>+TEST(GtestCheckSyntaxTest, WorksWithSwitch) {
>+ switch (0) {
>+ case 1:
>+ break;
>+ default:
>+ GTEST_CHECK_(true);
>+ }
>+
>+ switch (0)
>+ case 0:
>+ GTEST_CHECK_(true) << "Check failed in switch case";
>+}
>+
>+// Verifies behavior of FormatFileLocation.
>+TEST(FormatFileLocationTest, FormatsFileLocation) {
>+ EXPECT_PRED_FORMAT2(IsSubstring, "foo.cc", FormatFileLocation("foo.cc", 42));
>+ EXPECT_PRED_FORMAT2(IsSubstring, "42", FormatFileLocation("foo.cc", 42));
>+}
>+
>+TEST(FormatFileLocationTest, FormatsUnknownFile) {
>+ EXPECT_PRED_FORMAT2(
>+ IsSubstring, "unknown file", FormatFileLocation(NULL, 42));
>+ EXPECT_PRED_FORMAT2(IsSubstring, "42", FormatFileLocation(NULL, 42));
>+}
>+
>+TEST(FormatFileLocationTest, FormatsUknownLine) {
>+ EXPECT_EQ("foo.cc:", FormatFileLocation("foo.cc", -1));
>+}
>+
>+TEST(FormatFileLocationTest, FormatsUknownFileAndLine) {
>+ EXPECT_EQ("unknown file:", FormatFileLocation(NULL, -1));
>+}
>+
>+// Verifies behavior of FormatCompilerIndependentFileLocation.
>+TEST(FormatCompilerIndependentFileLocationTest, FormatsFileLocation) {
>+ EXPECT_EQ("foo.cc:42", FormatCompilerIndependentFileLocation("foo.cc", 42));
>+}
>+
>+TEST(FormatCompilerIndependentFileLocationTest, FormatsUknownFile) {
>+ EXPECT_EQ("unknown file:42",
>+ FormatCompilerIndependentFileLocation(NULL, 42));
>+}
>+
>+TEST(FormatCompilerIndependentFileLocationTest, FormatsUknownLine) {
>+ EXPECT_EQ("foo.cc", FormatCompilerIndependentFileLocation("foo.cc", -1));
>+}
>+
>+TEST(FormatCompilerIndependentFileLocationTest, FormatsUknownFileAndLine) {
>+ EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(NULL, -1));
>+}
>+
>+#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA
>+void* ThreadFunc(void* data) {
>+ internal::Mutex* mutex = static_cast<internal::Mutex*>(data);
>+ mutex->Lock();
>+ mutex->Unlock();
>+ return NULL;
>+}
>+
>+TEST(GetThreadCountTest, ReturnsCorrectValue) {
>+ const size_t starting_count = GetThreadCount();
>+ pthread_t thread_id;
>+
>+ internal::Mutex mutex;
>+ {
>+ internal::MutexLock lock(&mutex);
>+ pthread_attr_t attr;
>+ ASSERT_EQ(0, pthread_attr_init(&attr));
>+ ASSERT_EQ(0, pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE));
>+
>+ const int status = pthread_create(&thread_id, &attr, &ThreadFunc, &mutex);
>+ ASSERT_EQ(0, pthread_attr_destroy(&attr));
>+ ASSERT_EQ(0, status);
>+ EXPECT_EQ(starting_count + 1, GetThreadCount());
>+ }
>+
>+ void* dummy;
>+ ASSERT_EQ(0, pthread_join(thread_id, &dummy));
>+
>+ // The OS may not immediately report the updated thread count after
>+ // joining a thread, causing flakiness in this test. To counter that, we
>+ // wait for up to .5 seconds for the OS to report the correct value.
>+ for (int i = 0; i < 5; ++i) {
>+ if (GetThreadCount() == starting_count)
>+ break;
>+
>+ SleepMilliseconds(100);
>+ }
>+
>+ EXPECT_EQ(starting_count, GetThreadCount());
>+}
>+#else
>+TEST(GetThreadCountTest, ReturnsZeroWhenUnableToCountThreads) {
>+ EXPECT_EQ(0U, GetThreadCount());
>+}
>+#endif // GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA
>+
>+TEST(GtestCheckDeathTest, DiesWithCorrectOutputOnFailure) {
>+ const bool a_false_condition = false;
>+ const char regex[] =
>+#ifdef _MSC_VER
>+ "googletest-port-test\\.cc\$\\d+\$:"
>+#elif GTEST_USES_POSIX_RE
>+ "googletest-port-test\\.cc:[0-9]+"
>+#else
>+ "googletest-port-test\\.cc:\\d+"
>+#endif // _MSC_VER
>+ ".*a_false_condition.*Extra info.*";
>+
>+ EXPECT_DEATH_IF_SUPPORTED(GTEST_CHECK_(a_false_condition) << "Extra info",
>+ regex);
>+}
>+
>+#if GTEST_HAS_DEATH_TEST
>+
>+TEST(GtestCheckDeathTest, LivesSilentlyOnSuccess) {
>+ EXPECT_EXIT({
>+ GTEST_CHECK_(true) << "Extra info";
>+ ::std::cerr << "Success\n";
>+ exit(0); },
>+ ::testing::ExitedWithCode(0), "Success");
>+}
>+
>+#endif // GTEST_HAS_DEATH_TEST
>+
>+// Verifies that Google Test choose regular expression engine appropriate to
>+// the platform. The test will produce compiler errors in case of failure.
>+// For simplicity, we only cover the most important platforms here.
>+TEST(RegexEngineSelectionTest, SelectsCorrectRegexEngine) {
>+#if !GTEST_USES_PCRE
>+# if GTEST_HAS_POSIX_RE
>+
>+ EXPECT_TRUE(GTEST_USES_POSIX_RE);
>+
>+# else
>+
>+ EXPECT_TRUE(GTEST_USES_SIMPLE_RE);
>+
>+# endif
>+#endif // !GTEST_USES_PCRE
>+}
>+
>+#if GTEST_USES_POSIX_RE
>+
>+# if GTEST_HAS_TYPED_TEST
>+
>+template <typename Str>
>+class RETest : public ::testing::Test {};
>+
>+// Defines StringTypes as the list of all string types that class RE
>+// supports.
>+typedef testing::Types<
>+ ::std::string,
>+# if GTEST_HAS_GLOBAL_STRING
>+ ::string,
>+# endif // GTEST_HAS_GLOBAL_STRING
>+ const char*> StringTypes;
>+
>+TYPED_TEST_CASE(RETest, StringTypes);
>+
>+// Tests RE's implicit constructors.
>+TYPED_TEST(RETest, ImplicitConstructorWorks) {
>+ const RE empty(TypeParam(""));
>+ EXPECT_STREQ("", empty.pattern());
>+
>+ const RE simple(TypeParam("hello"));
>+ EXPECT_STREQ("hello", simple.pattern());
>+
>+ const RE normal(TypeParam(".*(\\w+)"));
>+ EXPECT_STREQ(".*(\\w+)", normal.pattern());
>+}
>+
>+// Tests that RE's constructors reject invalid regular expressions.
>+TYPED_TEST(RETest, RejectsInvalidRegex) {
>+ EXPECT_NONFATAL_FAILURE({
>+ const RE invalid(TypeParam("?"));
>+ }, "\"?\" is not a valid POSIX Extended regular expression.");
>+}
>+
>+// Tests RE::FullMatch().
>+TYPED_TEST(RETest, FullMatchWorks) {
>+ const RE empty(TypeParam(""));
>+ EXPECT_TRUE(RE::FullMatch(TypeParam(""), empty));
>+ EXPECT_FALSE(RE::FullMatch(TypeParam("a"), empty));
>+
>+ const RE re(TypeParam("a.*z"));
>+ EXPECT_TRUE(RE::FullMatch(TypeParam("az"), re));
>+ EXPECT_TRUE(RE::FullMatch(TypeParam("axyz"), re));
>+ EXPECT_FALSE(RE::FullMatch(TypeParam("baz"), re));
>+ EXPECT_FALSE(RE::FullMatch(TypeParam("azy"), re));
>+}
>+
>+// Tests RE::PartialMatch().
>+TYPED_TEST(RETest, PartialMatchWorks) {
>+ const RE empty(TypeParam(""));
>+ EXPECT_TRUE(RE::PartialMatch(TypeParam(""), empty));
>+ EXPECT_TRUE(RE::PartialMatch(TypeParam("a"), empty));
>+
>+ const RE re(TypeParam("a.*z"));
>+ EXPECT_TRUE(RE::PartialMatch(TypeParam("az"), re));
>+ EXPECT_TRUE(RE::PartialMatch(TypeParam("axyz"), re));
>+ EXPECT_TRUE(RE::PartialMatch(TypeParam("baz"), re));
>+ EXPECT_TRUE(RE::PartialMatch(TypeParam("azy"), re));
>+ EXPECT_FALSE(RE::PartialMatch(TypeParam("zza"), re));
>+}
>+
>+# endif // GTEST_HAS_TYPED_TEST
>+
>+#elif GTEST_USES_SIMPLE_RE
>+
>+TEST(IsInSetTest, NulCharIsNotInAnySet) {
>+ EXPECT_FALSE(IsInSet('\0', ""));
>+ EXPECT_FALSE(IsInSet('\0', "\0"));
>+ EXPECT_FALSE(IsInSet('\0', "a"));
>+}
>+
>+TEST(IsInSetTest, WorksForNonNulChars) {
>+ EXPECT_FALSE(IsInSet('a', "Ab"));
>+ EXPECT_FALSE(IsInSet('c', ""));
>+
>+ EXPECT_TRUE(IsInSet('b', "bcd"));
>+ EXPECT_TRUE(IsInSet('b', "ab"));
>+}
>+
>+TEST(IsAsciiDigitTest, IsFalseForNonDigit) {
>+ EXPECT_FALSE(IsAsciiDigit('\0'));
>+ EXPECT_FALSE(IsAsciiDigit(' '));
>+ EXPECT_FALSE(IsAsciiDigit('+'));
>+ EXPECT_FALSE(IsAsciiDigit('-'));
>+ EXPECT_FALSE(IsAsciiDigit('.'));
>+ EXPECT_FALSE(IsAsciiDigit('a'));
>+}
>+
>+TEST(IsAsciiDigitTest, IsTrueForDigit) {
>+ EXPECT_TRUE(IsAsciiDigit('0'));
>+ EXPECT_TRUE(IsAsciiDigit('1'));
>+ EXPECT_TRUE(IsAsciiDigit('5'));
>+ EXPECT_TRUE(IsAsciiDigit('9'));
>+}
>+
>+TEST(IsAsciiPunctTest, IsFalseForNonPunct) {
>+ EXPECT_FALSE(IsAsciiPunct('\0'));
>+ EXPECT_FALSE(IsAsciiPunct(' '));
>+ EXPECT_FALSE(IsAsciiPunct('\n'));
>+ EXPECT_FALSE(IsAsciiPunct('a'));
>+ EXPECT_FALSE(IsAsciiPunct('0'));
>+}
>+
>+TEST(IsAsciiPunctTest, IsTrueForPunct) {
>+ for (const char* p = "^-!\"#$%&'()*+,./:;<=>?@[\\]_`{|}~"; *p; p++) {
>+ EXPECT_PRED1(IsAsciiPunct, *p);
>+ }
>+}
>+
>+TEST(IsRepeatTest, IsFalseForNonRepeatChar) {
>+ EXPECT_FALSE(IsRepeat('\0'));
>+ EXPECT_FALSE(IsRepeat(' '));
>+ EXPECT_FALSE(IsRepeat('a'));
>+ EXPECT_FALSE(IsRepeat('1'));
>+ EXPECT_FALSE(IsRepeat('-'));
>+}
>+
>+TEST(IsRepeatTest, IsTrueForRepeatChar) {
>+ EXPECT_TRUE(IsRepeat('?'));
>+ EXPECT_TRUE(IsRepeat('*'));
>+ EXPECT_TRUE(IsRepeat('+'));
>+}
>+
>+TEST(IsAsciiWhiteSpaceTest, IsFalseForNonWhiteSpace) {
>+ EXPECT_FALSE(IsAsciiWhiteSpace('\0'));
>+ EXPECT_FALSE(IsAsciiWhiteSpace('a'));
>+ EXPECT_FALSE(IsAsciiWhiteSpace('1'));
>+ EXPECT_FALSE(IsAsciiWhiteSpace('+'));
>+ EXPECT_FALSE(IsAsciiWhiteSpace('_'));
>+}
>+
>+TEST(IsAsciiWhiteSpaceTest, IsTrueForWhiteSpace) {
>+ EXPECT_TRUE(IsAsciiWhiteSpace(' '));
>+ EXPECT_TRUE(IsAsciiWhiteSpace('\n'));
>+ EXPECT_TRUE(IsAsciiWhiteSpace('\r'));
>+ EXPECT_TRUE(IsAsciiWhiteSpace('\t'));
>+ EXPECT_TRUE(IsAsciiWhiteSpace('\v'));
>+ EXPECT_TRUE(IsAsciiWhiteSpace('\f'));
>+}
>+
>+TEST(IsAsciiWordCharTest, IsFalseForNonWordChar) {
>+ EXPECT_FALSE(IsAsciiWordChar('\0'));
>+ EXPECT_FALSE(IsAsciiWordChar('+'));
>+ EXPECT_FALSE(IsAsciiWordChar('.'));
>+ EXPECT_FALSE(IsAsciiWordChar(' '));
>+ EXPECT_FALSE(IsAsciiWordChar('\n'));
>+}
>+
>+TEST(IsAsciiWordCharTest, IsTrueForLetter) {
>+ EXPECT_TRUE(IsAsciiWordChar('a'));
>+ EXPECT_TRUE(IsAsciiWordChar('b'));
>+ EXPECT_TRUE(IsAsciiWordChar('A'));
>+ EXPECT_TRUE(IsAsciiWordChar('Z'));
>+}
>+
>+TEST(IsAsciiWordCharTest, IsTrueForDigit) {
>+ EXPECT_TRUE(IsAsciiWordChar('0'));
>+ EXPECT_TRUE(IsAsciiWordChar('1'));
>+ EXPECT_TRUE(IsAsciiWordChar('7'));
>+ EXPECT_TRUE(IsAsciiWordChar('9'));
>+}
>+
>+TEST(IsAsciiWordCharTest, IsTrueForUnderscore) {
>+ EXPECT_TRUE(IsAsciiWordChar('_'));
>+}
>+
>+TEST(IsValidEscapeTest, IsFalseForNonPrintable) {
>+ EXPECT_FALSE(IsValidEscape('\0'));
>+ EXPECT_FALSE(IsValidEscape('\007'));
>+}
>+
>+TEST(IsValidEscapeTest, IsFalseForDigit) {
>+ EXPECT_FALSE(IsValidEscape('0'));
>+ EXPECT_FALSE(IsValidEscape('9'));
>+}
>+
>+TEST(IsValidEscapeTest, IsFalseForWhiteSpace) {
>+ EXPECT_FALSE(IsValidEscape(' '));
>+ EXPECT_FALSE(IsValidEscape('\n'));
>+}
>+
>+TEST(IsValidEscapeTest, IsFalseForSomeLetter) {
>+ EXPECT_FALSE(IsValidEscape('a'));
>+ EXPECT_FALSE(IsValidEscape('Z'));
>+}
>+
>+TEST(IsValidEscapeTest, IsTrueForPunct) {
>+ EXPECT_TRUE(IsValidEscape('.'));
>+ EXPECT_TRUE(IsValidEscape('-'));
>+ EXPECT_TRUE(IsValidEscape('^'));
>+ EXPECT_TRUE(IsValidEscape('$'));
>+ EXPECT_TRUE(IsValidEscape('('));
>+ EXPECT_TRUE(IsValidEscape(']'));
>+ EXPECT_TRUE(IsValidEscape('{'));
>+ EXPECT_TRUE(IsValidEscape('|'));
>+}
>+
>+TEST(IsValidEscapeTest, IsTrueForSomeLetter) {
>+ EXPECT_TRUE(IsValidEscape('d'));
>+ EXPECT_TRUE(IsValidEscape('D'));
>+ EXPECT_TRUE(IsValidEscape('s'));
>+ EXPECT_TRUE(IsValidEscape('S'));
>+ EXPECT_TRUE(IsValidEscape('w'));
>+ EXPECT_TRUE(IsValidEscape('W'));
>+}
>+
>+TEST(AtomMatchesCharTest, EscapedPunct) {
>+ EXPECT_FALSE(AtomMatchesChar(true, '\\', '\0'));
>+ EXPECT_FALSE(AtomMatchesChar(true, '\\', ' '));
>+ EXPECT_FALSE(AtomMatchesChar(true, '_', '.'));
>+ EXPECT_FALSE(AtomMatchesChar(true, '.', 'a'));
>+
>+ EXPECT_TRUE(AtomMatchesChar(true, '\\', '\\'));
>+ EXPECT_TRUE(AtomMatchesChar(true, '_', '_'));
>+ EXPECT_TRUE(AtomMatchesChar(true, '+', '+'));
>+ EXPECT_TRUE(AtomMatchesChar(true, '.', '.'));
>+}
>+
>+TEST(AtomMatchesCharTest, Escaped_d) {
>+ EXPECT_FALSE(AtomMatchesChar(true, 'd', '\0'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 'd', 'a'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 'd', '.'));
>+
>+ EXPECT_TRUE(AtomMatchesChar(true, 'd', '0'));
>+ EXPECT_TRUE(AtomMatchesChar(true, 'd', '9'));
>+}
>+
>+TEST(AtomMatchesCharTest, Escaped_D) {
>+ EXPECT_FALSE(AtomMatchesChar(true, 'D', '0'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 'D', '9'));
>+
>+ EXPECT_TRUE(AtomMatchesChar(true, 'D', '\0'));
>+ EXPECT_TRUE(AtomMatchesChar(true, 'D', 'a'));
>+ EXPECT_TRUE(AtomMatchesChar(true, 'D', '-'));
>+}
>+
>+TEST(AtomMatchesCharTest, Escaped_s) {
>+ EXPECT_FALSE(AtomMatchesChar(true, 's', '\0'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 's', 'a'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 's', '.'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 's', '9'));
>+
>+ EXPECT_TRUE(AtomMatchesChar(true, 's', ' '));
>+ EXPECT_TRUE(AtomMatchesChar(true, 's', '\n'));
>+ EXPECT_TRUE(AtomMatchesChar(true, 's', '\t'));
>+}
>+
>+TEST(AtomMatchesCharTest, Escaped_S) {
>+ EXPECT_FALSE(AtomMatchesChar(true, 'S', ' '));
>+ EXPECT_FALSE(AtomMatchesChar(true, 'S', '\r'));
>+
>+ EXPECT_TRUE(AtomMatchesChar(true, 'S', '\0'));
>+ EXPECT_TRUE(AtomMatchesChar(true, 'S', 'a'));
>+ EXPECT_TRUE(AtomMatchesChar(true, 'S', '9'));
>+}
>+
>+TEST(AtomMatchesCharTest, Escaped_w) {
>+ EXPECT_FALSE(AtomMatchesChar(true, 'w', '\0'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 'w', '+'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 'w', ' '));
>+ EXPECT_FALSE(AtomMatchesChar(true, 'w', '\n'));
>+
>+ EXPECT_TRUE(AtomMatchesChar(true, 'w', '0'));
>+ EXPECT_TRUE(AtomMatchesChar(true, 'w', 'b'));
>+ EXPECT_TRUE(AtomMatchesChar(true, 'w', 'C'));
>+ EXPECT_TRUE(AtomMatchesChar(true, 'w', '_'));
>+}
>+
>+TEST(AtomMatchesCharTest, Escaped_W) {
>+ EXPECT_FALSE(AtomMatchesChar(true, 'W', 'A'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 'W', 'b'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 'W', '9'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 'W', '_'));
>+
>+ EXPECT_TRUE(AtomMatchesChar(true, 'W', '\0'));
>+ EXPECT_TRUE(AtomMatchesChar(true, 'W', '*'));
>+ EXPECT_TRUE(AtomMatchesChar(true, 'W', '\n'));
>+}
>+
>+TEST(AtomMatchesCharTest, EscapedWhiteSpace) {
>+ EXPECT_FALSE(AtomMatchesChar(true, 'f', '\0'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 'f', '\n'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 'n', '\0'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 'n', '\r'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 'r', '\0'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 'r', 'a'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 't', '\0'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 't', 't'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 'v', '\0'));
>+ EXPECT_FALSE(AtomMatchesChar(true, 'v', '\f'));
>+
>+ EXPECT_TRUE(AtomMatchesChar(true, 'f', '\f'));
>+ EXPECT_TRUE(AtomMatchesChar(true, 'n', '\n'));
>+ EXPECT_TRUE(AtomMatchesChar(true, 'r', '\r'));
>+ EXPECT_TRUE(AtomMatchesChar(true, 't', '\t'));
>+ EXPECT_TRUE(AtomMatchesChar(true, 'v', '\v'));
>+}
>+
>+TEST(AtomMatchesCharTest, UnescapedDot) {
>+ EXPECT_FALSE(AtomMatchesChar(false, '.', '\n'));
>+
>+ EXPECT_TRUE(AtomMatchesChar(false, '.', '\0'));
>+ EXPECT_TRUE(AtomMatchesChar(false, '.', '.'));
>+ EXPECT_TRUE(AtomMatchesChar(false, '.', 'a'));
>+ EXPECT_TRUE(AtomMatchesChar(false, '.', ' '));
>+}
>+
>+TEST(AtomMatchesCharTest, UnescapedChar) {
>+ EXPECT_FALSE(AtomMatchesChar(false, 'a', '\0'));
>+ EXPECT_FALSE(AtomMatchesChar(false, 'a', 'b'));
>+ EXPECT_FALSE(AtomMatchesChar(false, '$', 'a'));
>+
>+ EXPECT_TRUE(AtomMatchesChar(false, '$', '$'));
>+ EXPECT_TRUE(AtomMatchesChar(false, '5', '5'));
>+ EXPECT_TRUE(AtomMatchesChar(false, 'Z', 'Z'));
>+}
>+
>+TEST(ValidateRegexTest, GeneratesFailureAndReturnsFalseForInvalid) {
>+ EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex(NULL)),
>+ "NULL is not a valid simple regular expression");
>+ EXPECT_NONFATAL_FAILURE(
>+ ASSERT_FALSE(ValidateRegex("a\\")),
>+ "Syntax error at index 1 in simple regular expression \"a\\\": ");
>+ EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("a\\")),
>+ "'\\' cannot appear at the end");
>+ EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("\\n\\")),
>+ "'\\' cannot appear at the end");
>+ EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("\\s\\hb")),
>+ "invalid escape sequence \"\\h\"");
>+ EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("^^")),
>+ "'^' can only appear at the beginning");
>+ EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex(".*^b")),
>+ "'^' can only appear at the beginning");
>+ EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("$$")),
>+ "'$' can only appear at the end");
>+ EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("^$a")),
>+ "'$' can only appear at the end");
>+ EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("a(b")),
>+ "'(' is unsupported");
>+ EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("ab)")),
>+ "')' is unsupported");
>+ EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("[ab")),
>+ "'[' is unsupported");
>+ EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("a{2")),
>+ "'{' is unsupported");
>+ EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("?")),
>+ "'?' can only follow a repeatable token");
>+ EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("^*")),
>+ "'*' can only follow a repeatable token");
>+ EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("5*+")),
>+ "'+' can only follow a repeatable token");
>+}
>+
>+TEST(ValidateRegexTest, ReturnsTrueForValid) {
>+ EXPECT_TRUE(ValidateRegex(""));
>+ EXPECT_TRUE(ValidateRegex("a"));
>+ EXPECT_TRUE(ValidateRegex(".*"));
>+ EXPECT_TRUE(ValidateRegex("^a_+"));
>+ EXPECT_TRUE(ValidateRegex("^a\\t\\&?"));
>+ EXPECT_TRUE(ValidateRegex("09*$"));
>+ EXPECT_TRUE(ValidateRegex("^Z$"));
>+ EXPECT_TRUE(ValidateRegex("a\\^Z\\$\$\$\\|\\[\\]\\{\\}"));
>+}
>+
>+TEST(MatchRepetitionAndRegexAtHeadTest, WorksForZeroOrOne) {
>+ EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, 'a', '?', "a", "ba"));
>+ // Repeating more than once.
>+ EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, 'a', '?', "b", "aab"));
>+
>+ // Repeating zero times.
>+ EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, 'a', '?', "b", "ba"));
>+ // Repeating once.
>+ EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, 'a', '?', "b", "ab"));
>+ EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, '#', '?', ".", "##"));
>+}
>+
>+TEST(MatchRepetitionAndRegexAtHeadTest, WorksForZeroOrMany) {
>+ EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, '.', '*', "a$", "baab"));
>+
>+ // Repeating zero times.
>+ EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, '.', '*', "b", "bc"));
>+ // Repeating once.
>+ EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, '.', '*', "b", "abc"));
>+ // Repeating more than once.
>+ EXPECT_TRUE(MatchRepetitionAndRegexAtHead(true, 'w', '*', "-", "ab_1-g"));
>+}
>+
>+TEST(MatchRepetitionAndRegexAtHeadTest, WorksForOneOrMany) {
>+ EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, '.', '+', "a$", "baab"));
>+ // Repeating zero times.
>+ EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, '.', '+', "b", "bc"));
>+
>+ // Repeating once.
>+ EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, '.', '+', "b", "abc"));
>+ // Repeating more than once.
>+ EXPECT_TRUE(MatchRepetitionAndRegexAtHead(true, 'w', '+', "-", "ab_1-g"));
>+}
>+
>+TEST(MatchRegexAtHeadTest, ReturnsTrueForEmptyRegex) {
>+ EXPECT_TRUE(MatchRegexAtHead("", ""));
>+ EXPECT_TRUE(MatchRegexAtHead("", "ab"));
>+}
>+
>+TEST(MatchRegexAtHeadTest, WorksWhenDollarIsInRegex) {
>+ EXPECT_FALSE(MatchRegexAtHead("$", "a"));
>+
>+ EXPECT_TRUE(MatchRegexAtHead("$", ""));
>+ EXPECT_TRUE(MatchRegexAtHead("a$", "a"));
>+}
>+
>+TEST(MatchRegexAtHeadTest, WorksWhenRegexStartsWithEscapeSequence) {
>+ EXPECT_FALSE(MatchRegexAtHead("\\w", "+"));
>+ EXPECT_FALSE(MatchRegexAtHead("\\W", "ab"));
>+
>+ EXPECT_TRUE(MatchRegexAtHead("\\sa", "\nab"));
>+ EXPECT_TRUE(MatchRegexAtHead("\\d", "1a"));
>+}
>+
>+TEST(MatchRegexAtHeadTest, WorksWhenRegexStartsWithRepetition) {
>+ EXPECT_FALSE(MatchRegexAtHead(".+a", "abc"));
>+ EXPECT_FALSE(MatchRegexAtHead("a?b", "aab"));
>+
>+ EXPECT_TRUE(MatchRegexAtHead(".*a", "bc12-ab"));
>+ EXPECT_TRUE(MatchRegexAtHead("a?b", "b"));
>+ EXPECT_TRUE(MatchRegexAtHead("a?b", "ab"));
>+}
>+
>+TEST(MatchRegexAtHeadTest,
>+ WorksWhenRegexStartsWithRepetionOfEscapeSequence) {
>+ EXPECT_FALSE(MatchRegexAtHead("\\.+a", "abc"));
>+ EXPECT_FALSE(MatchRegexAtHead("\\s?b", " b"));
>+
>+ EXPECT_TRUE(MatchRegexAtHead("\\(*a", "((((ab"));
>+ EXPECT_TRUE(MatchRegexAtHead("\\^?b", "^b"));
>+ EXPECT_TRUE(MatchRegexAtHead("\\\\?b", "b"));
>+ EXPECT_TRUE(MatchRegexAtHead("\\\\?b", "\\b"));
>+}
>+
>+TEST(MatchRegexAtHeadTest, MatchesSequentially) {
>+ EXPECT_FALSE(MatchRegexAtHead("ab.*c", "acabc"));
>+
>+ EXPECT_TRUE(MatchRegexAtHead("ab.*c", "ab-fsc"));
>+}
>+
>+TEST(MatchRegexAnywhereTest, ReturnsFalseWhenStringIsNull) {
>+ EXPECT_FALSE(MatchRegexAnywhere("", NULL));
>+}
>+
>+TEST(MatchRegexAnywhereTest, WorksWhenRegexStartsWithCaret) {
>+ EXPECT_FALSE(MatchRegexAnywhere("^a", "ba"));
>+ EXPECT_FALSE(MatchRegexAnywhere("^$", "a"));
>+
>+ EXPECT_TRUE(MatchRegexAnywhere("^a", "ab"));
>+ EXPECT_TRUE(MatchRegexAnywhere("^", "ab"));
>+ EXPECT_TRUE(MatchRegexAnywhere("^$", ""));
>+}
>+
>+TEST(MatchRegexAnywhereTest, ReturnsFalseWhenNoMatch) {
>+ EXPECT_FALSE(MatchRegexAnywhere("a", "bcde123"));
>+ EXPECT_FALSE(MatchRegexAnywhere("a.+a", "--aa88888888"));
>+}
>+
>+TEST(MatchRegexAnywhereTest, ReturnsTrueWhenMatchingPrefix) {
>+ EXPECT_TRUE(MatchRegexAnywhere("\\w+", "ab1_ - 5"));
>+ EXPECT_TRUE(MatchRegexAnywhere(".*=", "="));
>+ EXPECT_TRUE(MatchRegexAnywhere("x.*ab?.*bc", "xaaabc"));
>+}
>+
>+TEST(MatchRegexAnywhereTest, ReturnsTrueWhenMatchingNonPrefix) {
>+ EXPECT_TRUE(MatchRegexAnywhere("\\w+", "$$$ ab1_ - 5"));
>+ EXPECT_TRUE(MatchRegexAnywhere("\\.+=", "= ...="));
>+}
>+
>+// Tests RE's implicit constructors.
>+TEST(RETest, ImplicitConstructorWorks) {
>+ const RE empty("");
>+ EXPECT_STREQ("", empty.pattern());
>+
>+ const RE simple("hello");
>+ EXPECT_STREQ("hello", simple.pattern());
>+}
>+
>+// Tests that RE's constructors reject invalid regular expressions.
>+TEST(RETest, RejectsInvalidRegex) {
>+ EXPECT_NONFATAL_FAILURE({
>+ const RE normal(NULL);
>+ }, "NULL is not a valid simple regular expression");
>+
>+ EXPECT_NONFATAL_FAILURE({
>+ const RE normal(".*(\\w+");
>+ }, "'(' is unsupported");
>+
>+ EXPECT_NONFATAL_FAILURE({
>+ const RE invalid("^?");
>+ }, "'?' can only follow a repeatable token");
>+}
>+
>+// Tests RE::FullMatch().
>+TEST(RETest, FullMatchWorks) {
>+ const RE empty("");
>+ EXPECT_TRUE(RE::FullMatch("", empty));
>+ EXPECT_FALSE(RE::FullMatch("a", empty));
>+
>+ const RE re1("a");
>+ EXPECT_TRUE(RE::FullMatch("a", re1));
>+
>+ const RE re("a.*z");
>+ EXPECT_TRUE(RE::FullMatch("az", re));
>+ EXPECT_TRUE(RE::FullMatch("axyz", re));
>+ EXPECT_FALSE(RE::FullMatch("baz", re));
>+ EXPECT_FALSE(RE::FullMatch("azy", re));
>+}
>+
>+// Tests RE::PartialMatch().
>+TEST(RETest, PartialMatchWorks) {
>+ const RE empty("");
>+ EXPECT_TRUE(RE::PartialMatch("", empty));
>+ EXPECT_TRUE(RE::PartialMatch("a", empty));
>+
>+ const RE re("a.*z");
>+ EXPECT_TRUE(RE::PartialMatch("az", re));
>+ EXPECT_TRUE(RE::PartialMatch("axyz", re));
>+ EXPECT_TRUE(RE::PartialMatch("baz", re));
>+ EXPECT_TRUE(RE::PartialMatch("azy", re));
>+ EXPECT_FALSE(RE::PartialMatch("zza", re));
>+}
>+
>+#endif // GTEST_USES_POSIX_RE
>+
>+#if !GTEST_OS_WINDOWS_MOBILE
>+
>+TEST(CaptureTest, CapturesStdout) {
>+ CaptureStdout();
>+ fprintf(stdout, "abc");
>+ EXPECT_STREQ("abc", GetCapturedStdout().c_str());
>+
>+ CaptureStdout();
>+ fprintf(stdout, "def%cghi", '\0');
>+ EXPECT_EQ(::std::string("def\0ghi", 7), ::std::string(GetCapturedStdout()));
>+}
>+
>+TEST(CaptureTest, CapturesStderr) {
>+ CaptureStderr();
>+ fprintf(stderr, "jkl");
>+ EXPECT_STREQ("jkl", GetCapturedStderr().c_str());
>+
>+ CaptureStderr();
>+ fprintf(stderr, "jkl%cmno", '\0');
>+ EXPECT_EQ(::std::string("jkl\0mno", 7), ::std::string(GetCapturedStderr()));
>+}
>+
>+// Tests that stdout and stderr capture don't interfere with each other.
>+TEST(CaptureTest, CapturesStdoutAndStderr) {
>+ CaptureStdout();
>+ CaptureStderr();
>+ fprintf(stdout, "pqr");
>+ fprintf(stderr, "stu");
>+ EXPECT_STREQ("pqr", GetCapturedStdout().c_str());
>+ EXPECT_STREQ("stu", GetCapturedStderr().c_str());
>+}
>+
>+TEST(CaptureDeathTest, CannotReenterStdoutCapture) {
>+ CaptureStdout();
>+ EXPECT_DEATH_IF_SUPPORTED(CaptureStdout(),
>+ "Only one stdout capturer can exist at a time");
>+ GetCapturedStdout();
>+
>+ // We cannot test stderr capturing using death tests as they use it
>+ // themselves.
>+}
>+
>+#endif // !GTEST_OS_WINDOWS_MOBILE
>+
>+TEST(ThreadLocalTest, DefaultConstructorInitializesToDefaultValues) {
>+ ThreadLocal<int> t1;
>+ EXPECT_EQ(0, t1.get());
>+
>+ ThreadLocal<void*> t2;
>+ EXPECT_TRUE(t2.get() == NULL);
>+}
>+
>+TEST(ThreadLocalTest, SingleParamConstructorInitializesToParam) {
>+ ThreadLocal<int> t1(123);
>+ EXPECT_EQ(123, t1.get());
>+
>+ int i = 0;
>+ ThreadLocal<int*> t2(&i);
>+ EXPECT_EQ(&i, t2.get());
>+}
>+
>+class NoDefaultContructor {
>+ public:
>+ explicit NoDefaultContructor(const char*) {}
>+ NoDefaultContructor(const NoDefaultContructor&) {}
>+};
>+
>+TEST(ThreadLocalTest, ValueDefaultContructorIsNotRequiredForParamVersion) {
>+ ThreadLocal<NoDefaultContructor> bar(NoDefaultContructor("foo"));
>+ bar.pointer();
>+}
>+
>+TEST(ThreadLocalTest, GetAndPointerReturnSameValue) {
>+ ThreadLocal<std::string> thread_local_string;
>+
>+ EXPECT_EQ(thread_local_string.pointer(), &(thread_local_string.get()));
>+
>+ // Verifies the condition still holds after calling set.
>+ thread_local_string.set("foo");
>+ EXPECT_EQ(thread_local_string.pointer(), &(thread_local_string.get()));
>+}
>+
>+TEST(ThreadLocalTest, PointerAndConstPointerReturnSameValue) {
>+ ThreadLocal<std::string> thread_local_string;
>+ const ThreadLocal<std::string>& const_thread_local_string =
>+ thread_local_string;
>+
>+ EXPECT_EQ(thread_local_string.pointer(), const_thread_local_string.pointer());
>+
>+ thread_local_string.set("foo");
>+ EXPECT_EQ(thread_local_string.pointer(), const_thread_local_string.pointer());
>+}
>+
>+#if GTEST_IS_THREADSAFE
>+
>+void AddTwo(int* param) { *param += 2; }
>+
>+TEST(ThreadWithParamTest, ConstructorExecutesThreadFunc) {
>+ int i = 40;
>+ ThreadWithParam<int*> thread(&AddTwo, &i, NULL);
>+ thread.Join();
>+ EXPECT_EQ(42, i);
>+}
>+
>+TEST(MutexDeathTest, AssertHeldShouldAssertWhenNotLocked) {
>+ // AssertHeld() is flaky only in the presence of multiple threads accessing
>+ // the lock. In this case, the test is robust.
>+ EXPECT_DEATH_IF_SUPPORTED({
>+ Mutex m;
>+ { MutexLock lock(&m); }
>+ m.AssertHeld();
>+ },
>+ "thread .*hold");
>+}
>+
>+TEST(MutexTest, AssertHeldShouldNotAssertWhenLocked) {
>+ Mutex m;
>+ MutexLock lock(&m);
>+ m.AssertHeld();
>+}
>+
>+class AtomicCounterWithMutex {
>+ public:
>+ explicit AtomicCounterWithMutex(Mutex* mutex) :
>+ value_(0), mutex_(mutex), random_(42) {}
>+
>+ void Increment() {
>+ MutexLock lock(mutex_);
>+ int temp = value_;
>+ {
>+ // We need to put up a memory barrier to prevent reads and writes to
>+ // value_ rearranged with the call to SleepMilliseconds when observed
>+ // from other threads.
>+#if GTEST_HAS_PTHREAD
>+ // On POSIX, locking a mutex puts up a memory barrier. We cannot use
>+ // Mutex and MutexLock here or rely on their memory barrier
>+ // functionality as we are testing them here.
>+ pthread_mutex_t memory_barrier_mutex;
>+ GTEST_CHECK_POSIX_SUCCESS_(
>+ pthread_mutex_init(&memory_barrier_mutex, NULL));
>+ GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_lock(&memory_barrier_mutex));
>+
>+ SleepMilliseconds(random_.Generate(30));
>+
>+ GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&memory_barrier_mutex));
>+ GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_destroy(&memory_barrier_mutex));
>+#elif GTEST_OS_WINDOWS
>+ // On Windows, performing an interlocked access puts up a memory barrier.
>+ volatile LONG dummy = 0;
>+ ::InterlockedIncrement(&dummy);
>+ SleepMilliseconds(random_.Generate(30));
>+ ::InterlockedIncrement(&dummy);
>+#else
>+# error "Memory barrier not implemented on this platform."
>+#endif // GTEST_HAS_PTHREAD
>+ }
>+ value_ = temp + 1;
>+ }
>+ int value() const { return value_; }
>+
>+ private:
>+ volatile int value_;
>+ Mutex* const mutex_; // Protects value_.
>+ Random random_;
>+};
>+
>+void CountingThreadFunc(pair<AtomicCounterWithMutex*, int> param) {
>+ for (int i = 0; i < param.second; ++i)
>+ param.first->Increment();
>+}
>+
>+// Tests that the mutex only lets one thread at a time to lock it.
>+TEST(MutexTest, OnlyOneThreadCanLockAtATime) {
>+ Mutex mutex;
>+ AtomicCounterWithMutex locked_counter(&mutex);
>+
>+ typedef ThreadWithParam<pair<AtomicCounterWithMutex*, int> > ThreadType;
>+ const int kCycleCount = 20;
>+ const int kThreadCount = 7;
>+ scoped_ptr<ThreadType> counting_threads[kThreadCount];
>+ Notification threads_can_start;
>+ // Creates and runs kThreadCount threads that increment locked_counter
>+ // kCycleCount times each.
>+ for (int i = 0; i < kThreadCount; ++i) {
>+ counting_threads[i].reset(new ThreadType(&CountingThreadFunc,
>+ make_pair(&locked_counter,
>+ kCycleCount),
>+ &threads_can_start));
>+ }
>+ threads_can_start.Notify();
>+ for (int i = 0; i < kThreadCount; ++i)
>+ counting_threads[i]->Join();
>+
>+ // If the mutex lets more than one thread to increment the counter at a
>+ // time, they are likely to encounter a race condition and have some
>+ // increments overwritten, resulting in the lower then expected counter
>+ // value.
>+ EXPECT_EQ(kCycleCount * kThreadCount, locked_counter.value());
>+}
>+
>+template <typename T>
>+void RunFromThread(void (func)(T), T param) {
>+ ThreadWithParam<T> thread(func, param, NULL);
>+ thread.Join();
>+}
>+
>+void RetrieveThreadLocalValue(
>+ pair<ThreadLocal<std::string>*, std::string*> param) {
>+ *param.second = param.first->get();
>+}
>+
>+TEST(ThreadLocalTest, ParameterizedConstructorSetsDefault) {
>+ ThreadLocal<std::string> thread_local_string("foo");
>+ EXPECT_STREQ("foo", thread_local_string.get().c_str());
>+
>+ thread_local_string.set("bar");
>+ EXPECT_STREQ("bar", thread_local_string.get().c_str());
>+
>+ std::string result;
>+ RunFromThread(&RetrieveThreadLocalValue,
>+ make_pair(&thread_local_string, &result));
>+ EXPECT_STREQ("foo", result.c_str());
>+}
>+
>+// Keeps track of whether of destructors being called on instances of
>+// DestructorTracker. On Windows, waits for the destructor call reports.
>+class DestructorCall {
>+ public:
>+ DestructorCall() {
>+ invoked_ = false;
>+#if GTEST_OS_WINDOWS
>+ wait_event_.Reset(::CreateEvent(NULL, TRUE, FALSE, NULL));
>+ GTEST_CHECK_(wait_event_.Get() != NULL);
>+#endif
>+ }
>+
>+ bool CheckDestroyed() const {
>+#if GTEST_OS_WINDOWS
>+ if (::WaitForSingleObject(wait_event_.Get(), 1000) != WAIT_OBJECT_0)
>+ return false;
>+#endif
>+ return invoked_;
>+ }
>+
>+ void ReportDestroyed() {
>+ invoked_ = true;
>+#if GTEST_OS_WINDOWS
>+ ::SetEvent(wait_event_.Get());
>+#endif
>+ }
>+
>+ static std::vector<DestructorCall*>& List() { return *list_; }
>+
>+ static void ResetList() {
>+ for (size_t i = 0; i < list_->size(); ++i) {
>+ delete list_->at(i);
>+ }
>+ list_->clear();
>+ }
>+
>+ private:
>+ bool invoked_;
>+#if GTEST_OS_WINDOWS
>+ AutoHandle wait_event_;
>+#endif
>+ static std::vector<DestructorCall*>* const list_;
>+
>+ GTEST_DISALLOW_COPY_AND_ASSIGN_(DestructorCall);
>+};
>+
>+std::vector<DestructorCall*>* const DestructorCall::list_ =
>+ new std::vector<DestructorCall*>;
>+
>+// DestructorTracker keeps track of whether its instances have been
>+// destroyed.
>+class DestructorTracker {
>+ public:
>+ DestructorTracker() : index_(GetNewIndex()) {}
>+ DestructorTracker(const DestructorTracker& /* rhs */)
>+ : index_(GetNewIndex()) {}
>+ ~DestructorTracker() {
>+ // We never access DestructorCall::List() concurrently, so we don't need
>+ // to protect this access with a mutex.
>+ DestructorCall::List()[index_]->ReportDestroyed();
>+ }
>+
>+ private:
>+ static size_t GetNewIndex() {
>+ DestructorCall::List().push_back(new DestructorCall);
>+ return DestructorCall::List().size() - 1;
>+ }
>+ const size_t index_;
>+
>+ GTEST_DISALLOW_ASSIGN_(DestructorTracker);
>+};
>+
>+typedef ThreadLocal<DestructorTracker>* ThreadParam;
>+
>+void CallThreadLocalGet(ThreadParam thread_local_param) {
>+ thread_local_param->get();
>+}
>+
>+// Tests that when a ThreadLocal object dies in a thread, it destroys
>+// the managed object for that thread.
>+TEST(ThreadLocalTest, DestroysManagedObjectForOwnThreadWhenDying) {
>+ DestructorCall::ResetList();
>+
>+ {
>+ ThreadLocal<DestructorTracker> thread_local_tracker;
>+ ASSERT_EQ(0U, DestructorCall::List().size());
>+
>+ // This creates another DestructorTracker object for the main thread.
>+ thread_local_tracker.get();
>+ ASSERT_EQ(1U, DestructorCall::List().size());
>+ ASSERT_FALSE(DestructorCall::List()[0]->CheckDestroyed());
>+ }
>+
>+ // Now thread_local_tracker has died.
>+ ASSERT_EQ(1U, DestructorCall::List().size());
>+ EXPECT_TRUE(DestructorCall::List()[0]->CheckDestroyed());
>+
>+ DestructorCall::ResetList();
>+}
>+
>+// Tests that when a thread exits, the thread-local object for that
>+// thread is destroyed.
>+TEST(ThreadLocalTest, DestroysManagedObjectAtThreadExit) {
>+ DestructorCall::ResetList();
>+
>+ {
>+ ThreadLocal<DestructorTracker> thread_local_tracker;
>+ ASSERT_EQ(0U, DestructorCall::List().size());
>+
>+ // This creates another DestructorTracker object in the new thread.
>+ ThreadWithParam<ThreadParam> thread(
>+ &CallThreadLocalGet, &thread_local_tracker, NULL);
>+ thread.Join();
>+
>+ // The thread has exited, and we should have a DestroyedTracker
>+ // instance created for it. But it may not have been destroyed yet.
>+ ASSERT_EQ(1U, DestructorCall::List().size());
>+ }
>+
>+ // The thread has exited and thread_local_tracker has died.
>+ ASSERT_EQ(1U, DestructorCall::List().size());
>+ EXPECT_TRUE(DestructorCall::List()[0]->CheckDestroyed());
>+
>+ DestructorCall::ResetList();
>+}
>+
>+TEST(ThreadLocalTest, ThreadLocalMutationsAffectOnlyCurrentThread) {
>+ ThreadLocal<std::string> thread_local_string;
>+ thread_local_string.set("Foo");
>+ EXPECT_STREQ("Foo", thread_local_string.get().c_str());
>+
>+ std::string result;
>+ RunFromThread(&RetrieveThreadLocalValue,
>+ make_pair(&thread_local_string, &result));
>+ EXPECT_TRUE(result.empty());
>+}
>+
>+#endif // GTEST_IS_THREADSAFE
>+
>+#if GTEST_OS_WINDOWS
>+TEST(WindowsTypesTest, HANDLEIsVoidStar) {
>+ StaticAssertTypeEq<HANDLE, void*>();
>+}
>+
>+#if GTEST_OS_WINDOWS_MINGW && !defined(__MINGW64_VERSION_MAJOR)
>+TEST(WindowsTypesTest, _CRITICAL_SECTIONIs_CRITICAL_SECTION) {
>+ StaticAssertTypeEq<CRITICAL_SECTION, _CRITICAL_SECTION>();
>+}
>+#else
>+TEST(WindowsTypesTest, CRITICAL_SECTIONIs_RTL_CRITICAL_SECTION) {
>+ StaticAssertTypeEq<CRITICAL_SECTION, _RTL_CRITICAL_SECTION>();
>+}
>+#endif
>+
>+#endif // GTEST_OS_WINDOWS
>+
>+} // namespace internal
>+} // namespace testing
>diff --git a/Source/ThirdParty/gtest/test/googletest-printers-test.cc b/Source/ThirdParty/gtest/test/googletest-printers-test.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..ea8369d27e50470f1eabe3af2804d345493aded9
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-printers-test.cc
>@@ -0,0 +1,1748 @@
>+// Copyright 2007, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+
>+// Google Test - The Google C++ Testing and Mocking Framework
>+//
>+// This file tests the universal value printer.
>+
>+#include <ctype.h>
>+#include <limits.h>
>+#include <string.h>
>+#include <algorithm>
>+#include <deque>
>+#include <list>
>+#include <map>
>+#include <set>
>+#include <sstream>
>+#include <string>
>+#include <utility>
>+#include <vector>
>+
>+#include "gtest/gtest-printers.h"
>+#include "gtest/gtest.h"
>+
>+#if GTEST_HAS_UNORDERED_MAP_
>+# include <unordered_map> // NOLINT
>+#endif // GTEST_HAS_UNORDERED_MAP_
>+
>+#if GTEST_HAS_UNORDERED_SET_
>+# include <unordered_set> // NOLINT
>+#endif // GTEST_HAS_UNORDERED_SET_
>+
>+#if GTEST_HAS_STD_FORWARD_LIST_
>+# include <forward_list> // NOLINT
>+#endif // GTEST_HAS_STD_FORWARD_LIST_
>+
>+// Some user-defined types for testing the universal value printer.
>+
>+// An anonymous enum type.
>+enum AnonymousEnum {
>+ kAE1 = -1,
>+ kAE2 = 1
>+};
>+
>+// An enum without a user-defined printer.
>+enum EnumWithoutPrinter {
>+ kEWP1 = -2,
>+ kEWP2 = 42
>+};
>+
>+// An enum with a << operator.
>+enum EnumWithStreaming {
>+ kEWS1 = 10
>+};
>+
>+std::ostream& operator<<(std::ostream& os, EnumWithStreaming e) {
>+ return os << (e == kEWS1 ? "kEWS1" : "invalid");
>+}
>+
>+// An enum with a PrintTo() function.
>+enum EnumWithPrintTo {
>+ kEWPT1 = 1
>+};
>+
>+void PrintTo(EnumWithPrintTo e, std::ostream* os) {
>+ *os << (e == kEWPT1 ? "kEWPT1" : "invalid");
>+}
>+
>+// A class implicitly convertible to BiggestInt.
>+class BiggestIntConvertible {
>+ public:
>+ operator ::testing::internal::BiggestInt() const { return 42; }
>+};
>+
>+// A user-defined unprintable class template in the global namespace.
>+template <typename T>
>+class UnprintableTemplateInGlobal {
>+ public:
>+ UnprintableTemplateInGlobal() : value_() {}
>+ private:
>+ T value_;
>+};
>+
>+// A user-defined streamable type in the global namespace.
>+class StreamableInGlobal {
>+ public:
>+ virtual ~StreamableInGlobal() {}
>+};
>+
>+inline void operator<<(::std::ostream& os, const StreamableInGlobal& /* x */) {
>+ os << "StreamableInGlobal";
>+}
>+
>+void operator<<(::std::ostream& os, const StreamableInGlobal* /* x */) {
>+ os << "StreamableInGlobal*";
>+}
>+
>+namespace foo {
>+
>+// A user-defined unprintable type in a user namespace.
>+class UnprintableInFoo {
>+ public:
>+ UnprintableInFoo() : z_(0) { memcpy(xy_, "\xEF\x12\x0\x0\x34\xAB\x0\x0", 8); }
>+ double z() const { return z_; }
>+ private:
>+ char xy_[8];
>+ double z_;
>+};
>+
>+// A user-defined printable type in a user-chosen namespace.
>+struct PrintableViaPrintTo {
>+ PrintableViaPrintTo() : value() {}
>+ int value;
>+};
>+
>+void PrintTo(const PrintableViaPrintTo& x, ::std::ostream* os) {
>+ *os << "PrintableViaPrintTo: " << x.value;
>+}
>+
>+// A type with a user-defined << for printing its pointer.
>+struct PointerPrintable {
>+};
>+
>+::std::ostream& operator<<(::std::ostream& os,
>+ const PointerPrintable* /* x */) {
>+ return os << "PointerPrintable*";
>+}
>+
>+// A user-defined printable class template in a user-chosen namespace.
>+template <typename T>
>+class PrintableViaPrintToTemplate {
>+ public:
>+ explicit PrintableViaPrintToTemplate(const T& a_value) : value_(a_value) {}
>+
>+ const T& value() const { return value_; }
>+ private:
>+ T value_;
>+};
>+
>+template <typename T>
>+void PrintTo(const PrintableViaPrintToTemplate<T>& x, ::std::ostream* os) {
>+ *os << "PrintableViaPrintToTemplate: " << x.value();
>+}
>+
>+// A user-defined streamable class template in a user namespace.
>+template <typename T>
>+class StreamableTemplateInFoo {
>+ public:
>+ StreamableTemplateInFoo() : value_() {}
>+
>+ const T& value() const { return value_; }
>+ private:
>+ T value_;
>+};
>+
>+template <typename T>
>+inline ::std::ostream& operator<<(::std::ostream& os,
>+ const StreamableTemplateInFoo<T>& x) {
>+ return os << "StreamableTemplateInFoo: " << x.value();
>+}
>+
>+// A user-defined streamable but recursivly-defined container type in
>+// a user namespace, it mimics therefore std::filesystem::path or
>+// boost::filesystem::path.
>+class PathLike {
>+ public:
>+ struct iterator {
>+ typedef PathLike value_type;
>+ };
>+
>+ PathLike() {}
>+
>+ iterator begin() const { return iterator(); }
>+ iterator end() const { return iterator(); }
>+
>+ friend ::std::ostream& operator<<(::std::ostream& os, const PathLike&) {
>+ return os << "Streamable-PathLike";
>+ }
>+};
>+
>+} // namespace foo
>+
>+namespace testing {
>+namespace gtest_printers_test {
>+
>+using ::std::deque;
>+using ::std::list;
>+using ::std::make_pair;
>+using ::std::map;
>+using ::std::multimap;
>+using ::std::multiset;
>+using ::std::pair;
>+using ::std::set;
>+using ::std::vector;
>+using ::testing::PrintToString;
>+using ::testing::internal::FormatForComparisonFailureMessage;
>+using ::testing::internal::ImplicitCast_;
>+using ::testing::internal::NativeArray;
>+using ::testing::internal::RE;
>+using ::testing::internal::RelationToSourceReference;
>+using ::testing::internal::Strings;
>+using ::testing::internal::UniversalPrint;
>+using ::testing::internal::UniversalPrinter;
>+using ::testing::internal::UniversalTersePrint;
>+#if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
>+using ::testing::internal::UniversalTersePrintTupleFieldsToStrings;
>+#endif
>+
>+// Prints a value to a string using the universal value printer. This
>+// is a helper for testing UniversalPrinter<T>::Print() for various types.
>+template <typename T>
>+std::string Print(const T& value) {
>+ ::std::stringstream ss;
>+ UniversalPrinter<T>::Print(value, &ss);
>+ return ss.str();
>+}
>+
>+// Prints a value passed by reference to a string, using the universal
>+// value printer. This is a helper for testing
>+// UniversalPrinter<T&>::Print() for various types.
>+template <typename T>
>+std::string PrintByRef(const T& value) {
>+ ::std::stringstream ss;
>+ UniversalPrinter<T&>::Print(value, &ss);
>+ return ss.str();
>+}
>+
>+// Tests printing various enum types.
>+
>+TEST(PrintEnumTest, AnonymousEnum) {
>+ EXPECT_EQ("-1", Print(kAE1));
>+ EXPECT_EQ("1", Print(kAE2));
>+}
>+
>+TEST(PrintEnumTest, EnumWithoutPrinter) {
>+ EXPECT_EQ("-2", Print(kEWP1));
>+ EXPECT_EQ("42", Print(kEWP2));
>+}
>+
>+TEST(PrintEnumTest, EnumWithStreaming) {
>+ EXPECT_EQ("kEWS1", Print(kEWS1));
>+ EXPECT_EQ("invalid", Print(static_cast<EnumWithStreaming>(0)));
>+}
>+
>+TEST(PrintEnumTest, EnumWithPrintTo) {
>+ EXPECT_EQ("kEWPT1", Print(kEWPT1));
>+ EXPECT_EQ("invalid", Print(static_cast<EnumWithPrintTo>(0)));
>+}
>+
>+// Tests printing a class implicitly convertible to BiggestInt.
>+
>+TEST(PrintClassTest, BiggestIntConvertible) {
>+ EXPECT_EQ("42", Print(BiggestIntConvertible()));
>+}
>+
>+// Tests printing various char types.
>+
>+// char.
>+TEST(PrintCharTest, PlainChar) {
>+ EXPECT_EQ("'\\0'", Print('\0'));
>+ EXPECT_EQ("'\\'' (39, 0x27)", Print('\''));
>+ EXPECT_EQ("'\"' (34, 0x22)", Print('"'));
>+ EXPECT_EQ("'?' (63, 0x3F)", Print('?'));
>+ EXPECT_EQ("'\\\\' (92, 0x5C)", Print('\\'));
>+ EXPECT_EQ("'\\a' (7)", Print('\a'));
>+ EXPECT_EQ("'\\b' (8)", Print('\b'));
>+ EXPECT_EQ("'\\f' (12, 0xC)", Print('\f'));
>+ EXPECT_EQ("'\\n' (10, 0xA)", Print('\n'));
>+ EXPECT_EQ("'\\r' (13, 0xD)", Print('\r'));
>+ EXPECT_EQ("'\\t' (9)", Print('\t'));
>+ EXPECT_EQ("'\\v' (11, 0xB)", Print('\v'));
>+ EXPECT_EQ("'\\x7F' (127)", Print('\x7F'));
>+ EXPECT_EQ("'\\xFF' (255)", Print('\xFF'));
>+ EXPECT_EQ("' ' (32, 0x20)", Print(' '));
>+ EXPECT_EQ("'a' (97, 0x61)", Print('a'));
>+}
>+
>+// signed char.
>+TEST(PrintCharTest, SignedChar) {
>+ EXPECT_EQ("'\\0'", Print(static_cast<signed char>('\0')));
>+ EXPECT_EQ("'\\xCE' (-50)",
>+ Print(static_cast<signed char>(-50)));
>+}
>+
>+// unsigned char.
>+TEST(PrintCharTest, UnsignedChar) {
>+ EXPECT_EQ("'\\0'", Print(static_cast<unsigned char>('\0')));
>+ EXPECT_EQ("'b' (98, 0x62)",
>+ Print(static_cast<unsigned char>('b')));
>+}
>+
>+// Tests printing other simple, built-in types.
>+
>+// bool.
>+TEST(PrintBuiltInTypeTest, Bool) {
>+ EXPECT_EQ("false", Print(false));
>+ EXPECT_EQ("true", Print(true));
>+}
>+
>+// wchar_t.
>+TEST(PrintBuiltInTypeTest, Wchar_t) {
>+ EXPECT_EQ("L'\\0'", Print(L'\0'));
>+ EXPECT_EQ("L'\\'' (39, 0x27)", Print(L'\''));
>+ EXPECT_EQ("L'\"' (34, 0x22)", Print(L'"'));
>+ EXPECT_EQ("L'?' (63, 0x3F)", Print(L'?'));
>+ EXPECT_EQ("L'\\\\' (92, 0x5C)", Print(L'\\'));
>+ EXPECT_EQ("L'\\a' (7)", Print(L'\a'));
>+ EXPECT_EQ("L'\\b' (8)", Print(L'\b'));
>+ EXPECT_EQ("L'\\f' (12, 0xC)", Print(L'\f'));
>+ EXPECT_EQ("L'\\n' (10, 0xA)", Print(L'\n'));
>+ EXPECT_EQ("L'\\r' (13, 0xD)", Print(L'\r'));
>+ EXPECT_EQ("L'\\t' (9)", Print(L'\t'));
>+ EXPECT_EQ("L'\\v' (11, 0xB)", Print(L'\v'));
>+ EXPECT_EQ("L'\\x7F' (127)", Print(L'\x7F'));
>+ EXPECT_EQ("L'\\xFF' (255)", Print(L'\xFF'));
>+ EXPECT_EQ("L' ' (32, 0x20)", Print(L' '));
>+ EXPECT_EQ("L'a' (97, 0x61)", Print(L'a'));
>+ EXPECT_EQ("L'\\x576' (1398)", Print(static_cast<wchar_t>(0x576)));
>+ EXPECT_EQ("L'\\xC74D' (51021)", Print(static_cast<wchar_t>(0xC74D)));
>+}
>+
>+// Test that Int64 provides more storage than wchar_t.
>+TEST(PrintTypeSizeTest, Wchar_t) {
>+ EXPECT_LT(sizeof(wchar_t), sizeof(testing::internal::Int64));
>+}
>+
>+// Various integer types.
>+TEST(PrintBuiltInTypeTest, Integer) {
>+ EXPECT_EQ("'\\xFF' (255)", Print(static_cast<unsigned char>(255))); // uint8
>+ EXPECT_EQ("'\\x80' (-128)", Print(static_cast<signed char>(-128))); // int8
>+ EXPECT_EQ("65535", Print(USHRT_MAX)); // uint16
>+ EXPECT_EQ("-32768", Print(SHRT_MIN)); // int16
>+ EXPECT_EQ("4294967295", Print(UINT_MAX)); // uint32
>+ EXPECT_EQ("-2147483648", Print(INT_MIN)); // int32
>+ EXPECT_EQ("18446744073709551615",
>+ Print(static_cast<testing::internal::UInt64>(-1))); // uint64
>+ EXPECT_EQ("-9223372036854775808",
>+ Print(static_cast<testing::internal::Int64>(1) << 63)); // int64
>+}
>+
>+// Size types.
>+TEST(PrintBuiltInTypeTest, Size_t) {
>+ EXPECT_EQ("1", Print(sizeof('a'))); // size_t.
>+#if !GTEST_OS_WINDOWS
>+ // Windows has no ssize_t type.
>+ EXPECT_EQ("-2", Print(static_cast<ssize_t>(-2))); // ssize_t.
>+#endif // !GTEST_OS_WINDOWS
>+}
>+
>+// Floating-points.
>+TEST(PrintBuiltInTypeTest, FloatingPoints) {
>+ EXPECT_EQ("1.5", Print(1.5f)); // float
>+ EXPECT_EQ("-2.5", Print(-2.5)); // double
>+}
>+
>+// Since ::std::stringstream::operator<<(const void *) formats the pointer
>+// output differently with different compilers, we have to create the expected
>+// output first and use it as our expectation.
>+static std::string PrintPointer(const void* p) {
>+ ::std::stringstream expected_result_stream;
>+ expected_result_stream << p;
>+ return expected_result_stream.str();
>+}
>+
>+// Tests printing C strings.
>+
>+// const char*.
>+TEST(PrintCStringTest, Const) {
>+ const char* p = "World";
>+ EXPECT_EQ(PrintPointer(p) + " pointing to \"World\"", Print(p));
>+}
>+
>+// char*.
>+TEST(PrintCStringTest, NonConst) {
>+ char p[] = "Hi";
>+ EXPECT_EQ(PrintPointer(p) + " pointing to \"Hi\"",
>+ Print(static_cast<char*>(p)));
>+}
>+
>+// NULL C string.
>+TEST(PrintCStringTest, Null) {
>+ const char* p = NULL;
>+ EXPECT_EQ("NULL", Print(p));
>+}
>+
>+// Tests that C strings are escaped properly.
>+TEST(PrintCStringTest, EscapesProperly) {
>+ const char* p = "'\"?\\\a\b\f\n\r\t\v\x7F\xFF a";
>+ EXPECT_EQ(PrintPointer(p) + " pointing to \"'\\\"?\\\\\\a\\b\\f"
>+ "\\n\\r\\t\\v\\x7F\\xFF a\"",
>+ Print(p));
>+}
>+
>+// MSVC compiler can be configured to define whar_t as a typedef
>+// of unsigned short. Defining an overload for const wchar_t* in that case
>+// would cause pointers to unsigned shorts be printed as wide strings,
>+// possibly accessing more memory than intended and causing invalid
>+// memory accesses. MSVC defines _NATIVE_WCHAR_T_DEFINED symbol when
>+// wchar_t is implemented as a native type.
>+#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
>+
>+// const wchar_t*.
>+TEST(PrintWideCStringTest, Const) {
>+ const wchar_t* p = L"World";
>+ EXPECT_EQ(PrintPointer(p) + " pointing to L\"World\"", Print(p));
>+}
>+
>+// wchar_t*.
>+TEST(PrintWideCStringTest, NonConst) {
>+ wchar_t p[] = L"Hi";
>+ EXPECT_EQ(PrintPointer(p) + " pointing to L\"Hi\"",
>+ Print(static_cast<wchar_t*>(p)));
>+}
>+
>+// NULL wide C string.
>+TEST(PrintWideCStringTest, Null) {
>+ const wchar_t* p = NULL;
>+ EXPECT_EQ("NULL", Print(p));
>+}
>+
>+// Tests that wide C strings are escaped properly.
>+TEST(PrintWideCStringTest, EscapesProperly) {
>+ const wchar_t s[] = {'\'', '"', '?', '\\', '\a', '\b', '\f', '\n', '\r',
>+ '\t', '\v', 0xD3, 0x576, 0x8D3, 0xC74D, ' ', 'a', '\0'};
>+ EXPECT_EQ(PrintPointer(s) + " pointing to L\"'\\\"?\\\\\\a\\b\\f"
>+ "\\n\\r\\t\\v\\xD3\\x576\\x8D3\\xC74D a\"",
>+ Print(static_cast<const wchar_t*>(s)));
>+}
>+#endif // native wchar_t
>+
>+// Tests printing pointers to other char types.
>+
>+// signed char*.
>+TEST(PrintCharPointerTest, SignedChar) {
>+ signed char* p = reinterpret_cast<signed char*>(0x1234);
>+ EXPECT_EQ(PrintPointer(p), Print(p));
>+ p = NULL;
>+ EXPECT_EQ("NULL", Print(p));
>+}
>+
>+// const signed char*.
>+TEST(PrintCharPointerTest, ConstSignedChar) {
>+ signed char* p = reinterpret_cast<signed char*>(0x1234);
>+ EXPECT_EQ(PrintPointer(p), Print(p));
>+ p = NULL;
>+ EXPECT_EQ("NULL", Print(p));
>+}
>+
>+// unsigned char*.
>+TEST(PrintCharPointerTest, UnsignedChar) {
>+ unsigned char* p = reinterpret_cast<unsigned char*>(0x1234);
>+ EXPECT_EQ(PrintPointer(p), Print(p));
>+ p = NULL;
>+ EXPECT_EQ("NULL", Print(p));
>+}
>+
>+// const unsigned char*.
>+TEST(PrintCharPointerTest, ConstUnsignedChar) {
>+ const unsigned char* p = reinterpret_cast<const unsigned char*>(0x1234);
>+ EXPECT_EQ(PrintPointer(p), Print(p));
>+ p = NULL;
>+ EXPECT_EQ("NULL", Print(p));
>+}
>+
>+// Tests printing pointers to simple, built-in types.
>+
>+// bool*.
>+TEST(PrintPointerToBuiltInTypeTest, Bool) {
>+ bool* p = reinterpret_cast<bool*>(0xABCD);
>+ EXPECT_EQ(PrintPointer(p), Print(p));
>+ p = NULL;
>+ EXPECT_EQ("NULL", Print(p));
>+}
>+
>+// void*.
>+TEST(PrintPointerToBuiltInTypeTest, Void) {
>+ void* p = reinterpret_cast<void*>(0xABCD);
>+ EXPECT_EQ(PrintPointer(p), Print(p));
>+ p = NULL;
>+ EXPECT_EQ("NULL", Print(p));
>+}
>+
>+// const void*.
>+TEST(PrintPointerToBuiltInTypeTest, ConstVoid) {
>+ const void* p = reinterpret_cast<const void*>(0xABCD);
>+ EXPECT_EQ(PrintPointer(p), Print(p));
>+ p = NULL;
>+ EXPECT_EQ("NULL", Print(p));
>+}
>+
>+// Tests printing pointers to pointers.
>+TEST(PrintPointerToPointerTest, IntPointerPointer) {
>+ int** p = reinterpret_cast<int**>(0xABCD);
>+ EXPECT_EQ(PrintPointer(p), Print(p));
>+ p = NULL;
>+ EXPECT_EQ("NULL", Print(p));
>+}
>+
>+// Tests printing (non-member) function pointers.
>+
>+void MyFunction(int /* n */) {}
>+
>+TEST(PrintPointerTest, NonMemberFunctionPointer) {
>+ // We cannot directly cast &MyFunction to const void* because the
>+ // standard disallows casting between pointers to functions and
>+ // pointers to objects, and some compilers (e.g. GCC 3.4) enforce
>+ // this limitation.
>+ EXPECT_EQ(
>+ PrintPointer(reinterpret_cast<const void*>(
>+ reinterpret_cast<internal::BiggestInt>(&MyFunction))),
>+ Print(&MyFunction));
>+ int (*p)(bool) = NULL; // NOLINT
>+ EXPECT_EQ("NULL", Print(p));
>+}
>+
>+// An assertion predicate determining whether a one string is a prefix for
>+// another.
>+template <typename StringType>
>+AssertionResult HasPrefix(const StringType& str, const StringType& prefix) {
>+ if (str.find(prefix, 0) == 0)
>+ return AssertionSuccess();
>+
>+ const bool is_wide_string = sizeof(prefix[0]) > 1;
>+ const char* const begin_string_quote = is_wide_string ? "L\"" : "\"";
>+ return AssertionFailure()
>+ << begin_string_quote << prefix << "\" is not a prefix of "
>+ << begin_string_quote << str << "\"\n";
>+}
>+
>+// Tests printing member variable pointers. Although they are called
>+// pointers, they don't point to a location in the address space.
>+// Their representation is implementation-defined. Thus they will be
>+// printed as raw bytes.
>+
>+struct Foo {
>+ public:
>+ virtual ~Foo() {}
>+ int MyMethod(char x) { return x + 1; }
>+ virtual char MyVirtualMethod(int /* n */) { return 'a'; }
>+
>+ int value;
>+};
>+
>+TEST(PrintPointerTest, MemberVariablePointer) {
>+ EXPECT_TRUE(HasPrefix(Print(&Foo::value),
>+ Print(sizeof(&Foo::value)) + "-byte object "));
>+ int Foo::*p = NULL; // NOLINT
>+ EXPECT_TRUE(HasPrefix(Print(p),
>+ Print(sizeof(p)) + "-byte object "));
>+}
>+
>+// Tests printing member function pointers. Although they are called
>+// pointers, they don't point to a location in the address space.
>+// Their representation is implementation-defined. Thus they will be
>+// printed as raw bytes.
>+TEST(PrintPointerTest, MemberFunctionPointer) {
>+ EXPECT_TRUE(HasPrefix(Print(&Foo::MyMethod),
>+ Print(sizeof(&Foo::MyMethod)) + "-byte object "));
>+ EXPECT_TRUE(
>+ HasPrefix(Print(&Foo::MyVirtualMethod),
>+ Print(sizeof((&Foo::MyVirtualMethod))) + "-byte object "));
>+ int (Foo::*p)(char) = NULL; // NOLINT
>+ EXPECT_TRUE(HasPrefix(Print(p),
>+ Print(sizeof(p)) + "-byte object "));
>+}
>+
>+// Tests printing C arrays.
>+
>+// The difference between this and Print() is that it ensures that the
>+// argument is a reference to an array.
>+template <typename T, size_t N>
>+std::string PrintArrayHelper(T (&a)[N]) {
>+ return Print(a);
>+}
>+
>+// One-dimensional array.
>+TEST(PrintArrayTest, OneDimensionalArray) {
>+ int a[5] = { 1, 2, 3, 4, 5 };
>+ EXPECT_EQ("{ 1, 2, 3, 4, 5 }", PrintArrayHelper(a));
>+}
>+
>+// Two-dimensional array.
>+TEST(PrintArrayTest, TwoDimensionalArray) {
>+ int a[2][5] = {
>+ { 1, 2, 3, 4, 5 },
>+ { 6, 7, 8, 9, 0 }
>+ };
>+ EXPECT_EQ("{ { 1, 2, 3, 4, 5 }, { 6, 7, 8, 9, 0 } }", PrintArrayHelper(a));
>+}
>+
>+// Array of const elements.
>+TEST(PrintArrayTest, ConstArray) {
>+ const bool a[1] = { false };
>+ EXPECT_EQ("{ false }", PrintArrayHelper(a));
>+}
>+
>+// char array without terminating NUL.
>+TEST(PrintArrayTest, CharArrayWithNoTerminatingNul) {
>+ // Array a contains '\0' in the middle and doesn't end with '\0'.
>+ char a[] = { 'H', '\0', 'i' };
>+ EXPECT_EQ("\"H\\0i\" (no terminating NUL)", PrintArrayHelper(a));
>+}
>+
>+// const char array with terminating NUL.
>+TEST(PrintArrayTest, ConstCharArrayWithTerminatingNul) {
>+ const char a[] = "\0Hi";
>+ EXPECT_EQ("\"\\0Hi\"", PrintArrayHelper(a));
>+}
>+
>+// const wchar_t array without terminating NUL.
>+TEST(PrintArrayTest, WCharArrayWithNoTerminatingNul) {
>+ // Array a contains '\0' in the middle and doesn't end with '\0'.
>+ const wchar_t a[] = { L'H', L'\0', L'i' };
>+ EXPECT_EQ("L\"H\\0i\" (no terminating NUL)", PrintArrayHelper(a));
>+}
>+
>+// wchar_t array with terminating NUL.
>+TEST(PrintArrayTest, WConstCharArrayWithTerminatingNul) {
>+ const wchar_t a[] = L"\0Hi";
>+ EXPECT_EQ("L\"\\0Hi\"", PrintArrayHelper(a));
>+}
>+
>+// Array of objects.
>+TEST(PrintArrayTest, ObjectArray) {
>+ std::string a[3] = {"Hi", "Hello", "Ni hao"};
>+ EXPECT_EQ("{ \"Hi\", \"Hello\", \"Ni hao\" }", PrintArrayHelper(a));
>+}
>+
>+// Array with many elements.
>+TEST(PrintArrayTest, BigArray) {
>+ int a[100] = { 1, 2, 3 };
>+ EXPECT_EQ("{ 1, 2, 3, 0, 0, 0, 0, 0, ..., 0, 0, 0, 0, 0, 0, 0, 0 }",
>+ PrintArrayHelper(a));
>+}
>+
>+// Tests printing ::string and ::std::string.
>+
>+#if GTEST_HAS_GLOBAL_STRING
>+// ::string.
>+TEST(PrintStringTest, StringInGlobalNamespace) {
>+ const char s[] = "'\"?\\\a\b\f\n\0\r\t\v\x7F\xFF a";
>+ const ::string str(s, sizeof(s));
>+ EXPECT_EQ("\"'\\\"?\\\\\\a\\b\\f\\n\\0\\r\\t\\v\\x7F\\xFF a\\0\"",
>+ Print(str));
>+}
>+#endif // GTEST_HAS_GLOBAL_STRING
>+
>+// ::std::string.
>+TEST(PrintStringTest, StringInStdNamespace) {
>+ const char s[] = "'\"?\\\a\b\f\n\0\r\t\v\x7F\xFF a";
>+ const ::std::string str(s, sizeof(s));
>+ EXPECT_EQ("\"'\\\"?\\\\\\a\\b\\f\\n\\0\\r\\t\\v\\x7F\\xFF a\\0\"",
>+ Print(str));
>+}
>+
>+TEST(PrintStringTest, StringAmbiguousHex) {
>+ // "\x6BANANA" is ambiguous, it can be interpreted as starting with either of:
>+ // '\x6', '\x6B', or '\x6BA'.
>+
>+ // a hex escaping sequence following by a decimal digit
>+ EXPECT_EQ("\"0\\x12\" \"3\"", Print(::std::string("0\x12" "3")));
>+ // a hex escaping sequence following by a hex digit (lower-case)
>+ EXPECT_EQ("\"mm\\x6\" \"bananas\"", Print(::std::string("mm\x6" "bananas")));
>+ // a hex escaping sequence following by a hex digit (upper-case)
>+ EXPECT_EQ("\"NOM\\x6\" \"BANANA\"", Print(::std::string("NOM\x6" "BANANA")));
>+ // a hex escaping sequence following by a non-xdigit
>+ EXPECT_EQ("\"!\\x5-!\"", Print(::std::string("!\x5-!")));
>+}
>+
>+// Tests printing ::wstring and ::std::wstring.
>+
>+#if GTEST_HAS_GLOBAL_WSTRING
>+// ::wstring.
>+TEST(PrintWideStringTest, StringInGlobalNamespace) {
>+ const wchar_t s[] = L"'\"?\\\a\b\f\n\0\r\t\v\xD3\x576\x8D3\xC74D a";
>+ const ::wstring str(s, sizeof(s)/sizeof(wchar_t));
>+ EXPECT_EQ("L\"'\\\"?\\\\\\a\\b\\f\\n\\0\\r\\t\\v"
>+ "\\xD3\\x576\\x8D3\\xC74D a\\0\"",
>+ Print(str));
>+}
>+#endif // GTEST_HAS_GLOBAL_WSTRING
>+
>+#if GTEST_HAS_STD_WSTRING
>+// ::std::wstring.
>+TEST(PrintWideStringTest, StringInStdNamespace) {
>+ const wchar_t s[] = L"'\"?\\\a\b\f\n\0\r\t\v\xD3\x576\x8D3\xC74D a";
>+ const ::std::wstring str(s, sizeof(s)/sizeof(wchar_t));
>+ EXPECT_EQ("L\"'\\\"?\\\\\\a\\b\\f\\n\\0\\r\\t\\v"
>+ "\\xD3\\x576\\x8D3\\xC74D a\\0\"",
>+ Print(str));
>+}
>+
>+TEST(PrintWideStringTest, StringAmbiguousHex) {
>+ // same for wide strings.
>+ EXPECT_EQ("L\"0\\x12\" L\"3\"", Print(::std::wstring(L"0\x12" L"3")));
>+ EXPECT_EQ("L\"mm\\x6\" L\"bananas\"",
>+ Print(::std::wstring(L"mm\x6" L"bananas")));
>+ EXPECT_EQ("L\"NOM\\x6\" L\"BANANA\"",
>+ Print(::std::wstring(L"NOM\x6" L"BANANA")));
>+ EXPECT_EQ("L\"!\\x5-!\"", Print(::std::wstring(L"!\x5-!")));
>+}
>+#endif // GTEST_HAS_STD_WSTRING
>+
>+// Tests printing types that support generic streaming (i.e. streaming
>+// to std::basic_ostream<Char, CharTraits> for any valid Char and
>+// CharTraits types).
>+
>+// Tests printing a non-template type that supports generic streaming.
>+
>+class AllowsGenericStreaming {};
>+
>+template <typename Char, typename CharTraits>
>+std::basic_ostream<Char, CharTraits>& operator<<(
>+ std::basic_ostream<Char, CharTraits>& os,
>+ const AllowsGenericStreaming& /* a */) {
>+ return os << "AllowsGenericStreaming";
>+}
>+
>+TEST(PrintTypeWithGenericStreamingTest, NonTemplateType) {
>+ AllowsGenericStreaming a;
>+ EXPECT_EQ("AllowsGenericStreaming", Print(a));
>+}
>+
>+// Tests printing a template type that supports generic streaming.
>+
>+template <typename T>
>+class AllowsGenericStreamingTemplate {};
>+
>+template <typename Char, typename CharTraits, typename T>
>+std::basic_ostream<Char, CharTraits>& operator<<(
>+ std::basic_ostream<Char, CharTraits>& os,
>+ const AllowsGenericStreamingTemplate<T>& /* a */) {
>+ return os << "AllowsGenericStreamingTemplate";
>+}
>+
>+TEST(PrintTypeWithGenericStreamingTest, TemplateType) {
>+ AllowsGenericStreamingTemplate<int> a;
>+ EXPECT_EQ("AllowsGenericStreamingTemplate", Print(a));
>+}
>+
>+// Tests printing a type that supports generic streaming and can be
>+// implicitly converted to another printable type.
>+
>+template <typename T>
>+class AllowsGenericStreamingAndImplicitConversionTemplate {
>+ public:
>+ operator bool() const { return false; }
>+};
>+
>+template <typename Char, typename CharTraits, typename T>
>+std::basic_ostream<Char, CharTraits>& operator<<(
>+ std::basic_ostream<Char, CharTraits>& os,
>+ const AllowsGenericStreamingAndImplicitConversionTemplate<T>& /* a */) {
>+ return os << "AllowsGenericStreamingAndImplicitConversionTemplate";
>+}
>+
>+TEST(PrintTypeWithGenericStreamingTest, TypeImplicitlyConvertible) {
>+ AllowsGenericStreamingAndImplicitConversionTemplate<int> a;
>+ EXPECT_EQ("AllowsGenericStreamingAndImplicitConversionTemplate", Print(a));
>+}
>+
>+#if GTEST_HAS_ABSL
>+
>+// Tests printing ::absl::string_view.
>+
>+TEST(PrintStringViewTest, SimpleStringView) {
>+ const ::absl::string_view sp = "Hello";
>+ EXPECT_EQ("\"Hello\"", Print(sp));
>+}
>+
>+TEST(PrintStringViewTest, UnprintableCharacters) {
>+ const char str[] = "NUL (\0) and \r\t";
>+ const ::absl::string_view sp(str, sizeof(str) - 1);
>+ EXPECT_EQ("\"NUL (\\0) and \\r\\t\"", Print(sp));
>+}
>+
>+#endif // GTEST_HAS_ABSL
>+
>+// Tests printing STL containers.
>+
>+TEST(PrintStlContainerTest, EmptyDeque) {
>+ deque<char> empty;
>+ EXPECT_EQ("{}", Print(empty));
>+}
>+
>+TEST(PrintStlContainerTest, NonEmptyDeque) {
>+ deque<int> non_empty;
>+ non_empty.push_back(1);
>+ non_empty.push_back(3);
>+ EXPECT_EQ("{ 1, 3 }", Print(non_empty));
>+}
>+
>+#if GTEST_HAS_UNORDERED_MAP_
>+
>+TEST(PrintStlContainerTest, OneElementHashMap) {
>+ ::std::unordered_map<int, char> map1;
>+ map1[1] = 'a';
>+ EXPECT_EQ("{ (1, 'a' (97, 0x61)) }", Print(map1));
>+}
>+
>+TEST(PrintStlContainerTest, HashMultiMap) {
>+ ::std::unordered_multimap<int, bool> map1;
>+ map1.insert(make_pair(5, true));
>+ map1.insert(make_pair(5, false));
>+
>+ // Elements of hash_multimap can be printed in any order.
>+ const std::string result = Print(map1);
>+ EXPECT_TRUE(result == "{ (5, true), (5, false) }" ||
>+ result == "{ (5, false), (5, true) }")
>+ << " where Print(map1) returns \"" << result << "\".";
>+}
>+
>+#endif // GTEST_HAS_UNORDERED_MAP_
>+
>+#if GTEST_HAS_UNORDERED_SET_
>+
>+TEST(PrintStlContainerTest, HashSet) {
>+ ::std::unordered_set<int> set1;
>+ set1.insert(1);
>+ EXPECT_EQ("{ 1 }", Print(set1));
>+}
>+
>+TEST(PrintStlContainerTest, HashMultiSet) {
>+ const int kSize = 5;
>+ int a[kSize] = { 1, 1, 2, 5, 1 };
>+ ::std::unordered_multiset<int> set1(a, a + kSize);
>+
>+ // Elements of hash_multiset can be printed in any order.
>+ const std::string result = Print(set1);
>+ const std::string expected_pattern = "{ d, d, d, d, d }"; // d means a digit.
>+
>+ // Verifies the result matches the expected pattern; also extracts
>+ // the numbers in the result.
>+ ASSERT_EQ(expected_pattern.length(), result.length());
>+ std::vector<int> numbers;
>+ for (size_t i = 0; i != result.length(); i++) {
>+ if (expected_pattern[i] == 'd') {
>+ ASSERT_NE(isdigit(static_cast<unsigned char>(result[i])), 0);
>+ numbers.push_back(result[i] - '0');
>+ } else {
>+ EXPECT_EQ(expected_pattern[i], result[i]) << " where result is "
>+ << result;
>+ }
>+ }
>+
>+ // Makes sure the result contains the right numbers.
>+ std::sort(numbers.begin(), numbers.end());
>+ std::sort(a, a + kSize);
>+ EXPECT_TRUE(std::equal(a, a + kSize, numbers.begin()));
>+}
>+
>+#endif // GTEST_HAS_UNORDERED_SET_
>+
>+TEST(PrintStlContainerTest, List) {
>+ const std::string a[] = {"hello", "world"};
>+ const list<std::string> strings(a, a + 2);
>+ EXPECT_EQ("{ \"hello\", \"world\" }", Print(strings));
>+}
>+
>+TEST(PrintStlContainerTest, Map) {
>+ map<int, bool> map1;
>+ map1[1] = true;
>+ map1[5] = false;
>+ map1[3] = true;
>+ EXPECT_EQ("{ (1, true), (3, true), (5, false) }", Print(map1));
>+}
>+
>+TEST(PrintStlContainerTest, MultiMap) {
>+ multimap<bool, int> map1;
>+ // The make_pair template function would deduce the type as
>+ // pair<bool, int> here, and since the key part in a multimap has to
>+ // be constant, without a templated ctor in the pair class (as in
>+ // libCstd on Solaris), make_pair call would fail to compile as no
>+ // implicit conversion is found. Thus explicit typename is used
>+ // here instead.
>+ map1.insert(pair<const bool, int>(true, 0));
>+ map1.insert(pair<const bool, int>(true, 1));
>+ map1.insert(pair<const bool, int>(false, 2));
>+ EXPECT_EQ("{ (false, 2), (true, 0), (true, 1) }", Print(map1));
>+}
>+
>+TEST(PrintStlContainerTest, Set) {
>+ const unsigned int a[] = { 3, 0, 5 };
>+ set<unsigned int> set1(a, a + 3);
>+ EXPECT_EQ("{ 0, 3, 5 }", Print(set1));
>+}
>+
>+TEST(PrintStlContainerTest, MultiSet) {
>+ const int a[] = { 1, 1, 2, 5, 1 };
>+ multiset<int> set1(a, a + 5);
>+ EXPECT_EQ("{ 1, 1, 1, 2, 5 }", Print(set1));
>+}
>+
>+#if GTEST_HAS_STD_FORWARD_LIST_
>+
>+TEST(PrintStlContainerTest, SinglyLinkedList) {
>+ int a[] = { 9, 2, 8 };
>+ const std::forward_list<int> ints(a, a + 3);
>+ EXPECT_EQ("{ 9, 2, 8 }", Print(ints));
>+}
>+#endif // GTEST_HAS_STD_FORWARD_LIST_
>+
>+TEST(PrintStlContainerTest, Pair) {
>+ pair<const bool, int> p(true, 5);
>+ EXPECT_EQ("(true, 5)", Print(p));
>+}
>+
>+TEST(PrintStlContainerTest, Vector) {
>+ vector<int> v;
>+ v.push_back(1);
>+ v.push_back(2);
>+ EXPECT_EQ("{ 1, 2 }", Print(v));
>+}
>+
>+TEST(PrintStlContainerTest, LongSequence) {
>+ const int a[100] = { 1, 2, 3 };
>+ const vector<int> v(a, a + 100);
>+ EXPECT_EQ("{ 1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "
>+ "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ... }", Print(v));
>+}
>+
>+TEST(PrintStlContainerTest, NestedContainer) {
>+ const int a1[] = { 1, 2 };
>+ const int a2[] = { 3, 4, 5 };
>+ const list<int> l1(a1, a1 + 2);
>+ const list<int> l2(a2, a2 + 3);
>+
>+ vector<list<int> > v;
>+ v.push_back(l1);
>+ v.push_back(l2);
>+ EXPECT_EQ("{ { 1, 2 }, { 3, 4, 5 } }", Print(v));
>+}
>+
>+TEST(PrintStlContainerTest, OneDimensionalNativeArray) {
>+ const int a[3] = { 1, 2, 3 };
>+ NativeArray<int> b(a, 3, RelationToSourceReference());
>+ EXPECT_EQ("{ 1, 2, 3 }", Print(b));
>+}
>+
>+TEST(PrintStlContainerTest, TwoDimensionalNativeArray) {
>+ const int a[2][3] = { { 1, 2, 3 }, { 4, 5, 6 } };
>+ NativeArray<int[3]> b(a, 2, RelationToSourceReference());
>+ EXPECT_EQ("{ { 1, 2, 3 }, { 4, 5, 6 } }", Print(b));
>+}
>+
>+// Tests that a class named iterator isn't treated as a container.
>+
>+struct iterator {
>+ char x;
>+};
>+
>+TEST(PrintStlContainerTest, Iterator) {
>+ iterator it = {};
>+ EXPECT_EQ("1-byte object <00>", Print(it));
>+}
>+
>+// Tests that a class named const_iterator isn't treated as a container.
>+
>+struct const_iterator {
>+ char x;
>+};
>+
>+TEST(PrintStlContainerTest, ConstIterator) {
>+ const_iterator it = {};
>+ EXPECT_EQ("1-byte object <00>", Print(it));
>+}
>+
>+#if GTEST_HAS_TR1_TUPLE
>+// Tests printing ::std::tr1::tuples.
>+
>+// Tuples of various arities.
>+TEST(PrintTr1TupleTest, VariousSizes) {
>+ ::std::tr1::tuple<> t0;
>+ EXPECT_EQ("()", Print(t0));
>+
>+ ::std::tr1::tuple<int> t1(5);
>+ EXPECT_EQ("(5)", Print(t1));
>+
>+ ::std::tr1::tuple<char, bool> t2('a', true);
>+ EXPECT_EQ("('a' (97, 0x61), true)", Print(t2));
>+
>+ ::std::tr1::tuple<bool, int, int> t3(false, 2, 3);
>+ EXPECT_EQ("(false, 2, 3)", Print(t3));
>+
>+ ::std::tr1::tuple<bool, int, int, int> t4(false, 2, 3, 4);
>+ EXPECT_EQ("(false, 2, 3, 4)", Print(t4));
>+
>+ ::std::tr1::tuple<bool, int, int, int, bool> t5(false, 2, 3, 4, true);
>+ EXPECT_EQ("(false, 2, 3, 4, true)", Print(t5));
>+
>+ ::std::tr1::tuple<bool, int, int, int, bool, int> t6(false, 2, 3, 4, true, 6);
>+ EXPECT_EQ("(false, 2, 3, 4, true, 6)", Print(t6));
>+
>+ ::std::tr1::tuple<bool, int, int, int, bool, int, int> t7(
>+ false, 2, 3, 4, true, 6, 7);
>+ EXPECT_EQ("(false, 2, 3, 4, true, 6, 7)", Print(t7));
>+
>+ ::std::tr1::tuple<bool, int, int, int, bool, int, int, bool> t8(
>+ false, 2, 3, 4, true, 6, 7, true);
>+ EXPECT_EQ("(false, 2, 3, 4, true, 6, 7, true)", Print(t8));
>+
>+ ::std::tr1::tuple<bool, int, int, int, bool, int, int, bool, int> t9(
>+ false, 2, 3, 4, true, 6, 7, true, 9);
>+ EXPECT_EQ("(false, 2, 3, 4, true, 6, 7, true, 9)", Print(t9));
>+
>+ const char* const str = "8";
>+ // VC++ 2010's implementation of tuple of C++0x is deficient, requiring
>+ // an explicit type cast of NULL to be used.
>+ ::std::tr1::tuple<bool, char, short, testing::internal::Int32, // NOLINT
>+ testing::internal::Int64, float, double, const char*, void*,
>+ std::string>
>+ t10(false, 'a', static_cast<short>(3), 4, 5, 1.5F, -2.5, str, // NOLINT
>+ ImplicitCast_<void*>(NULL), "10");
>+ EXPECT_EQ("(false, 'a' (97, 0x61), 3, 4, 5, 1.5, -2.5, " + PrintPointer(str) +
>+ " pointing to \"8\", NULL, \"10\")",
>+ Print(t10));
>+}
>+
>+// Nested tuples.
>+TEST(PrintTr1TupleTest, NestedTuple) {
>+ ::std::tr1::tuple< ::std::tr1::tuple<int, bool>, char> nested(
>+ ::std::tr1::make_tuple(5, true), 'a');
>+ EXPECT_EQ("((5, true), 'a' (97, 0x61))", Print(nested));
>+}
>+
>+#endif // GTEST_HAS_TR1_TUPLE
>+
>+#if GTEST_HAS_STD_TUPLE_
>+// Tests printing ::std::tuples.
>+
>+// Tuples of various arities.
>+TEST(PrintStdTupleTest, VariousSizes) {
>+ ::std::tuple<> t0;
>+ EXPECT_EQ("()", Print(t0));
>+
>+ ::std::tuple<int> t1(5);
>+ EXPECT_EQ("(5)", Print(t1));
>+
>+ ::std::tuple<char, bool> t2('a', true);
>+ EXPECT_EQ("('a' (97, 0x61), true)", Print(t2));
>+
>+ ::std::tuple<bool, int, int> t3(false, 2, 3);
>+ EXPECT_EQ("(false, 2, 3)", Print(t3));
>+
>+ ::std::tuple<bool, int, int, int> t4(false, 2, 3, 4);
>+ EXPECT_EQ("(false, 2, 3, 4)", Print(t4));
>+
>+ ::std::tuple<bool, int, int, int, bool> t5(false, 2, 3, 4, true);
>+ EXPECT_EQ("(false, 2, 3, 4, true)", Print(t5));
>+
>+ ::std::tuple<bool, int, int, int, bool, int> t6(false, 2, 3, 4, true, 6);
>+ EXPECT_EQ("(false, 2, 3, 4, true, 6)", Print(t6));
>+
>+ ::std::tuple<bool, int, int, int, bool, int, int> t7(
>+ false, 2, 3, 4, true, 6, 7);
>+ EXPECT_EQ("(false, 2, 3, 4, true, 6, 7)", Print(t7));
>+
>+ ::std::tuple<bool, int, int, int, bool, int, int, bool> t8(
>+ false, 2, 3, 4, true, 6, 7, true);
>+ EXPECT_EQ("(false, 2, 3, 4, true, 6, 7, true)", Print(t8));
>+
>+ ::std::tuple<bool, int, int, int, bool, int, int, bool, int> t9(
>+ false, 2, 3, 4, true, 6, 7, true, 9);
>+ EXPECT_EQ("(false, 2, 3, 4, true, 6, 7, true, 9)", Print(t9));
>+
>+ const char* const str = "8";
>+ // VC++ 2010's implementation of tuple of C++0x is deficient, requiring
>+ // an explicit type cast of NULL to be used.
>+ ::std::tuple<bool, char, short, testing::internal::Int32, // NOLINT
>+ testing::internal::Int64, float, double, const char*, void*,
>+ std::string>
>+ t10(false, 'a', static_cast<short>(3), 4, 5, 1.5F, -2.5, str, // NOLINT
>+ ImplicitCast_<void*>(NULL), "10");
>+ EXPECT_EQ("(false, 'a' (97, 0x61), 3, 4, 5, 1.5, -2.5, " + PrintPointer(str) +
>+ " pointing to \"8\", NULL, \"10\")",
>+ Print(t10));
>+}
>+
>+// Nested tuples.
>+TEST(PrintStdTupleTest, NestedTuple) {
>+ ::std::tuple< ::std::tuple<int, bool>, char> nested(
>+ ::std::make_tuple(5, true), 'a');
>+ EXPECT_EQ("((5, true), 'a' (97, 0x61))", Print(nested));
>+}
>+
>+#endif // GTEST_LANG_CXX11
>+
>+#if GTEST_LANG_CXX11
>+TEST(PrintNullptrT, Basic) {
>+ EXPECT_EQ("(nullptr)", Print(nullptr));
>+}
>+#endif // GTEST_LANG_CXX11
>+
>+// Tests printing user-defined unprintable types.
>+
>+// Unprintable types in the global namespace.
>+TEST(PrintUnprintableTypeTest, InGlobalNamespace) {
>+ EXPECT_EQ("1-byte object <00>",
>+ Print(UnprintableTemplateInGlobal<char>()));
>+}
>+
>+// Unprintable types in a user namespace.
>+TEST(PrintUnprintableTypeTest, InUserNamespace) {
>+ EXPECT_EQ("16-byte object <EF-12 00-00 34-AB 00-00 00-00 00-00 00-00 00-00>",
>+ Print(::foo::UnprintableInFoo()));
>+}
>+
>+// Unprintable types are that too big to be printed completely.
>+
>+struct Big {
>+ Big() { memset(array, 0, sizeof(array)); }
>+ char array[257];
>+};
>+
>+TEST(PrintUnpritableTypeTest, BigObject) {
>+ EXPECT_EQ("257-byte object <00-00 00-00 00-00 00-00 00-00 00-00 "
>+ "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 "
>+ "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 "
>+ "00-00 00-00 00-00 00-00 00-00 00-00 ... 00-00 00-00 00-00 "
>+ "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 "
>+ "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 "
>+ "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00>",
>+ Print(Big()));
>+}
>+
>+// Tests printing user-defined streamable types.
>+
>+// Streamable types in the global namespace.
>+TEST(PrintStreamableTypeTest, InGlobalNamespace) {
>+ StreamableInGlobal x;
>+ EXPECT_EQ("StreamableInGlobal", Print(x));
>+ EXPECT_EQ("StreamableInGlobal*", Print(&x));
>+}
>+
>+// Printable template types in a user namespace.
>+TEST(PrintStreamableTypeTest, TemplateTypeInUserNamespace) {
>+ EXPECT_EQ("StreamableTemplateInFoo: 0",
>+ Print(::foo::StreamableTemplateInFoo<int>()));
>+}
>+
>+// Tests printing a user-defined recursive container type that has a <<
>+// operator.
>+TEST(PrintStreamableTypeTest, PathLikeInUserNamespace) {
>+ ::foo::PathLike x;
>+ EXPECT_EQ("Streamable-PathLike", Print(x));
>+ const ::foo::PathLike cx;
>+ EXPECT_EQ("Streamable-PathLike", Print(cx));
>+}
>+
>+// Tests printing user-defined types that have a PrintTo() function.
>+TEST(PrintPrintableTypeTest, InUserNamespace) {
>+ EXPECT_EQ("PrintableViaPrintTo: 0",
>+ Print(::foo::PrintableViaPrintTo()));
>+}
>+
>+// Tests printing a pointer to a user-defined type that has a <<
>+// operator for its pointer.
>+TEST(PrintPrintableTypeTest, PointerInUserNamespace) {
>+ ::foo::PointerPrintable x;
>+ EXPECT_EQ("PointerPrintable*", Print(&x));
>+}
>+
>+// Tests printing user-defined class template that have a PrintTo() function.
>+TEST(PrintPrintableTypeTest, TemplateInUserNamespace) {
>+ EXPECT_EQ("PrintableViaPrintToTemplate: 5",
>+ Print(::foo::PrintableViaPrintToTemplate<int>(5)));
>+}
>+
>+// Tests that the universal printer prints both the address and the
>+// value of a reference.
>+TEST(PrintReferenceTest, PrintsAddressAndValue) {
>+ int n = 5;
>+ EXPECT_EQ("@" + PrintPointer(&n) + " 5", PrintByRef(n));
>+
>+ int a[2][3] = {
>+ { 0, 1, 2 },
>+ { 3, 4, 5 }
>+ };
>+ EXPECT_EQ("@" + PrintPointer(a) + " { { 0, 1, 2 }, { 3, 4, 5 } }",
>+ PrintByRef(a));
>+
>+ const ::foo::UnprintableInFoo x;
>+ EXPECT_EQ("@" + PrintPointer(&x) + " 16-byte object "
>+ "<EF-12 00-00 34-AB 00-00 00-00 00-00 00-00 00-00>",
>+ PrintByRef(x));
>+}
>+
>+// Tests that the universal printer prints a function pointer passed by
>+// reference.
>+TEST(PrintReferenceTest, HandlesFunctionPointer) {
>+ void (*fp)(int n) = &MyFunction;
>+ const std::string fp_pointer_string =
>+ PrintPointer(reinterpret_cast<const void*>(&fp));
>+ // We cannot directly cast &MyFunction to const void* because the
>+ // standard disallows casting between pointers to functions and
>+ // pointers to objects, and some compilers (e.g. GCC 3.4) enforce
>+ // this limitation.
>+ const std::string fp_string = PrintPointer(reinterpret_cast<const void*>(
>+ reinterpret_cast<internal::BiggestInt>(fp)));
>+ EXPECT_EQ("@" + fp_pointer_string + " " + fp_string,
>+ PrintByRef(fp));
>+}
>+
>+// Tests that the universal printer prints a member function pointer
>+// passed by reference.
>+TEST(PrintReferenceTest, HandlesMemberFunctionPointer) {
>+ int (Foo::*p)(char ch) = &Foo::MyMethod;
>+ EXPECT_TRUE(HasPrefix(
>+ PrintByRef(p),
>+ "@" + PrintPointer(reinterpret_cast<const void*>(&p)) + " " +
>+ Print(sizeof(p)) + "-byte object "));
>+
>+ char (Foo::*p2)(int n) = &Foo::MyVirtualMethod;
>+ EXPECT_TRUE(HasPrefix(
>+ PrintByRef(p2),
>+ "@" + PrintPointer(reinterpret_cast<const void*>(&p2)) + " " +
>+ Print(sizeof(p2)) + "-byte object "));
>+}
>+
>+// Tests that the universal printer prints a member variable pointer
>+// passed by reference.
>+TEST(PrintReferenceTest, HandlesMemberVariablePointer) {
>+ int Foo::*p = &Foo::value; // NOLINT
>+ EXPECT_TRUE(HasPrefix(
>+ PrintByRef(p),
>+ "@" + PrintPointer(&p) + " " + Print(sizeof(p)) + "-byte object "));
>+}
>+
>+// Tests that FormatForComparisonFailureMessage(), which is used to print
>+// an operand in a comparison assertion (e.g. ASSERT_EQ) when the assertion
>+// fails, formats the operand in the desired way.
>+
>+// scalar
>+TEST(FormatForComparisonFailureMessageTest, WorksForScalar) {
>+ EXPECT_STREQ("123",
>+ FormatForComparisonFailureMessage(123, 124).c_str());
>+}
>+
>+// non-char pointer
>+TEST(FormatForComparisonFailureMessageTest, WorksForNonCharPointer) {
>+ int n = 0;
>+ EXPECT_EQ(PrintPointer(&n),
>+ FormatForComparisonFailureMessage(&n, &n).c_str());
>+}
>+
>+// non-char array
>+TEST(FormatForComparisonFailureMessageTest, FormatsNonCharArrayAsPointer) {
>+ // In expression 'array == x', 'array' is compared by pointer.
>+ // Therefore we want to print an array operand as a pointer.
>+ int n[] = { 1, 2, 3 };
>+ EXPECT_EQ(PrintPointer(n),
>+ FormatForComparisonFailureMessage(n, n).c_str());
>+}
>+
>+// Tests formatting a char pointer when it's compared with another pointer.
>+// In this case we want to print it as a raw pointer, as the comparison is by
>+// pointer.
>+
>+// char pointer vs pointer
>+TEST(FormatForComparisonFailureMessageTest, WorksForCharPointerVsPointer) {
>+ // In expression 'p == x', where 'p' and 'x' are (const or not) char
>+ // pointers, the operands are compared by pointer. Therefore we
>+ // want to print 'p' as a pointer instead of a C string (we don't
>+ // even know if it's supposed to point to a valid C string).
>+
>+ // const char*
>+ const char* s = "hello";
>+ EXPECT_EQ(PrintPointer(s),
>+ FormatForComparisonFailureMessage(s, s).c_str());
>+
>+ // char*
>+ char ch = 'a';
>+ EXPECT_EQ(PrintPointer(&ch),
>+ FormatForComparisonFailureMessage(&ch, &ch).c_str());
>+}
>+
>+// wchar_t pointer vs pointer
>+TEST(FormatForComparisonFailureMessageTest, WorksForWCharPointerVsPointer) {
>+ // In expression 'p == x', where 'p' and 'x' are (const or not) char
>+ // pointers, the operands are compared by pointer. Therefore we
>+ // want to print 'p' as a pointer instead of a wide C string (we don't
>+ // even know if it's supposed to point to a valid wide C string).
>+
>+ // const wchar_t*
>+ const wchar_t* s = L"hello";
>+ EXPECT_EQ(PrintPointer(s),
>+ FormatForComparisonFailureMessage(s, s).c_str());
>+
>+ // wchar_t*
>+ wchar_t ch = L'a';
>+ EXPECT_EQ(PrintPointer(&ch),
>+ FormatForComparisonFailureMessage(&ch, &ch).c_str());
>+}
>+
>+// Tests formatting a char pointer when it's compared to a string object.
>+// In this case we want to print the char pointer as a C string.
>+
>+#if GTEST_HAS_GLOBAL_STRING
>+// char pointer vs ::string
>+TEST(FormatForComparisonFailureMessageTest, WorksForCharPointerVsString) {
>+ const char* s = "hello \"world";
>+ EXPECT_STREQ("\"hello \\\"world\"", // The string content should be escaped.
>+ FormatForComparisonFailureMessage(s, ::string()).c_str());
>+
>+ // char*
>+ char str[] = "hi\1";
>+ char* p = str;
>+ EXPECT_STREQ("\"hi\\x1\"", // The string content should be escaped.
>+ FormatForComparisonFailureMessage(p, ::string()).c_str());
>+}
>+#endif
>+
>+// char pointer vs std::string
>+TEST(FormatForComparisonFailureMessageTest, WorksForCharPointerVsStdString) {
>+ const char* s = "hello \"world";
>+ EXPECT_STREQ("\"hello \\\"world\"", // The string content should be escaped.
>+ FormatForComparisonFailureMessage(s, ::std::string()).c_str());
>+
>+ // char*
>+ char str[] = "hi\1";
>+ char* p = str;
>+ EXPECT_STREQ("\"hi\\x1\"", // The string content should be escaped.
>+ FormatForComparisonFailureMessage(p, ::std::string()).c_str());
>+}
>+
>+#if GTEST_HAS_GLOBAL_WSTRING
>+// wchar_t pointer vs ::wstring
>+TEST(FormatForComparisonFailureMessageTest, WorksForWCharPointerVsWString) {
>+ const wchar_t* s = L"hi \"world";
>+ EXPECT_STREQ("L\"hi \\\"world\"", // The string content should be escaped.
>+ FormatForComparisonFailureMessage(s, ::wstring()).c_str());
>+
>+ // wchar_t*
>+ wchar_t str[] = L"hi\1";
>+ wchar_t* p = str;
>+ EXPECT_STREQ("L\"hi\\x1\"", // The string content should be escaped.
>+ FormatForComparisonFailureMessage(p, ::wstring()).c_str());
>+}
>+#endif
>+
>+#if GTEST_HAS_STD_WSTRING
>+// wchar_t pointer vs std::wstring
>+TEST(FormatForComparisonFailureMessageTest, WorksForWCharPointerVsStdWString) {
>+ const wchar_t* s = L"hi \"world";
>+ EXPECT_STREQ("L\"hi \\\"world\"", // The string content should be escaped.
>+ FormatForComparisonFailureMessage(s, ::std::wstring()).c_str());
>+
>+ // wchar_t*
>+ wchar_t str[] = L"hi\1";
>+ wchar_t* p = str;
>+ EXPECT_STREQ("L\"hi\\x1\"", // The string content should be escaped.
>+ FormatForComparisonFailureMessage(p, ::std::wstring()).c_str());
>+}
>+#endif
>+
>+// Tests formatting a char array when it's compared with a pointer or array.
>+// In this case we want to print the array as a row pointer, as the comparison
>+// is by pointer.
>+
>+// char array vs pointer
>+TEST(FormatForComparisonFailureMessageTest, WorksForCharArrayVsPointer) {
>+ char str[] = "hi \"world\"";
>+ char* p = NULL;
>+ EXPECT_EQ(PrintPointer(str),
>+ FormatForComparisonFailureMessage(str, p).c_str());
>+}
>+
>+// char array vs char array
>+TEST(FormatForComparisonFailureMessageTest, WorksForCharArrayVsCharArray) {
>+ const char str[] = "hi \"world\"";
>+ EXPECT_EQ(PrintPointer(str),
>+ FormatForComparisonFailureMessage(str, str).c_str());
>+}
>+
>+// wchar_t array vs pointer
>+TEST(FormatForComparisonFailureMessageTest, WorksForWCharArrayVsPointer) {
>+ wchar_t str[] = L"hi \"world\"";
>+ wchar_t* p = NULL;
>+ EXPECT_EQ(PrintPointer(str),
>+ FormatForComparisonFailureMessage(str, p).c_str());
>+}
>+
>+// wchar_t array vs wchar_t array
>+TEST(FormatForComparisonFailureMessageTest, WorksForWCharArrayVsWCharArray) {
>+ const wchar_t str[] = L"hi \"world\"";
>+ EXPECT_EQ(PrintPointer(str),
>+ FormatForComparisonFailureMessage(str, str).c_str());
>+}
>+
>+// Tests formatting a char array when it's compared with a string object.
>+// In this case we want to print the array as a C string.
>+
>+#if GTEST_HAS_GLOBAL_STRING
>+// char array vs string
>+TEST(FormatForComparisonFailureMessageTest, WorksForCharArrayVsString) {
>+ const char str[] = "hi \"w\0rld\"";
>+ EXPECT_STREQ("\"hi \\\"w\"", // The content should be escaped.
>+ // Embedded NUL terminates the string.
>+ FormatForComparisonFailureMessage(str, ::string()).c_str());
>+}
>+#endif
>+
>+// char array vs std::string
>+TEST(FormatForComparisonFailureMessageTest, WorksForCharArrayVsStdString) {
>+ const char str[] = "hi \"world\"";
>+ EXPECT_STREQ("\"hi \\\"world\\\"\"", // The content should be escaped.
>+ FormatForComparisonFailureMessage(str, ::std::string()).c_str());
>+}
>+
>+#if GTEST_HAS_GLOBAL_WSTRING
>+// wchar_t array vs wstring
>+TEST(FormatForComparisonFailureMessageTest, WorksForWCharArrayVsWString) {
>+ const wchar_t str[] = L"hi \"world\"";
>+ EXPECT_STREQ("L\"hi \\\"world\\\"\"", // The content should be escaped.
>+ FormatForComparisonFailureMessage(str, ::wstring()).c_str());
>+}
>+#endif
>+
>+#if GTEST_HAS_STD_WSTRING
>+// wchar_t array vs std::wstring
>+TEST(FormatForComparisonFailureMessageTest, WorksForWCharArrayVsStdWString) {
>+ const wchar_t str[] = L"hi \"w\0rld\"";
>+ EXPECT_STREQ(
>+ "L\"hi \\\"w\"", // The content should be escaped.
>+ // Embedded NUL terminates the string.
>+ FormatForComparisonFailureMessage(str, ::std::wstring()).c_str());
>+}
>+#endif
>+
>+// Useful for testing PrintToString(). We cannot use EXPECT_EQ()
>+// there as its implementation uses PrintToString(). The caller must
>+// ensure that 'value' has no side effect.
>+#define EXPECT_PRINT_TO_STRING_(value, expected_string) \
>+ EXPECT_TRUE(PrintToString(value) == (expected_string)) \
>+ << " where " #value " prints as " << (PrintToString(value))
>+
>+TEST(PrintToStringTest, WorksForScalar) {
>+ EXPECT_PRINT_TO_STRING_(123, "123");
>+}
>+
>+TEST(PrintToStringTest, WorksForPointerToConstChar) {
>+ const char* p = "hello";
>+ EXPECT_PRINT_TO_STRING_(p, "\"hello\"");
>+}
>+
>+TEST(PrintToStringTest, WorksForPointerToNonConstChar) {
>+ char s[] = "hello";
>+ char* p = s;
>+ EXPECT_PRINT_TO_STRING_(p, "\"hello\"");
>+}
>+
>+TEST(PrintToStringTest, EscapesForPointerToConstChar) {
>+ const char* p = "hello\n";
>+ EXPECT_PRINT_TO_STRING_(p, "\"hello\\n\"");
>+}
>+
>+TEST(PrintToStringTest, EscapesForPointerToNonConstChar) {
>+ char s[] = "hello\1";
>+ char* p = s;
>+ EXPECT_PRINT_TO_STRING_(p, "\"hello\\x1\"");
>+}
>+
>+TEST(PrintToStringTest, WorksForArray) {
>+ int n[3] = { 1, 2, 3 };
>+ EXPECT_PRINT_TO_STRING_(n, "{ 1, 2, 3 }");
>+}
>+
>+TEST(PrintToStringTest, WorksForCharArray) {
>+ char s[] = "hello";
>+ EXPECT_PRINT_TO_STRING_(s, "\"hello\"");
>+}
>+
>+TEST(PrintToStringTest, WorksForCharArrayWithEmbeddedNul) {
>+ const char str_with_nul[] = "hello\0 world";
>+ EXPECT_PRINT_TO_STRING_(str_with_nul, "\"hello\\0 world\"");
>+
>+ char mutable_str_with_nul[] = "hello\0 world";
>+ EXPECT_PRINT_TO_STRING_(mutable_str_with_nul, "\"hello\\0 world\"");
>+}
>+
>+ TEST(PrintToStringTest, ContainsNonLatin) {
>+ // Sanity test with valid UTF-8. Prints both in hex and as text.
>+ std::string non_ascii_str = ::std::string("ì¤ì  4:30");
>+ EXPECT_PRINT_TO_STRING_(non_ascii_str,
>+ "\"\\xEC\\x98\\xA4\\xEC\\xA0\\x84 4:30\"\n"
>+ " As Text: \"ì¤ì  4:30\"");
>+ non_ascii_str = ::std::string("From Ã¤ â áº");
>+ EXPECT_PRINT_TO_STRING_(non_ascii_str,
>+ "\"From \\xC3\\xA4 \\xE2\\x80\\x94 \\xE1\\xBA\\x91\""
>+ "\n As Text: \"From Ã¤ â áº\"");
>+}
>+
>+TEST(IsValidUTF8Test, IllFormedUTF8) {
>+ // The following test strings are ill-formed UTF-8 and are printed
>+ // as hex only (or ASCII, in case of ASCII bytes) because IsValidUTF8() is
>+ // expected to fail, thus output does not contain "As Text:".
>+
>+ static const char *const kTestdata[][2] = {
>+ // 2-byte lead byte followed by a single-byte character.
>+ {"\xC3\x74", "\"\\xC3t\""},
>+ // Valid 2-byte character followed by an orphan trail byte.
>+ {"\xC3\x84\xA4", "\"\\xC3\\x84\\xA4\""},
>+ // Lead byte without trail byte.
>+ {"abc\xC3", "\"abc\\xC3\""},
>+ // 3-byte lead byte, single-byte character, orphan trail byte.
>+ {"x\xE2\x70\x94", "\"x\\xE2p\\x94\""},
>+ // Truncated 3-byte character.
>+ {"\xE2\x80", "\"\\xE2\\x80\""},
>+ // Truncated 3-byte character followed by valid 2-byte char.
>+ {"\xE2\x80\xC3\x84", "\"\\xE2\\x80\\xC3\\x84\""},
>+ // Truncated 3-byte character followed by a single-byte character.
>+ {"\xE2\x80\x7A", "\"\\xE2\\x80z\""},
>+ // 3-byte lead byte followed by valid 3-byte character.
>+ {"\xE2\xE2\x80\x94", "\"\\xE2\\xE2\\x80\\x94\""},
>+ // 4-byte lead byte followed by valid 3-byte character.
>+ {"\xF0\xE2\x80\x94", "\"\\xF0\\xE2\\x80\\x94\""},
>+ // Truncated 4-byte character.
>+ {"\xF0\xE2\x80", "\"\\xF0\\xE2\\x80\""},
>+ // Invalid UTF-8 byte sequences embedded in other chars.
>+ {"abc\xE2\x80\x94\xC3\x74xyc", "\"abc\\xE2\\x80\\x94\\xC3txyc\""},
>+ {"abc\xC3\x84\xE2\x80\xC3\x84xyz",
>+ "\"abc\\xC3\\x84\\xE2\\x80\\xC3\\x84xyz\""},
>+ // Non-shortest UTF-8 byte sequences are also ill-formed.
>+ // The classics: xC0, xC1 lead byte.
>+ {"\xC0\x80", "\"\\xC0\\x80\""},
>+ {"\xC1\x81", "\"\\xC1\\x81\""},
>+ // Non-shortest sequences.
>+ {"\xE0\x80\x80", "\"\\xE0\\x80\\x80\""},
>+ {"\xf0\x80\x80\x80", "\"\\xF0\\x80\\x80\\x80\""},
>+ // Last valid code point before surrogate range, should be printed as text,
>+ // too.
>+ {"\xED\x9F\xBF", "\"\\xED\\x9F\\xBF\"\n As Text: \"í¿\""},
>+ // Start of surrogate lead. Surrogates are not printed as text.
>+ {"\xED\xA0\x80", "\"\\xED\\xA0\\x80\""},
>+ // Last non-private surrogate lead.
>+ {"\xED\xAD\xBF", "\"\\xED\\xAD\\xBF\""},
>+ // First private-use surrogate lead.
>+ {"\xED\xAE\x80", "\"\\xED\\xAE\\x80\""},
>+ // Last private-use surrogate lead.
>+ {"\xED\xAF\xBF", "\"\\xED\\xAF\\xBF\""},
>+ // Mid-point of surrogate trail.
>+ {"\xED\xB3\xBF", "\"\\xED\\xB3\\xBF\""},
>+ // First valid code point after surrogate range, should be printed as text,
>+ // too.
>+ {"\xEE\x80\x80", "\"\\xEE\\x80\\x80\"\n As Text: \"î\""}
>+ };
>+
>+ for (int i = 0; i < int(sizeof(kTestdata)/sizeof(kTestdata[0])); ++i) {
>+ EXPECT_PRINT_TO_STRING_(kTestdata[i][0], kTestdata[i][1]);
>+ }
>+}
>+
>+#undef EXPECT_PRINT_TO_STRING_
>+
>+TEST(UniversalTersePrintTest, WorksForNonReference) {
>+ ::std::stringstream ss;
>+ UniversalTersePrint(123, &ss);
>+ EXPECT_EQ("123", ss.str());
>+}
>+
>+TEST(UniversalTersePrintTest, WorksForReference) {
>+ const int& n = 123;
>+ ::std::stringstream ss;
>+ UniversalTersePrint(n, &ss);
>+ EXPECT_EQ("123", ss.str());
>+}
>+
>+TEST(UniversalTersePrintTest, WorksForCString) {
>+ const char* s1 = "abc";
>+ ::std::stringstream ss1;
>+ UniversalTersePrint(s1, &ss1);
>+ EXPECT_EQ("\"abc\"", ss1.str());
>+
>+ char* s2 = const_cast<char*>(s1);
>+ ::std::stringstream ss2;
>+ UniversalTersePrint(s2, &ss2);
>+ EXPECT_EQ("\"abc\"", ss2.str());
>+
>+ const char* s3 = NULL;
>+ ::std::stringstream ss3;
>+ UniversalTersePrint(s3, &ss3);
>+ EXPECT_EQ("NULL", ss3.str());
>+}
>+
>+TEST(UniversalPrintTest, WorksForNonReference) {
>+ ::std::stringstream ss;
>+ UniversalPrint(123, &ss);
>+ EXPECT_EQ("123", ss.str());
>+}
>+
>+TEST(UniversalPrintTest, WorksForReference) {
>+ const int& n = 123;
>+ ::std::stringstream ss;
>+ UniversalPrint(n, &ss);
>+ EXPECT_EQ("123", ss.str());
>+}
>+
>+TEST(UniversalPrintTest, WorksForCString) {
>+ const char* s1 = "abc";
>+ ::std::stringstream ss1;
>+ UniversalPrint(s1, &ss1);
>+ EXPECT_EQ(PrintPointer(s1) + " pointing to \"abc\"", std::string(ss1.str()));
>+
>+ char* s2 = const_cast<char*>(s1);
>+ ::std::stringstream ss2;
>+ UniversalPrint(s2, &ss2);
>+ EXPECT_EQ(PrintPointer(s2) + " pointing to \"abc\"", std::string(ss2.str()));
>+
>+ const char* s3 = NULL;
>+ ::std::stringstream ss3;
>+ UniversalPrint(s3, &ss3);
>+ EXPECT_EQ("NULL", ss3.str());
>+}
>+
>+TEST(UniversalPrintTest, WorksForCharArray) {
>+ const char str[] = "\"Line\0 1\"\nLine 2";
>+ ::std::stringstream ss1;
>+ UniversalPrint(str, &ss1);
>+ EXPECT_EQ("\"\\\"Line\\0 1\\\"\\nLine 2\"", ss1.str());
>+
>+ const char mutable_str[] = "\"Line\0 1\"\nLine 2";
>+ ::std::stringstream ss2;
>+ UniversalPrint(mutable_str, &ss2);
>+ EXPECT_EQ("\"\\\"Line\\0 1\\\"\\nLine 2\"", ss2.str());
>+}
>+
>+#if GTEST_HAS_TR1_TUPLE
>+
>+TEST(UniversalTersePrintTupleFieldsToStringsTestWithTr1, PrintsEmptyTuple) {
>+ Strings result = UniversalTersePrintTupleFieldsToStrings(
>+ ::std::tr1::make_tuple());
>+ EXPECT_EQ(0u, result.size());
>+}
>+
>+TEST(UniversalTersePrintTupleFieldsToStringsTestWithTr1, PrintsOneTuple) {
>+ Strings result = UniversalTersePrintTupleFieldsToStrings(
>+ ::std::tr1::make_tuple(1));
>+ ASSERT_EQ(1u, result.size());
>+ EXPECT_EQ("1", result[0]);
>+}
>+
>+TEST(UniversalTersePrintTupleFieldsToStringsTestWithTr1, PrintsTwoTuple) {
>+ Strings result = UniversalTersePrintTupleFieldsToStrings(
>+ ::std::tr1::make_tuple(1, 'a'));
>+ ASSERT_EQ(2u, result.size());
>+ EXPECT_EQ("1", result[0]);
>+ EXPECT_EQ("'a' (97, 0x61)", result[1]);
>+}
>+
>+TEST(UniversalTersePrintTupleFieldsToStringsTestWithTr1, PrintsTersely) {
>+ const int n = 1;
>+ Strings result = UniversalTersePrintTupleFieldsToStrings(
>+ ::std::tr1::tuple<const int&, const char*>(n, "a"));
>+ ASSERT_EQ(2u, result.size());
>+ EXPECT_EQ("1", result[0]);
>+ EXPECT_EQ("\"a\"", result[1]);
>+}
>+
>+#endif // GTEST_HAS_TR1_TUPLE
>+
>+#if GTEST_HAS_STD_TUPLE_
>+
>+TEST(UniversalTersePrintTupleFieldsToStringsTestWithStd, PrintsEmptyTuple) {
>+ Strings result = UniversalTersePrintTupleFieldsToStrings(::std::make_tuple());
>+ EXPECT_EQ(0u, result.size());
>+}
>+
>+TEST(UniversalTersePrintTupleFieldsToStringsTestWithStd, PrintsOneTuple) {
>+ Strings result = UniversalTersePrintTupleFieldsToStrings(
>+ ::std::make_tuple(1));
>+ ASSERT_EQ(1u, result.size());
>+ EXPECT_EQ("1", result[0]);
>+}
>+
>+TEST(UniversalTersePrintTupleFieldsToStringsTestWithStd, PrintsTwoTuple) {
>+ Strings result = UniversalTersePrintTupleFieldsToStrings(
>+ ::std::make_tuple(1, 'a'));
>+ ASSERT_EQ(2u, result.size());
>+ EXPECT_EQ("1", result[0]);
>+ EXPECT_EQ("'a' (97, 0x61)", result[1]);
>+}
>+
>+TEST(UniversalTersePrintTupleFieldsToStringsTestWithStd, PrintsTersely) {
>+ const int n = 1;
>+ Strings result = UniversalTersePrintTupleFieldsToStrings(
>+ ::std::tuple<const int&, const char*>(n, "a"));
>+ ASSERT_EQ(2u, result.size());
>+ EXPECT_EQ("1", result[0]);
>+ EXPECT_EQ("\"a\"", result[1]);
>+}
>+
>+#endif // GTEST_HAS_STD_TUPLE_
>+
>+#if GTEST_HAS_ABSL
>+
>+TEST(PrintOptionalTest, Basic) {
>+ absl::optional<int> value;
>+ EXPECT_EQ("(nullopt)", PrintToString(value));
>+ value = {7};
>+ EXPECT_EQ("(7)", PrintToString(value));
>+ EXPECT_EQ("(1.1)", PrintToString(absl::optional<double>{1.1}));
>+ EXPECT_EQ("(\"A\")", PrintToString(absl::optional<std::string>{"A"}));
>+}
>+
>+struct NonPrintable {
>+ unsigned char contents = 17;
>+};
>+
>+TEST(PrintOneofTest, Basic) {
>+ using Type = absl::variant<int, StreamableInGlobal, NonPrintable>;
>+ EXPECT_EQ("('int' with value 7)", PrintToString(Type(7)));
>+ EXPECT_EQ("('StreamableInGlobal' with value StreamableInGlobal)",
>+ PrintToString(Type(StreamableInGlobal{})));
>+ EXPECT_EQ(
>+ "('testing::gtest_printers_test::NonPrintable' with value 1-byte object "
>+ "<11>)",
>+ PrintToString(Type(NonPrintable{})));
>+}
>+#endif // GTEST_HAS_ABSL
>+
>+} // namespace gtest_printers_test
>+} // namespace testing
>diff --git a/Source/ThirdParty/gtest/test/googletest-shuffle-test.py b/Source/ThirdParty/gtest/test/googletest-shuffle-test.py
>new file mode 100755
>index 0000000000000000000000000000000000000000..573cc5eca3fce458aa3ac3e39850f47bb382e55b
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-shuffle-test.py
>@@ -0,0 +1,323 @@
>+#!/usr/bin/env python
>+#
>+# Copyright 2009 Google Inc. All Rights Reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+"""Verifies that test shuffling works."""
>+
>+import os
>+import gtest_test_utils
>+
>+# Command to run the googletest-shuffle-test_ program.
>+COMMAND = gtest_test_utils.GetTestExecutablePath('googletest-shuffle-test_')
>+
>+# The environment variables for test sharding.
>+TOTAL_SHARDS_ENV_VAR = 'GTEST_TOTAL_SHARDS'
>+SHARD_INDEX_ENV_VAR = 'GTEST_SHARD_INDEX'
>+
>+TEST_FILTER = 'A*.A:A*.B:C*'
>+
>+ALL_TESTS = []
>+ACTIVE_TESTS = []
>+FILTERED_TESTS = []
>+SHARDED_TESTS = []
>+
>+SHUFFLED_ALL_TESTS = []
>+SHUFFLED_ACTIVE_TESTS = []
>+SHUFFLED_FILTERED_TESTS = []
>+SHUFFLED_SHARDED_TESTS = []
>+
>+
>+def AlsoRunDisabledTestsFlag():
>+ return '--gtest_also_run_disabled_tests'
>+
>+
>+def FilterFlag(test_filter):
>+ return '--gtest_filter=%s' % (test_filter,)
>+
>+
>+def RepeatFlag(n):
>+ return '--gtest_repeat=%s' % (n,)
>+
>+
>+def ShuffleFlag():
>+ return '--gtest_shuffle'
>+
>+
>+def RandomSeedFlag(n):
>+ return '--gtest_random_seed=%s' % (n,)
>+
>+
>+def RunAndReturnOutput(extra_env, args):
>+ """Runs the test program and returns its output."""
>+
>+ environ_copy = os.environ.copy()
>+ environ_copy.update(extra_env)
>+
>+ return gtest_test_utils.Subprocess([COMMAND] + args, env=environ_copy).output
>+
>+
>+def GetTestsForAllIterations(extra_env, args):
>+ """Runs the test program and returns a list of test lists.
>+
>+ Args:
>+ extra_env: a map from environment variables to their values
>+ args: command line flags to pass to googletest-shuffle-test_
>+
>+ Returns:
>+ A list where the i-th element is the list of tests run in the i-th
>+ test iteration.
>+ """
>+
>+ test_iterations = []
>+ for line in RunAndReturnOutput(extra_env, args).split('\n'):
>+ if line.startswith('----'):
>+ tests = []
>+ test_iterations.append(tests)
>+ elif line.strip():
>+ tests.append(line.strip()) # 'TestCaseName.TestName'
>+
>+ return test_iterations
>+
>+
>+def GetTestCases(tests):
>+ """Returns a list of test cases in the given full test names.
>+
>+ Args:
>+ tests: a list of full test names
>+
>+ Returns:
>+ A list of test cases from 'tests', in their original order.
>+ Consecutive duplicates are removed.
>+ """
>+
>+ test_cases = []
>+ for test in tests:
>+ test_case = test.split('.')[0]
>+ if not test_case in test_cases:
>+ test_cases.append(test_case)
>+
>+ return test_cases
>+
>+
>+def CalculateTestLists():
>+ """Calculates the list of tests run under different flags."""
>+
>+ if not ALL_TESTS:
>+ ALL_TESTS.extend(
>+ GetTestsForAllIterations({}, [AlsoRunDisabledTestsFlag()])[0])
>+
>+ if not ACTIVE_TESTS:
>+ ACTIVE_TESTS.extend(GetTestsForAllIterations({}, [])[0])
>+
>+ if not FILTERED_TESTS:
>+ FILTERED_TESTS.extend(
>+ GetTestsForAllIterations({}, [FilterFlag(TEST_FILTER)])[0])
>+
>+ if not SHARDED_TESTS:
>+ SHARDED_TESTS.extend(
>+ GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
>+ SHARD_INDEX_ENV_VAR: '1'},
>+ [])[0])
>+
>+ if not SHUFFLED_ALL_TESTS:
>+ SHUFFLED_ALL_TESTS.extend(GetTestsForAllIterations(
>+ {}, [AlsoRunDisabledTestsFlag(), ShuffleFlag(), RandomSeedFlag(1)])[0])
>+
>+ if not SHUFFLED_ACTIVE_TESTS:
>+ SHUFFLED_ACTIVE_TESTS.extend(GetTestsForAllIterations(
>+ {}, [ShuffleFlag(), RandomSeedFlag(1)])[0])
>+
>+ if not SHUFFLED_FILTERED_TESTS:
>+ SHUFFLED_FILTERED_TESTS.extend(GetTestsForAllIterations(
>+ {}, [ShuffleFlag(), RandomSeedFlag(1), FilterFlag(TEST_FILTER)])[0])
>+
>+ if not SHUFFLED_SHARDED_TESTS:
>+ SHUFFLED_SHARDED_TESTS.extend(
>+ GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
>+ SHARD_INDEX_ENV_VAR: '1'},
>+ [ShuffleFlag(), RandomSeedFlag(1)])[0])
>+
>+
>+class GTestShuffleUnitTest(gtest_test_utils.TestCase):
>+ """Tests test shuffling."""
>+
>+ def setUp(self):
>+ CalculateTestLists()
>+
>+ def testShufflePreservesNumberOfTests(self):
>+ self.assertEqual(len(ALL_TESTS), len(SHUFFLED_ALL_TESTS))
>+ self.assertEqual(len(ACTIVE_TESTS), len(SHUFFLED_ACTIVE_TESTS))
>+ self.assertEqual(len(FILTERED_TESTS), len(SHUFFLED_FILTERED_TESTS))
>+ self.assertEqual(len(SHARDED_TESTS), len(SHUFFLED_SHARDED_TESTS))
>+
>+ def testShuffleChangesTestOrder(self):
>+ self.assert_(SHUFFLED_ALL_TESTS != ALL_TESTS, SHUFFLED_ALL_TESTS)
>+ self.assert_(SHUFFLED_ACTIVE_TESTS != ACTIVE_TESTS, SHUFFLED_ACTIVE_TESTS)
>+ self.assert_(SHUFFLED_FILTERED_TESTS != FILTERED_TESTS,
>+ SHUFFLED_FILTERED_TESTS)
>+ self.assert_(SHUFFLED_SHARDED_TESTS != SHARDED_TESTS,
>+ SHUFFLED_SHARDED_TESTS)
>+
>+ def testShuffleChangesTestCaseOrder(self):
>+ self.assert_(GetTestCases(SHUFFLED_ALL_TESTS) != GetTestCases(ALL_TESTS),
>+ GetTestCases(SHUFFLED_ALL_TESTS))
>+ self.assert_(
>+ GetTestCases(SHUFFLED_ACTIVE_TESTS) != GetTestCases(ACTIVE_TESTS),
>+ GetTestCases(SHUFFLED_ACTIVE_TESTS))
>+ self.assert_(
>+ GetTestCases(SHUFFLED_FILTERED_TESTS) != GetTestCases(FILTERED_TESTS),
>+ GetTestCases(SHUFFLED_FILTERED_TESTS))
>+ self.assert_(
>+ GetTestCases(SHUFFLED_SHARDED_TESTS) != GetTestCases(SHARDED_TESTS),
>+ GetTestCases(SHUFFLED_SHARDED_TESTS))
>+
>+ def testShuffleDoesNotRepeatTest(self):
>+ for test in SHUFFLED_ALL_TESTS:
>+ self.assertEqual(1, SHUFFLED_ALL_TESTS.count(test),
>+ '%s appears more than once' % (test,))
>+ for test in SHUFFLED_ACTIVE_TESTS:
>+ self.assertEqual(1, SHUFFLED_ACTIVE_TESTS.count(test),
>+ '%s appears more than once' % (test,))
>+ for test in SHUFFLED_FILTERED_TESTS:
>+ self.assertEqual(1, SHUFFLED_FILTERED_TESTS.count(test),
>+ '%s appears more than once' % (test,))
>+ for test in SHUFFLED_SHARDED_TESTS:
>+ self.assertEqual(1, SHUFFLED_SHARDED_TESTS.count(test),
>+ '%s appears more than once' % (test,))
>+
>+ def testShuffleDoesNotCreateNewTest(self):
>+ for test in SHUFFLED_ALL_TESTS:
>+ self.assert_(test in ALL_TESTS, '%s is an invalid test' % (test,))
>+ for test in SHUFFLED_ACTIVE_TESTS:
>+ self.assert_(test in ACTIVE_TESTS, '%s is an invalid test' % (test,))
>+ for test in SHUFFLED_FILTERED_TESTS:
>+ self.assert_(test in FILTERED_TESTS, '%s is an invalid test' % (test,))
>+ for test in SHUFFLED_SHARDED_TESTS:
>+ self.assert_(test in SHARDED_TESTS, '%s is an invalid test' % (test,))
>+
>+ def testShuffleIncludesAllTests(self):
>+ for test in ALL_TESTS:
>+ self.assert_(test in SHUFFLED_ALL_TESTS, '%s is missing' % (test,))
>+ for test in ACTIVE_TESTS:
>+ self.assert_(test in SHUFFLED_ACTIVE_TESTS, '%s is missing' % (test,))
>+ for test in FILTERED_TESTS:
>+ self.assert_(test in SHUFFLED_FILTERED_TESTS, '%s is missing' % (test,))
>+ for test in SHARDED_TESTS:
>+ self.assert_(test in SHUFFLED_SHARDED_TESTS, '%s is missing' % (test,))
>+
>+ def testShuffleLeavesDeathTestsAtFront(self):
>+ non_death_test_found = False
>+ for test in SHUFFLED_ACTIVE_TESTS:
>+ if 'DeathTest.' in test:
>+ self.assert_(not non_death_test_found,
>+ '%s appears after a non-death test' % (test,))
>+ else:
>+ non_death_test_found = True
>+
>+ def _VerifyTestCasesDoNotInterleave(self, tests):
>+ test_cases = []
>+ for test in tests:
>+ [test_case, _] = test.split('.')
>+ if test_cases and test_cases[-1] != test_case:
>+ test_cases.append(test_case)
>+ self.assertEqual(1, test_cases.count(test_case),
>+ 'Test case %s is not grouped together in %s' %
>+ (test_case, tests))
>+
>+ def testShuffleDoesNotInterleaveTestCases(self):
>+ self._VerifyTestCasesDoNotInterleave(SHUFFLED_ALL_TESTS)
>+ self._VerifyTestCasesDoNotInterleave(SHUFFLED_ACTIVE_TESTS)
>+ self._VerifyTestCasesDoNotInterleave(SHUFFLED_FILTERED_TESTS)
>+ self._VerifyTestCasesDoNotInterleave(SHUFFLED_SHARDED_TESTS)
>+
>+ def testShuffleRestoresOrderAfterEachIteration(self):
>+ # Get the test lists in all 3 iterations, using random seed 1, 2,
>+ # and 3 respectively. Google Test picks a different seed in each
>+ # iteration, and this test depends on the current implementation
>+ # picking successive numbers. This dependency is not ideal, but
>+ # makes the test much easier to write.
>+ [tests_in_iteration1, tests_in_iteration2, tests_in_iteration3] = (
>+ GetTestsForAllIterations(
>+ {}, [ShuffleFlag(), RandomSeedFlag(1), RepeatFlag(3)]))
>+
>+ # Make sure running the tests with random seed 1 gets the same
>+ # order as in iteration 1 above.
>+ [tests_with_seed1] = GetTestsForAllIterations(
>+ {}, [ShuffleFlag(), RandomSeedFlag(1)])
>+ self.assertEqual(tests_in_iteration1, tests_with_seed1)
>+
>+ # Make sure running the tests with random seed 2 gets the same
>+ # order as in iteration 2 above. Success means that Google Test
>+ # correctly restores the test order before re-shuffling at the
>+ # beginning of iteration 2.
>+ [tests_with_seed2] = GetTestsForAllIterations(
>+ {}, [ShuffleFlag(), RandomSeedFlag(2)])
>+ self.assertEqual(tests_in_iteration2, tests_with_seed2)
>+
>+ # Make sure running the tests with random seed 3 gets the same
>+ # order as in iteration 3 above. Success means that Google Test
>+ # correctly restores the test order before re-shuffling at the
>+ # beginning of iteration 3.
>+ [tests_with_seed3] = GetTestsForAllIterations(
>+ {}, [ShuffleFlag(), RandomSeedFlag(3)])
>+ self.assertEqual(tests_in_iteration3, tests_with_seed3)
>+
>+ def testShuffleGeneratesNewOrderInEachIteration(self):
>+ [tests_in_iteration1, tests_in_iteration2, tests_in_iteration3] = (
>+ GetTestsForAllIterations(
>+ {}, [ShuffleFlag(), RandomSeedFlag(1), RepeatFlag(3)]))
>+
>+ self.assert_(tests_in_iteration1 != tests_in_iteration2,
>+ tests_in_iteration1)
>+ self.assert_(tests_in_iteration1 != tests_in_iteration3,
>+ tests_in_iteration1)
>+ self.assert_(tests_in_iteration2 != tests_in_iteration3,
>+ tests_in_iteration2)
>+
>+ def testShuffleShardedTestsPreservesPartition(self):
>+ # If we run M tests on N shards, the same M tests should be run in
>+ # total, regardless of the random seeds used by the shards.
>+ [tests1] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
>+ SHARD_INDEX_ENV_VAR: '0'},
>+ [ShuffleFlag(), RandomSeedFlag(1)])
>+ [tests2] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
>+ SHARD_INDEX_ENV_VAR: '1'},
>+ [ShuffleFlag(), RandomSeedFlag(20)])
>+ [tests3] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
>+ SHARD_INDEX_ENV_VAR: '2'},
>+ [ShuffleFlag(), RandomSeedFlag(25)])
>+ sorted_sharded_tests = tests1 + tests2 + tests3
>+ sorted_sharded_tests.sort()
>+ sorted_active_tests = []
>+ sorted_active_tests.extend(ACTIVE_TESTS)
>+ sorted_active_tests.sort()
>+ self.assertEqual(sorted_active_tests, sorted_sharded_tests)
>+
>+if __name__ == '__main__':
>+ gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/googletest-shuffle-test_.cc b/Source/ThirdParty/gtest/test/googletest-shuffle-test_.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..1fe5f6aba2a5e0ffcab915e4638d23f58cf48ff0
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-shuffle-test_.cc
>@@ -0,0 +1,102 @@
>+// Copyright 2009, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+
>+// Verifies that test shuffling works.
>+
>+#include "gtest/gtest.h"
>+
>+namespace {
>+
>+using ::testing::EmptyTestEventListener;
>+using ::testing::InitGoogleTest;
>+using ::testing::Message;
>+using ::testing::Test;
>+using ::testing::TestEventListeners;
>+using ::testing::TestInfo;
>+using ::testing::UnitTest;
>+using ::testing::internal::scoped_ptr;
>+
>+// The test methods are empty, as the sole purpose of this program is
>+// to print the test names before/after shuffling.
>+
>+class A : public Test {};
>+TEST_F(A, A) {}
>+TEST_F(A, B) {}
>+
>+TEST(ADeathTest, A) {}
>+TEST(ADeathTest, B) {}
>+TEST(ADeathTest, C) {}
>+
>+TEST(B, A) {}
>+TEST(B, B) {}
>+TEST(B, C) {}
>+TEST(B, DISABLED_D) {}
>+TEST(B, DISABLED_E) {}
>+
>+TEST(BDeathTest, A) {}
>+TEST(BDeathTest, B) {}
>+
>+TEST(C, A) {}
>+TEST(C, B) {}
>+TEST(C, C) {}
>+TEST(C, DISABLED_D) {}
>+
>+TEST(CDeathTest, A) {}
>+
>+TEST(DISABLED_D, A) {}
>+TEST(DISABLED_D, DISABLED_B) {}
>+
>+// This printer prints the full test names only, starting each test
>+// iteration with a "----" marker.
>+class TestNamePrinter : public EmptyTestEventListener {
>+ public:
>+ virtual void OnTestIterationStart(const UnitTest& /* unit_test */,
>+ int /* iteration */) {
>+ printf("----\n");
>+ }
>+
>+ virtual void OnTestStart(const TestInfo& test_info) {
>+ printf("%s.%s\n", test_info.test_case_name(), test_info.name());
>+ }
>+};
>+
>+} // namespace
>+
>+int main(int argc, char **argv) {
>+ InitGoogleTest(&argc, argv);
>+
>+ // Replaces the default printer with TestNamePrinter, which prints
>+ // the test name only.
>+ TestEventListeners& listeners = UnitTest::GetInstance()->listeners();
>+ delete listeners.Release(listeners.default_result_printer());
>+ listeners.Append(new TestNamePrinter);
>+
>+ return RUN_ALL_TESTS();
>+}
>diff --git a/Source/ThirdParty/gtest/test/googletest-test-part-test.cc b/Source/ThirdParty/gtest/test/googletest-test-part-test.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..cd2d6f9e858f5279ba5a16a5d1a6e37affe910ad
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-test-part-test.cc
>@@ -0,0 +1,205 @@
>+// Copyright 2008 Google Inc.
>+// All Rights Reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+#include "gtest/gtest-test-part.h"
>+
>+#include "gtest/gtest.h"
>+
>+using testing::Message;
>+using testing::Test;
>+using testing::TestPartResult;
>+using testing::TestPartResultArray;
>+
>+namespace {
>+
>+// Tests the TestPartResult class.
>+
>+// The test fixture for testing TestPartResult.
>+class TestPartResultTest : public Test {
>+ protected:
>+ TestPartResultTest()
>+ : r1_(TestPartResult::kSuccess, "foo/bar.cc", 10, "Success!"),
>+ r2_(TestPartResult::kNonFatalFailure, "foo/bar.cc", -1, "Failure!"),
>+ r3_(TestPartResult::kFatalFailure, NULL, -1, "Failure!") {}
>+
>+ TestPartResult r1_, r2_, r3_;
>+};
>+
>+
>+TEST_F(TestPartResultTest, ConstructorWorks) {
>+ Message message;
>+ message << "something is terribly wrong";
>+ message << static_cast<const char*>(testing::internal::kStackTraceMarker);
>+ message << "some unimportant stack trace";
>+
>+ const TestPartResult result(TestPartResult::kNonFatalFailure,
>+ "some_file.cc",
>+ 42,
>+ message.GetString().c_str());
>+
>+ EXPECT_EQ(TestPartResult::kNonFatalFailure, result.type());
>+ EXPECT_STREQ("some_file.cc", result.file_name());
>+ EXPECT_EQ(42, result.line_number());
>+ EXPECT_STREQ(message.GetString().c_str(), result.message());
>+ EXPECT_STREQ("something is terribly wrong", result.summary());
>+}
>+
>+TEST_F(TestPartResultTest, ResultAccessorsWork) {
>+ const TestPartResult success(TestPartResult::kSuccess,
>+ "file.cc",
>+ 42,
>+ "message");
>+ EXPECT_TRUE(success.passed());
>+ EXPECT_FALSE(success.failed());
>+ EXPECT_FALSE(success.nonfatally_failed());
>+ EXPECT_FALSE(success.fatally_failed());
>+
>+ const TestPartResult nonfatal_failure(TestPartResult::kNonFatalFailure,
>+ "file.cc",
>+ 42,
>+ "message");
>+ EXPECT_FALSE(nonfatal_failure.passed());
>+ EXPECT_TRUE(nonfatal_failure.failed());
>+ EXPECT_TRUE(nonfatal_failure.nonfatally_failed());
>+ EXPECT_FALSE(nonfatal_failure.fatally_failed());
>+
>+ const TestPartResult fatal_failure(TestPartResult::kFatalFailure,
>+ "file.cc",
>+ 42,
>+ "message");
>+ EXPECT_FALSE(fatal_failure.passed());
>+ EXPECT_TRUE(fatal_failure.failed());
>+ EXPECT_FALSE(fatal_failure.nonfatally_failed());
>+ EXPECT_TRUE(fatal_failure.fatally_failed());
>+}
>+
>+// Tests TestPartResult::type().
>+TEST_F(TestPartResultTest, type) {
>+ EXPECT_EQ(TestPartResult::kSuccess, r1_.type());
>+ EXPECT_EQ(TestPartResult::kNonFatalFailure, r2_.type());
>+ EXPECT_EQ(TestPartResult::kFatalFailure, r3_.type());
>+}
>+
>+// Tests TestPartResult::file_name().
>+TEST_F(TestPartResultTest, file_name) {
>+ EXPECT_STREQ("foo/bar.cc", r1_.file_name());
>+ EXPECT_STREQ(NULL, r3_.file_name());
>+}
>+
>+// Tests TestPartResult::line_number().
>+TEST_F(TestPartResultTest, line_number) {
>+ EXPECT_EQ(10, r1_.line_number());
>+ EXPECT_EQ(-1, r2_.line_number());
>+}
>+
>+// Tests TestPartResult::message().
>+TEST_F(TestPartResultTest, message) {
>+ EXPECT_STREQ("Success!", r1_.message());
>+}
>+
>+// Tests TestPartResult::passed().
>+TEST_F(TestPartResultTest, Passed) {
>+ EXPECT_TRUE(r1_.passed());
>+ EXPECT_FALSE(r2_.passed());
>+ EXPECT_FALSE(r3_.passed());
>+}
>+
>+// Tests TestPartResult::failed().
>+TEST_F(TestPartResultTest, Failed) {
>+ EXPECT_FALSE(r1_.failed());
>+ EXPECT_TRUE(r2_.failed());
>+ EXPECT_TRUE(r3_.failed());
>+}
>+
>+// Tests TestPartResult::fatally_failed().
>+TEST_F(TestPartResultTest, FatallyFailed) {
>+ EXPECT_FALSE(r1_.fatally_failed());
>+ EXPECT_FALSE(r2_.fatally_failed());
>+ EXPECT_TRUE(r3_.fatally_failed());
>+}
>+
>+// Tests TestPartResult::nonfatally_failed().
>+TEST_F(TestPartResultTest, NonfatallyFailed) {
>+ EXPECT_FALSE(r1_.nonfatally_failed());
>+ EXPECT_TRUE(r2_.nonfatally_failed());
>+ EXPECT_FALSE(r3_.nonfatally_failed());
>+}
>+
>+// Tests the TestPartResultArray class.
>+
>+class TestPartResultArrayTest : public Test {
>+ protected:
>+ TestPartResultArrayTest()
>+ : r1_(TestPartResult::kNonFatalFailure, "foo/bar.cc", -1, "Failure 1"),
>+ r2_(TestPartResult::kFatalFailure, "foo/bar.cc", -1, "Failure 2") {}
>+
>+ const TestPartResult r1_, r2_;
>+};
>+
>+// Tests that TestPartResultArray initially has size 0.
>+TEST_F(TestPartResultArrayTest, InitialSizeIsZero) {
>+ TestPartResultArray results;
>+ EXPECT_EQ(0, results.size());
>+}
>+
>+// Tests that TestPartResultArray contains the given TestPartResult
>+// after one Append() operation.
>+TEST_F(TestPartResultArrayTest, ContainsGivenResultAfterAppend) {
>+ TestPartResultArray results;
>+ results.Append(r1_);
>+ EXPECT_EQ(1, results.size());
>+ EXPECT_STREQ("Failure 1", results.GetTestPartResult(0).message());
>+}
>+
>+// Tests that TestPartResultArray contains the given TestPartResults
>+// after two Append() operations.
>+TEST_F(TestPartResultArrayTest, ContainsGivenResultsAfterTwoAppends) {
>+ TestPartResultArray results;
>+ results.Append(r1_);
>+ results.Append(r2_);
>+ EXPECT_EQ(2, results.size());
>+ EXPECT_STREQ("Failure 1", results.GetTestPartResult(0).message());
>+ EXPECT_STREQ("Failure 2", results.GetTestPartResult(1).message());
>+}
>+
>+typedef TestPartResultArrayTest TestPartResultArrayDeathTest;
>+
>+// Tests that the program dies when GetTestPartResult() is called with
>+// an invalid index.
>+TEST_F(TestPartResultArrayDeathTest, DiesWhenIndexIsOutOfBound) {
>+ TestPartResultArray results;
>+ results.Append(r1_);
>+
>+ EXPECT_DEATH_IF_SUPPORTED(results.GetTestPartResult(-1), "");
>+ EXPECT_DEATH_IF_SUPPORTED(results.GetTestPartResult(1), "");
>+}
>+
>+// FIXME: Add a test for the class HasNewFatalFailureHelper.
>+
>+} // namespace
>diff --git a/Source/ThirdParty/gtest/test/googletest-test2_test.cc b/Source/ThirdParty/gtest/test/googletest-test2_test.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..c2f98dc7d1c3e909758ba60772e977498ce81ff2
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-test2_test.cc
>@@ -0,0 +1,61 @@
>+// Copyright 2008, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+//
>+// Tests for Google Test itself. This verifies that the basic constructs of
>+// Google Test work.
>+
>+#include "gtest/gtest.h"
>+#include "googletest-param-test-test.h"
>+
>+using ::testing::Values;
>+using ::testing::internal::ParamGenerator;
>+
>+// Tests that generators defined in a different translation unit
>+// are functional. The test using extern_gen_2 is defined
>+// in googletest-param-test-test.cc.
>+ParamGenerator<int> extern_gen_2 = Values(33);
>+
>+// Tests that a parameterized test case can be defined in one translation unit
>+// and instantiated in another. The test is defined in
>+// googletest-param-test-test.cc and ExternalInstantiationTest fixture class is
>+// defined in gtest-param-test_test.h.
>+INSTANTIATE_TEST_CASE_P(MultiplesOf33,
>+ ExternalInstantiationTest,
>+ Values(33, 66));
>+
>+// Tests that a parameterized test case can be instantiated
>+// in multiple translation units. Another instantiation is defined
>+// in googletest-param-test-test.cc and
>+// InstantiationInMultipleTranslaionUnitsTest fixture is defined in
>+// gtest-param-test_test.h
>+INSTANTIATE_TEST_CASE_P(Sequence2,
>+ InstantiationInMultipleTranslaionUnitsTest,
>+ Values(42*3, 42*4, 42*5));
>+
>diff --git a/Source/ThirdParty/gtest/test/googletest-throw-on-failure-test.py b/Source/ThirdParty/gtest/test/googletest-throw-on-failure-test.py
>new file mode 100755
>index 0000000000000000000000000000000000000000..46cb9f6da31deadfd7eefd235e9b37df29fb3baf
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-throw-on-failure-test.py
>@@ -0,0 +1,169 @@
>+#!/usr/bin/env python
>+#
>+# Copyright 2009, Google Inc.
>+# All rights reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+"""Tests Google Test's throw-on-failure mode with exceptions disabled.
>+
>+This script invokes googletest-throw-on-failure-test_ (a program written with
>+Google Test) with different environments and command line flags.
>+"""
>+
>+import os
>+import gtest_test_utils
>+
>+
>+# Constants.
>+
>+# The command line flag for enabling/disabling the throw-on-failure mode.
>+THROW_ON_FAILURE = 'gtest_throw_on_failure'
>+
>+# Path to the googletest-throw-on-failure-test_ program, compiled with
>+# exceptions disabled.
>+EXE_PATH = gtest_test_utils.GetTestExecutablePath(
>+ 'googletest-throw-on-failure-test_')
>+
>+
>+# Utilities.
>+
>+
>+def SetEnvVar(env_var, value):
>+ """Sets an environment variable to a given value; unsets it when the
>+ given value is None.
>+ """
>+
>+ env_var = env_var.upper()
>+ if value is not None:
>+ os.environ[env_var] = value
>+ elif env_var in os.environ:
>+ del os.environ[env_var]
>+
>+
>+def Run(command):
>+ """Runs a command; returns True/False if its exit code is/isn't 0."""
>+
>+ print 'Running "%s". . .' % ' '.join(command)
>+ p = gtest_test_utils.Subprocess(command)
>+ return p.exited and p.exit_code == 0
>+
>+
>+# The tests. FIXME: refactor the class to share common
>+# logic with code in googletest-break-on-failure-unittest.py.
>+class ThrowOnFailureTest(gtest_test_utils.TestCase):
>+ """Tests the throw-on-failure mode."""
>+
>+ def RunAndVerify(self, env_var_value, flag_value, should_fail):
>+ """Runs googletest-throw-on-failure-test_ and verifies that it does
>+ (or does not) exit with a non-zero code.
>+
>+ Args:
>+ env_var_value: value of the GTEST_BREAK_ON_FAILURE environment
>+ variable; None if the variable should be unset.
>+ flag_value: value of the --gtest_break_on_failure flag;
>+ None if the flag should not be present.
>+ should_fail: True iff the program is expected to fail.
>+ """
>+
>+ SetEnvVar(THROW_ON_FAILURE, env_var_value)
>+
>+ if env_var_value is None:
>+ env_var_value_msg = ' is not set'
>+ else:
>+ env_var_value_msg = '=' + env_var_value
>+
>+ if flag_value is None:
>+ flag = ''
>+ elif flag_value == '0':
>+ flag = '--%s=0' % THROW_ON_FAILURE
>+ else:
>+ flag = '--%s' % THROW_ON_FAILURE
>+
>+ command = [EXE_PATH]
>+ if flag:
>+ command.append(flag)
>+
>+ if should_fail:
>+ should_or_not = 'should'
>+ else:
>+ should_or_not = 'should not'
>+
>+ failed = not Run(command)
>+
>+ SetEnvVar(THROW_ON_FAILURE, None)
>+
>+ msg = ('when %s%s, an assertion failure in "%s" %s cause a non-zero '
>+ 'exit code.' %
>+ (THROW_ON_FAILURE, env_var_value_msg, ' '.join(command),
>+ should_or_not))
>+ self.assert_(failed == should_fail, msg)
>+
>+ def testDefaultBehavior(self):
>+ """Tests the behavior of the default mode."""
>+
>+ self.RunAndVerify(env_var_value=None, flag_value=None, should_fail=False)
>+
>+ def testThrowOnFailureEnvVar(self):
>+ """Tests using the GTEST_THROW_ON_FAILURE environment variable."""
>+
>+ self.RunAndVerify(env_var_value='0',
>+ flag_value=None,
>+ should_fail=False)
>+ self.RunAndVerify(env_var_value='1',
>+ flag_value=None,
>+ should_fail=True)
>+
>+ def testThrowOnFailureFlag(self):
>+ """Tests using the --gtest_throw_on_failure flag."""
>+
>+ self.RunAndVerify(env_var_value=None,
>+ flag_value='0',
>+ should_fail=False)
>+ self.RunAndVerify(env_var_value=None,
>+ flag_value='1',
>+ should_fail=True)
>+
>+ def testThrowOnFailureFlagOverridesEnvVar(self):
>+ """Tests that --gtest_throw_on_failure overrides GTEST_THROW_ON_FAILURE."""
>+
>+ self.RunAndVerify(env_var_value='0',
>+ flag_value='0',
>+ should_fail=False)
>+ self.RunAndVerify(env_var_value='0',
>+ flag_value='1',
>+ should_fail=True)
>+ self.RunAndVerify(env_var_value='1',
>+ flag_value='0',
>+ should_fail=False)
>+ self.RunAndVerify(env_var_value='1',
>+ flag_value='1',
>+ should_fail=True)
>+
>+
>+if __name__ == '__main__':
>+ gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/googletest-throw-on-failure-test_.cc b/Source/ThirdParty/gtest/test/googletest-throw-on-failure-test_.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..f9a2c6448a29ca29649a1248059a985a51af8636
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-throw-on-failure-test_.cc
>@@ -0,0 +1,71 @@
>+// Copyright 2009, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+
>+// Tests Google Test's throw-on-failure mode with exceptions disabled.
>+//
>+// This program must be compiled with exceptions disabled. It will be
>+// invoked by googletest-throw-on-failure-test.py, and is expected to exit
>+// with non-zero in the throw-on-failure mode or 0 otherwise.
>+
>+#include "gtest/gtest.h"
>+
>+#include <stdio.h> // for fflush, fprintf, NULL, etc.
>+#include <stdlib.h> // for exit
>+#include <exception> // for set_terminate
>+
>+// This terminate handler aborts the program using exit() rather than abort().
>+// This avoids showing pop-ups on Windows systems and core dumps on Unix-like
>+// ones.
>+void TerminateHandler() {
>+ fprintf(stderr, "%s\n", "Unhandled C++ exception terminating the program.");
>+ fflush(NULL);
>+ exit(1);
>+}
>+
>+int main(int argc, char** argv) {
>+#if GTEST_HAS_EXCEPTIONS
>+ std::set_terminate(&TerminateHandler);
>+#endif
>+ testing::InitGoogleTest(&argc, argv);
>+
>+ // We want to ensure that people can use Google Test assertions in
>+ // other testing frameworks, as long as they initialize Google Test
>+ // properly and set the throw-on-failure mode. Therefore, we don't
>+ // use Google Test's constructs for defining and running tests
>+ // (e.g. TEST and RUN_ALL_TESTS) here.
>+
>+ // In the throw-on-failure mode with exceptions disabled, this
>+ // assertion will cause the program to exit with a non-zero code.
>+ EXPECT_EQ(2, 3);
>+
>+ // When not in the throw-on-failure mode, the control will reach
>+ // here.
>+ return 0;
>+}
>diff --git a/Source/ThirdParty/gtest/test/googletest-tuple-test.cc b/Source/ThirdParty/gtest/test/googletest-tuple-test.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..dd82c160f177d6f3badd77064ab8c7e98bd29767
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-tuple-test.cc
>@@ -0,0 +1,319 @@
>+// Copyright 2007, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+
>+#include "gtest/internal/gtest-tuple.h"
>+#include <utility>
>+#include "gtest/gtest.h"
>+
>+namespace {
>+
>+using ::std::tr1::get;
>+using ::std::tr1::make_tuple;
>+using ::std::tr1::tuple;
>+using ::std::tr1::tuple_element;
>+using ::std::tr1::tuple_size;
>+using ::testing::StaticAssertTypeEq;
>+
>+// Tests that tuple_element<K, tuple<T0, T1, ..., TN> >::type returns TK.
>+TEST(tuple_element_Test, ReturnsElementType) {
>+ StaticAssertTypeEq<int, tuple_element<0, tuple<int, char> >::type>();
>+ StaticAssertTypeEq<int&, tuple_element<1, tuple<double, int&> >::type>();
>+ StaticAssertTypeEq<bool, tuple_element<2, tuple<double, int, bool> >::type>();
>+}
>+
>+// Tests that tuple_size<T>::value gives the number of fields in tuple
>+// type T.
>+TEST(tuple_size_Test, ReturnsNumberOfFields) {
>+ EXPECT_EQ(0, +tuple_size<tuple<> >::value);
>+ EXPECT_EQ(1, +tuple_size<tuple<void*> >::value);
>+ EXPECT_EQ(1, +tuple_size<tuple<char> >::value);
>+ EXPECT_EQ(1, +(tuple_size<tuple<tuple<int, double> > >::value));
>+ EXPECT_EQ(2, +(tuple_size<tuple<int&, const char> >::value));
>+ EXPECT_EQ(3, +(tuple_size<tuple<char*, void, const bool&> >::value));
>+}
>+
>+// Tests comparing a tuple with itself.
>+TEST(ComparisonTest, ComparesWithSelf) {
>+ const tuple<int, char, bool> a(5, 'a', false);
>+
>+ EXPECT_TRUE(a == a);
>+ EXPECT_FALSE(a != a);
>+}
>+
>+// Tests comparing two tuples with the same value.
>+TEST(ComparisonTest, ComparesEqualTuples) {
>+ const tuple<int, bool> a(5, true), b(5, true);
>+
>+ EXPECT_TRUE(a == b);
>+ EXPECT_FALSE(a != b);
>+}
>+
>+// Tests comparing two different tuples that have no reference fields.
>+TEST(ComparisonTest, ComparesUnequalTuplesWithoutReferenceFields) {
>+ typedef tuple<const int, char> FooTuple;
>+
>+ const FooTuple a(0, 'x');
>+ const FooTuple b(1, 'a');
>+
>+ EXPECT_TRUE(a != b);
>+ EXPECT_FALSE(a == b);
>+
>+ const FooTuple c(1, 'b');
>+
>+ EXPECT_TRUE(b != c);
>+ EXPECT_FALSE(b == c);
>+}
>+
>+// Tests comparing two different tuples that have reference fields.
>+TEST(ComparisonTest, ComparesUnequalTuplesWithReferenceFields) {
>+ typedef tuple<int&, const char&> FooTuple;
>+
>+ int i = 5;
>+ const char ch = 'a';
>+ const FooTuple a(i, ch);
>+
>+ int j = 6;
>+ const FooTuple b(j, ch);
>+
>+ EXPECT_TRUE(a != b);
>+ EXPECT_FALSE(a == b);
>+
>+ j = 5;
>+ const char ch2 = 'b';
>+ const FooTuple c(j, ch2);
>+
>+ EXPECT_TRUE(b != c);
>+ EXPECT_FALSE(b == c);
>+}
>+
>+// Tests that a tuple field with a reference type is an alias of the
>+// variable it's supposed to reference.
>+TEST(ReferenceFieldTest, IsAliasOfReferencedVariable) {
>+ int n = 0;
>+ tuple<bool, int&> t(true, n);
>+
>+ n = 1;
>+ EXPECT_EQ(n, get<1>(t))
>+ << "Changing a underlying variable should update the reference field.";
>+
>+ // Makes sure that the implementation doesn't do anything funny with
>+ // the & operator for the return type of get<>().
>+ EXPECT_EQ(&n, &(get<1>(t)))
>+ << "The address of a reference field should equal the address of "
>+ << "the underlying variable.";
>+
>+ get<1>(t) = 2;
>+ EXPECT_EQ(2, n)
>+ << "Changing a reference field should update the underlying variable.";
>+}
>+
>+// Tests that tuple's default constructor default initializes each field.
>+// This test needs to compile without generating warnings.
>+TEST(TupleConstructorTest, DefaultConstructorDefaultInitializesEachField) {
>+ // The TR1 report requires that tuple's default constructor default
>+ // initializes each field, even if it's a primitive type. If the
>+ // implementation forgets to do this, this test will catch it by
>+ // generating warnings about using uninitialized variables (assuming
>+ // a decent compiler).
>+
>+ tuple<> empty;
>+
>+ tuple<int> a1, b1;
>+ b1 = a1;
>+ EXPECT_EQ(0, get<0>(b1));
>+
>+ tuple<int, double> a2, b2;
>+ b2 = a2;
>+ EXPECT_EQ(0, get<0>(b2));
>+ EXPECT_EQ(0.0, get<1>(b2));
>+
>+ tuple<double, char, bool*> a3, b3;
>+ b3 = a3;
>+ EXPECT_EQ(0.0, get<0>(b3));
>+ EXPECT_EQ('\0', get<1>(b3));
>+ EXPECT_TRUE(get<2>(b3) == NULL);
>+
>+ tuple<int, int, int, int, int, int, int, int, int, int> a10, b10;
>+ b10 = a10;
>+ EXPECT_EQ(0, get<0>(b10));
>+ EXPECT_EQ(0, get<1>(b10));
>+ EXPECT_EQ(0, get<2>(b10));
>+ EXPECT_EQ(0, get<3>(b10));
>+ EXPECT_EQ(0, get<4>(b10));
>+ EXPECT_EQ(0, get<5>(b10));
>+ EXPECT_EQ(0, get<6>(b10));
>+ EXPECT_EQ(0, get<7>(b10));
>+ EXPECT_EQ(0, get<8>(b10));
>+ EXPECT_EQ(0, get<9>(b10));
>+}
>+
>+// Tests constructing a tuple from its fields.
>+TEST(TupleConstructorTest, ConstructsFromFields) {
>+ int n = 1;
>+ // Reference field.
>+ tuple<int&> a(n);
>+ EXPECT_EQ(&n, &(get<0>(a)));
>+
>+ // Non-reference fields.
>+ tuple<int, char> b(5, 'a');
>+ EXPECT_EQ(5, get<0>(b));
>+ EXPECT_EQ('a', get<1>(b));
>+
>+ // Const reference field.
>+ const int m = 2;
>+ tuple<bool, const int&> c(true, m);
>+ EXPECT_TRUE(get<0>(c));
>+ EXPECT_EQ(&m, &(get<1>(c)));
>+}
>+
>+// Tests tuple's copy constructor.
>+TEST(TupleConstructorTest, CopyConstructor) {
>+ tuple<double, bool> a(0.0, true);
>+ tuple<double, bool> b(a);
>+
>+ EXPECT_DOUBLE_EQ(0.0, get<0>(b));
>+ EXPECT_TRUE(get<1>(b));
>+}
>+
>+// Tests constructing a tuple from another tuple that has a compatible
>+// but different type.
>+TEST(TupleConstructorTest, ConstructsFromDifferentTupleType) {
>+ tuple<int, int, char> a(0, 1, 'a');
>+ tuple<double, long, int> b(a);
>+
>+ EXPECT_DOUBLE_EQ(0.0, get<0>(b));
>+ EXPECT_EQ(1, get<1>(b));
>+ EXPECT_EQ('a', get<2>(b));
>+}
>+
>+// Tests constructing a 2-tuple from an std::pair.
>+TEST(TupleConstructorTest, ConstructsFromPair) {
>+ ::std::pair<int, char> a(1, 'a');
>+ tuple<int, char> b(a);
>+ tuple<int, const char&> c(a);
>+}
>+
>+// Tests assigning a tuple to another tuple with the same type.
>+TEST(TupleAssignmentTest, AssignsToSameTupleType) {
>+ const tuple<int, long> a(5, 7L);
>+ tuple<int, long> b;
>+ b = a;
>+ EXPECT_EQ(5, get<0>(b));
>+ EXPECT_EQ(7L, get<1>(b));
>+}
>+
>+// Tests assigning a tuple to another tuple with a different but
>+// compatible type.
>+TEST(TupleAssignmentTest, AssignsToDifferentTupleType) {
>+ const tuple<int, long, bool> a(1, 7L, true);
>+ tuple<long, int, bool> b;
>+ b = a;
>+ EXPECT_EQ(1L, get<0>(b));
>+ EXPECT_EQ(7, get<1>(b));
>+ EXPECT_TRUE(get<2>(b));
>+}
>+
>+// Tests assigning an std::pair to a 2-tuple.
>+TEST(TupleAssignmentTest, AssignsFromPair) {
>+ const ::std::pair<int, bool> a(5, true);
>+ tuple<int, bool> b;
>+ b = a;
>+ EXPECT_EQ(5, get<0>(b));
>+ EXPECT_TRUE(get<1>(b));
>+
>+ tuple<long, bool> c;
>+ c = a;
>+ EXPECT_EQ(5L, get<0>(c));
>+ EXPECT_TRUE(get<1>(c));
>+}
>+
>+// A fixture for testing big tuples.
>+class BigTupleTest : public testing::Test {
>+ protected:
>+ typedef tuple<int, int, int, int, int, int, int, int, int, int> BigTuple;
>+
>+ BigTupleTest() :
>+ a_(1, 0, 0, 0, 0, 0, 0, 0, 0, 2),
>+ b_(1, 0, 0, 0, 0, 0, 0, 0, 0, 3) {}
>+
>+ BigTuple a_, b_;
>+};
>+
>+// Tests constructing big tuples.
>+TEST_F(BigTupleTest, Construction) {
>+ BigTuple a;
>+ BigTuple b(b_);
>+}
>+
>+// Tests that get<N>(t) returns the N-th (0-based) field of tuple t.
>+TEST_F(BigTupleTest, get) {
>+ EXPECT_EQ(1, get<0>(a_));
>+ EXPECT_EQ(2, get<9>(a_));
>+
>+ // Tests that get() works on a const tuple too.
>+ const BigTuple a(a_);
>+ EXPECT_EQ(1, get<0>(a));
>+ EXPECT_EQ(2, get<9>(a));
>+}
>+
>+// Tests comparing big tuples.
>+TEST_F(BigTupleTest, Comparisons) {
>+ EXPECT_TRUE(a_ == a_);
>+ EXPECT_FALSE(a_ != a_);
>+
>+ EXPECT_TRUE(a_ != b_);
>+ EXPECT_FALSE(a_ == b_);
>+}
>+
>+TEST(MakeTupleTest, WorksForScalarTypes) {
>+ tuple<bool, int> a;
>+ a = make_tuple(true, 5);
>+ EXPECT_TRUE(get<0>(a));
>+ EXPECT_EQ(5, get<1>(a));
>+
>+ tuple<char, int, long> b;
>+ b = make_tuple('a', 'b', 5);
>+ EXPECT_EQ('a', get<0>(b));
>+ EXPECT_EQ('b', get<1>(b));
>+ EXPECT_EQ(5, get<2>(b));
>+}
>+
>+TEST(MakeTupleTest, WorksForPointers) {
>+ int a[] = { 1, 2, 3, 4 };
>+ const char* const str = "hi";
>+ int* const p = a;
>+
>+ tuple<const char*, int*> t;
>+ t = make_tuple(str, p);
>+ EXPECT_EQ(str, get<0>(t));
>+ EXPECT_EQ(p, get<1>(t));
>+}
>+
>+} // namespace
>diff --git a/Source/ThirdParty/gtest/test/googletest-uninitialized-test.py b/Source/ThirdParty/gtest/test/googletest-uninitialized-test.py
>new file mode 100755
>index 0000000000000000000000000000000000000000..5b7d1e74f67fcb00cb848557967def4f6a56cc8f
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-uninitialized-test.py
>@@ -0,0 +1,67 @@
>+#!/usr/bin/env python
>+#
>+# Copyright 2008, Google Inc.
>+# All rights reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+"""Verifies that Google Test warns the user when not initialized properly."""
>+
>+import gtest_test_utils
>+
>+COMMAND = gtest_test_utils.GetTestExecutablePath('googletest-uninitialized-test_')
>+
>+
>+def Assert(condition):
>+ if not condition:
>+ raise AssertionError
>+
>+
>+def AssertEq(expected, actual):
>+ if expected != actual:
>+ print 'Expected: %s' % (expected,)
>+ print ' Actual: %s' % (actual,)
>+ raise AssertionError
>+
>+
>+def TestExitCodeAndOutput(command):
>+ """Runs the given command and verifies its exit code and output."""
>+
>+ # Verifies that 'command' exits with code 1.
>+ p = gtest_test_utils.Subprocess(command)
>+ if p.exited and p.exit_code == 0:
>+ Assert('IMPORTANT NOTICE' in p.output);
>+ Assert('InitGoogleTest' in p.output)
>+
>+
>+class GTestUninitializedTest(gtest_test_utils.TestCase):
>+ def testExitCodeAndOutput(self):
>+ TestExitCodeAndOutput(COMMAND)
>+
>+
>+if __name__ == '__main__':
>+ gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/googletest-uninitialized-test_.cc b/Source/ThirdParty/gtest/test/googletest-uninitialized-test_.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..b4434d51eebfd8726bd3f04c2d0426bba960298c
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/googletest-uninitialized-test_.cc
>@@ -0,0 +1,42 @@
>+// Copyright 2008, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+
>+#include "gtest/gtest.h"
>+
>+TEST(DummyTest, Dummy) {
>+ // This test doesn't verify anything. We just need it to create a
>+ // realistic stage for testing the behavior of Google Test when
>+ // RUN_ALL_TESTS() is called without
>+ // testing::InitGoogleTest() being called first.
>+}
>+
>+int main() {
>+ return RUN_ALL_TESTS();
>+}
>diff --git a/Source/ThirdParty/gtest/test/gtest-death-test_test.cc b/Source/ThirdParty/gtest/test/gtest-death-test_test.cc
>deleted file mode 100644
>index ed5b53b71af2f79560d7172aa67cc740ba704011..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest-death-test_test.cc
>+++ /dev/null
>@@ -1,1230 +0,0 @@
>-// Copyright 2005, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>-//
>-// Tests for death tests.
>-
>-#include <gtest/gtest-death-test.h>
>-#include <gtest/gtest.h>
>-#include <gtest/internal/gtest-filepath.h>
>-
>-using testing::internal::AlwaysFalse;
>-using testing::internal::AlwaysTrue;
>-
>-#if GTEST_HAS_DEATH_TEST
>-
>-#if GTEST_OS_WINDOWS
>-#include <direct.h> // For chdir().
>-#else
>-#include <unistd.h>
>-#include <sys/wait.h> // For waitpid.
>-#include <limits> // For std::numeric_limits.
>-#endif // GTEST_OS_WINDOWS
>-
>-#include <limits.h>
>-#include <signal.h>
>-#include <stdio.h>
>-
>-#include <gtest/gtest-spi.h>
>-
>-// Indicates that this translation unit is part of Google Test's
>-// implementation. It must come before gtest-internal-inl.h is
>-// included, or there will be a compiler error. This trick is to
>-// prevent a user from accidentally including gtest-internal-inl.h in
>-// his code.
>-#define GTEST_IMPLEMENTATION_ 1
>-#include "src/gtest-internal-inl.h"
>-#undef GTEST_IMPLEMENTATION_
>-
>-namespace posix = ::testing::internal::posix;
>-
>-using testing::Message;
>-using testing::internal::DeathTest;
>-using testing::internal::DeathTestFactory;
>-using testing::internal::FilePath;
>-using testing::internal::GetLastErrnoDescription;
>-using testing::internal::GetUnitTestImpl;
>-using testing::internal::ParseNaturalNumber;
>-using testing::internal::String;
>-
>-namespace testing {
>-namespace internal {
>-
>-// A helper class whose objects replace the death test factory for a
>-// single UnitTest object during their lifetimes.
>-class ReplaceDeathTestFactory {
>- public:
>- explicit ReplaceDeathTestFactory(DeathTestFactory* new_factory)
>- : unit_test_impl_(GetUnitTestImpl()) {
>- old_factory_ = unit_test_impl_->death_test_factory_.release();
>- unit_test_impl_->death_test_factory_.reset(new_factory);
>- }
>-
>- ~ReplaceDeathTestFactory() {
>- unit_test_impl_->death_test_factory_.release();
>- unit_test_impl_->death_test_factory_.reset(old_factory_);
>- }
>- private:
>- // Prevents copying ReplaceDeathTestFactory objects.
>- ReplaceDeathTestFactory(const ReplaceDeathTestFactory&);
>- void operator=(const ReplaceDeathTestFactory&);
>-
>- UnitTestImpl* unit_test_impl_;
>- DeathTestFactory* old_factory_;
>-};
>-
>-} // namespace internal
>-} // namespace testing
>-
>-void DieInside(const char* function) {
>- fprintf(stderr, "death inside %s().", function);
>- fflush(stderr);
>- // We call _exit() instead of exit(), as the former is a direct
>- // system call and thus safer in the presence of threads. exit()
>- // will invoke user-defined exit-hooks, which may do dangerous
>- // things that conflict with death tests.
>- //
>- // Some compilers can recognize that _exit() never returns and issue the
>- // 'unreachable code' warning for code following this function, unless
>- // fooled by a fake condition.
>- if (AlwaysTrue())
>- _exit(1);
>-}
>-
>-// Tests that death tests work.
>-
>-class TestForDeathTest : public testing::Test {
>- protected:
>- TestForDeathTest() : original_dir_(FilePath::GetCurrentDir()) {}
>-
>- virtual ~TestForDeathTest() {
>- posix::ChDir(original_dir_.c_str());
>- }
>-
>- // A static member function that's expected to die.
>- static void StaticMemberFunction() { DieInside("StaticMemberFunction"); }
>-
>- // A method of the test fixture that may die.
>- void MemberFunction() {
>- if (should_die_)
>- DieInside("MemberFunction");
>- }
>-
>- // True iff MemberFunction() should die.
>- bool should_die_;
>- const FilePath original_dir_;
>-};
>-
>-// A class with a member function that may die.
>-class MayDie {
>- public:
>- explicit MayDie(bool should_die) : should_die_(should_die) {}
>-
>- // A member function that may die.
>- void MemberFunction() const {
>- if (should_die_)
>- DieInside("MayDie::MemberFunction");
>- }
>-
>- private:
>- // True iff MemberFunction() should die.
>- bool should_die_;
>-};
>-
>-// A global function that's expected to die.
>-void GlobalFunction() { DieInside("GlobalFunction"); }
>-
>-// A non-void function that's expected to die.
>-int NonVoidFunction() {
>- DieInside("NonVoidFunction");
>- return 1;
>-}
>-
>-// A unary function that may die.
>-void DieIf(bool should_die) {
>- if (should_die)
>- DieInside("DieIf");
>-}
>-
>-// A binary function that may die.
>-bool DieIfLessThan(int x, int y) {
>- if (x < y) {
>- DieInside("DieIfLessThan");
>- }
>- return true;
>-}
>-
>-// Tests that ASSERT_DEATH can be used outside a TEST, TEST_F, or test fixture.
>-void DeathTestSubroutine() {
>- EXPECT_DEATH(GlobalFunction(), "death.*GlobalFunction");
>- ASSERT_DEATH(GlobalFunction(), "death.*GlobalFunction");
>-}
>-
>-// Death in dbg, not opt.
>-int DieInDebugElse12(int* sideeffect) {
>- if (sideeffect) *sideeffect = 12;
>-#ifndef NDEBUG
>- DieInside("DieInDebugElse12");
>-#endif // NDEBUG
>- return 12;
>-}
>-
>-#if GTEST_OS_WINDOWS
>-
>-// Tests the ExitedWithCode predicate.
>-TEST(ExitStatusPredicateTest, ExitedWithCode) {
>- // On Windows, the process's exit code is the same as its exit status,
>- // so the predicate just compares the its input with its parameter.
>- EXPECT_TRUE(testing::ExitedWithCode(0)(0));
>- EXPECT_TRUE(testing::ExitedWithCode(1)(1));
>- EXPECT_TRUE(testing::ExitedWithCode(42)(42));
>- EXPECT_FALSE(testing::ExitedWithCode(0)(1));
>- EXPECT_FALSE(testing::ExitedWithCode(1)(0));
>-}
>-
>-#else
>-
>-// Returns the exit status of a process that calls _exit(2) with a
>-// given exit code. This is a helper function for the
>-// ExitStatusPredicateTest test suite.
>-static int NormalExitStatus(int exit_code) {
>- pid_t child_pid = fork();
>- if (child_pid == 0) {
>- _exit(exit_code);
>- }
>- int status;
>- waitpid(child_pid, &status, 0);
>- return status;
>-}
>-
>-// Returns the exit status of a process that raises a given signal.
>-// If the signal does not cause the process to die, then it returns
>-// instead the exit status of a process that exits normally with exit
>-// code 1. This is a helper function for the ExitStatusPredicateTest
>-// test suite.
>-static int KilledExitStatus(int signum) {
>- pid_t child_pid = fork();
>- if (child_pid == 0) {
>- raise(signum);
>- _exit(1);
>- }
>- int status;
>- waitpid(child_pid, &status, 0);
>- return status;
>-}
>-
>-// Tests the ExitedWithCode predicate.
>-TEST(ExitStatusPredicateTest, ExitedWithCode) {
>- const int status0 = NormalExitStatus(0);
>- const int status1 = NormalExitStatus(1);
>- const int status42 = NormalExitStatus(42);
>- const testing::ExitedWithCode pred0(0);
>- const testing::ExitedWithCode pred1(1);
>- const testing::ExitedWithCode pred42(42);
>- EXPECT_PRED1(pred0, status0);
>- EXPECT_PRED1(pred1, status1);
>- EXPECT_PRED1(pred42, status42);
>- EXPECT_FALSE(pred0(status1));
>- EXPECT_FALSE(pred42(status0));
>- EXPECT_FALSE(pred1(status42));
>-}
>-
>-// Tests the KilledBySignal predicate.
>-TEST(ExitStatusPredicateTest, KilledBySignal) {
>- const int status_segv = KilledExitStatus(SIGSEGV);
>- const int status_kill = KilledExitStatus(SIGKILL);
>- const testing::KilledBySignal pred_segv(SIGSEGV);
>- const testing::KilledBySignal pred_kill(SIGKILL);
>- EXPECT_PRED1(pred_segv, status_segv);
>- EXPECT_PRED1(pred_kill, status_kill);
>- EXPECT_FALSE(pred_segv(status_kill));
>- EXPECT_FALSE(pred_kill(status_segv));
>-}
>-
>-#endif // GTEST_OS_WINDOWS
>-
>-// Tests that the death test macros expand to code which may or may not
>-// be followed by operator<<, and that in either case the complete text
>-// comprises only a single C++ statement.
>-TEST_F(TestForDeathTest, SingleStatement) {
>- if (AlwaysFalse())
>- // This would fail if executed; this is a compilation test only
>- ASSERT_DEATH(return, "");
>-
>- if (AlwaysTrue())
>- EXPECT_DEATH(_exit(1), "");
>- else
>- // This empty "else" branch is meant to ensure that EXPECT_DEATH
>- // doesn't expand into an "if" statement without an "else"
>- ;
>-
>- if (AlwaysFalse())
>- ASSERT_DEATH(return, "") << "did not die";
>-
>- if (AlwaysFalse())
>- ;
>- else
>- EXPECT_DEATH(_exit(1), "") << 1 << 2 << 3;
>-}
>-
>-void DieWithEmbeddedNul() {
>- fprintf(stderr, "Hello%cmy null world.\n", '\0');
>- fflush(stderr);
>- _exit(1);
>-}
>-
>-#if GTEST_USES_PCRE
>-// Tests that EXPECT_DEATH and ASSERT_DEATH work when the error
>-// message has a NUL character in it.
>-TEST_F(TestForDeathTest, EmbeddedNulInMessage) {
>- // TODO(wan@google.com): <regex.h> doesn't support matching strings
>- // with embedded NUL characters - find a way to workaround it.
>- EXPECT_DEATH(DieWithEmbeddedNul(), "my null world");
>- ASSERT_DEATH(DieWithEmbeddedNul(), "my null world");
>-}
>-#endif // GTEST_USES_PCRE
>-
>-// Tests that death test macros expand to code which interacts well with switch
>-// statements.
>-TEST_F(TestForDeathTest, SwitchStatement) {
>-// Microsoft compiler usually complains about switch statements without
>-// case labels. We suppress that warning for this test.
>-#ifdef _MSC_VER
>-#pragma warning(push)
>-#pragma warning(disable: 4065)
>-#endif // _MSC_VER
>-
>- switch (0)
>- default:
>- ASSERT_DEATH(_exit(1), "") << "exit in default switch handler";
>-
>- switch (0)
>- case 0:
>- EXPECT_DEATH(_exit(1), "") << "exit in switch case";
>-
>-#ifdef _MSC_VER
>-#pragma warning(pop)
>-#endif // _MSC_VER
>-}
>-
>-// Tests that a static member function can be used in a "fast" style
>-// death test.
>-TEST_F(TestForDeathTest, StaticMemberFunctionFastStyle) {
>- testing::GTEST_FLAG(death_test_style) = "fast";
>- ASSERT_DEATH(StaticMemberFunction(), "death.*StaticMember");
>-}
>-
>-// Tests that a method of the test fixture can be used in a "fast"
>-// style death test.
>-TEST_F(TestForDeathTest, MemberFunctionFastStyle) {
>- testing::GTEST_FLAG(death_test_style) = "fast";
>- should_die_ = true;
>- EXPECT_DEATH(MemberFunction(), "inside.*MemberFunction");
>-}
>-
>-void ChangeToRootDir() { posix::ChDir(GTEST_PATH_SEP_); }
>-
>-// Tests that death tests work even if the current directory has been
>-// changed.
>-TEST_F(TestForDeathTest, FastDeathTestInChangedDir) {
>- testing::GTEST_FLAG(death_test_style) = "fast";
>-
>- ChangeToRootDir();
>- EXPECT_EXIT(_exit(1), testing::ExitedWithCode(1), "");
>-
>- ChangeToRootDir();
>- ASSERT_DEATH(_exit(1), "");
>-}
>-
>-// Repeats a representative sample of death tests in the "threadsafe" style:
>-
>-TEST_F(TestForDeathTest, StaticMemberFunctionThreadsafeStyle) {
>- testing::GTEST_FLAG(death_test_style) = "threadsafe";
>- ASSERT_DEATH(StaticMemberFunction(), "death.*StaticMember");
>-}
>-
>-TEST_F(TestForDeathTest, MemberFunctionThreadsafeStyle) {
>- testing::GTEST_FLAG(death_test_style) = "threadsafe";
>- should_die_ = true;
>- EXPECT_DEATH(MemberFunction(), "inside.*MemberFunction");
>-}
>-
>-TEST_F(TestForDeathTest, ThreadsafeDeathTestInLoop) {
>- testing::GTEST_FLAG(death_test_style) = "threadsafe";
>-
>- for (int i = 0; i < 3; ++i)
>- EXPECT_EXIT(_exit(i), testing::ExitedWithCode(i), "") << ": i = " << i;
>-}
>-
>-TEST_F(TestForDeathTest, ThreadsafeDeathTestInChangedDir) {
>- testing::GTEST_FLAG(death_test_style) = "threadsafe";
>-
>- ChangeToRootDir();
>- EXPECT_EXIT(_exit(1), testing::ExitedWithCode(1), "");
>-
>- ChangeToRootDir();
>- ASSERT_DEATH(_exit(1), "");
>-}
>-
>-TEST_F(TestForDeathTest, MixedStyles) {
>- testing::GTEST_FLAG(death_test_style) = "threadsafe";
>- EXPECT_DEATH(_exit(1), "");
>- testing::GTEST_FLAG(death_test_style) = "fast";
>- EXPECT_DEATH(_exit(1), "");
>-}
>-
>-namespace {
>-
>-bool pthread_flag;
>-
>-void SetPthreadFlag() {
>- pthread_flag = true;
>-}
>-
>-} // namespace
>-
>-#if GTEST_HAS_CLONE && GTEST_HAS_PTHREAD
>-
>-TEST_F(TestForDeathTest, DoesNotExecuteAtforkHooks) {
>- if (!testing::GTEST_FLAG(death_test_use_fork)) {
>- testing::GTEST_FLAG(death_test_style) = "threadsafe";
>- pthread_flag = false;
>- ASSERT_EQ(0, pthread_atfork(&SetPthreadFlag, NULL, NULL));
>- ASSERT_DEATH(_exit(1), "");
>- ASSERT_FALSE(pthread_flag);
>- }
>-}
>-
>-#endif // GTEST_HAS_CLONE && GTEST_HAS_PTHREAD
>-
>-// Tests that a method of another class can be used in a death test.
>-TEST_F(TestForDeathTest, MethodOfAnotherClass) {
>- const MayDie x(true);
>- ASSERT_DEATH(x.MemberFunction(), "MayDie\\:\\:MemberFunction");
>-}
>-
>-// Tests that a global function can be used in a death test.
>-TEST_F(TestForDeathTest, GlobalFunction) {
>- EXPECT_DEATH(GlobalFunction(), "GlobalFunction");
>-}
>-
>-// Tests that any value convertible to an RE works as a second
>-// argument to EXPECT_DEATH.
>-TEST_F(TestForDeathTest, AcceptsAnythingConvertibleToRE) {
>- static const char regex_c_str[] = "GlobalFunction";
>- EXPECT_DEATH(GlobalFunction(), regex_c_str);
>-
>- const testing::internal::RE regex(regex_c_str);
>- EXPECT_DEATH(GlobalFunction(), regex);
>-
>-#if GTEST_HAS_GLOBAL_STRING
>- const string regex_str(regex_c_str);
>- EXPECT_DEATH(GlobalFunction(), regex_str);
>-#endif // GTEST_HAS_GLOBAL_STRING
>-
>- const ::std::string regex_std_str(regex_c_str);
>- EXPECT_DEATH(GlobalFunction(), regex_std_str);
>-}
>-
>-// Tests that a non-void function can be used in a death test.
>-TEST_F(TestForDeathTest, NonVoidFunction) {
>- ASSERT_DEATH(NonVoidFunction(), "NonVoidFunction");
>-}
>-
>-// Tests that functions that take parameter(s) can be used in a death test.
>-TEST_F(TestForDeathTest, FunctionWithParameter) {
>- EXPECT_DEATH(DieIf(true), "DieIf\$\$");
>- EXPECT_DEATH(DieIfLessThan(2, 3), "DieIfLessThan");
>-}
>-
>-// Tests that ASSERT_DEATH can be used outside a TEST, TEST_F, or test fixture.
>-TEST_F(TestForDeathTest, OutsideFixture) {
>- DeathTestSubroutine();
>-}
>-
>-// Tests that death tests can be done inside a loop.
>-TEST_F(TestForDeathTest, InsideLoop) {
>- for (int i = 0; i < 5; i++) {
>- EXPECT_DEATH(DieIfLessThan(-1, i), "DieIfLessThan") << "where i == " << i;
>- }
>-}
>-
>-// Tests that a compound statement can be used in a death test.
>-TEST_F(TestForDeathTest, CompoundStatement) {
>- EXPECT_DEATH({ // NOLINT
>- const int x = 2;
>- const int y = x + 1;
>- DieIfLessThan(x, y);
>- },
>- "DieIfLessThan");
>-}
>-
>-// Tests that code that doesn't die causes a death test to fail.
>-TEST_F(TestForDeathTest, DoesNotDie) {
>- EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(DieIf(false), "DieIf"),
>- "failed to die");
>-}
>-
>-// Tests that a death test fails when the error message isn't expected.
>-TEST_F(TestForDeathTest, ErrorMessageMismatch) {
>- EXPECT_NONFATAL_FAILURE({ // NOLINT
>- EXPECT_DEATH(DieIf(true), "DieIfLessThan") << "End of death test message.";
>- }, "died but not with expected error");
>-}
>-
>-// On exit, *aborted will be true iff the EXPECT_DEATH() statement
>-// aborted the function.
>-void ExpectDeathTestHelper(bool* aborted) {
>- *aborted = true;
>- EXPECT_DEATH(DieIf(false), "DieIf"); // This assertion should fail.
>- *aborted = false;
>-}
>-
>-// Tests that EXPECT_DEATH doesn't abort the test on failure.
>-TEST_F(TestForDeathTest, EXPECT_DEATH) {
>- bool aborted = true;
>- EXPECT_NONFATAL_FAILURE(ExpectDeathTestHelper(&aborted),
>- "failed to die");
>- EXPECT_FALSE(aborted);
>-}
>-
>-// Tests that ASSERT_DEATH does abort the test on failure.
>-TEST_F(TestForDeathTest, ASSERT_DEATH) {
>- static bool aborted;
>- EXPECT_FATAL_FAILURE({ // NOLINT
>- aborted = true;
>- ASSERT_DEATH(DieIf(false), "DieIf"); // This assertion should fail.
>- aborted = false;
>- }, "failed to die");
>- EXPECT_TRUE(aborted);
>-}
>-
>-// Tests that EXPECT_DEATH evaluates the arguments exactly once.
>-TEST_F(TestForDeathTest, SingleEvaluation) {
>- int x = 3;
>- EXPECT_DEATH(DieIf((++x) == 4), "DieIf");
>-
>- const char* regex = "DieIf";
>- const char* regex_save = regex;
>- EXPECT_DEATH(DieIfLessThan(3, 4), regex++);
>- EXPECT_EQ(regex_save + 1, regex);
>-}
>-
>-// Tests that run-away death tests are reported as failures.
>-TEST_F(TestForDeathTest, Runaway) {
>- EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(static_cast<void>(0), "Foo"),
>- "failed to die.");
>-
>- EXPECT_FATAL_FAILURE(ASSERT_DEATH(return, "Bar"),
>- "illegal return in test statement.");
>-}
>-
>-
>-// Tests that EXPECT_DEBUG_DEATH works as expected,
>-// that is, in debug mode, it:
>-// 1. Asserts on death.
>-// 2. Has no side effect.
>-//
>-// And in opt mode, it:
>-// 1. Has side effects but does not assert.
>-TEST_F(TestForDeathTest, TestExpectDebugDeath) {
>- int sideeffect = 0;
>-
>- EXPECT_DEBUG_DEATH(DieInDebugElse12(&sideeffect),
>- "death.*DieInDebugElse12");
>-
>-#ifdef NDEBUG
>- // Checks that the assignment occurs in opt mode (sideeffect).
>- EXPECT_EQ(12, sideeffect);
>-#else
>- // Checks that the assignment does not occur in dbg mode (no sideeffect).
>- EXPECT_EQ(0, sideeffect);
>-#endif
>-}
>-
>-// Tests that ASSERT_DEBUG_DEATH works as expected
>-// In debug mode:
>-// 1. Asserts on debug death.
>-// 2. Has no side effect.
>-//
>-// In opt mode:
>-// 1. Has side effects and returns the expected value (12).
>-TEST_F(TestForDeathTest, TestAssertDebugDeath) {
>- int sideeffect = 0;
>-
>- ASSERT_DEBUG_DEATH({ // NOLINT
>- // Tests that the return value is 12 in opt mode.
>- EXPECT_EQ(12, DieInDebugElse12(&sideeffect));
>- // Tests that the side effect occurred in opt mode.
>- EXPECT_EQ(12, sideeffect);
>- }, "death.*DieInDebugElse12");
>-
>-#ifdef NDEBUG
>- // Checks that the assignment occurs in opt mode (sideeffect).
>- EXPECT_EQ(12, sideeffect);
>-#else
>- // Checks that the assignment does not occur in dbg mode (no sideeffect).
>- EXPECT_EQ(0, sideeffect);
>-#endif
>-}
>-
>-#ifndef NDEBUG
>-
>-void ExpectDebugDeathHelper(bool* aborted) {
>- *aborted = true;
>- EXPECT_DEBUG_DEATH(return, "") << "This is expected to fail.";
>- *aborted = false;
>-}
>-
>-#if GTEST_OS_WINDOWS
>-TEST(PopUpDeathTest, DoesNotShowPopUpOnAbort) {
>- printf("This test should be considered failing if it shows "
>- "any pop-up dialogs.\n");
>- fflush(stdout);
>-
>- EXPECT_DEATH({
>- testing::GTEST_FLAG(catch_exceptions) = false;
>- abort();
>- }, "");
>-}
>-
>-TEST(PopUpDeathTest, DoesNotShowPopUpOnThrow) {
>- printf("This test should be considered failing if it shows "
>- "any pop-up dialogs.\n");
>- fflush(stdout);
>-
>- EXPECT_DEATH({
>- testing::GTEST_FLAG(catch_exceptions) = false;
>- throw 1;
>- }, "");
>-}
>-#endif // GTEST_OS_WINDOWS
>-
>-// Tests that EXPECT_DEBUG_DEATH in debug mode does not abort
>-// the function.
>-TEST_F(TestForDeathTest, ExpectDebugDeathDoesNotAbort) {
>- bool aborted = true;
>- EXPECT_NONFATAL_FAILURE(ExpectDebugDeathHelper(&aborted), "");
>- EXPECT_FALSE(aborted);
>-}
>-
>-void AssertDebugDeathHelper(bool* aborted) {
>- *aborted = true;
>- ASSERT_DEBUG_DEATH(return, "") << "This is expected to fail.";
>- *aborted = false;
>-}
>-
>-// Tests that ASSERT_DEBUG_DEATH in debug mode aborts the function on
>-// failure.
>-TEST_F(TestForDeathTest, AssertDebugDeathAborts) {
>- static bool aborted;
>- aborted = false;
>- EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
>- EXPECT_TRUE(aborted);
>-}
>-
>-#endif // _NDEBUG
>-
>-// Tests the *_EXIT family of macros, using a variety of predicates.
>-static void TestExitMacros() {
>- EXPECT_EXIT(_exit(1), testing::ExitedWithCode(1), "");
>- ASSERT_EXIT(_exit(42), testing::ExitedWithCode(42), "");
>-
>-#if GTEST_OS_WINDOWS
>- // Of all signals effects on the process exit code, only those of SIGABRT
>- // are documented on Windows.
>- // See http://msdn.microsoft.com/en-us/library/dwwzkt4c(VS.71).aspx.
>- EXPECT_EXIT(raise(SIGABRT), testing::ExitedWithCode(3), "");
>-#else
>- EXPECT_EXIT(raise(SIGKILL), testing::KilledBySignal(SIGKILL), "") << "foo";
>- ASSERT_EXIT(raise(SIGUSR2), testing::KilledBySignal(SIGUSR2), "") << "bar";
>-
>- EXPECT_FATAL_FAILURE({ // NOLINT
>- ASSERT_EXIT(_exit(0), testing::KilledBySignal(SIGSEGV), "")
>- << "This failure is expected, too.";
>- }, "This failure is expected, too.");
>-#endif // GTEST_OS_WINDOWS
>-
>- EXPECT_NONFATAL_FAILURE({ // NOLINT
>- EXPECT_EXIT(raise(SIGSEGV), testing::ExitedWithCode(0), "")
>- << "This failure is expected.";
>- }, "This failure is expected.");
>-}
>-
>-TEST_F(TestForDeathTest, ExitMacros) {
>- TestExitMacros();
>-}
>-
>-TEST_F(TestForDeathTest, ExitMacrosUsingFork) {
>- testing::GTEST_FLAG(death_test_use_fork) = true;
>- TestExitMacros();
>-}
>-
>-TEST_F(TestForDeathTest, InvalidStyle) {
>- testing::GTEST_FLAG(death_test_style) = "rococo";
>- EXPECT_NONFATAL_FAILURE({ // NOLINT
>- EXPECT_DEATH(_exit(0), "") << "This failure is expected.";
>- }, "This failure is expected.");
>-}
>-
>-// A DeathTestFactory that returns MockDeathTests.
>-class MockDeathTestFactory : public DeathTestFactory {
>- public:
>- MockDeathTestFactory();
>- virtual bool Create(const char* statement,
>- const ::testing::internal::RE* regex,
>- const char* file, int line, DeathTest** test);
>-
>- // Sets the parameters for subsequent calls to Create.
>- void SetParameters(bool create, DeathTest::TestRole role,
>- int status, bool passed);
>-
>- // Accessors.
>- int AssumeRoleCalls() const { return assume_role_calls_; }
>- int WaitCalls() const { return wait_calls_; }
>- int PassedCalls() const { return passed_args_.size(); }
>- bool PassedArgument(int n) const { return passed_args_[n]; }
>- int AbortCalls() const { return abort_args_.size(); }
>- DeathTest::AbortReason AbortArgument(int n) const {
>- return abort_args_[n];
>- }
>- bool TestDeleted() const { return test_deleted_; }
>-
>- private:
>- friend class MockDeathTest;
>- // If true, Create will return a MockDeathTest; otherwise it returns
>- // NULL.
>- bool create_;
>- // The value a MockDeathTest will return from its AssumeRole method.
>- DeathTest::TestRole role_;
>- // The value a MockDeathTest will return from its Wait method.
>- int status_;
>- // The value a MockDeathTest will return from its Passed method.
>- bool passed_;
>-
>- // Number of times AssumeRole was called.
>- int assume_role_calls_;
>- // Number of times Wait was called.
>- int wait_calls_;
>- // The arguments to the calls to Passed since the last call to
>- // SetParameters.
>- std::vector<bool> passed_args_;
>- // The arguments to the calls to Abort since the last call to
>- // SetParameters.
>- std::vector<DeathTest::AbortReason> abort_args_;
>- // True if the last MockDeathTest returned by Create has been
>- // deleted.
>- bool test_deleted_;
>-};
>-
>-
>-// A DeathTest implementation useful in testing. It returns values set
>-// at its creation from its various inherited DeathTest methods, and
>-// reports calls to those methods to its parent MockDeathTestFactory
>-// object.
>-class MockDeathTest : public DeathTest {
>- public:
>- MockDeathTest(MockDeathTestFactory *parent,
>- TestRole role, int status, bool passed) :
>- parent_(parent), role_(role), status_(status), passed_(passed) {
>- }
>- virtual ~MockDeathTest() {
>- parent_->test_deleted_ = true;
>- }
>- virtual TestRole AssumeRole() {
>- ++parent_->assume_role_calls_;
>- return role_;
>- }
>- virtual int Wait() {
>- ++parent_->wait_calls_;
>- return status_;
>- }
>- virtual bool Passed(bool exit_status_ok) {
>- parent_->passed_args_.push_back(exit_status_ok);
>- return passed_;
>- }
>- virtual void Abort(AbortReason reason) {
>- parent_->abort_args_.push_back(reason);
>- }
>- private:
>- MockDeathTestFactory* const parent_;
>- const TestRole role_;
>- const int status_;
>- const bool passed_;
>-};
>-
>-
>-// MockDeathTestFactory constructor.
>-MockDeathTestFactory::MockDeathTestFactory()
>- : create_(true),
>- role_(DeathTest::OVERSEE_TEST),
>- status_(0),
>- passed_(true),
>- assume_role_calls_(0),
>- wait_calls_(0),
>- passed_args_(),
>- abort_args_() {
>-}
>-
>-
>-// Sets the parameters for subsequent calls to Create.
>-void MockDeathTestFactory::SetParameters(bool create,
>- DeathTest::TestRole role,
>- int status, bool passed) {
>- create_ = create;
>- role_ = role;
>- status_ = status;
>- passed_ = passed;
>-
>- assume_role_calls_ = 0;
>- wait_calls_ = 0;
>- passed_args_.clear();
>- abort_args_.clear();
>-}
>-
>-
>-// Sets test to NULL (if create_ is false) or to the address of a new
>-// MockDeathTest object with parameters taken from the last call
>-// to SetParameters (if create_ is true). Always returns true.
>-bool MockDeathTestFactory::Create(const char* /*statement*/,
>- const ::testing::internal::RE* /*regex*/,
>- const char* /*file*/,
>- int /*line*/,
>- DeathTest** test) {
>- test_deleted_ = false;
>- if (create_) {
>- *test = new MockDeathTest(this, role_, status_, passed_);
>- } else {
>- *test = NULL;
>- }
>- return true;
>-}
>-
>-// A test fixture for testing the logic of the GTEST_DEATH_TEST_ macro.
>-// It installs a MockDeathTestFactory that is used for the duration
>-// of the test case.
>-class MacroLogicDeathTest : public testing::Test {
>- protected:
>- static testing::internal::ReplaceDeathTestFactory* replacer_;
>- static MockDeathTestFactory* factory_;
>-
>- static void SetUpTestCase() {
>- factory_ = new MockDeathTestFactory;
>- replacer_ = new testing::internal::ReplaceDeathTestFactory(factory_);
>- }
>-
>- static void TearDownTestCase() {
>- delete replacer_;
>- replacer_ = NULL;
>- delete factory_;
>- factory_ = NULL;
>- }
>-
>- // Runs a death test that breaks the rules by returning. Such a death
>- // test cannot be run directly from a test routine that uses a
>- // MockDeathTest, or the remainder of the routine will not be executed.
>- static void RunReturningDeathTest(bool* flag) {
>- ASSERT_DEATH({ // NOLINT
>- *flag = true;
>- return;
>- }, "");
>- }
>-};
>-
>-testing::internal::ReplaceDeathTestFactory* MacroLogicDeathTest::replacer_
>- = NULL;
>-MockDeathTestFactory* MacroLogicDeathTest::factory_ = NULL;
>-
>-
>-// Test that nothing happens when the factory doesn't return a DeathTest:
>-TEST_F(MacroLogicDeathTest, NothingHappens) {
>- bool flag = false;
>- factory_->SetParameters(false, DeathTest::OVERSEE_TEST, 0, true);
>- EXPECT_DEATH(flag = true, "");
>- EXPECT_FALSE(flag);
>- EXPECT_EQ(0, factory_->AssumeRoleCalls());
>- EXPECT_EQ(0, factory_->WaitCalls());
>- EXPECT_EQ(0, factory_->PassedCalls());
>- EXPECT_EQ(0, factory_->AbortCalls());
>- EXPECT_FALSE(factory_->TestDeleted());
>-}
>-
>-// Test that the parent process doesn't run the death test code,
>-// and that the Passed method returns false when the (simulated)
>-// child process exits with status 0:
>-TEST_F(MacroLogicDeathTest, ChildExitsSuccessfully) {
>- bool flag = false;
>- factory_->SetParameters(true, DeathTest::OVERSEE_TEST, 0, true);
>- EXPECT_DEATH(flag = true, "");
>- EXPECT_FALSE(flag);
>- EXPECT_EQ(1, factory_->AssumeRoleCalls());
>- EXPECT_EQ(1, factory_->WaitCalls());
>- ASSERT_EQ(1, factory_->PassedCalls());
>- EXPECT_FALSE(factory_->PassedArgument(0));
>- EXPECT_EQ(0, factory_->AbortCalls());
>- EXPECT_TRUE(factory_->TestDeleted());
>-}
>-
>-// Tests that the Passed method was given the argument "true" when
>-// the (simulated) child process exits with status 1:
>-TEST_F(MacroLogicDeathTest, ChildExitsUnsuccessfully) {
>- bool flag = false;
>- factory_->SetParameters(true, DeathTest::OVERSEE_TEST, 1, true);
>- EXPECT_DEATH(flag = true, "");
>- EXPECT_FALSE(flag);
>- EXPECT_EQ(1, factory_->AssumeRoleCalls());
>- EXPECT_EQ(1, factory_->WaitCalls());
>- ASSERT_EQ(1, factory_->PassedCalls());
>- EXPECT_TRUE(factory_->PassedArgument(0));
>- EXPECT_EQ(0, factory_->AbortCalls());
>- EXPECT_TRUE(factory_->TestDeleted());
>-}
>-
>-// Tests that the (simulated) child process executes the death test
>-// code, and is aborted with the correct AbortReason if it
>-// executes a return statement.
>-TEST_F(MacroLogicDeathTest, ChildPerformsReturn) {
>- bool flag = false;
>- factory_->SetParameters(true, DeathTest::EXECUTE_TEST, 0, true);
>- RunReturningDeathTest(&flag);
>- EXPECT_TRUE(flag);
>- EXPECT_EQ(1, factory_->AssumeRoleCalls());
>- EXPECT_EQ(0, factory_->WaitCalls());
>- EXPECT_EQ(0, factory_->PassedCalls());
>- EXPECT_EQ(1, factory_->AbortCalls());
>- EXPECT_EQ(DeathTest::TEST_ENCOUNTERED_RETURN_STATEMENT,
>- factory_->AbortArgument(0));
>- EXPECT_TRUE(factory_->TestDeleted());
>-}
>-
>-// Tests that the (simulated) child process is aborted with the
>-// correct AbortReason if it does not die.
>-TEST_F(MacroLogicDeathTest, ChildDoesNotDie) {
>- bool flag = false;
>- factory_->SetParameters(true, DeathTest::EXECUTE_TEST, 0, true);
>- EXPECT_DEATH(flag = true, "");
>- EXPECT_TRUE(flag);
>- EXPECT_EQ(1, factory_->AssumeRoleCalls());
>- EXPECT_EQ(0, factory_->WaitCalls());
>- EXPECT_EQ(0, factory_->PassedCalls());
>- // This time there are two calls to Abort: one since the test didn't
>- // die, and another from the ReturnSentinel when it's destroyed. The
>- // sentinel normally isn't destroyed if a test doesn't die, since
>- // _exit(2) is called in that case by ForkingDeathTest, but not by
>- // our MockDeathTest.
>- ASSERT_EQ(2, factory_->AbortCalls());
>- EXPECT_EQ(DeathTest::TEST_DID_NOT_DIE,
>- factory_->AbortArgument(0));
>- EXPECT_EQ(DeathTest::TEST_ENCOUNTERED_RETURN_STATEMENT,
>- factory_->AbortArgument(1));
>- EXPECT_TRUE(factory_->TestDeleted());
>-}
>-
>-// Tests that a successful death test does not register a successful
>-// test part.
>-TEST(SuccessRegistrationDeathTest, NoSuccessPart) {
>- EXPECT_DEATH(_exit(1), "");
>- EXPECT_EQ(0, GetUnitTestImpl()->current_test_result()->total_part_count());
>-}
>-
>-TEST(StreamingAssertionsDeathTest, DeathTest) {
>- EXPECT_DEATH(_exit(1), "") << "unexpected failure";
>- ASSERT_DEATH(_exit(1), "") << "unexpected failure";
>- EXPECT_NONFATAL_FAILURE({ // NOLINT
>- EXPECT_DEATH(_exit(0), "") << "expected failure";
>- }, "expected failure");
>- EXPECT_FATAL_FAILURE({ // NOLINT
>- ASSERT_DEATH(_exit(0), "") << "expected failure";
>- }, "expected failure");
>-}
>-
>-// Tests that GetLastErrnoDescription returns an empty string when the
>-// last error is 0 and non-empty string when it is non-zero.
>-TEST(GetLastErrnoDescription, GetLastErrnoDescriptionWorks) {
>- errno = ENOENT;
>- EXPECT_STRNE("", GetLastErrnoDescription().c_str());
>- errno = 0;
>- EXPECT_STREQ("", GetLastErrnoDescription().c_str());
>-}
>-
>-#if GTEST_OS_WINDOWS
>-TEST(AutoHandleTest, AutoHandleWorks) {
>- HANDLE handle = ::CreateEvent(NULL, FALSE, FALSE, NULL);
>- ASSERT_NE(INVALID_HANDLE_VALUE, handle);
>-
>- // Tests that the AutoHandle is correctly initialized with a handle.
>- testing::internal::AutoHandle auto_handle(handle);
>- EXPECT_EQ(handle, auto_handle.Get());
>-
>- // Tests that Reset assigns INVALID_HANDLE_VALUE.
>- // Note that this cannot verify whether the original handle is closed.
>- auto_handle.Reset();
>- EXPECT_EQ(INVALID_HANDLE_VALUE, auto_handle.Get());
>-
>- // Tests that Reset assigns the new handle.
>- // Note that this cannot verify whether the original handle is closed.
>- handle = ::CreateEvent(NULL, FALSE, FALSE, NULL);
>- ASSERT_NE(INVALID_HANDLE_VALUE, handle);
>- auto_handle.Reset(handle);
>- EXPECT_EQ(handle, auto_handle.Get());
>-
>- // Tests that AutoHandle contains INVALID_HANDLE_VALUE by default.
>- testing::internal::AutoHandle auto_handle2;
>- EXPECT_EQ(INVALID_HANDLE_VALUE, auto_handle2.Get());
>-}
>-#endif // GTEST_OS_WINDOWS
>-
>-#if GTEST_OS_WINDOWS
>-typedef unsigned __int64 BiggestParsable;
>-typedef signed __int64 BiggestSignedParsable;
>-const BiggestParsable kBiggestParsableMax = ULLONG_MAX;
>-const BiggestParsable kBiggestSignedParsableMax = LLONG_MAX;
>-#else
>-typedef unsigned long long BiggestParsable;
>-typedef signed long long BiggestSignedParsable;
>-const BiggestParsable kBiggestParsableMax =
>- ::std::numeric_limits<BiggestParsable>::max();
>-const BiggestSignedParsable kBiggestSignedParsableMax =
>- ::std::numeric_limits<BiggestSignedParsable>::max();
>-#endif // GTEST_OS_WINDOWS
>-
>-TEST(ParseNaturalNumberTest, RejectsInvalidFormat) {
>- BiggestParsable result = 0;
>-
>- // Rejects non-numbers.
>- EXPECT_FALSE(ParseNaturalNumber(String("non-number string"), &result));
>-
>- // Rejects numbers with whitespace prefix.
>- EXPECT_FALSE(ParseNaturalNumber(String(" 123"), &result));
>-
>- // Rejects negative numbers.
>- EXPECT_FALSE(ParseNaturalNumber(String("-123"), &result));
>-
>- // Rejects numbers starting with a plus sign.
>- EXPECT_FALSE(ParseNaturalNumber(String("+123"), &result));
>- errno = 0;
>-}
>-
>-TEST(ParseNaturalNumberTest, RejectsOverflownNumbers) {
>- BiggestParsable result = 0;
>-
>- EXPECT_FALSE(ParseNaturalNumber(String("99999999999999999999999"), &result));
>-
>- signed char char_result = 0;
>- EXPECT_FALSE(ParseNaturalNumber(String("200"), &char_result));
>- errno = 0;
>-}
>-
>-TEST(ParseNaturalNumberTest, AcceptsValidNumbers) {
>- BiggestParsable result = 0;
>-
>- result = 0;
>- ASSERT_TRUE(ParseNaturalNumber(String("123"), &result));
>- EXPECT_EQ(123U, result);
>-
>- // Check 0 as an edge case.
>- result = 1;
>- ASSERT_TRUE(ParseNaturalNumber(String("0"), &result));
>- EXPECT_EQ(0U, result);
>-
>- result = 1;
>- ASSERT_TRUE(ParseNaturalNumber(String("00000"), &result));
>- EXPECT_EQ(0U, result);
>-}
>-
>-TEST(ParseNaturalNumberTest, AcceptsTypeLimits) {
>- Message msg;
>- msg << kBiggestParsableMax;
>-
>- BiggestParsable result = 0;
>- EXPECT_TRUE(ParseNaturalNumber(msg.GetString(), &result));
>- EXPECT_EQ(kBiggestParsableMax, result);
>-
>- Message msg2;
>- msg2 << kBiggestSignedParsableMax;
>-
>- BiggestSignedParsable signed_result = 0;
>- EXPECT_TRUE(ParseNaturalNumber(msg2.GetString(), &signed_result));
>- EXPECT_EQ(kBiggestSignedParsableMax, signed_result);
>-
>- Message msg3;
>- msg3 << INT_MAX;
>-
>- int int_result = 0;
>- EXPECT_TRUE(ParseNaturalNumber(msg3.GetString(), &int_result));
>- EXPECT_EQ(INT_MAX, int_result);
>-
>- Message msg4;
>- msg4 << UINT_MAX;
>-
>- unsigned int uint_result = 0;
>- EXPECT_TRUE(ParseNaturalNumber(msg4.GetString(), &uint_result));
>- EXPECT_EQ(UINT_MAX, uint_result);
>-}
>-
>-TEST(ParseNaturalNumberTest, WorksForShorterIntegers) {
>- short short_result = 0;
>- ASSERT_TRUE(ParseNaturalNumber(String("123"), &short_result));
>- EXPECT_EQ(123, short_result);
>-
>- signed char char_result = 0;
>- ASSERT_TRUE(ParseNaturalNumber(String("123"), &char_result));
>- EXPECT_EQ(123, char_result);
>-}
>-
>-#if GTEST_OS_WINDOWS
>-TEST(EnvironmentTest, HandleFitsIntoSizeT) {
>- // TODO(vladl@google.com): Remove this test after this condition is verified
>- // in a static assertion in gtest-death-test.cc in the function
>- // GetStatusFileDescriptor.
>- ASSERT_TRUE(sizeof(HANDLE) <= sizeof(size_t));
>-}
>-#endif // GTEST_OS_WINDOWS
>-
>-// Tests that EXPECT_DEATH_IF_SUPPORTED/ASSERT_DEATH_IF_SUPPORTED trigger
>-// failures when death tests are available on the system.
>-TEST(ConditionalDeathMacrosDeathTest, ExpectsDeathWhenDeathTestsAvailable) {
>- EXPECT_DEATH_IF_SUPPORTED(DieInside("CondDeathTestExpectMacro"),
>- "death inside CondDeathTestExpectMacro");
>- ASSERT_DEATH_IF_SUPPORTED(DieInside("CondDeathTestAssertMacro"),
>- "death inside CondDeathTestAssertMacro");
>-
>- // Empty statement will not crash, which must trigger a failure.
>- EXPECT_NONFATAL_FAILURE(EXPECT_DEATH_IF_SUPPORTED(;, ""), "");
>- EXPECT_FATAL_FAILURE(ASSERT_DEATH_IF_SUPPORTED(;, ""), "");
>-}
>-
>-#else
>-
>-using testing::internal::CaptureStderr;
>-using testing::internal::GetCapturedStderr;
>-using testing::internal::String;
>-
>-// Tests that EXPECT_DEATH_IF_SUPPORTED/ASSERT_DEATH_IF_SUPPORTED are still
>-// defined but do not trigger failures when death tests are not available on
>-// the system.
>-TEST(ConditionalDeathMacrosTest, WarnsWhenDeathTestsNotAvailable) {
>- // Empty statement will not crash, but that should not trigger a failure
>- // when death tests are not supported.
>- CaptureStderr();
>- EXPECT_DEATH_IF_SUPPORTED(;, "");
>- String output = GetCapturedStderr();
>- ASSERT_TRUE(NULL != strstr(output.c_str(),
>- "Death tests are not supported on this platform"));
>- ASSERT_TRUE(NULL != strstr(output.c_str(), ";"));
>-
>- // The streamed message should not be printed as there is no test failure.
>- CaptureStderr();
>- EXPECT_DEATH_IF_SUPPORTED(;, "") << "streamed message";
>- output = GetCapturedStderr();
>- ASSERT_TRUE(NULL == strstr(output.c_str(), "streamed message"));
>-
>- CaptureStderr();
>- ASSERT_DEATH_IF_SUPPORTED(;, ""); // NOLINT
>- output = GetCapturedStderr();
>- ASSERT_TRUE(NULL != strstr(output.c_str(),
>- "Death tests are not supported on this platform"));
>- ASSERT_TRUE(NULL != strstr(output.c_str(), ";"));
>-
>- CaptureStderr();
>- ASSERT_DEATH_IF_SUPPORTED(;, "") << "streamed message"; // NOLINT
>- output = GetCapturedStderr();
>- ASSERT_TRUE(NULL == strstr(output.c_str(), "streamed message"));
>-}
>-
>-void FuncWithAssert(int* n) {
>- ASSERT_DEATH_IF_SUPPORTED(return;, "");
>- (*n)++;
>-}
>-
>-// Tests that ASSERT_DEATH_IF_SUPPORTED does not return from the current
>-// function (as ASSERT_DEATH does) if death tests are not supported.
>-TEST(ConditionalDeathMacrosTest, AssertDeatDoesNotReturnhIfUnsupported) {
>- int n = 0;
>- FuncWithAssert(&n);
>- EXPECT_EQ(1, n);
>-}
>-#endif // GTEST_HAS_DEATH_TEST
>-
>-// Tests that the death test macros expand to code which may or may not
>-// be followed by operator<<, and that in either case the complete text
>-// comprises only a single C++ statement.
>-//
>-// The syntax should work whether death tests are available or not.
>-TEST(ConditionalDeathMacrosSyntaxDeathTest, SingleStatement) {
>- if (AlwaysFalse())
>- // This would fail if executed; this is a compilation test only
>- ASSERT_DEATH_IF_SUPPORTED(return, "");
>-
>- if (AlwaysTrue())
>- EXPECT_DEATH_IF_SUPPORTED(_exit(1), "");
>- else
>- // This empty "else" branch is meant to ensure that EXPECT_DEATH
>- // doesn't expand into an "if" statement without an "else"
>- ; // NOLINT
>-
>- if (AlwaysFalse())
>- ASSERT_DEATH_IF_SUPPORTED(return, "") << "did not die";
>-
>- if (AlwaysFalse())
>- ; // NOLINT
>- else
>- EXPECT_DEATH_IF_SUPPORTED(_exit(1), "") << 1 << 2 << 3;
>-}
>-
>-// Tests that conditional death test macros expand to code which interacts
>-// well with switch statements.
>-TEST(ConditionalDeathMacrosSyntaxDeathTest, SwitchStatement) {
>-// Microsoft compiler usually complains about switch statements without
>-// case labels. We suppress that warning for this test.
>-#ifdef _MSC_VER
>-#pragma warning(push)
>-#pragma warning(disable: 4065)
>-#endif // _MSC_VER
>-
>- switch (0)
>- default:
>- ASSERT_DEATH_IF_SUPPORTED(_exit(1), "")
>- << "exit in default switch handler";
>-
>- switch (0)
>- case 0:
>- EXPECT_DEATH_IF_SUPPORTED(_exit(1), "") << "exit in switch case";
>-
>-#ifdef _MSC_VER
>-#pragma warning(pop)
>-#endif // _MSC_VER
>-}
>-
>-// Tests that a test case whose name ends with "DeathTest" works fine
>-// on Windows.
>-TEST(NotADeathTest, Test) {
>- SUCCEED();
>-}
>diff --git a/Source/ThirdParty/gtest/test/gtest-filepath_test.cc b/Source/ThirdParty/gtest/test/gtest-filepath_test.cc
>deleted file mode 100644
>index 6250282758dfb3c93f47f091c52a2dbf92caceeb..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest-filepath_test.cc
>+++ /dev/null
>@@ -1,690 +0,0 @@
>-// Copyright 2008, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Authors: keith.ray@gmail.com (Keith Ray)
>-//
>-// Google Test filepath utilities
>-//
>-// This file tests classes and functions used internally by
>-// Google Test. They are subject to change without notice.
>-//
>-// This file is #included from gtest_unittest.cc, to avoid changing
>-// build or make-files for some existing Google Test clients. Do not
>-// #include this file anywhere else!
>-
>-#include <gtest/internal/gtest-filepath.h>
>-#include <gtest/gtest.h>
>-
>-// Indicates that this translation unit is part of Google Test's
>-// implementation. It must come before gtest-internal-inl.h is
>-// included, or there will be a compiler error. This trick is to
>-// prevent a user from accidentally including gtest-internal-inl.h in
>-// his code.
>-#define GTEST_IMPLEMENTATION_ 1
>-#include "src/gtest-internal-inl.h"
>-#undef GTEST_IMPLEMENTATION_
>-
>-#if GTEST_OS_WINDOWS_MOBILE
>-#include <windows.h> // NOLINT
>-#elif GTEST_OS_WINDOWS
>-#include <direct.h> // NOLINT
>-#endif // GTEST_OS_WINDOWS_MOBILE
>-
>-namespace testing {
>-namespace internal {
>-namespace {
>-
>-#if GTEST_OS_WINDOWS_MOBILE
>-// TODO(wan@google.com): Move these to the POSIX adapter section in
>-// gtest-port.h.
>-
>-// Windows CE doesn't have the remove C function.
>-int remove(const char* path) {
>- LPCWSTR wpath = String::AnsiToUtf16(path);
>- int ret = DeleteFile(wpath) ? 0 : -1;
>- delete [] wpath;
>- return ret;
>-}
>-// Windows CE doesn't have the _rmdir C function.
>-int _rmdir(const char* path) {
>- FilePath filepath(path);
>- LPCWSTR wpath = String::AnsiToUtf16(
>- filepath.RemoveTrailingPathSeparator().c_str());
>- int ret = RemoveDirectory(wpath) ? 0 : -1;
>- delete [] wpath;
>- return ret;
>-}
>-
>-#else
>-
>-TEST(GetCurrentDirTest, ReturnsCurrentDir) {
>- const FilePath original_dir = FilePath::GetCurrentDir();
>- EXPECT_FALSE(original_dir.IsEmpty());
>-
>- posix::ChDir(GTEST_PATH_SEP_);
>- const FilePath cwd = FilePath::GetCurrentDir();
>- posix::ChDir(original_dir.c_str());
>-
>-#if GTEST_OS_WINDOWS
>- // Skips the ":".
>- const char* const cwd_without_drive = strchr(cwd.c_str(), ':');
>- ASSERT_TRUE(cwd_without_drive != NULL);
>- EXPECT_STREQ(GTEST_PATH_SEP_, cwd_without_drive + 1);
>-#else
>- EXPECT_STREQ(GTEST_PATH_SEP_, cwd.c_str());
>-#endif
>-}
>-
>-#endif // GTEST_OS_WINDOWS_MOBILE
>-
>-TEST(IsEmptyTest, ReturnsTrueForEmptyPath) {
>- EXPECT_TRUE(FilePath("").IsEmpty());
>- EXPECT_TRUE(FilePath(NULL).IsEmpty());
>-}
>-
>-TEST(IsEmptyTest, ReturnsFalseForNonEmptyPath) {
>- EXPECT_FALSE(FilePath("a").IsEmpty());
>- EXPECT_FALSE(FilePath(".").IsEmpty());
>- EXPECT_FALSE(FilePath("a/b").IsEmpty());
>- EXPECT_FALSE(FilePath("a\\b\\").IsEmpty());
>-}
>-
>-// RemoveDirectoryName "" -> ""
>-TEST(RemoveDirectoryNameTest, WhenEmptyName) {
>- EXPECT_STREQ("", FilePath("").RemoveDirectoryName().c_str());
>-}
>-
>-// RemoveDirectoryName "afile" -> "afile"
>-TEST(RemoveDirectoryNameTest, ButNoDirectory) {
>- EXPECT_STREQ("afile",
>- FilePath("afile").RemoveDirectoryName().c_str());
>-}
>-
>-// RemoveDirectoryName "/afile" -> "afile"
>-TEST(RemoveDirectoryNameTest, RootFileShouldGiveFileName) {
>- EXPECT_STREQ("afile",
>- FilePath(GTEST_PATH_SEP_ "afile").RemoveDirectoryName().c_str());
>-}
>-
>-// RemoveDirectoryName "adir/" -> ""
>-TEST(RemoveDirectoryNameTest, WhereThereIsNoFileName) {
>- EXPECT_STREQ("",
>- FilePath("adir" GTEST_PATH_SEP_).RemoveDirectoryName().c_str());
>-}
>-
>-// RemoveDirectoryName "adir/afile" -> "afile"
>-TEST(RemoveDirectoryNameTest, ShouldGiveFileName) {
>- EXPECT_STREQ("afile",
>- FilePath("adir" GTEST_PATH_SEP_ "afile").RemoveDirectoryName().c_str());
>-}
>-
>-// RemoveDirectoryName "adir/subdir/afile" -> "afile"
>-TEST(RemoveDirectoryNameTest, ShouldAlsoGiveFileName) {
>- EXPECT_STREQ("afile",
>- FilePath("adir" GTEST_PATH_SEP_ "subdir" GTEST_PATH_SEP_ "afile")
>- .RemoveDirectoryName().c_str());
>-}
>-
>-#if GTEST_HAS_ALT_PATH_SEP_
>-
>-// Tests that RemoveDirectoryName() works with the alternate separator
>-// on Windows.
>-
>-// RemoveDirectoryName("/afile") -> "afile"
>-TEST(RemoveDirectoryNameTest, RootFileShouldGiveFileNameForAlternateSeparator) {
>- EXPECT_STREQ("afile",
>- FilePath("/afile").RemoveDirectoryName().c_str());
>-}
>-
>-// RemoveDirectoryName("adir/") -> ""
>-TEST(RemoveDirectoryNameTest, WhereThereIsNoFileNameForAlternateSeparator) {
>- EXPECT_STREQ("",
>- FilePath("adir/").RemoveDirectoryName().c_str());
>-}
>-
>-// RemoveDirectoryName("adir/afile") -> "afile"
>-TEST(RemoveDirectoryNameTest, ShouldGiveFileNameForAlternateSeparator) {
>- EXPECT_STREQ("afile",
>- FilePath("adir/afile").RemoveDirectoryName().c_str());
>-}
>-
>-// RemoveDirectoryName("adir/subdir/afile") -> "afile"
>-TEST(RemoveDirectoryNameTest, ShouldAlsoGiveFileNameForAlternateSeparator) {
>- EXPECT_STREQ("afile",
>- FilePath("adir/subdir/afile").RemoveDirectoryName().c_str());
>-}
>-
>-#endif
>-
>-// RemoveFileName "" -> "./"
>-TEST(RemoveFileNameTest, EmptyName) {
>-#if GTEST_OS_WINDOWS_MOBILE
>- // On Windows CE, we use the root as the current directory.
>- EXPECT_STREQ(GTEST_PATH_SEP_,
>- FilePath("").RemoveFileName().c_str());
>-#else
>- EXPECT_STREQ("." GTEST_PATH_SEP_,
>- FilePath("").RemoveFileName().c_str());
>-#endif
>-}
>-
>-// RemoveFileName "adir/" -> "adir/"
>-TEST(RemoveFileNameTest, ButNoFile) {
>- EXPECT_STREQ("adir" GTEST_PATH_SEP_,
>- FilePath("adir" GTEST_PATH_SEP_).RemoveFileName().c_str());
>-}
>-
>-// RemoveFileName "adir/afile" -> "adir/"
>-TEST(RemoveFileNameTest, GivesDirName) {
>- EXPECT_STREQ("adir" GTEST_PATH_SEP_,
>- FilePath("adir" GTEST_PATH_SEP_ "afile")
>- .RemoveFileName().c_str());
>-}
>-
>-// RemoveFileName "adir/subdir/afile" -> "adir/subdir/"
>-TEST(RemoveFileNameTest, GivesDirAndSubDirName) {
>- EXPECT_STREQ("adir" GTEST_PATH_SEP_ "subdir" GTEST_PATH_SEP_,
>- FilePath("adir" GTEST_PATH_SEP_ "subdir" GTEST_PATH_SEP_ "afile")
>- .RemoveFileName().c_str());
>-}
>-
>-// RemoveFileName "/afile" -> "/"
>-TEST(RemoveFileNameTest, GivesRootDir) {
>- EXPECT_STREQ(GTEST_PATH_SEP_,
>- FilePath(GTEST_PATH_SEP_ "afile").RemoveFileName().c_str());
>-}
>-
>-#if GTEST_HAS_ALT_PATH_SEP_
>-
>-// Tests that RemoveFileName() works with the alternate separator on
>-// Windows.
>-
>-// RemoveFileName("adir/") -> "adir/"
>-TEST(RemoveFileNameTest, ButNoFileForAlternateSeparator) {
>- EXPECT_STREQ("adir" GTEST_PATH_SEP_,
>- FilePath("adir/").RemoveFileName().c_str());
>-}
>-
>-// RemoveFileName("adir/afile") -> "adir/"
>-TEST(RemoveFileNameTest, GivesDirNameForAlternateSeparator) {
>- EXPECT_STREQ("adir" GTEST_PATH_SEP_,
>- FilePath("adir/afile").RemoveFileName().c_str());
>-}
>-
>-// RemoveFileName("adir/subdir/afile") -> "adir/subdir/"
>-TEST(RemoveFileNameTest, GivesDirAndSubDirNameForAlternateSeparator) {
>- EXPECT_STREQ("adir" GTEST_PATH_SEP_ "subdir" GTEST_PATH_SEP_,
>- FilePath("adir/subdir/afile").RemoveFileName().c_str());
>-}
>-
>-// RemoveFileName("/afile") -> "\"
>-TEST(RemoveFileNameTest, GivesRootDirForAlternateSeparator) {
>- EXPECT_STREQ(GTEST_PATH_SEP_,
>- FilePath("/afile").RemoveFileName().c_str());
>-}
>-
>-#endif
>-
>-TEST(MakeFileNameTest, GenerateWhenNumberIsZero) {
>- FilePath actual = FilePath::MakeFileName(FilePath("foo"), FilePath("bar"),
>- 0, "xml");
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_ "bar.xml", actual.c_str());
>-}
>-
>-TEST(MakeFileNameTest, GenerateFileNameNumberGtZero) {
>- FilePath actual = FilePath::MakeFileName(FilePath("foo"), FilePath("bar"),
>- 12, "xml");
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_ "bar_12.xml", actual.c_str());
>-}
>-
>-TEST(MakeFileNameTest, GenerateFileNameWithSlashNumberIsZero) {
>- FilePath actual = FilePath::MakeFileName(FilePath("foo" GTEST_PATH_SEP_),
>- FilePath("bar"), 0, "xml");
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_ "bar.xml", actual.c_str());
>-}
>-
>-TEST(MakeFileNameTest, GenerateFileNameWithSlashNumberGtZero) {
>- FilePath actual = FilePath::MakeFileName(FilePath("foo" GTEST_PATH_SEP_),
>- FilePath("bar"), 12, "xml");
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_ "bar_12.xml", actual.c_str());
>-}
>-
>-TEST(MakeFileNameTest, GenerateWhenNumberIsZeroAndDirIsEmpty) {
>- FilePath actual = FilePath::MakeFileName(FilePath(""), FilePath("bar"),
>- 0, "xml");
>- EXPECT_STREQ("bar.xml", actual.c_str());
>-}
>-
>-TEST(MakeFileNameTest, GenerateWhenNumberIsNotZeroAndDirIsEmpty) {
>- FilePath actual = FilePath::MakeFileName(FilePath(""), FilePath("bar"),
>- 14, "xml");
>- EXPECT_STREQ("bar_14.xml", actual.c_str());
>-}
>-
>-TEST(ConcatPathsTest, WorksWhenDirDoesNotEndWithPathSep) {
>- FilePath actual = FilePath::ConcatPaths(FilePath("foo"),
>- FilePath("bar.xml"));
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_ "bar.xml", actual.c_str());
>-}
>-
>-TEST(ConcatPathsTest, WorksWhenPath1EndsWithPathSep) {
>- FilePath actual = FilePath::ConcatPaths(FilePath("foo" GTEST_PATH_SEP_),
>- FilePath("bar.xml"));
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_ "bar.xml", actual.c_str());
>-}
>-
>-TEST(ConcatPathsTest, Path1BeingEmpty) {
>- FilePath actual = FilePath::ConcatPaths(FilePath(""),
>- FilePath("bar.xml"));
>- EXPECT_STREQ("bar.xml", actual.c_str());
>-}
>-
>-TEST(ConcatPathsTest, Path2BeingEmpty) {
>- FilePath actual = FilePath::ConcatPaths(FilePath("foo"),
>- FilePath(""));
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_, actual.c_str());
>-}
>-
>-TEST(ConcatPathsTest, BothPathBeingEmpty) {
>- FilePath actual = FilePath::ConcatPaths(FilePath(""),
>- FilePath(""));
>- EXPECT_STREQ("", actual.c_str());
>-}
>-
>-TEST(ConcatPathsTest, Path1ContainsPathSep) {
>- FilePath actual = FilePath::ConcatPaths(FilePath("foo" GTEST_PATH_SEP_ "bar"),
>- FilePath("foobar.xml"));
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_ "bar" GTEST_PATH_SEP_ "foobar.xml",
>- actual.c_str());
>-}
>-
>-TEST(ConcatPathsTest, Path2ContainsPathSep) {
>- FilePath actual = FilePath::ConcatPaths(
>- FilePath("foo" GTEST_PATH_SEP_),
>- FilePath("bar" GTEST_PATH_SEP_ "bar.xml"));
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_ "bar" GTEST_PATH_SEP_ "bar.xml",
>- actual.c_str());
>-}
>-
>-TEST(ConcatPathsTest, Path2EndsWithPathSep) {
>- FilePath actual = FilePath::ConcatPaths(FilePath("foo"),
>- FilePath("bar" GTEST_PATH_SEP_));
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_ "bar" GTEST_PATH_SEP_, actual.c_str());
>-}
>-
>-// RemoveTrailingPathSeparator "" -> ""
>-TEST(RemoveTrailingPathSeparatorTest, EmptyString) {
>- EXPECT_STREQ("",
>- FilePath("").RemoveTrailingPathSeparator().c_str());
>-}
>-
>-// RemoveTrailingPathSeparator "foo" -> "foo"
>-TEST(RemoveTrailingPathSeparatorTest, FileNoSlashString) {
>- EXPECT_STREQ("foo",
>- FilePath("foo").RemoveTrailingPathSeparator().c_str());
>-}
>-
>-// RemoveTrailingPathSeparator "foo/" -> "foo"
>-TEST(RemoveTrailingPathSeparatorTest, ShouldRemoveTrailingSeparator) {
>- EXPECT_STREQ(
>- "foo",
>- FilePath("foo" GTEST_PATH_SEP_).RemoveTrailingPathSeparator().c_str());
>-#if GTEST_HAS_ALT_PATH_SEP_
>- EXPECT_STREQ("foo",
>- FilePath("foo/").RemoveTrailingPathSeparator().c_str());
>-#endif
>-}
>-
>-// RemoveTrailingPathSeparator "foo/bar/" -> "foo/bar/"
>-TEST(RemoveTrailingPathSeparatorTest, ShouldRemoveLastSeparator) {
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_ "bar",
>- FilePath("foo" GTEST_PATH_SEP_ "bar" GTEST_PATH_SEP_)
>- .RemoveTrailingPathSeparator().c_str());
>-}
>-
>-// RemoveTrailingPathSeparator "foo/bar" -> "foo/bar"
>-TEST(RemoveTrailingPathSeparatorTest, ShouldReturnUnmodified) {
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_ "bar",
>- FilePath("foo" GTEST_PATH_SEP_ "bar")
>- .RemoveTrailingPathSeparator().c_str());
>-}
>-
>-TEST(DirectoryTest, RootDirectoryExists) {
>-#if GTEST_OS_WINDOWS // We are on Windows.
>- char current_drive[_MAX_PATH]; // NOLINT
>- current_drive[0] = static_cast<char>(_getdrive() + 'A' - 1);
>- current_drive[1] = ':';
>- current_drive[2] = '\\';
>- current_drive[3] = '\0';
>- EXPECT_TRUE(FilePath(current_drive).DirectoryExists());
>-#else
>- EXPECT_TRUE(FilePath("/").DirectoryExists());
>-#endif // GTEST_OS_WINDOWS
>-}
>-
>-#if GTEST_OS_WINDOWS
>-TEST(DirectoryTest, RootOfWrongDriveDoesNotExists) {
>- const int saved_drive_ = _getdrive();
>- // Find a drive that doesn't exist. Start with 'Z' to avoid common ones.
>- for (char drive = 'Z'; drive >= 'A'; drive--)
>- if (_chdrive(drive - 'A' + 1) == -1) {
>- char non_drive[_MAX_PATH]; // NOLINT
>- non_drive[0] = drive;
>- non_drive[1] = ':';
>- non_drive[2] = '\\';
>- non_drive[3] = '\0';
>- EXPECT_FALSE(FilePath(non_drive).DirectoryExists());
>- break;
>- }
>- _chdrive(saved_drive_);
>-}
>-#endif // GTEST_OS_WINDOWS
>-
>-#if !GTEST_OS_WINDOWS_MOBILE
>-// Windows CE _does_ consider an empty directory to exist.
>-TEST(DirectoryTest, EmptyPathDirectoryDoesNotExist) {
>- EXPECT_FALSE(FilePath("").DirectoryExists());
>-}
>-#endif // !GTEST_OS_WINDOWS_MOBILE
>-
>-TEST(DirectoryTest, CurrentDirectoryExists) {
>-#if GTEST_OS_WINDOWS // We are on Windows.
>-#ifndef _WIN32_CE // Windows CE doesn't have a current directory.
>- EXPECT_TRUE(FilePath(".").DirectoryExists());
>- EXPECT_TRUE(FilePath(".\\").DirectoryExists());
>-#endif // _WIN32_CE
>-#else
>- EXPECT_TRUE(FilePath(".").DirectoryExists());
>- EXPECT_TRUE(FilePath("./").DirectoryExists());
>-#endif // GTEST_OS_WINDOWS
>-}
>-
>-TEST(NormalizeTest, NullStringsEqualEmptyDirectory) {
>- EXPECT_STREQ("", FilePath(NULL).c_str());
>- EXPECT_STREQ("", FilePath(String(NULL)).c_str());
>-}
>-
>-// "foo/bar" == foo//bar" == "foo///bar"
>-TEST(NormalizeTest, MultipleConsecutiveSepaparatorsInMidstring) {
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_ "bar",
>- FilePath("foo" GTEST_PATH_SEP_ "bar").c_str());
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_ "bar",
>- FilePath("foo" GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar").c_str());
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_ "bar",
>- FilePath("foo" GTEST_PATH_SEP_ GTEST_PATH_SEP_
>- GTEST_PATH_SEP_ "bar").c_str());
>-}
>-
>-// "/bar" == //bar" == "///bar"
>-TEST(NormalizeTest, MultipleConsecutiveSepaparatorsAtStringStart) {
>- EXPECT_STREQ(GTEST_PATH_SEP_ "bar",
>- FilePath(GTEST_PATH_SEP_ "bar").c_str());
>- EXPECT_STREQ(GTEST_PATH_SEP_ "bar",
>- FilePath(GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar").c_str());
>- EXPECT_STREQ(GTEST_PATH_SEP_ "bar",
>- FilePath(GTEST_PATH_SEP_ GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar").c_str());
>-}
>-
>-// "foo/" == foo//" == "foo///"
>-TEST(NormalizeTest, MultipleConsecutiveSepaparatorsAtStringEnd) {
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_,
>- FilePath("foo" GTEST_PATH_SEP_).c_str());
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_,
>- FilePath("foo" GTEST_PATH_SEP_ GTEST_PATH_SEP_).c_str());
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_,
>- FilePath("foo" GTEST_PATH_SEP_ GTEST_PATH_SEP_ GTEST_PATH_SEP_).c_str());
>-}
>-
>-#if GTEST_HAS_ALT_PATH_SEP_
>-
>-// Tests that separators at the end of the string are normalized
>-// regardless of their combination (e.g. "foo\" =="foo/\" ==
>-// "foo\\/").
>-TEST(NormalizeTest, MixAlternateSeparatorAtStringEnd) {
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_,
>- FilePath("foo/").c_str());
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_,
>- FilePath("foo" GTEST_PATH_SEP_ "/").c_str());
>- EXPECT_STREQ("foo" GTEST_PATH_SEP_,
>- FilePath("foo//" GTEST_PATH_SEP_).c_str());
>-}
>-
>-#endif
>-
>-TEST(AssignmentOperatorTest, DefaultAssignedToNonDefault) {
>- FilePath default_path;
>- FilePath non_default_path("path");
>- non_default_path = default_path;
>- EXPECT_STREQ("", non_default_path.c_str());
>- EXPECT_STREQ("", default_path.c_str()); // RHS var is unchanged.
>-}
>-
>-TEST(AssignmentOperatorTest, NonDefaultAssignedToDefault) {
>- FilePath non_default_path("path");
>- FilePath default_path;
>- default_path = non_default_path;
>- EXPECT_STREQ("path", default_path.c_str());
>- EXPECT_STREQ("path", non_default_path.c_str()); // RHS var is unchanged.
>-}
>-
>-TEST(AssignmentOperatorTest, ConstAssignedToNonConst) {
>- const FilePath const_default_path("const_path");
>- FilePath non_default_path("path");
>- non_default_path = const_default_path;
>- EXPECT_STREQ("const_path", non_default_path.c_str());
>-}
>-
>-class DirectoryCreationTest : public Test {
>- protected:
>- virtual void SetUp() {
>- testdata_path_.Set(FilePath(String::Format("%s%s%s",
>- TempDir().c_str(), GetCurrentExecutableName().c_str(),
>- "_directory_creation" GTEST_PATH_SEP_ "test" GTEST_PATH_SEP_)));
>- testdata_file_.Set(testdata_path_.RemoveTrailingPathSeparator());
>-
>- unique_file0_.Set(FilePath::MakeFileName(testdata_path_, FilePath("unique"),
>- 0, "txt"));
>- unique_file1_.Set(FilePath::MakeFileName(testdata_path_, FilePath("unique"),
>- 1, "txt"));
>-
>- remove(testdata_file_.c_str());
>- remove(unique_file0_.c_str());
>- remove(unique_file1_.c_str());
>- posix::RmDir(testdata_path_.c_str());
>- }
>-
>- virtual void TearDown() {
>- remove(testdata_file_.c_str());
>- remove(unique_file0_.c_str());
>- remove(unique_file1_.c_str());
>- posix::RmDir(testdata_path_.c_str());
>- }
>-
>- String TempDir() const {
>-#if GTEST_OS_WINDOWS_MOBILE
>- return String("\\temp\\");
>-#elif GTEST_OS_WINDOWS
>- const char* temp_dir = posix::GetEnv("TEMP");
>- if (temp_dir == NULL || temp_dir[0] == '\0')
>- return String("\\temp\\");
>- else if (String(temp_dir).EndsWith("\\"))
>- return String(temp_dir);
>- else
>- return String::Format("%s\\", temp_dir);
>-#else
>- return String("/tmp/");
>-#endif // GTEST_OS_WINDOWS_MOBILE
>- }
>-
>- void CreateTextFile(const char* filename) {
>- FILE* f = posix::FOpen(filename, "w");
>- fprintf(f, "text\n");
>- fclose(f);
>- }
>-
>- // Strings representing a directory and a file, with identical paths
>- // except for the trailing separator character that distinquishes
>- // a directory named 'test' from a file named 'test'. Example names:
>- FilePath testdata_path_; // "/tmp/directory_creation/test/"
>- FilePath testdata_file_; // "/tmp/directory_creation/test"
>- FilePath unique_file0_; // "/tmp/directory_creation/test/unique.txt"
>- FilePath unique_file1_; // "/tmp/directory_creation/test/unique_1.txt"
>-};
>-
>-TEST_F(DirectoryCreationTest, CreateDirectoriesRecursively) {
>- EXPECT_FALSE(testdata_path_.DirectoryExists()) << testdata_path_.c_str();
>- EXPECT_TRUE(testdata_path_.CreateDirectoriesRecursively());
>- EXPECT_TRUE(testdata_path_.DirectoryExists());
>-}
>-
>-TEST_F(DirectoryCreationTest, CreateDirectoriesForAlreadyExistingPath) {
>- EXPECT_FALSE(testdata_path_.DirectoryExists()) << testdata_path_.c_str();
>- EXPECT_TRUE(testdata_path_.CreateDirectoriesRecursively());
>- // Call 'create' again... should still succeed.
>- EXPECT_TRUE(testdata_path_.CreateDirectoriesRecursively());
>-}
>-
>-TEST_F(DirectoryCreationTest, CreateDirectoriesAndUniqueFilename) {
>- FilePath file_path(FilePath::GenerateUniqueFileName(testdata_path_,
>- FilePath("unique"), "txt"));
>- EXPECT_STREQ(unique_file0_.c_str(), file_path.c_str());
>- EXPECT_FALSE(file_path.FileOrDirectoryExists()); // file not there
>-
>- testdata_path_.CreateDirectoriesRecursively();
>- EXPECT_FALSE(file_path.FileOrDirectoryExists()); // file still not there
>- CreateTextFile(file_path.c_str());
>- EXPECT_TRUE(file_path.FileOrDirectoryExists());
>-
>- FilePath file_path2(FilePath::GenerateUniqueFileName(testdata_path_,
>- FilePath("unique"), "txt"));
>- EXPECT_STREQ(unique_file1_.c_str(), file_path2.c_str());
>- EXPECT_FALSE(file_path2.FileOrDirectoryExists()); // file not there
>- CreateTextFile(file_path2.c_str());
>- EXPECT_TRUE(file_path2.FileOrDirectoryExists());
>-}
>-
>-TEST_F(DirectoryCreationTest, CreateDirectoriesFail) {
>- // force a failure by putting a file where we will try to create a directory.
>- CreateTextFile(testdata_file_.c_str());
>- EXPECT_TRUE(testdata_file_.FileOrDirectoryExists());
>- EXPECT_FALSE(testdata_file_.DirectoryExists());
>- EXPECT_FALSE(testdata_file_.CreateDirectoriesRecursively());
>-}
>-
>-TEST(NoDirectoryCreationTest, CreateNoDirectoriesForDefaultXmlFile) {
>- const FilePath test_detail_xml("test_detail.xml");
>- EXPECT_FALSE(test_detail_xml.CreateDirectoriesRecursively());
>-}
>-
>-TEST(FilePathTest, DefaultConstructor) {
>- FilePath fp;
>- EXPECT_STREQ("", fp.c_str());
>-}
>-
>-TEST(FilePathTest, CharAndCopyConstructors) {
>- const FilePath fp("spicy");
>- EXPECT_STREQ("spicy", fp.c_str());
>-
>- const FilePath fp_copy(fp);
>- EXPECT_STREQ("spicy", fp_copy.c_str());
>-}
>-
>-TEST(FilePathTest, StringConstructor) {
>- const FilePath fp(String("cider"));
>- EXPECT_STREQ("cider", fp.c_str());
>-}
>-
>-TEST(FilePathTest, Set) {
>- const FilePath apple("apple");
>- FilePath mac("mac");
>- mac.Set(apple); // Implement Set() since overloading operator= is forbidden.
>- EXPECT_STREQ("apple", mac.c_str());
>- EXPECT_STREQ("apple", apple.c_str());
>-}
>-
>-TEST(FilePathTest, ToString) {
>- const FilePath file("drink");
>- String str(file.ToString());
>- EXPECT_STREQ("drink", str.c_str());
>-}
>-
>-TEST(FilePathTest, RemoveExtension) {
>- EXPECT_STREQ("app", FilePath("app.exe").RemoveExtension("exe").c_str());
>- EXPECT_STREQ("APP", FilePath("APP.EXE").RemoveExtension("exe").c_str());
>-}
>-
>-TEST(FilePathTest, RemoveExtensionWhenThereIsNoExtension) {
>- EXPECT_STREQ("app", FilePath("app").RemoveExtension("exe").c_str());
>-}
>-
>-TEST(FilePathTest, IsDirectory) {
>- EXPECT_FALSE(FilePath("cola").IsDirectory());
>- EXPECT_TRUE(FilePath("koala" GTEST_PATH_SEP_).IsDirectory());
>-#if GTEST_HAS_ALT_PATH_SEP_
>- EXPECT_TRUE(FilePath("koala/").IsDirectory());
>-#endif
>-}
>-
>-TEST(FilePathTest, IsAbsolutePath) {
>- EXPECT_FALSE(FilePath("is" GTEST_PATH_SEP_ "relative").IsAbsolutePath());
>- EXPECT_FALSE(FilePath("").IsAbsolutePath());
>-#if GTEST_OS_WINDOWS
>- EXPECT_TRUE(FilePath("c:\\" GTEST_PATH_SEP_ "is_not"
>- GTEST_PATH_SEP_ "relative").IsAbsolutePath());
>- EXPECT_FALSE(FilePath("c:foo" GTEST_PATH_SEP_ "bar").IsAbsolutePath());
>- EXPECT_TRUE(FilePath("c:/" GTEST_PATH_SEP_ "is_not"
>- GTEST_PATH_SEP_ "relative").IsAbsolutePath());
>-#else
>- EXPECT_TRUE(FilePath(GTEST_PATH_SEP_ "is_not" GTEST_PATH_SEP_ "relative")
>- .IsAbsolutePath());
>-#endif // GTEST_OS_WINDOWS
>-}
>-
>-TEST(FilePathTest, IsRootDirectory) {
>-#if GTEST_OS_WINDOWS
>- EXPECT_TRUE(FilePath("a:\\").IsRootDirectory());
>- EXPECT_TRUE(FilePath("Z:/").IsRootDirectory());
>- EXPECT_TRUE(FilePath("e://").IsRootDirectory());
>- EXPECT_FALSE(FilePath("").IsRootDirectory());
>- EXPECT_FALSE(FilePath("b:").IsRootDirectory());
>- EXPECT_FALSE(FilePath("b:a").IsRootDirectory());
>- EXPECT_FALSE(FilePath("8:/").IsRootDirectory());
>- EXPECT_FALSE(FilePath("c|/").IsRootDirectory());
>-#else
>- EXPECT_TRUE(FilePath("/").IsRootDirectory());
>- EXPECT_TRUE(FilePath("//").IsRootDirectory());
>- EXPECT_FALSE(FilePath("").IsRootDirectory());
>- EXPECT_FALSE(FilePath("\\").IsRootDirectory());
>- EXPECT_FALSE(FilePath("/x").IsRootDirectory());
>-#endif
>-}
>-
>-} // namespace
>-} // namespace internal
>-} // namespace testing
>diff --git a/Source/ThirdParty/gtest/test/gtest-linked_ptr_test.cc b/Source/ThirdParty/gtest/test/gtest-linked_ptr_test.cc
>deleted file mode 100644
>index eae82296c921f0afe42fc233574970ee7709e5bd..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest-linked_ptr_test.cc
>+++ /dev/null
>@@ -1,154 +0,0 @@
>-// Copyright 2003, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Authors: Dan Egnor (egnor@google.com)
>-// Ported to Windows: Vadim Berman (vadimb@google.com)
>-
>-#include <gtest/internal/gtest-linked_ptr.h>
>-
>-#include <stdlib.h>
>-#include <gtest/gtest.h>
>-
>-namespace {
>-
>-using testing::Message;
>-using testing::internal::linked_ptr;
>-
>-int num;
>-Message* history = NULL;
>-
>-// Class which tracks allocation/deallocation
>-class A {
>- public:
>- A(): mynum(num++) { *history << "A" << mynum << " ctor\n"; }
>- virtual ~A() { *history << "A" << mynum << " dtor\n"; }
>- virtual void Use() { *history << "A" << mynum << " use\n"; }
>- protected:
>- int mynum;
>-};
>-
>-// Subclass
>-class B : public A {
>- public:
>- B() { *history << "B" << mynum << " ctor\n"; }
>- ~B() { *history << "B" << mynum << " dtor\n"; }
>- virtual void Use() { *history << "B" << mynum << " use\n"; }
>-};
>-
>-class LinkedPtrTest : public testing::Test {
>- public:
>- LinkedPtrTest() {
>- num = 0;
>- history = new Message;
>- }
>-
>- virtual ~LinkedPtrTest() {
>- delete history;
>- history = NULL;
>- }
>-};
>-
>-TEST_F(LinkedPtrTest, GeneralTest) {
>- {
>- linked_ptr<A> a0, a1, a2;
>- a0 = a0;
>- a1 = a2;
>- ASSERT_EQ(a0.get(), static_cast<A*>(NULL));
>- ASSERT_EQ(a1.get(), static_cast<A*>(NULL));
>- ASSERT_EQ(a2.get(), static_cast<A*>(NULL));
>- ASSERT_TRUE(a0 == NULL);
>- ASSERT_TRUE(a1 == NULL);
>- ASSERT_TRUE(a2 == NULL);
>-
>- {
>- linked_ptr<A> a3(new A);
>- a0 = a3;
>- ASSERT_TRUE(a0 == a3);
>- ASSERT_TRUE(a0 != NULL);
>- ASSERT_TRUE(a0.get() == a3);
>- ASSERT_TRUE(a0 == a3.get());
>- linked_ptr<A> a4(a0);
>- a1 = a4;
>- linked_ptr<A> a5(new A);
>- ASSERT_TRUE(a5.get() != a3);
>- ASSERT_TRUE(a5 != a3.get());
>- a2 = a5;
>- linked_ptr b0(new B);
>- linked_ptr<A> a6(b0);
>- ASSERT_TRUE(b0 == a6);
>- ASSERT_TRUE(a6 == b0);
>- ASSERT_TRUE(b0 != NULL);
>- a5 = b0;
>- a5 = b0;
>- a3->Use();
>- a4->Use();
>- a5->Use();
>- a6->Use();
>- b0->Use();
>- (*b0).Use();
>- b0.get()->Use();
>- }
>-
>- a0->Use();
>- a1->Use();
>- a2->Use();
>-
>- a1 = a2;
>- a2.reset(new A);
>- a0.reset();
>-
>- linked_ptr<A> a7;
>- }
>-
>- ASSERT_STREQ(
>- "A0 ctor\n"
>- "A1 ctor\n"
>- "A2 ctor\n"
>- "B2 ctor\n"
>- "A0 use\n"
>- "A0 use\n"
>- "B2 use\n"
>- "B2 use\n"
>- "B2 use\n"
>- "B2 use\n"
>- "B2 use\n"
>- "B2 dtor\n"
>- "A2 dtor\n"
>- "A0 use\n"
>- "A0 use\n"
>- "A1 use\n"
>- "A3 ctor\n"
>- "A0 dtor\n"
>- "A3 dtor\n"
>- "A1 dtor\n",
>- history->GetString().c_str()
>- );
>-}
>-
>-} // Unnamed namespace
>diff --git a/Source/ThirdParty/gtest/test/gtest-listener_test.cc b/Source/ThirdParty/gtest/test/gtest-listener_test.cc
>deleted file mode 100644
>index c9be39a87e88d89601b9bc9372a14edaaf612943..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest-listener_test.cc
>+++ /dev/null
>@@ -1,313 +0,0 @@
>-// Copyright 2009 Google Inc. All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: vladl@google.com (Vlad Losev)
>-//
>-// The Google C++ Testing Framework (Google Test)
>-//
>-// This file verifies Google Test event listeners receive events at the
>-// right times.
>-
>-#include <gtest/gtest.h>
>-#include <vector>
>-
>-using ::testing::AddGlobalTestEnvironment;
>-using ::testing::Environment;
>-using ::testing::InitGoogleTest;
>-using ::testing::Test;
>-using ::testing::TestCase;
>-using ::testing::TestEventListener;
>-using ::testing::TestInfo;
>-using ::testing::TestPartResult;
>-using ::testing::UnitTest;
>-using ::testing::internal::String;
>-
>-// Used by tests to register their events.
>-std::vector<String>* g_events = NULL;
>-
>-namespace testing {
>-namespace internal {
>-
>-class EventRecordingListener : public TestEventListener {
>- public:
>- EventRecordingListener(const char* name) : name_(name) {}
>-
>- protected:
>- virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {
>- g_events->push_back(GetFullMethodName("OnTestProgramStart"));
>- }
>-
>- virtual void OnTestIterationStart(const UnitTest& /*unit_test*/,
>- int iteration) {
>- Message message;
>- message << GetFullMethodName("OnTestIterationStart")
>- << "(" << iteration << ")";
>- g_events->push_back(message.GetString());
>- }
>-
>- virtual void OnEnvironmentsSetUpStart(const UnitTest& /*unit_test*/) {
>- g_events->push_back(GetFullMethodName("OnEnvironmentsSetUpStart"));
>- }
>-
>- virtual void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) {
>- g_events->push_back(GetFullMethodName("OnEnvironmentsSetUpEnd"));
>- }
>-
>- virtual void OnTestCaseStart(const TestCase& /*test_case*/) {
>- g_events->push_back(GetFullMethodName("OnTestCaseStart"));
>- }
>-
>- virtual void OnTestStart(const TestInfo& /*test_info*/) {
>- g_events->push_back(GetFullMethodName("OnTestStart"));
>- }
>-
>- virtual void OnTestPartResult(const TestPartResult& /*test_part_result*/) {
>- g_events->push_back(GetFullMethodName("OnTestPartResult"));
>- }
>-
>- virtual void OnTestEnd(const TestInfo& /*test_info*/) {
>- g_events->push_back(GetFullMethodName("OnTestEnd"));
>- }
>-
>- virtual void OnTestCaseEnd(const TestCase& /*test_case*/) {
>- g_events->push_back(GetFullMethodName("OnTestCaseEnd"));
>- }
>-
>- virtual void OnEnvironmentsTearDownStart(const UnitTest& /*unit_test*/) {
>- g_events->push_back(GetFullMethodName("OnEnvironmentsTearDownStart"));
>- }
>-
>- virtual void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) {
>- g_events->push_back(GetFullMethodName("OnEnvironmentsTearDownEnd"));
>- }
>-
>- virtual void OnTestIterationEnd(const UnitTest& /*unit_test*/,
>- int iteration) {
>- Message message;
>- message << GetFullMethodName("OnTestIterationEnd")
>- << "(" << iteration << ")";
>- g_events->push_back(message.GetString());
>- }
>-
>- virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) {
>- g_events->push_back(GetFullMethodName("OnTestProgramEnd"));
>- }
>-
>- private:
>- String GetFullMethodName(const char* name) {
>- Message message;
>- message << name_ << "." << name;
>- return message.GetString();
>- }
>-
>- String name_;
>-};
>-
>-class EnvironmentInvocationCatcher : public Environment {
>- protected:
>- virtual void SetUp() {
>- g_events->push_back(String("Environment::SetUp"));
>- }
>-
>- virtual void TearDown() {
>- g_events->push_back(String("Environment::TearDown"));
>- }
>-};
>-
>-class ListenerTest : public Test {
>- protected:
>- static void SetUpTestCase() {
>- g_events->push_back(String("ListenerTest::SetUpTestCase"));
>- }
>-
>- static void TearDownTestCase() {
>- g_events->push_back(String("ListenerTest::TearDownTestCase"));
>- }
>-
>- virtual void SetUp() {
>- g_events->push_back(String("ListenerTest::SetUp"));
>- }
>-
>- virtual void TearDown() {
>- g_events->push_back(String("ListenerTest::TearDown"));
>- }
>-};
>-
>-TEST_F(ListenerTest, DoesFoo) {
>- // Test execution order within a test case is not guaranteed so we are not
>- // recording the test name.
>- g_events->push_back(String("ListenerTest::* Test Body"));
>- SUCCEED(); // Triggers OnTestPartResult.
>-}
>-
>-TEST_F(ListenerTest, DoesBar) {
>- g_events->push_back(String("ListenerTest::* Test Body"));
>- SUCCEED(); // Triggers OnTestPartResult.
>-}
>-
>-} // namespace internal
>-
>-} // namespace testing
>-
>-using ::testing::internal::EnvironmentInvocationCatcher;
>-using ::testing::internal::EventRecordingListener;
>-
>-void VerifyResults(const std::vector<String>& data,
>- const char* const* expected_data,
>- int expected_data_size) {
>- const int actual_size = data.size();
>- // If the following assertion fails, a new entry will be appended to
>- // data. Hence we save data.size() first.
>- EXPECT_EQ(expected_data_size, actual_size);
>-
>- // Compares the common prefix.
>- const int shorter_size = expected_data_size <= actual_size ?
>- expected_data_size : actual_size;
>- int i = 0;
>- for (; i < shorter_size; ++i) {
>- ASSERT_STREQ(expected_data[i], data[i].c_str())
>- << "at position " << i;
>- }
>-
>- // Prints extra elements in the actual data.
>- for (; i < actual_size; ++i) {
>- printf(" Actual event #%d: %s\n", i, data[i].c_str());
>- }
>-}
>-
>-int main(int argc, char **argv) {
>- std::vector<String> events;
>- g_events = &events;
>- InitGoogleTest(&argc, argv);
>-
>- UnitTest::GetInstance()->listeners().Append(
>- new EventRecordingListener("1st"));
>- UnitTest::GetInstance()->listeners().Append(
>- new EventRecordingListener("2nd"));
>-
>- AddGlobalTestEnvironment(new EnvironmentInvocationCatcher);
>-
>- GTEST_CHECK_(events.size() == 0)
>- << "AddGlobalTestEnvironment should not generate any events itself.";
>-
>- ::testing::GTEST_FLAG(repeat) = 2;
>- int ret_val = RUN_ALL_TESTS();
>-
>- const char* const expected_events[] = {
>- "1st.OnTestProgramStart",
>- "2nd.OnTestProgramStart",
>- "1st.OnTestIterationStart(0)",
>- "2nd.OnTestIterationStart(0)",
>- "1st.OnEnvironmentsSetUpStart",
>- "2nd.OnEnvironmentsSetUpStart",
>- "Environment::SetUp",
>- "2nd.OnEnvironmentsSetUpEnd",
>- "1st.OnEnvironmentsSetUpEnd",
>- "1st.OnTestCaseStart",
>- "2nd.OnTestCaseStart",
>- "ListenerTest::SetUpTestCase",
>- "1st.OnTestStart",
>- "2nd.OnTestStart",
>- "ListenerTest::SetUp",
>- "ListenerTest::* Test Body",
>- "1st.OnTestPartResult",
>- "2nd.OnTestPartResult",
>- "ListenerTest::TearDown",
>- "2nd.OnTestEnd",
>- "1st.OnTestEnd",
>- "1st.OnTestStart",
>- "2nd.OnTestStart",
>- "ListenerTest::SetUp",
>- "ListenerTest::* Test Body",
>- "1st.OnTestPartResult",
>- "2nd.OnTestPartResult",
>- "ListenerTest::TearDown",
>- "2nd.OnTestEnd",
>- "1st.OnTestEnd",
>- "ListenerTest::TearDownTestCase",
>- "2nd.OnTestCaseEnd",
>- "1st.OnTestCaseEnd",
>- "1st.OnEnvironmentsTearDownStart",
>- "2nd.OnEnvironmentsTearDownStart",
>- "Environment::TearDown",
>- "2nd.OnEnvironmentsTearDownEnd",
>- "1st.OnEnvironmentsTearDownEnd",
>- "2nd.OnTestIterationEnd(0)",
>- "1st.OnTestIterationEnd(0)",
>- "1st.OnTestIterationStart(1)",
>- "2nd.OnTestIterationStart(1)",
>- "1st.OnEnvironmentsSetUpStart",
>- "2nd.OnEnvironmentsSetUpStart",
>- "Environment::SetUp",
>- "2nd.OnEnvironmentsSetUpEnd",
>- "1st.OnEnvironmentsSetUpEnd",
>- "1st.OnTestCaseStart",
>- "2nd.OnTestCaseStart",
>- "ListenerTest::SetUpTestCase",
>- "1st.OnTestStart",
>- "2nd.OnTestStart",
>- "ListenerTest::SetUp",
>- "ListenerTest::* Test Body",
>- "1st.OnTestPartResult",
>- "2nd.OnTestPartResult",
>- "ListenerTest::TearDown",
>- "2nd.OnTestEnd",
>- "1st.OnTestEnd",
>- "1st.OnTestStart",
>- "2nd.OnTestStart",
>- "ListenerTest::SetUp",
>- "ListenerTest::* Test Body",
>- "1st.OnTestPartResult",
>- "2nd.OnTestPartResult",
>- "ListenerTest::TearDown",
>- "2nd.OnTestEnd",
>- "1st.OnTestEnd",
>- "ListenerTest::TearDownTestCase",
>- "2nd.OnTestCaseEnd",
>- "1st.OnTestCaseEnd",
>- "1st.OnEnvironmentsTearDownStart",
>- "2nd.OnEnvironmentsTearDownStart",
>- "Environment::TearDown",
>- "2nd.OnEnvironmentsTearDownEnd",
>- "1st.OnEnvironmentsTearDownEnd",
>- "2nd.OnTestIterationEnd(1)",
>- "1st.OnTestIterationEnd(1)",
>- "2nd.OnTestProgramEnd",
>- "1st.OnTestProgramEnd"
>- };
>- VerifyResults(events,
>- expected_events,
>- sizeof(expected_events)/sizeof(expected_events[0]));
>-
>- // We need to check manually for ad hoc test failures that happen after
>- // RUN_ALL_TESTS finishes.
>- if (UnitTest::GetInstance()->Failed())
>- ret_val = 1;
>-
>- return ret_val;
>-}
>diff --git a/Source/ThirdParty/gtest/test/gtest-message_test.cc b/Source/ThirdParty/gtest/test/gtest-message_test.cc
>deleted file mode 100644
>index e42b03447872e3e8f07a9a4add2be5dd46980b55..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest-message_test.cc
>+++ /dev/null
>@@ -1,167 +0,0 @@
>-// Copyright 2005, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>-//
>-// Tests for the Message class.
>-
>-#include <gtest/gtest-message.h>
>-
>-#include <gtest/gtest.h>
>-
>-namespace {
>-
>-using ::testing::Message;
>-using ::testing::internal::StrStream;
>-
>-// A helper function that turns a Message into a C string.
>-const char* ToCString(const Message& msg) {
>- static testing::internal::String result;
>- result = msg.GetString();
>- return result.c_str();
>-}
>-
>-// Tests the testing::Message class
>-
>-// Tests the default constructor.
>-TEST(MessageTest, DefaultConstructor) {
>- const Message msg;
>- EXPECT_STREQ("", ToCString(msg));
>-}
>-
>-// Tests the copy constructor.
>-TEST(MessageTest, CopyConstructor) {
>- const Message msg1("Hello");
>- const Message msg2(msg1);
>- EXPECT_STREQ("Hello", ToCString(msg2));
>-}
>-
>-// Tests constructing a Message from a C-string.
>-TEST(MessageTest, ConstructsFromCString) {
>- Message msg("Hello");
>- EXPECT_STREQ("Hello", ToCString(msg));
>-}
>-
>-// Tests streaming a float.
>-TEST(MessageTest, StreamsFloat) {
>- const char* const s = ToCString(Message() << 1.23456F << " " << 2.34567F);
>- // Both numbers should be printed with enough precision.
>- EXPECT_PRED_FORMAT2(testing::IsSubstring, "1.234560", s);
>- EXPECT_PRED_FORMAT2(testing::IsSubstring, " 2.345669", s);
>-}
>-
>-// Tests streaming a double.
>-TEST(MessageTest, StreamsDouble) {
>- const char* const s = ToCString(Message() << 1260570880.4555497 << " "
>- << 1260572265.1954534);
>- // Both numbers should be printed with enough precision.
>- EXPECT_PRED_FORMAT2(testing::IsSubstring, "1260570880.45", s);
>- EXPECT_PRED_FORMAT2(testing::IsSubstring, " 1260572265.19", s);
>-}
>-
>-// Tests streaming a non-char pointer.
>-TEST(MessageTest, StreamsPointer) {
>- int n = 0;
>- int* p = &n;
>- EXPECT_STRNE("(null)", ToCString(Message() << p));
>-}
>-
>-// Tests streaming a NULL non-char pointer.
>-TEST(MessageTest, StreamsNullPointer) {
>- int* p = NULL;
>- EXPECT_STREQ("(null)", ToCString(Message() << p));
>-}
>-
>-// Tests streaming a C string.
>-TEST(MessageTest, StreamsCString) {
>- EXPECT_STREQ("Foo", ToCString(Message() << "Foo"));
>-}
>-
>-// Tests streaming a NULL C string.
>-TEST(MessageTest, StreamsNullCString) {
>- char* p = NULL;
>- EXPECT_STREQ("(null)", ToCString(Message() << p));
>-}
>-
>-// Tests streaming std::string.
>-TEST(MessageTest, StreamsString) {
>- const ::std::string str("Hello");
>- EXPECT_STREQ("Hello", ToCString(Message() << str));
>-}
>-
>-// Tests that we can output strings containing embedded NULs.
>-TEST(MessageTest, StreamsStringWithEmbeddedNUL) {
>- const char char_array_with_nul[] =
>- "Here's a NUL\0 and some more string";
>- const ::std::string string_with_nul(char_array_with_nul,
>- sizeof(char_array_with_nul) - 1);
>- EXPECT_STREQ("Here's a NUL\\0 and some more string",
>- ToCString(Message() << string_with_nul));
>-}
>-
>-// Tests streaming a NUL char.
>-TEST(MessageTest, StreamsNULChar) {
>- EXPECT_STREQ("\\0", ToCString(Message() << '\0'));
>-}
>-
>-// Tests streaming int.
>-TEST(MessageTest, StreamsInt) {
>- EXPECT_STREQ("123", ToCString(Message() << 123));
>-}
>-
>-// Tests that basic IO manipulators (endl, ends, and flush) can be
>-// streamed to Message.
>-TEST(MessageTest, StreamsBasicIoManip) {
>- EXPECT_STREQ("Line 1.\nA NUL char \\0 in line 2.",
>- ToCString(Message() << "Line 1." << std::endl
>- << "A NUL char " << std::ends << std::flush
>- << " in line 2."));
>-}
>-
>-// Tests Message::GetString()
>-TEST(MessageTest, GetString) {
>- Message msg;
>- msg << 1 << " lamb";
>- EXPECT_STREQ("1 lamb", msg.GetString().c_str());
>-}
>-
>-// Tests streaming a Message object to an ostream.
>-TEST(MessageTest, StreamsToOStream) {
>- Message msg("Hello");
>- StrStream ss;
>- ss << msg;
>- EXPECT_STREQ("Hello", testing::internal::StrStreamToString(&ss).c_str());
>-}
>-
>-// Tests that a Message object doesn't take up too much stack space.
>-TEST(MessageTest, DoesNotTakeUpMuchStackSpace) {
>- EXPECT_LE(sizeof(Message), 16U);
>-}
>-
>-} // namespace
>diff --git a/Source/ThirdParty/gtest/test/gtest-options_test.cc b/Source/ThirdParty/gtest/test/gtest-options_test.cc
>deleted file mode 100644
>index 2e2cbc92e5e028c74c82f0750fdd8bdfb4e8831e..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest-options_test.cc
>+++ /dev/null
>@@ -1,212 +0,0 @@
>-// Copyright 2008, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Authors: keith.ray@gmail.com (Keith Ray)
>-//
>-// Google Test UnitTestOptions tests
>-//
>-// This file tests classes and functions used internally by
>-// Google Test. They are subject to change without notice.
>-//
>-// This file is #included from gtest.cc, to avoid changing build or
>-// make-files on Windows and other platforms. Do not #include this file
>-// anywhere else!
>-
>-#include <gtest/gtest.h>
>-
>-#if GTEST_OS_WINDOWS_MOBILE
>-#include <windows.h>
>-#elif GTEST_OS_WINDOWS
>-#include <direct.h>
>-#endif // GTEST_OS_WINDOWS_MOBILE
>-
>-// Indicates that this translation unit is part of Google Test's
>-// implementation. It must come before gtest-internal-inl.h is
>-// included, or there will be a compiler error. This trick is to
>-// prevent a user from accidentally including gtest-internal-inl.h in
>-// his code.
>-#define GTEST_IMPLEMENTATION_ 1
>-#include "src/gtest-internal-inl.h"
>-#undef GTEST_IMPLEMENTATION_
>-
>-namespace testing {
>-namespace internal {
>-namespace {
>-
>-// Turns the given relative path into an absolute path.
>-FilePath GetAbsolutePathOf(const FilePath& relative_path) {
>- return FilePath::ConcatPaths(FilePath::GetCurrentDir(), relative_path);
>-}
>-
>-// Testing UnitTestOptions::GetOutputFormat/GetOutputFile.
>-
>-TEST(XmlOutputTest, GetOutputFormatDefault) {
>- GTEST_FLAG(output) = "";
>- EXPECT_STREQ("", UnitTestOptions::GetOutputFormat().c_str());
>-}
>-
>-TEST(XmlOutputTest, GetOutputFormat) {
>- GTEST_FLAG(output) = "xml:filename";
>- EXPECT_STREQ("xml", UnitTestOptions::GetOutputFormat().c_str());
>-}
>-
>-TEST(XmlOutputTest, GetOutputFileDefault) {
>- GTEST_FLAG(output) = "";
>- EXPECT_STREQ(GetAbsolutePathOf(FilePath("test_detail.xml")).c_str(),
>- UnitTestOptions::GetAbsolutePathToOutputFile().c_str());
>-}
>-
>-TEST(XmlOutputTest, GetOutputFileSingleFile) {
>- GTEST_FLAG(output) = "xml:filename.abc";
>- EXPECT_STREQ(GetAbsolutePathOf(FilePath("filename.abc")).c_str(),
>- UnitTestOptions::GetAbsolutePathToOutputFile().c_str());
>-}
>-
>-TEST(XmlOutputTest, GetOutputFileFromDirectoryPath) {
>- GTEST_FLAG(output) = "xml:path" GTEST_PATH_SEP_;
>- const std::string expected_output_file =
>- GetAbsolutePathOf(
>- FilePath(std::string("path") + GTEST_PATH_SEP_ +
>- GetCurrentExecutableName().c_str() + ".xml")).c_str();
>- const String& output_file = UnitTestOptions::GetAbsolutePathToOutputFile();
>-#if GTEST_OS_WINDOWS
>- EXPECT_STRCASEEQ(expected_output_file.c_str(), output_file.c_str());
>-#else
>- EXPECT_EQ(expected_output_file, output_file.c_str());
>-#endif
>-}
>-
>-TEST(OutputFileHelpersTest, GetCurrentExecutableName) {
>- const std::string exe_str = GetCurrentExecutableName().c_str();
>-#if GTEST_OS_WINDOWS
>- const bool success =
>- _strcmpi("gtest-options_test", exe_str.c_str()) == 0 ||
>- _strcmpi("gtest-options-ex_test", exe_str.c_str()) == 0 ||
>- _strcmpi("gtest_all_test", exe_str.c_str()) == 0 ||
>- _strcmpi("gtest_dll_test", exe_str.c_str()) == 0;
>-#else
>- // TODO(wan@google.com): remove the hard-coded "lt-" prefix when
>- // Chandler Carruth's libtool replacement is ready.
>- const bool success =
>- exe_str == "gtest-options_test" ||
>- exe_str == "gtest_all_test" ||
>- exe_str == "lt-gtest_all_test" ||
>- exe_str == "gtest_dll_test";
>-#endif // GTEST_OS_WINDOWS
>- if (!success)
>- FAIL() << "GetCurrentExecutableName() returns " << exe_str;
>-}
>-
>-class XmlOutputChangeDirTest : public Test {
>- protected:
>- virtual void SetUp() {
>- original_working_dir_ = FilePath::GetCurrentDir();
>- posix::ChDir("..");
>- // This will make the test fail if run from the root directory.
>- EXPECT_STRNE(original_working_dir_.c_str(),
>- FilePath::GetCurrentDir().c_str());
>- }
>-
>- virtual void TearDown() {
>- posix::ChDir(original_working_dir_.c_str());
>- }
>-
>- FilePath original_working_dir_;
>-};
>-
>-TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithDefault) {
>- GTEST_FLAG(output) = "";
>- EXPECT_STREQ(FilePath::ConcatPaths(original_working_dir_,
>- FilePath("test_detail.xml")).c_str(),
>- UnitTestOptions::GetAbsolutePathToOutputFile().c_str());
>-}
>-
>-TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithDefaultXML) {
>- GTEST_FLAG(output) = "xml";
>- EXPECT_STREQ(FilePath::ConcatPaths(original_working_dir_,
>- FilePath("test_detail.xml")).c_str(),
>- UnitTestOptions::GetAbsolutePathToOutputFile().c_str());
>-}
>-
>-TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithRelativeFile) {
>- GTEST_FLAG(output) = "xml:filename.abc";
>- EXPECT_STREQ(FilePath::ConcatPaths(original_working_dir_,
>- FilePath("filename.abc")).c_str(),
>- UnitTestOptions::GetAbsolutePathToOutputFile().c_str());
>-}
>-
>-TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithRelativePath) {
>- GTEST_FLAG(output) = "xml:path" GTEST_PATH_SEP_;
>- const std::string expected_output_file =
>- FilePath::ConcatPaths(
>- original_working_dir_,
>- FilePath(std::string("path") + GTEST_PATH_SEP_ +
>- GetCurrentExecutableName().c_str() + ".xml")).c_str();
>- const String& output_file = UnitTestOptions::GetAbsolutePathToOutputFile();
>-#if GTEST_OS_WINDOWS
>- EXPECT_STRCASEEQ(expected_output_file.c_str(), output_file.c_str());
>-#else
>- EXPECT_EQ(expected_output_file, output_file.c_str());
>-#endif
>-}
>-
>-TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithAbsoluteFile) {
>-#if GTEST_OS_WINDOWS
>- GTEST_FLAG(output) = "xml:c:\\tmp\\filename.abc";
>- EXPECT_STREQ(FilePath("c:\\tmp\\filename.abc").c_str(),
>- UnitTestOptions::GetAbsolutePathToOutputFile().c_str());
>-#else
>- GTEST_FLAG(output) ="xml:/tmp/filename.abc";
>- EXPECT_STREQ(FilePath("/tmp/filename.abc").c_str(),
>- UnitTestOptions::GetAbsolutePathToOutputFile().c_str());
>-#endif
>-}
>-
>-TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithAbsolutePath) {
>-#if GTEST_OS_WINDOWS
>- const std::string path = "c:\\tmp\\";
>-#else
>- const std::string path = "/tmp/";
>-#endif
>-
>- GTEST_FLAG(output) = "xml:" + path;
>- const std::string expected_output_file =
>- path + GetCurrentExecutableName().c_str() + ".xml";
>- const String& output_file = UnitTestOptions::GetAbsolutePathToOutputFile();
>-
>-#if GTEST_OS_WINDOWS
>- EXPECT_STRCASEEQ(expected_output_file.c_str(), output_file.c_str());
>-#else
>- EXPECT_EQ(expected_output_file, output_file.c_str());
>-#endif
>-}
>-
>-} // namespace
>-} // namespace internal
>-} // namespace testing
>diff --git a/Source/ThirdParty/gtest/test/gtest-param-test2_test.cc b/Source/ThirdParty/gtest/test/gtest-param-test2_test.cc
>deleted file mode 100644
>index ccb6cfac9e76b827f17ae11829e236d6f97ee646..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest-param-test2_test.cc
>+++ /dev/null
>@@ -1,65 +0,0 @@
>-// Copyright 2008, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: vladl@google.com (Vlad Losev)
>-//
>-// Tests for Google Test itself. This verifies that the basic constructs of
>-// Google Test work.
>-
>-#include <gtest/gtest.h>
>-
>-#include "test/gtest-param-test_test.h"
>-
>-#if GTEST_HAS_PARAM_TEST
>-
>-using ::testing::Values;
>-using ::testing::internal::ParamGenerator;
>-
>-// Tests that generators defined in a different translation unit
>-// are functional. The test using extern_gen is defined
>-// in gtest-param-test_test.cc.
>-ParamGenerator<int> extern_gen = Values(33);
>-
>-// Tests that a parameterized test case can be defined in one translation unit
>-// and instantiated in another. The test is defined in gtest-param-test_test.cc
>-// and ExternalInstantiationTest fixture class is defined in
>-// gtest-param-test_test.h.
>-INSTANTIATE_TEST_CASE_P(MultiplesOf33,
>- ExternalInstantiationTest,
>- Values(33, 66));
>-
>-// Tests that a parameterized test case can be instantiated
>-// in multiple translation units. Another instantiation is defined
>-// in gtest-param-test_test.cc and InstantiationInMultipleTranslaionUnitsTest
>-// fixture is defined in gtest-param-test_test.h
>-INSTANTIATE_TEST_CASE_P(Sequence2,
>- InstantiationInMultipleTranslaionUnitsTest,
>- Values(42*3, 42*4, 42*5));
>-
>-#endif // GTEST_HAS_PARAM_TEST
>diff --git a/Source/ThirdParty/gtest/test/gtest-param-test_test.cc b/Source/ThirdParty/gtest/test/gtest-param-test_test.cc
>deleted file mode 100644
>index d0a0e735c0b988ef1a22b7d7ae69027018bdb8cb..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest-param-test_test.cc
>+++ /dev/null
>@@ -1,835 +0,0 @@
>-// Copyright 2008, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: vladl@google.com (Vlad Losev)
>-//
>-// Tests for Google Test itself. This file verifies that the parameter
>-// generators objects produce correct parameter sequences and that
>-// Google Test runtime instantiates correct tests from those sequences.
>-
>-#include <gtest/gtest.h>
>-
>-#if GTEST_HAS_PARAM_TEST
>-
>-#include <algorithm>
>-#include <iostream>
>-#include <list>
>-#include <sstream>
>-#include <string>
>-#include <vector>
>-
>-// To include gtest-internal-inl.h.
>-#define GTEST_IMPLEMENTATION_ 1
>-#include "src/gtest-internal-inl.h" // for UnitTestOptions
>-#undef GTEST_IMPLEMENTATION_
>-
>-#include "test/gtest-param-test_test.h"
>-
>-using ::std::vector;
>-using ::std::sort;
>-
>-using ::testing::AddGlobalTestEnvironment;
>-using ::testing::Bool;
>-using ::testing::Message;
>-using ::testing::Range;
>-using ::testing::TestWithParam;
>-using ::testing::Values;
>-using ::testing::ValuesIn;
>-
>-#if GTEST_HAS_COMBINE
>-using ::testing::Combine;
>-using ::std::tr1::get;
>-using ::std::tr1::make_tuple;
>-using ::std::tr1::tuple;
>-#endif // GTEST_HAS_COMBINE
>-
>-using ::testing::internal::ParamGenerator;
>-using ::testing::internal::UnitTestOptions;
>-
>-// Prints a value to a string.
>-//
>-// TODO(wan@google.com): remove PrintValue() when we move matchers and
>-// EXPECT_THAT() from Google Mock to Google Test. At that time, we
>-// can write EXPECT_THAT(x, Eq(y)) to compare two tuples x and y, as
>-// EXPECT_THAT() and the matchers know how to print tuples.
>-template <typename T>
>-::std::string PrintValue(const T& value) {
>- ::std::stringstream stream;
>- stream << value;
>- return stream.str();
>-}
>-
>-#if GTEST_HAS_COMBINE
>-
>-// These overloads allow printing tuples in our tests. We cannot
>-// define an operator<< for tuples, as that definition needs to be in
>-// the std namespace in order to be picked up by Google Test via
>-// Argument-Dependent Lookup, yet defining anything in the std
>-// namespace in non-STL code is undefined behavior.
>-
>-template <typename T1, typename T2>
>-::std::string PrintValue(const tuple<T1, T2>& value) {
>- ::std::stringstream stream;
>- stream << "(" << get<0>(value) << ", " << get<1>(value) << ")";
>- return stream.str();
>-}
>-
>-template <typename T1, typename T2, typename T3>
>-::std::string PrintValue(const tuple<T1, T2, T3>& value) {
>- ::std::stringstream stream;
>- stream << "(" << get<0>(value) << ", " << get<1>(value)
>- << ", "<< get<2>(value) << ")";
>- return stream.str();
>-}
>-
>-template <typename T1, typename T2, typename T3, typename T4, typename T5,
>- typename T6, typename T7, typename T8, typename T9, typename T10>
>-::std::string PrintValue(
>- const tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>& value) {
>- ::std::stringstream stream;
>- stream << "(" << get<0>(value) << ", " << get<1>(value)
>- << ", "<< get<2>(value) << ", " << get<3>(value)
>- << ", "<< get<4>(value) << ", " << get<5>(value)
>- << ", "<< get<6>(value) << ", " << get<7>(value)
>- << ", "<< get<8>(value) << ", " << get<9>(value) << ")";
>- return stream.str();
>-}
>-
>-#endif // GTEST_HAS_COMBINE
>-
>-// Verifies that a sequence generated by the generator and accessed
>-// via the iterator object matches the expected one using Google Test
>-// assertions.
>-template <typename T, size_t N>
>-void VerifyGenerator(const ParamGenerator<T>& generator,
>- const T (&expected_values)[N]) {
>- typename ParamGenerator<T>::iterator it = generator.begin();
>- for (size_t i = 0; i < N; ++i) {
>- ASSERT_FALSE(it == generator.end())
>- << "At element " <- << "created with the copy constructor.\n";
>- // We cannot use EXPECT_EQ() here as the values may be tuples,
>- // which don't support <<.
>- EXPECT_TRUE(expected_values[i] == *it)
>- << "where i is " <- << ", expected_values[i] is " << PrintValue(expected_values[i])
>- << ", *it is " << PrintValue(*it)
>- << ", and 'it' is an iterator created with the copy constructor.\n";
>- it++;
>- }
>- EXPECT_TRUE(it == generator.end())
>- << "At the presumed end of sequence when accessing via an iterator "
>- << "created with the copy constructor.\n";
>-
>- // Test the iterator assignment. The following lines verify that
>- // the sequence accessed via an iterator initialized via the
>- // assignment operator (as opposed to a copy constructor) matches
>- // just the same.
>- it = generator.begin();
>- for (size_t i = 0; i < N; ++i) {
>- ASSERT_FALSE(it == generator.end())
>- << "At element " <- << "created with the assignment operator.\n";
>- EXPECT_TRUE(expected_values[i] == *it)
>- << "where i is " <- << ", expected_values[i] is " << PrintValue(expected_values[i])
>- << ", *it is " << PrintValue(*it)
>- << ", and 'it' is an iterator created with the copy constructor.\n";
>- it++;
>- }
>- EXPECT_TRUE(it == generator.end())
>- << "At the presumed end of sequence when accessing via an iterator "
>- << "created with the assignment operator.\n";
>-}
>-
>-template <typename T>
>-void VerifyGeneratorIsEmpty(const ParamGenerator<T>& generator) {
>- typename ParamGenerator<T>::iterator it = generator.begin();
>- EXPECT_TRUE(it == generator.end());
>-
>- it = generator.begin();
>- EXPECT_TRUE(it == generator.end());
>-}
>-
>-// Generator tests. They test that each of the provided generator functions
>-// generates an expected sequence of values. The general test pattern
>-// instantiates a generator using one of the generator functions,
>-// checks the sequence produced by the generator using its iterator API,
>-// and then resets the iterator back to the beginning of the sequence
>-// and checks the sequence again.
>-
>-// Tests that iterators produced by generator functions conform to the
>-// ForwardIterator concept.
>-TEST(IteratorTest, ParamIteratorConformsToForwardIteratorConcept) {
>- const ParamGenerator<int> gen = Range(0, 10);
>- ParamGenerator<int>::iterator it = gen.begin();
>-
>- // Verifies that iterator initialization works as expected.
>- ParamGenerator<int>::iterator it2 = it;
>- EXPECT_TRUE(*it == *it2) << "Initialized iterators must point to the "
>- << "element same as its source points to";
>-
>- // Verifies that iterator assignment works as expected.
>- it++;
>- EXPECT_FALSE(*it == *it2);
>- it2 = it;
>- EXPECT_TRUE(*it == *it2) << "Assigned iterators must point to the "
>- << "element same as its source points to";
>-
>- // Verifies that prefix operator++() returns *this.
>- EXPECT_EQ(&it, &(++it)) << "Result of the prefix operator++ must be "
>- << "refer to the original object";
>-
>- // Verifies that the result of the postfix operator++ points to the value
>- // pointed to by the original iterator.
>- int original_value = *it; // Have to compute it outside of macro call to be
>- // unaffected by the parameter evaluation order.
>- EXPECT_EQ(original_value, *(it++));
>-
>- // Verifies that prefix and postfix operator++() advance an iterator
>- // all the same.
>- it2 = it;
>- it++;
>- ++it2;
>- EXPECT_TRUE(*it == *it2);
>-}
>-
>-// Tests that Range() generates the expected sequence.
>-TEST(RangeTest, IntRangeWithDefaultStep) {
>- const ParamGenerator<int> gen = Range(0, 3);
>- const int expected_values[] = {0, 1, 2};
>- VerifyGenerator(gen, expected_values);
>-}
>-
>-// Edge case. Tests that Range() generates the single element sequence
>-// as expected when provided with range limits that are equal.
>-TEST(RangeTest, IntRangeSingleValue) {
>- const ParamGenerator<int> gen = Range(0, 1);
>- const int expected_values[] = {0};
>- VerifyGenerator(gen, expected_values);
>-}
>-
>-// Edge case. Tests that Range() with generates empty sequence when
>-// supplied with an empty range.
>-TEST(RangeTest, IntRangeEmpty) {
>- const ParamGenerator<int> gen = Range(0, 0);
>- VerifyGeneratorIsEmpty(gen);
>-}
>-
>-// Tests that Range() with custom step (greater then one) generates
>-// the expected sequence.
>-TEST(RangeTest, IntRangeWithCustomStep) {
>- const ParamGenerator<int> gen = Range(0, 9, 3);
>- const int expected_values[] = {0, 3, 6};
>- VerifyGenerator(gen, expected_values);
>-}
>-
>-// Tests that Range() with custom step (greater then one) generates
>-// the expected sequence when the last element does not fall on the
>-// upper range limit. Sequences generated by Range() must not have
>-// elements beyond the range limits.
>-TEST(RangeTest, IntRangeWithCustomStepOverUpperBound) {
>- const ParamGenerator<int> gen = Range(0, 4, 3);
>- const int expected_values[] = {0, 3};
>- VerifyGenerator(gen, expected_values);
>-}
>-
>-// Verifies that Range works with user-defined types that define
>-// copy constructor, operator=(), operator+(), and operator<().
>-class DogAdder {
>- public:
>- explicit DogAdder(const char* a_value) : value_(a_value) {}
>- DogAdder(const DogAdder& other) : value_(other.value_.c_str()) {}
>-
>- DogAdder operator=(const DogAdder& other) {
>- if (this != &other)
>- value_ = other.value_;
>- return *this;
>- }
>- DogAdder operator+(const DogAdder& other) const {
>- Message msg;
>- msg << value_.c_str() << other.value_.c_str();
>- return DogAdder(msg.GetString().c_str());
>- }
>- bool operator<(const DogAdder& other) const {
>- return value_ < other.value_;
>- }
>- const ::testing::internal::String& value() const { return value_; }
>-
>- private:
>- ::testing::internal::String value_;
>-};
>-
>-TEST(RangeTest, WorksWithACustomType) {
>- const ParamGenerator<DogAdder> gen =
>- Range(DogAdder("cat"), DogAdder("catdogdog"), DogAdder("dog"));
>- ParamGenerator<DogAdder>::iterator it = gen.begin();
>-
>- ASSERT_FALSE(it == gen.end());
>- EXPECT_STREQ("cat", it->value().c_str());
>-
>- ASSERT_FALSE(++it == gen.end());
>- EXPECT_STREQ("catdog", it->value().c_str());
>-
>- EXPECT_TRUE(++it == gen.end());
>-}
>-
>-class IntWrapper {
>- public:
>- explicit IntWrapper(int a_value) : value_(a_value) {}
>- IntWrapper(const IntWrapper& other) : value_(other.value_) {}
>-
>- IntWrapper operator=(const IntWrapper& other) {
>- value_ = other.value_;
>- return *this;
>- }
>- // operator+() adds a different type.
>- IntWrapper operator+(int other) const { return IntWrapper(value_ + other); }
>- bool operator<(const IntWrapper& other) const {
>- return value_ < other.value_;
>- }
>- int value() const { return value_; }
>-
>- private:
>- int value_;
>-};
>-
>-TEST(RangeTest, WorksWithACustomTypeWithDifferentIncrementType) {
>- const ParamGenerator<IntWrapper> gen = Range(IntWrapper(0), IntWrapper(2));
>- ParamGenerator<IntWrapper>::iterator it = gen.begin();
>-
>- ASSERT_FALSE(it == gen.end());
>- EXPECT_EQ(0, it->value());
>-
>- ASSERT_FALSE(++it == gen.end());
>- EXPECT_EQ(1, it->value());
>-
>- EXPECT_TRUE(++it == gen.end());
>-}
>-
>-// Tests that ValuesIn() with an array parameter generates
>-// the expected sequence.
>-TEST(ValuesInTest, ValuesInArray) {
>- int array[] = {3, 5, 8};
>- const ParamGenerator<int> gen = ValuesIn(array);
>- VerifyGenerator(gen, array);
>-}
>-
>-// Tests that ValuesIn() with a const array parameter generates
>-// the expected sequence.
>-TEST(ValuesInTest, ValuesInConstArray) {
>- const int array[] = {3, 5, 8};
>- const ParamGenerator<int> gen = ValuesIn(array);
>- VerifyGenerator(gen, array);
>-}
>-
>-// Edge case. Tests that ValuesIn() with an array parameter containing a
>-// single element generates the single element sequence.
>-TEST(ValuesInTest, ValuesInSingleElementArray) {
>- int array[] = {42};
>- const ParamGenerator<int> gen = ValuesIn(array);
>- VerifyGenerator(gen, array);
>-}
>-
>-// Tests that ValuesIn() generates the expected sequence for an STL
>-// container (vector).
>-TEST(ValuesInTest, ValuesInVector) {
>- typedef ::std::vector<int> ContainerType;
>- ContainerType values;
>- values.push_back(3);
>- values.push_back(5);
>- values.push_back(8);
>- const ParamGenerator<int> gen = ValuesIn(values);
>-
>- const int expected_values[] = {3, 5, 8};
>- VerifyGenerator(gen, expected_values);
>-}
>-
>-// Tests that ValuesIn() generates the expected sequence.
>-TEST(ValuesInTest, ValuesInIteratorRange) {
>- typedef ::std::vector<int> ContainerType;
>- ContainerType values;
>- values.push_back(3);
>- values.push_back(5);
>- values.push_back(8);
>- const ParamGenerator<int> gen = ValuesIn(values.begin(), values.end());
>-
>- const int expected_values[] = {3, 5, 8};
>- VerifyGenerator(gen, expected_values);
>-}
>-
>-// Edge case. Tests that ValuesIn() provided with an iterator range specifying a
>-// single value generates a single-element sequence.
>-TEST(ValuesInTest, ValuesInSingleElementIteratorRange) {
>- typedef ::std::vector<int> ContainerType;
>- ContainerType values;
>- values.push_back(42);
>- const ParamGenerator<int> gen = ValuesIn(values.begin(), values.end());
>-
>- const int expected_values[] = {42};
>- VerifyGenerator(gen, expected_values);
>-}
>-
>-// Edge case. Tests that ValuesIn() provided with an empty iterator range
>-// generates an empty sequence.
>-TEST(ValuesInTest, ValuesInEmptyIteratorRange) {
>- typedef ::std::vector<int> ContainerType;
>- ContainerType values;
>- const ParamGenerator<int> gen = ValuesIn(values.begin(), values.end());
>-
>- VerifyGeneratorIsEmpty(gen);
>-}
>-
>-// Tests that the Values() generates the expected sequence.
>-TEST(ValuesTest, ValuesWorks) {
>- const ParamGenerator<int> gen = Values(3, 5, 8);
>-
>- const int expected_values[] = {3, 5, 8};
>- VerifyGenerator(gen, expected_values);
>-}
>-
>-// Tests that Values() generates the expected sequences from elements of
>-// different types convertible to ParamGenerator's parameter type.
>-TEST(ValuesTest, ValuesWorksForValuesOfCompatibleTypes) {
>- const ParamGenerator<double> gen = Values(3, 5.0f, 8.0);
>-
>- const double expected_values[] = {3.0, 5.0, 8.0};
>- VerifyGenerator(gen, expected_values);
>-}
>-
>-TEST(ValuesTest, ValuesWorksForMaxLengthList) {
>- const ParamGenerator<int> gen = Values(
>- 10, 20, 30, 40, 50, 60, 70, 80, 90, 100,
>- 110, 120, 130, 140, 150, 160, 170, 180, 190, 200,
>- 210, 220, 230, 240, 250, 260, 270, 280, 290, 300,
>- 310, 320, 330, 340, 350, 360, 370, 380, 390, 400,
>- 410, 420, 430, 440, 450, 460, 470, 480, 490, 500);
>-
>- const int expected_values[] = {
>- 10, 20, 30, 40, 50, 60, 70, 80, 90, 100,
>- 110, 120, 130, 140, 150, 160, 170, 180, 190, 200,
>- 210, 220, 230, 240, 250, 260, 270, 280, 290, 300,
>- 310, 320, 330, 340, 350, 360, 370, 380, 390, 400,
>- 410, 420, 430, 440, 450, 460, 470, 480, 490, 500};
>- VerifyGenerator(gen, expected_values);
>-}
>-
>-// Edge case test. Tests that single-parameter Values() generates the sequence
>-// with the single value.
>-TEST(ValuesTest, ValuesWithSingleParameter) {
>- const ParamGenerator<int> gen = Values(42);
>-
>- const int expected_values[] = {42};
>- VerifyGenerator(gen, expected_values);
>-}
>-
>-// Tests that Bool() generates sequence (false, true).
>-TEST(BoolTest, BoolWorks) {
>- const ParamGenerator<bool> gen = Bool();
>-
>- const bool expected_values[] = {false, true};
>- VerifyGenerator(gen, expected_values);
>-}
>-
>-#if GTEST_HAS_COMBINE
>-
>-// Tests that Combine() with two parameters generates the expected sequence.
>-TEST(CombineTest, CombineWithTwoParameters) {
>- const char* foo = "foo";
>- const char* bar = "bar";
>- const ParamGenerator<tuple<const char*, int> > gen =
>- Combine(Values(foo, bar), Values(3, 4));
>-
>- tuple<const char*, int> expected_values[] = {
>- make_tuple(foo, 3), make_tuple(foo, 4),
>- make_tuple(bar, 3), make_tuple(bar, 4)};
>- VerifyGenerator(gen, expected_values);
>-}
>-
>-// Tests that Combine() with three parameters generates the expected sequence.
>-TEST(CombineTest, CombineWithThreeParameters) {
>- const ParamGenerator<tuple<int, int, int> > gen = Combine(Values(0, 1),
>- Values(3, 4),
>- Values(5, 6));
>- tuple<int, int, int> expected_values[] = {
>- make_tuple(0, 3, 5), make_tuple(0, 3, 6),
>- make_tuple(0, 4, 5), make_tuple(0, 4, 6),
>- make_tuple(1, 3, 5), make_tuple(1, 3, 6),
>- make_tuple(1, 4, 5), make_tuple(1, 4, 6)};
>- VerifyGenerator(gen, expected_values);
>-}
>-
>-// Tests that the Combine() with the first parameter generating a single value
>-// sequence generates a sequence with the number of elements equal to the
>-// number of elements in the sequence generated by the second parameter.
>-TEST(CombineTest, CombineWithFirstParameterSingleValue) {
>- const ParamGenerator<tuple<int, int> > gen = Combine(Values(42),
>- Values(0, 1));
>-
>- tuple<int, int> expected_values[] = {make_tuple(42, 0), make_tuple(42, 1)};
>- VerifyGenerator(gen, expected_values);
>-}
>-
>-// Tests that the Combine() with the second parameter generating a single value
>-// sequence generates a sequence with the number of elements equal to the
>-// number of elements in the sequence generated by the first parameter.
>-TEST(CombineTest, CombineWithSecondParameterSingleValue) {
>- const ParamGenerator<tuple<int, int> > gen = Combine(Values(0, 1),
>- Values(42));
>-
>- tuple<int, int> expected_values[] = {make_tuple(0, 42), make_tuple(1, 42)};
>- VerifyGenerator(gen, expected_values);
>-}
>-
>-// Tests that when the first parameter produces an empty sequence,
>-// Combine() produces an empty sequence, too.
>-TEST(CombineTest, CombineWithFirstParameterEmptyRange) {
>- const ParamGenerator<tuple<int, int> > gen = Combine(Range(0, 0),
>- Values(0, 1));
>- VerifyGeneratorIsEmpty(gen);
>-}
>-
>-// Tests that when the second parameter produces an empty sequence,
>-// Combine() produces an empty sequence, too.
>-TEST(CombineTest, CombineWithSecondParameterEmptyRange) {
>- const ParamGenerator<tuple<int, int> > gen = Combine(Values(0, 1),
>- Range(1, 1));
>- VerifyGeneratorIsEmpty(gen);
>-}
>-
>-// Edge case. Tests that combine works with the maximum number
>-// of parameters supported by Google Test (currently 10).
>-TEST(CombineTest, CombineWithMaxNumberOfParameters) {
>- const char* foo = "foo";
>- const char* bar = "bar";
>- const ParamGenerator<tuple<const char*, int, int, int, int, int, int, int,
>- int, int> > gen = Combine(Values(foo, bar),
>- Values(1), Values(2),
>- Values(3), Values(4),
>- Values(5), Values(6),
>- Values(7), Values(8),
>- Values(9));
>-
>- tuple<const char*, int, int, int, int, int, int, int, int, int>
>- expected_values[] = {make_tuple(foo, 1, 2, 3, 4, 5, 6, 7, 8, 9),
>- make_tuple(bar, 1, 2, 3, 4, 5, 6, 7, 8, 9)};
>- VerifyGenerator(gen, expected_values);
>-}
>-
>-#endif // GTEST_HAS_COMBINE
>-
>-// Tests that an generator produces correct sequence after being
>-// assigned from another generator.
>-TEST(ParamGeneratorTest, AssignmentWorks) {
>- ParamGenerator<int> gen = Values(1, 2);
>- const ParamGenerator<int> gen2 = Values(3, 4);
>- gen = gen2;
>-
>- const int expected_values[] = {3, 4};
>- VerifyGenerator(gen, expected_values);
>-}
>-
>-// This test verifies that the tests are expanded and run as specified:
>-// one test per element from the sequence produced by the generator
>-// specified in INSTANTIATE_TEST_CASE_P. It also verifies that the test's
>-// fixture constructor, SetUp(), and TearDown() have run and have been
>-// supplied with the correct parameters.
>-
>-// The use of environment object allows detection of the case where no test
>-// case functionality is run at all. In this case TestCaseTearDown will not
>-// be able to detect missing tests, naturally.
>-template <int kExpectedCalls>
>-class TestGenerationEnvironment : public ::testing::Environment {
>- public:
>- static TestGenerationEnvironment* Instance() {
>- static TestGenerationEnvironment* instance = new TestGenerationEnvironment;
>- return instance;
>- }
>-
>- void FixtureConstructorExecuted() { fixture_constructor_count_++; }
>- void SetUpExecuted() { set_up_count_++; }
>- void TearDownExecuted() { tear_down_count_++; }
>- void TestBodyExecuted() { test_body_count_++; }
>-
>- virtual void TearDown() {
>- // If all MultipleTestGenerationTest tests have been de-selected
>- // by the filter flag, the following checks make no sense.
>- bool perform_check = false;
>-
>- for (int i = 0; i < kExpectedCalls; ++i) {
>- Message msg;
>- msg << "TestsExpandedAndRun/" << i;
>- if (UnitTestOptions::FilterMatchesTest(
>- "TestExpansionModule/MultipleTestGenerationTest",
>- msg.GetString().c_str())) {
>- perform_check = true;
>- }
>- }
>- if (perform_check) {
>- EXPECT_EQ(kExpectedCalls, fixture_constructor_count_)
>- << "Fixture constructor of ParamTestGenerationTest test case "
>- << "has not been run as expected.";
>- EXPECT_EQ(kExpectedCalls, set_up_count_)
>- << "Fixture SetUp method of ParamTestGenerationTest test case "
>- << "has not been run as expected.";
>- EXPECT_EQ(kExpectedCalls, tear_down_count_)
>- << "Fixture TearDown method of ParamTestGenerationTest test case "
>- << "has not been run as expected.";
>- EXPECT_EQ(kExpectedCalls, test_body_count_)
>- << "Test in ParamTestGenerationTest test case "
>- << "has not been run as expected.";
>- }
>- }
>- private:
>- TestGenerationEnvironment() : fixture_constructor_count_(0), set_up_count_(0),
>- tear_down_count_(0), test_body_count_(0) {}
>-
>- int fixture_constructor_count_;
>- int set_up_count_;
>- int tear_down_count_;
>- int test_body_count_;
>-
>- GTEST_DISALLOW_COPY_AND_ASSIGN_(TestGenerationEnvironment);
>-};
>-
>-const int test_generation_params[] = {36, 42, 72};
>-
>-class TestGenerationTest : public TestWithParam<int> {
>- public:
>- enum {
>- PARAMETER_COUNT =
>- sizeof(test_generation_params)/sizeof(test_generation_params[0])
>- };
>-
>- typedef TestGenerationEnvironment<PARAMETER_COUNT> Environment;
>-
>- TestGenerationTest() {
>- Environment::Instance()->FixtureConstructorExecuted();
>- current_parameter_ = GetParam();
>- }
>- virtual void SetUp() {
>- Environment::Instance()->SetUpExecuted();
>- EXPECT_EQ(current_parameter_, GetParam());
>- }
>- virtual void TearDown() {
>- Environment::Instance()->TearDownExecuted();
>- EXPECT_EQ(current_parameter_, GetParam());
>- }
>-
>- static void SetUpTestCase() {
>- bool all_tests_in_test_case_selected = true;
>-
>- for (int i = 0; i < PARAMETER_COUNT; ++i) {
>- Message test_name;
>- test_name << "TestsExpandedAndRun/" << i;
>- if ( !UnitTestOptions::FilterMatchesTest(
>- "TestExpansionModule/MultipleTestGenerationTest",
>- test_name.GetString())) {
>- all_tests_in_test_case_selected = false;
>- }
>- }
>- EXPECT_TRUE(all_tests_in_test_case_selected)
>- << "When running the TestGenerationTest test case all of its tests\n"
>- << "must be selected by the filter flag for the test case to pass.\n"
>- << "If not all of them are enabled, we can't reliably conclude\n"
>- << "that the correct number of tests have been generated.";
>-
>- collected_parameters_.clear();
>- }
>-
>- static void TearDownTestCase() {
>- vector<int> expected_values(test_generation_params,
>- test_generation_params + PARAMETER_COUNT);
>- // Test execution order is not guaranteed by Google Test,
>- // so the order of values in collected_parameters_ can be
>- // different and we have to sort to compare.
>- sort(expected_values.begin(), expected_values.end());
>- sort(collected_parameters_.begin(), collected_parameters_.end());
>-
>- EXPECT_TRUE(collected_parameters_ == expected_values);
>- }
>- protected:
>- int current_parameter_;
>- static vector<int> collected_parameters_;
>-
>- private:
>- GTEST_DISALLOW_COPY_AND_ASSIGN_(TestGenerationTest);
>-};
>-vector<int> TestGenerationTest::collected_parameters_;
>-
>-TEST_P(TestGenerationTest, TestsExpandedAndRun) {
>- Environment::Instance()->TestBodyExecuted();
>- EXPECT_EQ(current_parameter_, GetParam());
>- collected_parameters_.push_back(GetParam());
>-}
>-INSTANTIATE_TEST_CASE_P(TestExpansionModule, TestGenerationTest,
>- ValuesIn(test_generation_params));
>-
>-// This test verifies that the element sequence (third parameter of
>-// INSTANTIATE_TEST_CASE_P) is evaluated in InitGoogleTest() and neither at
>-// the call site of INSTANTIATE_TEST_CASE_P nor in RUN_ALL_TESTS(). For
>-// that, we declare param_value_ to be a static member of
>-// GeneratorEvaluationTest and initialize it to 0. We set it to 1 in
>-// main(), just before invocation of InitGoogleTest(). After calling
>-// InitGoogleTest(), we set the value to 2. If the sequence is evaluated
>-// before or after InitGoogleTest, INSTANTIATE_TEST_CASE_P will create a
>-// test with parameter other than 1, and the test body will fail the
>-// assertion.
>-class GeneratorEvaluationTest : public TestWithParam<int> {
>- public:
>- static int param_value() { return param_value_; }
>- static void set_param_value(int param_value) { param_value_ = param_value; }
>-
>- private:
>- static int param_value_;
>-};
>-int GeneratorEvaluationTest::param_value_ = 0;
>-
>-TEST_P(GeneratorEvaluationTest, GeneratorsEvaluatedInMain) {
>- EXPECT_EQ(1, GetParam());
>-}
>-INSTANTIATE_TEST_CASE_P(GenEvalModule,
>- GeneratorEvaluationTest,
>- Values(GeneratorEvaluationTest::param_value()));
>-
>-// Tests that generators defined in a different translation unit are
>-// functional. Generator extern_gen is defined in gtest-param-test_test2.cc.
>-extern ParamGenerator<int> extern_gen;
>-class ExternalGeneratorTest : public TestWithParam<int> {};
>-TEST_P(ExternalGeneratorTest, ExternalGenerator) {
>- // Sequence produced by extern_gen contains only a single value
>- // which we verify here.
>- EXPECT_EQ(GetParam(), 33);
>-}
>-INSTANTIATE_TEST_CASE_P(ExternalGeneratorModule,
>- ExternalGeneratorTest,
>- extern_gen);
>-
>-// Tests that a parameterized test case can be defined in one translation
>-// unit and instantiated in another. This test will be instantiated in
>-// gtest-param-test_test2.cc. ExternalInstantiationTest fixture class is
>-// defined in gtest-param-test_test.h.
>-TEST_P(ExternalInstantiationTest, IsMultipleOf33) {
>- EXPECT_EQ(0, GetParam() % 33);
>-}
>-
>-// Tests that a parameterized test case can be instantiated with multiple
>-// generators.
>-class MultipleInstantiationTest : public TestWithParam<int> {};
>-TEST_P(MultipleInstantiationTest, AllowsMultipleInstances) {
>-}
>-INSTANTIATE_TEST_CASE_P(Sequence1, MultipleInstantiationTest, Values(1, 2));
>-INSTANTIATE_TEST_CASE_P(Sequence2, MultipleInstantiationTest, Range(3, 5));
>-
>-// Tests that a parameterized test case can be instantiated
>-// in multiple translation units. This test will be instantiated
>-// here and in gtest-param-test_test2.cc.
>-// InstantiationInMultipleTranslationUnitsTest fixture class
>-// is defined in gtest-param-test_test.h.
>-TEST_P(InstantiationInMultipleTranslaionUnitsTest, IsMultipleOf42) {
>- EXPECT_EQ(0, GetParam() % 42);
>-}
>-INSTANTIATE_TEST_CASE_P(Sequence1,
>- InstantiationInMultipleTranslaionUnitsTest,
>- Values(42, 42*2));
>-
>-// Tests that each iteration of parameterized test runs in a separate test
>-// object.
>-class SeparateInstanceTest : public TestWithParam<int> {
>- public:
>- SeparateInstanceTest() : count_(0) {}
>-
>- static void TearDownTestCase() {
>- EXPECT_GE(global_count_, 2)
>- << "If some (but not all) SeparateInstanceTest tests have been "
>- << "filtered out this test will fail. Make sure that all "
>- << "GeneratorEvaluationTest are selected or de-selected together "
>- << "by the test filter.";
>- }
>-
>- protected:
>- int count_;
>- static int global_count_;
>-};
>-int SeparateInstanceTest::global_count_ = 0;
>-
>-TEST_P(SeparateInstanceTest, TestsRunInSeparateInstances) {
>- EXPECT_EQ(0, count_++);
>- global_count_++;
>-}
>-INSTANTIATE_TEST_CASE_P(FourElemSequence, SeparateInstanceTest, Range(1, 4));
>-
>-// Tests that all instantiations of a test have named appropriately. Test
>-// defined with TEST_P(TestCaseName, TestName) and instantiated with
>-// INSTANTIATE_TEST_CASE_P(SequenceName, TestCaseName, generator) must be named
>-// SequenceName/TestCaseName.TestName/i, where i is the 0-based index of the
>-// sequence element used to instantiate the test.
>-class NamingTest : public TestWithParam<int> {};
>-
>-TEST_P(NamingTest, TestsAreNamedAppropriately) {
>- const ::testing::TestInfo* const test_info =
>- ::testing::UnitTest::GetInstance()->current_test_info();
>-
>- EXPECT_STREQ("ZeroToFiveSequence/NamingTest", test_info->test_case_name());
>-
>- Message msg;
>- msg << "TestsAreNamedAppropriately/" << GetParam();
>- EXPECT_STREQ(msg.GetString().c_str(), test_info->name());
>-}
>-
>-INSTANTIATE_TEST_CASE_P(ZeroToFiveSequence, NamingTest, Range(0, 5));
>-
>-#endif // GTEST_HAS_PARAM_TEST
>-
>-TEST(CompileTest, CombineIsDefinedOnlyWhenGtestHasParamTestIsDefined) {
>-#if GTEST_HAS_COMBINE && !GTEST_HAS_PARAM_TEST
>- FAIL() << "GTEST_HAS_COMBINE is defined while GTEST_HAS_PARAM_TEST is not\n"
>-#endif
>-}
>-
>-int main(int argc, char **argv) {
>-#if GTEST_HAS_PARAM_TEST
>- // Used in TestGenerationTest test case.
>- AddGlobalTestEnvironment(TestGenerationTest::Environment::Instance());
>- // Used in GeneratorEvaluationTest test case. Tests that the updated value
>- // will be picked up for instantiating tests in GeneratorEvaluationTest.
>- GeneratorEvaluationTest::set_param_value(1);
>-#endif // GTEST_HAS_PARAM_TEST
>-
>- ::testing::InitGoogleTest(&argc, argv);
>-
>-#if GTEST_HAS_PARAM_TEST
>- // Used in GeneratorEvaluationTest test case. Tests that value updated
>- // here will NOT be used for instantiating tests in
>- // GeneratorEvaluationTest.
>- GeneratorEvaluationTest::set_param_value(2);
>-#endif // GTEST_HAS_PARAM_TEST
>-
>- return RUN_ALL_TESTS();
>-}
>diff --git a/Source/ThirdParty/gtest/test/gtest-param-test_test.h b/Source/ThirdParty/gtest/test/gtest-param-test_test.h
>deleted file mode 100644
>index b7f94936137dfc5f3f2d57fa40dcaf7a15cb6b5e..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest-param-test_test.h
>+++ /dev/null
>@@ -1,55 +0,0 @@
>-// Copyright 2008, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Authors: vladl@google.com (Vlad Losev)
>-//
>-// The Google C++ Testing Framework (Google Test)
>-//
>-// This header file provides classes and functions used internally
>-// for testing Google Test itself.
>-
>-#ifndef GTEST_TEST_GTEST_PARAM_TEST_TEST_H_
>-#define GTEST_TEST_GTEST_PARAM_TEST_TEST_H_
>-
>-#include <gtest/gtest.h>
>-
>-#if GTEST_HAS_PARAM_TEST
>-
>-// Test fixture for testing definition and instantiation of a test
>-// in separate translation units.
>-class ExternalInstantiationTest : public ::testing::TestWithParam<int> {};
>-
>-// Test fixture for testing instantiation of a test in multiple
>-// translation units.
>-class InstantiationInMultipleTranslaionUnitsTest
>- : public ::testing::TestWithParam<int> {};
>-
>-#endif // GTEST_HAS_PARAM_TEST
>-
>-#endif // GTEST_TEST_GTEST_PARAM_TEST_TEST_H_
>diff --git a/Source/ThirdParty/gtest/test/gtest-port_test.cc b/Source/ThirdParty/gtest/test/gtest-port_test.cc
>deleted file mode 100644
>index 37258602fa5cf5a779947cd427e20e909fc9258d..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest-port_test.cc
>+++ /dev/null
>@@ -1,1018 +0,0 @@
>-// Copyright 2008, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Authors: vladl@google.com (Vlad Losev), wan@google.com (Zhanyong Wan)
>-//
>-// This file tests the internal cross-platform support utilities.
>-
>-#include <gtest/internal/gtest-port.h>
>-
>-#include <stdio.h>
>-
>-#if GTEST_OS_MAC
>-#include <time.h>
>-#endif // GTEST_OS_MAC
>-
>-#include <utility> // For std::pair and std::make_pair.
>-
>-#include <gtest/gtest.h>
>-#include <gtest/gtest-spi.h>
>-
>-// Indicates that this translation unit is part of Google Test's
>-// implementation. It must come before gtest-internal-inl.h is
>-// included, or there will be a compiler error. This trick is to
>-// prevent a user from accidentally including gtest-internal-inl.h in
>-// his code.
>-#define GTEST_IMPLEMENTATION_ 1
>-#include "src/gtest-internal-inl.h"
>-#undef GTEST_IMPLEMENTATION_
>-
>-using std::make_pair;
>-using std::pair;
>-
>-namespace testing {
>-namespace internal {
>-
>-// Tests that the element_type typedef is available in scoped_ptr and refers
>-// to the parameter type.
>-TEST(ScopedPtrTest, DefinesElementType) {
>- StaticAssertTypeEq<int, ::testing::internal::scoped_ptr<int>::element_type>();
>-}
>-
>-// TODO(vladl@google.com): Implement THE REST of scoped_ptr tests.
>-
>-TEST(GtestCheckSyntaxTest, BehavesLikeASingleStatement) {
>- if (AlwaysFalse())
>- GTEST_CHECK_(false) << "This should never be executed; "
>- "It's a compilation test only.";
>-
>- if (AlwaysTrue())
>- GTEST_CHECK_(true);
>- else
>- ; // NOLINT
>-
>- if (AlwaysFalse())
>- ; // NOLINT
>- else
>- GTEST_CHECK_(true) << "";
>-}
>-
>-TEST(GtestCheckSyntaxTest, WorksWithSwitch) {
>- switch (0) {
>- case 1:
>- break;
>- default:
>- GTEST_CHECK_(true);
>- }
>-
>- switch(0)
>- case 0:
>- GTEST_CHECK_(true) << "Check failed in switch case";
>-}
>-
>-#if GTEST_OS_MAC
>-void* ThreadFunc(void* data) {
>- pthread_mutex_t* mutex = static_cast<pthread_mutex_t*>(data);
>- pthread_mutex_lock(mutex);
>- pthread_mutex_unlock(mutex);
>- return NULL;
>-}
>-
>-TEST(GetThreadCountTest, ReturnsCorrectValue) {
>- EXPECT_EQ(1U, GetThreadCount());
>- pthread_mutex_t mutex;
>- pthread_attr_t attr;
>- pthread_t thread_id;
>-
>- // TODO(vladl@google.com): turn mutex into internal::Mutex for automatic
>- // destruction.
>- pthread_mutex_init(&mutex, NULL);
>- pthread_mutex_lock(&mutex);
>- ASSERT_EQ(0, pthread_attr_init(&attr));
>- ASSERT_EQ(0, pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE));
>-
>- const int status = pthread_create(&thread_id, &attr, &ThreadFunc, &mutex);
>- ASSERT_EQ(0, pthread_attr_destroy(&attr));
>- ASSERT_EQ(0, status);
>- EXPECT_EQ(2U, GetThreadCount());
>- pthread_mutex_unlock(&mutex);
>-
>- void* dummy;
>- ASSERT_EQ(0, pthread_join(thread_id, &dummy));
>-
>- // MacOS X may not immediately report the updated thread count after
>- // joining a thread, causing flakiness in this test. To counter that, we
>- // wait for up to .5 seconds for the OS to report the correct value.
>- for (int i = 0; i < 5; ++i) {
>- if (GetThreadCount() == 1)
>- break;
>-
>- SleepMilliseconds(100);
>- }
>- EXPECT_EQ(1U, GetThreadCount());
>- pthread_mutex_destroy(&mutex);
>-}
>-#else
>-TEST(GetThreadCountTest, ReturnsZeroWhenUnableToCountThreads) {
>- EXPECT_EQ(0U, GetThreadCount());
>-}
>-#endif // GTEST_OS_MAC
>-
>-TEST(GtestCheckDeathTest, DiesWithCorrectOutputOnFailure) {
>- const bool a_false_condition = false;
>- const char regex[] =
>-#ifdef _MSC_VER
>- "gtest-port_test\\.cc\$\\d+\$:"
>-#else
>- "gtest-port_test\\.cc:[0-9]+"
>-#endif // _MSC_VER
>- ".*a_false_condition.*Extra info.*";
>-
>- EXPECT_DEATH_IF_SUPPORTED(GTEST_CHECK_(a_false_condition) << "Extra info",
>- regex);
>-}
>-
>-#if GTEST_HAS_DEATH_TEST
>-
>-TEST(GtestCheckDeathTest, LivesSilentlyOnSuccess) {
>- EXPECT_EXIT({
>- GTEST_CHECK_(true) << "Extra info";
>- ::std::cerr << "Success\n";
>- exit(0); },
>- ::testing::ExitedWithCode(0), "Success");
>-}
>-
>-#endif // GTEST_HAS_DEATH_TEST
>-
>-#if GTEST_USES_POSIX_RE
>-
>-#if GTEST_HAS_TYPED_TEST
>-
>-template <typename Str>
>-class RETest : public ::testing::Test {};
>-
>-// Defines StringTypes as the list of all string types that class RE
>-// supports.
>-typedef testing::Types<
>- ::std::string,
>-#if GTEST_HAS_GLOBAL_STRING
>- ::string,
>-#endif // GTEST_HAS_GLOBAL_STRING
>- const char*> StringTypes;
>-
>-TYPED_TEST_CASE(RETest, StringTypes);
>-
>-// Tests RE's implicit constructors.
>-TYPED_TEST(RETest, ImplicitConstructorWorks) {
>- const RE empty(TypeParam(""));
>- EXPECT_STREQ("", empty.pattern());
>-
>- const RE simple(TypeParam("hello"));
>- EXPECT_STREQ("hello", simple.pattern());
>-
>- const RE normal(TypeParam(".*(\\w+)"));
>- EXPECT_STREQ(".*(\\w+)", normal.pattern());
>-}
>-
>-// Tests that RE's constructors reject invalid regular expressions.
>-TYPED_TEST(RETest, RejectsInvalidRegex) {
>- EXPECT_NONFATAL_FAILURE({
>- const RE invalid(TypeParam("?"));
>- }, "\"?\" is not a valid POSIX Extended regular expression.");
>-}
>-
>-// Tests RE::FullMatch().
>-TYPED_TEST(RETest, FullMatchWorks) {
>- const RE empty(TypeParam(""));
>- EXPECT_TRUE(RE::FullMatch(TypeParam(""), empty));
>- EXPECT_FALSE(RE::FullMatch(TypeParam("a"), empty));
>-
>- const RE re(TypeParam("a.*z"));
>- EXPECT_TRUE(RE::FullMatch(TypeParam("az"), re));
>- EXPECT_TRUE(RE::FullMatch(TypeParam("axyz"), re));
>- EXPECT_FALSE(RE::FullMatch(TypeParam("baz"), re));
>- EXPECT_FALSE(RE::FullMatch(TypeParam("azy"), re));
>-}
>-
>-// Tests RE::PartialMatch().
>-TYPED_TEST(RETest, PartialMatchWorks) {
>- const RE empty(TypeParam(""));
>- EXPECT_TRUE(RE::PartialMatch(TypeParam(""), empty));
>- EXPECT_TRUE(RE::PartialMatch(TypeParam("a"), empty));
>-
>- const RE re(TypeParam("a.*z"));
>- EXPECT_TRUE(RE::PartialMatch(TypeParam("az"), re));
>- EXPECT_TRUE(RE::PartialMatch(TypeParam("axyz"), re));
>- EXPECT_TRUE(RE::PartialMatch(TypeParam("baz"), re));
>- EXPECT_TRUE(RE::PartialMatch(TypeParam("azy"), re));
>- EXPECT_FALSE(RE::PartialMatch(TypeParam("zza"), re));
>-}
>-
>-#endif // GTEST_HAS_TYPED_TEST
>-
>-#elif GTEST_USES_SIMPLE_RE
>-
>-TEST(IsInSetTest, NulCharIsNotInAnySet) {
>- EXPECT_FALSE(IsInSet('\0', ""));
>- EXPECT_FALSE(IsInSet('\0', "\0"));
>- EXPECT_FALSE(IsInSet('\0', "a"));
>-}
>-
>-TEST(IsInSetTest, WorksForNonNulChars) {
>- EXPECT_FALSE(IsInSet('a', "Ab"));
>- EXPECT_FALSE(IsInSet('c', ""));
>-
>- EXPECT_TRUE(IsInSet('b', "bcd"));
>- EXPECT_TRUE(IsInSet('b', "ab"));
>-}
>-
>-TEST(IsDigitTest, IsFalseForNonDigit) {
>- EXPECT_FALSE(IsDigit('\0'));
>- EXPECT_FALSE(IsDigit(' '));
>- EXPECT_FALSE(IsDigit('+'));
>- EXPECT_FALSE(IsDigit('-'));
>- EXPECT_FALSE(IsDigit('.'));
>- EXPECT_FALSE(IsDigit('a'));
>-}
>-
>-TEST(IsDigitTest, IsTrueForDigit) {
>- EXPECT_TRUE(IsDigit('0'));
>- EXPECT_TRUE(IsDigit('1'));
>- EXPECT_TRUE(IsDigit('5'));
>- EXPECT_TRUE(IsDigit('9'));
>-}
>-
>-TEST(IsPunctTest, IsFalseForNonPunct) {
>- EXPECT_FALSE(IsPunct('\0'));
>- EXPECT_FALSE(IsPunct(' '));
>- EXPECT_FALSE(IsPunct('\n'));
>- EXPECT_FALSE(IsPunct('a'));
>- EXPECT_FALSE(IsPunct('0'));
>-}
>-
>-TEST(IsPunctTest, IsTrueForPunct) {
>- for (const char* p = "^-!\"#$%&'()*+,./:;<=>?@[\\]_`{|}~"; *p; p++) {
>- EXPECT_PRED1(IsPunct, *p);
>- }
>-}
>-
>-TEST(IsRepeatTest, IsFalseForNonRepeatChar) {
>- EXPECT_FALSE(IsRepeat('\0'));
>- EXPECT_FALSE(IsRepeat(' '));
>- EXPECT_FALSE(IsRepeat('a'));
>- EXPECT_FALSE(IsRepeat('1'));
>- EXPECT_FALSE(IsRepeat('-'));
>-}
>-
>-TEST(IsRepeatTest, IsTrueForRepeatChar) {
>- EXPECT_TRUE(IsRepeat('?'));
>- EXPECT_TRUE(IsRepeat('*'));
>- EXPECT_TRUE(IsRepeat('+'));
>-}
>-
>-TEST(IsWhiteSpaceTest, IsFalseForNonWhiteSpace) {
>- EXPECT_FALSE(IsWhiteSpace('\0'));
>- EXPECT_FALSE(IsWhiteSpace('a'));
>- EXPECT_FALSE(IsWhiteSpace('1'));
>- EXPECT_FALSE(IsWhiteSpace('+'));
>- EXPECT_FALSE(IsWhiteSpace('_'));
>-}
>-
>-TEST(IsWhiteSpaceTest, IsTrueForWhiteSpace) {
>- EXPECT_TRUE(IsWhiteSpace(' '));
>- EXPECT_TRUE(IsWhiteSpace('\n'));
>- EXPECT_TRUE(IsWhiteSpace('\r'));
>- EXPECT_TRUE(IsWhiteSpace('\t'));
>- EXPECT_TRUE(IsWhiteSpace('\v'));
>- EXPECT_TRUE(IsWhiteSpace('\f'));
>-}
>-
>-TEST(IsWordCharTest, IsFalseForNonWordChar) {
>- EXPECT_FALSE(IsWordChar('\0'));
>- EXPECT_FALSE(IsWordChar('+'));
>- EXPECT_FALSE(IsWordChar('.'));
>- EXPECT_FALSE(IsWordChar(' '));
>- EXPECT_FALSE(IsWordChar('\n'));
>-}
>-
>-TEST(IsWordCharTest, IsTrueForLetter) {
>- EXPECT_TRUE(IsWordChar('a'));
>- EXPECT_TRUE(IsWordChar('b'));
>- EXPECT_TRUE(IsWordChar('A'));
>- EXPECT_TRUE(IsWordChar('Z'));
>-}
>-
>-TEST(IsWordCharTest, IsTrueForDigit) {
>- EXPECT_TRUE(IsWordChar('0'));
>- EXPECT_TRUE(IsWordChar('1'));
>- EXPECT_TRUE(IsWordChar('7'));
>- EXPECT_TRUE(IsWordChar('9'));
>-}
>-
>-TEST(IsWordCharTest, IsTrueForUnderscore) {
>- EXPECT_TRUE(IsWordChar('_'));
>-}
>-
>-TEST(IsValidEscapeTest, IsFalseForNonPrintable) {
>- EXPECT_FALSE(IsValidEscape('\0'));
>- EXPECT_FALSE(IsValidEscape('\007'));
>-}
>-
>-TEST(IsValidEscapeTest, IsFalseForDigit) {
>- EXPECT_FALSE(IsValidEscape('0'));
>- EXPECT_FALSE(IsValidEscape('9'));
>-}
>-
>-TEST(IsValidEscapeTest, IsFalseForWhiteSpace) {
>- EXPECT_FALSE(IsValidEscape(' '));
>- EXPECT_FALSE(IsValidEscape('\n'));
>-}
>-
>-TEST(IsValidEscapeTest, IsFalseForSomeLetter) {
>- EXPECT_FALSE(IsValidEscape('a'));
>- EXPECT_FALSE(IsValidEscape('Z'));
>-}
>-
>-TEST(IsValidEscapeTest, IsTrueForPunct) {
>- EXPECT_TRUE(IsValidEscape('.'));
>- EXPECT_TRUE(IsValidEscape('-'));
>- EXPECT_TRUE(IsValidEscape('^'));
>- EXPECT_TRUE(IsValidEscape('$'));
>- EXPECT_TRUE(IsValidEscape('('));
>- EXPECT_TRUE(IsValidEscape(']'));
>- EXPECT_TRUE(IsValidEscape('{'));
>- EXPECT_TRUE(IsValidEscape('|'));
>-}
>-
>-TEST(IsValidEscapeTest, IsTrueForSomeLetter) {
>- EXPECT_TRUE(IsValidEscape('d'));
>- EXPECT_TRUE(IsValidEscape('D'));
>- EXPECT_TRUE(IsValidEscape('s'));
>- EXPECT_TRUE(IsValidEscape('S'));
>- EXPECT_TRUE(IsValidEscape('w'));
>- EXPECT_TRUE(IsValidEscape('W'));
>-}
>-
>-TEST(AtomMatchesCharTest, EscapedPunct) {
>- EXPECT_FALSE(AtomMatchesChar(true, '\\', '\0'));
>- EXPECT_FALSE(AtomMatchesChar(true, '\\', ' '));
>- EXPECT_FALSE(AtomMatchesChar(true, '_', '.'));
>- EXPECT_FALSE(AtomMatchesChar(true, '.', 'a'));
>-
>- EXPECT_TRUE(AtomMatchesChar(true, '\\', '\\'));
>- EXPECT_TRUE(AtomMatchesChar(true, '_', '_'));
>- EXPECT_TRUE(AtomMatchesChar(true, '+', '+'));
>- EXPECT_TRUE(AtomMatchesChar(true, '.', '.'));
>-}
>-
>-TEST(AtomMatchesCharTest, Escaped_d) {
>- EXPECT_FALSE(AtomMatchesChar(true, 'd', '\0'));
>- EXPECT_FALSE(AtomMatchesChar(true, 'd', 'a'));
>- EXPECT_FALSE(AtomMatchesChar(true, 'd', '.'));
>-
>- EXPECT_TRUE(AtomMatchesChar(true, 'd', '0'));
>- EXPECT_TRUE(AtomMatchesChar(true, 'd', '9'));
>-}
>-
>-TEST(AtomMatchesCharTest, Escaped_D) {
>- EXPECT_FALSE(AtomMatchesChar(true, 'D', '0'));
>- EXPECT_FALSE(AtomMatchesChar(true, 'D', '9'));
>-
>- EXPECT_TRUE(AtomMatchesChar(true, 'D', '\0'));
>- EXPECT_TRUE(AtomMatchesChar(true, 'D', 'a'));
>- EXPECT_TRUE(AtomMatchesChar(true, 'D', '-'));
>-}
>-
>-TEST(AtomMatchesCharTest, Escaped_s) {
>- EXPECT_FALSE(AtomMatchesChar(true, 's', '\0'));
>- EXPECT_FALSE(AtomMatchesChar(true, 's', 'a'));
>- EXPECT_FALSE(AtomMatchesChar(true, 's', '.'));
>- EXPECT_FALSE(AtomMatchesChar(true, 's', '9'));
>-
>- EXPECT_TRUE(AtomMatchesChar(true, 's', ' '));
>- EXPECT_TRUE(AtomMatchesChar(true, 's', '\n'));
>- EXPECT_TRUE(AtomMatchesChar(true, 's', '\t'));
>-}
>-
>-TEST(AtomMatchesCharTest, Escaped_S) {
>- EXPECT_FALSE(AtomMatchesChar(true, 'S', ' '));
>- EXPECT_FALSE(AtomMatchesChar(true, 'S', '\r'));
>-
>- EXPECT_TRUE(AtomMatchesChar(true, 'S', '\0'));
>- EXPECT_TRUE(AtomMatchesChar(true, 'S', 'a'));
>- EXPECT_TRUE(AtomMatchesChar(true, 'S', '9'));
>-}
>-
>-TEST(AtomMatchesCharTest, Escaped_w) {
>- EXPECT_FALSE(AtomMatchesChar(true, 'w', '\0'));
>- EXPECT_FALSE(AtomMatchesChar(true, 'w', '+'));
>- EXPECT_FALSE(AtomMatchesChar(true, 'w', ' '));
>- EXPECT_FALSE(AtomMatchesChar(true, 'w', '\n'));
>-
>- EXPECT_TRUE(AtomMatchesChar(true, 'w', '0'));
>- EXPECT_TRUE(AtomMatchesChar(true, 'w', 'b'));
>- EXPECT_TRUE(AtomMatchesChar(true, 'w', 'C'));
>- EXPECT_TRUE(AtomMatchesChar(true, 'w', '_'));
>-}
>-
>-TEST(AtomMatchesCharTest, Escaped_W) {
>- EXPECT_FALSE(AtomMatchesChar(true, 'W', 'A'));
>- EXPECT_FALSE(AtomMatchesChar(true, 'W', 'b'));
>- EXPECT_FALSE(AtomMatchesChar(true, 'W', '9'));
>- EXPECT_FALSE(AtomMatchesChar(true, 'W', '_'));
>-
>- EXPECT_TRUE(AtomMatchesChar(true, 'W', '\0'));
>- EXPECT_TRUE(AtomMatchesChar(true, 'W', '*'));
>- EXPECT_TRUE(AtomMatchesChar(true, 'W', '\n'));
>-}
>-
>-TEST(AtomMatchesCharTest, EscapedWhiteSpace) {
>- EXPECT_FALSE(AtomMatchesChar(true, 'f', '\0'));
>- EXPECT_FALSE(AtomMatchesChar(true, 'f', '\n'));
>- EXPECT_FALSE(AtomMatchesChar(true, 'n', '\0'));
>- EXPECT_FALSE(AtomMatchesChar(true, 'n', '\r'));
>- EXPECT_FALSE(AtomMatchesChar(true, 'r', '\0'));
>- EXPECT_FALSE(AtomMatchesChar(true, 'r', 'a'));
>- EXPECT_FALSE(AtomMatchesChar(true, 't', '\0'));
>- EXPECT_FALSE(AtomMatchesChar(true, 't', 't'));
>- EXPECT_FALSE(AtomMatchesChar(true, 'v', '\0'));
>- EXPECT_FALSE(AtomMatchesChar(true, 'v', '\f'));
>-
>- EXPECT_TRUE(AtomMatchesChar(true, 'f', '\f'));
>- EXPECT_TRUE(AtomMatchesChar(true, 'n', '\n'));
>- EXPECT_TRUE(AtomMatchesChar(true, 'r', '\r'));
>- EXPECT_TRUE(AtomMatchesChar(true, 't', '\t'));
>- EXPECT_TRUE(AtomMatchesChar(true, 'v', '\v'));
>-}
>-
>-TEST(AtomMatchesCharTest, UnescapedDot) {
>- EXPECT_FALSE(AtomMatchesChar(false, '.', '\n'));
>-
>- EXPECT_TRUE(AtomMatchesChar(false, '.', '\0'));
>- EXPECT_TRUE(AtomMatchesChar(false, '.', '.'));
>- EXPECT_TRUE(AtomMatchesChar(false, '.', 'a'));
>- EXPECT_TRUE(AtomMatchesChar(false, '.', ' '));
>-}
>-
>-TEST(AtomMatchesCharTest, UnescapedChar) {
>- EXPECT_FALSE(AtomMatchesChar(false, 'a', '\0'));
>- EXPECT_FALSE(AtomMatchesChar(false, 'a', 'b'));
>- EXPECT_FALSE(AtomMatchesChar(false, '$', 'a'));
>-
>- EXPECT_TRUE(AtomMatchesChar(false, '$', '$'));
>- EXPECT_TRUE(AtomMatchesChar(false, '5', '5'));
>- EXPECT_TRUE(AtomMatchesChar(false, 'Z', 'Z'));
>-}
>-
>-TEST(ValidateRegexTest, GeneratesFailureAndReturnsFalseForInvalid) {
>- EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex(NULL)),
>- "NULL is not a valid simple regular expression");
>- EXPECT_NONFATAL_FAILURE(
>- ASSERT_FALSE(ValidateRegex("a\\")),
>- "Syntax error at index 1 in simple regular expression \"a\\\": ");
>- EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("a\\")),
>- "'\\' cannot appear at the end");
>- EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("\\n\\")),
>- "'\\' cannot appear at the end");
>- EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("\\s\\hb")),
>- "invalid escape sequence \"\\h\"");
>- EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("^^")),
>- "'^' can only appear at the beginning");
>- EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex(".*^b")),
>- "'^' can only appear at the beginning");
>- EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("$$")),
>- "'$' can only appear at the end");
>- EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("^$a")),
>- "'$' can only appear at the end");
>- EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("a(b")),
>- "'(' is unsupported");
>- EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("ab)")),
>- "')' is unsupported");
>- EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("[ab")),
>- "'[' is unsupported");
>- EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("a{2")),
>- "'{' is unsupported");
>- EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("?")),
>- "'?' can only follow a repeatable token");
>- EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("^*")),
>- "'*' can only follow a repeatable token");
>- EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("5*+")),
>- "'+' can only follow a repeatable token");
>-}
>-
>-TEST(ValidateRegexTest, ReturnsTrueForValid) {
>- EXPECT_TRUE(ValidateRegex(""));
>- EXPECT_TRUE(ValidateRegex("a"));
>- EXPECT_TRUE(ValidateRegex(".*"));
>- EXPECT_TRUE(ValidateRegex("^a_+"));
>- EXPECT_TRUE(ValidateRegex("^a\\t\\&?"));
>- EXPECT_TRUE(ValidateRegex("09*$"));
>- EXPECT_TRUE(ValidateRegex("^Z$"));
>- EXPECT_TRUE(ValidateRegex("a\\^Z\\$\$\$\\|\\[\\]\\{\\}"));
>-}
>-
>-TEST(MatchRepetitionAndRegexAtHeadTest, WorksForZeroOrOne) {
>- EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, 'a', '?', "a", "ba"));
>- // Repeating more than once.
>- EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, 'a', '?', "b", "aab"));
>-
>- // Repeating zero times.
>- EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, 'a', '?', "b", "ba"));
>- // Repeating once.
>- EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, 'a', '?', "b", "ab"));
>- EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, '#', '?', ".", "##"));
>-}
>-
>-TEST(MatchRepetitionAndRegexAtHeadTest, WorksForZeroOrMany) {
>- EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, '.', '*', "a$", "baab"));
>-
>- // Repeating zero times.
>- EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, '.', '*', "b", "bc"));
>- // Repeating once.
>- EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, '.', '*', "b", "abc"));
>- // Repeating more than once.
>- EXPECT_TRUE(MatchRepetitionAndRegexAtHead(true, 'w', '*', "-", "ab_1-g"));
>-}
>-
>-TEST(MatchRepetitionAndRegexAtHeadTest, WorksForOneOrMany) {
>- EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, '.', '+', "a$", "baab"));
>- // Repeating zero times.
>- EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, '.', '+', "b", "bc"));
>-
>- // Repeating once.
>- EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, '.', '+', "b", "abc"));
>- // Repeating more than once.
>- EXPECT_TRUE(MatchRepetitionAndRegexAtHead(true, 'w', '+', "-", "ab_1-g"));
>-}
>-
>-TEST(MatchRegexAtHeadTest, ReturnsTrueForEmptyRegex) {
>- EXPECT_TRUE(MatchRegexAtHead("", ""));
>- EXPECT_TRUE(MatchRegexAtHead("", "ab"));
>-}
>-
>-TEST(MatchRegexAtHeadTest, WorksWhenDollarIsInRegex) {
>- EXPECT_FALSE(MatchRegexAtHead("$", "a"));
>-
>- EXPECT_TRUE(MatchRegexAtHead("$", ""));
>- EXPECT_TRUE(MatchRegexAtHead("a$", "a"));
>-}
>-
>-TEST(MatchRegexAtHeadTest, WorksWhenRegexStartsWithEscapeSequence) {
>- EXPECT_FALSE(MatchRegexAtHead("\\w", "+"));
>- EXPECT_FALSE(MatchRegexAtHead("\\W", "ab"));
>-
>- EXPECT_TRUE(MatchRegexAtHead("\\sa", "\nab"));
>- EXPECT_TRUE(MatchRegexAtHead("\\d", "1a"));
>-}
>-
>-TEST(MatchRegexAtHeadTest, WorksWhenRegexStartsWithRepetition) {
>- EXPECT_FALSE(MatchRegexAtHead(".+a", "abc"));
>- EXPECT_FALSE(MatchRegexAtHead("a?b", "aab"));
>-
>- EXPECT_TRUE(MatchRegexAtHead(".*a", "bc12-ab"));
>- EXPECT_TRUE(MatchRegexAtHead("a?b", "b"));
>- EXPECT_TRUE(MatchRegexAtHead("a?b", "ab"));
>-}
>-
>-TEST(MatchRegexAtHeadTest,
>- WorksWhenRegexStartsWithRepetionOfEscapeSequence) {
>- EXPECT_FALSE(MatchRegexAtHead("\\.+a", "abc"));
>- EXPECT_FALSE(MatchRegexAtHead("\\s?b", " b"));
>-
>- EXPECT_TRUE(MatchRegexAtHead("\\(*a", "((((ab"));
>- EXPECT_TRUE(MatchRegexAtHead("\\^?b", "^b"));
>- EXPECT_TRUE(MatchRegexAtHead("\\\\?b", "b"));
>- EXPECT_TRUE(MatchRegexAtHead("\\\\?b", "\\b"));
>-}
>-
>-TEST(MatchRegexAtHeadTest, MatchesSequentially) {
>- EXPECT_FALSE(MatchRegexAtHead("ab.*c", "acabc"));
>-
>- EXPECT_TRUE(MatchRegexAtHead("ab.*c", "ab-fsc"));
>-}
>-
>-TEST(MatchRegexAnywhereTest, ReturnsFalseWhenStringIsNull) {
>- EXPECT_FALSE(MatchRegexAnywhere("", NULL));
>-}
>-
>-TEST(MatchRegexAnywhereTest, WorksWhenRegexStartsWithCaret) {
>- EXPECT_FALSE(MatchRegexAnywhere("^a", "ba"));
>- EXPECT_FALSE(MatchRegexAnywhere("^$", "a"));
>-
>- EXPECT_TRUE(MatchRegexAnywhere("^a", "ab"));
>- EXPECT_TRUE(MatchRegexAnywhere("^", "ab"));
>- EXPECT_TRUE(MatchRegexAnywhere("^$", ""));
>-}
>-
>-TEST(MatchRegexAnywhereTest, ReturnsFalseWhenNoMatch) {
>- EXPECT_FALSE(MatchRegexAnywhere("a", "bcde123"));
>- EXPECT_FALSE(MatchRegexAnywhere("a.+a", "--aa88888888"));
>-}
>-
>-TEST(MatchRegexAnywhereTest, ReturnsTrueWhenMatchingPrefix) {
>- EXPECT_TRUE(MatchRegexAnywhere("\\w+", "ab1_ - 5"));
>- EXPECT_TRUE(MatchRegexAnywhere(".*=", "="));
>- EXPECT_TRUE(MatchRegexAnywhere("x.*ab?.*bc", "xaaabc"));
>-}
>-
>-TEST(MatchRegexAnywhereTest, ReturnsTrueWhenMatchingNonPrefix) {
>- EXPECT_TRUE(MatchRegexAnywhere("\\w+", "$$$ ab1_ - 5"));
>- EXPECT_TRUE(MatchRegexAnywhere("\\.+=", "= ...="));
>-}
>-
>-// Tests RE's implicit constructors.
>-TEST(RETest, ImplicitConstructorWorks) {
>- const RE empty("");
>- EXPECT_STREQ("", empty.pattern());
>-
>- const RE simple("hello");
>- EXPECT_STREQ("hello", simple.pattern());
>-}
>-
>-// Tests that RE's constructors reject invalid regular expressions.
>-TEST(RETest, RejectsInvalidRegex) {
>- EXPECT_NONFATAL_FAILURE({
>- const RE normal(NULL);
>- }, "NULL is not a valid simple regular expression");
>-
>- EXPECT_NONFATAL_FAILURE({
>- const RE normal(".*(\\w+");
>- }, "'(' is unsupported");
>-
>- EXPECT_NONFATAL_FAILURE({
>- const RE invalid("^?");
>- }, "'?' can only follow a repeatable token");
>-}
>-
>-// Tests RE::FullMatch().
>-TEST(RETest, FullMatchWorks) {
>- const RE empty("");
>- EXPECT_TRUE(RE::FullMatch("", empty));
>- EXPECT_FALSE(RE::FullMatch("a", empty));
>-
>- const RE re1("a");
>- EXPECT_TRUE(RE::FullMatch("a", re1));
>-
>- const RE re("a.*z");
>- EXPECT_TRUE(RE::FullMatch("az", re));
>- EXPECT_TRUE(RE::FullMatch("axyz", re));
>- EXPECT_FALSE(RE::FullMatch("baz", re));
>- EXPECT_FALSE(RE::FullMatch("azy", re));
>-}
>-
>-// Tests RE::PartialMatch().
>-TEST(RETest, PartialMatchWorks) {
>- const RE empty("");
>- EXPECT_TRUE(RE::PartialMatch("", empty));
>- EXPECT_TRUE(RE::PartialMatch("a", empty));
>-
>- const RE re("a.*z");
>- EXPECT_TRUE(RE::PartialMatch("az", re));
>- EXPECT_TRUE(RE::PartialMatch("axyz", re));
>- EXPECT_TRUE(RE::PartialMatch("baz", re));
>- EXPECT_TRUE(RE::PartialMatch("azy", re));
>- EXPECT_FALSE(RE::PartialMatch("zza", re));
>-}
>-
>-#endif // GTEST_USES_POSIX_RE
>-
>-#if !GTEST_OS_WINDOWS_MOBILE
>-
>-TEST(CaptureTest, CapturesStdout) {
>- CaptureStdout();
>- fprintf(stdout, "abc");
>- EXPECT_STREQ("abc", GetCapturedStdout().c_str());
>-
>- CaptureStdout();
>- fprintf(stdout, "def%cghi", '\0');
>- EXPECT_EQ(::std::string("def\0ghi", 7), ::std::string(GetCapturedStdout()));
>-}
>-
>-TEST(CaptureTest, CapturesStderr) {
>- CaptureStderr();
>- fprintf(stderr, "jkl");
>- EXPECT_STREQ("jkl", GetCapturedStderr().c_str());
>-
>- CaptureStderr();
>- fprintf(stderr, "jkl%cmno", '\0');
>- EXPECT_EQ(::std::string("jkl\0mno", 7), ::std::string(GetCapturedStderr()));
>-}
>-
>-// Tests that stdout and stderr capture don't interfere with each other.
>-TEST(CaptureTest, CapturesStdoutAndStderr) {
>- CaptureStdout();
>- CaptureStderr();
>- fprintf(stdout, "pqr");
>- fprintf(stderr, "stu");
>- EXPECT_STREQ("pqr", GetCapturedStdout().c_str());
>- EXPECT_STREQ("stu", GetCapturedStderr().c_str());
>-}
>-
>-TEST(CaptureDeathTest, CannotReenterStdoutCapture) {
>- CaptureStdout();
>- EXPECT_DEATH_IF_SUPPORTED(CaptureStdout();,
>- "Only one stdout capturer can exist at a time");
>- GetCapturedStdout();
>-
>- // We cannot test stderr capturing using death tests as they use it
>- // themselves.
>-}
>-
>-#endif // !GTEST_OS_WINDOWS_MOBILE
>-
>-TEST(ThreadLocalTest, DefaultConstructorInitializesToDefaultValues) {
>- ThreadLocal<int> t1;
>- EXPECT_EQ(0, t1.get());
>-
>- ThreadLocal<void*> t2;
>- EXPECT_TRUE(t2.get() == NULL);
>-}
>-
>-TEST(ThreadLocalTest, SingleParamConstructorInitializesToParam) {
>- ThreadLocal<int> t1(123);
>- EXPECT_EQ(123, t1.get());
>-
>- int i = 0;
>- ThreadLocal<int*> t2(&i);
>- EXPECT_EQ(&i, t2.get());
>-}
>-
>-class NoDefaultContructor {
>- public:
>- explicit NoDefaultContructor(const char*) {}
>- NoDefaultContructor(const NoDefaultContructor&) {}
>-};
>-
>-TEST(ThreadLocalTest, ValueDefaultContructorIsNotRequiredForParamVersion) {
>- ThreadLocal<NoDefaultContructor> bar(NoDefaultContructor("foo"));
>- bar.pointer();
>-}
>-
>-TEST(ThreadLocalTest, GetAndPointerReturnSameValue) {
>- ThreadLocal<String> thread_local;
>-
>- EXPECT_EQ(thread_local.pointer(), &(thread_local.get()));
>-
>- // Verifies the condition still holds after calling set.
>- thread_local.set("foo");
>- EXPECT_EQ(thread_local.pointer(), &(thread_local.get()));
>-}
>-
>-TEST(ThreadLocalTest, PointerAndConstPointerReturnSameValue) {
>- ThreadLocal<String> thread_local;
>- const ThreadLocal<String>& const_thread_local = thread_local;
>-
>- EXPECT_EQ(thread_local.pointer(), const_thread_local.pointer());
>-
>- thread_local.set("foo");
>- EXPECT_EQ(thread_local.pointer(), const_thread_local.pointer());
>-}
>-
>-#if GTEST_IS_THREADSAFE
>-
>-void AddTwo(int* param) { *param += 2; }
>-
>-TEST(ThreadWithParamTest, ConstructorExecutesThreadFunc) {
>- int i = 40;
>- ThreadWithParam<int*> thread(&AddTwo, &i, NULL);
>- thread.Join();
>- EXPECT_EQ(42, i);
>-}
>-
>-TEST(MutexDeathTest, AssertHeldShouldAssertWhenNotLocked) {
>- // AssertHeld() is flaky only in the presence of multiple threads accessing
>- // the lock. In this case, the test is robust.
>- EXPECT_DEATH_IF_SUPPORTED({
>- Mutex m;
>- { MutexLock lock(&m); }
>- m.AssertHeld();
>- },
>- "thread .*hold");
>-}
>-
>-TEST(MutexTest, AssertHeldShouldNotAssertWhenLocked) {
>- Mutex m;
>- MutexLock lock(&m);
>- m.AssertHeld();
>-}
>-
>-class AtomicCounterWithMutex {
>- public:
>- explicit AtomicCounterWithMutex(Mutex* mutex) :
>- value_(0), mutex_(mutex), random_(42) {}
>-
>- void Increment() {
>- MutexLock lock(mutex_);
>- int temp = value_;
>- {
>- // Locking a mutex puts up a memory barrier, preventing reads and
>- // writes to value_ rearranged when observed from other threads.
>- //
>- // We cannot use Mutex and MutexLock here or rely on their memory
>- // barrier functionality as we are testing them here.
>- pthread_mutex_t memory_barrier_mutex;
>- GTEST_CHECK_POSIX_SUCCESS_(
>- pthread_mutex_init(&memory_barrier_mutex, NULL));
>- GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_lock(&memory_barrier_mutex));
>-
>- SleepMilliseconds(random_.Generate(30));
>-
>- GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&memory_barrier_mutex));
>- }
>- value_ = temp + 1;
>- }
>- int value() const { return value_; }
>-
>- private:
>- volatile int value_;
>- Mutex* const mutex_; // Protects value_.
>- Random random_;
>-};
>-
>-void CountingThreadFunc(pair<AtomicCounterWithMutex*, int> param) {
>- for (int i = 0; i < param.second; ++i)
>- param.first->Increment();
>-}
>-
>-// Tests that the mutex only lets one thread at a time to lock it.
>-TEST(MutexTest, OnlyOneThreadCanLockAtATime) {
>- Mutex mutex;
>- AtomicCounterWithMutex locked_counter(&mutex);
>-
>- typedef ThreadWithParam<pair<AtomicCounterWithMutex*, int> > ThreadType;
>- const int kCycleCount = 20;
>- const int kThreadCount = 7;
>- scoped_ptr<ThreadType> counting_threads[kThreadCount];
>- Notification threads_can_start;
>- // Creates and runs kThreadCount threads that increment locked_counter
>- // kCycleCount times each.
>- for (int i = 0; i < kThreadCount; ++i) {
>- counting_threads[i].reset(new ThreadType(&CountingThreadFunc,
>- make_pair(&locked_counter,
>- kCycleCount),
>- &threads_can_start));
>- }
>- threads_can_start.Notify();
>- for (int i = 0; i < kThreadCount; ++i)
>- counting_threads[i]->Join();
>-
>- // If the mutex lets more than one thread to increment the counter at a
>- // time, they are likely to encounter a race condition and have some
>- // increments overwritten, resulting in the lower then expected counter
>- // value.
>- EXPECT_EQ(kCycleCount * kThreadCount, locked_counter.value());
>-}
>-
>-template <typename T>
>-void RunFromThread(void (func)(T), T param) {
>- ThreadWithParam<T> thread(func, param, NULL);
>- thread.Join();
>-}
>-
>-void RetrieveThreadLocalValue(pair<ThreadLocal<String>*, String*> param) {
>- *param.second = param.first->get();
>-}
>-
>-TEST(ThreadLocalTest, ParameterizedConstructorSetsDefault) {
>- ThreadLocal<String> thread_local("foo");
>- EXPECT_STREQ("foo", thread_local.get().c_str());
>-
>- thread_local.set("bar");
>- EXPECT_STREQ("bar", thread_local.get().c_str());
>-
>- String result;
>- RunFromThread(&RetrieveThreadLocalValue, make_pair(&thread_local, &result));
>- EXPECT_STREQ("foo", result.c_str());
>-}
>-
>-// DestructorTracker keeps track of whether its instances have been
>-// destroyed.
>-static std::vector<bool> g_destroyed;
>-
>-class DestructorTracker {
>- public:
>- DestructorTracker() : index_(GetNewIndex()) {}
>- DestructorTracker(const DestructorTracker& /* rhs */)
>- : index_(GetNewIndex()) {}
>- ~DestructorTracker() {
>- // We never access g_destroyed concurrently, so we don't need to
>- // protect the write operation under a mutex.
>- g_destroyed[index_] = true;
>- }
>-
>- private:
>- static int GetNewIndex() {
>- g_destroyed.push_back(false);
>- return g_destroyed.size() - 1;
>- }
>- const int index_;
>-};
>-
>-typedef ThreadLocal<DestructorTracker>* ThreadParam;
>-
>-void CallThreadLocalGet(ThreadParam thread_local) {
>- thread_local->get();
>-}
>-
>-// Tests that when a ThreadLocal object dies in a thread, it destroys
>-// the managed object for that thread.
>-TEST(ThreadLocalTest, DestroysManagedObjectForOwnThreadWhenDying) {
>- g_destroyed.clear();
>-
>- {
>- // The next line default constructs a DestructorTracker object as
>- // the default value of objects managed by thread_local.
>- ThreadLocal<DestructorTracker> thread_local;
>- ASSERT_EQ(1U, g_destroyed.size());
>- ASSERT_FALSE(g_destroyed[0]);
>-
>- // This creates another DestructorTracker object for the main thread.
>- thread_local.get();
>- ASSERT_EQ(2U, g_destroyed.size());
>- ASSERT_FALSE(g_destroyed[0]);
>- ASSERT_FALSE(g_destroyed[1]);
>- }
>-
>- // Now thread_local has died. It should have destroyed both the
>- // default value shared by all threads and the value for the main
>- // thread.
>- ASSERT_EQ(2U, g_destroyed.size());
>- EXPECT_TRUE(g_destroyed[0]);
>- EXPECT_TRUE(g_destroyed[1]);
>-
>- g_destroyed.clear();
>-}
>-
>-// Tests that when a thread exits, the thread-local object for that
>-// thread is destroyed.
>-TEST(ThreadLocalTest, DestroysManagedObjectAtThreadExit) {
>- g_destroyed.clear();
>-
>- {
>- // The next line default constructs a DestructorTracker object as
>- // the default value of objects managed by thread_local.
>- ThreadLocal<DestructorTracker> thread_local;
>- ASSERT_EQ(1U, g_destroyed.size());
>- ASSERT_FALSE(g_destroyed[0]);
>-
>- // This creates another DestructorTracker object in the new thread.
>- ThreadWithParam<ThreadParam> thread(
>- &CallThreadLocalGet, &thread_local, NULL);
>- thread.Join();
>-
>- // Now the new thread has exited. The per-thread object for it
>- // should have been destroyed.
>- ASSERT_EQ(2U, g_destroyed.size());
>- ASSERT_FALSE(g_destroyed[0]);
>- ASSERT_TRUE(g_destroyed[1]);
>- }
>-
>- // Now thread_local has died. The default value should have been
>- // destroyed too.
>- ASSERT_EQ(2U, g_destroyed.size());
>- EXPECT_TRUE(g_destroyed[0]);
>- EXPECT_TRUE(g_destroyed[1]);
>-
>- g_destroyed.clear();
>-}
>-
>-TEST(ThreadLocalTest, ThreadLocalMutationsAffectOnlyCurrentThread) {
>- ThreadLocal<String> thread_local;
>- thread_local.set("Foo");
>- EXPECT_STREQ("Foo", thread_local.get().c_str());
>-
>- String result;
>- RunFromThread(&RetrieveThreadLocalValue, make_pair(&thread_local, &result));
>- EXPECT_TRUE(result.c_str() == NULL);
>-}
>-
>-#endif // GTEST_IS_THREADSAFE
>-
>-} // namespace internal
>-} // namespace testing
>diff --git a/Source/ThirdParty/gtest/test/gtest-test-part_test.cc b/Source/ThirdParty/gtest/test/gtest-test-part_test.cc
>deleted file mode 100644
>index 5a3e9196ab96e413fef3307524b18c92f5edadb0..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest-test-part_test.cc
>+++ /dev/null
>@@ -1,208 +0,0 @@
>-// Copyright 2008 Google Inc.
>-// All Rights Reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: mheule@google.com (Markus Heule)
>-//
>-
>-#include <gtest/gtest-test-part.h>
>-
>-#include <gtest/gtest.h>
>-
>-using testing::Message;
>-using testing::Test;
>-using testing::TestPartResult;
>-using testing::TestPartResultArray;
>-
>-namespace {
>-
>-// Tests the TestPartResult class.
>-
>-// The test fixture for testing TestPartResult.
>-class TestPartResultTest : public Test {
>- protected:
>- TestPartResultTest()
>- : r1_(TestPartResult::kSuccess, "foo/bar.cc", 10, "Success!"),
>- r2_(TestPartResult::kNonFatalFailure, "foo/bar.cc", -1, "Failure!"),
>- r3_(TestPartResult::kFatalFailure, NULL, -1, "Failure!") {}
>-
>- TestPartResult r1_, r2_, r3_;
>-};
>-
>-
>-TEST_F(TestPartResultTest, ConstructorWorks) {
>- Message message;
>- message << "something is terribly wrong";
>- message << static_cast<const char*>(testing::internal::kStackTraceMarker);
>- message << "some unimportant stack trace";
>-
>- const TestPartResult result(TestPartResult::kNonFatalFailure,
>- "some_file.cc",
>- 42,
>- message.GetString().c_str());
>-
>- EXPECT_EQ(TestPartResult::kNonFatalFailure, result.type());
>- EXPECT_STREQ("some_file.cc", result.file_name());
>- EXPECT_EQ(42, result.line_number());
>- EXPECT_STREQ(message.GetString().c_str(), result.message());
>- EXPECT_STREQ("something is terribly wrong", result.summary());
>-}
>-
>-TEST_F(TestPartResultTest, ResultAccessorsWork) {
>- const TestPartResult success(TestPartResult::kSuccess,
>- "file.cc",
>- 42,
>- "message");
>- EXPECT_TRUE(success.passed());
>- EXPECT_FALSE(success.failed());
>- EXPECT_FALSE(success.nonfatally_failed());
>- EXPECT_FALSE(success.fatally_failed());
>-
>- const TestPartResult nonfatal_failure(TestPartResult::kNonFatalFailure,
>- "file.cc",
>- 42,
>- "message");
>- EXPECT_FALSE(nonfatal_failure.passed());
>- EXPECT_TRUE(nonfatal_failure.failed());
>- EXPECT_TRUE(nonfatal_failure.nonfatally_failed());
>- EXPECT_FALSE(nonfatal_failure.fatally_failed());
>-
>- const TestPartResult fatal_failure(TestPartResult::kFatalFailure,
>- "file.cc",
>- 42,
>- "message");
>- EXPECT_FALSE(fatal_failure.passed());
>- EXPECT_TRUE(fatal_failure.failed());
>- EXPECT_FALSE(fatal_failure.nonfatally_failed());
>- EXPECT_TRUE(fatal_failure.fatally_failed());
>-}
>-
>-// Tests TestPartResult::type().
>-TEST_F(TestPartResultTest, type) {
>- EXPECT_EQ(TestPartResult::kSuccess, r1_.type());
>- EXPECT_EQ(TestPartResult::kNonFatalFailure, r2_.type());
>- EXPECT_EQ(TestPartResult::kFatalFailure, r3_.type());
>-}
>-
>-// Tests TestPartResult::file_name().
>-TEST_F(TestPartResultTest, file_name) {
>- EXPECT_STREQ("foo/bar.cc", r1_.file_name());
>- EXPECT_STREQ(NULL, r3_.file_name());
>-}
>-
>-// Tests TestPartResult::line_number().
>-TEST_F(TestPartResultTest, line_number) {
>- EXPECT_EQ(10, r1_.line_number());
>- EXPECT_EQ(-1, r2_.line_number());
>-}
>-
>-// Tests TestPartResult::message().
>-TEST_F(TestPartResultTest, message) {
>- EXPECT_STREQ("Success!", r1_.message());
>-}
>-
>-// Tests TestPartResult::passed().
>-TEST_F(TestPartResultTest, Passed) {
>- EXPECT_TRUE(r1_.passed());
>- EXPECT_FALSE(r2_.passed());
>- EXPECT_FALSE(r3_.passed());
>-}
>-
>-// Tests TestPartResult::failed().
>-TEST_F(TestPartResultTest, Failed) {
>- EXPECT_FALSE(r1_.failed());
>- EXPECT_TRUE(r2_.failed());
>- EXPECT_TRUE(r3_.failed());
>-}
>-
>-// Tests TestPartResult::fatally_failed().
>-TEST_F(TestPartResultTest, FatallyFailed) {
>- EXPECT_FALSE(r1_.fatally_failed());
>- EXPECT_FALSE(r2_.fatally_failed());
>- EXPECT_TRUE(r3_.fatally_failed());
>-}
>-
>-// Tests TestPartResult::nonfatally_failed().
>-TEST_F(TestPartResultTest, NonfatallyFailed) {
>- EXPECT_FALSE(r1_.nonfatally_failed());
>- EXPECT_TRUE(r2_.nonfatally_failed());
>- EXPECT_FALSE(r3_.nonfatally_failed());
>-}
>-
>-// Tests the TestPartResultArray class.
>-
>-class TestPartResultArrayTest : public Test {
>- protected:
>- TestPartResultArrayTest()
>- : r1_(TestPartResult::kNonFatalFailure, "foo/bar.cc", -1, "Failure 1"),
>- r2_(TestPartResult::kFatalFailure, "foo/bar.cc", -1, "Failure 2") {}
>-
>- const TestPartResult r1_, r2_;
>-};
>-
>-// Tests that TestPartResultArray initially has size 0.
>-TEST_F(TestPartResultArrayTest, InitialSizeIsZero) {
>- TestPartResultArray results;
>- EXPECT_EQ(0, results.size());
>-}
>-
>-// Tests that TestPartResultArray contains the given TestPartResult
>-// after one Append() operation.
>-TEST_F(TestPartResultArrayTest, ContainsGivenResultAfterAppend) {
>- TestPartResultArray results;
>- results.Append(r1_);
>- EXPECT_EQ(1, results.size());
>- EXPECT_STREQ("Failure 1", results.GetTestPartResult(0).message());
>-}
>-
>-// Tests that TestPartResultArray contains the given TestPartResults
>-// after two Append() operations.
>-TEST_F(TestPartResultArrayTest, ContainsGivenResultsAfterTwoAppends) {
>- TestPartResultArray results;
>- results.Append(r1_);
>- results.Append(r2_);
>- EXPECT_EQ(2, results.size());
>- EXPECT_STREQ("Failure 1", results.GetTestPartResult(0).message());
>- EXPECT_STREQ("Failure 2", results.GetTestPartResult(1).message());
>-}
>-
>-typedef TestPartResultArrayTest TestPartResultArrayDeathTest;
>-
>-// Tests that the program dies when GetTestPartResult() is called with
>-// an invalid index.
>-TEST_F(TestPartResultArrayDeathTest, DiesWhenIndexIsOutOfBound) {
>- TestPartResultArray results;
>- results.Append(r1_);
>-
>- EXPECT_DEATH_IF_SUPPORTED(results.GetTestPartResult(-1), "");
>- EXPECT_DEATH_IF_SUPPORTED(results.GetTestPartResult(1), "");
>-}
>-
>-// TODO(mheule@google.com): Add a test for the class HasNewFatalFailureHelper.
>-
>-} // namespace
>diff --git a/Source/ThirdParty/gtest/test/gtest-tuple_test.cc b/Source/ThirdParty/gtest/test/gtest-tuple_test.cc
>deleted file mode 100644
>index 532f70b3d4e9070f45968625b3ff97c3984757d7..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest-tuple_test.cc
>+++ /dev/null
>@@ -1,320 +0,0 @@
>-// Copyright 2007, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>-
>-#include <gtest/internal/gtest-tuple.h>
>-#include <utility>
>-#include <gtest/gtest.h>
>-
>-namespace {
>-
>-using ::std::tr1::get;
>-using ::std::tr1::make_tuple;
>-using ::std::tr1::tuple;
>-using ::std::tr1::tuple_element;
>-using ::std::tr1::tuple_size;
>-using ::testing::StaticAssertTypeEq;
>-
>-// Tests that tuple_element<K, tuple<T0, T1, ..., TN> >::type returns TK.
>-TEST(tuple_element_Test, ReturnsElementType) {
>- StaticAssertTypeEq<int, tuple_element<0, tuple<int, char> >::type>();
>- StaticAssertTypeEq<int&, tuple_element<1, tuple<double, int&> >::type>();
>- StaticAssertTypeEq<bool, tuple_element<2, tuple<double, int, bool> >::type>();
>-}
>-
>-// Tests that tuple_size<T>::value gives the number of fields in tuple
>-// type T.
>-TEST(tuple_size_Test, ReturnsNumberOfFields) {
>- EXPECT_EQ(0, +tuple_size<tuple<> >::value);
>- EXPECT_EQ(1, +tuple_size<tuple<void*> >::value);
>- EXPECT_EQ(1, +tuple_size<tuple<char> >::value);
>- EXPECT_EQ(1, +(tuple_size<tuple<tuple<int, double> > >::value));
>- EXPECT_EQ(2, +(tuple_size<tuple<int&, const char> >::value));
>- EXPECT_EQ(3, +(tuple_size<tuple<char*, void, const bool&> >::value));
>-}
>-
>-// Tests comparing a tuple with itself.
>-TEST(ComparisonTest, ComparesWithSelf) {
>- const tuple<int, char, bool> a(5, 'a', false);
>-
>- EXPECT_TRUE(a == a);
>- EXPECT_FALSE(a != a);
>-}
>-
>-// Tests comparing two tuples with the same value.
>-TEST(ComparisonTest, ComparesEqualTuples) {
>- const tuple<int, bool> a(5, true), b(5, true);
>-
>- EXPECT_TRUE(a == b);
>- EXPECT_FALSE(a != b);
>-}
>-
>-// Tests comparing two different tuples that have no reference fields.
>-TEST(ComparisonTest, ComparesUnequalTuplesWithoutReferenceFields) {
>- typedef tuple<const int, char> FooTuple;
>-
>- const FooTuple a(0, 'x');
>- const FooTuple b(1, 'a');
>-
>- EXPECT_TRUE(a != b);
>- EXPECT_FALSE(a == b);
>-
>- const FooTuple c(1, 'b');
>-
>- EXPECT_TRUE(b != c);
>- EXPECT_FALSE(b == c);
>-}
>-
>-// Tests comparing two different tuples that have reference fields.
>-TEST(ComparisonTest, ComparesUnequalTuplesWithReferenceFields) {
>- typedef tuple<int&, const char&> FooTuple;
>-
>- int i = 5;
>- const char ch = 'a';
>- const FooTuple a(i, ch);
>-
>- int j = 6;
>- const FooTuple b(j, ch);
>-
>- EXPECT_TRUE(a != b);
>- EXPECT_FALSE(a == b);
>-
>- j = 5;
>- const char ch2 = 'b';
>- const FooTuple c(j, ch2);
>-
>- EXPECT_TRUE(b != c);
>- EXPECT_FALSE(b == c);
>-}
>-
>-// Tests that a tuple field with a reference type is an alias of the
>-// variable it's supposed to reference.
>-TEST(ReferenceFieldTest, IsAliasOfReferencedVariable) {
>- int n = 0;
>- tuple<bool, int&> t(true, n);
>-
>- n = 1;
>- EXPECT_EQ(n, get<1>(t))
>- << "Changing a underlying variable should update the reference field.";
>-
>- // Makes sure that the implementation doesn't do anything funny with
>- // the & operator for the return type of get<>().
>- EXPECT_EQ(&n, &(get<1>(t)))
>- << "The address of a reference field should equal the address of "
>- << "the underlying variable.";
>-
>- get<1>(t) = 2;
>- EXPECT_EQ(2, n)
>- << "Changing a reference field should update the underlying variable.";
>-}
>-
>-// Tests that tuple's default constructor default initializes each field.
>-// This test needs to compile without generating warnings.
>-TEST(TupleConstructorTest, DefaultConstructorDefaultInitializesEachField) {
>- // The TR1 report requires that tuple's default constructor default
>- // initializes each field, even if it's a primitive type. If the
>- // implementation forgets to do this, this test will catch it by
>- // generating warnings about using uninitialized variables (assuming
>- // a decent compiler).
>-
>- tuple<> empty;
>-
>- tuple<int> a1, b1;
>- b1 = a1;
>- EXPECT_EQ(0, get<0>(b1));
>-
>- tuple<int, double> a2, b2;
>- b2 = a2;
>- EXPECT_EQ(0, get<0>(b2));
>- EXPECT_EQ(0.0, get<1>(b2));
>-
>- tuple<double, char, bool*> a3, b3;
>- b3 = a3;
>- EXPECT_EQ(0.0, get<0>(b3));
>- EXPECT_EQ('\0', get<1>(b3));
>- EXPECT_TRUE(get<2>(b3) == NULL);
>-
>- tuple<int, int, int, int, int, int, int, int, int, int> a10, b10;
>- b10 = a10;
>- EXPECT_EQ(0, get<0>(b10));
>- EXPECT_EQ(0, get<1>(b10));
>- EXPECT_EQ(0, get<2>(b10));
>- EXPECT_EQ(0, get<3>(b10));
>- EXPECT_EQ(0, get<4>(b10));
>- EXPECT_EQ(0, get<5>(b10));
>- EXPECT_EQ(0, get<6>(b10));
>- EXPECT_EQ(0, get<7>(b10));
>- EXPECT_EQ(0, get<8>(b10));
>- EXPECT_EQ(0, get<9>(b10));
>-}
>-
>-// Tests constructing a tuple from its fields.
>-TEST(TupleConstructorTest, ConstructsFromFields) {
>- int n = 1;
>- // Reference field.
>- tuple<int&> a(n);
>- EXPECT_EQ(&n, &(get<0>(a)));
>-
>- // Non-reference fields.
>- tuple<int, char> b(5, 'a');
>- EXPECT_EQ(5, get<0>(b));
>- EXPECT_EQ('a', get<1>(b));
>-
>- // Const reference field.
>- const int m = 2;
>- tuple<bool, const int&> c(true, m);
>- EXPECT_TRUE(get<0>(c));
>- EXPECT_EQ(&m, &(get<1>(c)));
>-}
>-
>-// Tests tuple's copy constructor.
>-TEST(TupleConstructorTest, CopyConstructor) {
>- tuple<double, bool> a(0.0, true);
>- tuple<double, bool> b(a);
>-
>- EXPECT_DOUBLE_EQ(0.0, get<0>(b));
>- EXPECT_TRUE(get<1>(b));
>-}
>-
>-// Tests constructing a tuple from another tuple that has a compatible
>-// but different type.
>-TEST(TupleConstructorTest, ConstructsFromDifferentTupleType) {
>- tuple<int, int, char> a(0, 1, 'a');
>- tuple<double, long, int> b(a);
>-
>- EXPECT_DOUBLE_EQ(0.0, get<0>(b));
>- EXPECT_EQ(1, get<1>(b));
>- EXPECT_EQ('a', get<2>(b));
>-}
>-
>-// Tests constructing a 2-tuple from an std::pair.
>-TEST(TupleConstructorTest, ConstructsFromPair) {
>- ::std::pair<int, char> a(1, 'a');
>- tuple<int, char> b(a);
>- tuple<int, const char&> c(a);
>-}
>-
>-// Tests assigning a tuple to another tuple with the same type.
>-TEST(TupleAssignmentTest, AssignsToSameTupleType) {
>- const tuple<int, long> a(5, 7L);
>- tuple<int, long> b;
>- b = a;
>- EXPECT_EQ(5, get<0>(b));
>- EXPECT_EQ(7L, get<1>(b));
>-}
>-
>-// Tests assigning a tuple to another tuple with a different but
>-// compatible type.
>-TEST(TupleAssignmentTest, AssignsToDifferentTupleType) {
>- const tuple<int, long, bool> a(1, 7L, true);
>- tuple<long, int, bool> b;
>- b = a;
>- EXPECT_EQ(1L, get<0>(b));
>- EXPECT_EQ(7, get<1>(b));
>- EXPECT_TRUE(get<2>(b));
>-}
>-
>-// Tests assigning an std::pair to a 2-tuple.
>-TEST(TupleAssignmentTest, AssignsFromPair) {
>- const ::std::pair<int, bool> a(5, true);
>- tuple<int, bool> b;
>- b = a;
>- EXPECT_EQ(5, get<0>(b));
>- EXPECT_TRUE(get<1>(b));
>-
>- tuple<long, bool> c;
>- c = a;
>- EXPECT_EQ(5L, get<0>(c));
>- EXPECT_TRUE(get<1>(c));
>-}
>-
>-// A fixture for testing big tuples.
>-class BigTupleTest : public testing::Test {
>- protected:
>- typedef tuple<int, int, int, int, int, int, int, int, int, int> BigTuple;
>-
>- BigTupleTest() :
>- a_(1, 0, 0, 0, 0, 0, 0, 0, 0, 2),
>- b_(1, 0, 0, 0, 0, 0, 0, 0, 0, 3) {}
>-
>- BigTuple a_, b_;
>-};
>-
>-// Tests constructing big tuples.
>-TEST_F(BigTupleTest, Construction) {
>- BigTuple a;
>- BigTuple b(b_);
>-}
>-
>-// Tests that get<N>(t) returns the N-th (0-based) field of tuple t.
>-TEST_F(BigTupleTest, get) {
>- EXPECT_EQ(1, get<0>(a_));
>- EXPECT_EQ(2, get<9>(a_));
>-
>- // Tests that get() works on a const tuple too.
>- const BigTuple a(a_);
>- EXPECT_EQ(1, get<0>(a));
>- EXPECT_EQ(2, get<9>(a));
>-}
>-
>-// Tests comparing big tuples.
>-TEST_F(BigTupleTest, Comparisons) {
>- EXPECT_TRUE(a_ == a_);
>- EXPECT_FALSE(a_ != a_);
>-
>- EXPECT_TRUE(a_ != b_);
>- EXPECT_FALSE(a_ == b_);
>-}
>-
>-TEST(MakeTupleTest, WorksForScalarTypes) {
>- tuple<bool, int> a;
>- a = make_tuple(true, 5);
>- EXPECT_TRUE(get<0>(a));
>- EXPECT_EQ(5, get<1>(a));
>-
>- tuple<char, int, long> b;
>- b = make_tuple('a', 'b', 5);
>- EXPECT_EQ('a', get<0>(b));
>- EXPECT_EQ('b', get<1>(b));
>- EXPECT_EQ(5, get<2>(b));
>-}
>-
>-TEST(MakeTupleTest, WorksForPointers) {
>- int a[] = { 1, 2, 3, 4 };
>- const char* const str = "hi";
>- int* const p = a;
>-
>- tuple<const char*, int*> t;
>- t = make_tuple(str, p);
>- EXPECT_EQ(str, get<0>(t));
>- EXPECT_EQ(p, get<1>(t));
>-}
>-
>-} // namespace
>diff --git a/Source/ThirdParty/gtest/test/gtest-typed-test2_test.cc b/Source/ThirdParty/gtest/test/gtest-typed-test2_test.cc
>index 79a8a87dcfdbde53c1e0d8c6d11a986922b02ff8..ed96421c67ca8a2fb38f3d88960231ef22bea6fc 100644
>--- a/Source/ThirdParty/gtest/test/gtest-typed-test2_test.cc
>+++ b/Source/ThirdParty/gtest/test/gtest-typed-test2_test.cc
>@@ -26,13 +26,12 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>+
> 
> #include <vector>
> 
> #include "test/gtest-typed-test_test.h"
>-#include <gtest/gtest.h>
>+#include "gtest/gtest.h"
> 
> #if GTEST_HAS_TYPED_TEST_P
> 
>diff --git a/Source/ThirdParty/gtest/test/gtest-typed-test_test.cc b/Source/ThirdParty/gtest/test/gtest-typed-test_test.cc
>index f2c39723101779e771847d592d9fabb56f3b45c6..c38bb94a290d91403229119e30b9fdc55896a4ea 100644
>--- a/Source/ThirdParty/gtest/test/gtest-typed-test_test.cc
>+++ b/Source/ThirdParty/gtest/test/gtest-typed-test_test.cc
>@@ -26,14 +26,18 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>+
>+
>+#include "test/gtest-typed-test_test.h"
> 
> #include <set>
> #include <vector>
> 
>-#include "test/gtest-typed-test_test.h"
>-#include <gtest/gtest.h>
>+#include "gtest/gtest.h"
>+
>+#if _MSC_VER
>+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127 /* conditional expression is constant */)
>+#endif // _MSC_VER
> 
> using testing::Test;
> 
>@@ -165,6 +169,40 @@ TYPED_TEST(NumericTest, DefaultIsZero) {
> 
> } // namespace library1
> 
>+// Tests that custom names work.
>+template <typename T>
>+class TypedTestWithNames : public Test {};
>+
>+class TypedTestNames {
>+ public:
>+ template <typename T>
>+ static std::string GetName(int i) {
>+ if (testing::internal::IsSame<T, char>::value) {
>+ return std::string("char_") + ::testing::PrintToString(i);
>+ }
>+ if (testing::internal::IsSame<T, int>::value) {
>+ return std::string("int_") + ::testing::PrintToString(i);
>+ }
>+ }
>+};
>+
>+TYPED_TEST_CASE(TypedTestWithNames, TwoTypes, TypedTestNames);
>+
>+TYPED_TEST(TypedTestWithNames, TestCaseName) {
>+ if (testing::internal::IsSame<TypeParam, char>::value) {
>+ EXPECT_STREQ(::testing::UnitTest::GetInstance()
>+ ->current_test_info()
>+ ->test_case_name(),
>+ "TypedTestWithNames/char_0");
>+ }
>+ if (testing::internal::IsSame<TypeParam, int>::value) {
>+ EXPECT_STREQ(::testing::UnitTest::GetInstance()
>+ ->current_test_info()
>+ ->test_case_name(),
>+ "TypedTestWithNames/int_1");
>+ }
>+}
>+
> #endif // GTEST_HAS_TYPED_TEST
> 
> // This #ifdef block tests type-parameterized tests.
>@@ -265,6 +303,46 @@ REGISTER_TYPED_TEST_CASE_P(DerivedTest,
> typedef Types<short, long> MyTwoTypes;
> INSTANTIATE_TYPED_TEST_CASE_P(My, DerivedTest, MyTwoTypes);
> 
>+// Tests that custom names work with type parametrized tests. We reuse the
>+// TwoTypes from above here.
>+template <typename T>
>+class TypeParametrizedTestWithNames : public Test {};
>+
>+TYPED_TEST_CASE_P(TypeParametrizedTestWithNames);
>+
>+TYPED_TEST_P(TypeParametrizedTestWithNames, TestCaseName) {
>+ if (testing::internal::IsSame<TypeParam, char>::value) {
>+ EXPECT_STREQ(::testing::UnitTest::GetInstance()
>+ ->current_test_info()
>+ ->test_case_name(),
>+ "CustomName/TypeParametrizedTestWithNames/p_char_0");
>+ }
>+ if (testing::internal::IsSame<TypeParam, int>::value) {
>+ EXPECT_STREQ(::testing::UnitTest::GetInstance()
>+ ->current_test_info()
>+ ->test_case_name(),
>+ "CustomName/TypeParametrizedTestWithNames/p_int_1");
>+ }
>+}
>+
>+REGISTER_TYPED_TEST_CASE_P(TypeParametrizedTestWithNames, TestCaseName);
>+
>+class TypeParametrizedTestNames {
>+ public:
>+ template <typename T>
>+ static std::string GetName(int i) {
>+ if (testing::internal::IsSame<T, char>::value) {
>+ return std::string("p_char_") + ::testing::PrintToString(i);
>+ }
>+ if (testing::internal::IsSame<T, int>::value) {
>+ return std::string("p_int_") + ::testing::PrintToString(i);
>+ }
>+ }
>+};
>+
>+INSTANTIATE_TYPED_TEST_CASE_P(CustomName, TypeParametrizedTestWithNames,
>+ TwoTypes, TypeParametrizedTestNames);
>+
> // Tests that multiple TYPED_TEST_CASE_P's can be defined in the same
> // translation unit.
> 
>@@ -343,6 +421,25 @@ REGISTER_TYPED_TEST_CASE_P(NumericTest,
> typedef Types<int, double> NumericTypes;
> INSTANTIATE_TYPED_TEST_CASE_P(My, NumericTest, NumericTypes);
> 
>+static const char* GetTestName() {
>+ return testing::UnitTest::GetInstance()->current_test_info()->name();
>+}
>+// Test the stripping of space from test names
>+template <typename T> class TrimmedTest : public Test { };
>+TYPED_TEST_CASE_P(TrimmedTest);
>+TYPED_TEST_P(TrimmedTest, Test1) { EXPECT_STREQ("Test1", GetTestName()); }
>+TYPED_TEST_P(TrimmedTest, Test2) { EXPECT_STREQ("Test2", GetTestName()); }
>+TYPED_TEST_P(TrimmedTest, Test3) { EXPECT_STREQ("Test3", GetTestName()); }
>+TYPED_TEST_P(TrimmedTest, Test4) { EXPECT_STREQ("Test4", GetTestName()); }
>+TYPED_TEST_P(TrimmedTest, Test5) { EXPECT_STREQ("Test5", GetTestName()); }
>+REGISTER_TYPED_TEST_CASE_P(
>+ TrimmedTest,
>+ Test1, Test2,Test3 , Test4 ,Test5 ); // NOLINT
>+template <typename T1, typename T2> struct MyPair {};
>+// Be sure to try a type with a comma in its name just in case it matters.
>+typedef Types<int, double, MyPair<int, int> > TrimTypes;
>+INSTANTIATE_TYPED_TEST_CASE_P(My, TrimmedTest, TrimTypes);
>+
> } // namespace library2
> 
> #endif // GTEST_HAS_TYPED_TEST_P
>@@ -357,4 +454,8 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, NumericTest, NumericTypes);
> // must be defined). This dummy test keeps gtest_main linked in.
> TEST(DummyTest, TypedTestsAreNotSupportedOnThisPlatform) {}
> 
>+#if _MSC_VER
>+GTEST_DISABLE_MSC_WARNINGS_POP_() // 4127
>+#endif // _MSC_VER
>+
> #endif // #if !defined(GTEST_HAS_TYPED_TEST) && !defined(GTEST_HAS_TYPED_TEST_P)
>diff --git a/Source/ThirdParty/gtest/test/gtest-typed-test_test.h b/Source/ThirdParty/gtest/test/gtest-typed-test_test.h
>index 40dfeac6e01d97ecf7febb865fce66848ba8e8db..2cce67c825a6cabdb9a54b91929c00c992a0d47c 100644
>--- a/Source/ThirdParty/gtest/test/gtest-typed-test_test.h
>+++ b/Source/ThirdParty/gtest/test/gtest-typed-test_test.h
>@@ -26,13 +26,12 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>+
> 
> #ifndef GTEST_TEST_GTEST_TYPED_TEST_TEST_H_
> #define GTEST_TEST_GTEST_TYPED_TEST_TEST_H_
> 
>-#include <gtest/gtest.h>
>+#include "gtest/gtest.h"
> 
> #if GTEST_HAS_TYPED_TEST_P
> 
>diff --git a/Source/ThirdParty/gtest/test/gtest-unittest-api_test.cc b/Source/ThirdParty/gtest/test/gtest-unittest-api_test.cc
>index 7e0f8f8045d71c015d1294ffef4ca545ddc551f9..f3ea03a596d0f99a391252630dca1062293112fc 100644
>--- a/Source/ThirdParty/gtest/test/gtest-unittest-api_test.cc
>+++ b/Source/ThirdParty/gtest/test/gtest-unittest-api_test.cc
>@@ -25,15 +25,14 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
> //
>-// Author: vladl@google.com (Vlad Losev)
>-//
>-// The Google C++ Testing Framework (Google Test)
>+// The Google C++ Testing and Mocking Framework (Google Test)
> //
> // This file contains tests verifying correctness of data provided via
> // UnitTest's public methods.
> 
>-#include <gtest/gtest.h>
>+#include "gtest/gtest.h"
> 
> #include <string.h> // For strcmp.
> #include <algorithm>
>@@ -54,7 +53,7 @@ class UnitTestHelper {
> public:
> // Returns the array of pointers to all test cases sorted by the test case
> // name. The caller is responsible for deleting the array.
>- static TestCase const** const GetSortedTestCases() {
>+ static TestCase const** GetSortedTestCases() {
> UnitTest& unit_test = *UnitTest::GetInstance();
> TestCase const** const test_cases =
> new const TestCase*[unit_test.total_test_case_count()];
>@@ -83,7 +82,7 @@ class UnitTestHelper {
> // Returns the array of pointers to all tests in a particular test case
> // sorted by the test name. The caller is responsible for deleting the
> // array.
>- static TestInfo const** const GetSortedTests(const TestCase* test_case) {
>+ static TestInfo const** GetSortedTests(const TestCase* test_case) {
> TestInfo const** const tests =
> new const TestInfo*[test_case->total_test_count()];
> 
>@@ -103,12 +102,6 @@ TYPED_TEST(TestCaseWithCommentTest, Dummy) {}
> 
> const int kTypedTestCases = 1;
> const int kTypedTests = 1;
>-
>-String GetExpectedTestCaseComment() {
>- Message comment;
>- comment << "TypeParam = " << GetTypeName<int>().c_str();
>- return comment.GetString();
>-}
> #else
> const int kTypedTestCases = 0;
> const int kTypedTests = 0;
>@@ -143,12 +136,19 @@ TEST(ApiTest, UnitTestImmutableAccessorsWork) {
> RecordProperty("key", "value");
> }
> 
>+AssertionResult IsNull(const char* str) {
>+ if (str != NULL) {
>+ return testing::AssertionFailure() << "argument is " << str;
>+ }
>+ return AssertionSuccess();
>+}
>+
> TEST(ApiTest, TestCaseImmutableAccessorsWork) {
> const TestCase* test_case = UnitTestHelper::FindTestCase("ApiTest");
> ASSERT_TRUE(test_case != NULL);
> 
> EXPECT_STREQ("ApiTest", test_case->name());
>- EXPECT_STREQ("", test_case->comment());
>+ EXPECT_TRUE(IsNull(test_case->type_param()));
> EXPECT_TRUE(test_case->should_run());
> EXPECT_EQ(1, test_case->disabled_test_count());
> EXPECT_EQ(3, test_case->test_to_run_count());
>@@ -158,26 +158,26 @@ TEST(ApiTest, TestCaseImmutableAccessorsWork) {
> 
> EXPECT_STREQ("DISABLED_Dummy1", tests[0]->name());
> EXPECT_STREQ("ApiTest", tests[0]->test_case_name());
>- EXPECT_STREQ("", tests[0]->comment());
>- EXPECT_STREQ("", tests[0]->test_case_comment());
>+ EXPECT_TRUE(IsNull(tests[0]->value_param()));
>+ EXPECT_TRUE(IsNull(tests[0]->type_param()));
> EXPECT_FALSE(tests[0]->should_run());
> 
> EXPECT_STREQ("TestCaseDisabledAccessorsWork", tests[1]->name());
> EXPECT_STREQ("ApiTest", tests[1]->test_case_name());
>- EXPECT_STREQ("", tests[1]->comment());
>- EXPECT_STREQ("", tests[1]->test_case_comment());
>+ EXPECT_TRUE(IsNull(tests[1]->value_param()));
>+ EXPECT_TRUE(IsNull(tests[1]->type_param()));
> EXPECT_TRUE(tests[1]->should_run());
> 
> EXPECT_STREQ("TestCaseImmutableAccessorsWork", tests[2]->name());
> EXPECT_STREQ("ApiTest", tests[2]->test_case_name());
>- EXPECT_STREQ("", tests[2]->comment());
>- EXPECT_STREQ("", tests[2]->test_case_comment());
>+ EXPECT_TRUE(IsNull(tests[2]->value_param()));
>+ EXPECT_TRUE(IsNull(tests[2]->type_param()));
> EXPECT_TRUE(tests[2]->should_run());
> 
> EXPECT_STREQ("UnitTestImmutableAccessorsWork", tests[3]->name());
> EXPECT_STREQ("ApiTest", tests[3]->test_case_name());
>- EXPECT_STREQ("", tests[3]->comment());
>- EXPECT_STREQ("", tests[3]->test_case_comment());
>+ EXPECT_TRUE(IsNull(tests[3]->value_param()));
>+ EXPECT_TRUE(IsNull(tests[3]->type_param()));
> EXPECT_TRUE(tests[3]->should_run());
> 
> delete[] tests;
>@@ -188,7 +188,7 @@ TEST(ApiTest, TestCaseImmutableAccessorsWork) {
> ASSERT_TRUE(test_case != NULL);
> 
> EXPECT_STREQ("TestCaseWithCommentTest/0", test_case->name());
>- EXPECT_STREQ(GetExpectedTestCaseComment().c_str(), test_case->comment());
>+ EXPECT_STREQ(GetTypeName<int>().c_str(), test_case->type_param());
> EXPECT_TRUE(test_case->should_run());
> EXPECT_EQ(0, test_case->disabled_test_count());
> EXPECT_EQ(1, test_case->test_to_run_count());
>@@ -198,9 +198,8 @@ TEST(ApiTest, TestCaseImmutableAccessorsWork) {
> 
> EXPECT_STREQ("Dummy", tests[0]->name());
> EXPECT_STREQ("TestCaseWithCommentTest/0", tests[0]->test_case_name());
>- EXPECT_STREQ("", tests[0]->comment());
>- EXPECT_STREQ(GetExpectedTestCaseComment().c_str(),
>- tests[0]->test_case_comment());
>+ EXPECT_TRUE(IsNull(tests[0]->value_param()));
>+ EXPECT_STREQ(GetTypeName<int>().c_str(), tests[0]->type_param());
> EXPECT_TRUE(tests[0]->should_run());
> 
> delete[] tests;
>@@ -212,7 +211,7 @@ TEST(ApiTest, TestCaseDisabledAccessorsWork) {
> ASSERT_TRUE(test_case != NULL);
> 
> EXPECT_STREQ("DISABLED_Test", test_case->name());
>- EXPECT_STREQ("", test_case->comment());
>+ EXPECT_TRUE(IsNull(test_case->type_param()));
> EXPECT_FALSE(test_case->should_run());
> EXPECT_EQ(1, test_case->disabled_test_count());
> EXPECT_EQ(0, test_case->test_to_run_count());
>@@ -221,8 +220,8 @@ TEST(ApiTest, TestCaseDisabledAccessorsWork) {
> const TestInfo* const test_info = test_case->GetTestInfo(0);
> EXPECT_STREQ("Dummy2", test_info->name());
> EXPECT_STREQ("DISABLED_Test", test_info->test_case_name());
>- EXPECT_STREQ("", test_info->comment());
>- EXPECT_STREQ("", test_info->test_case_comment());
>+ EXPECT_TRUE(IsNull(test_info->value_param()));
>+ EXPECT_TRUE(IsNull(test_info->type_param()));
> EXPECT_FALSE(test_info->should_run());
> }
> 
>@@ -247,7 +246,7 @@ class FinalSuccessChecker : public Environment {
> const TestCase** const test_cases = UnitTestHelper::GetSortedTestCases();
> 
> EXPECT_STREQ("ApiTest", test_cases[0]->name());
>- EXPECT_STREQ("", test_cases[0]->comment());
>+ EXPECT_TRUE(IsNull(test_cases[0]->type_param()));
> EXPECT_TRUE(test_cases[0]->should_run());
> EXPECT_EQ(1, test_cases[0]->disabled_test_count());
> ASSERT_EQ(4, test_cases[0]->total_test_count());
>@@ -257,7 +256,7 @@ class FinalSuccessChecker : public Environment {
> EXPECT_FALSE(test_cases[0]->Failed());
> 
> EXPECT_STREQ("DISABLED_Test", test_cases[1]->name());
>- EXPECT_STREQ("", test_cases[1]->comment());
>+ EXPECT_TRUE(IsNull(test_cases[1]->type_param()));
> EXPECT_FALSE(test_cases[1]->should_run());
> EXPECT_EQ(1, test_cases[1]->disabled_test_count());
> ASSERT_EQ(1, test_cases[1]->total_test_count());
>@@ -266,8 +265,7 @@ class FinalSuccessChecker : public Environment {
> 
> #if GTEST_HAS_TYPED_TEST
> EXPECT_STREQ("TestCaseWithCommentTest/0", test_cases[2]->name());
>- EXPECT_STREQ(GetExpectedTestCaseComment().c_str(),
>- test_cases[2]->comment());
>+ EXPECT_STREQ(GetTypeName<int>().c_str(), test_cases[2]->type_param());
> EXPECT_TRUE(test_cases[2]->should_run());
> EXPECT_EQ(0, test_cases[2]->disabled_test_count());
> ASSERT_EQ(1, test_cases[2]->total_test_count());
>@@ -285,24 +283,24 @@ class FinalSuccessChecker : public Environment {
> 
> EXPECT_STREQ("TestCaseDisabledAccessorsWork", tests[1]->name());
> EXPECT_STREQ("ApiTest", tests[1]->test_case_name());
>- EXPECT_STREQ("", tests[1]->comment());
>- EXPECT_STREQ("", tests[1]->test_case_comment());
>+ EXPECT_TRUE(IsNull(tests[1]->value_param()));
>+ EXPECT_TRUE(IsNull(tests[1]->type_param()));
> EXPECT_TRUE(tests[1]->should_run());
> EXPECT_TRUE(tests[1]->result()->Passed());
> EXPECT_EQ(0, tests[1]->result()->test_property_count());
> 
> EXPECT_STREQ("TestCaseImmutableAccessorsWork", tests[2]->name());
> EXPECT_STREQ("ApiTest", tests[2]->test_case_name());
>- EXPECT_STREQ("", tests[2]->comment());
>- EXPECT_STREQ("", tests[2]->test_case_comment());
>+ EXPECT_TRUE(IsNull(tests[2]->value_param()));
>+ EXPECT_TRUE(IsNull(tests[2]->type_param()));
> EXPECT_TRUE(tests[2]->should_run());
> EXPECT_TRUE(tests[2]->result()->Passed());
> EXPECT_EQ(0, tests[2]->result()->test_property_count());
> 
> EXPECT_STREQ("UnitTestImmutableAccessorsWork", tests[3]->name());
> EXPECT_STREQ("ApiTest", tests[3]->test_case_name());
>- EXPECT_STREQ("", tests[3]->comment());
>- EXPECT_STREQ("", tests[3]->test_case_comment());
>+ EXPECT_TRUE(IsNull(tests[3]->value_param()));
>+ EXPECT_TRUE(IsNull(tests[3]->type_param()));
> EXPECT_TRUE(tests[3]->should_run());
> EXPECT_TRUE(tests[3]->result()->Passed());
> EXPECT_EQ(1, tests[3]->result()->test_property_count());
>@@ -318,9 +316,8 @@ class FinalSuccessChecker : public Environment {
> 
> EXPECT_STREQ("Dummy", tests[0]->name());
> EXPECT_STREQ("TestCaseWithCommentTest/0", tests[0]->test_case_name());
>- EXPECT_STREQ("", tests[0]->comment());
>- EXPECT_STREQ(GetExpectedTestCaseComment().c_str(),
>- tests[0]->test_case_comment());
>+ EXPECT_TRUE(IsNull(tests[0]->value_param()));
>+ EXPECT_STREQ(GetTypeName<int>().c_str(), tests[0]->type_param());
> EXPECT_TRUE(tests[0]->should_run());
> EXPECT_TRUE(tests[0]->result()->Passed());
> EXPECT_EQ(0, tests[0]->result()->test_property_count());
>diff --git a/Source/ThirdParty/gtest/test/gtest_all_test.cc b/Source/ThirdParty/gtest/test/gtest_all_test.cc
>index e1edb08e33a18c239115dad5e4a0d6fb632dbb17..e61e36b1dfe8da03016af57855b2c781ee7d91e6 100644
>--- a/Source/ThirdParty/gtest/test/gtest_all_test.cc
>+++ b/Source/ThirdParty/gtest/test/gtest_all_test.cc
>@@ -26,23 +26,21 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
> //
>-// Author: wan@google.com (Zhanyong Wan)
>-//
>-// Tests for Google C++ Testing Framework (Google Test)
>+// Tests for Google C++ Testing and Mocking Framework (Google Test)
> //
> // Sometimes it's desirable to build most of Google Test's own tests
> // by compiling a single file. This file serves this purpose.
>-#include "test/gtest-filepath_test.cc"
>-#include "test/gtest-linked_ptr_test.cc"
>-#include "test/gtest-message_test.cc"
>-#include "test/gtest-options_test.cc"
>-#include "test/gtest-port_test.cc"
>+#include "test/googletest-filepath-test.cc"
>+#include "test/googletest-linked-ptr-test.cc"
>+#include "test/googletest-message-test.cc"
>+#include "test/googletest-options-test.cc"
>+#include "test/googletest-port-test.cc"
> #include "test/gtest_pred_impl_unittest.cc"
> #include "test/gtest_prod_test.cc"
>-#include "test/gtest-test-part_test.cc"
>+#include "test/googletest-test-part-test.cc"
> #include "test/gtest-typed-test_test.cc"
> #include "test/gtest-typed-test2_test.cc"
> #include "test/gtest_unittest.cc"
> #include "test/production.cc"
>-#include "src/gtest_main.cc"
>diff --git a/Source/ThirdParty/gtest/test/gtest_assert_by_exception_test.cc b/Source/ThirdParty/gtest/test/gtest_assert_by_exception_test.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..0eae8575f3fee30bac642ba1589ff234d07f9454
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/gtest_assert_by_exception_test.cc
>@@ -0,0 +1,118 @@
>+// Copyright 2009, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+
>+// Tests Google Test's assert-by-exception mode with exceptions enabled.
>+
>+#include "gtest/gtest.h"
>+
>+#include <stdlib.h>
>+#include <stdio.h>
>+#include <string.h>
>+#include <stdexcept>
>+
>+class ThrowListener : public testing::EmptyTestEventListener {
>+ void OnTestPartResult(const testing::TestPartResult& result) override {
>+ if (result.type() == testing::TestPartResult::kFatalFailure) {
>+ throw testing::AssertionException(result);
>+ }
>+ }
>+};
>+
>+// Prints the given failure message and exits the program with
>+// non-zero. We use this instead of a Google Test assertion to
>+// indicate a failure, as the latter is been tested and cannot be
>+// relied on.
>+void Fail(const char* msg) {
>+ printf("FAILURE: %s\n", msg);
>+ fflush(stdout);
>+ exit(1);
>+}
>+
>+static void AssertFalse() {
>+ ASSERT_EQ(2, 3) << "Expected failure";
>+}
>+
>+// Tests that an assertion failure throws a subclass of
>+// std::runtime_error.
>+TEST(Test, Test) {
>+ // A successful assertion shouldn't throw.
>+ try {
>+ EXPECT_EQ(3, 3);
>+ } catch(...) {
>+ Fail("A successful assertion wrongfully threw.");
>+ }
>+
>+ // A successful assertion shouldn't throw.
>+ try {
>+ EXPECT_EQ(3, 4);
>+ } catch(...) {
>+ Fail("A failed non-fatal assertion wrongfully threw.");
>+ }
>+
>+ // A failed assertion should throw.
>+ try {
>+ AssertFalse();
>+ } catch(const testing::AssertionException& e) {
>+ if (strstr(e.what(), "Expected failure") != NULL)
>+ throw;
>+
>+ printf("%s",
>+ "A failed assertion did throw an exception of the right type, "
>+ "but the message is incorrect. Instead of containing \"Expected "
>+ "failure\", it is:\n");
>+ Fail(e.what());
>+ } catch(...) {
>+ Fail("A failed assertion threw the wrong type of exception.");
>+ }
>+ Fail("A failed assertion should've thrown but didn't.");
>+}
>+
>+int kTestForContinuingTest = 0;
>+
>+TEST(Test, Test2) {
>+ // FIXME: how to force Test2 to be after Test?
>+ kTestForContinuingTest = 1;
>+}
>+
>+int main(int argc, char** argv) {
>+ testing::InitGoogleTest(&argc, argv);
>+ testing::UnitTest::GetInstance()->listeners().Append(new ThrowListener);
>+
>+ int result = RUN_ALL_TESTS();
>+ if (result == 0) {
>+ printf("RUN_ALL_TESTS returned %d\n", result);
>+ Fail("Expected failure instead.");
>+ }
>+
>+ if (kTestForContinuingTest == 0) {
>+ Fail("Should have continued with other tests, but did not.");
>+ }
>+ return 0;
>+}
>diff --git a/Source/ThirdParty/gtest/test/gtest_break_on_failure_unittest.py b/Source/ThirdParty/gtest/test/gtest_break_on_failure_unittest.py
>deleted file mode 100755
>index c819183312275deca05c763186040471bff49f33..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_break_on_failure_unittest.py
>+++ /dev/null
>@@ -1,218 +0,0 @@
>-#!/usr/bin/env python
>-#
>-# Copyright 2006, Google Inc.
>-# All rights reserved.
>-#
>-# Redistribution and use in source and binary forms, with or without
>-# modification, are permitted provided that the following conditions are
>-# met:
>-#
>-# * Redistributions of source code must retain the above copyright
>-# notice, this list of conditions and the following disclaimer.
>-# * Redistributions in binary form must reproduce the above
>-# copyright notice, this list of conditions and the following disclaimer
>-# in the documentation and/or other materials provided with the
>-# distribution.
>-# * Neither the name of Google Inc. nor the names of its
>-# contributors may be used to endorse or promote products derived from
>-# this software without specific prior written permission.
>-#
>-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-
>-"""Unit test for Google Test's break-on-failure mode.
>-
>-A user can ask Google Test to seg-fault when an assertion fails, using
>-either the GTEST_BREAK_ON_FAILURE environment variable or the
>---gtest_break_on_failure flag. This script tests such functionality
>-by invoking gtest_break_on_failure_unittest_ (a program written with
>-Google Test) with different environments and command line flags.
>-"""
>-
>-__author__ = 'wan@google.com (Zhanyong Wan)'
>-
>-import gtest_test_utils
>-import os
>-import sys
>-
>-
>-# Constants.
>-
>-IS_WINDOWS = os.name == 'nt'
>-
>-# The environment variable for enabling/disabling the break-on-failure mode.
>-BREAK_ON_FAILURE_ENV_VAR = 'GTEST_BREAK_ON_FAILURE'
>-
>-# The command line flag for enabling/disabling the break-on-failure mode.
>-BREAK_ON_FAILURE_FLAG = 'gtest_break_on_failure'
>-
>-# The environment variable for enabling/disabling the throw-on-failure mode.
>-THROW_ON_FAILURE_ENV_VAR = 'GTEST_THROW_ON_FAILURE'
>-
>-# The environment variable for enabling/disabling the catch-exceptions mode.
>-CATCH_EXCEPTIONS_ENV_VAR = 'GTEST_CATCH_EXCEPTIONS'
>-
>-# Path to the gtest_break_on_failure_unittest_ program.
>-EXE_PATH = gtest_test_utils.GetTestExecutablePath(
>- 'gtest_break_on_failure_unittest_')
>-
>-
>-# Utilities.
>-
>-
>-environ = os.environ.copy()
>-
>-
>-def SetEnvVar(env_var, value):
>- """Sets an environment variable to a given value; unsets it when the
>- given value is None.
>- """
>-
>- if value is not None:
>- environ[env_var] = value
>- elif env_var in environ:
>- del environ[env_var]
>-
>-
>-def Run(command):
>- """Runs a command; returns 1 if it was killed by a signal, or 0 otherwise."""
>-
>- p = gtest_test_utils.Subprocess(command, env=environ)
>- if p.terminated_by_signal:
>- return 1
>- else:
>- return 0
>-
>-
>-# The tests.
>-
>-
>-class GTestBreakOnFailureUnitTest(gtest_test_utils.TestCase):
>- """Tests using the GTEST_BREAK_ON_FAILURE environment variable or
>- the --gtest_break_on_failure flag to turn assertion failures into
>- segmentation faults.
>- """
>-
>- def RunAndVerify(self, env_var_value, flag_value, expect_seg_fault):
>- """Runs gtest_break_on_failure_unittest_ and verifies that it does
>- (or does not) have a seg-fault.
>-
>- Args:
>- env_var_value: value of the GTEST_BREAK_ON_FAILURE environment
>- variable; None if the variable should be unset.
>- flag_value: value of the --gtest_break_on_failure flag;
>- None if the flag should not be present.
>- expect_seg_fault: 1 if the program is expected to generate a seg-fault;
>- 0 otherwise.
>- """
>-
>- SetEnvVar(BREAK_ON_FAILURE_ENV_VAR, env_var_value)
>-
>- if env_var_value is None:
>- env_var_value_msg = ' is not set'
>- else:
>- env_var_value_msg = '=' + env_var_value
>-
>- if flag_value is None:
>- flag = ''
>- elif flag_value == '0':
>- flag = '--%s=0' % BREAK_ON_FAILURE_FLAG
>- else:
>- flag = '--%s' % BREAK_ON_FAILURE_FLAG
>-
>- command = [EXE_PATH]
>- if flag:
>- command.append(flag)
>-
>- if expect_seg_fault:
>- should_or_not = 'should'
>- else:
>- should_or_not = 'should not'
>-
>- has_seg_fault = Run(command)
>-
>- SetEnvVar(BREAK_ON_FAILURE_ENV_VAR, None)
>-
>- msg = ('when %s%s, an assertion failure in "%s" %s cause a seg-fault.' %
>- (BREAK_ON_FAILURE_ENV_VAR, env_var_value_msg, ' '.join(command),
>- should_or_not))
>- self.assert_(has_seg_fault == expect_seg_fault, msg)
>-
>- def testDefaultBehavior(self):
>- """Tests the behavior of the default mode."""
>-
>- self.RunAndVerify(env_var_value=None,
>- flag_value=None,
>- expect_seg_fault=0)
>-
>- def testEnvVar(self):
>- """Tests using the GTEST_BREAK_ON_FAILURE environment variable."""
>-
>- self.RunAndVerify(env_var_value='0',
>- flag_value=None,
>- expect_seg_fault=0)
>- self.RunAndVerify(env_var_value='1',
>- flag_value=None,
>- expect_seg_fault=1)
>-
>- def testFlag(self):
>- """Tests using the --gtest_break_on_failure flag."""
>-
>- self.RunAndVerify(env_var_value=None,
>- flag_value='0',
>- expect_seg_fault=0)
>- self.RunAndVerify(env_var_value=None,
>- flag_value='1',
>- expect_seg_fault=1)
>-
>- def testFlagOverridesEnvVar(self):
>- """Tests that the flag overrides the environment variable."""
>-
>- self.RunAndVerify(env_var_value='0',
>- flag_value='0',
>- expect_seg_fault=0)
>- self.RunAndVerify(env_var_value='0',
>- flag_value='1',
>- expect_seg_fault=1)
>- self.RunAndVerify(env_var_value='1',
>- flag_value='0',
>- expect_seg_fault=0)
>- self.RunAndVerify(env_var_value='1',
>- flag_value='1',
>- expect_seg_fault=1)
>-
>- def testBreakOnFailureOverridesThrowOnFailure(self):
>- """Tests that gtest_break_on_failure overrides gtest_throw_on_failure."""
>-
>- SetEnvVar(THROW_ON_FAILURE_ENV_VAR, '1')
>- try:
>- self.RunAndVerify(env_var_value=None,
>- flag_value='1',
>- expect_seg_fault=1)
>- finally:
>- SetEnvVar(THROW_ON_FAILURE_ENV_VAR, None)
>-
>- if IS_WINDOWS:
>- def testCatchExceptionsDoesNotInterfere(self):
>- """Tests that gtest_catch_exceptions doesn't interfere."""
>-
>- SetEnvVar(CATCH_EXCEPTIONS_ENV_VAR, '1')
>- try:
>- self.RunAndVerify(env_var_value='1',
>- flag_value='1',
>- expect_seg_fault=1)
>- finally:
>- SetEnvVar(CATCH_EXCEPTIONS_ENV_VAR, None)
>-
>-
>-if __name__ == '__main__':
>- gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/gtest_break_on_failure_unittest_.cc b/Source/ThirdParty/gtest/test/gtest_break_on_failure_unittest_.cc
>deleted file mode 100644
>index d28d1d3dad46b8fdf3c340967dbfca852f59e4a1..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_break_on_failure_unittest_.cc
>+++ /dev/null
>@@ -1,86 +0,0 @@
>-// Copyright 2006, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>-
>-// Unit test for Google Test's break-on-failure mode.
>-//
>-// A user can ask Google Test to seg-fault when an assertion fails, using
>-// either the GTEST_BREAK_ON_FAILURE environment variable or the
>-// --gtest_break_on_failure flag. This file is used for testing such
>-// functionality.
>-//
>-// This program will be invoked from a Python unit test. It is
>-// expected to fail. Don't run it directly.
>-
>-#include <gtest/gtest.h>
>-
>-#if GTEST_OS_WINDOWS
>-#include <windows.h>
>-#include <stdlib.h>
>-#endif
>-
>-namespace {
>-
>-// A test that's expected to fail.
>-TEST(Foo, Bar) {
>- EXPECT_EQ(2, 3);
>-}
>-
>-#if GTEST_HAS_SEH && !GTEST_OS_WINDOWS_MOBILE
>-// On Windows Mobile global exception handlers are not supported.
>-LONG WINAPI ExitWithExceptionCode(
>- struct _EXCEPTION_POINTERS* exception_pointers) {
>- exit(exception_pointers->ExceptionRecord->ExceptionCode);
>-}
>-#endif
>-
>-} // namespace
>-
>-int main(int argc, char **argv) {
>-#if GTEST_OS_WINDOWS
>- // Suppresses display of the Windows error dialog upon encountering
>- // a general protection fault (segment violation).
>- SetErrorMode(SEM_NOGPFAULTERRORBOX | SEM_FAILCRITICALERRORS);
>-
>-#if !GTEST_OS_WINDOWS_MOBILE
>- // The default unhandled exception filter does not always exit
>- // with the exception code as exit code - for example it exits with
>- // 0 for EXCEPTION_ACCESS_VIOLATION and 1 for EXCEPTION_BREAKPOINT
>- // if the application is compiled in debug mode. Thus we use our own
>- // filter which always exits with the exception code for unhandled
>- // exceptions.
>- SetUnhandledExceptionFilter(ExitWithExceptionCode);
>-#endif
>-#endif
>-
>- testing::InitGoogleTest(&argc, argv);
>-
>- return RUN_ALL_TESTS();
>-}
>diff --git a/Source/ThirdParty/gtest/test/gtest_color_test.py b/Source/ThirdParty/gtest/test/gtest_color_test.py
>deleted file mode 100755
>index d02a53ed857c74c800bccd67bc418a51a09d6937..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_color_test.py
>+++ /dev/null
>@@ -1,130 +0,0 @@
>-#!/usr/bin/env python
>-#
>-# Copyright 2008, Google Inc.
>-# All rights reserved.
>-#
>-# Redistribution and use in source and binary forms, with or without
>-# modification, are permitted provided that the following conditions are
>-# met:
>-#
>-# * Redistributions of source code must retain the above copyright
>-# notice, this list of conditions and the following disclaimer.
>-# * Redistributions in binary form must reproduce the above
>-# copyright notice, this list of conditions and the following disclaimer
>-# in the documentation and/or other materials provided with the
>-# distribution.
>-# * Neither the name of Google Inc. nor the names of its
>-# contributors may be used to endorse or promote products derived from
>-# this software without specific prior written permission.
>-#
>-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-
>-"""Verifies that Google Test correctly determines whether to use colors."""
>-
>-__author__ = 'wan@google.com (Zhanyong Wan)'
>-
>-import os
>-import gtest_test_utils
>-
>-
>-IS_WINDOWS = os.name = 'nt'
>-
>-COLOR_ENV_VAR = 'GTEST_COLOR'
>-COLOR_FLAG = 'gtest_color'
>-COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_color_test_')
>-
>-
>-def SetEnvVar(env_var, value):
>- """Sets the env variable to 'value'; unsets it when 'value' is None."""
>-
>- if value is not None:
>- os.environ[env_var] = value
>- elif env_var in os.environ:
>- del os.environ[env_var]
>-
>-
>-def UsesColor(term, color_env_var, color_flag):
>- """Runs gtest_color_test_ and returns its exit code."""
>-
>- SetEnvVar('TERM', term)
>- SetEnvVar(COLOR_ENV_VAR, color_env_var)
>-
>- if color_flag is None:
>- args = []
>- else:
>- args = ['--%s=%s' % (COLOR_FLAG, color_flag)]
>- p = gtest_test_utils.Subprocess([COMMAND] + args)
>- return not p.exited or p.exit_code
>-
>-
>-class GTestColorTest(gtest_test_utils.TestCase):
>- def testNoEnvVarNoFlag(self):
>- """Tests the case when there's neither GTEST_COLOR nor --gtest_color."""
>-
>- if not IS_WINDOWS:
>- self.assert_(not UsesColor('dumb', None, None))
>- self.assert_(not UsesColor('emacs', None, None))
>- self.assert_(not UsesColor('xterm-mono', None, None))
>- self.assert_(not UsesColor('unknown', None, None))
>- self.assert_(not UsesColor(None, None, None))
>- self.assert_(UsesColor('linux', None, None))
>- self.assert_(UsesColor('cygwin', None, None))
>- self.assert_(UsesColor('xterm', None, None))
>- self.assert_(UsesColor('xterm-color', None, None))
>- self.assert_(UsesColor('xterm-256color', None, None))
>-
>- def testFlagOnly(self):
>- """Tests the case when there's --gtest_color but not GTEST_COLOR."""
>-
>- self.assert_(not UsesColor('dumb', None, 'no'))
>- self.assert_(not UsesColor('xterm-color', None, 'no'))
>- if not IS_WINDOWS:
>- self.assert_(not UsesColor('emacs', None, 'auto'))
>- self.assert_(UsesColor('xterm', None, 'auto'))
>- self.assert_(UsesColor('dumb', None, 'yes'))
>- self.assert_(UsesColor('xterm', None, 'yes'))
>-
>- def testEnvVarOnly(self):
>- """Tests the case when there's GTEST_COLOR but not --gtest_color."""
>-
>- self.assert_(not UsesColor('dumb', 'no', None))
>- self.assert_(not UsesColor('xterm-color', 'no', None))
>- if not IS_WINDOWS:
>- self.assert_(not UsesColor('dumb', 'auto', None))
>- self.assert_(UsesColor('xterm-color', 'auto', None))
>- self.assert_(UsesColor('dumb', 'yes', None))
>- self.assert_(UsesColor('xterm-color', 'yes', None))
>-
>- def testEnvVarAndFlag(self):
>- """Tests the case when there are both GTEST_COLOR and --gtest_color."""
>-
>- self.assert_(not UsesColor('xterm-color', 'no', 'no'))
>- self.assert_(UsesColor('dumb', 'no', 'yes'))
>- self.assert_(UsesColor('xterm-color', 'no', 'auto'))
>-
>- def testAliasesOfYesAndNo(self):
>- """Tests using aliases in specifying --gtest_color."""
>-
>- self.assert_(UsesColor('dumb', None, 'true'))
>- self.assert_(UsesColor('dumb', None, 'YES'))
>- self.assert_(UsesColor('dumb', None, 'T'))
>- self.assert_(UsesColor('dumb', None, '1'))
>-
>- self.assert_(not UsesColor('xterm', None, 'f'))
>- self.assert_(not UsesColor('xterm', None, 'false'))
>- self.assert_(not UsesColor('xterm', None, '0'))
>- self.assert_(not UsesColor('xterm', None, 'unknown'))
>-
>-
>-if __name__ == '__main__':
>- gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/gtest_color_test_.cc b/Source/ThirdParty/gtest/test/gtest_color_test_.cc
>deleted file mode 100644
>index 58d377c9b2af0bfe8195ca2c0a902139d9110642..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_color_test_.cc
>+++ /dev/null
>@@ -1,71 +0,0 @@
>-// Copyright 2008, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>-
>-// A helper program for testing how Google Test determines whether to use
>-// colors in the output. It prints "YES" and returns 1 if Google Test
>-// decides to use colors, and prints "NO" and returns 0 otherwise.
>-
>-#include <stdio.h>
>-
>-#include <gtest/gtest.h>
>-
>-// Indicates that this translation unit is part of Google Test's
>-// implementation. It must come before gtest-internal-inl.h is
>-// included, or there will be a compiler error. This trick is to
>-// prevent a user from accidentally including gtest-internal-inl.h in
>-// his code.
>-#define GTEST_IMPLEMENTATION_ 1
>-#include "src/gtest-internal-inl.h"
>-#undef GTEST_IMPLEMENTATION_
>-
>-using testing::internal::ShouldUseColor;
>-
>-// The purpose of this is to ensure that the UnitTest singleton is
>-// created before main() is entered, and thus that ShouldUseColor()
>-// works the same way as in a real Google-Test-based test. We don't actual
>-// run the TEST itself.
>-TEST(GTestColorTest, Dummy) {
>-}
>-
>-int main(int argc, char** argv) {
>- testing::InitGoogleTest(&argc, argv);
>-
>- if (ShouldUseColor(true)) {
>- // Google Test decides to use colors in the output (assuming it
>- // goes to a TTY).
>- printf("YES\n");
>- return 1;
>- } else {
>- // Google Test decides not to use colors in the output.
>- printf("NO\n");
>- return 0;
>- }
>-}
>diff --git a/Source/ThirdParty/gtest/test/gtest_env_var_test.py b/Source/ThirdParty/gtest/test/gtest_env_var_test.py
>deleted file mode 100755
>index bcc0bfd553297268076157736c83e4a84cae056c..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_env_var_test.py
>+++ /dev/null
>@@ -1,105 +0,0 @@
>-#!/usr/bin/env python
>-#
>-# Copyright 2008, Google Inc.
>-# All rights reserved.
>-#
>-# Redistribution and use in source and binary forms, with or without
>-# modification, are permitted provided that the following conditions are
>-# met:
>-#
>-# * Redistributions of source code must retain the above copyright
>-# notice, this list of conditions and the following disclaimer.
>-# * Redistributions in binary form must reproduce the above
>-# copyright notice, this list of conditions and the following disclaimer
>-# in the documentation and/or other materials provided with the
>-# distribution.
>-# * Neither the name of Google Inc. nor the names of its
>-# contributors may be used to endorse or promote products derived from
>-# this software without specific prior written permission.
>-#
>-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-
>-"""Verifies that Google Test correctly parses environment variables."""
>-
>-__author__ = 'wan@google.com (Zhanyong Wan)'
>-
>-import os
>-import gtest_test_utils
>-
>-
>-IS_WINDOWS = os.name == 'nt'
>-IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
>-
>-COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_env_var_test_')
>-
>-environ = os.environ.copy()
>-
>-
>-def AssertEq(expected, actual):
>- if expected != actual:
>- print 'Expected: %s' % (expected,)
>- print ' Actual: %s' % (actual,)
>- raise AssertionError
>-
>-
>-def SetEnvVar(env_var, value):
>- """Sets the env variable to 'value'; unsets it when 'value' is None."""
>-
>- if value is not None:
>- environ[env_var] = value
>- elif env_var in environ:
>- del environ[env_var]
>-
>-
>-def GetFlag(flag):
>- """Runs gtest_env_var_test_ and returns its output."""
>-
>- args = [COMMAND]
>- if flag is not None:
>- args += [flag]
>- return gtest_test_utils.Subprocess(args, env=environ).output
>-
>-
>-def TestFlag(flag, test_val, default_val):
>- """Verifies that the given flag is affected by the corresponding env var."""
>-
>- env_var = 'GTEST_' + flag.upper()
>- SetEnvVar(env_var, test_val)
>- AssertEq(test_val, GetFlag(flag))
>- SetEnvVar(env_var, None)
>- AssertEq(default_val, GetFlag(flag))
>-
>-
>-class GTestEnvVarTest(gtest_test_utils.TestCase):
>- def testEnvVarAffectsFlag(self):
>- """Tests that environment variable should affect the corresponding flag."""
>-
>- TestFlag('break_on_failure', '1', '0')
>- TestFlag('color', 'yes', 'auto')
>- TestFlag('filter', 'FooTest.Bar', '*')
>- TestFlag('output', 'xml:tmp/foo.xml', '')
>- TestFlag('print_time', '0', '1')
>- TestFlag('repeat', '999', '1')
>- TestFlag('throw_on_failure', '1', '0')
>- TestFlag('death_test_style', 'threadsafe', 'fast')
>-
>- if IS_WINDOWS:
>- TestFlag('catch_exceptions', '1', '0')
>-
>- if IS_LINUX:
>- TestFlag('death_test_use_fork', '1', '0')
>- TestFlag('stack_trace_depth', '0', '100')
>-
>-
>-if __name__ == '__main__':
>- gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/gtest_env_var_test_.cc b/Source/ThirdParty/gtest/test/gtest_env_var_test_.cc
>deleted file mode 100644
>index f7c78fcf305312a66c265b1810a691077db771f7..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_env_var_test_.cc
>+++ /dev/null
>@@ -1,126 +0,0 @@
>-// Copyright 2008, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>-
>-// A helper program for testing that Google Test parses the environment
>-// variables correctly.
>-
>-#include <gtest/gtest.h>
>-
>-#include <iostream>
>-
>-#define GTEST_IMPLEMENTATION_ 1
>-#include "src/gtest-internal-inl.h"
>-#undef GTEST_IMPLEMENTATION_
>-
>-using ::std::cout;
>-
>-namespace testing {
>-
>-// The purpose of this is to make the test more realistic by ensuring
>-// that the UnitTest singleton is created before main() is entered.
>-// We don't actual run the TEST itself.
>-TEST(GTestEnvVarTest, Dummy) {
>-}
>-
>-void PrintFlag(const char* flag) {
>- if (strcmp(flag, "break_on_failure") == 0) {
>- cout << GTEST_FLAG(break_on_failure);
>- return;
>- }
>-
>- if (strcmp(flag, "catch_exceptions") == 0) {
>- cout << GTEST_FLAG(catch_exceptions);
>- return;
>- }
>-
>- if (strcmp(flag, "color") == 0) {
>- cout << GTEST_FLAG(color);
>- return;
>- }
>-
>- if (strcmp(flag, "death_test_style") == 0) {
>- cout << GTEST_FLAG(death_test_style);
>- return;
>- }
>-
>- if (strcmp(flag, "death_test_use_fork") == 0) {
>- cout << GTEST_FLAG(death_test_use_fork);
>- return;
>- }
>-
>- if (strcmp(flag, "filter") == 0) {
>- cout << GTEST_FLAG(filter);
>- return;
>- }
>-
>- if (strcmp(flag, "output") == 0) {
>- cout << GTEST_FLAG(output);
>- return;
>- }
>-
>- if (strcmp(flag, "print_time") == 0) {
>- cout << GTEST_FLAG(print_time);
>- return;
>- }
>-
>- if (strcmp(flag, "repeat") == 0) {
>- cout << GTEST_FLAG(repeat);
>- return;
>- }
>-
>- if (strcmp(flag, "stack_trace_depth") == 0) {
>- cout << GTEST_FLAG(stack_trace_depth);
>- return;
>- }
>-
>- if (strcmp(flag, "throw_on_failure") == 0) {
>- cout << GTEST_FLAG(throw_on_failure);
>- return;
>- }
>-
>- cout << "Invalid flag name " << flag
>- << ". Valid names are break_on_failure, color, filter, etc.\n";
>- exit(1);
>-}
>-
>-} // namespace testing
>-
>-int main(int argc, char** argv) {
>- testing::InitGoogleTest(&argc, argv);
>-
>- if (argc != 2) {
>- cout << "Usage: gtest_env_var_test_ NAME_OF_FLAG\n";
>- return 1;
>- }
>-
>- testing::PrintFlag(argv[1]);
>- return 0;
>-}
>diff --git a/Source/ThirdParty/gtest/test/gtest_environment_test.cc b/Source/ThirdParty/gtest/test/gtest_environment_test.cc
>index c9392614d74d7fc232e86b2c3d6cdb1b1e2b6131..bc9524d66373e71951caccd906c066ef4af94b46 100644
>--- a/Source/ThirdParty/gtest/test/gtest_environment_test.cc
>+++ b/Source/ThirdParty/gtest/test/gtest_environment_test.cc
>@@ -26,14 +26,14 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>+
> //
> // Tests using global test environments.
> 
> #include <stdlib.h>
> #include <stdio.h>
>-#include <gtest/gtest.h>
>+#include "gtest/gtest.h"
>+#include "src/gtest-internal-inl.h"
> 
> namespace testing {
> GTEST_DECLARE_string_(filter);
>@@ -92,6 +92,7 @@ class MyEnvironment : public testing::Environment {
> 
> // Was TearDown() run?
> bool tear_down_was_run() const { return tear_down_was_run_; }
>+
> private:
> FailureType failure_in_set_up_;
> bool set_up_was_run_;
>@@ -111,7 +112,7 @@ TEST(FooTest, Bar) {
> void Check(bool condition, const char* msg) {
> if (!condition) {
> printf("FAILED: %s\n", msg);
>- abort();
>+ testing::internal::posix::Abort();
> }
> }
> 
>@@ -123,6 +124,7 @@ int RunAllTests(MyEnvironment* env, FailureType failure) {
> env->Reset();
> env->set_failure_in_set_up(failure);
> test_was_run = false;
>+ testing::internal::GetUnitTestImpl()->ClearAdHocTestResult();
> return RUN_ALL_TESTS();
> }
> 
>diff --git a/Source/ThirdParty/gtest/test/gtest_filter_unittest.py b/Source/ThirdParty/gtest/test/gtest_filter_unittest.py
>deleted file mode 100755
>index 0d1a770058ccb901154680924cbd3c64d8c8d179..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_filter_unittest.py
>+++ /dev/null
>@@ -1,633 +0,0 @@
>-#!/usr/bin/env python
>-#
>-# Copyright 2005 Google Inc. All Rights Reserved.
>-#
>-# Redistribution and use in source and binary forms, with or without
>-# modification, are permitted provided that the following conditions are
>-# met:
>-#
>-# * Redistributions of source code must retain the above copyright
>-# notice, this list of conditions and the following disclaimer.
>-# * Redistributions in binary form must reproduce the above
>-# copyright notice, this list of conditions and the following disclaimer
>-# in the documentation and/or other materials provided with the
>-# distribution.
>-# * Neither the name of Google Inc. nor the names of its
>-# contributors may be used to endorse or promote products derived from
>-# this software without specific prior written permission.
>-#
>-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-
>-"""Unit test for Google Test test filters.
>-
>-A user can specify which test(s) in a Google Test program to run via either
>-the GTEST_FILTER environment variable or the --gtest_filter flag.
>-This script tests such functionality by invoking
>-gtest_filter_unittest_ (a program written with Google Test) with different
>-environments and command line flags.
>-
>-Note that test sharding may also influence which tests are filtered. Therefore,
>-we test that here also.
>-"""
>-
>-__author__ = 'wan@google.com (Zhanyong Wan)'
>-
>-import os
>-import re
>-import sets
>-import sys
>-
>-import gtest_test_utils
>-
>-# Constants.
>-
>-# Checks if this platform can pass empty environment variables to child
>-# processes. We set an env variable to an empty string and invoke a python
>-# script in a subprocess to print whether the variable is STILL in
>-# os.environ. We then use 'eval' to parse the child's output so that an
>-# exception is thrown if the input is anything other than 'True' nor 'False'.
>-os.environ['EMPTY_VAR'] = ''
>-child = gtest_test_utils.Subprocess(
>- [sys.executable, '-c', 'import os; print \'EMPTY_VAR\' in os.environ'])
>-CAN_PASS_EMPTY_ENV = eval(child.output)
>-
>-
>-# Check if this platform can unset environment variables in child processes.
>-# We set an env variable to a non-empty string, unset it, and invoke
>-# a python script in a subprocess to print whether the variable
>-# is NO LONGER in os.environ.
>-# We use 'eval' to parse the child's output so that an exception
>-# is thrown if the input is neither 'True' nor 'False'.
>-os.environ['UNSET_VAR'] = 'X'
>-del os.environ['UNSET_VAR']
>-child = gtest_test_utils.Subprocess(
>- [sys.executable, '-c', 'import os; print \'UNSET_VAR\' not in os.environ'])
>-CAN_UNSET_ENV = eval(child.output)
>-
>-
>-# Checks if we should test with an empty filter. This doesn't
>-# make sense on platforms that cannot pass empty env variables (Win32)
>-# and on platforms that cannot unset variables (since we cannot tell
>-# the difference between "" and NULL -- Borland and Solaris < 5.10)
>-CAN_TEST_EMPTY_FILTER = (CAN_PASS_EMPTY_ENV and CAN_UNSET_ENV)
>-
>-
>-# The environment variable for specifying the test filters.
>-FILTER_ENV_VAR = 'GTEST_FILTER'
>-
>-# The environment variables for test sharding.
>-TOTAL_SHARDS_ENV_VAR = 'GTEST_TOTAL_SHARDS'
>-SHARD_INDEX_ENV_VAR = 'GTEST_SHARD_INDEX'
>-SHARD_STATUS_FILE_ENV_VAR = 'GTEST_SHARD_STATUS_FILE'
>-
>-# The command line flag for specifying the test filters.
>-FILTER_FLAG = 'gtest_filter'
>-
>-# The command line flag for including disabled tests.
>-ALSO_RUN_DISABED_TESTS_FLAG = 'gtest_also_run_disabled_tests'
>-
>-# Command to run the gtest_filter_unittest_ program.
>-COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_filter_unittest_')
>-
>-# Regex for determining whether parameterized tests are enabled in the binary.
>-PARAM_TEST_REGEX = re.compile(r'/ParamTest')
>-
>-# Regex for parsing test case names from Google Test's output.
>-TEST_CASE_REGEX = re.compile(r'^\[\-+\] \d+ tests? from (\w+(/\w+)?)')
>-
>-# Regex for parsing test names from Google Test's output.
>-TEST_REGEX = re.compile(r'^\[\s*RUN\s*\].*\.(\w+(/\w+)?)')
>-
>-# The command line flag to tell Google Test to output the list of tests it
>-# will run.
>-LIST_TESTS_FLAG = '--gtest_list_tests'
>-
>-# Indicates whether Google Test supports death tests.
>-SUPPORTS_DEATH_TESTS = 'HasDeathTest' in gtest_test_utils.Subprocess(
>- [COMMAND, LIST_TESTS_FLAG]).output
>-
>-# Full names of all tests in gtest_filter_unittests_.
>-PARAM_TESTS = [
>- 'SeqP/ParamTest.TestX/0',
>- 'SeqP/ParamTest.TestX/1',
>- 'SeqP/ParamTest.TestY/0',
>- 'SeqP/ParamTest.TestY/1',
>- 'SeqQ/ParamTest.TestX/0',
>- 'SeqQ/ParamTest.TestX/1',
>- 'SeqQ/ParamTest.TestY/0',
>- 'SeqQ/ParamTest.TestY/1',
>- ]
>-
>-DISABLED_TESTS = [
>- 'BarTest.DISABLED_TestFour',
>- 'BarTest.DISABLED_TestFive',
>- 'BazTest.DISABLED_TestC',
>- 'DISABLED_FoobarTest.Test1',
>- 'DISABLED_FoobarTest.DISABLED_Test2',
>- 'DISABLED_FoobarbazTest.TestA',
>- ]
>-
>-if SUPPORTS_DEATH_TESTS:
>- DEATH_TESTS = [
>- 'HasDeathTest.Test1',
>- 'HasDeathTest.Test2',
>- ]
>-else:
>- DEATH_TESTS = []
>-
>-# All the non-disabled tests.
>-ACTIVE_TESTS = [
>- 'FooTest.Abc',
>- 'FooTest.Xyz',
>-
>- 'BarTest.TestOne',
>- 'BarTest.TestTwo',
>- 'BarTest.TestThree',
>-
>- 'BazTest.TestOne',
>- 'BazTest.TestA',
>- 'BazTest.TestB',
>- ] + DEATH_TESTS + PARAM_TESTS
>-
>-param_tests_present = None
>-
>-# Utilities.
>-
>-environ = os.environ.copy()
>-
>-
>-def SetEnvVar(env_var, value):
>- """Sets the env variable to 'value'; unsets it when 'value' is None."""
>-
>- if value is not None:
>- environ[env_var] = value
>- elif env_var in environ:
>- del environ[env_var]
>-
>-
>-def RunAndReturnOutput(args = None):
>- """Runs the test program and returns its output."""
>-
>- return gtest_test_utils.Subprocess([COMMAND] + (args or []),
>- env=environ).output
>-
>-
>-def RunAndExtractTestList(args = None):
>- """Runs the test program and returns its exit code and a list of tests run."""
>-
>- p = gtest_test_utils.Subprocess([COMMAND] + (args or []), env=environ)
>- tests_run = []
>- test_case = ''
>- test = ''
>- for line in p.output.split('\n'):
>- match = TEST_CASE_REGEX.match(line)
>- if match is not None:
>- test_case = match.group(1)
>- else:
>- match = TEST_REGEX.match(line)
>- if match is not None:
>- test = match.group(1)
>- tests_run.append(test_case + '.' + test)
>- return (tests_run, p.exit_code)
>-
>-
>-def InvokeWithModifiedEnv(extra_env, function, *args, **kwargs):
>- """Runs the given function and arguments in a modified environment."""
>- try:
>- original_env = environ.copy()
>- environ.update(extra_env)
>- return function(*args, **kwargs)
>- finally:
>- environ.clear()
>- environ.update(original_env)
>-
>-
>-def RunWithSharding(total_shards, shard_index, command):
>- """Runs a test program shard and returns exit code and a list of tests run."""
>-
>- extra_env = {SHARD_INDEX_ENV_VAR: str(shard_index),
>- TOTAL_SHARDS_ENV_VAR: str(total_shards)}
>- return InvokeWithModifiedEnv(extra_env, RunAndExtractTestList, command)
>-
>-# The unit test.
>-
>-
>-class GTestFilterUnitTest(gtest_test_utils.TestCase):
>- """Tests the env variable or the command line flag to filter tests."""
>-
>- # Utilities.
>-
>- def AssertSetEqual(self, lhs, rhs):
>- """Asserts that two sets are equal."""
>-
>- for elem in lhs:
>- self.assert_(elem in rhs, '%s in %s' % (elem, rhs))
>-
>- for elem in rhs:
>- self.assert_(elem in lhs, '%s in %s' % (elem, lhs))
>-
>- def AssertPartitionIsValid(self, set_var, list_of_sets):
>- """Asserts that list_of_sets is a valid partition of set_var."""
>-
>- full_partition = []
>- for slice_var in list_of_sets:
>- full_partition.extend(slice_var)
>- self.assertEqual(len(set_var), len(full_partition))
>- self.assertEqual(sets.Set(set_var), sets.Set(full_partition))
>-
>- def AdjustForParameterizedTests(self, tests_to_run):
>- """Adjust tests_to_run in case value parameterized tests are disabled."""
>-
>- global param_tests_present
>- if not param_tests_present:
>- return list(sets.Set(tests_to_run) - sets.Set(PARAM_TESTS))
>- else:
>- return tests_to_run
>-
>- def RunAndVerify(self, gtest_filter, tests_to_run):
>- """Checks that the binary runs correct set of tests for a given filter."""
>-
>- tests_to_run = self.AdjustForParameterizedTests(tests_to_run)
>-
>- # First, tests using the environment variable.
>-
>- # Windows removes empty variables from the environment when passing it
>- # to a new process. This means it is impossible to pass an empty filter
>- # into a process using the environment variable. However, we can still
>- # test the case when the variable is not supplied (i.e., gtest_filter is
>- # None).
>- # pylint: disable-msg=C6403
>- if CAN_TEST_EMPTY_FILTER or gtest_filter != '':
>- SetEnvVar(FILTER_ENV_VAR, gtest_filter)
>- tests_run = RunAndExtractTestList()[0]
>- SetEnvVar(FILTER_ENV_VAR, None)
>- self.AssertSetEqual(tests_run, tests_to_run)
>- # pylint: enable-msg=C6403
>-
>- # Next, tests using the command line flag.
>-
>- if gtest_filter is None:
>- args = []
>- else:
>- args = ['--%s=%s' % (FILTER_FLAG, gtest_filter)]
>-
>- tests_run = RunAndExtractTestList(args)[0]
>- self.AssertSetEqual(tests_run, tests_to_run)
>-
>- def RunAndVerifyWithSharding(self, gtest_filter, total_shards, tests_to_run,
>- args=None, check_exit_0=False):
>- """Checks that binary runs correct tests for the given filter and shard.
>-
>- Runs all shards of gtest_filter_unittest_ with the given filter, and
>- verifies that the right set of tests were run. The union of tests run
>- on each shard should be identical to tests_to_run, without duplicates.
>-
>- Args:
>- gtest_filter: A filter to apply to the tests.
>- total_shards: A total number of shards to split test run into.
>- tests_to_run: A set of tests expected to run.
>- args : Arguments to pass to the to the test binary.
>- check_exit_0: When set to a true value, make sure that all shards
>- return 0.
>- """
>-
>- tests_to_run = self.AdjustForParameterizedTests(tests_to_run)
>-
>- # Windows removes empty variables from the environment when passing it
>- # to a new process. This means it is impossible to pass an empty filter
>- # into a process using the environment variable. However, we can still
>- # test the case when the variable is not supplied (i.e., gtest_filter is
>- # None).
>- # pylint: disable-msg=C6403
>- if CAN_TEST_EMPTY_FILTER or gtest_filter != '':
>- SetEnvVar(FILTER_ENV_VAR, gtest_filter)
>- partition = []
>- for i in range(0, total_shards):
>- (tests_run, exit_code) = RunWithSharding(total_shards, i, args)
>- if check_exit_0:
>- self.assertEqual(0, exit_code)
>- partition.append(tests_run)
>-
>- self.AssertPartitionIsValid(tests_to_run, partition)
>- SetEnvVar(FILTER_ENV_VAR, None)
>- # pylint: enable-msg=C6403
>-
>- def RunAndVerifyAllowingDisabled(self, gtest_filter, tests_to_run):
>- """Checks that the binary runs correct set of tests for the given filter.
>-
>- Runs gtest_filter_unittest_ with the given filter, and enables
>- disabled tests. Verifies that the right set of tests were run.
>-
>- Args:
>- gtest_filter: A filter to apply to the tests.
>- tests_to_run: A set of tests expected to run.
>- """
>-
>- tests_to_run = self.AdjustForParameterizedTests(tests_to_run)
>-
>- # Construct the command line.
>- args = ['--%s' % ALSO_RUN_DISABED_TESTS_FLAG]
>- if gtest_filter is not None:
>- args.append('--%s=%s' % (FILTER_FLAG, gtest_filter))
>-
>- tests_run = RunAndExtractTestList(args)[0]
>- self.AssertSetEqual(tests_run, tests_to_run)
>-
>- def setUp(self):
>- """Sets up test case.
>-
>- Determines whether value-parameterized tests are enabled in the binary and
>- sets the flags accordingly.
>- """
>-
>- global param_tests_present
>- if param_tests_present is None:
>- param_tests_present = PARAM_TEST_REGEX.search(
>- RunAndReturnOutput()) is not None
>-
>- def testDefaultBehavior(self):
>- """Tests the behavior of not specifying the filter."""
>-
>- self.RunAndVerify(None, ACTIVE_TESTS)
>-
>- def testDefaultBehaviorWithShards(self):
>- """Tests the behavior without the filter, with sharding enabled."""
>-
>- self.RunAndVerifyWithSharding(None, 1, ACTIVE_TESTS)
>- self.RunAndVerifyWithSharding(None, 2, ACTIVE_TESTS)
>- self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS) - 1, ACTIVE_TESTS)
>- self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS), ACTIVE_TESTS)
>- self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS) + 1, ACTIVE_TESTS)
>-
>- def testEmptyFilter(self):
>- """Tests an empty filter."""
>-
>- self.RunAndVerify('', [])
>- self.RunAndVerifyWithSharding('', 1, [])
>- self.RunAndVerifyWithSharding('', 2, [])
>-
>- def testBadFilter(self):
>- """Tests a filter that matches nothing."""
>-
>- self.RunAndVerify('BadFilter', [])
>- self.RunAndVerifyAllowingDisabled('BadFilter', [])
>-
>- def testFullName(self):
>- """Tests filtering by full name."""
>-
>- self.RunAndVerify('FooTest.Xyz', ['FooTest.Xyz'])
>- self.RunAndVerifyAllowingDisabled('FooTest.Xyz', ['FooTest.Xyz'])
>- self.RunAndVerifyWithSharding('FooTest.Xyz', 5, ['FooTest.Xyz'])
>-
>- def testUniversalFilters(self):
>- """Tests filters that match everything."""
>-
>- self.RunAndVerify('*', ACTIVE_TESTS)
>- self.RunAndVerify('*.*', ACTIVE_TESTS)
>- self.RunAndVerifyWithSharding('*.*', len(ACTIVE_TESTS) - 3, ACTIVE_TESTS)
>- self.RunAndVerifyAllowingDisabled('*', ACTIVE_TESTS + DISABLED_TESTS)
>- self.RunAndVerifyAllowingDisabled('*.*', ACTIVE_TESTS + DISABLED_TESTS)
>-
>- def testFilterByTestCase(self):
>- """Tests filtering by test case name."""
>-
>- self.RunAndVerify('FooTest.*', ['FooTest.Abc', 'FooTest.Xyz'])
>-
>- BAZ_TESTS = ['BazTest.TestOne', 'BazTest.TestA', 'BazTest.TestB']
>- self.RunAndVerify('BazTest.*', BAZ_TESTS)
>- self.RunAndVerifyAllowingDisabled('BazTest.*',
>- BAZ_TESTS + ['BazTest.DISABLED_TestC'])
>-
>- def testFilterByTest(self):
>- """Tests filtering by test name."""
>-
>- self.RunAndVerify('*.TestOne', ['BarTest.TestOne', 'BazTest.TestOne'])
>-
>- def testFilterDisabledTests(self):
>- """Select only the disabled tests to run."""
>-
>- self.RunAndVerify('DISABLED_FoobarTest.Test1', [])
>- self.RunAndVerifyAllowingDisabled('DISABLED_FoobarTest.Test1',
>- ['DISABLED_FoobarTest.Test1'])
>-
>- self.RunAndVerify('*DISABLED_*', [])
>- self.RunAndVerifyAllowingDisabled('*DISABLED_*', DISABLED_TESTS)
>-
>- self.RunAndVerify('*.DISABLED_*', [])
>- self.RunAndVerifyAllowingDisabled('*.DISABLED_*', [
>- 'BarTest.DISABLED_TestFour',
>- 'BarTest.DISABLED_TestFive',
>- 'BazTest.DISABLED_TestC',
>- 'DISABLED_FoobarTest.DISABLED_Test2',
>- ])
>-
>- self.RunAndVerify('DISABLED_*', [])
>- self.RunAndVerifyAllowingDisabled('DISABLED_*', [
>- 'DISABLED_FoobarTest.Test1',
>- 'DISABLED_FoobarTest.DISABLED_Test2',
>- 'DISABLED_FoobarbazTest.TestA',
>- ])
>-
>- def testWildcardInTestCaseName(self):
>- """Tests using wildcard in the test case name."""
>-
>- self.RunAndVerify('*a*.*', [
>- 'BarTest.TestOne',
>- 'BarTest.TestTwo',
>- 'BarTest.TestThree',
>-
>- 'BazTest.TestOne',
>- 'BazTest.TestA',
>- 'BazTest.TestB', ] + DEATH_TESTS + PARAM_TESTS)
>-
>- def testWildcardInTestName(self):
>- """Tests using wildcard in the test name."""
>-
>- self.RunAndVerify('*.*A*', ['FooTest.Abc', 'BazTest.TestA'])
>-
>- def testFilterWithoutDot(self):
>- """Tests a filter that has no '.' in it."""
>-
>- self.RunAndVerify('*z*', [
>- 'FooTest.Xyz',
>-
>- 'BazTest.TestOne',
>- 'BazTest.TestA',
>- 'BazTest.TestB',
>- ])
>-
>- def testTwoPatterns(self):
>- """Tests filters that consist of two patterns."""
>-
>- self.RunAndVerify('Foo*.*:*A*', [
>- 'FooTest.Abc',
>- 'FooTest.Xyz',
>-
>- 'BazTest.TestA',
>- ])
>-
>- # An empty pattern + a non-empty one
>- self.RunAndVerify(':*A*', ['FooTest.Abc', 'BazTest.TestA'])
>-
>- def testThreePatterns(self):
>- """Tests filters that consist of three patterns."""
>-
>- self.RunAndVerify('*oo*:*A*:*One', [
>- 'FooTest.Abc',
>- 'FooTest.Xyz',
>-
>- 'BarTest.TestOne',
>-
>- 'BazTest.TestOne',
>- 'BazTest.TestA',
>- ])
>-
>- # The 2nd pattern is empty.
>- self.RunAndVerify('*oo*::*One', [
>- 'FooTest.Abc',
>- 'FooTest.Xyz',
>-
>- 'BarTest.TestOne',
>-
>- 'BazTest.TestOne',
>- ])
>-
>- # The last 2 patterns are empty.
>- self.RunAndVerify('*oo*::', [
>- 'FooTest.Abc',
>- 'FooTest.Xyz',
>- ])
>-
>- def testNegativeFilters(self):
>- self.RunAndVerify('*-BazTest.TestOne', [
>- 'FooTest.Abc',
>- 'FooTest.Xyz',
>-
>- 'BarTest.TestOne',
>- 'BarTest.TestTwo',
>- 'BarTest.TestThree',
>-
>- 'BazTest.TestA',
>- 'BazTest.TestB',
>- ] + DEATH_TESTS + PARAM_TESTS)
>-
>- self.RunAndVerify('*-FooTest.Abc:BazTest.*', [
>- 'FooTest.Xyz',
>-
>- 'BarTest.TestOne',
>- 'BarTest.TestTwo',
>- 'BarTest.TestThree',
>- ] + DEATH_TESTS + PARAM_TESTS)
>-
>- self.RunAndVerify('BarTest.*-BarTest.TestOne', [
>- 'BarTest.TestTwo',
>- 'BarTest.TestThree',
>- ])
>-
>- # Tests without leading '*'.
>- self.RunAndVerify('-FooTest.Abc:FooTest.Xyz:BazTest.*', [
>- 'BarTest.TestOne',
>- 'BarTest.TestTwo',
>- 'BarTest.TestThree',
>- ] + DEATH_TESTS + PARAM_TESTS)
>-
>- # Value parameterized tests.
>- self.RunAndVerify('*/*', PARAM_TESTS)
>-
>- # Value parameterized tests filtering by the sequence name.
>- self.RunAndVerify('SeqP/*', [
>- 'SeqP/ParamTest.TestX/0',
>- 'SeqP/ParamTest.TestX/1',
>- 'SeqP/ParamTest.TestY/0',
>- 'SeqP/ParamTest.TestY/1',
>- ])
>-
>- # Value parameterized tests filtering by the test name.
>- self.RunAndVerify('*/0', [
>- 'SeqP/ParamTest.TestX/0',
>- 'SeqP/ParamTest.TestY/0',
>- 'SeqQ/ParamTest.TestX/0',
>- 'SeqQ/ParamTest.TestY/0',
>- ])
>-
>- def testFlagOverridesEnvVar(self):
>- """Tests that the filter flag overrides the filtering env. variable."""
>-
>- SetEnvVar(FILTER_ENV_VAR, 'Foo*')
>- args = ['--%s=%s' % (FILTER_FLAG, '*One')]
>- tests_run = RunAndExtractTestList(args)[0]
>- SetEnvVar(FILTER_ENV_VAR, None)
>-
>- self.AssertSetEqual(tests_run, ['BarTest.TestOne', 'BazTest.TestOne'])
>-
>- def testShardStatusFileIsCreated(self):
>- """Tests that the shard file is created if specified in the environment."""
>-
>- shard_status_file = os.path.join(gtest_test_utils.GetTempDir(),
>- 'shard_status_file')
>- self.assert_(not os.path.exists(shard_status_file))
>-
>- extra_env = {SHARD_STATUS_FILE_ENV_VAR: shard_status_file}
>- try:
>- InvokeWithModifiedEnv(extra_env, RunAndReturnOutput)
>- finally:
>- self.assert_(os.path.exists(shard_status_file))
>- os.remove(shard_status_file)
>-
>- def testShardStatusFileIsCreatedWithListTests(self):
>- """Tests that the shard file is created with the "list_tests" flag."""
>-
>- shard_status_file = os.path.join(gtest_test_utils.GetTempDir(),
>- 'shard_status_file2')
>- self.assert_(not os.path.exists(shard_status_file))
>-
>- extra_env = {SHARD_STATUS_FILE_ENV_VAR: shard_status_file}
>- try:
>- output = InvokeWithModifiedEnv(extra_env,
>- RunAndReturnOutput,
>- [LIST_TESTS_FLAG])
>- finally:
>- # This assertion ensures that Google Test enumerated the tests as
>- # opposed to running them.
>- self.assert_('[==========]' not in output,
>- 'Unexpected output during test enumeration.\n'
>- 'Please ensure that LIST_TESTS_FLAG is assigned the\n'
>- 'correct flag value for listing Google Test tests.')
>-
>- self.assert_(os.path.exists(shard_status_file))
>- os.remove(shard_status_file)
>-
>- if SUPPORTS_DEATH_TESTS:
>- def testShardingWorksWithDeathTests(self):
>- """Tests integration with death tests and sharding."""
>-
>- gtest_filter = 'HasDeathTest.*:SeqP/*'
>- expected_tests = [
>- 'HasDeathTest.Test1',
>- 'HasDeathTest.Test2',
>-
>- 'SeqP/ParamTest.TestX/0',
>- 'SeqP/ParamTest.TestX/1',
>- 'SeqP/ParamTest.TestY/0',
>- 'SeqP/ParamTest.TestY/1',
>- ]
>-
>- for flag in ['--gtest_death_test_style=threadsafe',
>- '--gtest_death_test_style=fast']:
>- self.RunAndVerifyWithSharding(gtest_filter, 3, expected_tests,
>- check_exit_0=True, args=[flag])
>- self.RunAndVerifyWithSharding(gtest_filter, 5, expected_tests,
>- check_exit_0=True, args=[flag])
>-
>-if __name__ == '__main__':
>- gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/gtest_filter_unittest_.cc b/Source/ThirdParty/gtest/test/gtest_filter_unittest_.cc
>deleted file mode 100644
>index 325504fe94afc177c46cbc135fec675c554d2e0d..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_filter_unittest_.cc
>+++ /dev/null
>@@ -1,140 +0,0 @@
>-// Copyright 2005, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>-
>-// Unit test for Google Test test filters.
>-//
>-// A user can specify which test(s) in a Google Test program to run via
>-// either the GTEST_FILTER environment variable or the --gtest_filter
>-// flag. This is used for testing such functionality.
>-//
>-// The program will be invoked from a Python unit test. Don't run it
>-// directly.
>-
>-#include <gtest/gtest.h>
>-
>-namespace {
>-
>-// Test case FooTest.
>-
>-class FooTest : public testing::Test {
>-};
>-
>-TEST_F(FooTest, Abc) {
>-}
>-
>-TEST_F(FooTest, Xyz) {
>- FAIL() << "Expected failure.";
>-}
>-
>-// Test case BarTest.
>-
>-TEST(BarTest, TestOne) {
>-}
>-
>-TEST(BarTest, TestTwo) {
>-}
>-
>-TEST(BarTest, TestThree) {
>-}
>-
>-TEST(BarTest, DISABLED_TestFour) {
>- FAIL() << "Expected failure.";
>-}
>-
>-TEST(BarTest, DISABLED_TestFive) {
>- FAIL() << "Expected failure.";
>-}
>-
>-// Test case BazTest.
>-
>-TEST(BazTest, TestOne) {
>- FAIL() << "Expected failure.";
>-}
>-
>-TEST(BazTest, TestA) {
>-}
>-
>-TEST(BazTest, TestB) {
>-}
>-
>-TEST(BazTest, DISABLED_TestC) {
>- FAIL() << "Expected failure.";
>-}
>-
>-// Test case HasDeathTest
>-
>-TEST(HasDeathTest, Test1) {
>- EXPECT_DEATH_IF_SUPPORTED(exit(1), ".*");
>-}
>-
>-// We need at least two death tests to make sure that the all death tests
>-// aren't on the first shard.
>-TEST(HasDeathTest, Test2) {
>- EXPECT_DEATH_IF_SUPPORTED(exit(1), ".*");
>-}
>-
>-// Test case FoobarTest
>-
>-TEST(DISABLED_FoobarTest, Test1) {
>- FAIL() << "Expected failure.";
>-}
>-
>-TEST(DISABLED_FoobarTest, DISABLED_Test2) {
>- FAIL() << "Expected failure.";
>-}
>-
>-// Test case FoobarbazTest
>-
>-TEST(DISABLED_FoobarbazTest, TestA) {
>- FAIL() << "Expected failure.";
>-}
>-
>-#if GTEST_HAS_PARAM_TEST
>-class ParamTest : public testing::TestWithParam<int> {
>-};
>-
>-TEST_P(ParamTest, TestX) {
>-}
>-
>-TEST_P(ParamTest, TestY) {
>-}
>-
>-INSTANTIATE_TEST_CASE_P(SeqP, ParamTest, testing::Values(1, 2));
>-INSTANTIATE_TEST_CASE_P(SeqQ, ParamTest, testing::Values(5, 6));
>-#endif // GTEST_HAS_PARAM_TEST
>-
>-} // namespace
>-
>-int main(int argc, char **argv) {
>- ::testing::InitGoogleTest(&argc, argv);
>-
>- return RUN_ALL_TESTS();
>-}
>diff --git a/Source/ThirdParty/gtest/test/gtest_help_test.py b/Source/ThirdParty/gtest/test/gtest_help_test.py
>index 3cb4c48e0b4628d9aa7c6f3207ab7ee10cd22ba3..582d24c2dcce894538aa63ccbd6120bdd4b350a0 100755
>--- a/Source/ThirdParty/gtest/test/gtest_help_test.py
>+++ b/Source/ThirdParty/gtest/test/gtest_help_test.py
>@@ -29,27 +29,26 @@
> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
>-"""Tests the --help flag of Google C++ Testing Framework.
>+"""Tests the --help flag of Google C++ Testing and Mocking Framework.
> 
> SYNOPSIS
>- gtest_help_test.py --gtest_build_dir=BUILD/DIR
>+ gtest_help_test.py --build_dir=BUILD/DIR
> # where BUILD/DIR contains the built gtest_help_test_ file.
> gtest_help_test.py
> """
> 
>-__author__ = 'wan@google.com (Zhanyong Wan)'
>-
> import os
> import re
> import gtest_test_utils
> 
> 
>+IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
> IS_WINDOWS = os.name == 'nt'
> 
> PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath('gtest_help_test_')
> FLAG_PREFIX = '--gtest_'
>-CATCH_EXCEPTIONS_FLAG = FLAG_PREFIX + 'catch_exceptions'
> DEATH_TEST_STYLE_FLAG = FLAG_PREFIX + 'death_test_style'
>+STREAM_RESULT_TO_FLAG = FLAG_PREFIX + 'stream_result_to'
> UNKNOWN_FLAG = FLAG_PREFIX + 'unknown_flag_for_testing'
> LIST_TESTS_FLAG = FLAG_PREFIX + 'list_tests'
> INCORRECT_FLAG_VARIANTS = [re.sub('^--', '-', LIST_TESTS_FLAG),
>@@ -72,7 +71,8 @@ HELP_REGEX = re.compile(
> FLAG_PREFIX + r'print_time.*' +
> FLAG_PREFIX + r'output=.*' +
> FLAG_PREFIX + r'break_on_failure.*' +
>- FLAG_PREFIX + r'throw_on_failure.*',
>+ FLAG_PREFIX + r'throw_on_failure.*' +
>+ FLAG_PREFIX + r'catch_exceptions=0.*',
> re.DOTALL)
> 
> 
>@@ -109,10 +109,11 @@ class GTestHelpTest(gtest_test_utils.TestCase):
> exit_code, output = RunWithFlag(flag)
> self.assertEquals(0, exit_code)
> self.assert_(HELP_REGEX.search(output), output)
>- if IS_WINDOWS:
>- self.assert_(CATCH_EXCEPTIONS_FLAG in output, output)
>+
>+ if IS_LINUX:
>+ self.assert_(STREAM_RESULT_TO_FLAG in output, output)
> else:
>- self.assert_(CATCH_EXCEPTIONS_FLAG not in output, output)
>+ self.assert_(STREAM_RESULT_TO_FLAG not in output, output)
> 
> if SUPPORTS_DEATH_TESTS and not IS_WINDOWS:
> self.assert_(DEATH_TEST_STYLE_FLAG in output, output)
>diff --git a/Source/ThirdParty/gtest/test/gtest_help_test_.cc b/Source/ThirdParty/gtest/test/gtest_help_test_.cc
>index aad0d72d767535e1b7a722247754301033e7106f..750ae6ce95fcbcb338ed5db2b588f15cdd5c2f9e 100644
>--- a/Source/ThirdParty/gtest/test/gtest_help_test_.cc
>+++ b/Source/ThirdParty/gtest/test/gtest_help_test_.cc
>@@ -26,13 +26,12 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>+
> 
> // This program is meant to be run by gtest_help_test.py. Do not run
> // it directly.
> 
>-#include <gtest/gtest.h>
>+#include "gtest/gtest.h"
> 
> // When a help flag is specified, this program should skip the tests
> // and exit with 0; otherwise the following test will be executed,
>diff --git a/Source/ThirdParty/gtest/test/gtest_json_test_utils.py b/Source/ThirdParty/gtest/test/gtest_json_test_utils.py
>new file mode 100644
>index 0000000000000000000000000000000000000000..62bbfc288f82b387cd83446c0a05ba167b1aa754
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/gtest_json_test_utils.py
>@@ -0,0 +1,60 @@
>+# Copyright 2018, Google Inc.
>+# All rights reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+"""Unit test utilities for gtest_json_output."""
>+
>+import re
>+
>+
>+def normalize(obj):
>+ """Normalize output object.
>+
>+ Args:
>+ obj: Google Test's JSON output object to normalize.
>+
>+ Returns:
>+ Normalized output without any references to transient information that may
>+ change from run to run.
>+ """
>+ def _normalize(key, value):
>+ if key == 'time':
>+ return re.sub(r'^\d+(\.\d+)?s$', '*', value)
>+ elif key == 'timestamp':
>+ return re.sub(r'^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\dZ$', '*', value)
>+ elif key == 'failure':
>+ value = re.sub(r'^.*[/\\](.*:)\d+\n', '\\1*\n', value)
>+ return re.sub(r'Stack trace:\n(.|\n)*', 'Stack trace:\n*', value)
>+ else:
>+ return normalize(value)
>+ if isinstance(obj, dict):
>+ return {k: _normalize(k, v) for k, v in obj.items()}
>+ if isinstance(obj, list):
>+ return [normalize(x) for x in obj]
>+ else:
>+ return obj
>diff --git a/Source/ThirdParty/gtest/test/gtest_list_output_unittest.py b/Source/ThirdParty/gtest/test/gtest_list_output_unittest.py
>new file mode 100644
>index 0000000000000000000000000000000000000000..3bba7ea2cfd37cad5509f40f8e8b0022706be784
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/gtest_list_output_unittest.py
>@@ -0,0 +1,141 @@
>+#!/usr/bin/env python
>+#
>+# Copyright 2006, Google Inc.
>+# All rights reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+"""Unit test for Google Test's --gtest_list_tests flag.
>+
>+A user can ask Google Test to list all tests by specifying the
>+--gtest_list_tests flag. If output is requested, via --gtest_output=xml
>+or --gtest_output=json, the tests are listed, with extra information in the
>+output file.
>+This script tests such functionality by invoking gtest_list_output_unittest_
>+ (a program written with Google Test) the command line flags.
>+"""
>+
>+import os
>+import re
>+import gtest_test_utils
>+
>+GTEST_LIST_TESTS_FLAG = '--gtest_list_tests'
>+GTEST_OUTPUT_FLAG = '--gtest_output'
>+
>+EXPECTED_XML = """<\?xml version="1.0" encoding="UTF-8"\?>
>+<testsuites tests="2" name="AllTests">
>+ <testsuite name="FooTest" tests="2">
>+ <testcase name="Test1" file=".*gtest_list_output_unittest_.cc" line="43" />
>+ <testcase name="Test2" file=".*gtest_list_output_unittest_.cc" line="45" />
>+ </testsuite>
>+</testsuites>
>+"""
>+
>+EXPECTED_JSON = """{
>+ "tests": 2,
>+ "name": "AllTests",
>+ "testsuites": \[
>+ {
>+ "name": "FooTest",
>+ "tests": 2,
>+ "testsuite": \[
>+ {
>+ "name": "Test1",
>+ "file": ".*gtest_list_output_unittest_.cc",
>+ "line": 43
>+ },
>+ {
>+ "name": "Test2",
>+ "file": ".*gtest_list_output_unittest_.cc",
>+ "line": 45
>+ }
>+ \]
>+ }
>+ \]
>+}
>+"""
>+
>+
>+class GTestListTestsOutputUnitTest(gtest_test_utils.TestCase):
>+ """Unit test for Google Test's list tests with output to file functionality.
>+ """
>+
>+ def testXml(self):
>+ """Verifies XML output for listing tests in a Google Test binary.
>+
>+ Runs a test program that generates an empty XML output, and
>+ tests that the XML output is expected.
>+ """
>+ self._TestOutput('xml', EXPECTED_XML)
>+
>+ def testJSON(self):
>+ """Verifies XML output for listing tests in a Google Test binary.
>+
>+ Runs a test program that generates an empty XML output, and
>+ tests that the XML output is expected.
>+ """
>+ self._TestOutput('json', EXPECTED_JSON)
>+
>+ def _GetOutput(self, out_format):
>+ file_path = os.path.join(gtest_test_utils.GetTempDir(),
>+ 'test_out.' + out_format)
>+ gtest_prog_path = gtest_test_utils.GetTestExecutablePath(
>+ 'gtest_list_output_unittest_')
>+
>+ command = ([
>+ gtest_prog_path,
>+ '%s=%s:%s' % (GTEST_OUTPUT_FLAG, out_format, file_path),
>+ '--gtest_list_tests'
>+ ])
>+ environ_copy = os.environ.copy()
>+ p = gtest_test_utils.Subprocess(
>+ command, env=environ_copy, working_dir=gtest_test_utils.GetTempDir())
>+
>+ self.assert_(p.exited)
>+ self.assertEquals(0, p.exit_code)
>+ with open(file_path) as f:
>+ result = f.read()
>+ return result
>+
>+ def _TestOutput(self, test_format, expected_output):
>+ actual = self._GetOutput(test_format)
>+ actual_lines = actual.splitlines()
>+ expected_lines = expected_output.splitlines()
>+ line_count = 0
>+ for actual_line in actual_lines:
>+ expected_line = expected_lines[line_count]
>+ expected_line_re = re.compile(expected_line.strip())
>+ self.assert_(
>+ expected_line_re.match(actual_line.strip()),
>+ ('actual output of "%s",\n'
>+ 'which does not match expected regex of "%s"\n'
>+ 'on line %d' % (actual, expected_output, line_count)))
>+ line_count = line_count + 1
>+
>+
>+if __name__ == '__main__':
>+ os.environ['GTEST_STACK_TRACE_DEPTH'] = '1'
>+ gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/gtest_list_output_unittest_.cc b/Source/ThirdParty/gtest/test/gtest_list_output_unittest_.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..b1c7b4de3461fc1645f411b71f9e37f8224fd8a6
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/gtest_list_output_unittest_.cc
>@@ -0,0 +1,51 @@
>+// Copyright 2018, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+//
>+// Author: david.schuldenfrei@gmail.com (David Schuldenfrei)
>+
>+// Unit test for Google Test's --gtest_list_tests and --gtest_output flag.
>+//
>+// A user can ask Google Test to list all tests that will run,
>+// and have the output saved in a Json/Xml file.
>+// The tests will not be run after listing.
>+//
>+// This program will be invoked from a Python unit test.
>+// Don't run it directly.
>+
>+#include "gtest/gtest.h"
>+
>+TEST(FooTest, Test1) {}
>+
>+TEST(FooTest, Test2) {}
>+
>+int main(int argc, char **argv) {
>+ ::testing::InitGoogleTest(&argc, argv);
>+
>+ return RUN_ALL_TESTS();
>+}
>diff --git a/Source/ThirdParty/gtest/test/gtest_list_tests_unittest.py b/Source/ThirdParty/gtest/test/gtest_list_tests_unittest.py
>deleted file mode 100755
>index ce8c3ef05f6600e87214a6d401628ed923a152da..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_list_tests_unittest.py
>+++ /dev/null
>@@ -1,177 +0,0 @@
>-#!/usr/bin/env python
>-#
>-# Copyright 2006, Google Inc.
>-# All rights reserved.
>-#
>-# Redistribution and use in source and binary forms, with or without
>-# modification, are permitted provided that the following conditions are
>-# met:
>-#
>-# * Redistributions of source code must retain the above copyright
>-# notice, this list of conditions and the following disclaimer.
>-# * Redistributions in binary form must reproduce the above
>-# copyright notice, this list of conditions and the following disclaimer
>-# in the documentation and/or other materials provided with the
>-# distribution.
>-# * Neither the name of Google Inc. nor the names of its
>-# contributors may be used to endorse or promote products derived from
>-# this software without specific prior written permission.
>-#
>-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-
>-"""Unit test for Google Test's --gtest_list_tests flag.
>-
>-A user can ask Google Test to list all tests by specifying the
>---gtest_list_tests flag. This script tests such functionality
>-by invoking gtest_list_tests_unittest_ (a program written with
>-Google Test) the command line flags.
>-"""
>-
>-__author__ = 'phanna@google.com (Patrick Hanna)'
>-
>-import gtest_test_utils
>-
>-
>-# Constants.
>-
>-# The command line flag for enabling/disabling listing all tests.
>-LIST_TESTS_FLAG = 'gtest_list_tests'
>-
>-# Path to the gtest_list_tests_unittest_ program.
>-EXE_PATH = gtest_test_utils.GetTestExecutablePath('gtest_list_tests_unittest_')
>-
>-# The expected output when running gtest_list_tests_unittest_ with
>-# --gtest_list_tests
>-EXPECTED_OUTPUT_NO_FILTER = """FooDeathTest.
>- Test1
>-Foo.
>- Bar1
>- Bar2
>- DISABLED_Bar3
>-Abc.
>- Xyz
>- Def
>-FooBar.
>- Baz
>-FooTest.
>- Test1
>- DISABLED_Test2
>- Test3
>-"""
>-
>-# The expected output when running gtest_list_tests_unittest_ with
>-# --gtest_list_tests and --gtest_filter=Foo*.
>-EXPECTED_OUTPUT_FILTER_FOO = """FooDeathTest.
>- Test1
>-Foo.
>- Bar1
>- Bar2
>- DISABLED_Bar3
>-FooBar.
>- Baz
>-FooTest.
>- Test1
>- DISABLED_Test2
>- Test3
>-"""
>-
>-# Utilities.
>-
>-
>-def Run(args):
>- """Runs gtest_list_tests_unittest_ and returns the list of tests printed."""
>-
>- return gtest_test_utils.Subprocess([EXE_PATH] + args,
>- capture_stderr=False).output
>-
>-
>-# The unit test.
>-
>-class GTestListTestsUnitTest(gtest_test_utils.TestCase):
>- """Tests using the --gtest_list_tests flag to list all tests."""
>-
>- def RunAndVerify(self, flag_value, expected_output, other_flag):
>- """Runs gtest_list_tests_unittest_ and verifies that it prints
>- the correct tests.
>-
>- Args:
>- flag_value: value of the --gtest_list_tests flag;
>- None if the flag should not be present.
>-
>- expected_output: the expected output after running command;
>-
>- other_flag: a different flag to be passed to command
>- along with gtest_list_tests;
>- None if the flag should not be present.
>- """
>-
>- if flag_value is None:
>- flag = ''
>- flag_expression = 'not set'
>- elif flag_value == '0':
>- flag = '--%s=0' % LIST_TESTS_FLAG
>- flag_expression = '0'
>- else:
>- flag = '--%s' % LIST_TESTS_FLAG
>- flag_expression = '1'
>-
>- args = [flag]
>-
>- if other_flag is not None:
>- args += [other_flag]
>-
>- output = Run(args)
>-
>- msg = ('when %s is %s, the output of "%s" is "%s".' %
>- (LIST_TESTS_FLAG, flag_expression, ' '.join(args), output))
>-
>- if expected_output is not None:
>- self.assert_(output == expected_output, msg)
>- else:
>- self.assert_(output != EXPECTED_OUTPUT_NO_FILTER, msg)
>-
>- def testDefaultBehavior(self):
>- """Tests the behavior of the default mode."""
>-
>- self.RunAndVerify(flag_value=None,
>- expected_output=None,
>- other_flag=None)
>-
>- def testFlag(self):
>- """Tests using the --gtest_list_tests flag."""
>-
>- self.RunAndVerify(flag_value='0',
>- expected_output=None,
>- other_flag=None)
>- self.RunAndVerify(flag_value='1',
>- expected_output=EXPECTED_OUTPUT_NO_FILTER,
>- other_flag=None)
>-
>- def testOverrideNonFilterFlags(self):
>- """Tests that --gtest_list_tests overrides the non-filter flags."""
>-
>- self.RunAndVerify(flag_value='1',
>- expected_output=EXPECTED_OUTPUT_NO_FILTER,
>- other_flag='--gtest_break_on_failure')
>-
>- def testWithFilterFlags(self):
>- """Tests that --gtest_list_tests takes into account the
>- --gtest_filter flag."""
>-
>- self.RunAndVerify(flag_value='1',
>- expected_output=EXPECTED_OUTPUT_FILTER_FOO,
>- other_flag='--gtest_filter=Foo*')
>-
>-
>-if __name__ == '__main__':
>- gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/gtest_list_tests_unittest_.cc b/Source/ThirdParty/gtest/test/gtest_list_tests_unittest_.cc
>deleted file mode 100644
>index a0ed0825b5d889692301c5a4d4f0eb75babc5bc8..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_list_tests_unittest_.cc
>+++ /dev/null
>@@ -1,85 +0,0 @@
>-// Copyright 2006, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: phanna@google.com (Patrick Hanna)
>-
>-// Unit test for Google Test's --gtest_list_tests flag.
>-//
>-// A user can ask Google Test to list all tests that will run
>-// so that when using a filter, a user will know what
>-// tests to look for. The tests will not be run after listing.
>-//
>-// This program will be invoked from a Python unit test.
>-// Don't run it directly.
>-
>-#include <gtest/gtest.h>
>-
>-namespace {
>-
>-// Several different test cases and tests that will be listed.
>-TEST(Foo, Bar1) {
>-}
>-
>-TEST(Foo, Bar2) {
>-}
>-
>-TEST(Foo, DISABLED_Bar3) {
>-}
>-
>-TEST(Abc, Xyz) {
>-}
>-
>-TEST(Abc, Def) {
>-}
>-
>-TEST(FooBar, Baz) {
>-}
>-
>-class FooTest : public testing::Test {
>-};
>-
>-TEST_F(FooTest, Test1) {
>-}
>-
>-TEST_F(FooTest, DISABLED_Test2) {
>-}
>-
>-TEST_F(FooTest, Test3) {
>-}
>-
>-TEST(FooDeathTest, Test1) {
>-}
>-
>-} // namespace
>-
>-int main(int argc, char **argv) {
>- ::testing::InitGoogleTest(&argc, argv);
>-
>- return RUN_ALL_TESTS();
>-}
>diff --git a/Source/ThirdParty/gtest/test/gtest_main_unittest.cc b/Source/ThirdParty/gtest/test/gtest_main_unittest.cc
>index 7a3f0adfadf6d7e5c195b31944714d5ac41bb8e3..eddedeabe8f3bb083dabca600e72f451b8d94cdb 100644
>--- a/Source/ThirdParty/gtest/test/gtest_main_unittest.cc
>+++ b/Source/ThirdParty/gtest/test/gtest_main_unittest.cc
>@@ -26,10 +26,9 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
> 
>-#include <gtest/gtest.h>
>+
>+#include "gtest/gtest.h"
> 
> // Tests that we don't have to define main() when we link to
> // gtest_main instead of gtest.
>@@ -41,5 +40,5 @@ TEST(GTestMainTest, ShouldSucceed) {
> 
> } // namespace
> 
>-// We are using the main() function defined in src/gtest_main.cc, so
>-// we don't define it here.
>+// We are using the main() function defined in gtest_main.cc, so we
>+// don't define it here.
>diff --git a/Source/ThirdParty/gtest/test/gtest_nc.cc b/Source/ThirdParty/gtest/test/gtest_nc.cc
>deleted file mode 100644
>index 73b5db6d418309a47a23dff180053b75d320124f..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_nc.cc
>+++ /dev/null
>@@ -1,234 +0,0 @@
>-// Copyright 2007, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>-
>-// This file is the input to a negative-compilation test for Google
>-// Test. Code here is NOT supposed to compile. Its purpose is to
>-// verify that certain incorrect usages of the Google Test API are
>-// indeed rejected by the compiler.
>-//
>-// We still need to write the negative-compilation test itself, which
>-// will be tightly coupled with the build environment.
>-//
>-// TODO(wan@google.com): finish the negative-compilation test.
>-
>-#ifdef TEST_CANNOT_IGNORE_RUN_ALL_TESTS_RESULT
>-// Tests that the result of RUN_ALL_TESTS() cannot be ignored.
>-
>-#include <gtest/gtest.h>
>-
>-int main(int argc, char** argv) {
>- testing::InitGoogleTest(&argc, argv);
>- RUN_ALL_TESTS(); // This line shouldn't compile.
>-}
>-
>-#elif defined(TEST_USER_CANNOT_INCLUDE_GTEST_INTERNAL_INL_H)
>-// Tests that a user cannot include gtest-internal-inl.h in his code.
>-
>-#include "src/gtest-internal-inl.h"
>-
>-#elif defined(TEST_CATCHES_DECLARING_SETUP_IN_TEST_FIXTURE_WITH_TYPO)
>-// Tests that the compiler catches the typo when a user declares a
>-// Setup() method in a test fixture.
>-
>-#include <gtest/gtest.h>
>-
>-class MyTest : public testing::Test {
>- protected:
>- void Setup() {}
>-};
>-
>-#elif defined(TEST_CATCHES_CALLING_SETUP_IN_TEST_WITH_TYPO)
>-// Tests that the compiler catches the typo when a user calls Setup()
>-// from a test fixture.
>-
>-#include <gtest/gtest.h>
>-
>-class MyTest : public testing::Test {
>- protected:
>- virtual void SetUp() {
>- testing::Test::Setup(); // Tries to call SetUp() in the parent class.
>- }
>-};
>-
>-#elif defined(TEST_CATCHES_DECLARING_SETUP_IN_ENVIRONMENT_WITH_TYPO)
>-// Tests that the compiler catches the typo when a user declares a
>-// Setup() method in a subclass of Environment.
>-
>-#include <gtest/gtest.h>
>-
>-class MyEnvironment : public testing::Environment {
>- public:
>- void Setup() {}
>-};
>-
>-#elif defined(TEST_CATCHES_CALLING_SETUP_IN_ENVIRONMENT_WITH_TYPO)
>-// Tests that the compiler catches the typo when a user calls Setup()
>-// in an Environment.
>-
>-#include <gtest/gtest.h>
>-
>-class MyEnvironment : public testing::Environment {
>- protected:
>- virtual void SetUp() {
>- // Tries to call SetUp() in the parent class.
>- testing::Environment::Setup();
>- }
>-};
>-
>-#elif defined(TEST_CATCHES_WRONG_CASE_IN_TYPED_TEST_P)
>-// Tests that the compiler catches using the wrong test case name in
>-// TYPED_TEST_P.
>-
>-#include <gtest/gtest.h>
>-
>-template <typename T>
>-class FooTest : public testing::Test {
>-};
>-
>-template <typename T>
>-class BarTest : public testing::Test {
>-};
>-
>-TYPED_TEST_CASE_P(FooTest);
>-TYPED_TEST_P(BarTest, A) {} // Wrong test case name.
>-REGISTER_TYPED_TEST_CASE_P(FooTest, A);
>-INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, testing::Types<int>);
>-
>-#elif defined(TEST_CATCHES_WRONG_CASE_IN_REGISTER_TYPED_TEST_CASE_P)
>-// Tests that the compiler catches using the wrong test case name in
>-// REGISTER_TYPED_TEST_CASE_P.
>-
>-#include <gtest/gtest.h>
>-
>-template <typename T>
>-class FooTest : public testing::Test {
>-};
>-
>-template <typename T>
>-class BarTest : public testing::Test {
>-};
>-
>-TYPED_TEST_CASE_P(FooTest);
>-TYPED_TEST_P(FooTest, A) {}
>-REGISTER_TYPED_TEST_CASE_P(BarTest, A); // Wrong test case name.
>-INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, testing::Types<int>);
>-
>-#elif defined(TEST_CATCHES_WRONG_CASE_IN_INSTANTIATE_TYPED_TEST_CASE_P)
>-// Tests that the compiler catches using the wrong test case name in
>-// INSTANTIATE_TYPED_TEST_CASE_P.
>-
>-#include <gtest/gtest.h>
>-
>-template <typename T>
>-class FooTest : public testing::Test {
>-};
>-
>-template <typename T>
>-class BarTest : public testing::Test {
>-};
>-
>-TYPED_TEST_CASE_P(FooTest);
>-TYPED_TEST_P(FooTest, A) {}
>-REGISTER_TYPED_TEST_CASE_P(FooTest, A);
>-
>-// Wrong test case name.
>-INSTANTIATE_TYPED_TEST_CASE_P(My, BarTest, testing::Types<int>);
>-
>-#elif defined(TEST_CATCHES_INSTANTIATE_TYPED_TESET_CASE_P_WITH_SAME_NAME_PREFIX)
>-// Tests that the compiler catches instantiating TYPED_TEST_CASE_P
>-// twice with the same name prefix.
>-
>-#include <gtest/gtest.h>
>-
>-template <typename T>
>-class FooTest : public testing::Test {
>-};
>-
>-TYPED_TEST_CASE_P(FooTest);
>-TYPED_TEST_P(FooTest, A) {}
>-REGISTER_TYPED_TEST_CASE_P(FooTest, A);
>-
>-INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, testing::Types<int>);
>-
>-// Wrong name prefix: "My" has been used.
>-INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, testing::Types<double>);
>-
>-#elif defined(TEST_STATIC_ASSERT_TYPE_EQ_IS_NOT_A_TYPE)
>-
>-#include <gtest/gtest.h>
>-
>-// Tests that StaticAssertTypeEq<T1, T2> cannot be used as a type.
>-testing::StaticAssertTypeEq<int, int> dummy;
>-
>-#elif defined(TEST_STATIC_ASSERT_TYPE_EQ_WORKS_IN_NAMESPACE)
>-
>-#include <gtest/gtest.h>
>-
>-// Tests that StaticAssertTypeEq<T1, T2> works in a namespace scope.
>-static bool dummy = testing::StaticAssertTypeEq<int, const int>();
>-
>-#elif defined(TEST_STATIC_ASSERT_TYPE_EQ_WORKS_IN_CLASS)
>-
>-#include <gtest/gtest.h>
>-
>-template <typename T>
>-class Helper {
>- public:
>- // Tests that StaticAssertTypeEq<T1, T2> works in a class.
>- Helper() { testing::StaticAssertTypeEq<int, T>(); }
>-
>- void DoSomething() {}
>-};
>-
>-void Test() {
>- Helper<bool> h;
>- h.DoSomething(); // To avoid the "unused variable" warning.
>-}
>-
>-#elif defined(TEST_STATIC_ASSERT_TYPE_EQ_WORKS_IN_FUNCTION)
>-
>-#include <gtest/gtest.h>
>-
>-void Test() {
>- // Tests that StaticAssertTypeEq<T1, T2> works inside a function.
>- testing::StaticAssertTypeEq<const int, int>();
>-}
>-
>-#else
>-// A sanity test. This should compile.
>-
>-#include <gtest/gtest.h>
>-
>-int main() {
>- return RUN_ALL_TESTS();
>-}
>-
>-#endif
>diff --git a/Source/ThirdParty/gtest/test/gtest_nc_test.py b/Source/ThirdParty/gtest/test/gtest_nc_test.py
>deleted file mode 100755
>index 06ffb3f8038f0a5796e4b6d629d02e80565a2438..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_nc_test.py
>+++ /dev/null
>@@ -1,106 +0,0 @@
>-#!/usr/bin/env python
>-#
>-# Copyright 2007, Google Inc.
>-# All rights reserved.
>-#
>-# Redistribution and use in source and binary forms, with or without
>-# modification, are permitted provided that the following conditions are
>-# met:
>-#
>-# * Redistributions of source code must retain the above copyright
>-# notice, this list of conditions and the following disclaimer.
>-# * Redistributions in binary form must reproduce the above
>-# copyright notice, this list of conditions and the following disclaimer
>-# in the documentation and/or other materials provided with the
>-# distribution.
>-# * Neither the name of Google Inc. nor the names of its
>-# contributors may be used to endorse or promote products derived from
>-# this software without specific prior written permission.
>-#
>-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-
>-"""Negative compilation test for Google Test."""
>-
>-__author__ = 'wan@google.com (Zhanyong Wan)'
>-
>-import os
>-import sys
>-import unittest
>-
>-
>-IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
>-if not IS_LINUX:
>- sys.exit(0) # Negative compilation tests are not supported on Windows & Mac.
>-
>-
>-class GTestNCTest(unittest.TestCase):
>- """Negative compilation test for Google Test."""
>-
>- def testCompilerError(self):
>- """Verifies that erroneous code leads to expected compiler
>- messages."""
>-
>- # Defines a list of test specs, where each element is a tuple
>- # (test name, list of regexes for matching the compiler errors).
>- test_specs = [
>- ('CANNOT_IGNORE_RUN_ALL_TESTS_RESULT',
>- [r'ignoring return value']),
>-
>- ('USER_CANNOT_INCLUDE_GTEST_INTERNAL_INL_H',
>- [r'must not be included except by Google Test itself']),
>-
>- ('CATCHES_DECLARING_SETUP_IN_TEST_FIXTURE_WITH_TYPO',
>- [r'Setup_should_be_spelled_SetUp']),
>-
>- ('CATCHES_CALLING_SETUP_IN_TEST_WITH_TYPO',
>- [r'Setup_should_be_spelled_SetUp']),
>-
>- ('CATCHES_DECLARING_SETUP_IN_ENVIRONMENT_WITH_TYPO',
>- [r'Setup_should_be_spelled_SetUp']),
>-
>- ('CATCHES_CALLING_SETUP_IN_ENVIRONMENT_WITH_TYPO',
>- [r'Setup_should_be_spelled_SetUp']),
>-
>- ('CATCHES_WRONG_CASE_IN_TYPED_TEST_P',
>- [r'BarTest.*was not declared']),
>-
>- ('CATCHES_WRONG_CASE_IN_REGISTER_TYPED_TEST_CASE_P',
>- [r'BarTest.*was not declared']),
>-
>- ('CATCHES_WRONG_CASE_IN_INSTANTIATE_TYPED_TEST_CASE_P',
>- [r'BarTest.*not declared']),
>-
>- ('CATCHES_INSTANTIATE_TYPED_TESET_CASE_P_WITH_SAME_NAME_PREFIX',
>- [r'redefinition of.*My.*FooTest']),
>-
>- ('STATIC_ASSERT_TYPE_EQ_IS_NOT_A_TYPE',
>- [r'StaticAssertTypeEq.* does not name a type']),
>-
>- ('STATIC_ASSERT_TYPE_EQ_WORKS_IN_NAMESPACE',
>- [r'StaticAssertTypeEq.*int.*const int']),
>-
>- ('STATIC_ASSERT_TYPE_EQ_WORKS_IN_CLASS',
>- [r'StaticAssertTypeEq.*int.*bool']),
>-
>- ('STATIC_ASSERT_TYPE_EQ_WORKS_IN_FUNCTION',
>- [r'StaticAssertTypeEq.*const int.*int']),
>-
>- ('SANITY',
>- None)
>- ]
>-
>- # TODO(wan@google.com): verify that the test specs are satisfied.
>-
>-
>-if __name__ == '__main__':
>- unittest.main()
>diff --git a/Source/ThirdParty/gtest/test/gtest_no_test_unittest.cc b/Source/ThirdParty/gtest/test/gtest_no_test_unittest.cc
>index afe2dc0c92fe43ae935b22cef3177e5184b7ffa1..d4f88dbfdfa68e6a0c40bb99fac6e4dbccff8f3b 100644
>--- a/Source/ThirdParty/gtest/test/gtest_no_test_unittest.cc
>+++ b/Source/ThirdParty/gtest/test/gtest_no_test_unittest.cc
>@@ -29,26 +29,26 @@
> 
> // Tests that a Google Test program that has no test defined can run
> // successfully.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>-
>-#include <gtest/gtest.h>
> 
>+#include "gtest/gtest.h"
> 
> int main(int argc, char **argv) {
> testing::InitGoogleTest(&argc, argv);
> 
> // An ad-hoc assertion outside of all tests.
> //
>- // This serves two purposes:
>+ // This serves three purposes:
> //
> // 1. It verifies that an ad-hoc assertion can be executed even if
> // no test is defined.
>- // 2. We had a bug where the XML output won't be generated if an
>+ // 2. It verifies that a failed ad-hoc assertion causes the test
>+ // program to fail.
>+ // 3. We had a bug where the XML output won't be generated if an
> // assertion is executed before RUN_ALL_TESTS() is called, even
> // though --gtest_output=xml is specified. This makes sure the
> // bug is fixed and doesn't regress.
>- EXPECT_EQ(1, 1);
>+ EXPECT_EQ(1, 2);
> 
>- return RUN_ALL_TESTS();
>+ // The above EXPECT_EQ() should cause RUN_ALL_TESTS() to return non-zero.
>+ return RUN_ALL_TESTS() ? 0 : 1;
> }
>diff --git a/Source/ThirdParty/gtest/test/gtest_output_test.py b/Source/ThirdParty/gtest/test/gtest_output_test.py
>deleted file mode 100755
>index 192030a2020bfd41e94c4e4914caba38db74f2fb..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_output_test.py
>+++ /dev/null
>@@ -1,327 +0,0 @@
>-#!/usr/bin/env python
>-#
>-# Copyright 2008, Google Inc.
>-# All rights reserved.
>-#
>-# Redistribution and use in source and binary forms, with or without
>-# modification, are permitted provided that the following conditions are
>-# met:
>-#
>-# * Redistributions of source code must retain the above copyright
>-# notice, this list of conditions and the following disclaimer.
>-# * Redistributions in binary form must reproduce the above
>-# copyright notice, this list of conditions and the following disclaimer
>-# in the documentation and/or other materials provided with the
>-# distribution.
>-# * Neither the name of Google Inc. nor the names of its
>-# contributors may be used to endorse or promote products derived from
>-# this software without specific prior written permission.
>-#
>-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-
>-"""Tests the text output of Google C++ Testing Framework.
>-
>-SYNOPSIS
>- gtest_output_test.py --gtest_build_dir=BUILD/DIR --gengolden
>- # where BUILD/DIR contains the built gtest_output_test_ file.
>- gtest_output_test.py --gengolden
>- gtest_output_test.py
>-"""
>-
>-__author__ = 'wan@google.com (Zhanyong Wan)'
>-
>-import os
>-import re
>-import sys
>-import gtest_test_utils
>-
>-
>-# The flag for generating the golden file
>-GENGOLDEN_FLAG = '--gengolden'
>-CATCH_EXCEPTIONS_ENV_VAR_NAME = 'GTEST_CATCH_EXCEPTIONS'
>-
>-IS_WINDOWS = os.name == 'nt'
>-
>-if IS_WINDOWS:
>- GOLDEN_NAME = 'gtest_output_test_golden_win.txt'
>-else:
>- GOLDEN_NAME = 'gtest_output_test_golden_lin.txt'
>-
>-PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath('gtest_output_test_')
>-
>-# At least one command we exercise must not have the
>-# --gtest_internal_skip_environment_and_ad_hoc_tests flag.
>-COMMAND_LIST_TESTS = ({}, [PROGRAM_PATH, '--gtest_list_tests'])
>-COMMAND_WITH_COLOR = ({}, [PROGRAM_PATH, '--gtest_color=yes'])
>-COMMAND_WITH_TIME = ({}, [PROGRAM_PATH,
>- '--gtest_print_time',
>- '--gtest_internal_skip_environment_and_ad_hoc_tests',
>- '--gtest_filter=FatalFailureTest.*:LoggingTest.*'])
>-COMMAND_WITH_DISABLED = (
>- {}, [PROGRAM_PATH,
>- '--gtest_also_run_disabled_tests',
>- '--gtest_internal_skip_environment_and_ad_hoc_tests',
>- '--gtest_filter=*DISABLED_*'])
>-COMMAND_WITH_SHARDING = (
>- {'GTEST_SHARD_INDEX': '1', 'GTEST_TOTAL_SHARDS': '2'},
>- [PROGRAM_PATH,
>- '--gtest_internal_skip_environment_and_ad_hoc_tests',
>- '--gtest_filter=PassingTest.*'])
>-
>-GOLDEN_PATH = os.path.join(gtest_test_utils.GetSourceDir(), GOLDEN_NAME)
>-
>-
>-def ToUnixLineEnding(s):
>- """Changes all Windows/Mac line endings in s to UNIX line endings."""
>-
>- return s.replace('\r\n', '\n').replace('\r', '\n')
>-
>-
>-def RemoveLocations(test_output):
>- """Removes all file location info from a Google Test program's output.
>-
>- Args:
>- test_output: the output of a Google Test program.
>-
>- Returns:
>- output with all file location info (in the form of
>- 'DIRECTORY/FILE_NAME:LINE_NUMBER: 'or
>- 'DIRECTORY\\FILE_NAME(LINE_NUMBER): ') replaced by
>- 'FILE_NAME:#: '.
>- """
>-
>- return re.sub(r'.*[/\\](.+)(\:\d+|$\d+$)\: ', r'\1:#: ', test_output)
>-
>-
>-def RemoveStackTraceDetails(output):
>- """Removes all stack traces from a Google Test program's output."""
>-
>- # *? means "find the shortest string that matches".
>- return re.sub(r'Stack trace:(.|\n)*?\n\n',
>- 'Stack trace: (omitted)\n\n', output)
>-
>-
>-def RemoveStackTraces(output):
>- """Removes all traces of stack traces from a Google Test program's output."""
>-
>- # *? means "find the shortest string that matches".
>- return re.sub(r'Stack trace:(.|\n)*?\n\n', '', output)
>-
>-
>-def RemoveTime(output):
>- """Removes all time information from a Google Test program's output."""
>-
>- return re.sub(r'\(\d+ ms', '(? ms', output)
>-
>-
>-def RemoveTypeInfoDetails(test_output):
>- """Removes compiler-specific type info from Google Test program's output.
>-
>- Args:
>- test_output: the output of a Google Test program.
>-
>- Returns:
>- output with type information normalized to canonical form.
>- """
>-
>- # some compilers output the name of type 'unsigned int' as 'unsigned'
>- return re.sub(r'unsigned int', 'unsigned', test_output)
>-
>-
>-def RemoveTestCounts(output):
>- """Removes test counts from a Google Test program's output."""
>-
>- output = re.sub(r'\d+ tests?, listed below',
>- '? tests, listed below', output)
>- output = re.sub(r'\d+ FAILED TESTS',
>- '? FAILED TESTS', output)
>- output = re.sub(r'\d+ tests? from \d+ test cases?',
>- '? tests from ? test cases', output)
>- output = re.sub(r'\d+ tests? from ([a-zA-Z_])',
>- r'? tests from \1', output)
>- return re.sub(r'\d+ tests?\.', '? tests.', output)
>-
>-
>-def RemoveMatchingTests(test_output, pattern):
>- """Removes output of specified tests from a Google Test program's output.
>-
>- This function strips not only the beginning and the end of a test but also
>- all output in between.
>-
>- Args:
>- test_output: A string containing the test output.
>- pattern: A regex string that matches names of test cases or
>- tests to remove.
>-
>- Returns:
>- Contents of test_output with tests whose names match pattern removed.
>- """
>-
>- test_output = re.sub(
>- r'.*\[ RUN \] .*%s(.|\n)*?\[( FAILED | OK )\] .*%s.*\n' % (
>- pattern, pattern),
>- '',
>- test_output)
>- return re.sub(r'.*%s.*\n' % pattern, '', test_output)
>-
>-
>-def NormalizeOutput(output):
>- """Normalizes output (the output of gtest_output_test_.exe)."""
>-
>- output = ToUnixLineEnding(output)
>- output = RemoveLocations(output)
>- output = RemoveStackTraceDetails(output)
>- output = RemoveTime(output)
>- return output
>-
>-
>-def GetShellCommandOutput(env_cmd):
>- """Runs a command in a sub-process, and returns its output in a string.
>-
>- Args:
>- env_cmd: The shell command. A 2-tuple where element 0 is a dict of extra
>- environment variables to set, and element 1 is a string with
>- the command and any flags.
>-
>- Returns:
>- A string with the command's combined standard and diagnostic output.
>- """
>-
>- # Spawns cmd in a sub-process, and gets its standard I/O file objects.
>- # Set and save the environment properly.
>- environ = os.environ.copy()
>- environ.update(env_cmd[0])
>- p = gtest_test_utils.Subprocess(env_cmd[1], env=environ)
>-
>- return p.output
>-
>-
>-def GetCommandOutput(env_cmd):
>- """Runs a command and returns its output with all file location
>- info stripped off.
>-
>- Args:
>- env_cmd: The shell command. A 2-tuple where element 0 is a dict of extra
>- environment variables to set, and element 1 is a string with
>- the command and any flags.
>- """
>-
>- # Disables exception pop-ups on Windows.
>- environ, cmdline = env_cmd
>- environ = dict(environ) # Ensures we are modifying a copy.
>- environ[CATCH_EXCEPTIONS_ENV_VAR_NAME] = '1'
>- return NormalizeOutput(GetShellCommandOutput((environ, cmdline)))
>-
>-
>-def GetOutputOfAllCommands():
>- """Returns concatenated output from several representative commands."""
>-
>- return (GetCommandOutput(COMMAND_WITH_COLOR) +
>- GetCommandOutput(COMMAND_WITH_TIME) +
>- GetCommandOutput(COMMAND_WITH_DISABLED) +
>- GetCommandOutput(COMMAND_WITH_SHARDING))
>-
>-
>-test_list = GetShellCommandOutput(COMMAND_LIST_TESTS)
>-SUPPORTS_DEATH_TESTS = 'DeathTest' in test_list
>-SUPPORTS_TYPED_TESTS = 'TypedTest' in test_list
>-SUPPORTS_THREADS = 'ExpectFailureWithThreadsTest' in test_list
>-SUPPORTS_STACK_TRACES = False
>-
>-CAN_GENERATE_GOLDEN_FILE = (SUPPORTS_DEATH_TESTS and
>- SUPPORTS_TYPED_TESTS and
>- SUPPORTS_THREADS)
>-
>-
>-class GTestOutputTest(gtest_test_utils.TestCase):
>- def RemoveUnsupportedTests(self, test_output):
>- if not SUPPORTS_DEATH_TESTS:
>- test_output = RemoveMatchingTests(test_output, 'DeathTest')
>- if not SUPPORTS_TYPED_TESTS:
>- test_output = RemoveMatchingTests(test_output, 'TypedTest')
>- test_output = RemoveMatchingTests(test_output, 'TypedDeathTest')
>- test_output = RemoveMatchingTests(test_output, 'TypeParamDeathTest')
>- if not SUPPORTS_THREADS:
>- test_output = RemoveMatchingTests(test_output,
>- 'ExpectFailureWithThreadsTest')
>- test_output = RemoveMatchingTests(test_output,
>- 'ScopedFakeTestPartResultReporterTest')
>- test_output = RemoveMatchingTests(test_output,
>- 'WorksConcurrently')
>- if not SUPPORTS_STACK_TRACES:
>- test_output = RemoveStackTraces(test_output)
>-
>- return test_output
>-
>- def testOutput(self):
>- output = GetOutputOfAllCommands()
>-
>- golden_file = open(GOLDEN_PATH, 'rb')
>- # A mis-configured source control system can cause \r appear in EOL
>- # sequences when we read the golden file irrespective of an operating
>- # system used. Therefore, we need to strip those \r's from newlines
>- # unconditionally.
>- golden = ToUnixLineEnding(golden_file.read())
>- golden_file.close()
>-
>- # We want the test to pass regardless of certain features being
>- # supported or not.
>-
>- # We still have to remove type name specifics in all cases.
>- normalized_actual = RemoveTypeInfoDetails(output)
>- normalized_golden = RemoveTypeInfoDetails(golden)
>-
>- if CAN_GENERATE_GOLDEN_FILE:
>- self.assertEqual(normalized_golden, normalized_actual)
>- else:
>- normalized_actual = RemoveTestCounts(normalized_actual)
>- normalized_golden = RemoveTestCounts(self.RemoveUnsupportedTests(
>- normalized_golden))
>-
>- # This code is very handy when debugging golden file differences:
>- if os.getenv('DEBUG_GTEST_OUTPUT_TEST'):
>- open(os.path.join(
>- gtest_test_utils.GetSourceDir(),
>- '_gtest_output_test_normalized_actual.txt'), 'wb').write(
>- normalized_actual)
>- open(os.path.join(
>- gtest_test_utils.GetSourceDir(),
>- '_gtest_output_test_normalized_golden.txt'), 'wb').write(
>- normalized_golden)
>-
>- self.assertEqual(normalized_golden, normalized_actual)
>-
>-
>-if __name__ == '__main__':
>- if sys.argv[1:] == [GENGOLDEN_FLAG]:
>- if CAN_GENERATE_GOLDEN_FILE:
>- output = GetOutputOfAllCommands()
>- golden_file = open(GOLDEN_PATH, 'wb')
>- golden_file.write(output)
>- golden_file.close()
>- else:
>- message = (
>- """Unable to write a golden file when compiled in an environment
>-that does not support all the required features (death tests""")
>- if IS_WINDOWS:
>- message += (
>- """\nand typed tests). Please check that you are using VC++ 8.0 SP1
>-or higher as your compiler.""")
>- else:
>- message += """\ntyped tests, and threads). Please generate the
>-golden file using a binary built with those features enabled."""
>-
>- sys.stderr.write(message)
>- sys.exit(1)
>- else:
>- gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/gtest_output_test_.cc b/Source/ThirdParty/gtest/test/gtest_output_test_.cc
>deleted file mode 100644
>index 273e8e93eb059f5db6937c8c7d77766f87805270..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_output_test_.cc
>+++ /dev/null
>@@ -1,1135 +0,0 @@
>-// Copyright 2005, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// A unit test for Google Test itself. This verifies that the basic
>-// constructs of Google Test work.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>-
>-#include <gtest/gtest-spi.h>
>-#include <gtest/gtest.h>
>-
>-// Indicates that this translation unit is part of Google Test's
>-// implementation. It must come before gtest-internal-inl.h is
>-// included, or there will be a compiler error. This trick is to
>-// prevent a user from accidentally including gtest-internal-inl.h in
>-// his code.
>-#define GTEST_IMPLEMENTATION_ 1
>-#include "src/gtest-internal-inl.h"
>-#undef GTEST_IMPLEMENTATION_
>-
>-#include <stdlib.h>
>-
>-#if GTEST_IS_THREADSAFE
>-using testing::ScopedFakeTestPartResultReporter;
>-using testing::TestPartResultArray;
>-
>-using testing::internal::Notification;
>-using testing::internal::ThreadWithParam;
>-#endif
>-
>-namespace posix = ::testing::internal::posix;
>-using testing::internal::String;
>-using testing::internal::scoped_ptr;
>-
>-// Tests catching fatal failures.
>-
>-// A subroutine used by the following test.
>-void TestEq1(int x) {
>- ASSERT_EQ(1, x);
>-}
>-
>-// This function calls a test subroutine, catches the fatal failure it
>-// generates, and then returns early.
>-void TryTestSubroutine() {
>- // Calls a subrountine that yields a fatal failure.
>- TestEq1(2);
>-
>- // Catches the fatal failure and aborts the test.
>- //
>- // The testing::Test:: prefix is necessary when calling
>- // HasFatalFailure() outside of a TEST, TEST_F, or test fixture.
>- if (testing::Test::HasFatalFailure()) return;
>-
>- // If we get here, something is wrong.
>- FAIL() << "This should never be reached.";
>-}
>-
>-TEST(PassingTest, PassingTest1) {
>-}
>-
>-TEST(PassingTest, PassingTest2) {
>-}
>-
>-// Tests catching a fatal failure in a subroutine.
>-TEST(FatalFailureTest, FatalFailureInSubroutine) {
>- printf("(expecting a failure that x should be 1)\n");
>-
>- TryTestSubroutine();
>-}
>-
>-// Tests catching a fatal failure in a nested subroutine.
>-TEST(FatalFailureTest, FatalFailureInNestedSubroutine) {
>- printf("(expecting a failure that x should be 1)\n");
>-
>- // Calls a subrountine that yields a fatal failure.
>- TryTestSubroutine();
>-
>- // Catches the fatal failure and aborts the test.
>- //
>- // When calling HasFatalFailure() inside a TEST, TEST_F, or test
>- // fixture, the testing::Test:: prefix is not needed.
>- if (HasFatalFailure()) return;
>-
>- // If we get here, something is wrong.
>- FAIL() << "This should never be reached.";
>-}
>-
>-// Tests HasFatalFailure() after a failed EXPECT check.
>-TEST(FatalFailureTest, NonfatalFailureInSubroutine) {
>- printf("(expecting a failure on false)\n");
>- EXPECT_TRUE(false); // Generates a nonfatal failure
>- ASSERT_FALSE(HasFatalFailure()); // This should succeed.
>-}
>-
>-// Tests interleaving user logging and Google Test assertions.
>-TEST(LoggingTest, InterleavingLoggingAndAssertions) {
>- static const int a[4] = {
>- 3, 9, 2, 6
>- };
>-
>- printf("(expecting 2 failures on (3) >= (a[i]))\n");
>- for (int i = 0; i < static_cast<int>(sizeof(a)/sizeof(*a)); i++) {
>- printf("i == %d\n", i);
>- EXPECT_GE(3, a[i]);
>- }
>-}
>-
>-// Tests the SCOPED_TRACE macro.
>-
>-// A helper function for testing SCOPED_TRACE.
>-void SubWithoutTrace(int n) {
>- EXPECT_EQ(1, n);
>- ASSERT_EQ(2, n);
>-}
>-
>-// Another helper function for testing SCOPED_TRACE.
>-void SubWithTrace(int n) {
>- SCOPED_TRACE(testing::Message() << "n = " << n);
>-
>- SubWithoutTrace(n);
>-}
>-
>-// Tests that SCOPED_TRACE() obeys lexical scopes.
>-TEST(SCOPED_TRACETest, ObeysScopes) {
>- printf("(expected to fail)\n");
>-
>- // There should be no trace before SCOPED_TRACE() is invoked.
>- ADD_FAILURE() << "This failure is expected, and shouldn't have a trace.";
>-
>- {
>- SCOPED_TRACE("Expected trace");
>- // After SCOPED_TRACE(), a failure in the current scope should contain
>- // the trace.
>- ADD_FAILURE() << "This failure is expected, and should have a trace.";
>- }
>-
>- // Once the control leaves the scope of the SCOPED_TRACE(), there
>- // should be no trace again.
>- ADD_FAILURE() << "This failure is expected, and shouldn't have a trace.";
>-}
>-
>-// Tests that SCOPED_TRACE works inside a loop.
>-TEST(SCOPED_TRACETest, WorksInLoop) {
>- printf("(expected to fail)\n");
>-
>- for (int i = 1; i <= 2; i++) {
>- SCOPED_TRACE(testing::Message() << "i = " << i);
>-
>- SubWithoutTrace(i);
>- }
>-}
>-
>-// Tests that SCOPED_TRACE works in a subroutine.
>-TEST(SCOPED_TRACETest, WorksInSubroutine) {
>- printf("(expected to fail)\n");
>-
>- SubWithTrace(1);
>- SubWithTrace(2);
>-}
>-
>-// Tests that SCOPED_TRACE can be nested.
>-TEST(SCOPED_TRACETest, CanBeNested) {
>- printf("(expected to fail)\n");
>-
>- SCOPED_TRACE(""); // A trace without a message.
>-
>- SubWithTrace(2);
>-}
>-
>-// Tests that multiple SCOPED_TRACEs can be used in the same scope.
>-TEST(SCOPED_TRACETest, CanBeRepeated) {
>- printf("(expected to fail)\n");
>-
>- SCOPED_TRACE("A");
>- ADD_FAILURE()
>- << "This failure is expected, and should contain trace point A.";
>-
>- SCOPED_TRACE("B");
>- ADD_FAILURE()
>- << "This failure is expected, and should contain trace point A and B.";
>-
>- {
>- SCOPED_TRACE("C");
>- ADD_FAILURE() << "This failure is expected, and should contain "
>- << "trace point A, B, and C.";
>- }
>-
>- SCOPED_TRACE("D");
>- ADD_FAILURE() << "This failure is expected, and should contain "
>- << "trace point A, B, and D.";
>-}
>-
>-#if GTEST_IS_THREADSAFE
>-// Tests that SCOPED_TRACE()s can be used concurrently from multiple
>-// threads. Namely, an assertion should be affected by
>-// SCOPED_TRACE()s in its own thread only.
>-
>-// Here's the sequence of actions that happen in the test:
>-//
>-// Thread A (main) | Thread B (spawned)
>-// ===============================|================================
>-// spawns thread B |
>-// -------------------------------+--------------------------------
>-// waits for n1 | SCOPED_TRACE("Trace B");
>-// | generates failure #1
>-// | notifies n1
>-// -------------------------------+--------------------------------
>-// SCOPED_TRACE("Trace A"); | waits for n2
>-// generates failure #2 |
>-// notifies n2 |
>-// -------------------------------|--------------------------------
>-// waits for n3 | generates failure #3
>-// | trace B dies
>-// | generates failure #4
>-// | notifies n3
>-// -------------------------------|--------------------------------
>-// generates failure #5 | finishes
>-// trace A dies |
>-// generates failure #6 |
>-// -------------------------------|--------------------------------
>-// waits for thread B to finish |
>-
>-struct CheckPoints {
>- Notification n1;
>- Notification n2;
>- Notification n3;
>-};
>-
>-static void ThreadWithScopedTrace(CheckPoints* check_points) {
>- {
>- SCOPED_TRACE("Trace B");
>- ADD_FAILURE()
>- << "Expected failure #1 (in thread B, only trace B alive).";
>- check_points->n1.Notify();
>- check_points->n2.WaitForNotification();
>-
>- ADD_FAILURE()
>- << "Expected failure #3 (in thread B, trace A & B both alive).";
>- } // Trace B dies here.
>- ADD_FAILURE()
>- << "Expected failure #4 (in thread B, only trace A alive).";
>- check_points->n3.Notify();
>-}
>-
>-TEST(SCOPED_TRACETest, WorksConcurrently) {
>- printf("(expecting 6 failures)\n");
>-
>- CheckPoints check_points;
>- ThreadWithParam<CheckPoints*> thread(&ThreadWithScopedTrace,
>- &check_points,
>- NULL);
>- check_points.n1.WaitForNotification();
>-
>- {
>- SCOPED_TRACE("Trace A");
>- ADD_FAILURE()
>- << "Expected failure #2 (in thread A, trace A & B both alive).";
>- check_points.n2.Notify();
>- check_points.n3.WaitForNotification();
>-
>- ADD_FAILURE()
>- << "Expected failure #5 (in thread A, only trace A alive).";
>- } // Trace A dies here.
>- ADD_FAILURE()
>- << "Expected failure #6 (in thread A, no trace alive).";
>- thread.Join();
>-}
>-#endif // GTEST_IS_THREADSAFE
>-
>-TEST(DisabledTestsWarningTest,
>- DISABLED_AlsoRunDisabledTestsFlagSuppressesWarning) {
>- // This test body is intentionally empty. Its sole purpose is for
>- // verifying that the --gtest_also_run_disabled_tests flag
>- // suppresses the "YOU HAVE 12 DISABLED TESTS" warning at the end of
>- // the test output.
>-}
>-
>-// Tests using assertions outside of TEST and TEST_F.
>-//
>-// This function creates two failures intentionally.
>-void AdHocTest() {
>- printf("The non-test part of the code is expected to have 2 failures.\n\n");
>- EXPECT_TRUE(false);
>- EXPECT_EQ(2, 3);
>-}
>-
>-// Runs all TESTs, all TEST_Fs, and the ad hoc test.
>-int RunAllTests() {
>- AdHocTest();
>- return RUN_ALL_TESTS();
>-}
>-
>-// Tests non-fatal failures in the fixture constructor.
>-class NonFatalFailureInFixtureConstructorTest : public testing::Test {
>- protected:
>- NonFatalFailureInFixtureConstructorTest() {
>- printf("(expecting 5 failures)\n");
>- ADD_FAILURE() << "Expected failure #1, in the test fixture c'tor.";
>- }
>-
>- ~NonFatalFailureInFixtureConstructorTest() {
>- ADD_FAILURE() << "Expected failure #5, in the test fixture d'tor.";
>- }
>-
>- virtual void SetUp() {
>- ADD_FAILURE() << "Expected failure #2, in SetUp().";
>- }
>-
>- virtual void TearDown() {
>- ADD_FAILURE() << "Expected failure #4, in TearDown.";
>- }
>-};
>-
>-TEST_F(NonFatalFailureInFixtureConstructorTest, FailureInConstructor) {
>- ADD_FAILURE() << "Expected failure #3, in the test body.";
>-}
>-
>-// Tests fatal failures in the fixture constructor.
>-class FatalFailureInFixtureConstructorTest : public testing::Test {
>- protected:
>- FatalFailureInFixtureConstructorTest() {
>- printf("(expecting 2 failures)\n");
>- Init();
>- }
>-
>- ~FatalFailureInFixtureConstructorTest() {
>- ADD_FAILURE() << "Expected failure #2, in the test fixture d'tor.";
>- }
>-
>- virtual void SetUp() {
>- ADD_FAILURE() << "UNEXPECTED failure in SetUp(). "
>- << "We should never get here, as the test fixture c'tor "
>- << "had a fatal failure.";
>- }
>-
>- virtual void TearDown() {
>- ADD_FAILURE() << "UNEXPECTED failure in TearDown(). "
>- << "We should never get here, as the test fixture c'tor "
>- << "had a fatal failure.";
>- }
>- private:
>- void Init() {
>- FAIL() << "Expected failure #1, in the test fixture c'tor.";
>- }
>-};
>-
>-TEST_F(FatalFailureInFixtureConstructorTest, FailureInConstructor) {
>- ADD_FAILURE() << "UNEXPECTED failure in the test body. "
>- << "We should never get here, as the test fixture c'tor "
>- << "had a fatal failure.";
>-}
>-
>-// Tests non-fatal failures in SetUp().
>-class NonFatalFailureInSetUpTest : public testing::Test {
>- protected:
>- virtual ~NonFatalFailureInSetUpTest() {
>- Deinit();
>- }
>-
>- virtual void SetUp() {
>- printf("(expecting 4 failures)\n");
>- ADD_FAILURE() << "Expected failure #1, in SetUp().";
>- }
>-
>- virtual void TearDown() {
>- FAIL() << "Expected failure #3, in TearDown().";
>- }
>- private:
>- void Deinit() {
>- FAIL() << "Expected failure #4, in the test fixture d'tor.";
>- }
>-};
>-
>-TEST_F(NonFatalFailureInSetUpTest, FailureInSetUp) {
>- FAIL() << "Expected failure #2, in the test function.";
>-}
>-
>-// Tests fatal failures in SetUp().
>-class FatalFailureInSetUpTest : public testing::Test {
>- protected:
>- virtual ~FatalFailureInSetUpTest() {
>- Deinit();
>- }
>-
>- virtual void SetUp() {
>- printf("(expecting 3 failures)\n");
>- FAIL() << "Expected failure #1, in SetUp().";
>- }
>-
>- virtual void TearDown() {
>- FAIL() << "Expected failure #2, in TearDown().";
>- }
>- private:
>- void Deinit() {
>- FAIL() << "Expected failure #3, in the test fixture d'tor.";
>- }
>-};
>-
>-TEST_F(FatalFailureInSetUpTest, FailureInSetUp) {
>- FAIL() << "UNEXPECTED failure in the test function. "
>- << "We should never get here, as SetUp() failed.";
>-}
>-
>-#if GTEST_OS_WINDOWS
>-
>-// This group of tests verifies that Google Test handles SEH and C++
>-// exceptions correctly.
>-
>-// A function that throws an SEH exception.
>-static void ThrowSEH() {
>- int* p = NULL;
>- *p = 0; // Raises an access violation.
>-}
>-
>-// Tests exceptions thrown in the test fixture constructor.
>-class ExceptionInFixtureCtorTest : public testing::Test {
>- protected:
>- ExceptionInFixtureCtorTest() {
>- printf("(expecting a failure on thrown exception "
>- "in the test fixture's constructor)\n");
>-
>- ThrowSEH();
>- }
>-
>- virtual ~ExceptionInFixtureCtorTest() {
>- Deinit();
>- }
>-
>- virtual void SetUp() {
>- FAIL() << "UNEXPECTED failure in SetUp(). "
>- << "We should never get here, as the test fixture c'tor threw.";
>- }
>-
>- virtual void TearDown() {
>- FAIL() << "UNEXPECTED failure in TearDown(). "
>- << "We should never get here, as the test fixture c'tor threw.";
>- }
>- private:
>- void Deinit() {
>- FAIL() << "UNEXPECTED failure in the d'tor. "
>- << "We should never get here, as the test fixture c'tor threw.";
>- }
>-};
>-
>-TEST_F(ExceptionInFixtureCtorTest, ExceptionInFixtureCtor) {
>- FAIL() << "UNEXPECTED failure in the test function. "
>- << "We should never get here, as the test fixture c'tor threw.";
>-}
>-
>-// Tests exceptions thrown in SetUp().
>-class ExceptionInSetUpTest : public testing::Test {
>- protected:
>- virtual ~ExceptionInSetUpTest() {
>- Deinit();
>- }
>-
>- virtual void SetUp() {
>- printf("(expecting 3 failures)\n");
>-
>- ThrowSEH();
>- }
>-
>- virtual void TearDown() {
>- FAIL() << "Expected failure #2, in TearDown().";
>- }
>- private:
>- void Deinit() {
>- FAIL() << "Expected failure #3, in the test fixture d'tor.";
>- }
>-};
>-
>-TEST_F(ExceptionInSetUpTest, ExceptionInSetUp) {
>- FAIL() << "UNEXPECTED failure in the test function. "
>- << "We should never get here, as SetUp() threw.";
>-}
>-
>-// Tests that TearDown() and the test fixture d'tor are always called,
>-// even when the test function throws an exception.
>-class ExceptionInTestFunctionTest : public testing::Test {
>- protected:
>- virtual ~ExceptionInTestFunctionTest() {
>- Deinit();
>- }
>-
>- virtual void TearDown() {
>- FAIL() << "Expected failure #2, in TearDown().";
>- }
>- private:
>- void Deinit() {
>- FAIL() << "Expected failure #3, in the test fixture d'tor.";
>- }
>-};
>-
>-// Tests that the test fixture d'tor is always called, even when the
>-// test function throws an SEH exception.
>-TEST_F(ExceptionInTestFunctionTest, SEH) {
>- printf("(expecting 3 failures)\n");
>-
>- ThrowSEH();
>-}
>-
>-#if GTEST_HAS_EXCEPTIONS
>-
>-// Tests that the test fixture d'tor is always called, even when the
>-// test function throws a C++ exception. We do this only when
>-// GTEST_HAS_EXCEPTIONS is non-zero, i.e. C++ exceptions are enabled.
>-TEST_F(ExceptionInTestFunctionTest, CppException) {
>- throw 1;
>-}
>-
>-// Tests exceptions thrown in TearDown().
>-class ExceptionInTearDownTest : public testing::Test {
>- protected:
>- virtual ~ExceptionInTearDownTest() {
>- Deinit();
>- }
>-
>- virtual void TearDown() {
>- throw 1;
>- }
>- private:
>- void Deinit() {
>- FAIL() << "Expected failure #2, in the test fixture d'tor.";
>- }
>-};
>-
>-TEST_F(ExceptionInTearDownTest, ExceptionInTearDown) {
>- printf("(expecting 2 failures)\n");
>-}
>-
>-#endif // GTEST_HAS_EXCEPTIONS
>-
>-#endif // GTEST_OS_WINDOWS
>-
>-#if GTEST_IS_THREADSAFE
>-
>-// A unary function that may die.
>-void DieIf(bool should_die) {
>- GTEST_CHECK_(!should_die) << " - death inside DieIf().";
>-}
>-
>-// Tests running death tests in a multi-threaded context.
>-
>-// Used for coordination between the main and the spawn thread.
>-struct SpawnThreadNotifications {
>- SpawnThreadNotifications() {}
>-
>- Notification spawn_thread_started;
>- Notification spawn_thread_ok_to_terminate;
>-
>- private:
>- GTEST_DISALLOW_COPY_AND_ASSIGN_(SpawnThreadNotifications);
>-};
>-
>-// The function to be executed in the thread spawn by the
>-// MultipleThreads test (below).
>-static void ThreadRoutine(SpawnThreadNotifications* notifications) {
>- // Signals the main thread that this thread has started.
>- notifications->spawn_thread_started.Notify();
>-
>- // Waits for permission to finish from the main thread.
>- notifications->spawn_thread_ok_to_terminate.WaitForNotification();
>-}
>-
>-// This is a death-test test, but it's not named with a DeathTest
>-// suffix. It starts threads which might interfere with later
>-// death tests, so it must run after all other death tests.
>-class DeathTestAndMultiThreadsTest : public testing::Test {
>- protected:
>- // Starts a thread and waits for it to begin.
>- virtual void SetUp() {
>- thread_.reset(new ThreadWithParam<SpawnThreadNotifications*>(
>- &ThreadRoutine, &notifications_, NULL));
>- notifications_.spawn_thread_started.WaitForNotification();
>- }
>- // Tells the thread to finish, and reaps it.
>- // Depending on the version of the thread library in use,
>- // a manager thread might still be left running that will interfere
>- // with later death tests. This is unfortunate, but this class
>- // cleans up after itself as best it can.
>- virtual void TearDown() {
>- notifications_.spawn_thread_ok_to_terminate.Notify();
>- }
>-
>- private:
>- SpawnThreadNotifications notifications_;
>- scoped_ptr<ThreadWithParam<SpawnThreadNotifications*> > thread_;
>-};
>-
>-#endif // GTEST_IS_THREADSAFE
>-
>-// The MixedUpTestCaseTest test case verifies that Google Test will fail a
>-// test if it uses a different fixture class than what other tests in
>-// the same test case use. It deliberately contains two fixture
>-// classes with the same name but defined in different namespaces.
>-
>-// The MixedUpTestCaseWithSameTestNameTest test case verifies that
>-// when the user defines two tests with the same test case name AND
>-// same test name (but in different namespaces), the second test will
>-// fail.
>-
>-namespace foo {
>-
>-class MixedUpTestCaseTest : public testing::Test {
>-};
>-
>-TEST_F(MixedUpTestCaseTest, FirstTestFromNamespaceFoo) {}
>-TEST_F(MixedUpTestCaseTest, SecondTestFromNamespaceFoo) {}
>-
>-class MixedUpTestCaseWithSameTestNameTest : public testing::Test {
>-};
>-
>-TEST_F(MixedUpTestCaseWithSameTestNameTest,
>- TheSecondTestWithThisNameShouldFail) {}
>-
>-} // namespace foo
>-
>-namespace bar {
>-
>-class MixedUpTestCaseTest : public testing::Test {
>-};
>-
>-// The following two tests are expected to fail. We rely on the
>-// golden file to check that Google Test generates the right error message.
>-TEST_F(MixedUpTestCaseTest, ThisShouldFail) {}
>-TEST_F(MixedUpTestCaseTest, ThisShouldFailToo) {}
>-
>-class MixedUpTestCaseWithSameTestNameTest : public testing::Test {
>-};
>-
>-// Expected to fail. We rely on the golden file to check that Google Test
>-// generates the right error message.
>-TEST_F(MixedUpTestCaseWithSameTestNameTest,
>- TheSecondTestWithThisNameShouldFail) {}
>-
>-} // namespace bar
>-
>-// The following two test cases verify that Google Test catches the user
>-// error of mixing TEST and TEST_F in the same test case. The first
>-// test case checks the scenario where TEST_F appears before TEST, and
>-// the second one checks where TEST appears before TEST_F.
>-
>-class TEST_F_before_TEST_in_same_test_case : public testing::Test {
>-};
>-
>-TEST_F(TEST_F_before_TEST_in_same_test_case, DefinedUsingTEST_F) {}
>-
>-// Expected to fail. We rely on the golden file to check that Google Test
>-// generates the right error message.
>-TEST(TEST_F_before_TEST_in_same_test_case, DefinedUsingTESTAndShouldFail) {}
>-
>-class TEST_before_TEST_F_in_same_test_case : public testing::Test {
>-};
>-
>-TEST(TEST_before_TEST_F_in_same_test_case, DefinedUsingTEST) {}
>-
>-// Expected to fail. We rely on the golden file to check that Google Test
>-// generates the right error message.
>-TEST_F(TEST_before_TEST_F_in_same_test_case, DefinedUsingTEST_FAndShouldFail) {
>-}
>-
>-// Used for testing EXPECT_NONFATAL_FAILURE() and EXPECT_FATAL_FAILURE().
>-int global_integer = 0;
>-
>-// Tests that EXPECT_NONFATAL_FAILURE() can reference global variables.
>-TEST(ExpectNonfatalFailureTest, CanReferenceGlobalVariables) {
>- global_integer = 0;
>- EXPECT_NONFATAL_FAILURE({
>- EXPECT_EQ(1, global_integer) << "Expected non-fatal failure.";
>- }, "Expected non-fatal failure.");
>-}
>-
>-// Tests that EXPECT_NONFATAL_FAILURE() can reference local variables
>-// (static or not).
>-TEST(ExpectNonfatalFailureTest, CanReferenceLocalVariables) {
>- int m = 0;
>- static int n;
>- n = 1;
>- EXPECT_NONFATAL_FAILURE({
>- EXPECT_EQ(m, n) << "Expected non-fatal failure.";
>- }, "Expected non-fatal failure.");
>-}
>-
>-// Tests that EXPECT_NONFATAL_FAILURE() succeeds when there is exactly
>-// one non-fatal failure and no fatal failure.
>-TEST(ExpectNonfatalFailureTest, SucceedsWhenThereIsOneNonfatalFailure) {
>- EXPECT_NONFATAL_FAILURE({
>- ADD_FAILURE() << "Expected non-fatal failure.";
>- }, "Expected non-fatal failure.");
>-}
>-
>-// Tests that EXPECT_NONFATAL_FAILURE() fails when there is no
>-// non-fatal failure.
>-TEST(ExpectNonfatalFailureTest, FailsWhenThereIsNoNonfatalFailure) {
>- printf("(expecting a failure)\n");
>- EXPECT_NONFATAL_FAILURE({
>- }, "");
>-}
>-
>-// Tests that EXPECT_NONFATAL_FAILURE() fails when there are two
>-// non-fatal failures.
>-TEST(ExpectNonfatalFailureTest, FailsWhenThereAreTwoNonfatalFailures) {
>- printf("(expecting a failure)\n");
>- EXPECT_NONFATAL_FAILURE({
>- ADD_FAILURE() << "Expected non-fatal failure 1.";
>- ADD_FAILURE() << "Expected non-fatal failure 2.";
>- }, "");
>-}
>-
>-// Tests that EXPECT_NONFATAL_FAILURE() fails when there is one fatal
>-// failure.
>-TEST(ExpectNonfatalFailureTest, FailsWhenThereIsOneFatalFailure) {
>- printf("(expecting a failure)\n");
>- EXPECT_NONFATAL_FAILURE({
>- FAIL() << "Expected fatal failure.";
>- }, "");
>-}
>-
>-// Tests that EXPECT_NONFATAL_FAILURE() fails when the statement being
>-// tested returns.
>-TEST(ExpectNonfatalFailureTest, FailsWhenStatementReturns) {
>- printf("(expecting a failure)\n");
>- EXPECT_NONFATAL_FAILURE({
>- return;
>- }, "");
>-}
>-
>-#if GTEST_HAS_EXCEPTIONS
>-
>-// Tests that EXPECT_NONFATAL_FAILURE() fails when the statement being
>-// tested throws.
>-TEST(ExpectNonfatalFailureTest, FailsWhenStatementThrows) {
>- printf("(expecting a failure)\n");
>- try {
>- EXPECT_NONFATAL_FAILURE({
>- throw 0;
>- }, "");
>- } catch(int) { // NOLINT
>- }
>-}
>-
>-#endif // GTEST_HAS_EXCEPTIONS
>-
>-// Tests that EXPECT_FATAL_FAILURE() can reference global variables.
>-TEST(ExpectFatalFailureTest, CanReferenceGlobalVariables) {
>- global_integer = 0;
>- EXPECT_FATAL_FAILURE({
>- ASSERT_EQ(1, global_integer) << "Expected fatal failure.";
>- }, "Expected fatal failure.");
>-}
>-
>-// Tests that EXPECT_FATAL_FAILURE() can reference local static
>-// variables.
>-TEST(ExpectFatalFailureTest, CanReferenceLocalStaticVariables) {
>- static int n;
>- n = 1;
>- EXPECT_FATAL_FAILURE({
>- ASSERT_EQ(0, n) << "Expected fatal failure.";
>- }, "Expected fatal failure.");
>-}
>-
>-// Tests that EXPECT_FATAL_FAILURE() succeeds when there is exactly
>-// one fatal failure and no non-fatal failure.
>-TEST(ExpectFatalFailureTest, SucceedsWhenThereIsOneFatalFailure) {
>- EXPECT_FATAL_FAILURE({
>- FAIL() << "Expected fatal failure.";
>- }, "Expected fatal failure.");
>-}
>-
>-// Tests that EXPECT_FATAL_FAILURE() fails when there is no fatal
>-// failure.
>-TEST(ExpectFatalFailureTest, FailsWhenThereIsNoFatalFailure) {
>- printf("(expecting a failure)\n");
>- EXPECT_FATAL_FAILURE({
>- }, "");
>-}
>-
>-// A helper for generating a fatal failure.
>-void FatalFailure() {
>- FAIL() << "Expected fatal failure.";
>-}
>-
>-// Tests that EXPECT_FATAL_FAILURE() fails when there are two
>-// fatal failures.
>-TEST(ExpectFatalFailureTest, FailsWhenThereAreTwoFatalFailures) {
>- printf("(expecting a failure)\n");
>- EXPECT_FATAL_FAILURE({
>- FatalFailure();
>- FatalFailure();
>- }, "");
>-}
>-
>-// Tests that EXPECT_FATAL_FAILURE() fails when there is one non-fatal
>-// failure.
>-TEST(ExpectFatalFailureTest, FailsWhenThereIsOneNonfatalFailure) {
>- printf("(expecting a failure)\n");
>- EXPECT_FATAL_FAILURE({
>- ADD_FAILURE() << "Expected non-fatal failure.";
>- }, "");
>-}
>-
>-// Tests that EXPECT_FATAL_FAILURE() fails when the statement being
>-// tested returns.
>-TEST(ExpectFatalFailureTest, FailsWhenStatementReturns) {
>- printf("(expecting a failure)\n");
>- EXPECT_FATAL_FAILURE({
>- return;
>- }, "");
>-}
>-
>-#if GTEST_HAS_EXCEPTIONS
>-
>-// Tests that EXPECT_FATAL_FAILURE() fails when the statement being
>-// tested throws.
>-TEST(ExpectFatalFailureTest, FailsWhenStatementThrows) {
>- printf("(expecting a failure)\n");
>- try {
>- EXPECT_FATAL_FAILURE({
>- throw 0;
>- }, "");
>- } catch(int) { // NOLINT
>- }
>-}
>-
>-#endif // GTEST_HAS_EXCEPTIONS
>-
>-// This #ifdef block tests the output of typed tests.
>-#if GTEST_HAS_TYPED_TEST
>-
>-template <typename T>
>-class TypedTest : public testing::Test {
>-};
>-
>-TYPED_TEST_CASE(TypedTest, testing::Types<int>);
>-
>-TYPED_TEST(TypedTest, Success) {
>- EXPECT_EQ(0, TypeParam());
>-}
>-
>-TYPED_TEST(TypedTest, Failure) {
>- EXPECT_EQ(1, TypeParam()) << "Expected failure";
>-}
>-
>-#endif // GTEST_HAS_TYPED_TEST
>-
>-// This #ifdef block tests the output of type-parameterized tests.
>-#if GTEST_HAS_TYPED_TEST_P
>-
>-template <typename T>
>-class TypedTestP : public testing::Test {
>-};
>-
>-TYPED_TEST_CASE_P(TypedTestP);
>-
>-TYPED_TEST_P(TypedTestP, Success) {
>- EXPECT_EQ(0U, TypeParam());
>-}
>-
>-TYPED_TEST_P(TypedTestP, Failure) {
>- EXPECT_EQ(1U, TypeParam()) << "Expected failure";
>-}
>-
>-REGISTER_TYPED_TEST_CASE_P(TypedTestP, Success, Failure);
>-
>-typedef testing::Types<unsigned char, unsigned int> UnsignedTypes;
>-INSTANTIATE_TYPED_TEST_CASE_P(Unsigned, TypedTestP, UnsignedTypes);
>-
>-#endif // GTEST_HAS_TYPED_TEST_P
>-
>-#if GTEST_HAS_DEATH_TEST
>-
>-// We rely on the golden file to verify that tests whose test case
>-// name ends with DeathTest are run first.
>-
>-TEST(ADeathTest, ShouldRunFirst) {
>-}
>-
>-#if GTEST_HAS_TYPED_TEST
>-
>-// We rely on the golden file to verify that typed tests whose test
>-// case name ends with DeathTest are run first.
>-
>-template <typename T>
>-class ATypedDeathTest : public testing::Test {
>-};
>-
>-typedef testing::Types<int, double> NumericTypes;
>-TYPED_TEST_CASE(ATypedDeathTest, NumericTypes);
>-
>-TYPED_TEST(ATypedDeathTest, ShouldRunFirst) {
>-}
>-
>-#endif // GTEST_HAS_TYPED_TEST
>-
>-#if GTEST_HAS_TYPED_TEST_P
>-
>-
>-// We rely on the golden file to verify that type-parameterized tests
>-// whose test case name ends with DeathTest are run first.
>-
>-template <typename T>
>-class ATypeParamDeathTest : public testing::Test {
>-};
>-
>-TYPED_TEST_CASE_P(ATypeParamDeathTest);
>-
>-TYPED_TEST_P(ATypeParamDeathTest, ShouldRunFirst) {
>-}
>-
>-REGISTER_TYPED_TEST_CASE_P(ATypeParamDeathTest, ShouldRunFirst);
>-
>-INSTANTIATE_TYPED_TEST_CASE_P(My, ATypeParamDeathTest, NumericTypes);
>-
>-#endif // GTEST_HAS_TYPED_TEST_P
>-
>-#endif // GTEST_HAS_DEATH_TEST
>-
>-// Tests various failure conditions of
>-// EXPECT_{,NON}FATAL_FAILURE{,_ON_ALL_THREADS}.
>-class ExpectFailureTest : public testing::Test {
>- public: // Must be public and not protected due to a bug in g++ 3.4.2.
>- enum FailureMode {
>- FATAL_FAILURE,
>- NONFATAL_FAILURE
>- };
>- static void AddFailure(FailureMode failure) {
>- if (failure == FATAL_FAILURE) {
>- FAIL() << "Expected fatal failure.";
>- } else {
>- ADD_FAILURE() << "Expected non-fatal failure.";
>- }
>- }
>-};
>-
>-TEST_F(ExpectFailureTest, ExpectFatalFailure) {
>- // Expected fatal failure, but succeeds.
>- printf("(expecting 1 failure)\n");
>- EXPECT_FATAL_FAILURE(SUCCEED(), "Expected fatal failure.");
>- // Expected fatal failure, but got a non-fatal failure.
>- printf("(expecting 1 failure)\n");
>- EXPECT_FATAL_FAILURE(AddFailure(NONFATAL_FAILURE), "Expected non-fatal "
>- "failure.");
>- // Wrong message.
>- printf("(expecting 1 failure)\n");
>- EXPECT_FATAL_FAILURE(AddFailure(FATAL_FAILURE), "Some other fatal failure "
>- "expected.");
>-}
>-
>-TEST_F(ExpectFailureTest, ExpectNonFatalFailure) {
>- // Expected non-fatal failure, but succeeds.
>- printf("(expecting 1 failure)\n");
>- EXPECT_NONFATAL_FAILURE(SUCCEED(), "Expected non-fatal failure.");
>- // Expected non-fatal failure, but got a fatal failure.
>- printf("(expecting 1 failure)\n");
>- EXPECT_NONFATAL_FAILURE(AddFailure(FATAL_FAILURE), "Expected fatal failure.");
>- // Wrong message.
>- printf("(expecting 1 failure)\n");
>- EXPECT_NONFATAL_FAILURE(AddFailure(NONFATAL_FAILURE), "Some other non-fatal "
>- "failure.");
>-}
>-
>-#if GTEST_IS_THREADSAFE
>-
>-class ExpectFailureWithThreadsTest : public ExpectFailureTest {
>- protected:
>- static void AddFailureInOtherThread(FailureMode failure) {
>- ThreadWithParam<FailureMode> thread(&AddFailure, failure, NULL);
>- thread.Join();
>- }
>-};
>-
>-TEST_F(ExpectFailureWithThreadsTest, ExpectFatalFailure) {
>- // We only intercept the current thread.
>- printf("(expecting 2 failures)\n");
>- EXPECT_FATAL_FAILURE(AddFailureInOtherThread(FATAL_FAILURE),
>- "Expected fatal failure.");
>-}
>-
>-TEST_F(ExpectFailureWithThreadsTest, ExpectNonFatalFailure) {
>- // We only intercept the current thread.
>- printf("(expecting 2 failures)\n");
>- EXPECT_NONFATAL_FAILURE(AddFailureInOtherThread(NONFATAL_FAILURE),
>- "Expected non-fatal failure.");
>-}
>-
>-typedef ExpectFailureWithThreadsTest ScopedFakeTestPartResultReporterTest;
>-
>-// Tests that the ScopedFakeTestPartResultReporter only catches failures from
>-// the current thread if it is instantiated with INTERCEPT_ONLY_CURRENT_THREAD.
>-TEST_F(ScopedFakeTestPartResultReporterTest, InterceptOnlyCurrentThread) {
>- printf("(expecting 2 failures)\n");
>- TestPartResultArray results;
>- {
>- ScopedFakeTestPartResultReporter reporter(
>- ScopedFakeTestPartResultReporter::INTERCEPT_ONLY_CURRENT_THREAD,
>- &results);
>- AddFailureInOtherThread(FATAL_FAILURE);
>- AddFailureInOtherThread(NONFATAL_FAILURE);
>- }
>- // The two failures should not have been intercepted.
>- EXPECT_EQ(0, results.size()) << "This shouldn't fail.";
>-}
>-
>-#endif // GTEST_IS_THREADSAFE
>-
>-TEST_F(ExpectFailureTest, ExpectFatalFailureOnAllThreads) {
>- // Expected fatal failure, but succeeds.
>- printf("(expecting 1 failure)\n");
>- EXPECT_FATAL_FAILURE_ON_ALL_THREADS(SUCCEED(), "Expected fatal failure.");
>- // Expected fatal failure, but got a non-fatal failure.
>- printf("(expecting 1 failure)\n");
>- EXPECT_FATAL_FAILURE_ON_ALL_THREADS(AddFailure(NONFATAL_FAILURE),
>- "Expected non-fatal failure.");
>- // Wrong message.
>- printf("(expecting 1 failure)\n");
>- EXPECT_FATAL_FAILURE_ON_ALL_THREADS(AddFailure(FATAL_FAILURE),
>- "Some other fatal failure expected.");
>-}
>-
>-TEST_F(ExpectFailureTest, ExpectNonFatalFailureOnAllThreads) {
>- // Expected non-fatal failure, but succeeds.
>- printf("(expecting 1 failure)\n");
>- EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(SUCCEED(), "Expected non-fatal "
>- "failure.");
>- // Expected non-fatal failure, but got a fatal failure.
>- printf("(expecting 1 failure)\n");
>- EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(AddFailure(FATAL_FAILURE),
>- "Expected fatal failure.");
>- // Wrong message.
>- printf("(expecting 1 failure)\n");
>- EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(AddFailure(NONFATAL_FAILURE),
>- "Some other non-fatal failure.");
>-}
>-
>-
>-// Two test environments for testing testing::AddGlobalTestEnvironment().
>-
>-class FooEnvironment : public testing::Environment {
>- public:
>- virtual void SetUp() {
>- printf("%s", "FooEnvironment::SetUp() called.\n");
>- }
>-
>- virtual void TearDown() {
>- printf("%s", "FooEnvironment::TearDown() called.\n");
>- FAIL() << "Expected fatal failure.";
>- }
>-};
>-
>-class BarEnvironment : public testing::Environment {
>- public:
>- virtual void SetUp() {
>- printf("%s", "BarEnvironment::SetUp() called.\n");
>- }
>-
>- virtual void TearDown() {
>- printf("%s", "BarEnvironment::TearDown() called.\n");
>- ADD_FAILURE() << "Expected non-fatal failure.";
>- }
>-};
>-
>-GTEST_DEFINE_bool_(internal_skip_environment_and_ad_hoc_tests, false,
>- "This flag causes the program to skip test environment "
>- "tests and ad hoc tests.");
>-
>-// The main function.
>-//
>-// The idea is to use Google Test to run all the tests we have defined (some
>-// of them are intended to fail), and then compare the test results
>-// with the "golden" file.
>-int main(int argc, char **argv) {
>- testing::GTEST_FLAG(print_time) = false;
>-
>- // We just run the tests, knowing some of them are intended to fail.
>- // We will use a separate Python script to compare the output of
>- // this program with the golden file.
>-
>- // It's hard to test InitGoogleTest() directly, as it has many
>- // global side effects. The following line serves as a sanity test
>- // for it.
>- testing::InitGoogleTest(&argc, argv);
>- if (argc >= 2 &&
>- String(argv[1]) == "--gtest_internal_skip_environment_and_ad_hoc_tests")
>- GTEST_FLAG(internal_skip_environment_and_ad_hoc_tests) = true;
>-
>-#if GTEST_HAS_DEATH_TEST
>- if (testing::internal::GTEST_FLAG(internal_run_death_test) != "") {
>- // Skip the usual output capturing if we're running as the child
>- // process of an threadsafe-style death test.
>-#if GTEST_OS_WINDOWS
>- posix::FReopen("nul:", "w", stdout);
>-#else
>- posix::FReopen("/dev/null", "w", stdout);
>-#endif // GTEST_OS_WINDOWS
>- return RUN_ALL_TESTS();
>- }
>-#endif // GTEST_HAS_DEATH_TEST
>-
>- if (GTEST_FLAG(internal_skip_environment_and_ad_hoc_tests))
>- return RUN_ALL_TESTS();
>-
>- // Registers two global test environments.
>- // The golden file verifies that they are set up in the order they
>- // are registered, and torn down in the reverse order.
>- testing::AddGlobalTestEnvironment(new FooEnvironment);
>- testing::AddGlobalTestEnvironment(new BarEnvironment);
>-
>- return RunAllTests();
>-}
>diff --git a/Source/ThirdParty/gtest/test/gtest_output_test_golden_lin.txt b/Source/ThirdParty/gtest/test/gtest_output_test_golden_lin.txt
>deleted file mode 100644
>index ec60437acaa7640dfbf3db283cf1d15034c0622e..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_output_test_golden_lin.txt
>+++ /dev/null
>@@ -1,696 +0,0 @@
>-The non-test part of the code is expected to have 2 failures.
>-
>-gtest_output_test_.cc:#: Failure
>-Value of: false
>- Actual: false
>-Expected: true
>-gtest_output_test_.cc:#: Failure
>-Value of: 3
>-Expected: 2
>-[0;32m[==========] [mRunning 60 tests from 25 test cases.
>-[0;32m[----------] [mGlobal test environment set-up.
>-FooEnvironment::SetUp() called.
>-BarEnvironment::SetUp() called.
>-[0;32m[----------] [m1 test from ADeathTest
>-[0;32m[ RUN ] [mADeathTest.ShouldRunFirst
>-[0;32m[ OK ] [mADeathTest.ShouldRunFirst
>-[0;32m[----------] [m1 test from ATypedDeathTest/0, where TypeParam = int
>-[0;32m[ RUN ] [mATypedDeathTest/0.ShouldRunFirst
>-[0;32m[ OK ] [mATypedDeathTest/0.ShouldRunFirst
>-[0;32m[----------] [m1 test from ATypedDeathTest/1, where TypeParam = double
>-[0;32m[ RUN ] [mATypedDeathTest/1.ShouldRunFirst
>-[0;32m[ OK ] [mATypedDeathTest/1.ShouldRunFirst
>-[0;32m[----------] [m1 test from My/ATypeParamDeathTest/0, where TypeParam = int
>-[0;32m[ RUN ] [mMy/ATypeParamDeathTest/0.ShouldRunFirst
>-[0;32m[ OK ] [mMy/ATypeParamDeathTest/0.ShouldRunFirst
>-[0;32m[----------] [m1 test from My/ATypeParamDeathTest/1, where TypeParam = double
>-[0;32m[ RUN ] [mMy/ATypeParamDeathTest/1.ShouldRunFirst
>-[0;32m[ OK ] [mMy/ATypeParamDeathTest/1.ShouldRunFirst
>-[0;32m[----------] [m2 tests from PassingTest
>-[0;32m[ RUN ] [mPassingTest.PassingTest1
>-[0;32m[ OK ] [mPassingTest.PassingTest1
>-[0;32m[ RUN ] [mPassingTest.PassingTest2
>-[0;32m[ OK ] [mPassingTest.PassingTest2
>-[0;32m[----------] [m3 tests from FatalFailureTest
>-[0;32m[ RUN ] [mFatalFailureTest.FatalFailureInSubroutine
>-(expecting a failure that x should be 1)
>-gtest_output_test_.cc:#: Failure
>-Value of: x
>- Actual: 2
>-Expected: 1
>-[0;31m[ FAILED ] [mFatalFailureTest.FatalFailureInSubroutine
>-[0;32m[ RUN ] [mFatalFailureTest.FatalFailureInNestedSubroutine
>-(expecting a failure that x should be 1)
>-gtest_output_test_.cc:#: Failure
>-Value of: x
>- Actual: 2
>-Expected: 1
>-[0;31m[ FAILED ] [mFatalFailureTest.FatalFailureInNestedSubroutine
>-[0;32m[ RUN ] [mFatalFailureTest.NonfatalFailureInSubroutine
>-(expecting a failure on false)
>-gtest_output_test_.cc:#: Failure
>-Value of: false
>- Actual: false
>-Expected: true
>-[0;31m[ FAILED ] [mFatalFailureTest.NonfatalFailureInSubroutine
>-[0;32m[----------] [m1 test from LoggingTest
>-[0;32m[ RUN ] [mLoggingTest.InterleavingLoggingAndAssertions
>-(expecting 2 failures on (3) >= (a[i]))
>-i == 0
>-i == 1
>-gtest_output_test_.cc:#: Failure
>-Expected: (3) >= (a[i]), actual: 3 vs 9
>-i == 2
>-i == 3
>-gtest_output_test_.cc:#: Failure
>-Expected: (3) >= (a[i]), actual: 3 vs 6
>-[0;31m[ FAILED ] [mLoggingTest.InterleavingLoggingAndAssertions
>-[0;32m[----------] [m6 tests from SCOPED_TRACETest
>-[0;32m[ RUN ] [mSCOPED_TRACETest.ObeysScopes
>-(expected to fail)
>-gtest_output_test_.cc:#: Failure
>-Failed
>-This failure is expected, and shouldn't have a trace.
>-gtest_output_test_.cc:#: Failure
>-Failed
>-This failure is expected, and should have a trace.
>-Google Test trace:
>-gtest_output_test_.cc:#: Expected trace
>-gtest_output_test_.cc:#: Failure
>-Failed
>-This failure is expected, and shouldn't have a trace.
>-[0;31m[ FAILED ] [mSCOPED_TRACETest.ObeysScopes
>-[0;32m[ RUN ] [mSCOPED_TRACETest.WorksInLoop
>-(expected to fail)
>-gtest_output_test_.cc:#: Failure
>-Value of: n
>- Actual: 1
>-Expected: 2
>-Google Test trace:
>-gtest_output_test_.cc:#: i = 1
>-gtest_output_test_.cc:#: Failure
>-Value of: n
>- Actual: 2
>-Expected: 1
>-Google Test trace:
>-gtest_output_test_.cc:#: i = 2
>-[0;31m[ FAILED ] [mSCOPED_TRACETest.WorksInLoop
>-[0;32m[ RUN ] [mSCOPED_TRACETest.WorksInSubroutine
>-(expected to fail)
>-gtest_output_test_.cc:#: Failure
>-Value of: n
>- Actual: 1
>-Expected: 2
>-Google Test trace:
>-gtest_output_test_.cc:#: n = 1
>-gtest_output_test_.cc:#: Failure
>-Value of: n
>- Actual: 2
>-Expected: 1
>-Google Test trace:
>-gtest_output_test_.cc:#: n = 2
>-[0;31m[ FAILED ] [mSCOPED_TRACETest.WorksInSubroutine
>-[0;32m[ RUN ] [mSCOPED_TRACETest.CanBeNested
>-(expected to fail)
>-gtest_output_test_.cc:#: Failure
>-Value of: n
>- Actual: 2
>-Expected: 1
>-Google Test trace:
>-gtest_output_test_.cc:#: n = 2
>-gtest_output_test_.cc:#: 
>-[0;31m[ FAILED ] [mSCOPED_TRACETest.CanBeNested
>-[0;32m[ RUN ] [mSCOPED_TRACETest.CanBeRepeated
>-(expected to fail)
>-gtest_output_test_.cc:#: Failure
>-Failed
>-This failure is expected, and should contain trace point A.
>-Google Test trace:
>-gtest_output_test_.cc:#: A
>-gtest_output_test_.cc:#: Failure
>-Failed
>-This failure is expected, and should contain trace point A and B.
>-Google Test trace:
>-gtest_output_test_.cc:#: B
>-gtest_output_test_.cc:#: A
>-gtest_output_test_.cc:#: Failure
>-Failed
>-This failure is expected, and should contain trace point A, B, and C.
>-Google Test trace:
>-gtest_output_test_.cc:#: C
>-gtest_output_test_.cc:#: B
>-gtest_output_test_.cc:#: A
>-gtest_output_test_.cc:#: Failure
>-Failed
>-This failure is expected, and should contain trace point A, B, and D.
>-Google Test trace:
>-gtest_output_test_.cc:#: D
>-gtest_output_test_.cc:#: B
>-gtest_output_test_.cc:#: A
>-[0;31m[ FAILED ] [mSCOPED_TRACETest.CanBeRepeated
>-[0;32m[ RUN ] [mSCOPED_TRACETest.WorksConcurrently
>-(expecting 6 failures)
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #1 (in thread B, only trace B alive).
>-Google Test trace:
>-gtest_output_test_.cc:#: Trace B
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #2 (in thread A, trace A & B both alive).
>-Google Test trace:
>-gtest_output_test_.cc:#: Trace A
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #3 (in thread B, trace A & B both alive).
>-Google Test trace:
>-gtest_output_test_.cc:#: Trace B
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #4 (in thread B, only trace A alive).
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #5 (in thread A, only trace A alive).
>-Google Test trace:
>-gtest_output_test_.cc:#: Trace A
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #6 (in thread A, no trace alive).
>-[0;31m[ FAILED ] [mSCOPED_TRACETest.WorksConcurrently
>-[0;32m[----------] [m1 test from NonFatalFailureInFixtureConstructorTest
>-[0;32m[ RUN ] [mNonFatalFailureInFixtureConstructorTest.FailureInConstructor
>-(expecting 5 failures)
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #1, in the test fixture c'tor.
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #2, in SetUp().
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #3, in the test body.
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #4, in TearDown.
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #5, in the test fixture d'tor.
>-[0;31m[ FAILED ] [mNonFatalFailureInFixtureConstructorTest.FailureInConstructor
>-[0;32m[----------] [m1 test from FatalFailureInFixtureConstructorTest
>-[0;32m[ RUN ] [mFatalFailureInFixtureConstructorTest.FailureInConstructor
>-(expecting 2 failures)
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #1, in the test fixture c'tor.
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #2, in the test fixture d'tor.
>-[0;31m[ FAILED ] [mFatalFailureInFixtureConstructorTest.FailureInConstructor
>-[0;32m[----------] [m1 test from NonFatalFailureInSetUpTest
>-[0;32m[ RUN ] [mNonFatalFailureInSetUpTest.FailureInSetUp
>-(expecting 4 failures)
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #1, in SetUp().
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #2, in the test function.
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #3, in TearDown().
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #4, in the test fixture d'tor.
>-[0;31m[ FAILED ] [mNonFatalFailureInSetUpTest.FailureInSetUp
>-[0;32m[----------] [m1 test from FatalFailureInSetUpTest
>-[0;32m[ RUN ] [mFatalFailureInSetUpTest.FailureInSetUp
>-(expecting 3 failures)
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #1, in SetUp().
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #2, in TearDown().
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected failure #3, in the test fixture d'tor.
>-[0;31m[ FAILED ] [mFatalFailureInSetUpTest.FailureInSetUp
>-[0;32m[----------] [m4 tests from MixedUpTestCaseTest
>-[0;32m[ RUN ] [mMixedUpTestCaseTest.FirstTestFromNamespaceFoo
>-[0;32m[ OK ] [mMixedUpTestCaseTest.FirstTestFromNamespaceFoo
>-[0;32m[ RUN ] [mMixedUpTestCaseTest.SecondTestFromNamespaceFoo
>-[0;32m[ OK ] [mMixedUpTestCaseTest.SecondTestFromNamespaceFoo
>-[0;32m[ RUN ] [mMixedUpTestCaseTest.ThisShouldFail
>-gtest.cc:#: Failure
>-Failed
>-All tests in the same test case must use the same test fixture
>-class. However, in test case MixedUpTestCaseTest,
>-you defined test FirstTestFromNamespaceFoo and test ThisShouldFail
>-using two different test fixture classes. This can happen if
>-the two classes are from different namespaces or translation
>-units and have the same name. You should probably rename one
>-of the classes to put the tests into different test cases.
>-[0;31m[ FAILED ] [mMixedUpTestCaseTest.ThisShouldFail
>-[0;32m[ RUN ] [mMixedUpTestCaseTest.ThisShouldFailToo
>-gtest.cc:#: Failure
>-Failed
>-All tests in the same test case must use the same test fixture
>-class. However, in test case MixedUpTestCaseTest,
>-you defined test FirstTestFromNamespaceFoo and test ThisShouldFailToo
>-using two different test fixture classes. This can happen if
>-the two classes are from different namespaces or translation
>-units and have the same name. You should probably rename one
>-of the classes to put the tests into different test cases.
>-[0;31m[ FAILED ] [mMixedUpTestCaseTest.ThisShouldFailToo
>-[0;32m[----------] [m2 tests from MixedUpTestCaseWithSameTestNameTest
>-[0;32m[ RUN ] [mMixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
>-[0;32m[ OK ] [mMixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
>-[0;32m[ RUN ] [mMixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
>-gtest.cc:#: Failure
>-Failed
>-All tests in the same test case must use the same test fixture
>-class. However, in test case MixedUpTestCaseWithSameTestNameTest,
>-you defined test TheSecondTestWithThisNameShouldFail and test TheSecondTestWithThisNameShouldFail
>-using two different test fixture classes. This can happen if
>-the two classes are from different namespaces or translation
>-units and have the same name. You should probably rename one
>-of the classes to put the tests into different test cases.
>-[0;31m[ FAILED ] [mMixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
>-[0;32m[----------] [m2 tests from TEST_F_before_TEST_in_same_test_case
>-[0;32m[ RUN ] [mTEST_F_before_TEST_in_same_test_case.DefinedUsingTEST_F
>-[0;32m[ OK ] [mTEST_F_before_TEST_in_same_test_case.DefinedUsingTEST_F
>-[0;32m[ RUN ] [mTEST_F_before_TEST_in_same_test_case.DefinedUsingTESTAndShouldFail
>-gtest.cc:#: Failure
>-Failed
>-All tests in the same test case must use the same test fixture
>-class, so mixing TEST_F and TEST in the same test case is
>-illegal. In test case TEST_F_before_TEST_in_same_test_case,
>-test DefinedUsingTEST_F is defined using TEST_F but
>-test DefinedUsingTESTAndShouldFail is defined using TEST. You probably
>-want to change the TEST to TEST_F or move it to another test
>-case.
>-[0;31m[ FAILED ] [mTEST_F_before_TEST_in_same_test_case.DefinedUsingTESTAndShouldFail
>-[0;32m[----------] [m2 tests from TEST_before_TEST_F_in_same_test_case
>-[0;32m[ RUN ] [mTEST_before_TEST_F_in_same_test_case.DefinedUsingTEST
>-[0;32m[ OK ] [mTEST_before_TEST_F_in_same_test_case.DefinedUsingTEST
>-[0;32m[ RUN ] [mTEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail
>-gtest.cc:#: Failure
>-Failed
>-All tests in the same test case must use the same test fixture
>-class, so mixing TEST_F and TEST in the same test case is
>-illegal. In test case TEST_before_TEST_F_in_same_test_case,
>-test DefinedUsingTEST_FAndShouldFail is defined using TEST_F but
>-test DefinedUsingTEST is defined using TEST. You probably
>-want to change the TEST to TEST_F or move it to another test
>-case.
>-[0;31m[ FAILED ] [mTEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail
>-[0;32m[----------] [m8 tests from ExpectNonfatalFailureTest
>-[0;32m[ RUN ] [mExpectNonfatalFailureTest.CanReferenceGlobalVariables
>-[0;32m[ OK ] [mExpectNonfatalFailureTest.CanReferenceGlobalVariables
>-[0;32m[ RUN ] [mExpectNonfatalFailureTest.CanReferenceLocalVariables
>-[0;32m[ OK ] [mExpectNonfatalFailureTest.CanReferenceLocalVariables
>-[0;32m[ RUN ] [mExpectNonfatalFailureTest.SucceedsWhenThereIsOneNonfatalFailure
>-[0;32m[ OK ] [mExpectNonfatalFailureTest.SucceedsWhenThereIsOneNonfatalFailure
>-[0;32m[ RUN ] [mExpectNonfatalFailureTest.FailsWhenThereIsNoNonfatalFailure
>-(expecting a failure)
>-gtest.cc:#: Failure
>-Expected: 1 non-fatal failure
>- Actual: 0 failures
>-[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenThereIsNoNonfatalFailure
>-[0;32m[ RUN ] [mExpectNonfatalFailureTest.FailsWhenThereAreTwoNonfatalFailures
>-(expecting a failure)
>-gtest.cc:#: Failure
>-Expected: 1 non-fatal failure
>- Actual: 2 failures
>-gtest_output_test_.cc:#: Non-fatal failure:
>-Failed
>-Expected non-fatal failure 1.
>-
>-gtest_output_test_.cc:#: Non-fatal failure:
>-Failed
>-Expected non-fatal failure 2.
>-
>-[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenThereAreTwoNonfatalFailures
>-[0;32m[ RUN ] [mExpectNonfatalFailureTest.FailsWhenThereIsOneFatalFailure
>-(expecting a failure)
>-gtest.cc:#: Failure
>-Expected: 1 non-fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Fatal failure:
>-Failed
>-Expected fatal failure.
>-
>-[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenThereIsOneFatalFailure
>-[0;32m[ RUN ] [mExpectNonfatalFailureTest.FailsWhenStatementReturns
>-(expecting a failure)
>-gtest.cc:#: Failure
>-Expected: 1 non-fatal failure
>- Actual: 0 failures
>-[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenStatementReturns
>-[0;32m[ RUN ] [mExpectNonfatalFailureTest.FailsWhenStatementThrows
>-(expecting a failure)
>-gtest.cc:#: Failure
>-Expected: 1 non-fatal failure
>- Actual: 0 failures
>-[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenStatementThrows
>-[0;32m[----------] [m8 tests from ExpectFatalFailureTest
>-[0;32m[ RUN ] [mExpectFatalFailureTest.CanReferenceGlobalVariables
>-[0;32m[ OK ] [mExpectFatalFailureTest.CanReferenceGlobalVariables
>-[0;32m[ RUN ] [mExpectFatalFailureTest.CanReferenceLocalStaticVariables
>-[0;32m[ OK ] [mExpectFatalFailureTest.CanReferenceLocalStaticVariables
>-[0;32m[ RUN ] [mExpectFatalFailureTest.SucceedsWhenThereIsOneFatalFailure
>-[0;32m[ OK ] [mExpectFatalFailureTest.SucceedsWhenThereIsOneFatalFailure
>-[0;32m[ RUN ] [mExpectFatalFailureTest.FailsWhenThereIsNoFatalFailure
>-(expecting a failure)
>-gtest.cc:#: Failure
>-Expected: 1 fatal failure
>- Actual: 0 failures
>-[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenThereIsNoFatalFailure
>-[0;32m[ RUN ] [mExpectFatalFailureTest.FailsWhenThereAreTwoFatalFailures
>-(expecting a failure)
>-gtest.cc:#: Failure
>-Expected: 1 fatal failure
>- Actual: 2 failures
>-gtest_output_test_.cc:#: Fatal failure:
>-Failed
>-Expected fatal failure.
>-
>-gtest_output_test_.cc:#: Fatal failure:
>-Failed
>-Expected fatal failure.
>-
>-[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenThereAreTwoFatalFailures
>-[0;32m[ RUN ] [mExpectFatalFailureTest.FailsWhenThereIsOneNonfatalFailure
>-(expecting a failure)
>-gtest.cc:#: Failure
>-Expected: 1 fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Non-fatal failure:
>-Failed
>-Expected non-fatal failure.
>-
>-[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenThereIsOneNonfatalFailure
>-[0;32m[ RUN ] [mExpectFatalFailureTest.FailsWhenStatementReturns
>-(expecting a failure)
>-gtest.cc:#: Failure
>-Expected: 1 fatal failure
>- Actual: 0 failures
>-[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenStatementReturns
>-[0;32m[ RUN ] [mExpectFatalFailureTest.FailsWhenStatementThrows
>-(expecting a failure)
>-gtest.cc:#: Failure
>-Expected: 1 fatal failure
>- Actual: 0 failures
>-[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenStatementThrows
>-[0;32m[----------] [m2 tests from TypedTest/0, where TypeParam = int
>-[0;32m[ RUN ] [mTypedTest/0.Success
>-[0;32m[ OK ] [mTypedTest/0.Success
>-[0;32m[ RUN ] [mTypedTest/0.Failure
>-gtest_output_test_.cc:#: Failure
>-Value of: TypeParam()
>- Actual: 0
>-Expected: 1
>-Expected failure
>-[0;31m[ FAILED ] [mTypedTest/0.Failure
>-[0;32m[----------] [m2 tests from Unsigned/TypedTestP/0, where TypeParam = unsigned char
>-[0;32m[ RUN ] [mUnsigned/TypedTestP/0.Success
>-[0;32m[ OK ] [mUnsigned/TypedTestP/0.Success
>-[0;32m[ RUN ] [mUnsigned/TypedTestP/0.Failure
>-gtest_output_test_.cc:#: Failure
>-Value of: TypeParam()
>- Actual: \0
>-Expected: 1U
>-Which is: 1
>-Expected failure
>-[0;31m[ FAILED ] [mUnsigned/TypedTestP/0.Failure
>-[0;32m[----------] [m2 tests from Unsigned/TypedTestP/1, where TypeParam = unsigned int
>-[0;32m[ RUN ] [mUnsigned/TypedTestP/1.Success
>-[0;32m[ OK ] [mUnsigned/TypedTestP/1.Success
>-[0;32m[ RUN ] [mUnsigned/TypedTestP/1.Failure
>-gtest_output_test_.cc:#: Failure
>-Value of: TypeParam()
>- Actual: 0
>-Expected: 1U
>-Which is: 1
>-Expected failure
>-[0;31m[ FAILED ] [mUnsigned/TypedTestP/1.Failure
>-[0;32m[----------] [m4 tests from ExpectFailureTest
>-[0;32m[ RUN ] [mExpectFailureTest.ExpectFatalFailure
>-(expecting 1 failure)
>-gtest.cc:#: Failure
>-Expected: 1 fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Success:
>-Succeeded
>-
>-(expecting 1 failure)
>-gtest.cc:#: Failure
>-Expected: 1 fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Non-fatal failure:
>-Failed
>-Expected non-fatal failure.
>-
>-(expecting 1 failure)
>-gtest.cc:#: Failure
>-Expected: 1 fatal failure containing "Some other fatal failure expected."
>- Actual:
>-gtest_output_test_.cc:#: Fatal failure:
>-Failed
>-Expected fatal failure.
>-
>-[0;31m[ FAILED ] [mExpectFailureTest.ExpectFatalFailure
>-[0;32m[ RUN ] [mExpectFailureTest.ExpectNonFatalFailure
>-(expecting 1 failure)
>-gtest.cc:#: Failure
>-Expected: 1 non-fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Success:
>-Succeeded
>-
>-(expecting 1 failure)
>-gtest.cc:#: Failure
>-Expected: 1 non-fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Fatal failure:
>-Failed
>-Expected fatal failure.
>-
>-(expecting 1 failure)
>-gtest.cc:#: Failure
>-Expected: 1 non-fatal failure containing "Some other non-fatal failure."
>- Actual:
>-gtest_output_test_.cc:#: Non-fatal failure:
>-Failed
>-Expected non-fatal failure.
>-
>-[0;31m[ FAILED ] [mExpectFailureTest.ExpectNonFatalFailure
>-[0;32m[ RUN ] [mExpectFailureTest.ExpectFatalFailureOnAllThreads
>-(expecting 1 failure)
>-gtest.cc:#: Failure
>-Expected: 1 fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Success:
>-Succeeded
>-
>-(expecting 1 failure)
>-gtest.cc:#: Failure
>-Expected: 1 fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Non-fatal failure:
>-Failed
>-Expected non-fatal failure.
>-
>-(expecting 1 failure)
>-gtest.cc:#: Failure
>-Expected: 1 fatal failure containing "Some other fatal failure expected."
>- Actual:
>-gtest_output_test_.cc:#: Fatal failure:
>-Failed
>-Expected fatal failure.
>-
>-[0;31m[ FAILED ] [mExpectFailureTest.ExpectFatalFailureOnAllThreads
>-[0;32m[ RUN ] [mExpectFailureTest.ExpectNonFatalFailureOnAllThreads
>-(expecting 1 failure)
>-gtest.cc:#: Failure
>-Expected: 1 non-fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Success:
>-Succeeded
>-
>-(expecting 1 failure)
>-gtest.cc:#: Failure
>-Expected: 1 non-fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Fatal failure:
>-Failed
>-Expected fatal failure.
>-
>-(expecting 1 failure)
>-gtest.cc:#: Failure
>-Expected: 1 non-fatal failure containing "Some other non-fatal failure."
>- Actual:
>-gtest_output_test_.cc:#: Non-fatal failure:
>-Failed
>-Expected non-fatal failure.
>-
>-[0;31m[ FAILED ] [mExpectFailureTest.ExpectNonFatalFailureOnAllThreads
>-[0;32m[----------] [m2 tests from ExpectFailureWithThreadsTest
>-[0;32m[ RUN ] [mExpectFailureWithThreadsTest.ExpectFatalFailure
>-(expecting 2 failures)
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected fatal failure.
>-gtest.cc:#: Failure
>-Expected: 1 fatal failure
>- Actual: 0 failures
>-[0;31m[ FAILED ] [mExpectFailureWithThreadsTest.ExpectFatalFailure
>-[0;32m[ RUN ] [mExpectFailureWithThreadsTest.ExpectNonFatalFailure
>-(expecting 2 failures)
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected non-fatal failure.
>-gtest.cc:#: Failure
>-Expected: 1 non-fatal failure
>- Actual: 0 failures
>-[0;31m[ FAILED ] [mExpectFailureWithThreadsTest.ExpectNonFatalFailure
>-[0;32m[----------] [m1 test from ScopedFakeTestPartResultReporterTest
>-[0;32m[ RUN ] [mScopedFakeTestPartResultReporterTest.InterceptOnlyCurrentThread
>-(expecting 2 failures)
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected fatal failure.
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected non-fatal failure.
>-[0;31m[ FAILED ] [mScopedFakeTestPartResultReporterTest.InterceptOnlyCurrentThread
>-[0;32m[----------] [mGlobal test environment tear-down
>-BarEnvironment::TearDown() called.
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected non-fatal failure.
>-FooEnvironment::TearDown() called.
>-gtest_output_test_.cc:#: Failure
>-Failed
>-Expected fatal failure.
>-[0;32m[==========] [m60 tests from 25 test cases ran.
>-[0;32m[ PASSED ] [m21 tests.
>-[0;31m[ FAILED ] [m39 tests, listed below:
>-[0;31m[ FAILED ] [mFatalFailureTest.FatalFailureInSubroutine
>-[0;31m[ FAILED ] [mFatalFailureTest.FatalFailureInNestedSubroutine
>-[0;31m[ FAILED ] [mFatalFailureTest.NonfatalFailureInSubroutine
>-[0;31m[ FAILED ] [mLoggingTest.InterleavingLoggingAndAssertions
>-[0;31m[ FAILED ] [mSCOPED_TRACETest.ObeysScopes
>-[0;31m[ FAILED ] [mSCOPED_TRACETest.WorksInLoop
>-[0;31m[ FAILED ] [mSCOPED_TRACETest.WorksInSubroutine
>-[0;31m[ FAILED ] [mSCOPED_TRACETest.CanBeNested
>-[0;31m[ FAILED ] [mSCOPED_TRACETest.CanBeRepeated
>-[0;31m[ FAILED ] [mSCOPED_TRACETest.WorksConcurrently
>-[0;31m[ FAILED ] [mNonFatalFailureInFixtureConstructorTest.FailureInConstructor
>-[0;31m[ FAILED ] [mFatalFailureInFixtureConstructorTest.FailureInConstructor
>-[0;31m[ FAILED ] [mNonFatalFailureInSetUpTest.FailureInSetUp
>-[0;31m[ FAILED ] [mFatalFailureInSetUpTest.FailureInSetUp
>-[0;31m[ FAILED ] [mMixedUpTestCaseTest.ThisShouldFail
>-[0;31m[ FAILED ] [mMixedUpTestCaseTest.ThisShouldFailToo
>-[0;31m[ FAILED ] [mMixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
>-[0;31m[ FAILED ] [mTEST_F_before_TEST_in_same_test_case.DefinedUsingTESTAndShouldFail
>-[0;31m[ FAILED ] [mTEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail
>-[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenThereIsNoNonfatalFailure
>-[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenThereAreTwoNonfatalFailures
>-[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenThereIsOneFatalFailure
>-[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenStatementReturns
>-[0;31m[ FAILED ] [mExpectNonfatalFailureTest.FailsWhenStatementThrows
>-[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenThereIsNoFatalFailure
>-[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenThereAreTwoFatalFailures
>-[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenThereIsOneNonfatalFailure
>-[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenStatementReturns
>-[0;31m[ FAILED ] [mExpectFatalFailureTest.FailsWhenStatementThrows
>-[0;31m[ FAILED ] [mTypedTest/0.Failure, where TypeParam = int
>-[0;31m[ FAILED ] [mUnsigned/TypedTestP/0.Failure, where TypeParam = unsigned char
>-[0;31m[ FAILED ] [mUnsigned/TypedTestP/1.Failure, where TypeParam = unsigned int
>-[0;31m[ FAILED ] [mExpectFailureTest.ExpectFatalFailure
>-[0;31m[ FAILED ] [mExpectFailureTest.ExpectNonFatalFailure
>-[0;31m[ FAILED ] [mExpectFailureTest.ExpectFatalFailureOnAllThreads
>-[0;31m[ FAILED ] [mExpectFailureTest.ExpectNonFatalFailureOnAllThreads
>-[0;31m[ FAILED ] [mExpectFailureWithThreadsTest.ExpectFatalFailure
>-[0;31m[ FAILED ] [mExpectFailureWithThreadsTest.ExpectNonFatalFailure
>-[0;31m[ FAILED ] [mScopedFakeTestPartResultReporterTest.InterceptOnlyCurrentThread
>-
>-39 FAILED TESTS
>-[0;33m YOU HAVE 1 DISABLED TEST
>-
>-[mNote: Google Test filter = FatalFailureTest.*:LoggingTest.*
>-[==========] Running 4 tests from 2 test cases.
>-[----------] Global test environment set-up.
>-[----------] 3 tests from FatalFailureTest
>-[ RUN ] FatalFailureTest.FatalFailureInSubroutine
>-(expecting a failure that x should be 1)
>-gtest_output_test_.cc:#: Failure
>-Value of: x
>- Actual: 2
>-Expected: 1
>-[ FAILED ] FatalFailureTest.FatalFailureInSubroutine (? ms)
>-[ RUN ] FatalFailureTest.FatalFailureInNestedSubroutine
>-(expecting a failure that x should be 1)
>-gtest_output_test_.cc:#: Failure
>-Value of: x
>- Actual: 2
>-Expected: 1
>-[ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine (? ms)
>-[ RUN ] FatalFailureTest.NonfatalFailureInSubroutine
>-(expecting a failure on false)
>-gtest_output_test_.cc:#: Failure
>-Value of: false
>- Actual: false
>-Expected: true
>-[ FAILED ] FatalFailureTest.NonfatalFailureInSubroutine (? ms)
>-[----------] 3 tests from FatalFailureTest (? ms total)
>-
>-[----------] 1 test from LoggingTest
>-[ RUN ] LoggingTest.InterleavingLoggingAndAssertions
>-(expecting 2 failures on (3) >= (a[i]))
>-i == 0
>-i == 1
>-gtest_output_test_.cc:#: Failure
>-Expected: (3) >= (a[i]), actual: 3 vs 9
>-i == 2
>-i == 3
>-gtest_output_test_.cc:#: Failure
>-Expected: (3) >= (a[i]), actual: 3 vs 6
>-[ FAILED ] LoggingTest.InterleavingLoggingAndAssertions (? ms)
>-[----------] 1 test from LoggingTest (? ms total)
>-
>-[----------] Global test environment tear-down
>-[==========] 4 tests from 2 test cases ran. (? ms total)
>-[ PASSED ] 0 tests.
>-[ FAILED ] 4 tests, listed below:
>-[ FAILED ] FatalFailureTest.FatalFailureInSubroutine
>-[ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine
>-[ FAILED ] FatalFailureTest.NonfatalFailureInSubroutine
>-[ FAILED ] LoggingTest.InterleavingLoggingAndAssertions
>-
>- 4 FAILED TESTS
>- YOU HAVE 1 DISABLED TEST
>-
>-Note: Google Test filter = *DISABLED_*
>-[==========] Running 1 test from 1 test case.
>-[----------] Global test environment set-up.
>-[----------] 1 test from DisabledTestsWarningTest
>-[ RUN ] DisabledTestsWarningTest.DISABLED_AlsoRunDisabledTestsFlagSuppressesWarning
>-[ OK ] DisabledTestsWarningTest.DISABLED_AlsoRunDisabledTestsFlagSuppressesWarning
>-[----------] Global test environment tear-down
>-[==========] 1 test from 1 test case ran.
>-[ PASSED ] 1 test.
>-Note: Google Test filter = PassingTest.*
>-Note: This is test shard 1 of 2.
>-[==========] Running 1 test from 1 test case.
>-[----------] Global test environment set-up.
>-[----------] 1 test from PassingTest
>-[ RUN ] PassingTest.PassingTest2
>-[ OK ] PassingTest.PassingTest2
>-[----------] Global test environment tear-down
>-[==========] 1 test from 1 test case ran.
>-[ PASSED ] 1 test.
>-
>- YOU HAVE 1 DISABLED TEST
>-
>diff --git a/Source/ThirdParty/gtest/test/gtest_output_test_golden_win.txt b/Source/ThirdParty/gtest/test/gtest_output_test_golden_win.txt
>deleted file mode 100644
>index 313c3aafc31f5f1005c774283e00bdb09de81f69..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_output_test_golden_win.txt
>+++ /dev/null
>@@ -1,605 +0,0 @@
>-The non-test part of the code is expected to have 2 failures.
>-
>-gtest_output_test_.cc:#: error: Value of: false
>- Actual: false
>-Expected: true
>-gtest_output_test_.cc:#: error: Value of: 3
>-Expected: 2
>-[==========] Running 61 tests from 27 test cases.
>-[----------] Global test environment set-up.
>-FooEnvironment::SetUp() called.
>-BarEnvironment::SetUp() called.
>-[----------] 1 test from ADeathTest
>-[ RUN ] ADeathTest.ShouldRunFirst
>-[ OK ] ADeathTest.ShouldRunFirst
>-[----------] 1 test from ATypedDeathTest/0, where TypeParam = int
>-[ RUN ] ATypedDeathTest/0.ShouldRunFirst
>-[ OK ] ATypedDeathTest/0.ShouldRunFirst
>-[----------] 1 test from ATypedDeathTest/1, where TypeParam = double
>-[ RUN ] ATypedDeathTest/1.ShouldRunFirst
>-[ OK ] ATypedDeathTest/1.ShouldRunFirst
>-[----------] 1 test from My/ATypeParamDeathTest/0, where TypeParam = int
>-[ RUN ] My/ATypeParamDeathTest/0.ShouldRunFirst
>-[ OK ] My/ATypeParamDeathTest/0.ShouldRunFirst
>-[----------] 1 test from My/ATypeParamDeathTest/1, where TypeParam = double
>-[ RUN ] My/ATypeParamDeathTest/1.ShouldRunFirst
>-[ OK ] My/ATypeParamDeathTest/1.ShouldRunFirst
>-[----------] 2 tests from PassingTest
>-[ RUN ] PassingTest.PassingTest1
>-[ OK ] PassingTest.PassingTest1
>-[ RUN ] PassingTest.PassingTest2
>-[ OK ] PassingTest.PassingTest2
>-[----------] 3 tests from FatalFailureTest
>-[ RUN ] FatalFailureTest.FatalFailureInSubroutine
>-(expecting a failure that x should be 1)
>-gtest_output_test_.cc:#: error: Value of: x
>- Actual: 2
>-Expected: 1
>-[ FAILED ] FatalFailureTest.FatalFailureInSubroutine
>-[ RUN ] FatalFailureTest.FatalFailureInNestedSubroutine
>-(expecting a failure that x should be 1)
>-gtest_output_test_.cc:#: error: Value of: x
>- Actual: 2
>-Expected: 1
>-[ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine
>-[ RUN ] FatalFailureTest.NonfatalFailureInSubroutine
>-(expecting a failure on false)
>-gtest_output_test_.cc:#: error: Value of: false
>- Actual: false
>-Expected: true
>-[ FAILED ] FatalFailureTest.NonfatalFailureInSubroutine
>-[----------] 1 test from LoggingTest
>-[ RUN ] LoggingTest.InterleavingLoggingAndAssertions
>-(expecting 2 failures on (3) >= (a[i]))
>-i == 0
>-i == 1
>-gtest_output_test_.cc:#: error: Expected: (3) >= (a[i]), actual: 3 vs 9
>-i == 2
>-i == 3
>-gtest_output_test_.cc:#: error: Expected: (3) >= (a[i]), actual: 3 vs 6
>-[ FAILED ] LoggingTest.InterleavingLoggingAndAssertions
>-[----------] 5 tests from SCOPED_TRACETest
>-[ RUN ] SCOPED_TRACETest.ObeysScopes
>-(expected to fail)
>-gtest_output_test_.cc:#: error: Failed
>-This failure is expected, and shouldn't have a trace.
>-gtest_output_test_.cc:#: error: Failed
>-This failure is expected, and should have a trace.
>-Google Test trace:
>-gtest_output_test_.cc:#: Expected trace
>-gtest_output_test_.cc:#: error: Failed
>-This failure is expected, and shouldn't have a trace.
>-[ FAILED ] SCOPED_TRACETest.ObeysScopes
>-[ RUN ] SCOPED_TRACETest.WorksInLoop
>-(expected to fail)
>-gtest_output_test_.cc:#: error: Value of: n
>- Actual: 1
>-Expected: 2
>-Google Test trace:
>-gtest_output_test_.cc:#: i = 1
>-gtest_output_test_.cc:#: error: Value of: n
>- Actual: 2
>-Expected: 1
>-Google Test trace:
>-gtest_output_test_.cc:#: i = 2
>-[ FAILED ] SCOPED_TRACETest.WorksInLoop
>-[ RUN ] SCOPED_TRACETest.WorksInSubroutine
>-(expected to fail)
>-gtest_output_test_.cc:#: error: Value of: n
>- Actual: 1
>-Expected: 2
>-Google Test trace:
>-gtest_output_test_.cc:#: n = 1
>-gtest_output_test_.cc:#: error: Value of: n
>- Actual: 2
>-Expected: 1
>-Google Test trace:
>-gtest_output_test_.cc:#: n = 2
>-[ FAILED ] SCOPED_TRACETest.WorksInSubroutine
>-[ RUN ] SCOPED_TRACETest.CanBeNested
>-(expected to fail)
>-gtest_output_test_.cc:#: error: Value of: n
>- Actual: 2
>-Expected: 1
>-Google Test trace:
>-gtest_output_test_.cc:#: n = 2
>-gtest_output_test_.cc:#: 
>-[ FAILED ] SCOPED_TRACETest.CanBeNested
>-[ RUN ] SCOPED_TRACETest.CanBeRepeated
>-(expected to fail)
>-gtest_output_test_.cc:#: error: Failed
>-This failure is expected, and should contain trace point A.
>-Google Test trace:
>-gtest_output_test_.cc:#: A
>-gtest_output_test_.cc:#: error: Failed
>-This failure is expected, and should contain trace point A and B.
>-Google Test trace:
>-gtest_output_test_.cc:#: B
>-gtest_output_test_.cc:#: A
>-gtest_output_test_.cc:#: error: Failed
>-This failure is expected, and should contain trace point A, B, and C.
>-Google Test trace:
>-gtest_output_test_.cc:#: C
>-gtest_output_test_.cc:#: B
>-gtest_output_test_.cc:#: A
>-gtest_output_test_.cc:#: error: Failed
>-This failure is expected, and should contain trace point A, B, and D.
>-Google Test trace:
>-gtest_output_test_.cc:#: D
>-gtest_output_test_.cc:#: B
>-gtest_output_test_.cc:#: A
>-[ FAILED ] SCOPED_TRACETest.CanBeRepeated
>-[----------] 1 test from NonFatalFailureInFixtureConstructorTest
>-[ RUN ] NonFatalFailureInFixtureConstructorTest.FailureInConstructor
>-(expecting 5 failures)
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #1, in the test fixture c'tor.
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #2, in SetUp().
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #3, in the test body.
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #4, in TearDown.
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #5, in the test fixture d'tor.
>-[ FAILED ] NonFatalFailureInFixtureConstructorTest.FailureInConstructor
>-[----------] 1 test from FatalFailureInFixtureConstructorTest
>-[ RUN ] FatalFailureInFixtureConstructorTest.FailureInConstructor
>-(expecting 2 failures)
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #1, in the test fixture c'tor.
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #2, in the test fixture d'tor.
>-[ FAILED ] FatalFailureInFixtureConstructorTest.FailureInConstructor
>-[----------] 1 test from NonFatalFailureInSetUpTest
>-[ RUN ] NonFatalFailureInSetUpTest.FailureInSetUp
>-(expecting 4 failures)
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #1, in SetUp().
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #2, in the test function.
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #3, in TearDown().
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #4, in the test fixture d'tor.
>-[ FAILED ] NonFatalFailureInSetUpTest.FailureInSetUp
>-[----------] 1 test from FatalFailureInSetUpTest
>-[ RUN ] FatalFailureInSetUpTest.FailureInSetUp
>-(expecting 3 failures)
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #1, in SetUp().
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #2, in TearDown().
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #3, in the test fixture d'tor.
>-[ FAILED ] FatalFailureInSetUpTest.FailureInSetUp
>-[----------] 1 test from ExceptionInFixtureCtorTest
>-[ RUN ] ExceptionInFixtureCtorTest.ExceptionInFixtureCtor
>-(expecting a failure on thrown exception in the test fixture's constructor)
>-unknown file: error: Exception thrown with code 0xc0000005 in the test fixture's constructor.
>-[----------] 1 test from ExceptionInSetUpTest
>-[ RUN ] ExceptionInSetUpTest.ExceptionInSetUp
>-(expecting 3 failures)
>-unknown file: error: Exception thrown with code 0xc0000005 in SetUp().
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #2, in TearDown().
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #3, in the test fixture d'tor.
>-[ FAILED ] ExceptionInSetUpTest.ExceptionInSetUp
>-[----------] 2 tests from ExceptionInTestFunctionTest
>-[ RUN ] ExceptionInTestFunctionTest.SEH
>-(expecting 3 failures)
>-unknown file: error: Exception thrown with code 0xc0000005 in the test body.
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #2, in TearDown().
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #3, in the test fixture d'tor.
>-[ FAILED ] ExceptionInTestFunctionTest.SEH
>-[ RUN ] ExceptionInTestFunctionTest.CppException
>-unknown file: error: Exception thrown with code 0xe06d7363 in the test body.
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #2, in TearDown().
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #3, in the test fixture d'tor.
>-[ FAILED ] ExceptionInTestFunctionTest.CppException
>-[----------] 1 test from ExceptionInTearDownTest
>-[ RUN ] ExceptionInTearDownTest.ExceptionInTearDown
>-(expecting 2 failures)
>-unknown file: error: Exception thrown with code 0xe06d7363 in TearDown().
>-gtest_output_test_.cc:#: error: Failed
>-Expected failure #2, in the test fixture d'tor.
>-[ FAILED ] ExceptionInTearDownTest.ExceptionInTearDown
>-[----------] 4 tests from MixedUpTestCaseTest
>-[ RUN ] MixedUpTestCaseTest.FirstTestFromNamespaceFoo
>-[ OK ] MixedUpTestCaseTest.FirstTestFromNamespaceFoo
>-[ RUN ] MixedUpTestCaseTest.SecondTestFromNamespaceFoo
>-[ OK ] MixedUpTestCaseTest.SecondTestFromNamespaceFoo
>-[ RUN ] MixedUpTestCaseTest.ThisShouldFail
>-gtest.cc:#: error: Failed
>-All tests in the same test case must use the same test fixture
>-class. However, in test case MixedUpTestCaseTest,
>-you defined test FirstTestFromNamespaceFoo and test ThisShouldFail
>-using two different test fixture classes. This can happen if
>-the two classes are from different namespaces or translation
>-units and have the same name. You should probably rename one
>-of the classes to put the tests into different test cases.
>-[ FAILED ] MixedUpTestCaseTest.ThisShouldFail
>-[ RUN ] MixedUpTestCaseTest.ThisShouldFailToo
>-gtest.cc:#: error: Failed
>-All tests in the same test case must use the same test fixture
>-class. However, in test case MixedUpTestCaseTest,
>-you defined test FirstTestFromNamespaceFoo and test ThisShouldFailToo
>-using two different test fixture classes. This can happen if
>-the two classes are from different namespaces or translation
>-units and have the same name. You should probably rename one
>-of the classes to put the tests into different test cases.
>-[ FAILED ] MixedUpTestCaseTest.ThisShouldFailToo
>-[----------] 2 tests from MixedUpTestCaseWithSameTestNameTest
>-[ RUN ] MixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
>-[ OK ] MixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
>-[ RUN ] MixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
>-gtest.cc:#: error: Failed
>-All tests in the same test case must use the same test fixture
>-class. However, in test case MixedUpTestCaseWithSameTestNameTest,
>-you defined test TheSecondTestWithThisNameShouldFail and test TheSecondTestWithThisNameShouldFail
>-using two different test fixture classes. This can happen if
>-the two classes are from different namespaces or translation
>-units and have the same name. You should probably rename one
>-of the classes to put the tests into different test cases.
>-[ FAILED ] MixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
>-[----------] 2 tests from TEST_F_before_TEST_in_same_test_case
>-[ RUN ] TEST_F_before_TEST_in_same_test_case.DefinedUsingTEST_F
>-[ OK ] TEST_F_before_TEST_in_same_test_case.DefinedUsingTEST_F
>-[ RUN ] TEST_F_before_TEST_in_same_test_case.DefinedUsingTESTAndShouldFail
>-gtest.cc:#: error: Failed
>-All tests in the same test case must use the same test fixture
>-class, so mixing TEST_F and TEST in the same test case is
>-illegal. In test case TEST_F_before_TEST_in_same_test_case,
>-test DefinedUsingTEST_F is defined using TEST_F but
>-test DefinedUsingTESTAndShouldFail is defined using TEST. You probably
>-want to change the TEST to TEST_F or move it to another test
>-case.
>-[ FAILED ] TEST_F_before_TEST_in_same_test_case.DefinedUsingTESTAndShouldFail
>-[----------] 2 tests from TEST_before_TEST_F_in_same_test_case
>-[ RUN ] TEST_before_TEST_F_in_same_test_case.DefinedUsingTEST
>-[ OK ] TEST_before_TEST_F_in_same_test_case.DefinedUsingTEST
>-[ RUN ] TEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail
>-gtest.cc:#: error: Failed
>-All tests in the same test case must use the same test fixture
>-class, so mixing TEST_F and TEST in the same test case is
>-illegal. In test case TEST_before_TEST_F_in_same_test_case,
>-test DefinedUsingTEST_FAndShouldFail is defined using TEST_F but
>-test DefinedUsingTEST is defined using TEST. You probably
>-want to change the TEST to TEST_F or move it to another test
>-case.
>-[ FAILED ] TEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail
>-[----------] 8 tests from ExpectNonfatalFailureTest
>-[ RUN ] ExpectNonfatalFailureTest.CanReferenceGlobalVariables
>-[ OK ] ExpectNonfatalFailureTest.CanReferenceGlobalVariables
>-[ RUN ] ExpectNonfatalFailureTest.CanReferenceLocalVariables
>-[ OK ] ExpectNonfatalFailureTest.CanReferenceLocalVariables
>-[ RUN ] ExpectNonfatalFailureTest.SucceedsWhenThereIsOneNonfatalFailure
>-[ OK ] ExpectNonfatalFailureTest.SucceedsWhenThereIsOneNonfatalFailure
>-[ RUN ] ExpectNonfatalFailureTest.FailsWhenThereIsNoNonfatalFailure
>-(expecting a failure)
>-gtest.cc:#: error: Expected: 1 non-fatal failure
>- Actual: 0 failures
>-[ FAILED ] ExpectNonfatalFailureTest.FailsWhenThereIsNoNonfatalFailure
>-[ RUN ] ExpectNonfatalFailureTest.FailsWhenThereAreTwoNonfatalFailures
>-(expecting a failure)
>-gtest.cc:#: error: Expected: 1 non-fatal failure
>- Actual: 2 failures
>-gtest_output_test_.cc:#: Non-fatal failure:
>-Failed
>-Expected non-fatal failure 1.
>-
>-gtest_output_test_.cc:#: Non-fatal failure:
>-Failed
>-Expected non-fatal failure 2.
>-
>-[ FAILED ] ExpectNonfatalFailureTest.FailsWhenThereAreTwoNonfatalFailures
>-[ RUN ] ExpectNonfatalFailureTest.FailsWhenThereIsOneFatalFailure
>-(expecting a failure)
>-gtest.cc:#: error: Expected: 1 non-fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Fatal failure:
>-Failed
>-Expected fatal failure.
>-
>-[ FAILED ] ExpectNonfatalFailureTest.FailsWhenThereIsOneFatalFailure
>-[ RUN ] ExpectNonfatalFailureTest.FailsWhenStatementReturns
>-(expecting a failure)
>-gtest.cc:#: error: Expected: 1 non-fatal failure
>- Actual: 0 failures
>-[ FAILED ] ExpectNonfatalFailureTest.FailsWhenStatementReturns
>-[ RUN ] ExpectNonfatalFailureTest.FailsWhenStatementThrows
>-(expecting a failure)
>-gtest.cc:#: error: Expected: 1 non-fatal failure
>- Actual: 0 failures
>-[ FAILED ] ExpectNonfatalFailureTest.FailsWhenStatementThrows
>-[----------] 8 tests from ExpectFatalFailureTest
>-[ RUN ] ExpectFatalFailureTest.CanReferenceGlobalVariables
>-[ OK ] ExpectFatalFailureTest.CanReferenceGlobalVariables
>-[ RUN ] ExpectFatalFailureTest.CanReferenceLocalStaticVariables
>-[ OK ] ExpectFatalFailureTest.CanReferenceLocalStaticVariables
>-[ RUN ] ExpectFatalFailureTest.SucceedsWhenThereIsOneFatalFailure
>-[ OK ] ExpectFatalFailureTest.SucceedsWhenThereIsOneFatalFailure
>-[ RUN ] ExpectFatalFailureTest.FailsWhenThereIsNoFatalFailure
>-(expecting a failure)
>-gtest.cc:#: error: Expected: 1 fatal failure
>- Actual: 0 failures
>-[ FAILED ] ExpectFatalFailureTest.FailsWhenThereIsNoFatalFailure
>-[ RUN ] ExpectFatalFailureTest.FailsWhenThereAreTwoFatalFailures
>-(expecting a failure)
>-gtest.cc:#: error: Expected: 1 fatal failure
>- Actual: 2 failures
>-gtest_output_test_.cc:#: Fatal failure:
>-Failed
>-Expected fatal failure.
>-
>-gtest_output_test_.cc:#: Fatal failure:
>-Failed
>-Expected fatal failure.
>-
>-[ FAILED ] ExpectFatalFailureTest.FailsWhenThereAreTwoFatalFailures
>-[ RUN ] ExpectFatalFailureTest.FailsWhenThereIsOneNonfatalFailure
>-(expecting a failure)
>-gtest.cc:#: error: Expected: 1 fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Non-fatal failure:
>-Failed
>-Expected non-fatal failure.
>-
>-[ FAILED ] ExpectFatalFailureTest.FailsWhenThereIsOneNonfatalFailure
>-[ RUN ] ExpectFatalFailureTest.FailsWhenStatementReturns
>-(expecting a failure)
>-gtest.cc:#: error: Expected: 1 fatal failure
>- Actual: 0 failures
>-[ FAILED ] ExpectFatalFailureTest.FailsWhenStatementReturns
>-[ RUN ] ExpectFatalFailureTest.FailsWhenStatementThrows
>-(expecting a failure)
>-gtest.cc:#: error: Expected: 1 fatal failure
>- Actual: 0 failures
>-[ FAILED ] ExpectFatalFailureTest.FailsWhenStatementThrows
>-[----------] 2 tests from TypedTest/0, where TypeParam = int
>-[ RUN ] TypedTest/0.Success
>-[ OK ] TypedTest/0.Success
>-[ RUN ] TypedTest/0.Failure
>-gtest_output_test_.cc:#: error: Value of: TypeParam()
>- Actual: 0
>-Expected: 1
>-Expected failure
>-[ FAILED ] TypedTest/0.Failure
>-[----------] 2 tests from Unsigned/TypedTestP/0, where TypeParam = unsigned char
>-[ RUN ] Unsigned/TypedTestP/0.Success
>-[ OK ] Unsigned/TypedTestP/0.Success
>-[ RUN ] Unsigned/TypedTestP/0.Failure
>-gtest_output_test_.cc:#: error: Value of: TypeParam()
>- Actual: \0
>-Expected: 1U
>-Which is: 1
>-Expected failure
>-[ FAILED ] Unsigned/TypedTestP/0.Failure
>-[----------] 2 tests from Unsigned/TypedTestP/1, where TypeParam = unsigned int
>-[ RUN ] Unsigned/TypedTestP/1.Success
>-[ OK ] Unsigned/TypedTestP/1.Success
>-[ RUN ] Unsigned/TypedTestP/1.Failure
>-gtest_output_test_.cc:#: error: Value of: TypeParam()
>- Actual: 0
>-Expected: 1U
>-Which is: 1
>-Expected failure
>-[ FAILED ] Unsigned/TypedTestP/1.Failure
>-[----------] 4 tests from ExpectFailureTest
>-[ RUN ] ExpectFailureTest.ExpectFatalFailure
>-(expecting 1 failure)
>-gtest.cc:#: error: Expected: 1 fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Success:
>-Succeeded
>-
>-(expecting 1 failure)
>-gtest.cc:#: error: Expected: 1 fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Non-fatal failure:
>-Failed
>-Expected non-fatal failure.
>-
>-(expecting 1 failure)
>-gtest.cc:#: error: Expected: 1 fatal failure containing "Some other fatal failure expected."
>- Actual:
>-gtest_output_test_.cc:#: Fatal failure:
>-Failed
>-Expected fatal failure.
>-
>-[ FAILED ] ExpectFailureTest.ExpectFatalFailure
>-[ RUN ] ExpectFailureTest.ExpectNonFatalFailure
>-(expecting 1 failure)
>-gtest.cc:#: error: Expected: 1 non-fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Success:
>-Succeeded
>-
>-(expecting 1 failure)
>-gtest.cc:#: error: Expected: 1 non-fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Fatal failure:
>-Failed
>-Expected fatal failure.
>-
>-(expecting 1 failure)
>-gtest.cc:#: error: Expected: 1 non-fatal failure containing "Some other non-fatal failure."
>- Actual:
>-gtest_output_test_.cc:#: Non-fatal failure:
>-Failed
>-Expected non-fatal failure.
>-
>-[ FAILED ] ExpectFailureTest.ExpectNonFatalFailure
>-[ RUN ] ExpectFailureTest.ExpectFatalFailureOnAllThreads
>-(expecting 1 failure)
>-gtest.cc:#: error: Expected: 1 fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Success:
>-Succeeded
>-
>-(expecting 1 failure)
>-gtest.cc:#: error: Expected: 1 fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Non-fatal failure:
>-Failed
>-Expected non-fatal failure.
>-
>-(expecting 1 failure)
>-gtest.cc:#: error: Expected: 1 fatal failure containing "Some other fatal failure expected."
>- Actual:
>-gtest_output_test_.cc:#: Fatal failure:
>-Failed
>-Expected fatal failure.
>-
>-[ FAILED ] ExpectFailureTest.ExpectFatalFailureOnAllThreads
>-[ RUN ] ExpectFailureTest.ExpectNonFatalFailureOnAllThreads
>-(expecting 1 failure)
>-gtest.cc:#: error: Expected: 1 non-fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Success:
>-Succeeded
>-
>-(expecting 1 failure)
>-gtest.cc:#: error: Expected: 1 non-fatal failure
>- Actual:
>-gtest_output_test_.cc:#: Fatal failure:
>-Failed
>-Expected fatal failure.
>-
>-(expecting 1 failure)
>-gtest.cc:#: error: Expected: 1 non-fatal failure containing "Some other non-fatal failure."
>- Actual:
>-gtest_output_test_.cc:#: Non-fatal failure:
>-Failed
>-Expected non-fatal failure.
>-
>-[ FAILED ] ExpectFailureTest.ExpectNonFatalFailureOnAllThreads
>-[----------] Global test environment tear-down
>-BarEnvironment::TearDown() called.
>-gtest_output_test_.cc:#: error: Failed
>-Expected non-fatal failure.
>-FooEnvironment::TearDown() called.
>-gtest_output_test_.cc:#: error: Failed
>-Expected fatal failure.
>-[==========] 61 tests from 27 test cases ran.
>-[ PASSED ] 21 tests.
>-[ FAILED ] 40 tests, listed below:
>-[ FAILED ] FatalFailureTest.FatalFailureInSubroutine
>-[ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine
>-[ FAILED ] FatalFailureTest.NonfatalFailureInSubroutine
>-[ FAILED ] LoggingTest.InterleavingLoggingAndAssertions
>-[ FAILED ] SCOPED_TRACETest.ObeysScopes
>-[ FAILED ] SCOPED_TRACETest.WorksInLoop
>-[ FAILED ] SCOPED_TRACETest.WorksInSubroutine
>-[ FAILED ] SCOPED_TRACETest.CanBeNested
>-[ FAILED ] SCOPED_TRACETest.CanBeRepeated
>-[ FAILED ] NonFatalFailureInFixtureConstructorTest.FailureInConstructor
>-[ FAILED ] FatalFailureInFixtureConstructorTest.FailureInConstructor
>-[ FAILED ] NonFatalFailureInSetUpTest.FailureInSetUp
>-[ FAILED ] FatalFailureInSetUpTest.FailureInSetUp
>-[ FAILED ] ExceptionInFixtureCtorTest.ExceptionInFixtureCtor
>-[ FAILED ] ExceptionInSetUpTest.ExceptionInSetUp
>-[ FAILED ] ExceptionInTestFunctionTest.SEH
>-[ FAILED ] ExceptionInTestFunctionTest.CppException
>-[ FAILED ] ExceptionInTearDownTest.ExceptionInTearDown
>-[ FAILED ] MixedUpTestCaseTest.ThisShouldFail
>-[ FAILED ] MixedUpTestCaseTest.ThisShouldFailToo
>-[ FAILED ] MixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
>-[ FAILED ] TEST_F_before_TEST_in_same_test_case.DefinedUsingTESTAndShouldFail
>-[ FAILED ] TEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail
>-[ FAILED ] ExpectNonfatalFailureTest.FailsWhenThereIsNoNonfatalFailure
>-[ FAILED ] ExpectNonfatalFailureTest.FailsWhenThereAreTwoNonfatalFailures
>-[ FAILED ] ExpectNonfatalFailureTest.FailsWhenThereIsOneFatalFailure
>-[ FAILED ] ExpectNonfatalFailureTest.FailsWhenStatementReturns
>-[ FAILED ] ExpectNonfatalFailureTest.FailsWhenStatementThrows
>-[ FAILED ] ExpectFatalFailureTest.FailsWhenThereIsNoFatalFailure
>-[ FAILED ] ExpectFatalFailureTest.FailsWhenThereAreTwoFatalFailures
>-[ FAILED ] ExpectFatalFailureTest.FailsWhenThereIsOneNonfatalFailure
>-[ FAILED ] ExpectFatalFailureTest.FailsWhenStatementReturns
>-[ FAILED ] ExpectFatalFailureTest.FailsWhenStatementThrows
>-[ FAILED ] TypedTest/0.Failure, where TypeParam = int
>-[ FAILED ] Unsigned/TypedTestP/0.Failure, where TypeParam = unsigned char
>-[ FAILED ] Unsigned/TypedTestP/1.Failure, where TypeParam = unsigned int
>-[ FAILED ] ExpectFailureTest.ExpectFatalFailure
>-[ FAILED ] ExpectFailureTest.ExpectNonFatalFailure
>-[ FAILED ] ExpectFailureTest.ExpectFatalFailureOnAllThreads
>-[ FAILED ] ExpectFailureTest.ExpectNonFatalFailureOnAllThreads
>-
>-40 FAILED TESTS
>- YOU HAVE 1 DISABLED TEST
>-
>-Note: Google Test filter = FatalFailureTest.*:LoggingTest.*
>-[==========] Running 4 tests from 2 test cases.
>-[----------] Global test environment set-up.
>-[----------] 3 tests from FatalFailureTest
>-[ RUN ] FatalFailureTest.FatalFailureInSubroutine
>-(expecting a failure that x should be 1)
>-gtest_output_test_.cc:#: error: Value of: x
>- Actual: 2
>-Expected: 1
>-[ FAILED ] FatalFailureTest.FatalFailureInSubroutine (? ms)
>-[ RUN ] FatalFailureTest.FatalFailureInNestedSubroutine
>-(expecting a failure that x should be 1)
>-gtest_output_test_.cc:#: error: Value of: x
>- Actual: 2
>-Expected: 1
>-[ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine (? ms)
>-[ RUN ] FatalFailureTest.NonfatalFailureInSubroutine
>-(expecting a failure on false)
>-gtest_output_test_.cc:#: error: Value of: false
>- Actual: false
>-Expected: true
>-[ FAILED ] FatalFailureTest.NonfatalFailureInSubroutine (? ms)
>-[----------] 3 tests from FatalFailureTest (? ms total)
>-
>-[----------] 1 test from LoggingTest
>-[ RUN ] LoggingTest.InterleavingLoggingAndAssertions
>-(expecting 2 failures on (3) >= (a[i]))
>-i == 0
>-i == 1
>-gtest_output_test_.cc:#: error: Expected: (3) >= (a[i]), actual: 3 vs 9
>-i == 2
>-i == 3
>-gtest_output_test_.cc:#: error: Expected: (3) >= (a[i]), actual: 3 vs 6
>-[ FAILED ] LoggingTest.InterleavingLoggingAndAssertions (? ms)
>-[----------] 1 test from LoggingTest (? ms total)
>-
>-[----------] Global test environment tear-down
>-[==========] 4 tests from 2 test cases ran. (? ms total)
>-[ PASSED ] 0 tests.
>-[ FAILED ] 4 tests, listed below:
>-[ FAILED ] FatalFailureTest.FatalFailureInSubroutine
>-[ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine
>-[ FAILED ] FatalFailureTest.NonfatalFailureInSubroutine
>-[ FAILED ] LoggingTest.InterleavingLoggingAndAssertions
>-
>- 4 FAILED TESTS
>- YOU HAVE 1 DISABLED TEST
>-
>-Note: Google Test filter = *DISABLED_*
>-[==========] Running 1 test from 1 test case.
>-[----------] Global test environment set-up.
>-[----------] 1 test from DisabledTestsWarningTest
>-[ RUN ] DisabledTestsWarningTest.DISABLED_AlsoRunDisabledTestsFlagSuppressesWarning
>-[ OK ] DisabledTestsWarningTest.DISABLED_AlsoRunDisabledTestsFlagSuppressesWarning
>-[----------] Global test environment tear-down
>-[==========] 1 test from 1 test case ran.
>-[ PASSED ] 1 test.
>-Note: Google Test filter = PassingTest.*
>-Note: This is test shard 1 of 2.
>-[==========] Running 1 test from 1 test case.
>-[----------] Global test environment set-up.
>-[----------] 1 test from PassingTest
>-[ RUN ] PassingTest.PassingTest2
>-[ OK ] PassingTest.PassingTest2
>-[----------] Global test environment tear-down
>-[==========] 1 test from 1 test case ran.
>-[ PASSED ] 1 test.
>-
>- YOU HAVE 1 DISABLED TEST
>-
>diff --git a/Source/ThirdParty/gtest/test/gtest_pred_impl_unittest.cc b/Source/ThirdParty/gtest/test/gtest_pred_impl_unittest.cc
>index e7ee54b56d86b9ea54b716125869aa287d126be7..b466c150aedc43fdb10373b7a802ccbe775790f8 100644
>--- a/Source/ThirdParty/gtest/test/gtest_pred_impl_unittest.cc
>+++ b/Source/ThirdParty/gtest/test/gtest_pred_impl_unittest.cc
>@@ -27,7 +27,7 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
>-// This file is AUTOMATICALLY GENERATED on 10/02/2008 by command
>+// This file is AUTOMATICALLY GENERATED on 01/02/2018 by command
> // 'gen_gtest_pred_impl.py 5'. DO NOT EDIT BY HAND!
> 
> // Regression test for gtest_pred_impl.h
>@@ -49,8 +49,8 @@
> 
> #include <iostream>
> 
>-#include <gtest/gtest.h>
>-#include <gtest/gtest-spi.h>
>+#include "gtest/gtest.h"
>+#include "gtest/gtest-spi.h"
> 
> // A user-defined data type.
> struct Bool {
>@@ -103,11 +103,10 @@ testing::AssertionResult PredFormatFunction1(const char* e1,
> if (PredFunction1(v1))
> return testing::AssertionSuccess();
> 
>- testing::Message msg;
>- msg << e1
>+ return testing::AssertionFailure()
>+ << e1
> << " is expected to be positive, but evaluates to "
> << v1 << ".";
>- return testing::AssertionFailure(msg);
> }
> 
> // A unary predicate-formatter functor.
>@@ -494,11 +493,10 @@ testing::AssertionResult PredFormatFunction2(const char* e1,
> if (PredFunction2(v1, v2))
> return testing::AssertionSuccess();
> 
>- testing::Message msg;
>- msg << e1 << " + " << e2
>+ return testing::AssertionFailure()
>+ << e1 << " + " << e2
> << " is expected to be positive, but evaluates to "
> << v1 + v2 << ".";
>- return testing::AssertionFailure(msg);
> }
> 
> // A binary predicate-formatter functor.
>@@ -927,11 +925,10 @@ testing::AssertionResult PredFormatFunction3(const char* e1,
> if (PredFunction3(v1, v2, v3))
> return testing::AssertionSuccess();
> 
>- testing::Message msg;
>- msg << e1 << " + " << e2 << " + " << e3
>+ return testing::AssertionFailure()
>+ << e1 << " + " << e2 << " + " << e3
> << " is expected to be positive, but evaluates to "
> << v1 + v2 + v3 << ".";
>- return testing::AssertionFailure(msg);
> }
> 
> // A ternary predicate-formatter functor.
>@@ -1402,11 +1399,10 @@ testing::AssertionResult PredFormatFunction4(const char* e1,
> if (PredFunction4(v1, v2, v3, v4))
> return testing::AssertionSuccess();
> 
>- testing::Message msg;
>- msg << e1 << " + " << e2 << " + " << e3 << " + " << e4
>+ return testing::AssertionFailure()
>+ << e1 << " + " << e2 << " + " << e3 << " + " << e4
> << " is expected to be positive, but evaluates to "
> << v1 + v2 + v3 + v4 << ".";
>- return testing::AssertionFailure(msg);
> }
> 
> // A 4-ary predicate-formatter functor.
>@@ -1919,11 +1915,10 @@ testing::AssertionResult PredFormatFunction5(const char* e1,
> if (PredFunction5(v1, v2, v3, v4, v5))
> return testing::AssertionSuccess();
> 
>- testing::Message msg;
>- msg << e1 << " + " << e2 << " + " << e3 << " + " << e4 << " + " << e5
>+ return testing::AssertionFailure()
>+ << e1 << " + " << e2 << " + " << e3 << " + " << e4 << " + " << e5
> << " is expected to be positive, but evaluates to "
> << v1 + v2 + v3 + v4 + v5 << ".";
>- return testing::AssertionFailure(msg);
> }
> 
> // A 5-ary predicate-formatter functor.
>diff --git a/Source/ThirdParty/gtest/test/gtest_premature_exit_test.cc b/Source/ThirdParty/gtest/test/gtest_premature_exit_test.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..c1e93056d8b562c59feba8278e20c29df13e1915
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/gtest_premature_exit_test.cc
>@@ -0,0 +1,126 @@
>+// Copyright 2013, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+//
>+// Tests that Google Test manipulates the premature-exit-detection
>+// file correctly.
>+
>+#include <stdio.h>
>+
>+#include "gtest/gtest.h"
>+
>+using ::testing::InitGoogleTest;
>+using ::testing::Test;
>+using ::testing::internal::posix::GetEnv;
>+using ::testing::internal::posix::Stat;
>+using ::testing::internal::posix::StatStruct;
>+
>+namespace {
>+
>+class PrematureExitTest : public Test {
>+ public:
>+ // Returns true iff the given file exists.
>+ static bool FileExists(const char* filepath) {
>+ StatStruct stat;
>+ return Stat(filepath, &stat) == 0;
>+ }
>+
>+ protected:
>+ PrematureExitTest() {
>+ premature_exit_file_path_ = GetEnv("TEST_PREMATURE_EXIT_FILE");
>+
>+ // Normalize NULL to "" for ease of handling.
>+ if (premature_exit_file_path_ == NULL) {
>+ premature_exit_file_path_ = "";
>+ }
>+ }
>+
>+ // Returns true iff the premature-exit file exists.
>+ bool PrematureExitFileExists() const {
>+ return FileExists(premature_exit_file_path_);
>+ }
>+
>+ const char* premature_exit_file_path_;
>+};
>+
>+typedef PrematureExitTest PrematureExitDeathTest;
>+
>+// Tests that:
>+// - the premature-exit file exists during the execution of a
>+// death test (EXPECT_DEATH*), and
>+// - a death test doesn't interfere with the main test process's
>+// handling of the premature-exit file.
>+TEST_F(PrematureExitDeathTest, FileExistsDuringExecutionOfDeathTest) {
>+ if (*premature_exit_file_path_ == '\0') {
>+ return;
>+ }
>+
>+ EXPECT_DEATH_IF_SUPPORTED({
>+ // If the file exists, crash the process such that the main test
>+ // process will catch the (expected) crash and report a success;
>+ // otherwise don't crash, which will cause the main test process
>+ // to report that the death test has failed.
>+ if (PrematureExitFileExists()) {
>+ exit(1);
>+ }
>+ }, "");
>+}
>+
>+// Tests that the premature-exit file exists during the execution of a
>+// normal (non-death) test.
>+TEST_F(PrematureExitTest, PrematureExitFileExistsDuringTestExecution) {
>+ if (*premature_exit_file_path_ == '\0') {
>+ return;
>+ }
>+
>+ EXPECT_TRUE(PrematureExitFileExists())
>+ << " file " << premature_exit_file_path_
>+ << " should exist during test execution, but doesn't.";
>+}
>+
>+} // namespace
>+
>+int main(int argc, char **argv) {
>+ InitGoogleTest(&argc, argv);
>+ const int exit_code = RUN_ALL_TESTS();
>+
>+ // Test that the premature-exit file is deleted upon return from
>+ // RUN_ALL_TESTS().
>+ const char* const filepath = GetEnv("TEST_PREMATURE_EXIT_FILE");
>+ if (filepath != NULL && *filepath != '\0') {
>+ if (PrematureExitTest::FileExists(filepath)) {
>+ printf(
>+ "File %s shouldn't exist after the test program finishes, but does.",
>+ filepath);
>+ return 1;
>+ }
>+ }
>+
>+ return exit_code;
>+}
>diff --git a/Source/ThirdParty/gtest/test/gtest_prod_test.cc b/Source/ThirdParty/gtest/test/gtest_prod_test.cc
>index bc3201d0f24ae98ed062c7b8c9f44d7dfe6d7c96..ede81a0d17a02c853ed2234ec88fe8277180a37e 100644
>--- a/Source/ThirdParty/gtest/test/gtest_prod_test.cc
>+++ b/Source/ThirdParty/gtest/test/gtest_prod_test.cc
>@@ -26,13 +26,12 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
> //
>-// Author: wan@google.com (Zhanyong Wan)
>-//
>-// Unit test for include/gtest/gtest_prod.h.
>+// Unit test for gtest_prod.h.
> 
>-#include <gtest/gtest.h>
>-#include "test/production.h"
>+#include "production.h"
>+#include "gtest/gtest.h"
> 
> // Tests that private members can be accessed from a TEST declared as
> // a friend of the class.
>diff --git a/Source/ThirdParty/gtest/test/gtest_repeat_test.cc b/Source/ThirdParty/gtest/test/gtest_repeat_test.cc
>index df6868b830296125a27c7f37f9316ced4ed82d54..1e8f499bb9de3d14bcb3bb1a641c06d7a1250ad2 100644
>--- a/Source/ThirdParty/gtest/test/gtest_repeat_test.cc
>+++ b/Source/ThirdParty/gtest/test/gtest_repeat_test.cc
>@@ -26,23 +26,14 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>+
> 
> // Tests the --gtest_repeat=number flag.
> 
> #include <stdlib.h>
> #include <iostream>
>-#include <gtest/gtest.h>
>-
>-// Indicates that this translation unit is part of Google Test's
>-// implementation. It must come before gtest-internal-inl.h is
>-// included, or there will be a compiler error. This trick is to
>-// prevent a user from accidentally including gtest-internal-inl.h in
>-// his code.
>-#define GTEST_IMPLEMENTATION_ 1
>+#include "gtest/gtest.h"
> #include "src/gtest-internal-inl.h"
>-#undef GTEST_IMPLEMENTATION_
> 
> namespace testing {
> 
>@@ -69,13 +60,13 @@ namespace {
> << " Actual: " << actual_val << "\n"\
> << "Expected: " #expected "\n"\
> << "Which is: " << expected_val << "\n";\
>- abort();\
>+ ::testing::internal::posix::Abort();\
> }\
>- } while(::testing::internal::AlwaysFalse())
>+ } while (::testing::internal::AlwaysFalse())
> 
> 
> // Used for verifying that global environment set-up and tear-down are
>-// inside the gtest_repeat loop.
>+// inside the --gtest_repeat loop.
> 
> int g_environment_set_up_count = 0;
> int g_environment_tear_down_count = 0;
>@@ -113,13 +104,12 @@ TEST(BarDeathTest, ThreadSafeAndFast) {
> g_death_test_count++;
> 
> GTEST_FLAG(death_test_style) = "threadsafe";
>- EXPECT_DEATH_IF_SUPPORTED(abort(), "");
>+ EXPECT_DEATH_IF_SUPPORTED(::testing::internal::posix::Abort(), "");
> 
> GTEST_FLAG(death_test_style) = "fast";
>- EXPECT_DEATH_IF_SUPPORTED(abort(), "");
>+ EXPECT_DEATH_IF_SUPPORTED(::testing::internal::posix::Abort(), "");
> }
> 
>-#if GTEST_HAS_PARAM_TEST
> int g_param_test_count = 0;
> 
> const int kNumberOfParamTests = 10;
>@@ -127,15 +117,13 @@ const int kNumberOfParamTests = 10;
> class MyParamTest : public testing::TestWithParam<int> {};
> 
> TEST_P(MyParamTest, ShouldPass) {
>- // TODO(vladl@google.com): Make parameter value checking robust
>- // WRT order of tests.
>+ // FIXME: Make parameter value checking robust WRT order of tests.
> GTEST_CHECK_INT_EQ_(g_param_test_count % kNumberOfParamTests, GetParam());
> g_param_test_count++;
> }
> INSTANTIATE_TEST_CASE_P(MyParamSequence,
> MyParamTest,
> testing::Range(0, kNumberOfParamTests));
>-#endif // GTEST_HAS_PARAM_TEST
> 
> // Resets the count for each test.
> void ResetCounts() {
>@@ -144,9 +132,7 @@ void ResetCounts() {
> g_should_fail_count = 0;
> g_should_pass_count = 0;
> g_death_test_count = 0;
>-#if GTEST_HAS_PARAM_TEST
> g_param_test_count = 0;
>-#endif // GTEST_HAS_PARAM_TEST
> }
> 
> // Checks that the count for each test is expected.
>@@ -156,9 +142,7 @@ void CheckCounts(int expected) {
> GTEST_CHECK_INT_EQ_(expected, g_should_fail_count);
> GTEST_CHECK_INT_EQ_(expected, g_should_pass_count);
> GTEST_CHECK_INT_EQ_(expected, g_death_test_count);
>-#if GTEST_HAS_PARAM_TEST
> GTEST_CHECK_INT_EQ_(expected * kNumberOfParamTests, g_param_test_count);
>-#endif // GTEST_HAS_PARAM_TEST
> }
> 
> // Tests the behavior of Google Test when --gtest_repeat is not specified.
>@@ -201,9 +185,7 @@ void TestRepeatWithFilterForSuccessfulTests(int repeat) {
> GTEST_CHECK_INT_EQ_(0, g_should_fail_count);
> GTEST_CHECK_INT_EQ_(repeat, g_should_pass_count);
> GTEST_CHECK_INT_EQ_(repeat, g_death_test_count);
>-#if GTEST_HAS_PARAM_TEST
> GTEST_CHECK_INT_EQ_(repeat * kNumberOfParamTests, g_param_test_count);
>-#endif // GTEST_HAS_PARAM_TEST
> }
> 
> // Tests using --gtest_repeat when --gtest_filter specifies a set of
>@@ -219,15 +201,14 @@ void TestRepeatWithFilterForFailedTests(int repeat) {
> GTEST_CHECK_INT_EQ_(repeat, g_should_fail_count);
> GTEST_CHECK_INT_EQ_(0, g_should_pass_count);
> GTEST_CHECK_INT_EQ_(0, g_death_test_count);
>-#if GTEST_HAS_PARAM_TEST
> GTEST_CHECK_INT_EQ_(0, g_param_test_count);
>-#endif // GTEST_HAS_PARAM_TEST
> }
> 
> } // namespace
> 
> int main(int argc, char **argv) {
> testing::InitGoogleTest(&argc, argv);
>+
> testing::AddGlobalTestEnvironment(new MyEnvironment);
> 
> TestRepeatUnspecified();
>diff --git a/Source/ThirdParty/gtest/test/gtest_shuffle_test.py b/Source/ThirdParty/gtest/test/gtest_shuffle_test.py
>deleted file mode 100755
>index 30d0303d193554a5fd0b9b1f6a51ef7d09f30612..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_shuffle_test.py
>+++ /dev/null
>@@ -1,325 +0,0 @@
>-#!/usr/bin/env python
>-#
>-# Copyright 2009 Google Inc. All Rights Reserved.
>-#
>-# Redistribution and use in source and binary forms, with or without
>-# modification, are permitted provided that the following conditions are
>-# met:
>-#
>-# * Redistributions of source code must retain the above copyright
>-# notice, this list of conditions and the following disclaimer.
>-# * Redistributions in binary form must reproduce the above
>-# copyright notice, this list of conditions and the following disclaimer
>-# in the documentation and/or other materials provided with the
>-# distribution.
>-# * Neither the name of Google Inc. nor the names of its
>-# contributors may be used to endorse or promote products derived from
>-# this software without specific prior written permission.
>-#
>-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-
>-"""Verifies that test shuffling works."""
>-
>-__author__ = 'wan@google.com (Zhanyong Wan)'
>-
>-import os
>-import gtest_test_utils
>-
>-# Command to run the gtest_shuffle_test_ program.
>-COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_shuffle_test_')
>-
>-# The environment variables for test sharding.
>-TOTAL_SHARDS_ENV_VAR = 'GTEST_TOTAL_SHARDS'
>-SHARD_INDEX_ENV_VAR = 'GTEST_SHARD_INDEX'
>-
>-TEST_FILTER = 'A*.A:A*.B:C*'
>-
>-ALL_TESTS = []
>-ACTIVE_TESTS = []
>-FILTERED_TESTS = []
>-SHARDED_TESTS = []
>-
>-SHUFFLED_ALL_TESTS = []
>-SHUFFLED_ACTIVE_TESTS = []
>-SHUFFLED_FILTERED_TESTS = []
>-SHUFFLED_SHARDED_TESTS = []
>-
>-
>-def AlsoRunDisabledTestsFlag():
>- return '--gtest_also_run_disabled_tests'
>-
>-
>-def FilterFlag(test_filter):
>- return '--gtest_filter=%s' % (test_filter,)
>-
>-
>-def RepeatFlag(n):
>- return '--gtest_repeat=%s' % (n,)
>-
>-
>-def ShuffleFlag():
>- return '--gtest_shuffle'
>-
>-
>-def RandomSeedFlag(n):
>- return '--gtest_random_seed=%s' % (n,)
>-
>-
>-def RunAndReturnOutput(extra_env, args):
>- """Runs the test program and returns its output."""
>-
>- environ_copy = os.environ.copy()
>- environ_copy.update(extra_env)
>-
>- return gtest_test_utils.Subprocess([COMMAND] + args, env=environ_copy).output
>-
>-
>-def GetTestsForAllIterations(extra_env, args):
>- """Runs the test program and returns a list of test lists.
>-
>- Args:
>- extra_env: a map from environment variables to their values
>- args: command line flags to pass to gtest_shuffle_test_
>-
>- Returns:
>- A list where the i-th element is the list of tests run in the i-th
>- test iteration.
>- """
>-
>- test_iterations = []
>- for line in RunAndReturnOutput(extra_env, args).split('\n'):
>- if line.startswith('----'):
>- tests = []
>- test_iterations.append(tests)
>- elif line.strip():
>- tests.append(line.strip()) # 'TestCaseName.TestName'
>-
>- return test_iterations
>-
>-
>-def GetTestCases(tests):
>- """Returns a list of test cases in the given full test names.
>-
>- Args:
>- tests: a list of full test names
>-
>- Returns:
>- A list of test cases from 'tests', in their original order.
>- Consecutive duplicates are removed.
>- """
>-
>- test_cases = []
>- for test in tests:
>- test_case = test.split('.')[0]
>- if not test_case in test_cases:
>- test_cases.append(test_case)
>-
>- return test_cases
>-
>-
>-def CalculateTestLists():
>- """Calculates the list of tests run under different flags."""
>-
>- if not ALL_TESTS:
>- ALL_TESTS.extend(
>- GetTestsForAllIterations({}, [AlsoRunDisabledTestsFlag()])[0])
>-
>- if not ACTIVE_TESTS:
>- ACTIVE_TESTS.extend(GetTestsForAllIterations({}, [])[0])
>-
>- if not FILTERED_TESTS:
>- FILTERED_TESTS.extend(
>- GetTestsForAllIterations({}, [FilterFlag(TEST_FILTER)])[0])
>-
>- if not SHARDED_TESTS:
>- SHARDED_TESTS.extend(
>- GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
>- SHARD_INDEX_ENV_VAR: '1'},
>- [])[0])
>-
>- if not SHUFFLED_ALL_TESTS:
>- SHUFFLED_ALL_TESTS.extend(GetTestsForAllIterations(
>- {}, [AlsoRunDisabledTestsFlag(), ShuffleFlag(), RandomSeedFlag(1)])[0])
>-
>- if not SHUFFLED_ACTIVE_TESTS:
>- SHUFFLED_ACTIVE_TESTS.extend(GetTestsForAllIterations(
>- {}, [ShuffleFlag(), RandomSeedFlag(1)])[0])
>-
>- if not SHUFFLED_FILTERED_TESTS:
>- SHUFFLED_FILTERED_TESTS.extend(GetTestsForAllIterations(
>- {}, [ShuffleFlag(), RandomSeedFlag(1), FilterFlag(TEST_FILTER)])[0])
>-
>- if not SHUFFLED_SHARDED_TESTS:
>- SHUFFLED_SHARDED_TESTS.extend(
>- GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
>- SHARD_INDEX_ENV_VAR: '1'},
>- [ShuffleFlag(), RandomSeedFlag(1)])[0])
>-
>-
>-class GTestShuffleUnitTest(gtest_test_utils.TestCase):
>- """Tests test shuffling."""
>-
>- def setUp(self):
>- CalculateTestLists()
>-
>- def testShufflePreservesNumberOfTests(self):
>- self.assertEqual(len(ALL_TESTS), len(SHUFFLED_ALL_TESTS))
>- self.assertEqual(len(ACTIVE_TESTS), len(SHUFFLED_ACTIVE_TESTS))
>- self.assertEqual(len(FILTERED_TESTS), len(SHUFFLED_FILTERED_TESTS))
>- self.assertEqual(len(SHARDED_TESTS), len(SHUFFLED_SHARDED_TESTS))
>-
>- def testShuffleChangesTestOrder(self):
>- self.assert_(SHUFFLED_ALL_TESTS != ALL_TESTS, SHUFFLED_ALL_TESTS)
>- self.assert_(SHUFFLED_ACTIVE_TESTS != ACTIVE_TESTS, SHUFFLED_ACTIVE_TESTS)
>- self.assert_(SHUFFLED_FILTERED_TESTS != FILTERED_TESTS,
>- SHUFFLED_FILTERED_TESTS)
>- self.assert_(SHUFFLED_SHARDED_TESTS != SHARDED_TESTS,
>- SHUFFLED_SHARDED_TESTS)
>-
>- def testShuffleChangesTestCaseOrder(self):
>- self.assert_(GetTestCases(SHUFFLED_ALL_TESTS) != GetTestCases(ALL_TESTS),
>- GetTestCases(SHUFFLED_ALL_TESTS))
>- self.assert_(
>- GetTestCases(SHUFFLED_ACTIVE_TESTS) != GetTestCases(ACTIVE_TESTS),
>- GetTestCases(SHUFFLED_ACTIVE_TESTS))
>- self.assert_(
>- GetTestCases(SHUFFLED_FILTERED_TESTS) != GetTestCases(FILTERED_TESTS),
>- GetTestCases(SHUFFLED_FILTERED_TESTS))
>- self.assert_(
>- GetTestCases(SHUFFLED_SHARDED_TESTS) != GetTestCases(SHARDED_TESTS),
>- GetTestCases(SHUFFLED_SHARDED_TESTS))
>-
>- def testShuffleDoesNotRepeatTest(self):
>- for test in SHUFFLED_ALL_TESTS:
>- self.assertEqual(1, SHUFFLED_ALL_TESTS.count(test),
>- '%s appears more than once' % (test,))
>- for test in SHUFFLED_ACTIVE_TESTS:
>- self.assertEqual(1, SHUFFLED_ACTIVE_TESTS.count(test),
>- '%s appears more than once' % (test,))
>- for test in SHUFFLED_FILTERED_TESTS:
>- self.assertEqual(1, SHUFFLED_FILTERED_TESTS.count(test),
>- '%s appears more than once' % (test,))
>- for test in SHUFFLED_SHARDED_TESTS:
>- self.assertEqual(1, SHUFFLED_SHARDED_TESTS.count(test),
>- '%s appears more than once' % (test,))
>-
>- def testShuffleDoesNotCreateNewTest(self):
>- for test in SHUFFLED_ALL_TESTS:
>- self.assert_(test in ALL_TESTS, '%s is an invalid test' % (test,))
>- for test in SHUFFLED_ACTIVE_TESTS:
>- self.assert_(test in ACTIVE_TESTS, '%s is an invalid test' % (test,))
>- for test in SHUFFLED_FILTERED_TESTS:
>- self.assert_(test in FILTERED_TESTS, '%s is an invalid test' % (test,))
>- for test in SHUFFLED_SHARDED_TESTS:
>- self.assert_(test in SHARDED_TESTS, '%s is an invalid test' % (test,))
>-
>- def testShuffleIncludesAllTests(self):
>- for test in ALL_TESTS:
>- self.assert_(test in SHUFFLED_ALL_TESTS, '%s is missing' % (test,))
>- for test in ACTIVE_TESTS:
>- self.assert_(test in SHUFFLED_ACTIVE_TESTS, '%s is missing' % (test,))
>- for test in FILTERED_TESTS:
>- self.assert_(test in SHUFFLED_FILTERED_TESTS, '%s is missing' % (test,))
>- for test in SHARDED_TESTS:
>- self.assert_(test in SHUFFLED_SHARDED_TESTS, '%s is missing' % (test,))
>-
>- def testShuffleLeavesDeathTestsAtFront(self):
>- non_death_test_found = False
>- for test in SHUFFLED_ACTIVE_TESTS:
>- if 'DeathTest.' in test:
>- self.assert_(not non_death_test_found,
>- '%s appears after a non-death test' % (test,))
>- else:
>- non_death_test_found = True
>-
>- def _VerifyTestCasesDoNotInterleave(self, tests):
>- test_cases = []
>- for test in tests:
>- [test_case, _] = test.split('.')
>- if test_cases and test_cases[-1] != test_case:
>- test_cases.append(test_case)
>- self.assertEqual(1, test_cases.count(test_case),
>- 'Test case %s is not grouped together in %s' %
>- (test_case, tests))
>-
>- def testShuffleDoesNotInterleaveTestCases(self):
>- self._VerifyTestCasesDoNotInterleave(SHUFFLED_ALL_TESTS)
>- self._VerifyTestCasesDoNotInterleave(SHUFFLED_ACTIVE_TESTS)
>- self._VerifyTestCasesDoNotInterleave(SHUFFLED_FILTERED_TESTS)
>- self._VerifyTestCasesDoNotInterleave(SHUFFLED_SHARDED_TESTS)
>-
>- def testShuffleRestoresOrderAfterEachIteration(self):
>- # Get the test lists in all 3 iterations, using random seed 1, 2,
>- # and 3 respectively. Google Test picks a different seed in each
>- # iteration, and this test depends on the current implementation
>- # picking successive numbers. This dependency is not ideal, but
>- # makes the test much easier to write.
>- [tests_in_iteration1, tests_in_iteration2, tests_in_iteration3] = (
>- GetTestsForAllIterations(
>- {}, [ShuffleFlag(), RandomSeedFlag(1), RepeatFlag(3)]))
>-
>- # Make sure running the tests with random seed 1 gets the same
>- # order as in iteration 1 above.
>- [tests_with_seed1] = GetTestsForAllIterations(
>- {}, [ShuffleFlag(), RandomSeedFlag(1)])
>- self.assertEqual(tests_in_iteration1, tests_with_seed1)
>-
>- # Make sure running the tests with random seed 2 gets the same
>- # order as in iteration 2 above. Success means that Google Test
>- # correctly restores the test order before re-shuffling at the
>- # beginning of iteration 2.
>- [tests_with_seed2] = GetTestsForAllIterations(
>- {}, [ShuffleFlag(), RandomSeedFlag(2)])
>- self.assertEqual(tests_in_iteration2, tests_with_seed2)
>-
>- # Make sure running the tests with random seed 3 gets the same
>- # order as in iteration 3 above. Success means that Google Test
>- # correctly restores the test order before re-shuffling at the
>- # beginning of iteration 3.
>- [tests_with_seed3] = GetTestsForAllIterations(
>- {}, [ShuffleFlag(), RandomSeedFlag(3)])
>- self.assertEqual(tests_in_iteration3, tests_with_seed3)
>-
>- def testShuffleGeneratesNewOrderInEachIteration(self):
>- [tests_in_iteration1, tests_in_iteration2, tests_in_iteration3] = (
>- GetTestsForAllIterations(
>- {}, [ShuffleFlag(), RandomSeedFlag(1), RepeatFlag(3)]))
>-
>- self.assert_(tests_in_iteration1 != tests_in_iteration2,
>- tests_in_iteration1)
>- self.assert_(tests_in_iteration1 != tests_in_iteration3,
>- tests_in_iteration1)
>- self.assert_(tests_in_iteration2 != tests_in_iteration3,
>- tests_in_iteration2)
>-
>- def testShuffleShardedTestsPreservesPartition(self):
>- # If we run M tests on N shards, the same M tests should be run in
>- # total, regardless of the random seeds used by the shards.
>- [tests1] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
>- SHARD_INDEX_ENV_VAR: '0'},
>- [ShuffleFlag(), RandomSeedFlag(1)])
>- [tests2] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
>- SHARD_INDEX_ENV_VAR: '1'},
>- [ShuffleFlag(), RandomSeedFlag(20)])
>- [tests3] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
>- SHARD_INDEX_ENV_VAR: '2'},
>- [ShuffleFlag(), RandomSeedFlag(25)])
>- sorted_sharded_tests = tests1 + tests2 + tests3
>- sorted_sharded_tests.sort()
>- sorted_active_tests = []
>- sorted_active_tests.extend(ACTIVE_TESTS)
>- sorted_active_tests.sort()
>- self.assertEqual(sorted_active_tests, sorted_sharded_tests)
>-
>-if __name__ == '__main__':
>- gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/gtest_shuffle_test_.cc b/Source/ThirdParty/gtest/test/gtest_shuffle_test_.cc
>deleted file mode 100644
>index 53ecf7770a14117668b4adea6fb6f50266717de7..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_shuffle_test_.cc
>+++ /dev/null
>@@ -1,104 +0,0 @@
>-// Copyright 2009, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>-
>-// Verifies that test shuffling works.
>-
>-#include <gtest/gtest.h>
>-
>-namespace {
>-
>-using ::testing::EmptyTestEventListener;
>-using ::testing::InitGoogleTest;
>-using ::testing::Message;
>-using ::testing::Test;
>-using ::testing::TestEventListeners;
>-using ::testing::TestInfo;
>-using ::testing::UnitTest;
>-using ::testing::internal::String;
>-using ::testing::internal::scoped_ptr;
>-
>-// The test methods are empty, as the sole purpose of this program is
>-// to print the test names before/after shuffling.
>-
>-class A : public Test {};
>-TEST_F(A, A) {}
>-TEST_F(A, B) {}
>-
>-TEST(ADeathTest, A) {}
>-TEST(ADeathTest, B) {}
>-TEST(ADeathTest, C) {}
>-
>-TEST(B, A) {}
>-TEST(B, B) {}
>-TEST(B, C) {}
>-TEST(B, DISABLED_D) {}
>-TEST(B, DISABLED_E) {}
>-
>-TEST(BDeathTest, A) {}
>-TEST(BDeathTest, B) {}
>-
>-TEST(C, A) {}
>-TEST(C, B) {}
>-TEST(C, C) {}
>-TEST(C, DISABLED_D) {}
>-
>-TEST(CDeathTest, A) {}
>-
>-TEST(DISABLED_D, A) {}
>-TEST(DISABLED_D, DISABLED_B) {}
>-
>-// This printer prints the full test names only, starting each test
>-// iteration with a "----" marker.
>-class TestNamePrinter : public EmptyTestEventListener {
>- public:
>- virtual void OnTestIterationStart(const UnitTest& /* unit_test */,
>- int /* iteration */) {
>- printf("----\n");
>- }
>-
>- virtual void OnTestStart(const TestInfo& test_info) {
>- printf("%s.%s\n", test_info.test_case_name(), test_info.name());
>- }
>-};
>-
>-} // namespace
>-
>-int main(int argc, char **argv) {
>- InitGoogleTest(&argc, argv);
>-
>- // Replaces the default printer with TestNamePrinter, which prints
>- // the test name only.
>- TestEventListeners& listeners = UnitTest::GetInstance()->listeners();
>- delete listeners.Release(listeners.default_result_printer());
>- listeners.Append(new TestNamePrinter);
>-
>- return RUN_ALL_TESTS();
>-}
>diff --git a/Source/ThirdParty/gtest/test/gtest_sole_header_test.cc b/Source/ThirdParty/gtest/test/gtest_sole_header_test.cc
>index de91e800f5a1382999fc201f5cf3ce0464caa1ce..1d94ac6b3ad9f9f7dbadbfb2bf749b8271560dac 100644
>--- a/Source/ThirdParty/gtest/test/gtest_sole_header_test.cc
>+++ b/Source/ThirdParty/gtest/test/gtest_sole_header_test.cc
>@@ -26,13 +26,12 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: mheule@google.com (Markus Heule)
>+
> //
> // This test verifies that it's possible to use Google Test by including
> // the gtest.h header file alone.
> 
>-#include <gtest/gtest.h>
>+#include "gtest/gtest.h"
> 
> namespace {
> 
>diff --git a/Source/ThirdParty/gtest/test/gtest_stress_test.cc b/Source/ThirdParty/gtest/test/gtest_stress_test.cc
>index f5af78cc6d3f395a00d4d1ce8599fa5f1dfa7626..95ada39c337d0d4ece6ff5b3232de96c3d5986bd 100644
>--- a/Source/ThirdParty/gtest/test/gtest_stress_test.cc
>+++ b/Source/ThirdParty/gtest/test/gtest_stress_test.cc
>@@ -26,23 +26,16 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>+
> 
> // Tests that SCOPED_TRACE() and various Google Test assertions can be
> // used in a large number of threads concurrently.
> 
>-#include <gtest/gtest.h>
>+#include "gtest/gtest.h"
> 
>-#include <iostream>
> #include <vector>
> 
>-// We must define this macro in order to #include
>-// gtest-internal-inl.h. This is how Google Test prevents a user from
>-// accidentally depending on its internal implementation.
>-#define GTEST_IMPLEMENTATION_ 1
> #include "src/gtest-internal-inl.h"
>-#undef GTEST_IMPLEMENTATION_
> 
> #if GTEST_IS_THREADSAFE
> 
>@@ -50,7 +43,6 @@ namespace testing {
> namespace {
> 
> using internal::Notification;
>-using internal::String;
> using internal::TestPropertyKeyIs;
> using internal::ThreadWithParam;
> using internal::scoped_ptr;
>@@ -62,13 +54,13 @@ using internal::scoped_ptr;
> // How many threads to create?
> const int kThreadCount = 50;
> 
>-String IdToKey(int id, const char* suffix) {
>+std::string IdToKey(int id, const char* suffix) {
> Message key;
> key << "key_" << id << "_" << suffix;
> return key.GetString();
> }
> 
>-String IdToString(int id) {
>+std::string IdToString(int id) {
> Message id_message;
> id_message << id;
> return id_message.GetString();
>diff --git a/Source/ThirdParty/gtest/test/gtest_test_macro_stack_footprint_test.cc b/Source/ThirdParty/gtest/test/gtest_test_macro_stack_footprint_test.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..a48db05012cc30e0edf4a1354ff392c92d000bf0
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/gtest_test_macro_stack_footprint_test.cc
>@@ -0,0 +1,89 @@
>+// Copyright 2013, Google Inc.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+//
>+// Each TEST() expands to some static registration logic. GCC puts all
>+// such static initialization logic for a translation unit in a common,
>+// internal function. Since Google's build system restricts how much
>+// stack space a function can use, there's a limit on how many TEST()s
>+// one can put in a single C++ test file. This test ensures that a large
>+// number of TEST()s can be defined in the same translation unit.
>+
>+#include "gtest/gtest.h"
>+
>+// This macro defines 10 dummy tests.
>+#define TEN_TESTS_(test_case_name) \
>+ TEST(test_case_name, T0) {} \
>+ TEST(test_case_name, T1) {} \
>+ TEST(test_case_name, T2) {} \
>+ TEST(test_case_name, T3) {} \
>+ TEST(test_case_name, T4) {} \
>+ TEST(test_case_name, T5) {} \
>+ TEST(test_case_name, T6) {} \
>+ TEST(test_case_name, T7) {} \
>+ TEST(test_case_name, T8) {} \
>+ TEST(test_case_name, T9) {}
>+
>+// This macro defines 100 dummy tests.
>+#define HUNDRED_TESTS_(test_case_name_prefix) \
>+ TEN_TESTS_(test_case_name_prefix ## 0) \
>+ TEN_TESTS_(test_case_name_prefix ## 1) \
>+ TEN_TESTS_(test_case_name_prefix ## 2) \
>+ TEN_TESTS_(test_case_name_prefix ## 3) \
>+ TEN_TESTS_(test_case_name_prefix ## 4) \
>+ TEN_TESTS_(test_case_name_prefix ## 5) \
>+ TEN_TESTS_(test_case_name_prefix ## 6) \
>+ TEN_TESTS_(test_case_name_prefix ## 7) \
>+ TEN_TESTS_(test_case_name_prefix ## 8) \
>+ TEN_TESTS_(test_case_name_prefix ## 9)
>+
>+// This macro defines 1000 dummy tests.
>+#define THOUSAND_TESTS_(test_case_name_prefix) \
>+ HUNDRED_TESTS_(test_case_name_prefix ## 0) \
>+ HUNDRED_TESTS_(test_case_name_prefix ## 1) \
>+ HUNDRED_TESTS_(test_case_name_prefix ## 2) \
>+ HUNDRED_TESTS_(test_case_name_prefix ## 3) \
>+ HUNDRED_TESTS_(test_case_name_prefix ## 4) \
>+ HUNDRED_TESTS_(test_case_name_prefix ## 5) \
>+ HUNDRED_TESTS_(test_case_name_prefix ## 6) \
>+ HUNDRED_TESTS_(test_case_name_prefix ## 7) \
>+ HUNDRED_TESTS_(test_case_name_prefix ## 8) \
>+ HUNDRED_TESTS_(test_case_name_prefix ## 9)
>+
>+// Ensures that we can define 1000 TEST()s in the same translation
>+// unit.
>+THOUSAND_TESTS_(T)
>+
>+int main(int argc, char **argv) {
>+ testing::InitGoogleTest(&argc, argv);
>+
>+ // We don't actually need to run the dummy tests - the purpose is to
>+ // ensure that they compile.
>+ return 0;
>+}
>diff --git a/Source/ThirdParty/gtest/test/gtest_test_utils.py b/Source/ThirdParty/gtest/test/gtest_test_utils.py
>index e0f5973e7ea6f81e666c3121c3c8fa843f434f61..43cba8f4cd61dfff3a1a52101bed3e734a5e1b54 100755
>--- a/Source/ThirdParty/gtest/test/gtest_test_utils.py
>+++ b/Source/ThirdParty/gtest/test/gtest_test_utils.py
>@@ -1,5 +1,3 @@
>-#!/usr/bin/env python
>-#
> # Copyright 2006, Google Inc.
> # All rights reserved.
> #
>@@ -29,20 +27,21 @@
> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
>-"""Unit test utilities for Google C++ Testing Framework."""
>+"""Unit test utilities for Google C++ Testing and Mocking Framework."""
>+# Suppresses the 'Import not at the top of the file' lint complaint.
>+# pylint: disable-msg=C6204
>+
>+import os
>+import sys
> 
>-__author__ = 'wan@google.com (Zhanyong Wan)'
>+IS_WINDOWS = os.name == 'nt'
>+IS_CYGWIN = os.name == 'posix' and 'CYGWIN' in os.uname()[0]
> 
> import atexit
>-import os
> import shutil
>-import sys
> import tempfile
>-import unittest
>-_test_module = unittest
>+import unittest as _test_module
> 
>-# Suppresses the 'Import not at the top of the file' lint complaint.
>-# pylint: disable-msg=C6204
> try:
> import subprocess
> _SUBPROCESS_MODULE_AVAILABLE = True
>@@ -53,18 +52,30 @@ except:
> 
> GTEST_OUTPUT_VAR_NAME = 'GTEST_OUTPUT'
> 
>-IS_WINDOWS = os.name == 'nt'
>-IS_CYGWIN = os.name == 'posix' and 'CYGWIN' in os.uname()[0]
>+# The environment variable for specifying the path to the premature-exit file.
>+PREMATURE_EXIT_FILE_ENV_VAR = 'TEST_PREMATURE_EXIT_FILE'
>+
>+environ = os.environ.copy()
>+
>+
>+def SetEnvVar(env_var, value):
>+ """Sets/unsets an environment variable to a given value."""
>+
>+ if value is not None:
>+ environ[env_var] = value
>+ elif env_var in environ:
>+ del environ[env_var]
>+
> 
> # Here we expose a class from a particular module, depending on the
> # environment. The comment suppresses the 'Invalid variable name' lint
> # complaint.
>-TestCase = _test_module.TestCase # pylint: disable-msg=C6409
>+TestCase = _test_module.TestCase # pylint: disable=C6409
> 
> # Initially maps a flag to its default value. After
> # _ParseAndStripGTestFlags() is called, maps a flag to its actual value.
>-_flag_map = {'gtest_source_dir': os.path.dirname(sys.argv[0]),
>- 'gtest_build_dir': os.path.dirname(sys.argv[0])}
>+_flag_map = {'source_dir': os.path.dirname(sys.argv[0]),
>+ 'build_dir': os.path.dirname(sys.argv[0])}
> _gtest_flags_are_parsed = False
> 
> 
>@@ -73,7 +84,7 @@ def _ParseAndStripGTestFlags(argv):
> 
> # Suppresses the lint complaint about a global variable since we need it
> # here to maintain module-wide state.
>- global _gtest_flags_are_parsed # pylint: disable-msg=W0603
>+ global _gtest_flags_are_parsed # pylint: disable=W0603
> if _gtest_flags_are_parsed:
> return
> 
>@@ -111,13 +122,13 @@ def GetFlag(flag):
> def GetSourceDir():
> """Returns the absolute path of the directory where the .py files are."""
> 
>- return os.path.abspath(GetFlag('gtest_source_dir'))
>+ return os.path.abspath(GetFlag('source_dir'))
> 
> 
> def GetBuildDir():
> """Returns the absolute path of the directory where the test binaries are."""
> 
>- return os.path.abspath(GetFlag('gtest_build_dir'))
>+ return os.path.abspath(GetFlag('build_dir'))
> 
> 
> _temp_dir = None
>@@ -130,8 +141,6 @@ atexit.register(_RemoveTempDir)
> 
> 
> def GetTempDir():
>- """Returns a directory for temporary files."""
>-
> global _temp_dir
> if not _temp_dir:
> _temp_dir = tempfile.mkdtemp()
>@@ -160,13 +169,9 @@ def GetTestExecutablePath(executable_name, build_dir=None):
> 
> if not os.path.exists(path):
> message = (
>- 'Unable to find the test binary. Please make sure to provide path\n'
>- 'to the binary via the --gtest_build_dir flag or the GTEST_BUILD_DIR\n'
>- 'environment variable. For convenient use, invoke this script via\n'
>- 'mk_test.py.\n'
>- # TODO(vladl@google.com): change mk_test.py to test.py after renaming
>- # the file.
>- 'Please run mk_test.py -h for help.')
>+ 'Unable to find the test binary "%s". Please make sure to provide\n'
>+ 'a path to the binary via the --build_dir flag or the BUILD_DIR\n'
>+ 'environment variable.' % path)
> print >> sys.stderr, message
> sys.exit(1)
> 
>@@ -234,7 +239,7 @@ class Subprocess:
> p = subprocess.Popen(command,
> stdout=subprocess.PIPE, stderr=stderr,
> cwd=working_dir, universal_newlines=True, env=env)
>- # communicate returns a tuple with the file obect for the child's
>+ # communicate returns a tuple with the file object for the child's
> # output.
> self.output = p.communicate()[0]
> self._return_code = p.returncode
>@@ -245,7 +250,7 @@ class Subprocess:
> # Changes made by os.environ.clear are not inheritable by child
> # processes until Python 2.6. To produce inheritable changes we have
> # to delete environment items with the del statement.
>- for key in dest:
>+ for key in dest.keys():
> del dest[key]
> dest.update(src)
> 
>@@ -301,7 +306,7 @@ def Main():
> _ParseAndStripGTestFlags(sys.argv)
> # The tested binaries should not be writing XML output files unless the
> # script explicitly instructs them to.
>- # TODO(vladl@google.com): Move this into Subprocess when we implement
>+ # FIXME: Move this into Subprocess when we implement
> # passing environment into it as a parameter.
> if GTEST_OUTPUT_VAR_NAME in os.environ:
> del os.environ[GTEST_OUTPUT_VAR_NAME]
>diff --git a/Source/ThirdParty/gtest/test/gtest_testbridge_test.py b/Source/ThirdParty/gtest/test/gtest_testbridge_test.py
>new file mode 100755
>index 0000000000000000000000000000000000000000..87ffad73d40065298f30500de824d808b6571d8d
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/gtest_testbridge_test.py
>@@ -0,0 +1,63 @@
>+#!/usr/bin/env python
>+#
>+# Copyright 2018 Google LLC. All rights reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are
>+# met:
>+#
>+# * Redistributions of source code must retain the above copyright
>+# notice, this list of conditions and the following disclaimer.
>+# * Redistributions in binary form must reproduce the above
>+# copyright notice, this list of conditions and the following disclaimer
>+# in the documentation and/or other materials provided with the
>+# distribution.
>+# * Neither the name of Google Inc. nor the names of its
>+# contributors may be used to endorse or promote products derived from
>+# this software without specific prior written permission.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+"""Verifies that Google Test uses filter provided via testbridge."""
>+
>+import os
>+
>+import gtest_test_utils
>+
>+binary_name = 'gtest_testbridge_test_'
>+COMMAND = gtest_test_utils.GetTestExecutablePath(binary_name)
>+TESTBRIDGE_NAME = 'TESTBRIDGE_TEST_ONLY'
>+
>+
>+def Assert(condition):
>+ if not condition:
>+ raise AssertionError
>+
>+
>+class GTestTestFilterTest(gtest_test_utils.TestCase):
>+
>+ def testTestExecutionIsFiltered(self):
>+ """Tests that the test filter is picked up from the testbridge env var."""
>+ subprocess_env = os.environ.copy()
>+
>+ subprocess_env[TESTBRIDGE_NAME] = '*.TestThatSucceeds'
>+ p = gtest_test_utils.Subprocess(COMMAND, env=subprocess_env)
>+
>+ self.assertEquals(0, p.exit_code)
>+
>+ Assert('filter = *.TestThatSucceeds' in p.output)
>+ Assert('[ OK ] TestFilterTest.TestThatSucceeds' in p.output)
>+ Assert('[ PASSED ] 1 test.' in p.output)
>+
>+
>+if __name__ == '__main__':
>+ gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/gtest_testbridge_test_.cc b/Source/ThirdParty/gtest/test/gtest_testbridge_test_.cc
>new file mode 100644
>index 0000000000000000000000000000000000000000..24617b209e10a9d1798368e26465aaa62715f0ee
>--- /dev/null
>+++ b/Source/ThirdParty/gtest/test/gtest_testbridge_test_.cc
>@@ -0,0 +1,43 @@
>+// Copyright 2018, Google LLC.
>+// All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions are
>+// met:
>+//
>+// * Redistributions of source code must retain the above copyright
>+// notice, this list of conditions and the following disclaimer.
>+// * Redistributions in binary form must reproduce the above
>+// copyright notice, this list of conditions and the following disclaimer
>+// in the documentation and/or other materials provided with the
>+// distribution.
>+// * Neither the name of Google Inc. nor the names of its
>+// contributors may be used to endorse or promote products derived from
>+// this software without specific prior written permission.
>+//
>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+
>+// This program is meant to be run by gtest_test_filter_test.py. Do not run
>+// it directly.
>+
>+#include "gtest/gtest.h"
>+
>+// These tests are used to detect if filtering is working. Only
>+// 'TestThatSucceeds' should ever run.
>+
>+TEST(TestFilterTest, TestThatSucceeds) {}
>+
>+TEST(TestFilterTest, TestThatFails) {
>+ ASSERT_TRUE(false) << "This test should never be run.";
>+}
>diff --git a/Source/ThirdParty/gtest/test/gtest_throw_on_failure_ex_test.cc b/Source/ThirdParty/gtest/test/gtest_throw_on_failure_ex_test.cc
>index 8bf9dc905b5ff83ac021041343580f90975483ce..93f59d49cfdb9474dca622c17a2c964ab0bd58f4 100644
>--- a/Source/ThirdParty/gtest/test/gtest_throw_on_failure_ex_test.cc
>+++ b/Source/ThirdParty/gtest/test/gtest_throw_on_failure_ex_test.cc
>@@ -26,12 +26,11 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>+
> 
> // Tests Google Test's throw-on-failure mode with exceptions enabled.
> 
>-#include <gtest/gtest.h>
>+#include "gtest/gtest.h"
> 
> #include <stdlib.h>
> #include <stdio.h>
>diff --git a/Source/ThirdParty/gtest/test/gtest_throw_on_failure_test.py b/Source/ThirdParty/gtest/test/gtest_throw_on_failure_test.py
>deleted file mode 100755
>index 5678ffeaf6fa61ef7dcb45b8f34a0341191abf6e..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_throw_on_failure_test.py
>+++ /dev/null
>@@ -1,171 +0,0 @@
>-#!/usr/bin/env python
>-#
>-# Copyright 2009, Google Inc.
>-# All rights reserved.
>-#
>-# Redistribution and use in source and binary forms, with or without
>-# modification, are permitted provided that the following conditions are
>-# met:
>-#
>-# * Redistributions of source code must retain the above copyright
>-# notice, this list of conditions and the following disclaimer.
>-# * Redistributions in binary form must reproduce the above
>-# copyright notice, this list of conditions and the following disclaimer
>-# in the documentation and/or other materials provided with the
>-# distribution.
>-# * Neither the name of Google Inc. nor the names of its
>-# contributors may be used to endorse or promote products derived from
>-# this software without specific prior written permission.
>-#
>-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-
>-"""Tests Google Test's throw-on-failure mode with exceptions disabled.
>-
>-This script invokes gtest_throw_on_failure_test_ (a program written with
>-Google Test) with different environments and command line flags.
>-"""
>-
>-__author__ = 'wan@google.com (Zhanyong Wan)'
>-
>-import os
>-import gtest_test_utils
>-
>-
>-# Constants.
>-
>-# The command line flag for enabling/disabling the throw-on-failure mode.
>-THROW_ON_FAILURE = 'gtest_throw_on_failure'
>-
>-# Path to the gtest_throw_on_failure_test_ program, compiled with
>-# exceptions disabled.
>-EXE_PATH = gtest_test_utils.GetTestExecutablePath(
>- 'gtest_throw_on_failure_test_')
>-
>-
>-# Utilities.
>-
>-
>-def SetEnvVar(env_var, value):
>- """Sets an environment variable to a given value; unsets it when the
>- given value is None.
>- """
>-
>- env_var = env_var.upper()
>- if value is not None:
>- os.environ[env_var] = value
>- elif env_var in os.environ:
>- del os.environ[env_var]
>-
>-
>-def Run(command):
>- """Runs a command; returns True/False if its exit code is/isn't 0."""
>-
>- print 'Running "%s". . .' % ' '.join(command)
>- p = gtest_test_utils.Subprocess(command)
>- return p.exited and p.exit_code == 0
>-
>-
>-# The tests. TODO(wan@google.com): refactor the class to share common
>-# logic with code in gtest_break_on_failure_unittest.py.
>-class ThrowOnFailureTest(gtest_test_utils.TestCase):
>- """Tests the throw-on-failure mode."""
>-
>- def RunAndVerify(self, env_var_value, flag_value, should_fail):
>- """Runs gtest_throw_on_failure_test_ and verifies that it does
>- (or does not) exit with a non-zero code.
>-
>- Args:
>- env_var_value: value of the GTEST_BREAK_ON_FAILURE environment
>- variable; None if the variable should be unset.
>- flag_value: value of the --gtest_break_on_failure flag;
>- None if the flag should not be present.
>- should_fail: True iff the program is expected to fail.
>- """
>-
>- SetEnvVar(THROW_ON_FAILURE, env_var_value)
>-
>- if env_var_value is None:
>- env_var_value_msg = ' is not set'
>- else:
>- env_var_value_msg = '=' + env_var_value
>-
>- if flag_value is None:
>- flag = ''
>- elif flag_value == '0':
>- flag = '--%s=0' % THROW_ON_FAILURE
>- else:
>- flag = '--%s' % THROW_ON_FAILURE
>-
>- command = [EXE_PATH]
>- if flag:
>- command.append(flag)
>-
>- if should_fail:
>- should_or_not = 'should'
>- else:
>- should_or_not = 'should not'
>-
>- failed = not Run(command)
>-
>- SetEnvVar(THROW_ON_FAILURE, None)
>-
>- msg = ('when %s%s, an assertion failure in "%s" %s cause a non-zero '
>- 'exit code.' %
>- (THROW_ON_FAILURE, env_var_value_msg, ' '.join(command),
>- should_or_not))
>- self.assert_(failed == should_fail, msg)
>-
>- def testDefaultBehavior(self):
>- """Tests the behavior of the default mode."""
>-
>- self.RunAndVerify(env_var_value=None, flag_value=None, should_fail=False)
>-
>- def testThrowOnFailureEnvVar(self):
>- """Tests using the GTEST_THROW_ON_FAILURE environment variable."""
>-
>- self.RunAndVerify(env_var_value='0',
>- flag_value=None,
>- should_fail=False)
>- self.RunAndVerify(env_var_value='1',
>- flag_value=None,
>- should_fail=True)
>-
>- def testThrowOnFailureFlag(self):
>- """Tests using the --gtest_throw_on_failure flag."""
>-
>- self.RunAndVerify(env_var_value=None,
>- flag_value='0',
>- should_fail=False)
>- self.RunAndVerify(env_var_value=None,
>- flag_value='1',
>- should_fail=True)
>-
>- def testThrowOnFailureFlagOverridesEnvVar(self):
>- """Tests that --gtest_throw_on_failure overrides GTEST_THROW_ON_FAILURE."""
>-
>- self.RunAndVerify(env_var_value='0',
>- flag_value='0',
>- should_fail=False)
>- self.RunAndVerify(env_var_value='0',
>- flag_value='1',
>- should_fail=True)
>- self.RunAndVerify(env_var_value='1',
>- flag_value='0',
>- should_fail=False)
>- self.RunAndVerify(env_var_value='1',
>- flag_value='1',
>- should_fail=True)
>-
>-
>-if __name__ == '__main__':
>- gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/gtest_throw_on_failure_test_.cc b/Source/ThirdParty/gtest/test/gtest_throw_on_failure_test_.cc
>deleted file mode 100644
>index 88fbd5a76dc9206f4a029514b876dc0141e36bfa..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_throw_on_failure_test_.cc
>+++ /dev/null
>@@ -1,56 +0,0 @@
>-// Copyright 2009, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>-
>-// Tests Google Test's throw-on-failure mode with exceptions disabled.
>-//
>-// This program must be compiled with exceptions disabled. It will be
>-// invoked by gtest_throw_on_failure_test.py, and is expected to exit
>-// with non-zero in the throw-on-failure mode or 0 otherwise.
>-
>-#include <gtest/gtest.h>
>-
>-int main(int argc, char** argv) {
>- testing::InitGoogleTest(&argc, argv);
>-
>- // We want to ensure that people can use Google Test assertions in
>- // other testing frameworks, as long as they initialize Google Test
>- // properly and set the thrown-on-failure mode. Therefore, we don't
>- // use Google Test's constructs for defining and running tests
>- // (e.g. TEST and RUN_ALL_TESTS) here.
>-
>- // In the throw-on-failure mode with exceptions disabled, this
>- // assertion will cause the program to exit with a non-zero code.
>- EXPECT_EQ(2, 3);
>-
>- // When not in the throw-on-failure mode, the control will reach
>- // here.
>- return 0;
>-}
>diff --git a/Source/ThirdParty/gtest/test/gtest_uninitialized_test.py b/Source/ThirdParty/gtest/test/gtest_uninitialized_test.py
>deleted file mode 100755
>index 6ae57eeedafcf07504dd8d5d7a8b5a7f83813f27..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_uninitialized_test.py
>+++ /dev/null
>@@ -1,70 +0,0 @@
>-#!/usr/bin/env python
>-#
>-# Copyright 2008, Google Inc.
>-# All rights reserved.
>-#
>-# Redistribution and use in source and binary forms, with or without
>-# modification, are permitted provided that the following conditions are
>-# met:
>-#
>-# * Redistributions of source code must retain the above copyright
>-# notice, this list of conditions and the following disclaimer.
>-# * Redistributions in binary form must reproduce the above
>-# copyright notice, this list of conditions and the following disclaimer
>-# in the documentation and/or other materials provided with the
>-# distribution.
>-# * Neither the name of Google Inc. nor the names of its
>-# contributors may be used to endorse or promote products derived from
>-# this software without specific prior written permission.
>-#
>-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-
>-"""Verifies that Google Test warns the user when not initialized properly."""
>-
>-__author__ = 'wan@google.com (Zhanyong Wan)'
>-
>-import gtest_test_utils
>-
>-
>-COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_uninitialized_test_')
>-
>-
>-def Assert(condition):
>- if not condition:
>- raise AssertionError
>-
>-
>-def AssertEq(expected, actual):
>- if expected != actual:
>- print 'Expected: %s' % (expected,)
>- print ' Actual: %s' % (actual,)
>- raise AssertionError
>-
>-
>-def TestExitCodeAndOutput(command):
>- """Runs the given command and verifies its exit code and output."""
>-
>- # Verifies that 'command' exits with code 1.
>- p = gtest_test_utils.Subprocess(command)
>- Assert(p.exited)
>- AssertEq(1, p.exit_code)
>- Assert('InitGoogleTest' in p.output)
>-
>-
>-class GTestUninitializedTest(gtest_test_utils.TestCase):
>- def testExitCodeAndOutput(self):
>- TestExitCodeAndOutput(COMMAND)
>-
>-
>-if __name__ == '__main__':
>- gtest_test_utils.Main()
>diff --git a/Source/ThirdParty/gtest/test/gtest_uninitialized_test_.cc b/Source/ThirdParty/gtest/test/gtest_uninitialized_test_.cc
>deleted file mode 100644
>index e8b2aa81dd54d9c643a58de5e44d6ccb520a7765..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/gtest_uninitialized_test_.cc
>+++ /dev/null
>@@ -1,43 +0,0 @@
>-// Copyright 2008, Google Inc.
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are
>-// met:
>-//
>-// * Redistributions of source code must retain the above copyright
>-// notice, this list of conditions and the following disclaimer.
>-// * Redistributions in binary form must reproduce the above
>-// copyright notice, this list of conditions and the following disclaimer
>-// in the documentation and/or other materials provided with the
>-// distribution.
>-// * Neither the name of Google Inc. nor the names of its
>-// contributors may be used to endorse or promote products derived from
>-// this software without specific prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>-
>-#include <gtest/gtest.h>
>-
>-TEST(DummyTest, Dummy) {
>- // This test doesn't verify anything. We just need it to create a
>- // realistic stage for testing the behavior of Google Test when
>- // RUN_ALL_TESTS() is called without testing::InitGoogleTest() being
>- // called first.
>-}
>-
>-int main() {
>- return RUN_ALL_TESTS();
>-}
>diff --git a/Source/ThirdParty/gtest/test/gtest_unittest.cc b/Source/ThirdParty/gtest/test/gtest_unittest.cc
>index a14f065a2ccd86379a0149a33fc5645c0ec8b181..f7213fbf3e5e872089bfb98551ac3ba3e3a67bf5 100644
>--- a/Source/ThirdParty/gtest/test/gtest_unittest.cc
>+++ b/Source/ThirdParty/gtest/test/gtest_unittest.cc
>@@ -26,18 +26,16 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-//
>-// Author: wan@google.com (Zhanyong Wan)
>+
> //
> // Tests for Google Test itself. This verifies that the basic constructs of
> // Google Test work.
> 
>-#include <gtest/gtest.h>
>-#include <vector>
>+#include "gtest/gtest.h"
> 
>-// Verifies that the command line flag variables can be accessed
>-// in code once <gtest/gtest.h> has been #included.
>-// Do not move it after other #includes.
>+// Verifies that the command line flag variables can be accessed in
>+// code once "gtest.h" has been #included.
>+// Do not move it after other gtest #includes.
> TEST(CommandLineFlagsTest, CanBeAccessedInCodeOnceGTestHIsIncluded) {
> bool dummy = testing::GTEST_FLAG(also_run_disabled_tests)
> || testing::GTEST_FLAG(break_on_failure)
>@@ -52,30 +50,105 @@ TEST(CommandLineFlagsTest, CanBeAccessedInCodeOnceGTestHIsIncluded) {
> || testing::GTEST_FLAG(show_internal_stack_frames)
> || testing::GTEST_FLAG(shuffle)
> || testing::GTEST_FLAG(stack_trace_depth) > 0
>+ || testing::GTEST_FLAG(stream_result_to) != "unknown"
> || testing::GTEST_FLAG(throw_on_failure);
> EXPECT_TRUE(dummy || !dummy); // Suppresses warning that dummy is unused.
> }
> 
>-#include <gtest/gtest-spi.h>
>-
>-// Indicates that this translation unit is part of Google Test's
>-// implementation. It must come before gtest-internal-inl.h is
>-// included, or there will be a compiler error. This trick is to
>-// prevent a user from accidentally including gtest-internal-inl.h in
>-// his code.
>-#define GTEST_IMPLEMENTATION_ 1
>-#include "src/gtest-internal-inl.h"
>-#undef GTEST_IMPLEMENTATION_
>-
> #include <limits.h> // For INT_MAX.
> #include <stdlib.h>
>+#include <string.h>
> #include <time.h>
> 
> #include <map>
>+#include <vector>
>+#include <ostream>
>+#if GTEST_LANG_CXX11
>+#include <unordered_set>
>+#endif // GTEST_LANG_CXX11
>+
>+#include "gtest/gtest-spi.h"
>+#include "src/gtest-internal-inl.h"
> 
> namespace testing {
> namespace internal {
> 
>+#if GTEST_CAN_STREAM_RESULTS_
>+
>+class StreamingListenerTest : public Test {
>+ public:
>+ class FakeSocketWriter : public StreamingListener::AbstractSocketWriter {
>+ public:
>+ // Sends a string to the socket.
>+ virtual void Send(const std::string& message) { output_ += message; }
>+
>+ std::string output_;
>+ };
>+
>+ StreamingListenerTest()
>+ : fake_sock_writer_(new FakeSocketWriter),
>+ streamer_(fake_sock_writer_),
>+ test_info_obj_("FooTest", "Bar", NULL, NULL,
>+ CodeLocation(__FILE__, __LINE__), 0, NULL) {}
>+
>+ protected:
>+ std::string* output() { return &(fake_sock_writer_->output_); }
>+
>+ FakeSocketWriter* const fake_sock_writer_;
>+ StreamingListener streamer_;
>+ UnitTest unit_test_;
>+ TestInfo test_info_obj_; // The name test_info_ was taken by testing::Test.
>+};
>+
>+TEST_F(StreamingListenerTest, OnTestProgramEnd) {
>+ *output() = "";
>+ streamer_.OnTestProgramEnd(unit_test_);
>+ EXPECT_EQ("event=TestProgramEnd&passed=1\n", *output());
>+}
>+
>+TEST_F(StreamingListenerTest, OnTestIterationEnd) {
>+ *output() = "";
>+ streamer_.OnTestIterationEnd(unit_test_, 42);
>+ EXPECT_EQ("event=TestIterationEnd&passed=1&elapsed_time=0ms\n", *output());
>+}
>+
>+TEST_F(StreamingListenerTest, OnTestCaseStart) {
>+ *output() = "";
>+ streamer_.OnTestCaseStart(TestCase("FooTest", "Bar", NULL, NULL));
>+ EXPECT_EQ("event=TestCaseStart&name=FooTest\n", *output());
>+}
>+
>+TEST_F(StreamingListenerTest, OnTestCaseEnd) {
>+ *output() = "";
>+ streamer_.OnTestCaseEnd(TestCase("FooTest", "Bar", NULL, NULL));
>+ EXPECT_EQ("event=TestCaseEnd&passed=1&elapsed_time=0ms\n", *output());
>+}
>+
>+TEST_F(StreamingListenerTest, OnTestStart) {
>+ *output() = "";
>+ streamer_.OnTestStart(test_info_obj_);
>+ EXPECT_EQ("event=TestStart&name=Bar\n", *output());
>+}
>+
>+TEST_F(StreamingListenerTest, OnTestEnd) {
>+ *output() = "";
>+ streamer_.OnTestEnd(test_info_obj_);
>+ EXPECT_EQ("event=TestEnd&passed=1&elapsed_time=0ms\n", *output());
>+}
>+
>+TEST_F(StreamingListenerTest, OnTestPartResult) {
>+ *output() = "";
>+ streamer_.OnTestPartResult(TestPartResult(
>+ TestPartResult::kFatalFailure, "foo.cc", 42, "failed=\n&%"));
>+
>+ // Meta characters in the failure message should be properly escaped.
>+ EXPECT_EQ(
>+ "event=TestPartResult&file=foo.cc&line=42&message=failed%3D%0A%26%25\n",
>+ *output());
>+}
>+
>+#endif // GTEST_CAN_STREAM_RESULTS_
>+
> // Provides access to otherwise private parts of the TestEventListeners class
> // that are needed to test it.
> class TestEventListenersAccessor {
>@@ -102,6 +175,18 @@ class TestEventListenersAccessor {
> }
> };
> 
>+class UnitTestRecordPropertyTestHelper : public Test {
>+ protected:
>+ UnitTestRecordPropertyTestHelper() {}
>+
>+ // Forwards to UnitTest::RecordProperty() to bypass access controls.
>+ void UnitTestRecordProperty(const char* key, const std::string& value) {
>+ unit_test_.RecordProperty(key, value);
>+ }
>+
>+ UnitTest unit_test_;
>+};
>+
> } // namespace internal
> } // namespace testing
> 
>@@ -110,6 +195,7 @@ using testing::AssertionResult;
> using testing::AssertionSuccess;
> using testing::DoubleLE;
> using testing::EmptyTestEventListener;
>+using testing::Environment;
> using testing::FloatLE;
> using testing::GTEST_FLAG(also_run_disabled_tests);
> using testing::GTEST_FLAG(break_on_failure);
>@@ -125,6 +211,7 @@ using testing::GTEST_FLAG(repeat);
> using testing::GTEST_FLAG(show_internal_stack_frames);
> using testing::GTEST_FLAG(shuffle);
> using testing::GTEST_FLAG(stack_trace_depth);
>+using testing::GTEST_FLAG(stream_result_to);
> using testing::GTEST_FLAG(throw_on_failure);
> using testing::IsNotSubstring;
> using testing::IsSubstring;
>@@ -132,53 +219,78 @@ using testing::Message;
> using testing::ScopedFakeTestPartResultReporter;
> using testing::StaticAssertTypeEq;
> using testing::Test;
>-using testing::TestEventListeners;
> using testing::TestCase;
>+using testing::TestEventListeners;
>+using testing::TestInfo;
> using testing::TestPartResult;
> using testing::TestPartResultArray;
> using testing::TestProperty;
> using testing::TestResult;
>+using testing::TimeInMillis;
> using testing::UnitTest;
>-using testing::kMaxStackTraceDepth;
>+using testing::internal::AddReference;
> using testing::internal::AlwaysFalse;
> using testing::internal::AlwaysTrue;
> using testing::internal::AppendUserMessage;
>+using testing::internal::ArrayAwareFind;
>+using testing::internal::ArrayEq;
> using testing::internal::CodePointToUtf8;
>+using testing::internal::CompileAssertTypesEqual;
>+using testing::internal::CopyArray;
> using testing::internal::CountIf;
> using testing::internal::EqFailure;
> using testing::internal::FloatingPoint;
>-using testing::internal::FormatTimeInMillisAsSeconds;
> using testing::internal::ForEach;
>+using testing::internal::FormatEpochTimeInMillisAsIso8601;
>+using testing::internal::FormatTimeInMillisAsSeconds;
> using testing::internal::GTestFlagSaver;
> using testing::internal::GetCurrentOsStackTraceExceptTop;
> using testing::internal::GetElementOr;
> using testing::internal::GetNextRandomSeed;
> using testing::internal::GetRandomSeedFromFlag;
> using testing::internal::GetTestTypeId;
>+using testing::internal::GetTimeInMillis;
> using testing::internal::GetTypeId;
> using testing::internal::GetUnitTestImpl;
>+using testing::internal::ImplicitlyConvertible;
> using testing::internal::Int32;
> using testing::internal::Int32FromEnvOrDie;
>+using testing::internal::IsAProtocolMessage;
>+using testing::internal::IsContainer;
>+using testing::internal::IsContainerTest;
>+using testing::internal::IsNotContainer;
>+using testing::internal::NativeArray;
>+using testing::internal::OsStackTraceGetter;
>+using testing::internal::OsStackTraceGetterInterface;
> using testing::internal::ParseInt32Flag;
>+using testing::internal::RelationToSourceCopy;
>+using testing::internal::RelationToSourceReference;
>+using testing::internal::RemoveConst;
>+using testing::internal::RemoveReference;
> using testing::internal::ShouldRunTestOnShard;
> using testing::internal::ShouldShard;
> using testing::internal::ShouldUseColor;
> using testing::internal::Shuffle;
> using testing::internal::ShuffleRange;
>+using testing::internal::SkipPrefix;
> using testing::internal::StreamableToString;
> using testing::internal::String;
> using testing::internal::TestEventListenersAccessor;
> using testing::internal::TestResultAccessor;
> using testing::internal::UInt32;
>+using testing::internal::UnitTestImpl;
> using testing::internal::WideStringToUtf8;
>+using testing::internal::edit_distance::CalculateOptimalEdits;
>+using testing::internal::edit_distance::CreateUnifiedDiff;
>+using testing::internal::edit_distance::EditType;
> using testing::internal::kMaxRandomSeed;
> using testing::internal::kTestTypeIdInGoogleTest;
>-using testing::internal::scoped_ptr;
>+using testing::kMaxStackTraceDepth;
> 
>-#if GTEST_HAS_STREAM_REDIRECTION_
>+#if GTEST_HAS_STREAM_REDIRECTION
> using testing::internal::CaptureStdout;
> using testing::internal::GetCapturedStdout;
>-#endif // GTEST_HAS_STREAM_REDIRECTION_
>+#endif
> 
> #if GTEST_IS_THREADSAFE
> using testing::internal::ThreadWithParam;
>@@ -267,6 +379,31 @@ TEST(GetTestTypeIdTest, ReturnsTheSameValueInsideOrOutsideOfGoogleTest) {
> EXPECT_EQ(kTestTypeIdInGoogleTest, GetTestTypeId());
> }
> 
>+// Tests CanonicalizeForStdLibVersioning.
>+
>+using ::testing::internal::CanonicalizeForStdLibVersioning;
>+
>+TEST(CanonicalizeForStdLibVersioning, LeavesUnversionedNamesUnchanged) {
>+ EXPECT_EQ("std::bind", CanonicalizeForStdLibVersioning("std::bind"));
>+ EXPECT_EQ("std::_", CanonicalizeForStdLibVersioning("std::_"));
>+ EXPECT_EQ("std::__foo", CanonicalizeForStdLibVersioning("std::__foo"));
>+ EXPECT_EQ("gtl::__1::x", CanonicalizeForStdLibVersioning("gtl::__1::x"));
>+ EXPECT_EQ("__1::x", CanonicalizeForStdLibVersioning("__1::x"));
>+ EXPECT_EQ("::__1::x", CanonicalizeForStdLibVersioning("::__1::x"));
>+}
>+
>+TEST(CanonicalizeForStdLibVersioning, ElidesDoubleUnderNames) {
>+ EXPECT_EQ("std::bind", CanonicalizeForStdLibVersioning("std::__1::bind"));
>+ EXPECT_EQ("std::_", CanonicalizeForStdLibVersioning("std::__1::_"));
>+
>+ EXPECT_EQ("std::bind", CanonicalizeForStdLibVersioning("std::__g::bind"));
>+ EXPECT_EQ("std::_", CanonicalizeForStdLibVersioning("std::__g::_"));
>+
>+ EXPECT_EQ("std::bind",
>+ CanonicalizeForStdLibVersioning("std::__google::bind"));
>+ EXPECT_EQ("std::_", CanonicalizeForStdLibVersioning("std::__google::_"));
>+}
>+
> // Tests FormatTimeInMillisAsSeconds().
> 
> TEST(FormatTimeInMillisAsSecondsTest, FormatsZero) {
>@@ -289,12 +426,99 @@ TEST(FormatTimeInMillisAsSecondsTest, FormatsNegativeNumber) {
> EXPECT_EQ("-3", FormatTimeInMillisAsSeconds(-3000));
> }
> 
>+// Tests FormatEpochTimeInMillisAsIso8601(). The correctness of conversion
>+// for particular dates below was verified in Python using
>+// datetime.datetime.fromutctimestamp(<timetamp>/1000).
>+
>+// FormatEpochTimeInMillisAsIso8601 depends on the current timezone, so we
>+// have to set up a particular timezone to obtain predictable results.
>+class FormatEpochTimeInMillisAsIso8601Test : public Test {
>+ public:
>+ // On Cygwin, GCC doesn't allow unqualified integer literals to exceed
>+ // 32 bits, even when 64-bit integer types are available. We have to
>+ // force the constants to have a 64-bit type here.
>+ static const TimeInMillis kMillisPerSec = 1000;
>+
>+ private:
>+ virtual void SetUp() {
>+ saved_tz_ = NULL;
>+
>+ GTEST_DISABLE_MSC_DEPRECATED_PUSH_(/* getenv, strdup: deprecated */)
>+ if (getenv("TZ"))
>+ saved_tz_ = strdup(getenv("TZ"));
>+ GTEST_DISABLE_MSC_DEPRECATED_POP_()
>+
>+ // Set up the time zone for FormatEpochTimeInMillisAsIso8601 to use. We
>+ // cannot use the local time zone because the function's output depends
>+ // on the time zone.
>+ SetTimeZone("UTC+00");
>+ }
>+
>+ virtual void TearDown() {
>+ SetTimeZone(saved_tz_);
>+ free(const_cast<char*>(saved_tz_));
>+ saved_tz_ = NULL;
>+ }
>+
>+ static void SetTimeZone(const char* time_zone) {
>+ // tzset() distinguishes between the TZ variable being present and empty
>+ // and not being present, so we have to consider the case of time_zone
>+ // being NULL.
>+#if _MSC_VER || GTEST_OS_WINDOWS_MINGW
>+ // ...Unless it's MSVC, whose standard library's _putenv doesn't
>+ // distinguish between an empty and a missing variable.
>+ const std::string env_var =
>+ std::string("TZ=") + (time_zone ? time_zone : "");
>+ _putenv(env_var.c_str());
>+ GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996 /* deprecated function */)
>+ tzset();
>+ GTEST_DISABLE_MSC_WARNINGS_POP_()
>+#else
>+ if (time_zone) {
>+ setenv(("TZ"), time_zone, 1);
>+ } else {
>+ unsetenv("TZ");
>+ }
>+ tzset();
>+#endif
>+ }
>+
>+ const char* saved_tz_;
>+};
>+
>+const TimeInMillis FormatEpochTimeInMillisAsIso8601Test::kMillisPerSec;
>+
>+TEST_F(FormatEpochTimeInMillisAsIso8601Test, PrintsTwoDigitSegments) {
>+ EXPECT_EQ("2011-10-31T18:52:42",
>+ FormatEpochTimeInMillisAsIso8601(1320087162 * kMillisPerSec));
>+}
>+
>+TEST_F(FormatEpochTimeInMillisAsIso8601Test, MillisecondsDoNotAffectResult) {
>+ EXPECT_EQ(
>+ "2011-10-31T18:52:42",
>+ FormatEpochTimeInMillisAsIso8601(1320087162 * kMillisPerSec + 234));
>+}
>+
>+TEST_F(FormatEpochTimeInMillisAsIso8601Test, PrintsLeadingZeroes) {
>+ EXPECT_EQ("2011-09-03T05:07:02",
>+ FormatEpochTimeInMillisAsIso8601(1315026422 * kMillisPerSec));
>+}
>+
>+TEST_F(FormatEpochTimeInMillisAsIso8601Test, Prints24HourTime) {
>+ EXPECT_EQ("2011-09-28T17:08:22",
>+ FormatEpochTimeInMillisAsIso8601(1317229702 * kMillisPerSec));
>+}
>+
>+TEST_F(FormatEpochTimeInMillisAsIso8601Test, PrintsEpochStart) {
>+ EXPECT_EQ("1970-01-01T00:00:00", FormatEpochTimeInMillisAsIso8601(0));
>+}
>+
> #if GTEST_CAN_COMPARE_NULL
> 
>-#ifdef __BORLANDC__
>+# ifdef __BORLANDC__
> // Silences warnings: "Condition is always true", "Unreachable code"
>-#pragma option push -w-ccc -w-rch
>-#endif
>+# pragma option push -w-ccc -w-rch
>+# endif
> 
> // Tests that GTEST_IS_NULL_LITERAL_(x) is true when x is a null
> // pointer literal.
>@@ -303,14 +527,6 @@ TEST(NullLiteralTest, IsTrueForNullLiterals) {
> EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(0));
> EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(0U));
> EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(0L));
>- EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(false));
>-#ifndef __BORLANDC__
>- // Some compilers may fail to detect some null pointer literals;
>- // as long as users of the framework don't use such literals, this
>- // is harmless.
>- EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(1 - 1));
>- EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(true && false));
>-#endif
> }
> 
> // Tests that GTEST_IS_NULL_LITERAL_(x) is false when x is not a null
>@@ -322,10 +538,10 @@ TEST(NullLiteralTest, IsFalseForNonNullLiterals) {
> EXPECT_FALSE(GTEST_IS_NULL_LITERAL_(static_cast<void*>(NULL)));
> }
> 
>-#ifdef __BORLANDC__
>+# ifdef __BORLANDC__
> // Restores warnings after previous "#pragma option push" suppressed them.
>-#pragma option pop
>-#endif
>+# pragma option pop
>+# endif
> 
> #endif // GTEST_CAN_COMPARE_NULL
> //
>@@ -333,39 +549,41 @@ TEST(NullLiteralTest, IsFalseForNonNullLiterals) {
> 
> // Tests that the NUL character L'\0' is encoded correctly.
> TEST(CodePointToUtf8Test, CanEncodeNul) {
>- char buffer[32];
>- EXPECT_STREQ("", CodePointToUtf8(L'\0', buffer));
>+ EXPECT_EQ("", CodePointToUtf8(L'\0'));
> }
> 
> // Tests that ASCII characters are encoded correctly.
> TEST(CodePointToUtf8Test, CanEncodeAscii) {
>- char buffer[32];
>- EXPECT_STREQ("a", CodePointToUtf8(L'a', buffer));
>- EXPECT_STREQ("Z", CodePointToUtf8(L'Z', buffer));
>- EXPECT_STREQ("&", CodePointToUtf8(L'&', buffer));
>- EXPECT_STREQ("\x7F", CodePointToUtf8(L'\x7F', buffer));
>+ EXPECT_EQ("a", CodePointToUtf8(L'a'));
>+ EXPECT_EQ("Z", CodePointToUtf8(L'Z'));
>+ EXPECT_EQ("&", CodePointToUtf8(L'&'));
>+ EXPECT_EQ("\x7F", CodePointToUtf8(L'\x7F'));
> }
> 
> // Tests that Unicode code-points that have 8 to 11 bits are encoded
> // as 110xxxxx 10xxxxxx.
> TEST(CodePointToUtf8Test, CanEncode8To11Bits) {
>- char buffer[32];
> // 000 1101 0011 => 110-00011 10-010011
>- EXPECT_STREQ("\xC3\x93", CodePointToUtf8(L'\xD3', buffer));
>+ EXPECT_EQ("\xC3\x93", CodePointToUtf8(L'\xD3'));
> 
> // 101 0111 0110 => 110-10101 10-110110
>- EXPECT_STREQ("\xD5\xB6", CodePointToUtf8(L'\x576', buffer));
>+ // Some compilers (e.g., GCC on MinGW) cannot handle non-ASCII codepoints
>+ // in wide strings and wide chars. In order to accommodate them, we have to
>+ // introduce such character constants as integers.
>+ EXPECT_EQ("\xD5\xB6",
>+ CodePointToUtf8(static_cast<wchar_t>(0x576)));
> }
> 
> // Tests that Unicode code-points that have 12 to 16 bits are encoded
> // as 1110xxxx 10xxxxxx 10xxxxxx.
> TEST(CodePointToUtf8Test, CanEncode12To16Bits) {
>- char buffer[32];
> // 0000 1000 1101 0011 => 1110-0000 10-100011 10-010011
>- EXPECT_STREQ("\xE0\xA3\x93", CodePointToUtf8(L'\x8D3', buffer));
>+ EXPECT_EQ("\xE0\xA3\x93",
>+ CodePointToUtf8(static_cast<wchar_t>(0x8D3)));
> 
> // 1100 0111 0100 1101 => 1110-1100 10-011101 10-001101
>- EXPECT_STREQ("\xEC\x9D\x8D", CodePointToUtf8(L'\xC74D', buffer));
>+ EXPECT_EQ("\xEC\x9D\x8D",
>+ CodePointToUtf8(static_cast<wchar_t>(0xC74D)));
> }
> 
> #if !GTEST_WIDE_STRING_USES_UTF16_
>@@ -376,22 +594,19 @@ TEST(CodePointToUtf8Test, CanEncode12To16Bits) {
> // Tests that Unicode code-points that have 17 to 21 bits are encoded
> // as 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx.
> TEST(CodePointToUtf8Test, CanEncode17To21Bits) {
>- char buffer[32];
> // 0 0001 0000 1000 1101 0011 => 11110-000 10-010000 10-100011 10-010011
>- EXPECT_STREQ("\xF0\x90\xA3\x93", CodePointToUtf8(L'\x108D3', buffer));
>+ EXPECT_EQ("\xF0\x90\xA3\x93", CodePointToUtf8(L'\x108D3'));
> 
> // 0 0001 0000 0100 0000 0000 => 11110-000 10-010000 10-010000 10-000000
>- EXPECT_STREQ("\xF0\x90\x90\x80", CodePointToUtf8(L'\x10400', buffer));
>+ EXPECT_EQ("\xF0\x90\x90\x80", CodePointToUtf8(L'\x10400'));
> 
> // 1 0000 1000 0110 0011 0100 => 11110-100 10-001000 10-011000 10-110100
>- EXPECT_STREQ("\xF4\x88\x98\xB4", CodePointToUtf8(L'\x108634', buffer));
>+ EXPECT_EQ("\xF4\x88\x98\xB4", CodePointToUtf8(L'\x108634'));
> }
> 
> // Tests that encoding an invalid code-point generates the expected result.
> TEST(CodePointToUtf8Test, CanEncodeInvalidCodePoint) {
>- char buffer[32];
>- EXPECT_STREQ("(Invalid Unicode 0x1234ABCD)",
>- CodePointToUtf8(L'\x1234ABCD', buffer));
>+ EXPECT_EQ("(Invalid Unicode 0x1234ABCD)", CodePointToUtf8(L'\x1234ABCD'));
> }
> 
> #endif // !GTEST_WIDE_STRING_USES_UTF16_
>@@ -420,20 +635,23 @@ TEST(WideStringToUtf8Test, CanEncode8To11Bits) {
> EXPECT_STREQ("\xC3\x93", WideStringToUtf8(L"\xD3", -1).c_str());
> 
> // 101 0111 0110 => 110-10101 10-110110
>- EXPECT_STREQ("\xD5\xB6", WideStringToUtf8(L"\x576", 1).c_str());
>- EXPECT_STREQ("\xD5\xB6", WideStringToUtf8(L"\x576", -1).c_str());
>+ const wchar_t s[] = { 0x576, '\0' };
>+ EXPECT_STREQ("\xD5\xB6", WideStringToUtf8(s, 1).c_str());
>+ EXPECT_STREQ("\xD5\xB6", WideStringToUtf8(s, -1).c_str());
> }
> 
> // Tests that Unicode code-points that have 12 to 16 bits are encoded
> // as 1110xxxx 10xxxxxx 10xxxxxx.
> TEST(WideStringToUtf8Test, CanEncode12To16Bits) {
> // 0000 1000 1101 0011 => 1110-0000 10-100011 10-010011
>- EXPECT_STREQ("\xE0\xA3\x93", WideStringToUtf8(L"\x8D3", 1).c_str());
>- EXPECT_STREQ("\xE0\xA3\x93", WideStringToUtf8(L"\x8D3", -1).c_str());
>+ const wchar_t s1[] = { 0x8D3, '\0' };
>+ EXPECT_STREQ("\xE0\xA3\x93", WideStringToUtf8(s1, 1).c_str());
>+ EXPECT_STREQ("\xE0\xA3\x93", WideStringToUtf8(s1, -1).c_str());
> 
> // 1100 0111 0100 1101 => 1110-1100 10-011101 10-001101
>- EXPECT_STREQ("\xEC\x9D\x8D", WideStringToUtf8(L"\xC74D", 1).c_str());
>- EXPECT_STREQ("\xEC\x9D\x8D", WideStringToUtf8(L"\xC74D", -1).c_str());
>+ const wchar_t s2[] = { 0xC74D, '\0' };
>+ EXPECT_STREQ("\xEC\x9D\x8D", WideStringToUtf8(s2, 1).c_str());
>+ EXPECT_STREQ("\xEC\x9D\x8D", WideStringToUtf8(s2, -1).c_str());
> }
> 
> // Tests that the conversion stops when the function encounters \0 character.
>@@ -447,7 +665,6 @@ TEST(WideStringToUtf8Test, StopsWhenLengthLimitReached) {
> EXPECT_STREQ("ABC", WideStringToUtf8(L"ABCDEF", 3).c_str());
> }
> 
>-
> #if !GTEST_WIDE_STRING_USES_UTF16_
> // Tests that Unicode code-points that have 17 to 21 bits are encoded
> // as 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx. This code may not compile
>@@ -471,25 +688,29 @@ TEST(WideStringToUtf8Test, CanEncodeInvalidCodePoint) {
> // Tests that surrogate pairs are encoded correctly on the systems using
> // UTF-16 encoding in the wide strings.
> TEST(WideStringToUtf8Test, CanEncodeValidUtf16SUrrogatePairs) {
>- EXPECT_STREQ("\xF0\x90\x90\x80",
>- WideStringToUtf8(L"\xD801\xDC00", -1).c_str());
>+ const wchar_t s[] = { 0xD801, 0xDC00, '\0' };
>+ EXPECT_STREQ("\xF0\x90\x90\x80", WideStringToUtf8(s, -1).c_str());
> }
> 
> // Tests that encoding an invalid UTF-16 surrogate pair
> // generates the expected result.
> TEST(WideStringToUtf8Test, CanEncodeInvalidUtf16SurrogatePair) {
> // Leading surrogate is at the end of the string.
>- EXPECT_STREQ("\xED\xA0\x80", WideStringToUtf8(L"\xD800", -1).c_str());
>+ const wchar_t s1[] = { 0xD800, '\0' };
>+ EXPECT_STREQ("\xED\xA0\x80", WideStringToUtf8(s1, -1).c_str());
> // Leading surrogate is not followed by the trailing surrogate.
>- EXPECT_STREQ("\xED\xA0\x80$", WideStringToUtf8(L"\xD800$", -1).c_str());
>+ const wchar_t s2[] = { 0xD800, 'M', '\0' };
>+ EXPECT_STREQ("\xED\xA0\x80M", WideStringToUtf8(s2, -1).c_str());
> // Trailing surrogate appearas without a leading surrogate.
>- EXPECT_STREQ("\xED\xB0\x80PQR", WideStringToUtf8(L"\xDC00PQR", -1).c_str());
>+ const wchar_t s3[] = { 0xDC00, 'P', 'Q', 'R', '\0' };
>+ EXPECT_STREQ("\xED\xB0\x80PQR", WideStringToUtf8(s3, -1).c_str());
> }
> #endif // !GTEST_WIDE_STRING_USES_UTF16_
> 
> // Tests that codepoint concatenation works correctly.
> #if !GTEST_WIDE_STRING_USES_UTF16_
> TEST(WideStringToUtf8Test, ConcatenatesCodepointsCorrectly) {
>+ const wchar_t s[] = { 0x108634, 0xC74D, '\n', 0x576, 0x8D3, 0x108634, '\0'};
> EXPECT_STREQ(
> "\xF4\x88\x98\xB4"
> "\xEC\x9D\x8D"
>@@ -497,13 +718,14 @@ TEST(WideStringToUtf8Test, ConcatenatesCodepointsCorrectly) {
> "\xD5\xB6"
> "\xE0\xA3\x93"
> "\xF4\x88\x98\xB4",
>- WideStringToUtf8(L"\x108634\xC74D\n\x576\x8D3\x108634", -1).c_str());
>+ WideStringToUtf8(s, -1).c_str());
> }
> #else
> TEST(WideStringToUtf8Test, ConcatenatesCodepointsCorrectly) {
>+ const wchar_t s[] = { 0xC74D, '\n', 0x576, 0x8D3, '\0'};
> EXPECT_STREQ(
> "\xEC\x9D\x8D" "\n" "\xD5\xB6" "\xE0\xA3\x93",
>- WideStringToUtf8(L"\xC74D\n\x576\x8D3", -1).c_str());
>+ WideStringToUtf8(s, -1).c_str());
> }
> #endif // !GTEST_WIDE_STRING_USES_UTF16_
> 
>@@ -797,269 +1019,16 @@ TEST(AssertHelperTest, AssertHelperIsSmall) {
> EXPECT_LE(sizeof(testing::internal::AssertHelper), sizeof(void*));
> }
> 
>-// Tests the String class.
>-
>-// Tests String's constructors.
>-TEST(StringTest, Constructors) {
>- // Default ctor.
>- String s1;
>- // We aren't using EXPECT_EQ(NULL, s1.c_str()) because comparing
>- // pointers with NULL isn't supported on all platforms.
>- EXPECT_EQ(0U, s1.length());
>- EXPECT_TRUE(NULL == s1.c_str());
>-
>- // Implicitly constructs from a C-string.
>- String s2 = "Hi";
>- EXPECT_EQ(2U, s2.length());
>- EXPECT_STREQ("Hi", s2.c_str());
>-
>- // Constructs from a C-string and a length.
>- String s3("hello", 3);
>- EXPECT_EQ(3U, s3.length());
>- EXPECT_STREQ("hel", s3.c_str());
>-
>- // The empty String should be created when String is constructed with
>- // a NULL pointer and length 0.
>- EXPECT_EQ(0U, String(NULL, 0).length());
>- EXPECT_FALSE(String(NULL, 0).c_str() == NULL);
>-
>- // Constructs a String that contains '\0'.
>- String s4("a\0bcd", 4);
>- EXPECT_EQ(4U, s4.length());
>- EXPECT_EQ('a', s4.c_str()[0]);
>- EXPECT_EQ('\0', s4.c_str()[1]);
>- EXPECT_EQ('b', s4.c_str()[2]);
>- EXPECT_EQ('c', s4.c_str()[3]);
>-
>- // Copy ctor where the source is NULL.
>- const String null_str;
>- String s5 = null_str;
>- EXPECT_TRUE(s5.c_str() == NULL);
>-
>- // Copy ctor where the source isn't NULL.
>- String s6 = s3;
>- EXPECT_EQ(3U, s6.length());
>- EXPECT_STREQ("hel", s6.c_str());
>-
>- // Copy ctor where the source contains '\0'.
>- String s7 = s4;
>- EXPECT_EQ(4U, s7.length());
>- EXPECT_EQ('a', s7.c_str()[0]);
>- EXPECT_EQ('\0', s7.c_str()[1]);
>- EXPECT_EQ('b', s7.c_str()[2]);
>- EXPECT_EQ('c', s7.c_str()[3]);
>-}
>-
>-TEST(StringTest, ConvertsFromStdString) {
>- // An empty std::string.
>- const std::string src1("");
>- const String dest1 = src1;
>- EXPECT_EQ(0U, dest1.length());
>- EXPECT_STREQ("", dest1.c_str());
>-
>- // A normal std::string.
>- const std::string src2("Hi");
>- const String dest2 = src2;
>- EXPECT_EQ(2U, dest2.length());
>- EXPECT_STREQ("Hi", dest2.c_str());
>-
>- // An std::string with an embedded NUL character.
>- const char src3[] = "a\0b";
>- const String dest3 = std::string(src3, sizeof(src3));
>- EXPECT_EQ(sizeof(src3), dest3.length());
>- EXPECT_EQ('a', dest3.c_str()[0]);
>- EXPECT_EQ('\0', dest3.c_str()[1]);
>- EXPECT_EQ('b', dest3.c_str()[2]);
>-}
>-
>-TEST(StringTest, ConvertsToStdString) {
>- // An empty String.
>- const String src1("");
>- const std::string dest1 = src1;
>- EXPECT_EQ("", dest1);
>-
>- // A normal String.
>- const String src2("Hi");
>- const std::string dest2 = src2;
>- EXPECT_EQ("Hi", dest2);
>-
>- // A String containing a '\0'.
>- const String src3("x\0y", 3);
>- const std::string dest3 = src3;
>- EXPECT_EQ(std::string("x\0y", 3), dest3);
>-}
>-
>-#if GTEST_HAS_GLOBAL_STRING
>-
>-TEST(StringTest, ConvertsFromGlobalString) {
>- // An empty ::string.
>- const ::string src1("");
>- const String dest1 = src1;
>- EXPECT_EQ(0U, dest1.length());
>- EXPECT_STREQ("", dest1.c_str());
>-
>- // A normal ::string.
>- const ::string src2("Hi");
>- const String dest2 = src2;
>- EXPECT_EQ(2U, dest2.length());
>- EXPECT_STREQ("Hi", dest2.c_str());
>-
>- // An ::string with an embedded NUL character.
>- const char src3[] = "x\0y";
>- const String dest3 = ::string(src3, sizeof(src3));
>- EXPECT_EQ(sizeof(src3), dest3.length());
>- EXPECT_EQ('x', dest3.c_str()[0]);
>- EXPECT_EQ('\0', dest3.c_str()[1]);
>- EXPECT_EQ('y', dest3.c_str()[2]);
>-}
>-
>-TEST(StringTest, ConvertsToGlobalString) {
>- // An empty String.
>- const String src1("");
>- const ::string dest1 = src1;
>- EXPECT_EQ("", dest1);
>-
>- // A normal String.
>- const String src2("Hi");
>- const ::string dest2 = src2;
>- EXPECT_EQ("Hi", dest2);
>-
>- const String src3("x\0y", 3);
>- const ::string dest3 = src3;
>- EXPECT_EQ(::string("x\0y", 3), dest3);
>-}
>-
>-#endif // GTEST_HAS_GLOBAL_STRING
>-
>-// Tests String::ShowCStringQuoted().
>-TEST(StringTest, ShowCStringQuoted) {
>- EXPECT_STREQ("(null)",
>- String::ShowCStringQuoted(NULL).c_str());
>- EXPECT_STREQ("\"\"",
>- String::ShowCStringQuoted("").c_str());
>- EXPECT_STREQ("\"foo\"",
>- String::ShowCStringQuoted("foo").c_str());
>-}
>-
>-// Tests String::empty().
>-TEST(StringTest, Empty) {
>- EXPECT_TRUE(String("").empty());
>- EXPECT_FALSE(String().empty());
>- EXPECT_FALSE(String(NULL).empty());
>- EXPECT_FALSE(String("a").empty());
>- EXPECT_FALSE(String("\0", 1).empty());
>-}
>-
>-// Tests String::Compare().
>-TEST(StringTest, Compare) {
>- // NULL vs NULL.
>- EXPECT_EQ(0, String().Compare(String()));
>-
>- // NULL vs non-NULL.
>- EXPECT_EQ(-1, String().Compare(String("")));
>-
>- // Non-NULL vs NULL.
>- EXPECT_EQ(1, String("").Compare(String()));
>-
>- // The following covers non-NULL vs non-NULL.
>-
>- // "" vs "".
>- EXPECT_EQ(0, String("").Compare(String("")));
>-
>- // "" vs non-"".
>- EXPECT_EQ(-1, String("").Compare(String("\0", 1)));
>- EXPECT_EQ(-1, String("").Compare(" "));
>-
>- // Non-"" vs "".
>- EXPECT_EQ(1, String("a").Compare(String("")));
>-
>- // The following covers non-"" vs non-"".
>-
>- // Same length and equal.
>- EXPECT_EQ(0, String("a").Compare(String("a")));
>-
>- // Same length and different.
>- EXPECT_EQ(-1, String("a\0b", 3).Compare(String("a\0c", 3)));
>- EXPECT_EQ(1, String("b").Compare(String("a")));
>-
>- // Different lengths.
>- EXPECT_EQ(-1, String("a").Compare(String("ab")));
>- EXPECT_EQ(-1, String("a").Compare(String("a\0", 2)));
>- EXPECT_EQ(1, String("abc").Compare(String("aacd")));
>-}
>-
>-// Tests String::operator==().
>-TEST(StringTest, Equals) {
>- const String null(NULL);
>- EXPECT_TRUE(null == NULL); // NOLINT
>- EXPECT_FALSE(null == ""); // NOLINT
>- EXPECT_FALSE(null == "bar"); // NOLINT
>-
>- const String empty("");
>- EXPECT_FALSE(empty == NULL); // NOLINT
>- EXPECT_TRUE(empty == ""); // NOLINT
>- EXPECT_FALSE(empty == "bar"); // NOLINT
>-
>- const String foo("foo");
>- EXPECT_FALSE(foo == NULL); // NOLINT
>- EXPECT_FALSE(foo == ""); // NOLINT
>- EXPECT_FALSE(foo == "bar"); // NOLINT
>- EXPECT_TRUE(foo == "foo"); // NOLINT
>-
>- const String bar("x\0y", 3);
>- EXPECT_FALSE(bar == "x");
>-}
>-
>-// Tests String::operator!=().
>-TEST(StringTest, NotEquals) {
>- const String null(NULL);
>- EXPECT_FALSE(null != NULL); // NOLINT
>- EXPECT_TRUE(null != ""); // NOLINT
>- EXPECT_TRUE(null != "bar"); // NOLINT
>-
>- const String empty("");
>- EXPECT_TRUE(empty != NULL); // NOLINT
>- EXPECT_FALSE(empty != ""); // NOLINT
>- EXPECT_TRUE(empty != "bar"); // NOLINT
>-
>- const String foo("foo");
>- EXPECT_TRUE(foo != NULL); // NOLINT
>- EXPECT_TRUE(foo != ""); // NOLINT
>- EXPECT_TRUE(foo != "bar"); // NOLINT
>- EXPECT_FALSE(foo != "foo"); // NOLINT
>-
>- const String bar("x\0y", 3);
>- EXPECT_TRUE(bar != "x");
>-}
>-
>-// Tests String::length().
>-TEST(StringTest, Length) {
>- EXPECT_EQ(0U, String().length());
>- EXPECT_EQ(0U, String("").length());
>- EXPECT_EQ(2U, String("ab").length());
>- EXPECT_EQ(3U, String("a\0b", 3).length());
>-}
>-
>-// Tests String::EndsWith().
>-TEST(StringTest, EndsWith) {
>- EXPECT_TRUE(String("foobar").EndsWith("bar"));
>- EXPECT_TRUE(String("foobar").EndsWith(""));
>- EXPECT_TRUE(String("").EndsWith(""));
>-
>- EXPECT_FALSE(String("foobar").EndsWith("foo"));
>- EXPECT_FALSE(String("").EndsWith("foo"));
>-}
>-
> // Tests String::EndsWithCaseInsensitive().
> TEST(StringTest, EndsWithCaseInsensitive) {
>- EXPECT_TRUE(String("foobar").EndsWithCaseInsensitive("BAR"));
>- EXPECT_TRUE(String("foobaR").EndsWithCaseInsensitive("bar"));
>- EXPECT_TRUE(String("foobar").EndsWithCaseInsensitive(""));
>- EXPECT_TRUE(String("").EndsWithCaseInsensitive(""));
>+ EXPECT_TRUE(String::EndsWithCaseInsensitive("foobar", "BAR"));
>+ EXPECT_TRUE(String::EndsWithCaseInsensitive("foobaR", "bar"));
>+ EXPECT_TRUE(String::EndsWithCaseInsensitive("foobar", ""));
>+ EXPECT_TRUE(String::EndsWithCaseInsensitive("", ""));
> 
>- EXPECT_FALSE(String("Foobar").EndsWithCaseInsensitive("foo"));
>- EXPECT_FALSE(String("foobar").EndsWithCaseInsensitive("Foo"));
>- EXPECT_FALSE(String("").EndsWithCaseInsensitive("foo"));
>+ EXPECT_FALSE(String::EndsWithCaseInsensitive("Foobar", "foo"));
>+ EXPECT_FALSE(String::EndsWithCaseInsensitive("foobar", "Foo"));
>+ EXPECT_FALSE(String::EndsWithCaseInsensitive("", "foo"));
> }
> 
> // C++Builder's preprocessor is buggy; it fails to expand macros that
>@@ -1079,87 +1048,6 @@ TEST(StringTest, CaseInsensitiveWideCStringEquals) {
> EXPECT_TRUE(String::CaseInsensitiveWideCStringEquals(L"FOOBAR", L"foobar"));
> }
> 
>-// Tests that NULL can be assigned to a String.
>-TEST(StringTest, CanBeAssignedNULL) {
>- const String src(NULL);
>- String dest;
>-
>- dest = src;
>- EXPECT_STREQ(NULL, dest.c_str());
>-}
>-
>-// Tests that the empty string "" can be assigned to a String.
>-TEST(StringTest, CanBeAssignedEmpty) {
>- const String src("");
>- String dest;
>-
>- dest = src;
>- EXPECT_STREQ("", dest.c_str());
>-}
>-
>-// Tests that a non-empty string can be assigned to a String.
>-TEST(StringTest, CanBeAssignedNonEmpty) {
>- const String src("hello");
>- String dest;
>- dest = src;
>- EXPECT_EQ(5U, dest.length());
>- EXPECT_STREQ("hello", dest.c_str());
>-
>- const String src2("x\0y", 3);
>- String dest2;
>- dest2 = src2;
>- EXPECT_EQ(3U, dest2.length());
>- EXPECT_EQ('x', dest2.c_str()[0]);
>- EXPECT_EQ('\0', dest2.c_str()[1]);
>- EXPECT_EQ('y', dest2.c_str()[2]);
>-}
>-
>-// Tests that a String can be assigned to itself.
>-TEST(StringTest, CanBeAssignedSelf) {
>- String dest("hello");
>-
>- dest = dest;
>- EXPECT_STREQ("hello", dest.c_str());
>-}
>-
>-// Sun Studio < 12 incorrectly rejects this code due to an overloading
>-// ambiguity.
>-#if !(defined(__SUNPRO_CC) && __SUNPRO_CC < 0x590)
>-// Tests streaming a String.
>-TEST(StringTest, Streams) {
>- EXPECT_EQ(StreamableToString(String()), "(null)");
>- EXPECT_EQ(StreamableToString(String("")), "");
>- EXPECT_EQ(StreamableToString(String("a\0b", 3)), "a\\0b");
>-}
>-#endif
>-
>-// Tests that String::Format() works.
>-TEST(StringTest, FormatWorks) {
>- // Normal case: the format spec is valid, the arguments match the
>- // spec, and the result is < 4095 characters.
>- EXPECT_STREQ("Hello, 42", String::Format("%s, %d", "Hello", 42).c_str());
>-
>- // Edge case: the result is 4095 characters.
>- char buffer[4096];
>- const size_t kSize = sizeof(buffer);
>- memset(buffer, 'a', kSize - 1);
>- buffer[kSize - 1] = '\0';
>- EXPECT_STREQ(buffer, String::Format("%s", buffer).c_str());
>-
>- // The result needs to be 4096 characters, exceeding Format()'s limit.
>- EXPECT_STREQ("<formatting error or buffer exceeded>",
>- String::Format("x%s", buffer).c_str());
>-
>-#if GTEST_OS_LINUX
>- // On Linux, invalid format spec should lead to an error message.
>- // In other environment (e.g. MSVC on Windows), String::Format() may
>- // simply ignore a bad format spec, so this assertion is run on
>- // Linux only.
>- EXPECT_STREQ("<formatting error or buffer exceeded>",
>- String::Format("%").c_str());
>-#endif
>-}
>-
> #if GTEST_OS_WINDOWS
> 
> // Tests String::ShowWideCString().
>@@ -1170,17 +1058,7 @@ TEST(StringTest, ShowWideCString) {
> EXPECT_STREQ("foo", String::ShowWideCString(L"foo").c_str());
> }
> 
>-// Tests String::ShowWideCStringQuoted().
>-TEST(StringTest, ShowWideCStringQuoted) {
>- EXPECT_STREQ("(null)",
>- String::ShowWideCStringQuoted(NULL).c_str());
>- EXPECT_STREQ("L\"\"",
>- String::ShowWideCStringQuoted(L"").c_str());
>- EXPECT_STREQ("L\"foo\"",
>- String::ShowWideCStringQuoted(L"foo").c_str());
>-}
>-
>-#if GTEST_OS_WINDOWS_MOBILE
>+# if GTEST_OS_WINDOWS_MOBILE
> TEST(StringTest, AnsiAndUtf16Null) {
> EXPECT_EQ(NULL, String::AnsiToUtf16(NULL));
> EXPECT_EQ(NULL, String::Utf16ToAnsi(NULL));
>@@ -1203,7 +1081,7 @@ TEST(StringTest, AnsiAndUtf16ConvertPathChars) {
> EXPECT_EQ(0, wcsncmp(L".:\\ \"*?", utf16, 3));
> delete [] utf16;
> }
>-#endif // GTEST_OS_WINDOWS_MOBILE
>+# endif // GTEST_OS_WINDOWS_MOBILE
> 
> #endif // GTEST_OS_WINDOWS
> 
>@@ -1317,6 +1195,17 @@ TEST_F(ExpectFatalFailureTest, CatchesFatalFaliure) {
> EXPECT_FATAL_FAILURE(AddFatalFailure(), "Expected fatal failure.");
> }
> 
>+#if GTEST_HAS_GLOBAL_STRING
>+TEST_F(ExpectFatalFailureTest, AcceptsStringObject) {
>+ EXPECT_FATAL_FAILURE(AddFatalFailure(), ::string("Expected fatal failure."));
>+}
>+#endif
>+
>+TEST_F(ExpectFatalFailureTest, AcceptsStdStringObject) {
>+ EXPECT_FATAL_FAILURE(AddFatalFailure(),
>+ ::std::string("Expected fatal failure."));
>+}
>+
> TEST_F(ExpectFatalFailureTest, CatchesFatalFailureOnAllThreads) {
> // We have another test below to verify that the macro catches fatal
> // failures generated on another thread.
>@@ -1326,7 +1215,7 @@ TEST_F(ExpectFatalFailureTest, CatchesFatalFailureOnAllThreads) {
> 
> #ifdef __BORLANDC__
> // Silences warnings: "Condition is always true"
>-#pragma option push -w-ccc
>+# pragma option push -w-ccc
> #endif
> 
> // Tests that EXPECT_FATAL_FAILURE() can be used in a non-void
>@@ -1354,7 +1243,7 @@ void DoesNotAbortHelper(bool* aborted) {
> 
> #ifdef __BORLANDC__
> // Restores warnings after previous "#pragma option push" suppressed them.
>-#pragma option pop
>+# pragma option pop
> #endif
> 
> TEST_F(ExpectFatalFailureTest, DoesNotAbort) {
>@@ -1371,8 +1260,8 @@ static int global_var = 0;
> #define GTEST_USE_UNPROTECTED_COMMA_ global_var++, global_var++
> 
> TEST_F(ExpectFatalFailureTest, AcceptsMacroThatExpandsToUnprotectedComma) {
>-#if !defined(__BORLANDC__) || __BORLANDC__ >= 0x600
>- // ICE's in C++Builder 2007.
>+#ifndef __BORLANDC__
>+ // ICE's in C++Builder.
> EXPECT_FATAL_FAILURE({
> GTEST_USE_UNPROTECTED_COMMA_;
> AddFatalFailure();
>@@ -1394,6 +1283,18 @@ TEST_F(ExpectNonfatalFailureTest, CatchesNonfatalFailure) {
> "Expected non-fatal failure.");
> }
> 
>+#if GTEST_HAS_GLOBAL_STRING
>+TEST_F(ExpectNonfatalFailureTest, AcceptsStringObject) {
>+ EXPECT_NONFATAL_FAILURE(AddNonfatalFailure(),
>+ ::string("Expected non-fatal failure."));
>+}
>+#endif
>+
>+TEST_F(ExpectNonfatalFailureTest, AcceptsStdStringObject) {
>+ EXPECT_NONFATAL_FAILURE(AddNonfatalFailure(),
>+ ::std::string("Expected non-fatal failure."));
>+}
>+
> TEST_F(ExpectNonfatalFailureTest, CatchesNonfatalFailureOnAllThreads) {
> // We have another test below to verify that the macro catches
> // non-fatal failures generated on another thread.
>@@ -1483,8 +1384,7 @@ class TestResultTest : public Test {
> // In order to test TestResult, we need to modify its internal
> // state, in particular the TestPartResult vector it holds.
> // test_part_results() returns a const reference to this vector.
>- // We cast it to a non-const object s.t. it can be modified (yes,
>- // this is a hack).
>+ // We cast it to a non-const object s.t. it can be modified
> TPRVector* results1 = const_cast<TPRVector*>(
> &TestResultAccessor::test_part_results(*r1));
> TPRVector* results2 = const_cast<TPRVector*>(
>@@ -1509,7 +1409,7 @@ class TestResultTest : public Test {
> delete r2;
> }
> 
>- // Helper that compares two two TestPartResults.
>+ // Helper that compares two TestPartResults.
> static void CompareTestPartResult(const TestPartResult& expected,
> const TestPartResult& actual) {
> EXPECT_EQ(expected.type(), actual.type());
>@@ -1566,7 +1466,7 @@ TEST(TestResultPropertyTest, NoPropertiesFoundWhenNoneAreAdded) {
> TEST(TestResultPropertyTest, OnePropertyFoundWhenAdded) {
> TestResult test_result;
> TestProperty property("key_1", "1");
>- TestResultAccessor::RecordProperty(&test_result, property);
>+ TestResultAccessor::RecordProperty(&test_result, "testcase", property);
> ASSERT_EQ(1, test_result.test_property_count());
> const TestProperty& actual_property = test_result.GetTestProperty(0);
> EXPECT_STREQ("key_1", actual_property.key());
>@@ -1578,8 +1478,8 @@ TEST(TestResultPropertyTest, MultiplePropertiesFoundWhenAdded) {
> TestResult test_result;
> TestProperty property_1("key_1", "1");
> TestProperty property_2("key_2", "2");
>- TestResultAccessor::RecordProperty(&test_result, property_1);
>- TestResultAccessor::RecordProperty(&test_result, property_2);
>+ TestResultAccessor::RecordProperty(&test_result, "testcase", property_1);
>+ TestResultAccessor::RecordProperty(&test_result, "testcase", property_2);
> ASSERT_EQ(2, test_result.test_property_count());
> const TestProperty& actual_property_1 = test_result.GetTestProperty(0);
> EXPECT_STREQ("key_1", actual_property_1.key());
>@@ -1597,10 +1497,10 @@ TEST(TestResultPropertyTest, OverridesValuesForDuplicateKeys) {
> TestProperty property_2_1("key_2", "2");
> TestProperty property_1_2("key_1", "12");
> TestProperty property_2_2("key_2", "22");
>- TestResultAccessor::RecordProperty(&test_result, property_1_1);
>- TestResultAccessor::RecordProperty(&test_result, property_2_1);
>- TestResultAccessor::RecordProperty(&test_result, property_1_2);
>- TestResultAccessor::RecordProperty(&test_result, property_2_2);
>+ TestResultAccessor::RecordProperty(&test_result, "testcase", property_1_1);
>+ TestResultAccessor::RecordProperty(&test_result, "testcase", property_2_1);
>+ TestResultAccessor::RecordProperty(&test_result, "testcase", property_1_2);
>+ TestResultAccessor::RecordProperty(&test_result, "testcase", property_2_2);
> 
> ASSERT_EQ(2, test_result.test_property_count());
> const TestProperty& actual_property_1 = test_result.GetTestProperty(0);
>@@ -1613,14 +1513,14 @@ TEST(TestResultPropertyTest, OverridesValuesForDuplicateKeys) {
> }
> 
> // Tests TestResult::GetTestProperty().
>-TEST(TestResultPropertyDeathTest, GetTestProperty) {
>+TEST(TestResultPropertyTest, GetTestProperty) {
> TestResult test_result;
> TestProperty property_1("key_1", "1");
> TestProperty property_2("key_2", "2");
> TestProperty property_3("key_3", "3");
>- TestResultAccessor::RecordProperty(&test_result, property_1);
>- TestResultAccessor::RecordProperty(&test_result, property_2);
>- TestResultAccessor::RecordProperty(&test_result, property_3);
>+ TestResultAccessor::RecordProperty(&test_result, "testcase", property_1);
>+ TestResultAccessor::RecordProperty(&test_result, "testcase", property_2);
>+ TestResultAccessor::RecordProperty(&test_result, "testcase", property_3);
> 
> const TestProperty& fetched_property_1 = test_result.GetTestProperty(0);
> const TestProperty& fetched_property_2 = test_result.GetTestProperty(1);
>@@ -1639,41 +1539,15 @@ TEST(TestResultPropertyDeathTest, GetTestProperty) {
> EXPECT_DEATH_IF_SUPPORTED(test_result.GetTestProperty(-1), "");
> }
> 
>-// When a property using a reserved key is supplied to this function, it tests
>-// that a non-fatal failure is added, a fatal failure is not added, and that the
>-// property is not recorded.
>-void ExpectNonFatalFailureRecordingPropertyWithReservedKey(const char* key) {
>- TestResult test_result;
>- TestProperty property(key, "1");
>- EXPECT_NONFATAL_FAILURE(
>- TestResultAccessor::RecordProperty(&test_result, property),
>- "Reserved key");
>- ASSERT_EQ(0, test_result.test_property_count()) << "Not recorded";
>-}
>-
>-// Attempting to recording a property with the Reserved literal "name"
>-// should add a non-fatal failure and the property should not be recorded.
>-TEST(TestResultPropertyTest, AddFailureWhenUsingReservedKeyCalledName) {
>- ExpectNonFatalFailureRecordingPropertyWithReservedKey("name");
>-}
>-
>-// Attempting to recording a property with the Reserved literal "status"
>-// should add a non-fatal failure and the property should not be recorded.
>-TEST(TestResultPropertyTest, AddFailureWhenUsingReservedKeyCalledStatus) {
>- ExpectNonFatalFailureRecordingPropertyWithReservedKey("status");
>-}
>-
>-// Attempting to recording a property with the Reserved literal "time"
>-// should add a non-fatal failure and the property should not be recorded.
>-TEST(TestResultPropertyTest, AddFailureWhenUsingReservedKeyCalledTime) {
>- ExpectNonFatalFailureRecordingPropertyWithReservedKey("time");
>-}
>-
>-// Attempting to recording a property with the Reserved literal "classname"
>-// should add a non-fatal failure and the property should not be recorded.
>-TEST(TestResultPropertyTest, AddFailureWhenUsingReservedKeyCalledClassname) {
>- ExpectNonFatalFailureRecordingPropertyWithReservedKey("classname");
>-}
>+// Tests the Test class.
>+//
>+// It's difficult to test every public method of this class (we are
>+// already stretching the limit of Google Test by using it to test itself!).
>+// Fortunately, we don't have to do that, as we are already testing
>+// the functionalities of the Test class extensively by using Google Test
>+// alone.
>+//
>+// Therefore, this section only contains one test.
> 
> // Tests that GTestFlagSaver works on Windows and Mac.
> 
>@@ -1698,6 +1572,7 @@ class GTestFlagSaverTest : public Test {
> GTEST_FLAG(repeat) = 1;
> GTEST_FLAG(shuffle) = false;
> GTEST_FLAG(stack_trace_depth) = kMaxStackTraceDepth;
>+ GTEST_FLAG(stream_result_to) = "";
> GTEST_FLAG(throw_on_failure) = false;
> }
> 
>@@ -1724,6 +1599,7 @@ class GTestFlagSaverTest : public Test {
> EXPECT_EQ(1, GTEST_FLAG(repeat));
> EXPECT_FALSE(GTEST_FLAG(shuffle));
> EXPECT_EQ(kMaxStackTraceDepth, GTEST_FLAG(stack_trace_depth));
>+ EXPECT_STREQ("", GTEST_FLAG(stream_result_to).c_str());
> EXPECT_FALSE(GTEST_FLAG(throw_on_failure));
> 
> GTEST_FLAG(also_run_disabled_tests) = true;
>@@ -1739,8 +1615,10 @@ class GTestFlagSaverTest : public Test {
> GTEST_FLAG(repeat) = 100;
> GTEST_FLAG(shuffle) = true;
> GTEST_FLAG(stack_trace_depth) = 1;
>+ GTEST_FLAG(stream_result_to) = "localhost:1234";
> GTEST_FLAG(throw_on_failure) = true;
> }
>+
> private:
> // For saving Google Test flags during this test case.
> static GTestFlagSaver* saver_;
>@@ -1773,15 +1651,16 @@ static void SetEnv(const char* name, const char* value) {
> // C++Builder's putenv only stores a pointer to its parameter; we have to
> // ensure that the string remains valid as long as it might be needed.
> // We use an std::map to do so.
>- static std::map<String, String*> added_env;
>+ static std::map<std::string, std::string*> added_env;
> 
> // Because putenv stores a pointer to the string buffer, we can't delete the
> // previous string (if present) until after it's replaced.
>- String *prev_env = NULL;
>+ std::string *prev_env = NULL;
> if (added_env.find(name) != added_env.end()) {
> prev_env = added_env[name];
> }
>- added_env[name] = new String((Message() << name << "=" << value).GetString());
>+ added_env[name] = new std::string(
>+ (Message() << name << "=" << value).GetString());
> 
> // The standard signature of putenv accepts a 'char*' argument. Other
> // implementations, like C++Builder's, accept a 'const char*'.
>@@ -1813,6 +1692,8 @@ TEST(Int32FromGTestEnvTest, ReturnsDefaultWhenVariableIsNotSet) {
> EXPECT_EQ(10, Int32FromGTestEnv("temp", 10));
> }
> 
>+# if !defined(GTEST_GET_INT32_FROM_ENV_)
>+
> // Tests that Int32FromGTestEnv() returns the default value when the
> // environment variable overflows as an Int32.
> TEST(Int32FromGTestEnvTest, ReturnsDefaultWhenValueOverflows) {
>@@ -1837,6 +1718,8 @@ TEST(Int32FromGTestEnvTest, ReturnsDefaultWhenValueIsInvalid) {
> EXPECT_EQ(50, Int32FromGTestEnv("temp", 50));
> }
> 
>+# endif // !defined(GTEST_GET_INT32_FROM_ENV_)
>+
> // Tests that Int32FromGTestEnv() parses and returns the value of the
> // environment variable when it represents a valid decimal integer in
> // the range of an Int32.
>@@ -1925,7 +1808,7 @@ TEST(Int32FromEnvOrDieDeathTest, AbortsOnFailure) {
> }
> 
> // Tests that Int32FromEnvOrDie() aborts with an error message
>-// if the variable cannot be represnted by an Int32.
>+// if the variable cannot be represented by an Int32.
> TEST(Int32FromEnvOrDieDeathTest, AbortsOnInt32Overflow) {
> SetEnv(GTEST_FLAG_PREFIX_UPPER_ "VAR", "1234567891234567891234");
> EXPECT_DEATH_IF_SUPPORTED(
>@@ -2070,6 +1953,173 @@ TEST(UnitTestTest, CanGetOriginalWorkingDir) {
> EXPECT_STRNE(UnitTest::GetInstance()->original_working_dir(), "");
> }
> 
>+TEST(UnitTestTest, ReturnsPlausibleTimestamp) {
>+ EXPECT_LT(0, UnitTest::GetInstance()->start_timestamp());
>+ EXPECT_LE(UnitTest::GetInstance()->start_timestamp(), GetTimeInMillis());
>+}
>+
>+// When a property using a reserved key is supplied to this function, it
>+// tests that a non-fatal failure is added, a fatal failure is not added,
>+// and that the property is not recorded.
>+void ExpectNonFatalFailureRecordingPropertyWithReservedKey(
>+ const TestResult& test_result, const char* key) {
>+ EXPECT_NONFATAL_FAILURE(Test::RecordProperty(key, "1"), "Reserved key");
>+ ASSERT_EQ(0, test_result.test_property_count()) << "Property for key '" << key
>+ << "' recorded unexpectedly.";
>+}
>+
>+void ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
>+ const char* key) {
>+ const TestInfo* test_info = UnitTest::GetInstance()->current_test_info();
>+ ASSERT_TRUE(test_info != NULL);
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKey(*test_info->result(),
>+ key);
>+}
>+
>+void ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase(
>+ const char* key) {
>+ const TestCase* test_case = UnitTest::GetInstance()->current_test_case();
>+ ASSERT_TRUE(test_case != NULL);
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKey(
>+ test_case->ad_hoc_test_result(), key);
>+}
>+
>+void ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase(
>+ const char* key) {
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKey(
>+ UnitTest::GetInstance()->ad_hoc_test_result(), key);
>+}
>+
>+// Tests that property recording functions in UnitTest outside of tests
>+// functions correcly. Creating a separate instance of UnitTest ensures it
>+// is in a state similar to the UnitTest's singleton's between tests.
>+class UnitTestRecordPropertyTest :
>+ public testing::internal::UnitTestRecordPropertyTestHelper {
>+ public:
>+ static void SetUpTestCase() {
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase(
>+ "disabled");
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase(
>+ "errors");
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase(
>+ "failures");
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase(
>+ "name");
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase(
>+ "tests");
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase(
>+ "time");
>+
>+ Test::RecordProperty("test_case_key_1", "1");
>+ const TestCase* test_case = UnitTest::GetInstance()->current_test_case();
>+ ASSERT_TRUE(test_case != NULL);
>+
>+ ASSERT_EQ(1, test_case->ad_hoc_test_result().test_property_count());
>+ EXPECT_STREQ("test_case_key_1",
>+ test_case->ad_hoc_test_result().GetTestProperty(0).key());
>+ EXPECT_STREQ("1",
>+ test_case->ad_hoc_test_result().GetTestProperty(0).value());
>+ }
>+};
>+
>+// Tests TestResult has the expected property when added.
>+TEST_F(UnitTestRecordPropertyTest, OnePropertyFoundWhenAdded) {
>+ UnitTestRecordProperty("key_1", "1");
>+
>+ ASSERT_EQ(1, unit_test_.ad_hoc_test_result().test_property_count());
>+
>+ EXPECT_STREQ("key_1",
>+ unit_test_.ad_hoc_test_result().GetTestProperty(0).key());
>+ EXPECT_STREQ("1",
>+ unit_test_.ad_hoc_test_result().GetTestProperty(0).value());
>+}
>+
>+// Tests TestResult has multiple properties when added.
>+TEST_F(UnitTestRecordPropertyTest, MultiplePropertiesFoundWhenAdded) {
>+ UnitTestRecordProperty("key_1", "1");
>+ UnitTestRecordProperty("key_2", "2");
>+
>+ ASSERT_EQ(2, unit_test_.ad_hoc_test_result().test_property_count());
>+
>+ EXPECT_STREQ("key_1",
>+ unit_test_.ad_hoc_test_result().GetTestProperty(0).key());
>+ EXPECT_STREQ("1", unit_test_.ad_hoc_test_result().GetTestProperty(0).value());
>+
>+ EXPECT_STREQ("key_2",
>+ unit_test_.ad_hoc_test_result().GetTestProperty(1).key());
>+ EXPECT_STREQ("2", unit_test_.ad_hoc_test_result().GetTestProperty(1).value());
>+}
>+
>+// Tests TestResult::RecordProperty() overrides values for duplicate keys.
>+TEST_F(UnitTestRecordPropertyTest, OverridesValuesForDuplicateKeys) {
>+ UnitTestRecordProperty("key_1", "1");
>+ UnitTestRecordProperty("key_2", "2");
>+ UnitTestRecordProperty("key_1", "12");
>+ UnitTestRecordProperty("key_2", "22");
>+
>+ ASSERT_EQ(2, unit_test_.ad_hoc_test_result().test_property_count());
>+
>+ EXPECT_STREQ("key_1",
>+ unit_test_.ad_hoc_test_result().GetTestProperty(0).key());
>+ EXPECT_STREQ("12",
>+ unit_test_.ad_hoc_test_result().GetTestProperty(0).value());
>+
>+ EXPECT_STREQ("key_2",
>+ unit_test_.ad_hoc_test_result().GetTestProperty(1).key());
>+ EXPECT_STREQ("22",
>+ unit_test_.ad_hoc_test_result().GetTestProperty(1).value());
>+}
>+
>+TEST_F(UnitTestRecordPropertyTest,
>+ AddFailureInsideTestsWhenUsingTestCaseReservedKeys) {
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
>+ "name");
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
>+ "value_param");
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
>+ "type_param");
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
>+ "status");
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
>+ "time");
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
>+ "classname");
>+}
>+
>+TEST_F(UnitTestRecordPropertyTest,
>+ AddRecordWithReservedKeysGeneratesCorrectPropertyList) {
>+ EXPECT_NONFATAL_FAILURE(
>+ Test::RecordProperty("name", "1"),
>+ "'classname', 'name', 'status', 'time', 'type_param', 'value_param',"
>+ " 'file', and 'line' are reserved");
>+}
>+
>+class UnitTestRecordPropertyTestEnvironment : public Environment {
>+ public:
>+ virtual void TearDown() {
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase(
>+ "tests");
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase(
>+ "failures");
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase(
>+ "disabled");
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase(
>+ "errors");
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase(
>+ "name");
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase(
>+ "timestamp");
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase(
>+ "time");
>+ ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase(
>+ "random_seed");
>+ }
>+};
>+
>+// This will test property recording outside of any test or test case.
>+static Environment* record_property_env =
>+ AddGlobalTestEnvironment(new UnitTestRecordPropertyTestEnvironment);
>+
> // This group of tests is for predicate assertions (ASSERT_PRED*, etc)
> // of various arities. They do not attempt to be exhaustive. Rather,
> // view them as smoke tests that can be easily reviewed and verified.
>@@ -2401,7 +2451,7 @@ TEST(StringAssertionTest, ASSERT_STREQ) {
> ASSERT_STREQ(p1, p2);
> 
> EXPECT_FATAL_FAILURE(ASSERT_STREQ("bad", "good"),
>- "Expected: \"bad\"");
>+ " \"bad\"\n \"good\"");
> }
> 
> // Tests ASSERT_STREQ with NULL arguments.
>@@ -2437,7 +2487,7 @@ TEST(StringAssertionTest, ASSERT_STRCASEEQ) {
> 
> ASSERT_STRCASEEQ("", "");
> EXPECT_FATAL_FAILURE(ASSERT_STRCASEEQ("Hi", "hi2"),
>- "(ignoring case)");
>+ "Ignoring case");
> }
> 
> // Tests ASSERT_STRCASENE.
>@@ -2475,6 +2525,11 @@ TEST(StringAssertionTest, STREQ_Wide) {
> // Strings containing wide characters.
> EXPECT_NONFATAL_FAILURE(EXPECT_STREQ(L"abc\x8119", L"abc\x8120"),
> "abc");
>+
>+ // The streaming variation.
>+ EXPECT_NONFATAL_FAILURE({ // NOLINT
>+ EXPECT_STREQ(L"abc\x8119", L"abc\x8121") << "Expected failure";
>+ }, "Expected failure");
> }
> 
> // Tests *_STRNE on wide strings.
>@@ -2501,6 +2556,9 @@ TEST(StringAssertionTest, STRNE_Wide) {
> // Strings containing wide characters.
> EXPECT_NONFATAL_FAILURE(EXPECT_STRNE(L"abc\x8119", L"abc\x8119"),
> "abc");
>+
>+ // The streaming variation.
>+ ASSERT_STRNE(L"abc\x8119", L"abc\x8120") << "This shouldn't happen";
> }
> 
> // Tests for ::testing::IsSubstring().
>@@ -2631,7 +2689,6 @@ TEST(IsNotSubstringTest, ReturnsCorrectResultForStdWstring) {
> template <typename RawType>
> class FloatingPointTest : public Test {
> protected:
>-
> // Pre-calculated numbers to be used by the tests.
> struct TestValues {
> RawType close_to_positive_zero;
>@@ -3079,13 +3136,13 @@ TEST(DISABLED_TestCase, DISABLED_TestShouldNotRun) {
> FAIL() << "Unexpected failure: Test in disabled test case should not be run.";
> }
> 
>-// Check that when all tests in a test case are disabled, SetupTestCase() and
>+// Check that when all tests in a test case are disabled, SetUpTestCase() and
> // TearDownTestCase() are not called.
> class DisabledTestsTest : public Test {
> protected:
> static void SetUpTestCase() {
> FAIL() << "Unexpected failure: All tests disabled in test case. "
>- "SetupTestCase() should not be called.";
>+ "SetUpTestCase() should not be called.";
> }
> 
> static void TearDownTestCase() {
>@@ -3224,7 +3281,7 @@ TEST_F(SingleEvaluationTest, ASSERT_STR) {
> 
> // failed EXPECT_STRCASEEQ
> EXPECT_NONFATAL_FAILURE(EXPECT_STRCASEEQ(p1_++, p2_++),
>- "ignoring case");
>+ "Ignoring case");
> EXPECT_EQ(s1_ + 2, p1_);
> EXPECT_EQ(s2_ + 2, p2_);
> }
>@@ -3332,7 +3389,7 @@ class NoFatalFailureTest : public Test {
> 
> void DoAssertNoFatalFailureOnFails() {
> ASSERT_NO_FATAL_FAILURE(Fails());
>- ADD_FAILURE() << "shold not reach here.";
>+ ADD_FAILURE() << "should not reach here.";
> }
> 
> void DoExpectNoFatalFailureOnFails() {
>@@ -3412,59 +3469,157 @@ TEST_F(NoFatalFailureTest, MessageIsStreamable) {
> 
> // Tests non-string assertions.
> 
>+std::string EditsToString(const std::vector<EditType>& edits) {
>+ std::string out;
>+ for (size_t i = 0; i < edits.size(); ++i) {
>+ static const char kEdits[] = " +-/";
>+ out.append(1, kEdits[edits[i]]);
>+ }
>+ return out;
>+}
>+
>+std::vector<size_t> CharsToIndices(const std::string& str) {
>+ std::vector<size_t> out;
>+ for (size_t i = 0; i < str.size(); ++i) {
>+ out.push_back(str[i]);
>+ }
>+ return out;
>+}
>+
>+std::vector<std::string> CharsToLines(const std::string& str) {
>+ std::vector<std::string> out;
>+ for (size_t i = 0; i < str.size(); ++i) {
>+ out.push_back(str.substr(i, 1));
>+ }
>+ return out;
>+}
>+
>+TEST(EditDistance, TestCases) {
>+ struct Case {
>+ int line;
>+ const char* left;
>+ const char* right;
>+ const char* expected_edits;
>+ const char* expected_diff;
>+ };
>+ static const Case kCases[] = {
>+ // No change.
>+ {__LINE__, "A", "A", " ", ""},
>+ {__LINE__, "ABCDE", "ABCDE", " ", ""},
>+ // Simple adds.
>+ {__LINE__, "X", "XA", " +", "@@ +1,2 @@\n X\n+A\n"},
>+ {__LINE__, "X", "XABCD", " ++++", "@@ +1,5 @@\n X\n+A\n+B\n+C\n+D\n"},
>+ // Simple removes.
>+ {__LINE__, "XA", "X", " -", "@@ -1,2 @@\n X\n-A\n"},
>+ {__LINE__, "XABCD", "X", " ----", "@@ -1,5 @@\n X\n-A\n-B\n-C\n-D\n"},
>+ // Simple replaces.
>+ {__LINE__, "A", "a", "/", "@@ -1,1 +1,1 @@\n-A\n+a\n"},
>+ {__LINE__, "ABCD", "abcd", "////",
>+ "@@ -1,4 +1,4 @@\n-A\n-B\n-C\n-D\n+a\n+b\n+c\n+d\n"},
>+ // Path finding.
>+ {__LINE__, "ABCDEFGH", "ABXEGH1", " -/ - +",
>+ "@@ -1,8 +1,7 @@\n A\n B\n-C\n-D\n+X\n E\n-F\n G\n H\n+1\n"},
>+ {__LINE__, "AAAABCCCC", "ABABCDCDC", "- / + / ",
>+ "@@ -1,9 +1,9 @@\n-A\n A\n-A\n+B\n A\n B\n C\n+D\n C\n-C\n+D\n C\n"},
>+ {__LINE__, "ABCDE", "BCDCD", "- +/",
>+ "@@ -1,5 +1,5 @@\n-A\n B\n C\n D\n-E\n+C\n+D\n"},
>+ {__LINE__, "ABCDEFGHIJKL", "BCDCDEFGJKLJK", "- ++ -- ++",
>+ "@@ -1,4 +1,5 @@\n-A\n B\n+C\n+D\n C\n D\n"
>+ "@@ -6,7 +7,7 @@\n F\n G\n-H\n-I\n J\n K\n L\n+J\n+K\n"},
>+ {}};
>+ for (const Case* c = kCases; c->left; ++c) {
>+ EXPECT_TRUE(c->expected_edits ==
>+ EditsToString(CalculateOptimalEdits(CharsToIndices(c->left),
>+ CharsToIndices(c->right))))
>+ << "Left <" << c->left << "> Right <" << c->right << "> Edits <"
>+ << EditsToString(CalculateOptimalEdits(
>+ CharsToIndices(c->left), CharsToIndices(c->right))) << ">";
>+ EXPECT_TRUE(c->expected_diff == CreateUnifiedDiff(CharsToLines(c->left),
>+ CharsToLines(c->right)))
>+ << "Left <" << c->left << "> Right <" << c->right << "> Diff <"
>+ << CreateUnifiedDiff(CharsToLines(c->left), CharsToLines(c->right))
>+ << ">";
>+ }
>+}
>+
> // Tests EqFailure(), used for implementing *EQ* assertions.
> TEST(AssertionTest, EqFailure) {
>- const String foo_val("5"), bar_val("6");
>- const String msg1(
>+ const std::string foo_val("5"), bar_val("6");
>+ const std::string msg1(
> EqFailure("foo", "bar", foo_val, bar_val, false)
> .failure_message());
> EXPECT_STREQ(
>- "Value of: bar\n"
>- " Actual: 6\n"
>- "Expected: foo\n"
>- "Which is: 5",
>+ "Expected equality of these values:\n"
>+ " foo\n"
>+ " Which is: 5\n"
>+ " bar\n"
>+ " Which is: 6",
> msg1.c_str());
> 
>- const String msg2(
>+ const std::string msg2(
> EqFailure("foo", "6", foo_val, bar_val, false)
> .failure_message());
> EXPECT_STREQ(
>- "Value of: 6\n"
>- "Expected: foo\n"
>- "Which is: 5",
>+ "Expected equality of these values:\n"
>+ " foo\n"
>+ " Which is: 5\n"
>+ " 6",
> msg2.c_str());
> 
>- const String msg3(
>+ const std::string msg3(
> EqFailure("5", "bar", foo_val, bar_val, false)
> .failure_message());
> EXPECT_STREQ(
>- "Value of: bar\n"
>- " Actual: 6\n"
>- "Expected: 5",
>+ "Expected equality of these values:\n"
>+ " 5\n"
>+ " bar\n"
>+ " Which is: 6",
> msg3.c_str());
> 
>- const String msg4(
>+ const std::string msg4(
> EqFailure("5", "6", foo_val, bar_val, false).failure_message());
> EXPECT_STREQ(
>- "Value of: 6\n"
>- "Expected: 5",
>+ "Expected equality of these values:\n"
>+ " 5\n"
>+ " 6",
> msg4.c_str());
> 
>- const String msg5(
>+ const std::string msg5(
> EqFailure("foo", "bar",
>- String("\"x\""), String("\"y\""),
>+ std::string("\"x\""), std::string("\"y\""),
> true).failure_message());
> EXPECT_STREQ(
>- "Value of: bar\n"
>- " Actual: \"y\"\n"
>- "Expected: foo (ignoring case)\n"
>- "Which is: \"x\"",
>+ "Expected equality of these values:\n"
>+ " foo\n"
>+ " Which is: \"x\"\n"
>+ " bar\n"
>+ " Which is: \"y\"\n"
>+ "Ignoring case",
> msg5.c_str());
> }
> 
>+TEST(AssertionTest, EqFailureWithDiff) {
>+ const std::string left(
>+ "1\\n2XXX\\n3\\n5\\n6\\n7\\n8\\n9\\n10\\n11\\n12XXX\\n13\\n14\\n15");
>+ const std::string right(
>+ "1\\n2\\n3\\n4\\n5\\n6\\n7\\n8\\n9\\n11\\n12\\n13\\n14");
>+ const std::string msg1(
>+ EqFailure("left", "right", left, right, false).failure_message());
>+ EXPECT_STREQ(
>+ "Expected equality of these values:\n"
>+ " left\n"
>+ " Which is: "
>+ "1\\n2XXX\\n3\\n5\\n6\\n7\\n8\\n9\\n10\\n11\\n12XXX\\n13\\n14\\n15\n"
>+ " right\n"
>+ " Which is: 1\\n2\\n3\\n4\\n5\\n6\\n7\\n8\\n9\\n11\\n12\\n13\\n14\n"
>+ "With diff:\n@@ -1,5 +1,6 @@\n 1\n-2XXX\n+2\n 3\n+4\n 5\n 6\n"
>+ "@@ -7,8 +8,6 @@\n 8\n 9\n-10\n 11\n-12XXX\n+12\n 13\n 14\n-15\n",
>+ msg1.c_str());
>+}
>+
> // Tests AppendUserMessage(), used for implementing the *EQ* macros.
> TEST(AssertionTest, AppendUserMessage) {
>- const String foo("foo");
>+ const std::string foo("foo");
> 
> Message msg;
> EXPECT_STREQ("foo",
>@@ -3477,7 +3632,7 @@ TEST(AssertionTest, AppendUserMessage) {
> 
> #ifdef __BORLANDC__
> // Silences warnings: "Condition is always true", "Unreachable code"
>-#pragma option push -w-ccc -w-rch
>+# pragma option push -w-ccc -w-rch
> #endif
> 
> // Tests ASSERT_TRUE.
>@@ -3490,8 +3645,8 @@ TEST(AssertionTest, ASSERT_TRUE) {
> // Tests ASSERT_TRUE(predicate) for predicates returning AssertionResult.
> TEST(AssertionTest, AssertTrueWithAssertionResult) {
> ASSERT_TRUE(ResultIsEven(2));
>-#if !defined(__BORLANDC__) || __BORLANDC__ >= 0x600
>- // ICE's in C++Builder 2007.
>+#ifndef __BORLANDC__
>+ // ICE's in C++Builder.
> EXPECT_FATAL_FAILURE(ASSERT_TRUE(ResultIsEven(3)),
> "Value of: ResultIsEven(3)\n"
> " Actual: false (3 is odd)\n"
>@@ -3516,8 +3671,8 @@ TEST(AssertionTest, ASSERT_FALSE) {
> // Tests ASSERT_FALSE(predicate) for predicates returning AssertionResult.
> TEST(AssertionTest, AssertFalseWithAssertionResult) {
> ASSERT_FALSE(ResultIsEven(3));
>-#if !defined(__BORLANDC__) || __BORLANDC__ >= 0x600
>- // ICE's in C++Builder 2007.
>+#ifndef __BORLANDC__
>+ // ICE's in C++Builder.
> EXPECT_FATAL_FAILURE(ASSERT_FALSE(ResultIsEven(2)),
> "Value of: ResultIsEven(2)\n"
> " Actual: true (2 is even)\n"
>@@ -3531,8 +3686,8 @@ TEST(AssertionTest, AssertFalseWithAssertionResult) {
> }
> 
> #ifdef __BORLANDC__
>-// Restores warnings after previous "#pragma option push" supressed them
>-#pragma option pop
>+// Restores warnings after previous "#pragma option push" suppressed them
>+# pragma option pop
> #endif
> 
> // Tests using ASSERT_EQ on double values. The purpose is to make
>@@ -3551,9 +3706,10 @@ TEST(ExpectTest, ASSERT_EQ_Double) {
> TEST(AssertionTest, ASSERT_EQ) {
> ASSERT_EQ(5, 2 + 3);
> EXPECT_FATAL_FAILURE(ASSERT_EQ(5, 2*3),
>- "Value of: 2*3\n"
>- " Actual: 6\n"
>- "Expected: 5");
>+ "Expected equality of these values:\n"
>+ " 5\n"
>+ " 2*3\n"
>+ " Which is: 6");
> }
> 
> // Tests ASSERT_EQ(NULL, pointer).
>@@ -3561,7 +3717,7 @@ TEST(AssertionTest, ASSERT_EQ) {
> TEST(AssertionTest, ASSERT_EQ_NULL) {
> // A success.
> const char* p = NULL;
>- // Some older GCC versions may issue a spurious waring in this or the next
>+ // Some older GCC versions may issue a spurious warning in this or the next
> // assertion statement. This warning should not be suppressed with
> // static_cast since the test verifies the ability to use bare NULL as the
> // expected parameter to the macro.
>@@ -3570,7 +3726,7 @@ TEST(AssertionTest, ASSERT_EQ_NULL) {
> // A failure.
> static int n = 0;
> EXPECT_FATAL_FAILURE(ASSERT_EQ(NULL, &n),
>- "Value of: &n\n");
>+ " &n\n Which is:");
> }
> #endif // GTEST_CAN_COMPARE_NULL
> 
>@@ -3586,7 +3742,7 @@ TEST(ExpectTest, ASSERT_EQ_0) {
> 
> // A failure.
> EXPECT_FATAL_FAILURE(ASSERT_EQ(0, 5.6),
>- "Expected: 0");
>+ " 0\n 5.6");
> }
> 
> // Tests ASSERT_NE.
>@@ -3635,13 +3791,14 @@ void ThrowNothing() {}
> TEST(AssertionTest, ASSERT_THROW) {
> ASSERT_THROW(ThrowAnInteger(), int);
> 
>-#ifndef __BORLANDC__
>+# ifndef __BORLANDC__
>+
> // ICE's in C++Builder 2007 and 2009.
> EXPECT_FATAL_FAILURE(
> ASSERT_THROW(ThrowAnInteger(), bool),
> "Expected: ThrowAnInteger() throws an exception of type bool.\n"
> " Actual: it throws a different type.");
>-#endif
>+# endif
> 
> EXPECT_FATAL_FAILURE(
> ASSERT_THROW(ThrowNothing(), bool),
>@@ -3672,7 +3829,8 @@ TEST(AssertionTest, ASSERT_ANY_THROW) {
> // compile.
> TEST(AssertionTest, AssertPrecedence) {
> ASSERT_EQ(1 < 2, true);
>- ASSERT_EQ(true && false, false);
>+ bool false_value = false;
>+ ASSERT_EQ(true && false_value, false);
> }
> 
> // A subroutine used by the following test.
>@@ -3683,7 +3841,7 @@ void TestEq1(int x) {
> // Tests calling a test subroutine that's not part of a fixture.
> TEST(AssertionTest, NonFixtureSubroutine) {
> EXPECT_FATAL_FAILURE(TestEq1(2),
>- "Value of: x");
>+ " x\n Which is: 2");
> }
> 
> // An uncopyable class.
>@@ -3732,7 +3890,8 @@ TEST(AssertionTest, AssertWorksWithUncopyableObject) {
> EXPECT_FATAL_FAILURE(TestAssertNonPositive(),
> "IsPositiveUncopyable(y) evaluates to false, where\ny evaluates to -1");
> EXPECT_FATAL_FAILURE(TestAssertEqualsUncopyable(),
>- "Value of: y\n Actual: -1\nExpected: x\nWhich is: 5");
>+ "Expected equality of these values:\n"
>+ " x\n Which is: 5\n y\n Which is: -1");
> }
> 
> // Tests that uncopyable objects can be used in expects.
>@@ -3744,57 +3903,90 @@ TEST(AssertionTest, ExpectWorksWithUncopyableObject) {
> "IsPositiveUncopyable(y) evaluates to false, where\ny evaluates to -1");
> EXPECT_EQ(x, x);
> EXPECT_NONFATAL_FAILURE(EXPECT_EQ(x, y),
>- "Value of: y\n Actual: -1\nExpected: x\nWhich is: 5");
>+ "Expected equality of these values:\n"
>+ " x\n Which is: 5\n y\n Which is: -1");
> }
> 
>+enum NamedEnum {
>+ kE1 = 0,
>+ kE2 = 1
>+};
>+
>+TEST(AssertionTest, NamedEnum) {
>+ EXPECT_EQ(kE1, kE1);
>+ EXPECT_LT(kE1, kE2);
>+ EXPECT_NONFATAL_FAILURE(EXPECT_EQ(kE1, kE2), "Which is: 0");
>+ EXPECT_NONFATAL_FAILURE(EXPECT_EQ(kE1, kE2), "Which is: 1");
>+}
> 
> // The version of gcc used in XCode 2.2 has a bug and doesn't allow
> // anonymous enums in assertions. Therefore the following test is not
> // done on Mac.
>-// Sun Studio also rejects this code.
>-#if !GTEST_OS_MAC && !defined(__SUNPRO_CC)
>+// Sun Studio and HP aCC also reject this code.
>+#if !GTEST_OS_MAC && !defined(__SUNPRO_CC) && !defined(__HP_aCC)
> 
> // Tests using assertions with anonymous enums.
> enum {
>- CASE_A = -1,
>-#if GTEST_OS_LINUX
>+ kCaseA = -1,
>+
>+# if GTEST_OS_LINUX
>+
> // We want to test the case where the size of the anonymous enum is
> // larger than sizeof(int), to make sure our implementation of the
> // assertions doesn't truncate the enums. However, MSVC
> // (incorrectly) doesn't allow an enum value to exceed the range of
> // an int, so this has to be conditionally compiled.
> //
>- // On Linux, CASE_B and CASE_A have the same value when truncated to
>+ // On Linux, kCaseB and kCaseA have the same value when truncated to
> // int size. We want to test whether this will confuse the
> // assertions.
>- CASE_B = testing::internal::kMaxBiggestInt,
>-#else
>- CASE_B = INT_MAX,
>-#endif // GTEST_OS_LINUX
>+ kCaseB = testing::internal::kMaxBiggestInt,
>+
>+# else
>+
>+ kCaseB = INT_MAX,
>+
>+# endif // GTEST_OS_LINUX
>+
>+ kCaseC = 42
> };
> 
> TEST(AssertionTest, AnonymousEnum) {
>-#if GTEST_OS_LINUX
>- EXPECT_EQ(static_cast<int>(CASE_A), static_cast<int>(CASE_B));
>-#endif // GTEST_OS_LINUX
>-
>- EXPECT_EQ(CASE_A, CASE_A);
>- EXPECT_NE(CASE_A, CASE_B);
>- EXPECT_LT(CASE_A, CASE_B);
>- EXPECT_LE(CASE_A, CASE_B);
>- EXPECT_GT(CASE_B, CASE_A);
>- EXPECT_GE(CASE_A, CASE_A);
>- EXPECT_NONFATAL_FAILURE(EXPECT_GE(CASE_A, CASE_B),
>- "(CASE_A) >= (CASE_B)");
>-
>- ASSERT_EQ(CASE_A, CASE_A);
>- ASSERT_NE(CASE_A, CASE_B);
>- ASSERT_LT(CASE_A, CASE_B);
>- ASSERT_LE(CASE_A, CASE_B);
>- ASSERT_GT(CASE_B, CASE_A);
>- ASSERT_GE(CASE_A, CASE_A);
>- EXPECT_FATAL_FAILURE(ASSERT_EQ(CASE_A, CASE_B),
>- "Value of: CASE_B");
>+# if GTEST_OS_LINUX
>+
>+ EXPECT_EQ(static_cast<int>(kCaseA), static_cast<int>(kCaseB));
>+
>+# endif // GTEST_OS_LINUX
>+
>+ EXPECT_EQ(kCaseA, kCaseA);
>+ EXPECT_NE(kCaseA, kCaseB);
>+ EXPECT_LT(kCaseA, kCaseB);
>+ EXPECT_LE(kCaseA, kCaseB);
>+ EXPECT_GT(kCaseB, kCaseA);
>+ EXPECT_GE(kCaseA, kCaseA);
>+ EXPECT_NONFATAL_FAILURE(EXPECT_GE(kCaseA, kCaseB),
>+ "(kCaseA) >= (kCaseB)");
>+ EXPECT_NONFATAL_FAILURE(EXPECT_GE(kCaseA, kCaseC),
>+ "-1 vs 42");
>+
>+ ASSERT_EQ(kCaseA, kCaseA);
>+ ASSERT_NE(kCaseA, kCaseB);
>+ ASSERT_LT(kCaseA, kCaseB);
>+ ASSERT_LE(kCaseA, kCaseB);
>+ ASSERT_GT(kCaseB, kCaseA);
>+ ASSERT_GE(kCaseA, kCaseA);
>+
>+# ifndef __BORLANDC__
>+
>+ // ICE's in C++Builder.
>+ EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseB),
>+ " kCaseB\n Which is: ");
>+ EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseC),
>+ "\n Which is: 42");
>+# endif
>+
>+ EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseC),
>+ "\n Which is: -1");
> }
> 
> #endif // !GTEST_OS_MAC && !defined(__SUNPRO_CC)
>@@ -3840,24 +4032,26 @@ TEST(HRESULTAssertionTest, EXPECT_HRESULT_FAILED) {
> 
> EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_FAILED(OkHRESULTSuccess()),
> "Expected: (OkHRESULTSuccess()) fails.\n"
>- " Actual: 0x00000000");
>+ " Actual: 0x0");
> EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_FAILED(FalseHRESULTSuccess()),
> "Expected: (FalseHRESULTSuccess()) fails.\n"
>- " Actual: 0x00000001");
>+ " Actual: 0x1");
> }
> 
> TEST(HRESULTAssertionTest, ASSERT_HRESULT_FAILED) {
> ASSERT_HRESULT_FAILED(E_UNEXPECTED);
> 
>-#ifndef __BORLANDC__
>+# ifndef __BORLANDC__
>+
> // ICE's in C++Builder 2007 and 2009.
> EXPECT_FATAL_FAILURE(ASSERT_HRESULT_FAILED(OkHRESULTSuccess()),
> "Expected: (OkHRESULTSuccess()) fails.\n"
>- " Actual: 0x00000000");
>-#endif
>+ " Actual: 0x0");
>+# endif
>+
> EXPECT_FATAL_FAILURE(ASSERT_HRESULT_FAILED(FalseHRESULTSuccess()),
> "Expected: (FalseHRESULTSuccess()) fails.\n"
>- " Actual: 0x00000001");
>+ " Actual: 0x1");
> }
> 
> // Tests that streaming to the HRESULT macros works.
>@@ -3871,12 +4065,13 @@ TEST(HRESULTAssertionTest, Streaming) {
> EXPECT_HRESULT_SUCCEEDED(E_UNEXPECTED) << "expected failure",
> "expected failure");
> 
>-#ifndef __BORLANDC__
>+# ifndef __BORLANDC__
>+
> // ICE's in C++Builder 2007 and 2009.
> EXPECT_FATAL_FAILURE(
> ASSERT_HRESULT_SUCCEEDED(E_UNEXPECTED) << "expected failure",
> "expected failure");
>-#endif
>+# endif
> 
> EXPECT_NONFATAL_FAILURE(
> EXPECT_HRESULT_FAILED(S_OK) << "expected failure",
>@@ -3891,7 +4086,7 @@ TEST(HRESULTAssertionTest, Streaming) {
> 
> #ifdef __BORLANDC__
> // Silences warnings: "Condition is always true", "Unreachable code"
>-#pragma option push -w-ccc -w-rch
>+# pragma option push -w-ccc -w-rch
> #endif
> 
> // Tests that the assertion macros behave like single statements.
>@@ -4008,7 +4203,7 @@ TEST(AssertionSyntaxTest, WorksWithSwitch) {
> #if GTEST_HAS_EXCEPTIONS
> 
> void ThrowAString() {
>- throw "String";
>+ throw "std::string";
> }
> 
> // Test that the exception assertion macros compile and work with const
>@@ -4060,8 +4255,109 @@ TEST(SuccessfulAssertionTest, ASSERT_STR) {
> 
> namespace {
> 
>+// Tests the message streaming variation of assertions.
>+
>+TEST(AssertionWithMessageTest, EXPECT) {
>+ EXPECT_EQ(1, 1) << "This should succeed.";
>+ EXPECT_NONFATAL_FAILURE(EXPECT_NE(1, 1) << "Expected failure #1.",
>+ "Expected failure #1");
>+ EXPECT_LE(1, 2) << "This should succeed.";
>+ EXPECT_NONFATAL_FAILURE(EXPECT_LT(1, 0) << "Expected failure #2.",
>+ "Expected failure #2.");
>+ EXPECT_GE(1, 0) << "This should succeed.";
>+ EXPECT_NONFATAL_FAILURE(EXPECT_GT(1, 2) << "Expected failure #3.",
>+ "Expected failure #3.");
>+
>+ EXPECT_STREQ("1", "1") << "This should succeed.";
>+ EXPECT_NONFATAL_FAILURE(EXPECT_STRNE("1", "1") << "Expected failure #4.",
>+ "Expected failure #4.");
>+ EXPECT_STRCASEEQ("a", "A") << "This should succeed.";
>+ EXPECT_NONFATAL_FAILURE(EXPECT_STRCASENE("a", "A") << "Expected failure #5.",
>+ "Expected failure #5.");
>+
>+ EXPECT_FLOAT_EQ(1, 1) << "This should succeed.";
>+ EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(1, 1.2) << "Expected failure #6.",
>+ "Expected failure #6.");
>+ EXPECT_NEAR(1, 1.1, 0.2) << "This should succeed.";
>+}
>+
>+TEST(AssertionWithMessageTest, ASSERT) {
>+ ASSERT_EQ(1, 1) << "This should succeed.";
>+ ASSERT_NE(1, 2) << "This should succeed.";
>+ ASSERT_LE(1, 2) << "This should succeed.";
>+ ASSERT_LT(1, 2) << "This should succeed.";
>+ ASSERT_GE(1, 0) << "This should succeed.";
>+ EXPECT_FATAL_FAILURE(ASSERT_GT(1, 2) << "Expected failure.",
>+ "Expected failure.");
>+}
>+
>+TEST(AssertionWithMessageTest, ASSERT_STR) {
>+ ASSERT_STREQ("1", "1") << "This should succeed.";
>+ ASSERT_STRNE("1", "2") << "This should succeed.";
>+ ASSERT_STRCASEEQ("a", "A") << "This should succeed.";
>+ EXPECT_FATAL_FAILURE(ASSERT_STRCASENE("a", "A") << "Expected failure.",
>+ "Expected failure.");
>+}
>+
>+TEST(AssertionWithMessageTest, ASSERT_FLOATING) {
>+ ASSERT_FLOAT_EQ(1, 1) << "This should succeed.";
>+ ASSERT_DOUBLE_EQ(1, 1) << "This should succeed.";
>+ EXPECT_FATAL_FAILURE(ASSERT_NEAR(1,1.2, 0.1) << "Expect failure.", // NOLINT
>+ "Expect failure.");
>+ // To work around a bug in gcc 2.95.0, there is intentionally no
>+ // space after the first comma in the previous statement.
>+}
>+
>+// Tests using ASSERT_FALSE with a streamed message.
>+TEST(AssertionWithMessageTest, ASSERT_FALSE) {
>+ ASSERT_FALSE(false) << "This shouldn't fail.";
>+ EXPECT_FATAL_FAILURE({ // NOLINT
>+ ASSERT_FALSE(true) << "Expected failure: " << 2 << " > " << 1
>+ << " evaluates to " << true;
>+ }, "Expected failure");
>+}
>+
>+// Tests using FAIL with a streamed message.
>+TEST(AssertionWithMessageTest, FAIL) {
>+ EXPECT_FATAL_FAILURE(FAIL() << 0,
>+ "0");
>+}
>+
>+// Tests using SUCCEED with a streamed message.
>+TEST(AssertionWithMessageTest, SUCCEED) {
>+ SUCCEED() << "Success == " << 1;
>+}
>+
>+// Tests using ASSERT_TRUE with a streamed message.
>+TEST(AssertionWithMessageTest, ASSERT_TRUE) {
>+ ASSERT_TRUE(true) << "This should succeed.";
>+ ASSERT_TRUE(true) << true;
>+ EXPECT_FATAL_FAILURE({ // NOLINT
>+ ASSERT_TRUE(false) << static_cast<const char *>(NULL)
>+ << static_cast<char *>(NULL);
>+ }, "(null)(null)");
>+}
>+
>+#if GTEST_OS_WINDOWS
>+// Tests using wide strings in assertion messages.
>+TEST(AssertionWithMessageTest, WideStringMessage) {
>+ EXPECT_NONFATAL_FAILURE({ // NOLINT
>+ EXPECT_TRUE(false) << L"This failure is expected.\x8119";
>+ }, "This failure is expected.");
>+ EXPECT_FATAL_FAILURE({ // NOLINT
>+ ASSERT_EQ(1, 2) << "This failure is "
>+ << L"expected too.\x8120";
>+ }, "This failure is expected too.");
>+}
>+#endif // GTEST_OS_WINDOWS
>+
> // Tests EXPECT_TRUE.
> TEST(ExpectTest, EXPECT_TRUE) {
>+ EXPECT_TRUE(true) << "Intentional success";
>+ EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(false) << "Intentional failure #1.",
>+ "Intentional failure #1.");
>+ EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(false) << "Intentional failure #2.",
>+ "Intentional failure #2.");
> EXPECT_TRUE(2 > 1); // NOLINT
> EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(2 < 1),
> "Value of: 2 < 1\n"
>@@ -4085,9 +4381,14 @@ TEST(ExpectTest, ExpectTrueWithAssertionResult) {
> "Expected: true");
> }
> 
>-// Tests EXPECT_FALSE.
>+// Tests EXPECT_FALSE with a streamed message.
> TEST(ExpectTest, EXPECT_FALSE) {
> EXPECT_FALSE(2 < 1); // NOLINT
>+ EXPECT_FALSE(false) << "Intentional success";
>+ EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(true) << "Intentional failure #1.",
>+ "Intentional failure #1.");
>+ EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(true) << "Intentional failure #2.",
>+ "Intentional failure #2.");
> EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(2 > 1),
> "Value of: 2 > 1\n"
> " Actual: true\n"
>@@ -4111,17 +4412,18 @@ TEST(ExpectTest, ExpectFalseWithAssertionResult) {
> }
> 
> #ifdef __BORLANDC__
>-// Restores warnings after previous "#pragma option push" supressed them
>-#pragma option pop
>+// Restores warnings after previous "#pragma option push" suppressed them
>+# pragma option pop
> #endif
> 
> // Tests EXPECT_EQ.
> TEST(ExpectTest, EXPECT_EQ) {
> EXPECT_EQ(5, 2 + 3);
> EXPECT_NONFATAL_FAILURE(EXPECT_EQ(5, 2*3),
>- "Value of: 2*3\n"
>- " Actual: 6\n"
>- "Expected: 5");
>+ "Expected equality of these values:\n"
>+ " 5\n"
>+ " 2*3\n"
>+ " Which is: 6");
> EXPECT_NONFATAL_FAILURE(EXPECT_EQ(5, 2 - 3),
> "2 - 3");
> }
>@@ -4143,7 +4445,7 @@ TEST(ExpectTest, EXPECT_EQ_Double) {
> TEST(ExpectTest, EXPECT_EQ_NULL) {
> // A success.
> const char* p = NULL;
>- // Some older GCC versions may issue a spurious waring in this or the next
>+ // Some older GCC versions may issue a spurious warning in this or the next
> // assertion statement. This warning should not be suppressed with
> // static_cast since the test verifies the ability to use bare NULL as the
> // expected parameter to the macro.
>@@ -4152,7 +4454,7 @@ TEST(ExpectTest, EXPECT_EQ_NULL) {
> // A failure.
> int n = 0;
> EXPECT_NONFATAL_FAILURE(EXPECT_EQ(NULL, &n),
>- "Value of: &n\n");
>+ " &n\n Which is:");
> }
> #endif // GTEST_CAN_COMPARE_NULL
> 
>@@ -4168,7 +4470,7 @@ TEST(ExpectTest, EXPECT_EQ_0) {
> 
> // A failure.
> EXPECT_NONFATAL_FAILURE(EXPECT_EQ(0, 5.6),
>- "Expected: 0");
>+ " 0\n 5.6");
> }
> 
> // Tests EXPECT_NE.
>@@ -4268,7 +4570,7 @@ TEST(ExpectTest, EXPECT_ANY_THROW) {
> TEST(ExpectTest, ExpectPrecedence) {
> EXPECT_EQ(1 < 2, true);
> EXPECT_NONFATAL_FAILURE(EXPECT_EQ(true, true && false),
>- "Value of: true && false");
>+ " true && false\n Which is: false");
> }
> 
> 
>@@ -4361,7 +4663,7 @@ TEST(StreamableTest, BasicIoManip) {
> 
> void AddFailureHelper(bool* aborted) {
> *aborted = true;
>- ADD_FAILURE() << "Failure";
>+ ADD_FAILURE() << "Intentional failure.";
> *aborted = false;
> }
> 
>@@ -4369,10 +4671,25 @@ void AddFailureHelper(bool* aborted) {
> TEST(MacroTest, ADD_FAILURE) {
> bool aborted = true;
> EXPECT_NONFATAL_FAILURE(AddFailureHelper(&aborted),
>- "Failure");
>+ "Intentional failure.");
> EXPECT_FALSE(aborted);
> }
> 
>+// Tests ADD_FAILURE_AT.
>+TEST(MacroTest, ADD_FAILURE_AT) {
>+ // Verifies that ADD_FAILURE_AT does generate a nonfatal failure and
>+ // the failure message contains the user-streamed part.
>+ EXPECT_NONFATAL_FAILURE(ADD_FAILURE_AT("foo.cc", 42) << "Wrong!", "Wrong!");
>+
>+ // Verifies that the user-streamed part is optional.
>+ EXPECT_NONFATAL_FAILURE(ADD_FAILURE_AT("foo.cc", 42), "Failed");
>+
>+ // Unfortunately, we cannot verify that the failure message contains
>+ // the right file path and line number the same way, as
>+ // EXPECT_NONFATAL_FAILURE() doesn't get to see the file path and
>+ // line number. Instead, we do that in googletest-output-test_.cc.
>+}
>+
> // Tests FAIL.
> TEST(MacroTest, FAIL) {
> EXPECT_FATAL_FAILURE(FAIL(),
>@@ -4387,7 +4704,6 @@ TEST(MacroTest, SUCCEED) {
> SUCCEED() << "Explicit success.";
> }
> 
>-
> // Tests for EXPECT_EQ() and ASSERT_EQ().
> //
> // These tests fail *intentionally*, s.t. the failure messages can be
>@@ -4398,15 +4714,17 @@ TEST(MacroTest, SUCCEED) {
> // Tests using bool values in {EXPECT|ASSERT}_EQ.
> TEST(EqAssertionTest, Bool) {
> EXPECT_EQ(true, true);
>- EXPECT_FATAL_FAILURE(ASSERT_EQ(false, true),
>- "Value of: true");
>+ EXPECT_FATAL_FAILURE({
>+ bool false_value = false;
>+ ASSERT_EQ(false_value, true);
>+ }, " false_value\n Which is: false\n true");
> }
> 
> // Tests using int values in {EXPECT|ASSERT}_EQ.
> TEST(EqAssertionTest, Int) {
> ASSERT_EQ(32, 32);
> EXPECT_NONFATAL_FAILURE(EXPECT_EQ(32, 33),
>- "33");
>+ " 32\n 33");
> }
> 
> // Tests using time_t values in {EXPECT|ASSERT}_EQ.
>@@ -4423,9 +4741,9 @@ TEST(EqAssertionTest, Char) {
> ASSERT_EQ('z', 'z');
> const char ch = 'b';
> EXPECT_NONFATAL_FAILURE(EXPECT_EQ('\0', ch),
>- "ch");
>+ " ch\n Which is: 'b'");
> EXPECT_NONFATAL_FAILURE(EXPECT_EQ('a', ch),
>- "ch");
>+ " ch\n Which is: 'b'");
> }
> 
> // Tests using wchar_t values in {EXPECT|ASSERT}_EQ.
>@@ -4433,18 +4751,19 @@ TEST(EqAssertionTest, WideChar) {
> EXPECT_EQ(L'b', L'b');
> 
> EXPECT_NONFATAL_FAILURE(EXPECT_EQ(L'\0', L'x'),
>- "Value of: L'x'\n"
>- " Actual: L'x' (120, 0x78)\n"
>- "Expected: L'\0'\n"
>- "Which is: L'\0' (0, 0x0)");
>+ "Expected equality of these values:\n"
>+ " L'\0'\n"
>+ " Which is: L'\0' (0, 0x0)\n"
>+ " L'x'\n"
>+ " Which is: L'x' (120, 0x78)");
> 
> static wchar_t wchar;
> wchar = L'b';
> EXPECT_NONFATAL_FAILURE(EXPECT_EQ(L'a', wchar),
> "wchar");
>- wchar = L'\x8119';
>- EXPECT_FATAL_FAILURE(ASSERT_EQ(L'\x8120', wchar),
>- "Value of: wchar");
>+ wchar = 0x8119;
>+ EXPECT_FATAL_FAILURE(ASSERT_EQ(static_cast<wchar_t>(0x8120), wchar),
>+ " wchar\n Which is: L'");
> }
> 
> // Tests using ::std::string values in {EXPECT|ASSERT}_EQ.
>@@ -4461,7 +4780,7 @@ TEST(EqAssertionTest, StdString) {
> // Compares a const char* to an std::string that has different
> // content
> EXPECT_NONFATAL_FAILURE(EXPECT_EQ("Test", ::std::string("test")),
>- "::std::string(\"test\")");
>+ "\"test\"");
> 
> // Compares an std::string to a char* that has different content.
> char* const p1 = const_cast<char*>("foo");
>@@ -4473,28 +4792,29 @@ TEST(EqAssertionTest, StdString) {
> static ::std::string str3(str1);
> str3.at(2) = '\0';
> EXPECT_FATAL_FAILURE(ASSERT_EQ(str1, str3),
>- "Value of: str3\n"
>- " Actual: \"A \\0 in the middle\"");
>+ " str3\n Which is: \"A \\0 in the middle\"");
> }
> 
> #if GTEST_HAS_STD_WSTRING
> 
> // Tests using ::std::wstring values in {EXPECT|ASSERT}_EQ.
> TEST(EqAssertionTest, StdWideString) {
>- // Compares an std::wstring to a const wchar_t* that has identical
>- // content.
>- EXPECT_EQ(::std::wstring(L"Test\x8119"), L"Test\x8119");
>-
> // Compares two identical std::wstrings.
> const ::std::wstring wstr1(L"A * in the middle");
> const ::std::wstring wstr2(wstr1);
> ASSERT_EQ(wstr1, wstr2);
> 
>+ // Compares an std::wstring to a const wchar_t* that has identical
>+ // content.
>+ const wchar_t kTestX8119[] = { 'T', 'e', 's', 't', 0x8119, '\0' };
>+ EXPECT_EQ(::std::wstring(kTestX8119), kTestX8119);
>+
> // Compares an std::wstring to a const wchar_t* that has different
> // content.
>+ const wchar_t kTestX8120[] = { 'T', 'e', 's', 't', 0x8120, '\0' };
> EXPECT_NONFATAL_FAILURE({ // NOLINT
>- EXPECT_EQ(::std::wstring(L"Test\x8119"), L"Test\x8120");
>- }, "L\"Test\\x8120\"");
>+ EXPECT_EQ(::std::wstring(kTestX8119), kTestX8120);
>+ }, "kTestX8120");
> 
> // Compares two std::wstrings that have different contents, one of
> // which having a NUL character in the middle.
>@@ -4546,18 +4866,20 @@ TEST(EqAssertionTest, GlobalString) {
> 
> // Tests using ::wstring values in {EXPECT|ASSERT}_EQ.
> TEST(EqAssertionTest, GlobalWideString) {
>- // Compares a const wchar_t* to a ::wstring that has identical content.
>- ASSERT_EQ(L"Test\x8119", ::wstring(L"Test\x8119"));
>-
> // Compares two identical ::wstrings.
> static const ::wstring wstr1(L"A * in the middle");
> static const ::wstring wstr2(wstr1);
> EXPECT_EQ(wstr1, wstr2);
> 
>+ // Compares a const wchar_t* to a ::wstring that has identical content.
>+ const wchar_t kTestX8119[] = { 'T', 'e', 's', 't', 0x8119, '\0' };
>+ ASSERT_EQ(kTestX8119, ::wstring(kTestX8119));
>+
> // Compares a const wchar_t* to a ::wstring that has different
> // content.
>+ const wchar_t kTestX8120[] = { 'T', 'e', 's', 't', 0x8120, '\0' };
> EXPECT_NONFATAL_FAILURE({ // NOLINT
>- EXPECT_EQ(L"Test\x8120", ::wstring(L"Test\x8119"));
>+ EXPECT_EQ(kTestX8120, ::wstring(kTestX8119));
> }, "Test\\x8119");
> 
> // Compares a wchar_t* to a ::wstring that has different content.
>@@ -4590,9 +4912,9 @@ TEST(EqAssertionTest, CharPointer) {
> ASSERT_EQ(p1, p1);
> 
> EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p0, p2),
>- "Value of: p2");
>+ " p2\n Which is:");
> EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p1, p2),
>- "p2");
>+ " p2\n Which is:");
> EXPECT_FATAL_FAILURE(ASSERT_EQ(reinterpret_cast<char*>(0x1234),
> reinterpret_cast<char*>(0xABC0)),
> "ABC0");
>@@ -4612,9 +4934,9 @@ TEST(EqAssertionTest, WideCharPointer) {
> EXPECT_EQ(p0, p0);
> 
> EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p0, p2),
>- "Value of: p2");
>+ " p2\n Which is:");
> EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p1, p2),
>- "p2");
>+ " p2\n Which is:");
> void* pv3 = (void*)0x1234; // NOLINT
> void* pv4 = (void*)0xABC0; // NOLINT
> const wchar_t* p3 = reinterpret_cast<const wchar_t*>(pv3);
>@@ -4632,6 +4954,68 @@ TEST(EqAssertionTest, OtherPointer) {
> "0x1234");
> }
> 
>+// A class that supports binary comparison operators but not streaming.
>+class UnprintableChar {
>+ public:
>+ explicit UnprintableChar(char ch) : char_(ch) {}
>+
>+ bool operator==(const UnprintableChar& rhs) const {
>+ return char_ == rhs.char_;
>+ }
>+ bool operator!=(const UnprintableChar& rhs) const {
>+ return char_ != rhs.char_;
>+ }
>+ bool operator<(const UnprintableChar& rhs) const {
>+ return char_ < rhs.char_;
>+ }
>+ bool operator<=(const UnprintableChar& rhs) const {
>+ return char_ <= rhs.char_;
>+ }
>+ bool operator>(const UnprintableChar& rhs) const {
>+ return char_ > rhs.char_;
>+ }
>+ bool operator>=(const UnprintableChar& rhs) const {
>+ return char_ >= rhs.char_;
>+ }
>+
>+ private:
>+ char char_;
>+};
>+
>+// Tests that ASSERT_EQ() and friends don't require the arguments to
>+// be printable.
>+TEST(ComparisonAssertionTest, AcceptsUnprintableArgs) {
>+ const UnprintableChar x('x'), y('y');
>+ ASSERT_EQ(x, x);
>+ EXPECT_NE(x, y);
>+ ASSERT_LT(x, y);
>+ EXPECT_LE(x, y);
>+ ASSERT_GT(y, x);
>+ EXPECT_GE(x, x);
>+
>+ EXPECT_NONFATAL_FAILURE(EXPECT_EQ(x, y), "1-byte object <78>");
>+ EXPECT_NONFATAL_FAILURE(EXPECT_EQ(x, y), "1-byte object <79>");
>+ EXPECT_NONFATAL_FAILURE(EXPECT_LT(y, y), "1-byte object <79>");
>+ EXPECT_NONFATAL_FAILURE(EXPECT_GT(x, y), "1-byte object <78>");
>+ EXPECT_NONFATAL_FAILURE(EXPECT_GT(x, y), "1-byte object <79>");
>+
>+ // Code tested by EXPECT_FATAL_FAILURE cannot reference local
>+ // variables, so we have to write UnprintableChar('x') instead of x.
>+#ifndef __BORLANDC__
>+ // ICE's in C++Builder.
>+ EXPECT_FATAL_FAILURE(ASSERT_NE(UnprintableChar('x'), UnprintableChar('x')),
>+ "1-byte object <78>");
>+ EXPECT_FATAL_FAILURE(ASSERT_LE(UnprintableChar('y'), UnprintableChar('x')),
>+ "1-byte object <78>");
>+#endif
>+ EXPECT_FATAL_FAILURE(ASSERT_LE(UnprintableChar('y'), UnprintableChar('x')),
>+ "1-byte object <79>");
>+ EXPECT_FATAL_FAILURE(ASSERT_GE(UnprintableChar('x'), UnprintableChar('y')),
>+ "1-byte object <78>");
>+ EXPECT_FATAL_FAILURE(ASSERT_GE(UnprintableChar('x'), UnprintableChar('y')),
>+ "1-byte object <79>");
>+}
>+
> // Tests the FRIEND_TEST macro.
> 
> // This class has a private member we want to test. We will test it
>@@ -4749,7 +5133,7 @@ TEST(AssertionResultTest, ConstructionWorks) {
> EXPECT_STREQ("ghi", r5.message());
> }
> 
>-// Tests that the negation fips the predicate result but keeps the message.
>+// Tests that the negation flips the predicate result but keeps the message.
> TEST(AssertionResultTest, NegationWorks) {
> AssertionResult r1 = AssertionSuccess() << "abc";
> EXPECT_FALSE(!r1);
>@@ -4766,6 +5150,37 @@ TEST(AssertionResultTest, StreamingWorks) {
> EXPECT_STREQ("abcd0true", r.message());
> }
> 
>+TEST(AssertionResultTest, CanStreamOstreamManipulators) {
>+ AssertionResult r = AssertionSuccess();
>+ r << "Data" << std::endl << std::flush << std::ends << "Will be visible";
>+ EXPECT_STREQ("Data\n\\0Will be visible", r.message());
>+}
>+
>+// The next test uses explicit conversion operators -- a C++11 feature.
>+#if GTEST_LANG_CXX11
>+
>+TEST(AssertionResultTest, ConstructibleFromContextuallyConvertibleToBool) {
>+ struct ExplicitlyConvertibleToBool {
>+ explicit operator bool() const { return value; }
>+ bool value;
>+ };
>+ ExplicitlyConvertibleToBool v1 = {false};
>+ ExplicitlyConvertibleToBool v2 = {true};
>+ EXPECT_FALSE(v1);
>+ EXPECT_TRUE(v2);
>+}
>+
>+#endif // GTEST_LANG_CXX11
>+
>+struct ConvertibleToAssertionResult {
>+ operator AssertionResult() const { return AssertionResult(true); }
>+};
>+
>+TEST(AssertionResultTest, ConstructibleFromImplicitlyConvertible) {
>+ ConvertibleToAssertionResult obj;
>+ EXPECT_TRUE(obj);
>+}
>+
> // Tests streaming a user type whose definition and operator << are
> // both in the global namespace.
> class Base {
>@@ -4950,6 +5365,59 @@ TEST_F(TestInfoTest, result) {
> ASSERT_EQ(0, GetTestResult(test_info)->total_part_count());
> }
> 
>+#define VERIFY_CODE_LOCATION \
>+ const int expected_line = __LINE__ - 1; \
>+ const TestInfo* const test_info = GetUnitTestImpl()->current_test_info(); \
>+ ASSERT_TRUE(test_info); \
>+ EXPECT_STREQ(__FILE__, test_info->file()); \
>+ EXPECT_EQ(expected_line, test_info->line())
>+
>+TEST(CodeLocationForTEST, Verify) {
>+ VERIFY_CODE_LOCATION;
>+}
>+
>+class CodeLocationForTESTF : public Test {
>+};
>+
>+TEST_F(CodeLocationForTESTF, Verify) {
>+ VERIFY_CODE_LOCATION;
>+}
>+
>+class CodeLocationForTESTP : public TestWithParam<int> {
>+};
>+
>+TEST_P(CodeLocationForTESTP, Verify) {
>+ VERIFY_CODE_LOCATION;
>+}
>+
>+INSTANTIATE_TEST_CASE_P(, CodeLocationForTESTP, Values(0));
>+
>+template <typename T>
>+class CodeLocationForTYPEDTEST : public Test {
>+};
>+
>+TYPED_TEST_CASE(CodeLocationForTYPEDTEST, int);
>+
>+TYPED_TEST(CodeLocationForTYPEDTEST, Verify) {
>+ VERIFY_CODE_LOCATION;
>+}
>+
>+template <typename T>
>+class CodeLocationForTYPEDTESTP : public Test {
>+};
>+
>+TYPED_TEST_CASE_P(CodeLocationForTYPEDTESTP);
>+
>+TYPED_TEST_P(CodeLocationForTYPEDTESTP, Verify) {
>+ VERIFY_CODE_LOCATION;
>+}
>+
>+REGISTER_TYPED_TEST_CASE_P(CodeLocationForTYPEDTESTP, Verify);
>+
>+INSTANTIATE_TYPED_TEST_CASE_P(My, CodeLocationForTYPEDTESTP, int);
>+
>+#undef VERIFY_CODE_LOCATION
>+
> // Tests setting up and tearing down a test case.
> 
> class SetUpTestCaseTest : public Test {
>@@ -5013,7 +5481,8 @@ TEST_F(SetUpTestCaseTest, Test2) {
> EXPECT_STREQ("123", shared_resource_);
> }
> 
>-// The InitGoogleTestTest test case tests testing::InitGoogleTest().
>+
>+// The ParseFlagsTest test case tests ParseGoogleTestFlagsOnly.
> 
> // The Flags struct stores a copy of all Google Test flags.
> struct Flags {
>@@ -5030,6 +5499,7 @@ struct Flags {
> repeat(1),
> shuffle(false),
> stack_trace_depth(kMaxStackTraceDepth),
>+ stream_result_to(""),
> throw_on_failure(false) {}
> 
> // Factory methods.
>@@ -5098,8 +5568,8 @@ struct Flags {
> return flags;
> }
> 
>- // Creates a Flags struct where the gtest_random_seed flag has
>- // the given value.
>+ // Creates a Flags struct where the gtest_random_seed flag has the given
>+ // value.
> static Flags RandomSeed(Int32 random_seed) {
> Flags flags;
> flags.random_seed = random_seed;
>@@ -5114,8 +5584,8 @@ struct Flags {
> return flags;
> }
> 
>- // Creates a Flags struct where the gtest_shuffle flag has
>- // the given value.
>+ // Creates a Flags struct where the gtest_shuffle flag has the given
>+ // value.
> static Flags Shuffle(bool shuffle) {
> Flags flags;
> flags.shuffle = shuffle;
>@@ -5130,6 +5600,14 @@ struct Flags {
> return flags;
> }
> 
>+ // Creates a Flags struct where the GTEST_FLAG(stream_result_to) flag has
>+ // the given value.
>+ static Flags StreamResultTo(const char* stream_result_to) {
>+ Flags flags;
>+ flags.stream_result_to = stream_result_to;
>+ return flags;
>+ }
>+
> // Creates a Flags struct where the gtest_throw_on_failure flag has
> // the given value.
> static Flags ThrowOnFailure(bool throw_on_failure) {
>@@ -5151,11 +5629,12 @@ struct Flags {
> Int32 repeat;
> bool shuffle;
> Int32 stack_trace_depth;
>+ const char* stream_result_to;
> bool throw_on_failure;
> };
> 
>-// Fixture for testing InitGoogleTest().
>-class InitGoogleTestTest : public Test {
>+// Fixture for testing ParseGoogleTestFlagsOnly().
>+class ParseFlagsTest : public Test {
> protected:
> // Clears the flags before each test.
> virtual void SetUp() {
>@@ -5171,6 +5650,7 @@ class InitGoogleTestTest : public Test {
> GTEST_FLAG(repeat) = 1;
> GTEST_FLAG(shuffle) = false;
> GTEST_FLAG(stack_trace_depth) = kMaxStackTraceDepth;
>+ GTEST_FLAG(stream_result_to) = "";
> GTEST_FLAG(throw_on_failure) = false;
> }
> 
>@@ -5199,8 +5679,10 @@ class InitGoogleTestTest : public Test {
> EXPECT_EQ(expected.random_seed, GTEST_FLAG(random_seed));
> EXPECT_EQ(expected.repeat, GTEST_FLAG(repeat));
> EXPECT_EQ(expected.shuffle, GTEST_FLAG(shuffle));
>- EXPECT_EQ(expected.throw_on_failure, GTEST_FLAG(throw_on_failure));
> EXPECT_EQ(expected.stack_trace_depth, GTEST_FLAG(stack_trace_depth));
>+ EXPECT_STREQ(expected.stream_result_to,
>+ GTEST_FLAG(stream_result_to).c_str());
>+ EXPECT_EQ(expected.throw_on_failure, GTEST_FLAG(throw_on_failure));
> }
> 
> // Parses a command line (specified by argc1 and argv1), then
>@@ -5213,16 +5695,16 @@ class InitGoogleTestTest : public Test {
> const bool saved_help_flag = ::testing::internal::g_help_flag;
> ::testing::internal::g_help_flag = false;
> 
>-#if GTEST_HAS_STREAM_REDIRECTION_
>+# if GTEST_HAS_STREAM_REDIRECTION
> CaptureStdout();
>-#endif // GTEST_HAS_STREAM_REDIRECTION_
>+# endif
> 
> // Parses the command line.
> internal::ParseGoogleTestFlagsOnly(&argc1, const_cast<CharType**>(argv1));
> 
>-#if GTEST_HAS_STREAM_REDIRECTION_
>- const String captured_stdout = GetCapturedStdout();
>-#endif // GTEST_HAS_STREAM_REDIRECTION_
>+# if GTEST_HAS_STREAM_REDIRECTION
>+ const std::string captured_stdout = GetCapturedStdout();
>+# endif
> 
> // Verifies the flag values.
> CheckFlags(expected);
>@@ -5235,7 +5717,7 @@ class InitGoogleTestTest : public Test {
> // help message for the flags it recognizes.
> EXPECT_EQ(should_print_help, ::testing::internal::g_help_flag);
> 
>-#if GTEST_HAS_STREAM_REDIRECTION_
>+# if GTEST_HAS_STREAM_REDIRECTION
> const char* const expected_help_fragment =
> "This program contains tests written using";
> if (should_print_help) {
>@@ -5244,21 +5726,22 @@ class InitGoogleTestTest : public Test {
> EXPECT_PRED_FORMAT2(IsNotSubstring,
> expected_help_fragment, captured_stdout);
> }
>-#endif // GTEST_HAS_STREAM_REDIRECTION_
>+# endif // GTEST_HAS_STREAM_REDIRECTION
> 
> ::testing::internal::g_help_flag = saved_help_flag;
> }
> 
> // This macro wraps TestParsingFlags s.t. the user doesn't need
> // to specify the array sizes.
>-#define GTEST_TEST_PARSING_FLAGS_(argv1, argv2, expected, should_print_help) \
>+
>+# define GTEST_TEST_PARSING_FLAGS_(argv1, argv2, expected, should_print_help) \
> TestParsingFlags(sizeof(argv1)/sizeof(*argv1) - 1, argv1, \
> sizeof(argv2)/sizeof(*argv2) - 1, argv2, \
> expected, should_print_help)
> };
> 
> // Tests parsing an empty command line.
>-TEST_F(InitGoogleTestTest, Empty) {
>+TEST_F(ParseFlagsTest, Empty) {
> const char* argv[] = {
> NULL
> };
>@@ -5271,7 +5754,7 @@ TEST_F(InitGoogleTestTest, Empty) {
> }
> 
> // Tests parsing a command line that has no flag.
>-TEST_F(InitGoogleTestTest, NoFlag) {
>+TEST_F(ParseFlagsTest, NoFlag) {
> const char* argv[] = {
> "foo.exe",
> NULL
>@@ -5286,7 +5769,7 @@ TEST_F(InitGoogleTestTest, NoFlag) {
> }
> 
> // Tests parsing a bad --gtest_filter flag.
>-TEST_F(InitGoogleTestTest, FilterBad) {
>+TEST_F(ParseFlagsTest, FilterBad) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_filter",
>@@ -5303,7 +5786,7 @@ TEST_F(InitGoogleTestTest, FilterBad) {
> }
> 
> // Tests parsing an empty --gtest_filter flag.
>-TEST_F(InitGoogleTestTest, FilterEmpty) {
>+TEST_F(ParseFlagsTest, FilterEmpty) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_filter=",
>@@ -5319,7 +5802,7 @@ TEST_F(InitGoogleTestTest, FilterEmpty) {
> }
> 
> // Tests parsing a non-empty --gtest_filter flag.
>-TEST_F(InitGoogleTestTest, FilterNonEmpty) {
>+TEST_F(ParseFlagsTest, FilterNonEmpty) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_filter=abc",
>@@ -5335,7 +5818,7 @@ TEST_F(InitGoogleTestTest, FilterNonEmpty) {
> }
> 
> // Tests parsing --gtest_break_on_failure.
>-TEST_F(InitGoogleTestTest, BreakOnFailureWithoutValue) {
>+TEST_F(ParseFlagsTest, BreakOnFailureWithoutValue) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_break_on_failure",
>@@ -5351,7 +5834,7 @@ TEST_F(InitGoogleTestTest, BreakOnFailureWithoutValue) {
> }
> 
> // Tests parsing --gtest_break_on_failure=0.
>-TEST_F(InitGoogleTestTest, BreakOnFailureFalse_0) {
>+TEST_F(ParseFlagsTest, BreakOnFailureFalse_0) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_break_on_failure=0",
>@@ -5367,7 +5850,7 @@ TEST_F(InitGoogleTestTest, BreakOnFailureFalse_0) {
> }
> 
> // Tests parsing --gtest_break_on_failure=f.
>-TEST_F(InitGoogleTestTest, BreakOnFailureFalse_f) {
>+TEST_F(ParseFlagsTest, BreakOnFailureFalse_f) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_break_on_failure=f",
>@@ -5383,7 +5866,7 @@ TEST_F(InitGoogleTestTest, BreakOnFailureFalse_f) {
> }
> 
> // Tests parsing --gtest_break_on_failure=F.
>-TEST_F(InitGoogleTestTest, BreakOnFailureFalse_F) {
>+TEST_F(ParseFlagsTest, BreakOnFailureFalse_F) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_break_on_failure=F",
>@@ -5400,7 +5883,7 @@ TEST_F(InitGoogleTestTest, BreakOnFailureFalse_F) {
> 
> // Tests parsing a --gtest_break_on_failure flag that has a "true"
> // definition.
>-TEST_F(InitGoogleTestTest, BreakOnFailureTrue) {
>+TEST_F(ParseFlagsTest, BreakOnFailureTrue) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_break_on_failure=1",
>@@ -5416,7 +5899,7 @@ TEST_F(InitGoogleTestTest, BreakOnFailureTrue) {
> }
> 
> // Tests parsing --gtest_catch_exceptions.
>-TEST_F(InitGoogleTestTest, CatchExceptions) {
>+TEST_F(ParseFlagsTest, CatchExceptions) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_catch_exceptions",
>@@ -5432,7 +5915,7 @@ TEST_F(InitGoogleTestTest, CatchExceptions) {
> }
> 
> // Tests parsing --gtest_death_test_use_fork.
>-TEST_F(InitGoogleTestTest, DeathTestUseFork) {
>+TEST_F(ParseFlagsTest, DeathTestUseFork) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_death_test_use_fork",
>@@ -5449,7 +5932,7 @@ TEST_F(InitGoogleTestTest, DeathTestUseFork) {
> 
> // Tests having the same flag twice with different values. The
> // expected behavior is that the one coming last takes precedence.
>-TEST_F(InitGoogleTestTest, DuplicatedFlags) {
>+TEST_F(ParseFlagsTest, DuplicatedFlags) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_filter=a",
>@@ -5466,7 +5949,7 @@ TEST_F(InitGoogleTestTest, DuplicatedFlags) {
> }
> 
> // Tests having an unrecognized flag on the command line.
>-TEST_F(InitGoogleTestTest, UnrecognizedFlag) {
>+TEST_F(ParseFlagsTest, UnrecognizedFlag) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_break_on_failure",
>@@ -5488,7 +5971,7 @@ TEST_F(InitGoogleTestTest, UnrecognizedFlag) {
> }
> 
> // Tests having a --gtest_list_tests flag
>-TEST_F(InitGoogleTestTest, ListTestsFlag) {
>+TEST_F(ParseFlagsTest, ListTestsFlag) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_list_tests",
>@@ -5504,7 +5987,7 @@ TEST_F(InitGoogleTestTest, ListTestsFlag) {
> }
> 
> // Tests having a --gtest_list_tests flag with a "true" value
>-TEST_F(InitGoogleTestTest, ListTestsTrue) {
>+TEST_F(ParseFlagsTest, ListTestsTrue) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_list_tests=1",
>@@ -5520,7 +6003,7 @@ TEST_F(InitGoogleTestTest, ListTestsTrue) {
> }
> 
> // Tests having a --gtest_list_tests flag with a "false" value
>-TEST_F(InitGoogleTestTest, ListTestsFalse) {
>+TEST_F(ParseFlagsTest, ListTestsFalse) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_list_tests=0",
>@@ -5536,7 +6019,7 @@ TEST_F(InitGoogleTestTest, ListTestsFalse) {
> }
> 
> // Tests parsing --gtest_list_tests=f.
>-TEST_F(InitGoogleTestTest, ListTestsFalse_f) {
>+TEST_F(ParseFlagsTest, ListTestsFalse_f) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_list_tests=f",
>@@ -5552,7 +6035,7 @@ TEST_F(InitGoogleTestTest, ListTestsFalse_f) {
> }
> 
> // Tests parsing --gtest_list_tests=F.
>-TEST_F(InitGoogleTestTest, ListTestsFalse_F) {
>+TEST_F(ParseFlagsTest, ListTestsFalse_F) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_list_tests=F",
>@@ -5568,7 +6051,7 @@ TEST_F(InitGoogleTestTest, ListTestsFalse_F) {
> }
> 
> // Tests parsing --gtest_output (invalid).
>-TEST_F(InitGoogleTestTest, OutputEmpty) {
>+TEST_F(ParseFlagsTest, OutputEmpty) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_output",
>@@ -5585,7 +6068,7 @@ TEST_F(InitGoogleTestTest, OutputEmpty) {
> }
> 
> // Tests parsing --gtest_output=xml
>-TEST_F(InitGoogleTestTest, OutputXml) {
>+TEST_F(ParseFlagsTest, OutputXml) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_output=xml",
>@@ -5601,7 +6084,7 @@ TEST_F(InitGoogleTestTest, OutputXml) {
> }
> 
> // Tests parsing --gtest_output=xml:file
>-TEST_F(InitGoogleTestTest, OutputXmlFile) {
>+TEST_F(ParseFlagsTest, OutputXmlFile) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_output=xml:file",
>@@ -5617,7 +6100,7 @@ TEST_F(InitGoogleTestTest, OutputXmlFile) {
> }
> 
> // Tests parsing --gtest_output=xml:directory/path/
>-TEST_F(InitGoogleTestTest, OutputXmlDirectory) {
>+TEST_F(ParseFlagsTest, OutputXmlDirectory) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_output=xml:directory/path/",
>@@ -5634,7 +6117,7 @@ TEST_F(InitGoogleTestTest, OutputXmlDirectory) {
> }
> 
> // Tests having a --gtest_print_time flag
>-TEST_F(InitGoogleTestTest, PrintTimeFlag) {
>+TEST_F(ParseFlagsTest, PrintTimeFlag) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_print_time",
>@@ -5650,7 +6133,7 @@ TEST_F(InitGoogleTestTest, PrintTimeFlag) {
> }
> 
> // Tests having a --gtest_print_time flag with a "true" value
>-TEST_F(InitGoogleTestTest, PrintTimeTrue) {
>+TEST_F(ParseFlagsTest, PrintTimeTrue) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_print_time=1",
>@@ -5666,7 +6149,7 @@ TEST_F(InitGoogleTestTest, PrintTimeTrue) {
> }
> 
> // Tests having a --gtest_print_time flag with a "false" value
>-TEST_F(InitGoogleTestTest, PrintTimeFalse) {
>+TEST_F(ParseFlagsTest, PrintTimeFalse) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_print_time=0",
>@@ -5682,7 +6165,7 @@ TEST_F(InitGoogleTestTest, PrintTimeFalse) {
> }
> 
> // Tests parsing --gtest_print_time=f.
>-TEST_F(InitGoogleTestTest, PrintTimeFalse_f) {
>+TEST_F(ParseFlagsTest, PrintTimeFalse_f) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_print_time=f",
>@@ -5698,7 +6181,7 @@ TEST_F(InitGoogleTestTest, PrintTimeFalse_f) {
> }
> 
> // Tests parsing --gtest_print_time=F.
>-TEST_F(InitGoogleTestTest, PrintTimeFalse_F) {
>+TEST_F(ParseFlagsTest, PrintTimeFalse_F) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_print_time=F",
>@@ -5714,7 +6197,7 @@ TEST_F(InitGoogleTestTest, PrintTimeFalse_F) {
> }
> 
> // Tests parsing --gtest_random_seed=number
>-TEST_F(InitGoogleTestTest, RandomSeed) {
>+TEST_F(ParseFlagsTest, RandomSeed) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_random_seed=1000",
>@@ -5730,7 +6213,7 @@ TEST_F(InitGoogleTestTest, RandomSeed) {
> }
> 
> // Tests parsing --gtest_repeat=number
>-TEST_F(InitGoogleTestTest, Repeat) {
>+TEST_F(ParseFlagsTest, Repeat) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_repeat=1000",
>@@ -5746,7 +6229,7 @@ TEST_F(InitGoogleTestTest, Repeat) {
> }
> 
> // Tests having a --gtest_also_run_disabled_tests flag
>-TEST_F(InitGoogleTestTest, AlsoRunDisabledTestsFlag) {
>+TEST_F(ParseFlagsTest, AlsoRunDisabledTestsFlag) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_also_run_disabled_tests",
>@@ -5763,7 +6246,7 @@ TEST_F(InitGoogleTestTest, AlsoRunDisabledTestsFlag) {
> }
> 
> // Tests having a --gtest_also_run_disabled_tests flag with a "true" value
>-TEST_F(InitGoogleTestTest, AlsoRunDisabledTestsTrue) {
>+TEST_F(ParseFlagsTest, AlsoRunDisabledTestsTrue) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_also_run_disabled_tests=1",
>@@ -5780,7 +6263,7 @@ TEST_F(InitGoogleTestTest, AlsoRunDisabledTestsTrue) {
> }
> 
> // Tests having a --gtest_also_run_disabled_tests flag with a "false" value
>-TEST_F(InitGoogleTestTest, AlsoRunDisabledTestsFalse) {
>+TEST_F(ParseFlagsTest, AlsoRunDisabledTestsFalse) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_also_run_disabled_tests=0",
>@@ -5797,7 +6280,7 @@ TEST_F(InitGoogleTestTest, AlsoRunDisabledTestsFalse) {
> }
> 
> // Tests parsing --gtest_shuffle.
>-TEST_F(InitGoogleTestTest, ShuffleWithoutValue) {
>+TEST_F(ParseFlagsTest, ShuffleWithoutValue) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_shuffle",
>@@ -5813,7 +6296,7 @@ TEST_F(InitGoogleTestTest, ShuffleWithoutValue) {
> }
> 
> // Tests parsing --gtest_shuffle=0.
>-TEST_F(InitGoogleTestTest, ShuffleFalse_0) {
>+TEST_F(ParseFlagsTest, ShuffleFalse_0) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_shuffle=0",
>@@ -5828,9 +6311,8 @@ TEST_F(InitGoogleTestTest, ShuffleFalse_0) {
> GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Shuffle(false), false);
> }
> 
>-// Tests parsing a --gtest_shuffle flag that has a "true"
>-// definition.
>-TEST_F(InitGoogleTestTest, ShuffleTrue) {
>+// Tests parsing a --gtest_shuffle flag that has a "true" definition.
>+TEST_F(ParseFlagsTest, ShuffleTrue) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_shuffle=1",
>@@ -5846,7 +6328,7 @@ TEST_F(InitGoogleTestTest, ShuffleTrue) {
> }
> 
> // Tests parsing --gtest_stack_trace_depth=number.
>-TEST_F(InitGoogleTestTest, StackTraceDepth) {
>+TEST_F(ParseFlagsTest, StackTraceDepth) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_stack_trace_depth=5",
>@@ -5861,8 +6343,24 @@ TEST_F(InitGoogleTestTest, StackTraceDepth) {
> GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::StackTraceDepth(5), false);
> }
> 
>+TEST_F(ParseFlagsTest, StreamResultTo) {
>+ const char* argv[] = {
>+ "foo.exe",
>+ "--gtest_stream_result_to=localhost:1234",
>+ NULL
>+ };
>+
>+ const char* argv2[] = {
>+ "foo.exe",
>+ NULL
>+ };
>+
>+ GTEST_TEST_PARSING_FLAGS_(
>+ argv, argv2, Flags::StreamResultTo("localhost:1234"), false);
>+}
>+
> // Tests parsing --gtest_throw_on_failure.
>-TEST_F(InitGoogleTestTest, ThrowOnFailureWithoutValue) {
>+TEST_F(ParseFlagsTest, ThrowOnFailureWithoutValue) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_throw_on_failure",
>@@ -5878,7 +6376,7 @@ TEST_F(InitGoogleTestTest, ThrowOnFailureWithoutValue) {
> }
> 
> // Tests parsing --gtest_throw_on_failure=0.
>-TEST_F(InitGoogleTestTest, ThrowOnFailureFalse_0) {
>+TEST_F(ParseFlagsTest, ThrowOnFailureFalse_0) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_throw_on_failure=0",
>@@ -5895,7 +6393,7 @@ TEST_F(InitGoogleTestTest, ThrowOnFailureFalse_0) {
> 
> // Tests parsing a --gtest_throw_on_failure flag that has a "true"
> // definition.
>-TEST_F(InitGoogleTestTest, ThrowOnFailureTrue) {
>+TEST_F(ParseFlagsTest, ThrowOnFailureTrue) {
> const char* argv[] = {
> "foo.exe",
> "--gtest_throw_on_failure=1",
>@@ -5910,9 +6408,9 @@ TEST_F(InitGoogleTestTest, ThrowOnFailureTrue) {
> GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ThrowOnFailure(true), false);
> }
> 
>-#if GTEST_OS_WINDOWS
>+# if GTEST_OS_WINDOWS
> // Tests parsing wide strings.
>-TEST_F(InitGoogleTestTest, WideStrings) {
>+TEST_F(ParseFlagsTest, WideStrings) {
> const wchar_t* argv[] = {
> L"foo.exe",
> L"--gtest_filter=Foo*",
>@@ -5935,7 +6433,108 @@ TEST_F(InitGoogleTestTest, WideStrings) {
> 
> GTEST_TEST_PARSING_FLAGS_(argv, argv2, expected_flags, false);
> }
>-#endif // GTEST_OS_WINDOWS
>+# endif // GTEST_OS_WINDOWS
>+
>+#if GTEST_USE_OWN_FLAGFILE_FLAG_
>+class FlagfileTest : public ParseFlagsTest {
>+ public:
>+ virtual void SetUp() {
>+ ParseFlagsTest::SetUp();
>+
>+ testdata_path_.Set(internal::FilePath(
>+ testing::TempDir() + internal::GetCurrentExecutableName().string() +
>+ "_flagfile_test"));
>+ testing::internal::posix::RmDir(testdata_path_.c_str());
>+ EXPECT_TRUE(testdata_path_.CreateFolder());
>+ }
>+
>+ virtual void TearDown() {
>+ testing::internal::posix::RmDir(testdata_path_.c_str());
>+ ParseFlagsTest::TearDown();
>+ }
>+
>+ internal::FilePath CreateFlagfile(const char* contents) {
>+ internal::FilePath file_path(internal::FilePath::GenerateUniqueFileName(
>+ testdata_path_, internal::FilePath("unique"), "txt"));
>+ FILE* f = testing::internal::posix::FOpen(file_path.c_str(), "w");
>+ fprintf(f, "%s", contents);
>+ fclose(f);
>+ return file_path;
>+ }
>+
>+ private:
>+ internal::FilePath testdata_path_;
>+};
>+
>+// Tests an empty flagfile.
>+TEST_F(FlagfileTest, Empty) {
>+ internal::FilePath flagfile_path(CreateFlagfile(""));
>+ std::string flagfile_flag =
>+ std::string("--" GTEST_FLAG_PREFIX_ "flagfile=") + flagfile_path.c_str();
>+
>+ const char* argv[] = {
>+ "foo.exe",
>+ flagfile_flag.c_str(),
>+ NULL
>+ };
>+
>+ const char* argv2[] = {
>+ "foo.exe",
>+ NULL
>+ };
>+
>+ GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags(), false);
>+}
>+
>+// Tests passing a non-empty --gtest_filter flag via --gtest_flagfile.
>+TEST_F(FlagfileTest, FilterNonEmpty) {
>+ internal::FilePath flagfile_path(CreateFlagfile(
>+ "--" GTEST_FLAG_PREFIX_ "filter=abc"));
>+ std::string flagfile_flag =
>+ std::string("--" GTEST_FLAG_PREFIX_ "flagfile=") + flagfile_path.c_str();
>+
>+ const char* argv[] = {
>+ "foo.exe",
>+ flagfile_flag.c_str(),
>+ NULL
>+ };
>+
>+ const char* argv2[] = {
>+ "foo.exe",
>+ NULL
>+ };
>+
>+ GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Filter("abc"), false);
>+}
>+
>+// Tests passing several flags via --gtest_flagfile.
>+TEST_F(FlagfileTest, SeveralFlags) {
>+ internal::FilePath flagfile_path(CreateFlagfile(
>+ "--" GTEST_FLAG_PREFIX_ "filter=abc\n"
>+ "--" GTEST_FLAG_PREFIX_ "break_on_failure\n"
>+ "--" GTEST_FLAG_PREFIX_ "list_tests"));
>+ std::string flagfile_flag =
>+ std::string("--" GTEST_FLAG_PREFIX_ "flagfile=") + flagfile_path.c_str();
>+
>+ const char* argv[] = {
>+ "foo.exe",
>+ flagfile_flag.c_str(),
>+ NULL
>+ };
>+
>+ const char* argv2[] = {
>+ "foo.exe",
>+ NULL
>+ };
>+
>+ Flags expected_flags;
>+ expected_flags.break_on_failure = true;
>+ expected_flags.filter = "abc";
>+ expected_flags.list_tests = true;
>+
>+ GTEST_TEST_PARSING_FLAGS_(argv, argv2, expected_flags, false);
>+}
>+#endif // GTEST_USE_OWN_FLAGFILE_FLAG_
> 
> // Tests current_test_info() in UnitTest.
> class CurrentTestInfoTest : public Test {
>@@ -5990,6 +6589,7 @@ TEST_F(CurrentTestInfoTest, WorksForSecondTestInATestCase) {
> 
> } // namespace testing
> 
>+
> // These two lines test that we can define tests in a namespace that
> // has the name "testing" and is nested in another namespace.
> namespace my_namespace {
>@@ -6048,7 +6648,7 @@ TEST(StreamingAssertionsTest, Unconditional) {
> 
> #ifdef __BORLANDC__
> // Silences warnings: "Condition is always true", "Unreachable code"
>-#pragma option push -w-ccc -w-rch
>+# pragma option push -w-ccc -w-rch
> #endif
> 
> TEST(StreamingAssertionsTest, Truth) {
>@@ -6070,8 +6670,8 @@ TEST(StreamingAssertionsTest, Truth2) {
> }
> 
> #ifdef __BORLANDC__
>-// Restores warnings after previous "#pragma option push" supressed them
>-#pragma option pop
>+// Restores warnings after previous "#pragma option push" suppressed them
>+# pragma option pop
> #endif
> 
> TEST(StreamingAssertionsTest, IntegerEquals) {
>@@ -6264,15 +6864,40 @@ TEST(ColoredOutputTest, UsesColorsWhenTermSupportsColors) {
> SetEnv("TERM", "xterm-color"); // TERM supports colors.
> EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY.
> 
>+ SetEnv("TERM", "xterm-256color"); // TERM supports colors.
>+ EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY.
>+
>+ SetEnv("TERM", "screen"); // TERM supports colors.
>+ EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY.
>+
>+ SetEnv("TERM", "screen-256color"); // TERM supports colors.
>+ EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY.
>+
>+ SetEnv("TERM", "tmux"); // TERM supports colors.
>+ EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY.
>+
>+ SetEnv("TERM", "tmux-256color"); // TERM supports colors.
>+ EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY.
>+
>+ SetEnv("TERM", "rxvt-unicode"); // TERM supports colors.
>+ EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY.
>+
>+ SetEnv("TERM", "rxvt-unicode-256color"); // TERM supports colors.
>+ EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY.
>+
> SetEnv("TERM", "linux"); // TERM supports colors.
> EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY.
>+
>+ SetEnv("TERM", "cygwin"); // TERM supports colors.
>+ EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY.
> #endif // GTEST_OS_WINDOWS
> }
> 
> // Verifies that StaticAssertTypeEq works in a namespace scope.
> 
>-static bool dummy1 = StaticAssertTypeEq<bool, bool>();
>-static bool dummy2 = StaticAssertTypeEq<const int, const int>();
>+static bool dummy1 GTEST_ATTRIBUTE_UNUSED_ = StaticAssertTypeEq<bool, bool>();
>+static bool dummy2 GTEST_ATTRIBUTE_UNUSED_ =
>+ StaticAssertTypeEq<const int, const int>();
> 
> // Verifies that StaticAssertTypeEq works in a class.
> 
>@@ -6295,14 +6920,6 @@ TEST(StaticAssertTypeEqTest, CompilesForEqualTypes) {
> StaticAssertTypeEq<int*, IntAlias*>();
> }
> 
>-TEST(GetCurrentOsStackTraceExceptTopTest, ReturnsTheStackTrace) {
>- testing::UnitTest* const unit_test = testing::UnitTest::GetInstance();
>-
>- // We don't have a stack walker in Google Test yet.
>- EXPECT_STREQ("", GetCurrentOsStackTraceExceptTop(unit_test, 0).c_str());
>- EXPECT_STREQ("", GetCurrentOsStackTraceExceptTop(unit_test, 1).c_str());
>-}
>-
> TEST(HasNonfatalFailureTest, ReturnsFalseWhenThereIsNoFailure) {
> EXPECT_FALSE(HasNonfatalFailure());
> }
>@@ -6466,7 +7083,7 @@ TEST(TestEventListenersTest, Append) {
> // order.
> class SequenceTestingListener : public EmptyTestEventListener {
> public:
>- SequenceTestingListener(std::vector<String>* vector, const char* id)
>+ SequenceTestingListener(std::vector<std::string>* vector, const char* id)
> : vector_(vector), id_(id) {}
> 
> protected:
>@@ -6489,20 +7106,20 @@ class SequenceTestingListener : public EmptyTestEventListener {
> }
> 
> private:
>- String GetEventDescription(const char* method) {
>+ std::string GetEventDescription(const char* method) {
> Message message;
> message << id_ << "." << method;
> return message.GetString();
> }
> 
>- std::vector<String>* vector_;
>+ std::vector<std::string>* vector_;
> const char* const id_;
> 
> GTEST_DISALLOW_COPY_AND_ASSIGN_(SequenceTestingListener);
> };
> 
> TEST(EventListenerTest, AppendKeepsOrder) {
>- std::vector<String> vec;
>+ std::vector<std::string> vec;
> TestEventListeners listeners;
> listeners.Append(new SequenceTestingListener(&vec, "1st"));
> listeners.Append(new SequenceTestingListener(&vec, "2nd"));
>@@ -6715,4 +7332,464 @@ GTEST_TEST(AlternativeNameTest, Works) { // GTEST_TEST is the same as TEST.
> // GTEST_FAIL is the same as FAIL.
> EXPECT_FATAL_FAILURE(GTEST_FAIL() << "An expected failure",
> "An expected failure");
>+
>+ // GTEST_ASSERT_XY is the same as ASSERT_XY.
>+
>+ GTEST_ASSERT_EQ(0, 0);
>+ EXPECT_FATAL_FAILURE(GTEST_ASSERT_EQ(0, 1) << "An expected failure",
>+ "An expected failure");
>+ EXPECT_FATAL_FAILURE(GTEST_ASSERT_EQ(1, 0) << "An expected failure",
>+ "An expected failure");
>+
>+ GTEST_ASSERT_NE(0, 1);
>+ GTEST_ASSERT_NE(1, 0);
>+ EXPECT_FATAL_FAILURE(GTEST_ASSERT_NE(0, 0) << "An expected failure",
>+ "An expected failure");
>+
>+ GTEST_ASSERT_LE(0, 0);
>+ GTEST_ASSERT_LE(0, 1);
>+ EXPECT_FATAL_FAILURE(GTEST_ASSERT_LE(1, 0) << "An expected failure",
>+ "An expected failure");
>+
>+ GTEST_ASSERT_LT(0, 1);
>+ EXPECT_FATAL_FAILURE(GTEST_ASSERT_LT(0, 0) << "An expected failure",
>+ "An expected failure");
>+ EXPECT_FATAL_FAILURE(GTEST_ASSERT_LT(1, 0) << "An expected failure",
>+ "An expected failure");
>+
>+ GTEST_ASSERT_GE(0, 0);
>+ GTEST_ASSERT_GE(1, 0);
>+ EXPECT_FATAL_FAILURE(GTEST_ASSERT_GE(0, 1) << "An expected failure",
>+ "An expected failure");
>+
>+ GTEST_ASSERT_GT(1, 0);
>+ EXPECT_FATAL_FAILURE(GTEST_ASSERT_GT(0, 1) << "An expected failure",
>+ "An expected failure");
>+ EXPECT_FATAL_FAILURE(GTEST_ASSERT_GT(1, 1) << "An expected failure",
>+ "An expected failure");
>+}
>+
>+// Tests for internal utilities necessary for implementation of the universal
>+// printing.
>+// FIXME: Find a better home for them.
>+
>+class ConversionHelperBase {};
>+class ConversionHelperDerived : public ConversionHelperBase {};
>+
>+// Tests that IsAProtocolMessage<T>::value is a compile-time constant.
>+TEST(IsAProtocolMessageTest, ValueIsCompileTimeConstant) {
>+ GTEST_COMPILE_ASSERT_(IsAProtocolMessage<ProtocolMessage>::value,
>+ const_true);
>+ GTEST_COMPILE_ASSERT_(!IsAProtocolMessage<int>::value, const_false);
>+}
>+
>+// Tests that IsAProtocolMessage<T>::value is true when T is
>+// proto2::Message or a sub-class of it.
>+TEST(IsAProtocolMessageTest, ValueIsTrueWhenTypeIsAProtocolMessage) {
>+ EXPECT_TRUE(IsAProtocolMessage< ::proto2::Message>::value);
>+ EXPECT_TRUE(IsAProtocolMessage<ProtocolMessage>::value);
>+}
>+
>+// Tests that IsAProtocolMessage<T>::value is false when T is neither
>+// ProtocolMessage nor a sub-class of it.
>+TEST(IsAProtocolMessageTest, ValueIsFalseWhenTypeIsNotAProtocolMessage) {
>+ EXPECT_FALSE(IsAProtocolMessage<int>::value);
>+ EXPECT_FALSE(IsAProtocolMessage<const ConversionHelperBase>::value);
>+}
>+
>+// Tests that CompileAssertTypesEqual compiles when the type arguments are
>+// equal.
>+TEST(CompileAssertTypesEqual, CompilesWhenTypesAreEqual) {
>+ CompileAssertTypesEqual<void, void>();
>+ CompileAssertTypesEqual<int*, int*>();
>+}
>+
>+// Tests that RemoveReference does not affect non-reference types.
>+TEST(RemoveReferenceTest, DoesNotAffectNonReferenceType) {
>+ CompileAssertTypesEqual<int, RemoveReference<int>::type>();
>+ CompileAssertTypesEqual<const char, RemoveReference<const char>::type>();
>+}
>+
>+// Tests that RemoveReference removes reference from reference types.
>+TEST(RemoveReferenceTest, RemovesReference) {
>+ CompileAssertTypesEqual<int, RemoveReference<int&>::type>();
>+ CompileAssertTypesEqual<const char, RemoveReference<const char&>::type>();
>+}
>+
>+// Tests GTEST_REMOVE_REFERENCE_.
>+
>+template <typename T1, typename T2>
>+void TestGTestRemoveReference() {
>+ CompileAssertTypesEqual<T1, GTEST_REMOVE_REFERENCE_(T2)>();
>+}
>+
>+TEST(RemoveReferenceTest, MacroVersion) {
>+ TestGTestRemoveReference<int, int>();
>+ TestGTestRemoveReference<const char, const char&>();
>+}
>+
>+
>+// Tests that RemoveConst does not affect non-const types.
>+TEST(RemoveConstTest, DoesNotAffectNonConstType) {
>+ CompileAssertTypesEqual<int, RemoveConst<int>::type>();
>+ CompileAssertTypesEqual<char&, RemoveConst<char&>::type>();
>+}
>+
>+// Tests that RemoveConst removes const from const types.
>+TEST(RemoveConstTest, RemovesConst) {
>+ CompileAssertTypesEqual<int, RemoveConst<const int>::type>();
>+ CompileAssertTypesEqual<char[2], RemoveConst<const char[2]>::type>();
>+ CompileAssertTypesEqual<char[2][3], RemoveConst<const char[2][3]>::type>();
>+}
>+
>+// Tests GTEST_REMOVE_CONST_.
>+
>+template <typename T1, typename T2>
>+void TestGTestRemoveConst() {
>+ CompileAssertTypesEqual<T1, GTEST_REMOVE_CONST_(T2)>();
>+}
>+
>+TEST(RemoveConstTest, MacroVersion) {
>+ TestGTestRemoveConst<int, int>();
>+ TestGTestRemoveConst<double&, double&>();
>+ TestGTestRemoveConst<char, const char>();
>+}
>+
>+// Tests GTEST_REMOVE_REFERENCE_AND_CONST_.
>+
>+template <typename T1, typename T2>
>+void TestGTestRemoveReferenceAndConst() {
>+ CompileAssertTypesEqual<T1, GTEST_REMOVE_REFERENCE_AND_CONST_(T2)>();
>+}
>+
>+TEST(RemoveReferenceToConstTest, Works) {
>+ TestGTestRemoveReferenceAndConst<int, int>();
>+ TestGTestRemoveReferenceAndConst<double, double&>();
>+ TestGTestRemoveReferenceAndConst<char, const char>();
>+ TestGTestRemoveReferenceAndConst<char, const char&>();
>+ TestGTestRemoveReferenceAndConst<const char*, const char*>();
>+}
>+
>+// Tests that AddReference does not affect reference types.
>+TEST(AddReferenceTest, DoesNotAffectReferenceType) {
>+ CompileAssertTypesEqual<int&, AddReference<int&>::type>();
>+ CompileAssertTypesEqual<const char&, AddReference<const char&>::type>();
>+}
>+
>+// Tests that AddReference adds reference to non-reference types.
>+TEST(AddReferenceTest, AddsReference) {
>+ CompileAssertTypesEqual<int&, AddReference<int>::type>();
>+ CompileAssertTypesEqual<const char&, AddReference<const char>::type>();
>+}
>+
>+// Tests GTEST_ADD_REFERENCE_.
>+
>+template <typename T1, typename T2>
>+void TestGTestAddReference() {
>+ CompileAssertTypesEqual<T1, GTEST_ADD_REFERENCE_(T2)>();
>+}
>+
>+TEST(AddReferenceTest, MacroVersion) {
>+ TestGTestAddReference<int&, int>();
>+ TestGTestAddReference<const char&, const char&>();
>+}
>+
>+// Tests GTEST_REFERENCE_TO_CONST_.
>+
>+template <typename T1, typename T2>
>+void TestGTestReferenceToConst() {
>+ CompileAssertTypesEqual<T1, GTEST_REFERENCE_TO_CONST_(T2)>();
>+}
>+
>+TEST(GTestReferenceToConstTest, Works) {
>+ TestGTestReferenceToConst<const char&, char>();
>+ TestGTestReferenceToConst<const int&, const int>();
>+ TestGTestReferenceToConst<const double&, double>();
>+ TestGTestReferenceToConst<const std::string&, const std::string&>();
>+}
>+
>+// Tests that ImplicitlyConvertible<T1, T2>::value is a compile-time constant.
>+TEST(ImplicitlyConvertibleTest, ValueIsCompileTimeConstant) {
>+ GTEST_COMPILE_ASSERT_((ImplicitlyConvertible<int, int>::value), const_true);
>+ GTEST_COMPILE_ASSERT_((!ImplicitlyConvertible<void*, int*>::value),
>+ const_false);
>+}
>+
>+// Tests that ImplicitlyConvertible<T1, T2>::value is true when T1 can
>+// be implicitly converted to T2.
>+TEST(ImplicitlyConvertibleTest, ValueIsTrueWhenConvertible) {
>+ EXPECT_TRUE((ImplicitlyConvertible<int, double>::value));
>+ EXPECT_TRUE((ImplicitlyConvertible<double, int>::value));
>+ EXPECT_TRUE((ImplicitlyConvertible<int*, void*>::value));
>+ EXPECT_TRUE((ImplicitlyConvertible<int*, const int*>::value));
>+ EXPECT_TRUE((ImplicitlyConvertible<ConversionHelperDerived&,
>+ const ConversionHelperBase&>::value));
>+ EXPECT_TRUE((ImplicitlyConvertible<const ConversionHelperBase,
>+ ConversionHelperBase>::value));
>+}
>+
>+// Tests that ImplicitlyConvertible<T1, T2>::value is false when T1
>+// cannot be implicitly converted to T2.
>+TEST(ImplicitlyConvertibleTest, ValueIsFalseWhenNotConvertible) {
>+ EXPECT_FALSE((ImplicitlyConvertible<double, int*>::value));
>+ EXPECT_FALSE((ImplicitlyConvertible<void*, int*>::value));
>+ EXPECT_FALSE((ImplicitlyConvertible<const int*, int*>::value));
>+ EXPECT_FALSE((ImplicitlyConvertible<ConversionHelperBase&,
>+ ConversionHelperDerived&>::value));
>+}
>+
>+// Tests IsContainerTest.
>+
>+class NonContainer {};
>+
>+TEST(IsContainerTestTest, WorksForNonContainer) {
>+ EXPECT_EQ(sizeof(IsNotContainer), sizeof(IsContainerTest<int>(0)));
>+ EXPECT_EQ(sizeof(IsNotContainer), sizeof(IsContainerTest<char[5]>(0)));
>+ EXPECT_EQ(sizeof(IsNotContainer), sizeof(IsContainerTest<NonContainer>(0)));
>+}
>+
>+TEST(IsContainerTestTest, WorksForContainer) {
>+ EXPECT_EQ(sizeof(IsContainer),
>+ sizeof(IsContainerTest<std::vector<bool> >(0)));
>+ EXPECT_EQ(sizeof(IsContainer),
>+ sizeof(IsContainerTest<std::map<int, double> >(0)));
>+}
>+
>+#if GTEST_LANG_CXX11
>+struct ConstOnlyContainerWithPointerIterator {
>+ using const_iterator = int*;
>+ const_iterator begin() const;
>+ const_iterator end() const;
>+};
>+
>+struct ConstOnlyContainerWithClassIterator {
>+ struct const_iterator {
>+ const int& operator*() const;
>+ const_iterator& operator++(/* pre-increment */);
>+ };
>+ const_iterator begin() const;
>+ const_iterator end() const;
>+};
>+
>+TEST(IsContainerTestTest, ConstOnlyContainer) {
>+ EXPECT_EQ(sizeof(IsContainer),
>+ sizeof(IsContainerTest<ConstOnlyContainerWithPointerIterator>(0)));
>+ EXPECT_EQ(sizeof(IsContainer),
>+ sizeof(IsContainerTest<ConstOnlyContainerWithClassIterator>(0)));
>+}
>+#endif // GTEST_LANG_CXX11
>+
>+// Tests IsHashTable.
>+struct AHashTable {
>+ typedef void hasher;
>+};
>+struct NotReallyAHashTable {
>+ typedef void hasher;
>+ typedef void reverse_iterator;
>+};
>+TEST(IsHashTable, Basic) {
>+ EXPECT_TRUE(testing::internal::IsHashTable<AHashTable>::value);
>+ EXPECT_FALSE(testing::internal::IsHashTable<NotReallyAHashTable>::value);
>+#if GTEST_LANG_CXX11
>+ EXPECT_FALSE(testing::internal::IsHashTable<std::vector<int>>::value);
>+ EXPECT_TRUE(testing::internal::IsHashTable<std::unordered_set<int>>::value);
>+#endif // GTEST_LANG_CXX11
>+#if GTEST_HAS_HASH_SET_
>+ EXPECT_TRUE(testing::internal::IsHashTable<__gnu_cxx::hash_set<int>>::value);
>+#endif // GTEST_HAS_HASH_SET_
>+}
>+
>+// Tests ArrayEq().
>+
>+TEST(ArrayEqTest, WorksForDegeneratedArrays) {
>+ EXPECT_TRUE(ArrayEq(5, 5L));
>+ EXPECT_FALSE(ArrayEq('a', 0));
>+}
>+
>+TEST(ArrayEqTest, WorksForOneDimensionalArrays) {
>+ // Note that a and b are distinct but compatible types.
>+ const int a[] = { 0, 1 };
>+ long b[] = { 0, 1 };
>+ EXPECT_TRUE(ArrayEq(a, b));
>+ EXPECT_TRUE(ArrayEq(a, 2, b));
>+
>+ b[0] = 2;
>+ EXPECT_FALSE(ArrayEq(a, b));
>+ EXPECT_FALSE(ArrayEq(a, 1, b));
>+}
>+
>+TEST(ArrayEqTest, WorksForTwoDimensionalArrays) {
>+ const char a[][3] = { "hi", "lo" };
>+ const char b[][3] = { "hi", "lo" };
>+ const char c[][3] = { "hi", "li" };
>+
>+ EXPECT_TRUE(ArrayEq(a, b));
>+ EXPECT_TRUE(ArrayEq(a, 2, b));
>+
>+ EXPECT_FALSE(ArrayEq(a, c));
>+ EXPECT_FALSE(ArrayEq(a, 2, c));
>+}
>+
>+// Tests ArrayAwareFind().
>+
>+TEST(ArrayAwareFindTest, WorksForOneDimensionalArray) {
>+ const char a[] = "hello";
>+ EXPECT_EQ(a + 4, ArrayAwareFind(a, a + 5, 'o'));
>+ EXPECT_EQ(a + 5, ArrayAwareFind(a, a + 5, 'x'));
>+}
>+
>+TEST(ArrayAwareFindTest, WorksForTwoDimensionalArray) {
>+ int a[][2] = { { 0, 1 }, { 2, 3 }, { 4, 5 } };
>+ const int b[2] = { 2, 3 };
>+ EXPECT_EQ(a + 1, ArrayAwareFind(a, a + 3, b));
>+
>+ const int c[2] = { 6, 7 };
>+ EXPECT_EQ(a + 3, ArrayAwareFind(a, a + 3, c));
>+}
>+
>+// Tests CopyArray().
>+
>+TEST(CopyArrayTest, WorksForDegeneratedArrays) {
>+ int n = 0;
>+ CopyArray('a', &n);
>+ EXPECT_EQ('a', n);
>+}
>+
>+TEST(CopyArrayTest, WorksForOneDimensionalArrays) {
>+ const char a[3] = "hi";
>+ int b[3];
>+#ifndef __BORLANDC__ // C++Builder cannot compile some array size deductions.
>+ CopyArray(a, &b);
>+ EXPECT_TRUE(ArrayEq(a, b));
>+#endif
>+
>+ int c[3];
>+ CopyArray(a, 3, c);
>+ EXPECT_TRUE(ArrayEq(a, c));
>+}
>+
>+TEST(CopyArrayTest, WorksForTwoDimensionalArrays) {
>+ const int a[2][3] = { { 0, 1, 2 }, { 3, 4, 5 } };
>+ int b[2][3];
>+#ifndef __BORLANDC__ // C++Builder cannot compile some array size deductions.
>+ CopyArray(a, &b);
>+ EXPECT_TRUE(ArrayEq(a, b));
>+#endif
>+
>+ int c[2][3];
>+ CopyArray(a, 2, c);
>+ EXPECT_TRUE(ArrayEq(a, c));
>+}
>+
>+// Tests NativeArray.
>+
>+TEST(NativeArrayTest, ConstructorFromArrayWorks) {
>+ const int a[3] = { 0, 1, 2 };
>+ NativeArray<int> na(a, 3, RelationToSourceReference());
>+ EXPECT_EQ(3U, na.size());
>+ EXPECT_EQ(a, na.begin());
>+}
>+
>+TEST(NativeArrayTest, CreatesAndDeletesCopyOfArrayWhenAskedTo) {
>+ typedef int Array[2];
>+ Array* a = new Array[1];
>+ (*a)[0] = 0;
>+ (*a)[1] = 1;
>+ NativeArray<int> na(*a, 2, RelationToSourceCopy());
>+ EXPECT_NE(*a, na.begin());
>+ delete[] a;
>+ EXPECT_EQ(0, na.begin()[0]);
>+ EXPECT_EQ(1, na.begin()[1]);
>+
>+ // We rely on the heap checker to verify that na deletes the copy of
>+ // array.
>+}
>+
>+TEST(NativeArrayTest, TypeMembersAreCorrect) {
>+ StaticAssertTypeEq<char, NativeArray<char>::value_type>();
>+ StaticAssertTypeEq<int[2], NativeArray<int[2]>::value_type>();
>+
>+ StaticAssertTypeEq<const char*, NativeArray<char>::const_iterator>();
>+ StaticAssertTypeEq<const bool(*)[2], NativeArray<bool[2]>::const_iterator>();
>+}
>+
>+TEST(NativeArrayTest, MethodsWork) {
>+ const int a[3] = { 0, 1, 2 };
>+ NativeArray<int> na(a, 3, RelationToSourceCopy());
>+ ASSERT_EQ(3U, na.size());
>+ EXPECT_EQ(3, na.end() - na.begin());
>+
>+ NativeArray<int>::const_iterator it = na.begin();
>+ EXPECT_EQ(0, *it);
>+ ++it;
>+ EXPECT_EQ(1, *it);
>+ it++;
>+ EXPECT_EQ(2, *it);
>+ ++it;
>+ EXPECT_EQ(na.end(), it);
>+
>+ EXPECT_TRUE(na == na);
>+
>+ NativeArray<int> na2(a, 3, RelationToSourceReference());
>+ EXPECT_TRUE(na == na2);
>+
>+ const int b1[3] = { 0, 1, 1 };
>+ const int b2[4] = { 0, 1, 2, 3 };
>+ EXPECT_FALSE(na == NativeArray<int>(b1, 3, RelationToSourceReference()));
>+ EXPECT_FALSE(na == NativeArray<int>(b2, 4, RelationToSourceCopy()));
>+}
>+
>+TEST(NativeArrayTest, WorksForTwoDimensionalArray) {
>+ const char a[2][3] = { "hi", "lo" };
>+ NativeArray<char[3]> na(a, 2, RelationToSourceReference());
>+ ASSERT_EQ(2U, na.size());
>+ EXPECT_EQ(a, na.begin());
>+}
>+
>+// Tests SkipPrefix().
>+
>+TEST(SkipPrefixTest, SkipsWhenPrefixMatches) {
>+ const char* const str = "hello";
>+
>+ const char* p = str;
>+ EXPECT_TRUE(SkipPrefix("", &p));
>+ EXPECT_EQ(str, p);
>+
>+ p = str;
>+ EXPECT_TRUE(SkipPrefix("hell", &p));
>+ EXPECT_EQ(str + 4, p);
>+}
>+
>+TEST(SkipPrefixTest, DoesNotSkipWhenPrefixDoesNotMatch) {
>+ const char* const str = "world";
>+
>+ const char* p = str;
>+ EXPECT_FALSE(SkipPrefix("W", &p));
>+ EXPECT_EQ(str, p);
>+
>+ p = str;
>+ EXPECT_FALSE(SkipPrefix("world!", &p));
>+ EXPECT_EQ(str, p);
>+}
>+
>+// Tests ad_hoc_test_result().
>+
>+class AdHocTestResultTest : public testing::Test {
>+ protected:
>+ static void SetUpTestCase() {
>+ FAIL() << "A failure happened inside SetUpTestCase().";
>+ }
>+};
>+
>+TEST_F(AdHocTestResultTest, AdHocTestResultForTestCaseShowsFailure) {
>+ const testing::TestResult& test_result = testing::UnitTest::GetInstance()
>+ ->current_test_case()
>+ ->ad_hoc_test_result();
>+ EXPECT_TRUE(test_result.Failed());
>+}
>+
>+TEST_F(AdHocTestResultTest, AdHocTestResultTestForUnitTestDoesNotShowFailure) {
>+ const testing::TestResult& test_result =
>+ testing::UnitTest::GetInstance()->ad_hoc_test_result();
>+ EXPECT_FALSE(test_result.Failed());
> }
>diff --git a/Source/ThirdParty/gtest/test/gtest_xml_outfile1_test_.cc b/Source/ThirdParty/gtest/test/gtest_xml_outfile1_test_.cc
>index 664baad2ab873ba388193a65d2b79fd83db2e775..a38ebac839f7b4fcf7109351c4d3fecde2715b0a 100644
>--- a/Source/ThirdParty/gtest/test/gtest_xml_outfile1_test_.cc
>+++ b/Source/ThirdParty/gtest/test/gtest_xml_outfile1_test_.cc
>@@ -27,12 +27,10 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> //
>-// Author: keith.ray@gmail.com (Keith Ray)
>-//
> // gtest_xml_outfile1_test_ writes some xml via TestProperty used by
> // gtest_xml_outfiles_test.py
> 
>-#include <gtest/gtest.h>
>+#include "gtest/gtest.h"
> 
> class PropertyOne : public testing::Test {
> protected:
>diff --git a/Source/ThirdParty/gtest/test/gtest_xml_outfile2_test_.cc b/Source/ThirdParty/gtest/test/gtest_xml_outfile2_test_.cc
>index 3411a3d38b86104c6a60c60d1131cb66aa54c192..afaf15a5dc32315d51ac7a0a555f83cab41ef74f 100644
>--- a/Source/ThirdParty/gtest/test/gtest_xml_outfile2_test_.cc
>+++ b/Source/ThirdParty/gtest/test/gtest_xml_outfile2_test_.cc
>@@ -27,12 +27,10 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> //
>-// Author: keith.ray@gmail.com (Keith Ray)
>-//
> // gtest_xml_outfile2_test_ writes some xml via TestProperty used by
> // gtest_xml_outfiles_test.py
> 
>-#include <gtest/gtest.h>
>+#include "gtest/gtest.h"
> 
> class PropertyTwo : public testing::Test {
> protected:
>diff --git a/Source/ThirdParty/gtest/test/gtest_xml_outfiles_test.py b/Source/ThirdParty/gtest/test/gtest_xml_outfiles_test.py
>index 0fe947f084c8f56f4adf5d0c9fa026ce29975d2c..2c031ff8dba512c2e04e270534e29fcebe886cf9 100755
>--- a/Source/ThirdParty/gtest/test/gtest_xml_outfiles_test.py
>+++ b/Source/ThirdParty/gtest/test/gtest_xml_outfiles_test.py
>@@ -31,31 +31,39 @@
> 
> """Unit test for the gtest_xml_output module."""
> 
>-__author__ = "keith.ray@gmail.com (Keith Ray)"
>-
> import os
> from xml.dom import minidom, Node
>-
> import gtest_test_utils
> import gtest_xml_test_utils
> 
>-
> GTEST_OUTPUT_SUBDIR = "xml_outfiles"
> GTEST_OUTPUT_1_TEST = "gtest_xml_outfile1_test_"
> GTEST_OUTPUT_2_TEST = "gtest_xml_outfile2_test_"
> 
> EXPECTED_XML_1 = """<?xml version="1.0" encoding="UTF-8"?>
>-<testsuites tests="1" failures="0" disabled="0" errors="0" time="*" name="AllTests">
>+<testsuites tests="1" failures="0" disabled="0" errors="0" time="*" timestamp="*" name="AllTests">
> <testsuite name="PropertyOne" tests="1" failures="0" disabled="0" errors="0" time="*">
>- <testcase name="TestSomeProperties" status="run" time="*" classname="PropertyOne" SetUpProp="1" TestSomeProperty="1" TearDownProp="1" />
>+ <testcase name="TestSomeProperties" status="run" time="*" classname="PropertyOne">
>+ <properties>
>+ <property name="SetUpProp" value="1"/>
>+ <property name="TestSomeProperty" value="1"/>
>+ <property name="TearDownProp" value="1"/>
>+ </properties>
>+ </testcase>
> </testsuite>
> </testsuites>
> """
> 
> EXPECTED_XML_2 = """<?xml version="1.0" encoding="UTF-8"?>
>-<testsuites tests="1" failures="0" disabled="0" errors="0" time="*" name="AllTests">
>+<testsuites tests="1" failures="0" disabled="0" errors="0" time="*" timestamp="*" name="AllTests">
> <testsuite name="PropertyTwo" tests="1" failures="0" disabled="0" errors="0" time="*">
>- <testcase name="TestSomeProperties" status="run" time="*" classname="PropertyTwo" SetUpProp="2" TestSomeProperty="2" TearDownProp="2" />
>+ <testcase name="TestSomeProperties" status="run" time="*" classname="PropertyTwo">
>+ <properties>
>+ <property name="SetUpProp" value="2"/>
>+ <property name="TestSomeProperty" value="2"/>
>+ <property name="TearDownProp" value="2"/>
>+ </properties>
>+ </testcase>
> </testsuite>
> </testsuites>
> """
>@@ -103,11 +111,11 @@ class GTestXMLOutFilesTest(gtest_xml_test_utils.GTestXMLTestCase):
> self.assert_(p.exited)
> self.assertEquals(0, p.exit_code)
> 
>- # TODO(wan@google.com): libtool causes the built test binary to be
>+ # FIXME: libtool causes the built test binary to be
> # named lt-gtest_xml_outfiles_test_ instead of
>- # gtest_xml_outfiles_test_. To account for this possibillity, we
>+ # gtest_xml_outfiles_test_. To account for this possibility, we
> # allow both names in the following code. We should remove this
>- # hack when Chandler Carruth's libtool replacement tool is ready.
>+ # when libtool replacement tool is ready.
> output_file_name1 = test_name + ".xml"
> output_file1 = os.path.join(self.output_dir_, output_file_name1)
> output_file_name2 = 'lt-' + output_file_name1
>diff --git a/Source/ThirdParty/gtest/test/gtest_xml_output_unittest.py b/Source/ThirdParty/gtest/test/gtest_xml_output_unittest.py
>index 6d44929caca03ec6fae4471ed1ba1d416a5dfce0..faedd4e6ce72dabef786a312ef4aeca5c5d29bfa 100755
>--- a/Source/ThirdParty/gtest/test/gtest_xml_output_unittest.py
>+++ b/Source/ThirdParty/gtest/test/gtest_xml_output_unittest.py
>@@ -31,62 +31,76 @@
> 
> """Unit test for the gtest_xml_output module"""
> 
>-__author__ = 'eefacm@gmail.com (Sean Mcafee)'
>-
>+import datetime
> import errno
> import os
>+import re
> import sys
> from xml.dom import minidom, Node
> 
> import gtest_test_utils
> import gtest_xml_test_utils
> 
>+GTEST_FILTER_FLAG = '--gtest_filter'
>+GTEST_LIST_TESTS_FLAG = '--gtest_list_tests'
>+GTEST_OUTPUT_FLAG = '--gtest_output'
>+GTEST_DEFAULT_OUTPUT_FILE = 'test_detail.xml'
>+GTEST_PROGRAM_NAME = 'gtest_xml_output_unittest_'
>+
>+# The flag indicating stacktraces are not supported
>+NO_STACKTRACE_SUPPORT_FLAG = '--no_stacktrace_support'
> 
>-GTEST_OUTPUT_FLAG = "--gtest_output"
>-GTEST_DEFAULT_OUTPUT_FILE = "test_detail.xml"
>-GTEST_PROGRAM_NAME = "gtest_xml_output_unittest_"
>+# The environment variables for test sharding.
>+TOTAL_SHARDS_ENV_VAR = 'GTEST_TOTAL_SHARDS'
>+SHARD_INDEX_ENV_VAR = 'GTEST_SHARD_INDEX'
>+SHARD_STATUS_FILE_ENV_VAR = 'GTEST_SHARD_STATUS_FILE'
> 
>-SUPPORTS_STACK_TRACES = False
>+SUPPORTS_STACK_TRACES = NO_STACKTRACE_SUPPORT_FLAG not in sys.argv
> 
> if SUPPORTS_STACK_TRACES:
>- STACK_TRACE_TEMPLATE = "\nStack trace:\n*"
>+ STACK_TRACE_TEMPLATE = '\nStack trace:\n*'
> else:
>- STACK_TRACE_TEMPLATE = ""
>+ STACK_TRACE_TEMPLATE = ''
>+ # unittest.main() can't handle unknown flags
>+ sys.argv.remove(NO_STACKTRACE_SUPPORT_FLAG)
> 
> EXPECTED_NON_EMPTY_XML = """<?xml version="1.0" encoding="UTF-8"?>
>-<testsuites tests="15" failures="4" disabled="2" errors="0" time="*" name="AllTests">
>+<testsuites tests="23" failures="4" disabled="2" errors="0" time="*" timestamp="*" name="AllTests" ad_hoc_property="42">
> <testsuite name="SuccessfulTest" tests="1" failures="0" disabled="0" errors="0" time="*">
> <testcase name="Succeeds" status="run" time="*" classname="SuccessfulTest"/>
> </testsuite>
> <testsuite name="FailedTest" tests="1" failures="1" disabled="0" errors="0" time="*">
> <testcase name="Fails" status="run" time="*" classname="FailedTest">
>- <failure message="Value of: 2&#x0A;Expected: 1" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
>-Value of: 2
>-Expected: 1%(stack)s]]></failure>
>+ <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Expected equality of these values:&#x0A; 1&#x0A; 2" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
>+Expected equality of these values:
>+ 1
>+ 2%(stack)s]]></failure>
> </testcase>
> </testsuite>
> <testsuite name="MixedResultTest" tests="3" failures="1" disabled="1" errors="0" time="*">
> <testcase name="Succeeds" status="run" time="*" classname="MixedResultTest"/>
> <testcase name="Fails" status="run" time="*" classname="MixedResultTest">
>- <failure message="Value of: 2&#x0A;Expected: 1" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
>-Value of: 2
>-Expected: 1%(stack)s]]></failure>
>- <failure message="Value of: 3&#x0A;Expected: 2" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
>-Value of: 3
>-Expected: 2%(stack)s]]></failure>
>+ <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Expected equality of these values:&#x0A; 1&#x0A; 2" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
>+Expected equality of these values:
>+ 1
>+ 2%(stack)s]]></failure>
>+ <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Expected equality of these values:&#x0A; 2&#x0A; 3" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
>+Expected equality of these values:
>+ 2
>+ 3%(stack)s]]></failure>
> </testcase>
> <testcase name="DISABLED_test" status="notrun" time="*" classname="MixedResultTest"/>
> </testsuite>
> <testsuite name="XmlQuotingTest" tests="1" failures="1" disabled="0" errors="0" time="*">
> <testcase name="OutputsCData" status="run" time="*" classname="XmlQuotingTest">
>- <failure message="Failed&#x0A;XML output: &lt;?xml encoding=&quot;utf-8&quot;&gt;&lt;top&gt;&lt;![CDATA[cdata text]]&gt;&lt;/top&gt;" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
>+ <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Failed&#x0A;XML output: &lt;?xml encoding=&quot;utf-8&quot;&gt;&lt;top&gt;&lt;![CDATA[cdata text]]&gt;&lt;/top&gt;" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
> Failed
> XML output: <?xml encoding="utf-8"><top><![CDATA[cdata text]]>]]&gt;<![CDATA[</top>%(stack)s]]></failure>
> </testcase>
> </testsuite>
> <testsuite name="InvalidCharactersTest" tests="1" failures="1" disabled="0" errors="0" time="*">
> <testcase name="InvalidCharactersInMessage" status="run" time="*" classname="InvalidCharactersTest">
>- <failure message="Failed&#x0A;Invalid characters in brackets []" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
>+ <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Failed&#x0A;Invalid characters in brackets []" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
> Failed
> Invalid characters in brackets []%(stack)s]]></failure>
> </testcase>
>@@ -94,45 +108,152 @@ Invalid characters in brackets []%(stack)s]]></failure>
> <testsuite name="DisabledTest" tests="1" failures="0" disabled="1" errors="0" time="*">
> <testcase name="DISABLED_test_not_run" status="notrun" time="*" classname="DisabledTest"/>
> </testsuite>
>- <testsuite name="PropertyRecordingTest" tests="4" failures="0" disabled="0" errors="0" time="*">
>- <testcase name="OneProperty" status="run" time="*" classname="PropertyRecordingTest" key_1="1"/>
>- <testcase name="IntValuedProperty" status="run" time="*" classname="PropertyRecordingTest" key_int="1"/>
>- <testcase name="ThreeProperties" status="run" time="*" classname="PropertyRecordingTest" key_1="1" key_2="2" key_3="3"/>
>- <testcase name="TwoValuesForOneKeyUsesLastValue" status="run" time="*" classname="PropertyRecordingTest" key_1="2"/>
>+ <testsuite name="PropertyRecordingTest" tests="4" failures="0" disabled="0" errors="0" time="*" SetUpTestCase="yes" TearDownTestCase="aye">
>+ <testcase name="OneProperty" status="run" time="*" classname="PropertyRecordingTest">
>+ <properties>
>+ <property name="key_1" value="1"/>
>+ </properties>
>+ </testcase>
>+ <testcase name="IntValuedProperty" status="run" time="*" classname="PropertyRecordingTest">
>+ <properties>
>+ <property name="key_int" value="1"/>
>+ </properties>
>+ </testcase>
>+ <testcase name="ThreeProperties" status="run" time="*" classname="PropertyRecordingTest">
>+ <properties>
>+ <property name="key_1" value="1"/>
>+ <property name="key_2" value="2"/>
>+ <property name="key_3" value="3"/>
>+ </properties>
>+ </testcase>
>+ <testcase name="TwoValuesForOneKeyUsesLastValue" status="run" time="*" classname="PropertyRecordingTest">
>+ <properties>
>+ <property name="key_1" value="2"/>
>+ </properties>
>+ </testcase>
> </testsuite>
> <testsuite name="NoFixtureTest" tests="3" failures="0" disabled="0" errors="0" time="*">
>- <testcase name="RecordProperty" status="run" time="*" classname="NoFixtureTest" key="1"/>
>- <testcase name="ExternalUtilityThatCallsRecordIntValuedProperty" status="run" time="*" classname="NoFixtureTest" key_for_utility_int="1"/>
>- <testcase name="ExternalUtilityThatCallsRecordStringValuedProperty" status="run" time="*" classname="NoFixtureTest" key_for_utility_string="1"/>
>+ <testcase name="RecordProperty" status="run" time="*" classname="NoFixtureTest">
>+ <properties>
>+ <property name="key" value="1"/>
>+ </properties>
>+ </testcase>
>+ <testcase name="ExternalUtilityThatCallsRecordIntValuedProperty" status="run" time="*" classname="NoFixtureTest">
>+ <properties>
>+ <property name="key_for_utility_int" value="1"/>
>+ </properties>
>+ </testcase>
>+ <testcase name="ExternalUtilityThatCallsRecordStringValuedProperty" status="run" time="*" classname="NoFixtureTest">
>+ <properties>
>+ <property name="key_for_utility_string" value="1"/>
>+ </properties>
>+ </testcase>
>+ </testsuite>
>+ <testsuite name="Single/ValueParamTest" tests="4" failures="0" disabled="0" errors="0" time="*">
>+ <testcase name="HasValueParamAttribute/0" value_param="33" status="run" time="*" classname="Single/ValueParamTest" />
>+ <testcase name="HasValueParamAttribute/1" value_param="42" status="run" time="*" classname="Single/ValueParamTest" />
>+ <testcase name="AnotherTestThatHasValueParamAttribute/0" value_param="33" status="run" time="*" classname="Single/ValueParamTest" />
>+ <testcase name="AnotherTestThatHasValueParamAttribute/1" value_param="42" status="run" time="*" classname="Single/ValueParamTest" />
>+ </testsuite>
>+ <testsuite name="TypedTest/0" tests="1" failures="0" disabled="0" errors="0" time="*">
>+ <testcase name="HasTypeParamAttribute" type_param="*" status="run" time="*" classname="TypedTest/0" />
>+ </testsuite>
>+ <testsuite name="TypedTest/1" tests="1" failures="0" disabled="0" errors="0" time="*">
>+ <testcase name="HasTypeParamAttribute" type_param="*" status="run" time="*" classname="TypedTest/1" />
>+ </testsuite>
>+ <testsuite name="Single/TypeParameterizedTestCase/0" tests="1" failures="0" disabled="0" errors="0" time="*">
>+ <testcase name="HasTypeParamAttribute" type_param="*" status="run" time="*" classname="Single/TypeParameterizedTestCase/0" />
>+ </testsuite>
>+ <testsuite name="Single/TypeParameterizedTestCase/1" tests="1" failures="0" disabled="0" errors="0" time="*">
>+ <testcase name="HasTypeParamAttribute" type_param="*" status="run" time="*" classname="Single/TypeParameterizedTestCase/1" />
> </testsuite>
> </testsuites>""" % {'stack': STACK_TRACE_TEMPLATE}
> 
>+EXPECTED_FILTERED_TEST_XML = """<?xml version="1.0" encoding="UTF-8"?>
>+<testsuites tests="1" failures="0" disabled="0" errors="0" time="*"
>+ timestamp="*" name="AllTests" ad_hoc_property="42">
>+ <testsuite name="SuccessfulTest" tests="1" failures="0" disabled="0"
>+ errors="0" time="*">
>+ <testcase name="Succeeds" status="run" time="*" classname="SuccessfulTest"/>
>+ </testsuite>
>+</testsuites>"""
>+
>+EXPECTED_SHARDED_TEST_XML = """<?xml version="1.0" encoding="UTF-8"?>
>+<testsuites tests="3" failures="0" disabled="0" errors="0" time="*" timestamp="*" name="AllTests" ad_hoc_property="42">
>+ <testsuite name="SuccessfulTest" tests="1" failures="0" disabled="0" errors="0" time="*">
>+ <testcase name="Succeeds" status="run" time="*" classname="SuccessfulTest"/>
>+ </testsuite>
>+ <testsuite name="NoFixtureTest" tests="1" failures="0" disabled="0" errors="0" time="*">
>+ <testcase name="RecordProperty" status="run" time="*" classname="NoFixtureTest">
>+ <properties>
>+ <property name="key" value="1"/>
>+ </properties>
>+ </testcase>
>+ </testsuite>
>+ <testsuite name="Single/ValueParamTest" tests="1" failures="0" disabled="0" errors="0" time="*">
>+ <testcase name="AnotherTestThatHasValueParamAttribute/1" value_param="42" status="run" time="*" classname="Single/ValueParamTest" />
>+ </testsuite>
>+</testsuites>"""
> 
> EXPECTED_EMPTY_XML = """<?xml version="1.0" encoding="UTF-8"?>
>-<testsuites tests="0" failures="0" disabled="0" errors="0" time="*" name="AllTests">
>+<testsuites tests="0" failures="0" disabled="0" errors="0" time="*"
>+ timestamp="*" name="AllTests">
> </testsuites>"""
> 
>+GTEST_PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath(GTEST_PROGRAM_NAME)
>+
>+SUPPORTS_TYPED_TESTS = 'TypedTest' in gtest_test_utils.Subprocess(
>+ [GTEST_PROGRAM_PATH, GTEST_LIST_TESTS_FLAG], capture_stderr=False).output
>+
> 
> class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase):
> """
> Unit test for Google Test's XML output functionality.
> """
> 
>- def testNonEmptyXmlOutput(self):
>- """
>- Runs a test program that generates a non-empty XML output, and
>- tests that the XML output is expected.
>- """
>- self._TestXmlOutput(GTEST_PROGRAM_NAME, EXPECTED_NON_EMPTY_XML, 1)
>+ # This test currently breaks on platforms that do not support typed and
>+ # type-parameterized tests, so we don't run it under them.
>+ if SUPPORTS_TYPED_TESTS:
>+ def testNonEmptyXmlOutput(self):
>+ """
>+ Runs a test program that generates a non-empty XML output, and
>+ tests that the XML output is expected.
>+ """
>+ self._TestXmlOutput(GTEST_PROGRAM_NAME, EXPECTED_NON_EMPTY_XML, 1)
> 
> def testEmptyXmlOutput(self):
>- """
>+ """Verifies XML output for a Google Test binary without actual tests.
>+
> Runs a test program that generates an empty XML output, and
> tests that the XML output is expected.
> """
> 
>- self._TestXmlOutput("gtest_no_test_unittest",
>- EXPECTED_EMPTY_XML, 0)
>+ self._TestXmlOutput('gtest_no_test_unittest', EXPECTED_EMPTY_XML, 0)
>+
>+ def testTimestampValue(self):
>+ """Checks whether the timestamp attribute in the XML output is valid.
>+
>+ Runs a test program that generates an empty XML output, and checks if
>+ the timestamp attribute in the testsuites tag is valid.
>+ """
>+ actual = self._GetXmlOutput('gtest_no_test_unittest', [], {}, 0)
>+ date_time_str = actual.documentElement.getAttributeNode('timestamp').value
>+ # datetime.strptime() is only available in Python 2.5+ so we have to
>+ # parse the expected datetime manually.
>+ match = re.match(r'(\d+)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)', date_time_str)
>+ self.assertTrue(
>+ re.match,
>+ 'XML datettime string %s has incorrect format' % date_time_str)
>+ date_time_from_xml = datetime.datetime(
>+ year=int(match.group(1)), month=int(match.group(2)),
>+ day=int(match.group(3)), hour=int(match.group(4)),
>+ minute=int(match.group(5)), second=int(match.group(6)))
>+
>+ time_delta = abs(datetime.datetime.now() - date_time_from_xml)
>+ # timestamp value should be near the current local time
>+ self.assertTrue(time_delta < datetime.timedelta(seconds=600),
>+ 'time_delta is %s' % time_delta)
>+ actual.unlink()
> 
> def testDefaultOutputFile(self):
> """
>@@ -142,7 +263,7 @@ class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase):
> output_file = os.path.join(gtest_test_utils.GetTempDir(),
> GTEST_DEFAULT_OUTPUT_FILE)
> gtest_prog_path = gtest_test_utils.GetTestExecutablePath(
>- "gtest_no_test_unittest")
>+ 'gtest_no_test_unittest')
> try:
> os.remove(output_file)
> except OSError, e:
>@@ -150,7 +271,7 @@ class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase):
> raise
> 
> p = gtest_test_utils.Subprocess(
>- [gtest_prog_path, "%s=xml" % GTEST_OUTPUT_FLAG],
>+ [gtest_prog_path, '%s=xml' % GTEST_OUTPUT_FLAG],
> working_dir=gtest_test_utils.GetTempDir())
> self.assert_(p.exited)
> self.assertEquals(0, p.exit_code)
>@@ -163,60 +284,98 @@ class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase):
> """
> 
> xml_path = os.path.join(gtest_test_utils.GetTempDir(),
>- GTEST_PROGRAM_NAME + "out.xml")
>+ GTEST_PROGRAM_NAME + 'out.xml')
> if os.path.isfile(xml_path):
> os.remove(xml_path)
> 
>- gtest_prog_path = gtest_test_utils.GetTestExecutablePath(GTEST_PROGRAM_NAME)
>-
>- command = [gtest_prog_path,
>- "%s=xml:%s" % (GTEST_OUTPUT_FLAG, xml_path),
>- "--shut_down_xml"]
>+ command = [GTEST_PROGRAM_PATH,
>+ '%s=xml:%s' % (GTEST_OUTPUT_FLAG, xml_path),
>+ '--shut_down_xml']
> p = gtest_test_utils.Subprocess(command)
> if p.terminated_by_signal:
>- self.assert_(False,
>- "%s was killed by signal %d" % (gtest_prog_name, p.signal))
>+ # p.signal is available only if p.terminated_by_signal is True.
>+ self.assertFalse(
>+ p.terminated_by_signal,
>+ '%s was killed by signal %d' % (GTEST_PROGRAM_NAME, p.signal))
> else:
> self.assert_(p.exited)
> self.assertEquals(1, p.exit_code,
> "'%s' exited with code %s, which doesn't match "
>- "the expected exit code %s."
>+ 'the expected exit code %s.'
> % (command, p.exit_code, 1))
> 
> self.assert_(not os.path.isfile(xml_path))
> 
>+ def testFilteredTestXmlOutput(self):
>+ """Verifies XML output when a filter is applied.
> 
>- def _TestXmlOutput(self, gtest_prog_name, expected_xml, expected_exit_code):
>+ Runs a test program that executes only some tests and verifies that
>+ non-selected tests do not show up in the XML output.
> """
>- Asserts that the XML document generated by running the program
>- gtest_prog_name matches expected_xml, a string containing another
>- XML document. Furthermore, the program's exit code must be
>- expected_exit_code.
>+
>+ self._TestXmlOutput(GTEST_PROGRAM_NAME, EXPECTED_FILTERED_TEST_XML, 0,
>+ extra_args=['%s=SuccessfulTest.*' % GTEST_FILTER_FLAG])
>+
>+ def testShardedTestXmlOutput(self):
>+ """Verifies XML output when run using multiple shards.
>+
>+ Runs a test program that executes only one shard and verifies that tests
>+ from other shards do not show up in the XML output.
>+ """
>+
>+ self._TestXmlOutput(
>+ GTEST_PROGRAM_NAME,
>+ EXPECTED_SHARDED_TEST_XML,
>+ 0,
>+ extra_env={SHARD_INDEX_ENV_VAR: '0',
>+ TOTAL_SHARDS_ENV_VAR: '10'})
>+
>+ def _GetXmlOutput(self, gtest_prog_name, extra_args, extra_env,
>+ expected_exit_code):
>+ """
>+ Returns the xml output generated by running the program gtest_prog_name.
>+ Furthermore, the program's exit code must be expected_exit_code.
> """
> xml_path = os.path.join(gtest_test_utils.GetTempDir(),
>- gtest_prog_name + "out.xml")
>+ gtest_prog_name + 'out.xml')
> gtest_prog_path = gtest_test_utils.GetTestExecutablePath(gtest_prog_name)
> 
>- command = [gtest_prog_path, "%s=xml:%s" % (GTEST_OUTPUT_FLAG, xml_path)]
>- p = gtest_test_utils.Subprocess(command)
>+ command = ([gtest_prog_path, '%s=xml:%s' % (GTEST_OUTPUT_FLAG, xml_path)] +
>+ extra_args)
>+ environ_copy = os.environ.copy()
>+ if extra_env:
>+ environ_copy.update(extra_env)
>+ p = gtest_test_utils.Subprocess(command, env=environ_copy)
>+
> if p.terminated_by_signal:
> self.assert_(False,
>- "%s was killed by signal %d" % (gtest_prog_name, p.signal))
>+ '%s was killed by signal %d' % (gtest_prog_name, p.signal))
> else:
> self.assert_(p.exited)
> self.assertEquals(expected_exit_code, p.exit_code,
> "'%s' exited with code %s, which doesn't match "
>- "the expected exit code %s."
>+ 'the expected exit code %s.'
> % (command, p.exit_code, expected_exit_code))
>+ actual = minidom.parse(xml_path)
>+ return actual
> 
>+ def _TestXmlOutput(self, gtest_prog_name, expected_xml,
>+ expected_exit_code, extra_args=None, extra_env=None):
>+ """
>+ Asserts that the XML document generated by running the program
>+ gtest_prog_name matches expected_xml, a string containing another
>+ XML document. Furthermore, the program's exit code must be
>+ expected_exit_code.
>+ """
>+
>+ actual = self._GetXmlOutput(gtest_prog_name, extra_args or [],
>+ extra_env or {}, expected_exit_code)
> expected = minidom.parseString(expected_xml)
>- actual = minidom.parse(xml_path)
> self.NormalizeXml(actual.documentElement)
> self.AssertEquivalentNodes(expected.documentElement,
> actual.documentElement)
> expected.unlink()
>- actual .unlink()
>-
>+ actual.unlink()
> 
> 
> if __name__ == '__main__':
>diff --git a/Source/ThirdParty/gtest/test/gtest_xml_output_unittest_.cc b/Source/ThirdParty/gtest/test/gtest_xml_output_unittest_.cc
>index fc07ef46bd667aa92e5daf7f202efcd76366bf8a..2ee8838005eeec23571bae389c792698c30c4d50 100644
>--- a/Source/ThirdParty/gtest/test/gtest_xml_output_unittest_.cc
>+++ b/Source/ThirdParty/gtest/test/gtest_xml_output_unittest_.cc
>@@ -27,8 +27,6 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
>-// Author: eefacm@gmail.com (Sean Mcafee)
>-
> // Unit test for Google Test XML output.
> //
> // A user can specify XML output in a Google Test program to run via
>@@ -38,13 +36,16 @@
> // This program will be invoked from a Python unit test. Don't run it
> // directly.
> 
>-#include <gtest/gtest.h>
>+#include "gtest/gtest.h"
> 
> using ::testing::InitGoogleTest;
> using ::testing::TestEventListeners;
>+using ::testing::TestWithParam;
> using ::testing::UnitTest;
>+using ::testing::Test;
>+using ::testing::Values;
> 
>-class SuccessfulTest : public testing::Test {
>+class SuccessfulTest : public Test {
> };
> 
> TEST_F(SuccessfulTest, Succeeds) {
>@@ -52,14 +53,14 @@ TEST_F(SuccessfulTest, Succeeds) {
> ASSERT_EQ(1, 1);
> }
> 
>-class FailedTest : public testing::Test {
>+class FailedTest : public Test {
> };
> 
> TEST_F(FailedTest, Fails) {
> ASSERT_EQ(1, 2);
> }
> 
>-class DisabledTest : public testing::Test {
>+class DisabledTest : public Test {
> };
> 
> TEST_F(DisabledTest, DISABLED_test_not_run) {
>@@ -91,7 +92,10 @@ TEST(InvalidCharactersTest, InvalidCharactersInMessage) {
> FAIL() << "Invalid characters in brackets [\x1\x2]";
> }
> 
>-class PropertyRecordingTest : public testing::Test {
>+class PropertyRecordingTest : public Test {
>+ public:
>+ static void SetUpTestCase() { RecordProperty("SetUpTestCase", "yes"); }
>+ static void TearDownTestCase() { RecordProperty("TearDownTestCase", "aye"); }
> };
> 
> TEST_F(PropertyRecordingTest, OneProperty) {
>@@ -117,12 +121,12 @@ TEST(NoFixtureTest, RecordProperty) {
> RecordProperty("key", "1");
> }
> 
>-void ExternalUtilityThatCallsRecordProperty(const char* key, int value) {
>+void ExternalUtilityThatCallsRecordProperty(const std::string& key, int value) {
> testing::Test::RecordProperty(key, value);
> }
> 
>-void ExternalUtilityThatCallsRecordProperty(const char* key,
>- const char* value) {
>+void ExternalUtilityThatCallsRecordProperty(const std::string& key,
>+ const std::string& value) {
> testing::Test::RecordProperty(key, value);
> }
> 
>@@ -134,6 +138,35 @@ TEST(NoFixtureTest, ExternalUtilityThatCallsRecordStringValuedProperty) {
> ExternalUtilityThatCallsRecordProperty("key_for_utility_string", "1");
> }
> 
>+// Verifies that the test parameter value is output in the 'value_param'
>+// XML attribute for value-parameterized tests.
>+class ValueParamTest : public TestWithParam<int> {};
>+TEST_P(ValueParamTest, HasValueParamAttribute) {}
>+TEST_P(ValueParamTest, AnotherTestThatHasValueParamAttribute) {}
>+INSTANTIATE_TEST_CASE_P(Single, ValueParamTest, Values(33, 42));
>+
>+#if GTEST_HAS_TYPED_TEST
>+// Verifies that the type parameter name is output in the 'type_param'
>+// XML attribute for typed tests.
>+template <typename T> class TypedTest : public Test {};
>+typedef testing::Types<int, long> TypedTestTypes;
>+TYPED_TEST_CASE(TypedTest, TypedTestTypes);
>+TYPED_TEST(TypedTest, HasTypeParamAttribute) {}
>+#endif
>+
>+#if GTEST_HAS_TYPED_TEST_P
>+// Verifies that the type parameter name is output in the 'type_param'
>+// XML attribute for type-parameterized tests.
>+template <typename T> class TypeParameterizedTestCase : public Test {};
>+TYPED_TEST_CASE_P(TypeParameterizedTestCase);
>+TYPED_TEST_P(TypeParameterizedTestCase, HasTypeParamAttribute) {}
>+REGISTER_TYPED_TEST_CASE_P(TypeParameterizedTestCase, HasTypeParamAttribute);
>+typedef testing::Types<int, long> TypeParameterizedTestCaseTypes;
>+INSTANTIATE_TYPED_TEST_CASE_P(Single,
>+ TypeParameterizedTestCase,
>+ TypeParameterizedTestCaseTypes);
>+#endif
>+
> int main(int argc, char** argv) {
> InitGoogleTest(&argc, argv);
> 
>@@ -141,5 +174,6 @@ int main(int argc, char** argv) {
> TestEventListeners& listeners = UnitTest::GetInstance()->listeners();
> delete listeners.Release(listeners.default_xml_generator());
> }
>+ testing::Test::RecordProperty("ad_hoc_property", "42");
> return RUN_ALL_TESTS();
> }
>diff --git a/Source/ThirdParty/gtest/test/gtest_xml_test_utils.py b/Source/ThirdParty/gtest/test/gtest_xml_test_utils.py
>index c83c3b7ea79b2d762eed665e2d61df8b9ea08443..1e0358592fb0084f0a89c3436ff7517486827acd 100755
>--- a/Source/ThirdParty/gtest/test/gtest_xml_test_utils.py
>+++ b/Source/ThirdParty/gtest/test/gtest_xml_test_utils.py
>@@ -1,5 +1,3 @@
>-#!/usr/bin/env python
>-#
> # Copyright 2006, Google Inc.
> # All rights reserved.
> #
>@@ -31,16 +29,11 @@
> 
> """Unit test utilities for gtest_xml_output"""
> 
>-__author__ = 'eefacm@gmail.com (Sean Mcafee)'
>-
> import re
> from xml.dom import minidom, Node
>-
> import gtest_test_utils
> 
>-
>-GTEST_OUTPUT_FLAG = "--gtest_output"
>-GTEST_DEFAULT_OUTPUT_FILE = "test_detail.xml"
>+GTEST_DEFAULT_OUTPUT_FILE = 'test_detail.xml'
> 
> class GTestXMLTestCase(gtest_test_utils.TestCase):
> """
>@@ -58,8 +51,9 @@ class GTestXMLTestCase(gtest_test_utils.TestCase):
> * It has the same tag name as expected_node.
> * It has the same set of attributes as expected_node, each with
> the same value as the corresponding attribute of expected_node.
>- An exception is any attribute named "time", which needs only be
>- convertible to a floating-point number.
>+ Exceptions are any attribute named "time", which needs only be
>+ convertible to a floating-point number and any attribute named
>+ "type_param" which only has to be non-empty.
> * It has an equivalent set of child nodes (including elements and
> CDATA sections) as expected_node. Note that we ignore the
> order of the children as they are not guaranteed to be in any
>@@ -79,23 +73,27 @@ class GTestXMLTestCase(gtest_test_utils.TestCase):
> actual_attributes = actual_node .attributes
> self.assertEquals(
> expected_attributes.length, actual_attributes.length,
>- "attribute numbers differ in element " + actual_node.tagName)
>+ 'attribute numbers differ in element %s:\nExpected: %r\nActual: %r' % (
>+ actual_node.tagName, expected_attributes.keys(),
>+ actual_attributes.keys()))
> for i in range(expected_attributes.length):
> expected_attr = expected_attributes.item(i)
> actual_attr = actual_attributes.get(expected_attr.name)
> self.assert_(
> actual_attr is not None,
>- "expected attribute %s not found in element %s" %
>+ 'expected attribute %s not found in element %s' %
> (expected_attr.name, actual_node.tagName))
>- self.assertEquals(expected_attr.value, actual_attr.value,
>- " values of attribute %s in element %s differ" %
>- (expected_attr.name, actual_node.tagName))
>+ self.assertEquals(
>+ expected_attr.value, actual_attr.value,
>+ ' values of attribute %s in element %s differ: %s vs %s' %
>+ (expected_attr.name, actual_node.tagName,
>+ expected_attr.value, actual_attr.value))
> 
> expected_children = self._GetChildren(expected_node)
> actual_children = self._GetChildren(actual_node)
> self.assertEquals(
> len(expected_children), len(actual_children),
>- "number of child elements differ in element " + actual_node.tagName)
>+ 'number of child elements differ in element ' + actual_node.tagName)
> for child_id, child in expected_children.iteritems():
> self.assert_(child_id in actual_children,
> '<%s> is not in <%s> (in element %s)' %
>@@ -103,19 +101,22 @@ class GTestXMLTestCase(gtest_test_utils.TestCase):
> self.AssertEquivalentNodes(child, actual_children[child_id])
> 
> identifying_attribute = {
>- "testsuites": "name",
>- "testsuite": "name",
>- "testcase": "name",
>- "failure": "message",
>- }
>+ 'testsuites': 'name',
>+ 'testsuite': 'name',
>+ 'testcase': 'name',
>+ 'failure': 'message',
>+ 'property': 'name',
>+ }
> 
> def _GetChildren(self, element):
> """
> Fetches all of the child nodes of element, a DOM Element object.
> Returns them as the values of a dictionary keyed by the IDs of the
>- children. For <testsuites>, <testsuite> and <testcase> elements, the ID
>- is the value of their "name" attribute; for <failure> elements, it is
>- the value of the "message" attribute; CDATA sections and non-whitespace
>+ children. For <testsuites>, <testsuite>, <testcase>, and <property>
>+ elements, the ID is the value of their "name" attribute; for <failure>
>+ elements, it is the value of the "message" attribute; for <properties>
>+ elements, it is the value of their parent's "name" attribute plus the
>+ literal string "properties"; CDATA sections and non-whitespace
> text nodes are concatenated into a single CDATA section with ID
> "detail". An exception is raised if any element other than the above
> four is encountered, if two child elements with the same identifying
>@@ -125,21 +126,27 @@ class GTestXMLTestCase(gtest_test_utils.TestCase):
> children = {}
> for child in element.childNodes:
> if child.nodeType == Node.ELEMENT_NODE:
>- self.assert_(child.tagName in self.identifying_attribute,
>- "Encountered unknown element <%s>" % child.tagName)
>- childID = child.getAttribute(self.identifying_attribute[child.tagName])
>- self.assert_(childID not in children)
>- children[childID] = child
>+ if child.tagName == 'properties':
>+ self.assert_(child.parentNode is not None,
>+ 'Encountered <properties> element without a parent')
>+ child_id = child.parentNode.getAttribute('name') + '-properties'
>+ else:
>+ self.assert_(child.tagName in self.identifying_attribute,
>+ 'Encountered unknown element <%s>' % child.tagName)
>+ child_id = child.getAttribute(
>+ self.identifying_attribute[child.tagName])
>+ self.assert_(child_id not in children)
>+ children[child_id] = child
> elif child.nodeType in [Node.TEXT_NODE, Node.CDATA_SECTION_NODE]:
>- if "detail" not in children:
>+ if 'detail' not in children:
> if (child.nodeType == Node.CDATA_SECTION_NODE or
> not child.nodeValue.isspace()):
>- children["detail"] = child.ownerDocument.createCDATASection(
>+ children['detail'] = child.ownerDocument.createCDATASection(
> child.nodeValue)
> else:
>- children["detail"].nodeValue += child.nodeValue
>+ children['detail'].nodeValue += child.nodeValue
> else:
>- self.fail("Encountered unexpected node type %d" % child.nodeType)
>+ self.fail('Encountered unexpected node type %d' % child.nodeType)
> return children
> 
> def NormalizeXml(self, element):
>@@ -150,23 +157,40 @@ class GTestXMLTestCase(gtest_test_utils.TestCase):
> * The "time" attribute of <testsuites>, <testsuite> and <testcase>
> elements is replaced with a single asterisk, if it contains
> only digit characters.
>- * The line number reported in the first line of the "message"
>- attribute of <failure> elements is replaced with a single asterisk.
>+ * The "timestamp" attribute of <testsuites> elements is replaced with a
>+ single asterisk, if it contains a valid ISO8601 datetime value.
>+ * The "type_param" attribute of <testcase> elements is replaced with a
>+ single asterisk (if it sn non-empty) as it is the type name returned
>+ by the compiler and is platform dependent.
>+ * The line info reported in the first line of the "message"
>+ attribute and CDATA section of <failure> elements is replaced with the
>+ file's basename and a single asterisk for the line number.
> * The directory names in file paths are removed.
> * The stack traces are removed.
> """
> 
>- if element.tagName in ("testsuites", "testsuite", "testcase"):
>- time = element.getAttributeNode("time")
>- time.value = re.sub(r"^\d+(\.\d+)?$", "*", time.value)
>- elif element.tagName == "failure":
>+ if element.tagName == 'testsuites':
>+ timestamp = element.getAttributeNode('timestamp')
>+ timestamp.value = re.sub(r'^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d$',
>+ '*', timestamp.value)
>+ if element.tagName in ('testsuites', 'testsuite', 'testcase'):
>+ time = element.getAttributeNode('time')
>+ time.value = re.sub(r'^\d+(\.\d+)?$', '*', time.value)
>+ type_param = element.getAttributeNode('type_param')
>+ if type_param and type_param.value:
>+ type_param.value = '*'
>+ elif element.tagName == 'failure':
>+ source_line_pat = r'^.*[/\\](.*:)\d+\n'
>+ # Replaces the source line information with a normalized form.
>+ message = element.getAttributeNode('message')
>+ message.value = re.sub(source_line_pat, '\\1*\n', message.value)
> for child in element.childNodes:
> if child.nodeType == Node.CDATA_SECTION_NODE:
>- # Removes the source line number.
>- cdata = re.sub(r"^.*[/\\](.*:)\d+\n", "\\1*\n", child.nodeValue)
>+ # Replaces the source line information with a normalized form.
>+ cdata = re.sub(source_line_pat, '\\1*\n', child.nodeValue)
> # Removes the actual stack trace.
>- child.nodeValue = re.sub(r"\nStack trace:\n(.|\n)*",
>- "", cdata)
>+ child.nodeValue = re.sub(r'Stack trace:\n(.|\n)*',
>+ 'Stack trace:\n*', cdata)
> for child in element.childNodes:
> if child.nodeType == Node.ELEMENT_NODE:
> self.NormalizeXml(child)
>diff --git a/Source/ThirdParty/gtest/test/production.cc b/Source/ThirdParty/gtest/test/production.cc
>index 8b8a40b44e9b41f4c29d75526908568af237912d..0f69f6dbd2e26a3a9bdf756b480737a4ef4218d4 100644
>--- a/Source/ThirdParty/gtest/test/production.cc
>+++ b/Source/ThirdParty/gtest/test/production.cc
>@@ -26,10 +26,9 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
> //
>-// Author: wan@google.com (Zhanyong Wan)
>-//
>-// This is part of the unit test for include/gtest/gtest_prod.h.
>+// This is part of the unit test for gtest_prod.h.
> 
> #include "production.h"
> 
>diff --git a/Source/ThirdParty/gtest/test/production.h b/Source/ThirdParty/gtest/test/production.h
>index 8f16fffa2416c57153fab3e097d134af1fb4a9bc..542723b7087387d4fb529fc07a688bc1c8d78b1e 100644
>--- a/Source/ThirdParty/gtest/test/production.h
>+++ b/Source/ThirdParty/gtest/test/production.h
>@@ -26,15 +26,14 @@
> // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
> //
>-// Author: wan@google.com (Zhanyong Wan)
>-//
>-// This is part of the unit test for include/gtest/gtest_prod.h.
>+// This is part of the unit test for gtest_prod.h.
> 
> #ifndef GTEST_TEST_PRODUCTION_H_
> #define GTEST_TEST_PRODUCTION_H_
> 
>-#include <gtest/gtest_prod.h>
>+#include "gtest/gtest_prod.h"
> 
> class PrivateCode {
> public:
>diff --git a/Source/ThirdParty/gtest/test/run_tests_util.py b/Source/ThirdParty/gtest/test/run_tests_util.py
>deleted file mode 100755
>index 9e57931eba2c611e0a1f60fff4f09539e10767ad..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/run_tests_util.py
>+++ /dev/null
>@@ -1,466 +0,0 @@
>-# Copyright 2008 Google Inc. All Rights Reserved.
>-#
>-# Redistribution and use in source and binary forms, with or without
>-# modification, are permitted provided that the following conditions are
>-# met:
>-#
>-# * Redistributions of source code must retain the above copyright
>-# notice, this list of conditions and the following disclaimer.
>-# * Redistributions in binary form must reproduce the above
>-# copyright notice, this list of conditions and the following disclaimer
>-# in the documentation and/or other materials provided with the
>-# distribution.
>-# * Neither the name of Google Inc. nor the names of its
>-# contributors may be used to endorse or promote products derived from
>-# this software without specific prior written permission.
>-#
>-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-
>-"""Provides facilities for running SCons-built Google Test/Mock tests."""
>-
>-
>-import optparse
>-import os
>-import re
>-import sets
>-import sys
>-
>-try:
>- # subrocess module is a preferable way to invoke subprocesses but it may
>- # not be available on MacOS X 10.4.
>- # Suppresses the 'Import not at the top of the file' lint complaint.
>- # pylint: disable-msg=C6204
>- import subprocess
>-except ImportError:
>- subprocess = None
>-
>-HELP_MSG = """Runs the specified tests for %(proj)s.
>-
>-SYNOPSIS
>- run_tests.py [OPTION]... [BUILD_DIR]... [TEST]...
>-
>-DESCRIPTION
>- Runs the specified tests (either binary or Python), and prints a
>- summary of the results. BUILD_DIRS will be used to search for the
>- binaries. If no TESTs are specified, all binary tests found in
>- BUILD_DIRs and all Python tests found in the directory test/ (in the
>- %(proj)s root) are run.
>-
>- TEST is a name of either a binary or a Python test. A binary test is
>- an executable file named *_test or *_unittest (with the .exe
>- extension on Windows) A Python test is a script named *_test.py or
>- *_unittest.py.
>-
>-OPTIONS
>- -h, --help
>- Print this help message.
>- -c CONFIGURATIONS
>- Specify build directories via build configurations.
>- CONFIGURATIONS is either a comma-separated list of build
>- configurations or 'all'. Each configuration is equivalent to
>- adding 'scons/build/<configuration>/%(proj)s/scons' to BUILD_DIRs.
>- Specifying -c=all is equivalent to providing all directories
>- listed in KNOWN BUILD DIRECTORIES section below.
>- -a
>- Equivalent to -c=all
>- -b
>- Equivalent to -c=all with the exception that the script will not
>- fail if some of the KNOWN BUILD DIRECTORIES do not exists; the
>- script will simply not run the tests there. 'b' stands for
>- 'built directories'.
>-
>-RETURN VALUE
>- Returns 0 if all tests are successful; otherwise returns 1.
>-
>-EXAMPLES
>- run_tests.py
>- Runs all tests for the default build configuration.
>- run_tests.py -a
>- Runs all tests with binaries in KNOWN BUILD DIRECTORIES.
>- run_tests.py -b
>- Runs all tests in KNOWN BUILD DIRECTORIES that have been
>- built.
>- run_tests.py foo/
>- Runs all tests in the foo/ directory and all Python tests in
>- the directory test. The Python tests are instructed to look
>- for binaries in foo/.
>- run_tests.py bar_test.exe test/baz_test.exe foo/ bar/
>- Runs foo/bar_test.exe, bar/bar_test.exe, foo/baz_test.exe, and
>- bar/baz_test.exe.
>- run_tests.py foo bar test/foo_test.py
>- Runs test/foo_test.py twice instructing it to look for its
>- test binaries in the directories foo and bar,
>- correspondingly.
>-
>-KNOWN BUILD DIRECTORIES
>- run_tests.py knows about directories where the SCons build script
>- deposits its products. These are the directories where run_tests.py
>- will be looking for its binaries. Currently, %(proj)s's SConstruct file
>- defines them as follows (the default build directory is the first one
>- listed in each group):
>- On Windows:
>- <%(proj)s root>/scons/build/win-dbg8/%(proj)s/scons/
>- <%(proj)s root>/scons/build/win-opt8/%(proj)s/scons/
>- On Mac:
>- <%(proj)s root>/scons/build/mac-dbg/%(proj)s/scons/
>- <%(proj)s root>/scons/build/mac-opt/%(proj)s/scons/
>- On other platforms:
>- <%(proj)s root>/scons/build/dbg/%(proj)s/scons/
>- <%(proj)s root>/scons/build/opt/%(proj)s/scons/"""
>-
>-IS_WINDOWS = os.name == 'nt'
>-IS_MAC = os.name == 'posix' and os.uname()[0] == 'Darwin'
>-IS_CYGWIN = os.name == 'posix' and 'CYGWIN' in os.uname()[0]
>-
>-# Definition of CONFIGS must match that of the build directory names in the
>-# SConstruct script. The first list item is the default build configuration.
>-if IS_WINDOWS:
>- CONFIGS = ('win-dbg8', 'win-opt8')
>-elif IS_MAC:
>- CONFIGS = ('mac-dbg', 'mac-opt')
>-else:
>- CONFIGS = ('dbg', 'opt')
>-
>-if IS_WINDOWS or IS_CYGWIN:
>- PYTHON_TEST_REGEX = re.compile(r'_(unit)?test\.py$', re.IGNORECASE)
>- BINARY_TEST_REGEX = re.compile(r'_(unit)?test(\.exe)?$', re.IGNORECASE)
>- BINARY_TEST_SEARCH_REGEX = re.compile(r'_(unit)?test\.exe$', re.IGNORECASE)
>-else:
>- PYTHON_TEST_REGEX = re.compile(r'_(unit)?test\.py$')
>- BINARY_TEST_REGEX = re.compile(r'_(unit)?test$')
>- BINARY_TEST_SEARCH_REGEX = BINARY_TEST_REGEX
>-
>-
>-def _GetGtestBuildDir(injected_os, script_dir, config):
>- """Calculates path to the Google Test SCons build directory."""
>-
>- return injected_os.path.normpath(injected_os.path.join(script_dir,
>- 'scons/build',
>- config,
>- 'gtest/scons'))
>-
>-
>-def _GetConfigFromBuildDir(build_dir):
>- """Extracts the configuration name from the build directory."""
>-
>- # We don't want to depend on build_dir containing the correct path
>- # separators.
>- m = re.match(r'.*[\\/]([^\\/]+)[\\/][^\\/]+[\\/]scons[\\/]?$', build_dir)
>- if m:
>- return m.group(1)
>- else:
>- print >>sys.stderr, ('%s is an invalid build directory that does not '
>- 'correspond to any configuration.' % (build_dir,))
>- return ''
>-
>-
>-# All paths in this script are either absolute or relative to the current
>-# working directory, unless otherwise specified.
>-class TestRunner(object):
>- """Provides facilities for running Python and binary tests for Google Test."""
>-
>- def __init__(self,
>- script_dir,
>- build_dir_var_name='GTEST_BUILD_DIR',
>- injected_os=os,
>- injected_subprocess=subprocess,
>- injected_build_dir_finder=_GetGtestBuildDir):
>- """Initializes a TestRunner instance.
>-
>- Args:
>- script_dir: File path to the calling script.
>- build_dir_var_name: Name of the env variable used to pass the
>- the build directory path to the invoked
>- tests.
>- injected_os: standard os module or a mock/stub for
>- testing.
>- injected_subprocess: standard subprocess module or a mock/stub
>- for testing
>- injected_build_dir_finder: function that determines the path to
>- the build directory.
>- """
>-
>- self.os = injected_os
>- self.subprocess = injected_subprocess
>- self.build_dir_finder = injected_build_dir_finder
>- self.build_dir_var_name = build_dir_var_name
>- self.script_dir = script_dir
>-
>- def _GetBuildDirForConfig(self, config):
>- """Returns the build directory for a given configuration."""
>-
>- return self.build_dir_finder(self.os, self.script_dir, config)
>-
>- def _Run(self, args):
>- """Runs the executable with given args (args[0] is the executable name).
>-
>- Args:
>- args: Command line arguments for the process.
>-
>- Returns:
>- Process's exit code if it exits normally, or -signal if the process is
>- killed by a signal.
>- """
>-
>- if self.subprocess:
>- return self.subprocess.Popen(args).wait()
>- else:
>- return self.os.spawnv(self.os.P_WAIT, args[0], args)
>-
>- def _RunBinaryTest(self, test):
>- """Runs the binary test given its path.
>-
>- Args:
>- test: Path to the test binary.
>-
>- Returns:
>- Process's exit code if it exits normally, or -signal if the process is
>- killed by a signal.
>- """
>-
>- return self._Run([test])
>-
>- def _RunPythonTest(self, test, build_dir):
>- """Runs the Python test script with the specified build directory.
>-
>- Args:
>- test: Path to the test's Python script.
>- build_dir: Path to the directory where the test binary is to be found.
>-
>- Returns:
>- Process's exit code if it exits normally, or -signal if the process is
>- killed by a signal.
>- """
>-
>- old_build_dir = self.os.environ.get(self.build_dir_var_name)
>-
>- try:
>- self.os.environ[self.build_dir_var_name] = build_dir
>-
>- # If this script is run on a Windows machine that has no association
>- # between the .py extension and a python interpreter, simply passing
>- # the script name into subprocess.Popen/os.spawn will not work.
>- print 'Running %s . . .' % (test,)
>- return self._Run([sys.executable, test])
>-
>- finally:
>- if old_build_dir is None:
>- del self.os.environ[self.build_dir_var_name]
>- else:
>- self.os.environ[self.build_dir_var_name] = old_build_dir
>-
>- def _FindFilesByRegex(self, directory, regex):
>- """Returns files in a directory whose names match a regular expression.
>-
>- Args:
>- directory: Path to the directory to search for files.
>- regex: Regular expression to filter file names.
>-
>- Returns:
>- The list of the paths to the files in the directory.
>- """
>-
>- return [self.os.path.join(directory, file_name)
>- for file_name in self.os.listdir(directory)
>- if re.search(regex, file_name)]
>-
>- # TODO(vladl@google.com): Implement parsing of scons/SConscript to run all
>- # tests defined there when no tests are specified.
>- # TODO(vladl@google.com): Update the docstring after the code is changed to
>- # try to test all builds defined in scons/SConscript.
>- def GetTestsToRun(self,
>- args,
>- named_configurations,
>- built_configurations,
>- available_configurations=CONFIGS,
>- python_tests_to_skip=None):
>- """Determines what tests should be run.
>-
>- Args:
>- args: The list of non-option arguments from the command line.
>- named_configurations: The list of configurations specified via -c or -a.
>- built_configurations: True if -b has been specified.
>- available_configurations: a list of configurations available on the
>- current platform, injectable for testing.
>- python_tests_to_skip: a collection of (configuration, python test name)s
>- that need to be skipped.
>-
>- Returns:
>- A tuple with 2 elements: the list of Python tests to run and the list of
>- binary tests to run.
>- """
>-
>- if named_configurations == 'all':
>- named_configurations = ','.join(available_configurations)
>-
>- normalized_args = [self.os.path.normpath(arg) for arg in args]
>-
>- # A final list of build directories which will be searched for the test
>- # binaries. First, add directories specified directly on the command
>- # line.
>- build_dirs = filter(self.os.path.isdir, normalized_args)
>-
>- # Adds build directories specified via their build configurations using
>- # the -c or -a options.
>- if named_configurations:
>- build_dirs += [self._GetBuildDirForConfig(config)
>- for config in named_configurations.split(',')]
>-
>- # Adds KNOWN BUILD DIRECTORIES if -b is specified.
>- if built_configurations:
>- build_dirs += [self._GetBuildDirForConfig(config)
>- for config in available_configurations
>- if self.os.path.isdir(self._GetBuildDirForConfig(config))]
>-
>- # If no directories were specified either via -a, -b, -c, or directly, use
>- # the default configuration.
>- elif not build_dirs:
>- build_dirs = [self._GetBuildDirForConfig(available_configurations[0])]
>-
>- # Makes sure there are no duplications.
>- build_dirs = sets.Set(build_dirs)
>-
>- errors_found = False
>- listed_python_tests = [] # All Python tests listed on the command line.
>- listed_binary_tests = [] # All binary tests listed on the command line.
>-
>- test_dir = self.os.path.normpath(self.os.path.join(self.script_dir, 'test'))
>-
>- # Sifts through non-directory arguments fishing for any Python or binary
>- # tests and detecting errors.
>- for argument in sets.Set(normalized_args) - build_dirs:
>- if re.search(PYTHON_TEST_REGEX, argument):
>- python_path = self.os.path.join(test_dir,
>- self.os.path.basename(argument))
>- if self.os.path.isfile(python_path):
>- listed_python_tests.append(python_path)
>- else:
>- sys.stderr.write('Unable to find Python test %s' % argument)
>- errors_found = True
>- elif re.search(BINARY_TEST_REGEX, argument):
>- # This script also accepts binary test names prefixed with test/ for
>- # the convenience of typing them (can use path completions in the
>- # shell). Strips test/ prefix from the binary test names.
>- listed_binary_tests.append(self.os.path.basename(argument))
>- else:
>- sys.stderr.write('%s is neither test nor build directory' % argument)
>- errors_found = True
>-
>- if errors_found:
>- return None
>-
>- user_has_listed_tests = listed_python_tests or listed_binary_tests
>-
>- if user_has_listed_tests:
>- selected_python_tests = listed_python_tests
>- else:
>- selected_python_tests = self._FindFilesByRegex(test_dir,
>- PYTHON_TEST_REGEX)
>-
>- # TODO(vladl@google.com): skip unbuilt Python tests when -b is specified.
>- python_test_pairs = []
>- for directory in build_dirs:
>- for test in selected_python_tests:
>- config = _GetConfigFromBuildDir(directory)
>- file_name = os.path.basename(test)
>- if python_tests_to_skip and (config, file_name) in python_tests_to_skip:
>- print ('NOTE: %s is skipped for configuration %s, as it does not '
>- 'work there.' % (file_name, config))
>- else:
>- python_test_pairs.append((directory, test))
>-
>- binary_test_pairs = []
>- for directory in build_dirs:
>- if user_has_listed_tests:
>- binary_test_pairs.extend(
>- [(directory, self.os.path.join(directory, test))
>- for test in listed_binary_tests])
>- else:
>- tests = self._FindFilesByRegex(directory, BINARY_TEST_SEARCH_REGEX)
>- binary_test_pairs.extend([(directory, test) for test in tests])
>-
>- return (python_test_pairs, binary_test_pairs)
>-
>- def RunTests(self, python_tests, binary_tests):
>- """Runs Python and binary tests and reports results to the standard output.
>-
>- Args:
>- python_tests: List of Python tests to run in the form of tuples
>- (build directory, Python test script).
>- binary_tests: List of binary tests to run in the form of tuples
>- (build directory, binary file).
>-
>- Returns:
>- The exit code the program should pass into sys.exit().
>- """
>-
>- if python_tests or binary_tests:
>- results = []
>- for directory, test in python_tests:
>- results.append((directory,
>- test,
>- self._RunPythonTest(test, directory) == 0))
>- for directory, test in binary_tests:
>- results.append((directory,
>- self.os.path.basename(test),
>- self._RunBinaryTest(test) == 0))
>-
>- failed = [(directory, test)
>- for (directory, test, success) in results
>- if not success]
>- print
>- print '%d tests run.' % len(results)
>- if failed:
>- print 'The following %d tests failed:' % len(failed)
>- for (directory, test) in failed:
>- print '%s in %s' % (test, directory)
>- return 1
>- else:
>- print 'All tests passed!'
>- else: # No tests defined
>- print 'Nothing to test - no tests specified!'
>-
>- return 0
>-
>-
>-def ParseArgs(project_name, argv=None, help_callback=None):
>- """Parses the options run_tests.py uses."""
>-
>- # Suppresses lint warning on unused arguments. These arguments are
>- # required by optparse, even though they are unused.
>- # pylint: disable-msg=W0613
>- def PrintHelp(option, opt, value, parser):
>- print HELP_MSG % {'proj': project_name}
>- sys.exit(1)
>-
>- parser = optparse.OptionParser()
>- parser.add_option('-c',
>- action='store',
>- dest='configurations',
>- default=None)
>- parser.add_option('-a',
>- action='store_const',
>- dest='configurations',
>- default=None,
>- const='all')
>- parser.add_option('-b',
>- action='store_const',
>- dest='built_configurations',
>- default=False,
>- const=True)
>- # Replaces the built-in help with ours.
>- parser.remove_option('-h')
>- parser.add_option('-h', '--help',
>- action='callback',
>- callback=help_callback or PrintHelp)
>- return parser.parse_args(argv)
>diff --git a/Source/ThirdParty/gtest/test/run_tests_util_test.py b/Source/ThirdParty/gtest/test/run_tests_util_test.py
>deleted file mode 100755
>index 9c55726fd50b2a0c25068141d7e66943f0b6de73..0000000000000000000000000000000000000000
>--- a/Source/ThirdParty/gtest/test/run_tests_util_test.py
>+++ /dev/null
>@@ -1,676 +0,0 @@
>-#!/usr/bin/env python
>-#
>-# Copyright 2009 Google Inc. All Rights Reserved.
>-#
>-# Redistribution and use in source and binary forms, with or without
>-# modification, are permitted provided that the following conditions are
>-# met:
>-#
>-# * Redistributions of source code must retain the above copyright
>-# notice, this list of conditions and the following disclaimer.
>-# * Redistributions in binary form must reproduce the above
>-# copyright notice, this list of conditions and the following disclaimer
>-# in the documentation and/or other materials provided with the
>-# distribution.
>-# * Neither the name of Google Inc. nor the names of its
>-# contributors may be used to endorse or promote products derived from
>-# this software without specific prior written permission.
>-#
>-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-
>-"""Tests for run_tests_util.py test runner script."""
>-
>-__author__ = 'vladl@google.com (Vlad Losev)'
>-
>-import os
>-import re
>-import sets
>-import unittest
>-
>-import run_tests_util
>-
>-
>-GTEST_DBG_DIR = 'scons/build/dbg/gtest/scons'
>-GTEST_OPT_DIR = 'scons/build/opt/gtest/scons'
>-GTEST_OTHER_DIR = 'scons/build/other/gtest/scons'
>-
>-
>-def AddExeExtension(path):
>- """Appends .exe to the path on Windows or Cygwin."""
>-
>- if run_tests_util.IS_WINDOWS or run_tests_util.IS_CYGWIN:
>- return path + '.exe'
>- else:
>- return path
>-
>-
>-class FakePath(object):
>- """A fake os.path module for testing."""
>-
>- def __init__(self, current_dir=os.getcwd(), known_paths=None):
>- self.current_dir = current_dir
>- self.tree = {}
>- self.path_separator = os.sep
>-
>- # known_paths contains either absolute or relative paths. Relative paths
>- # are absolutized with self.current_dir.
>- if known_paths:
>- self._AddPaths(known_paths)
>-
>- def _AddPath(self, path):
>- ends_with_slash = path.endswith('/')
>- path = self.abspath(path)
>- if ends_with_slash:
>- path += self.path_separator
>- name_list = path.split(self.path_separator)
>- tree = self.tree
>- for name in name_list[:-1]:
>- if not name:
>- continue
>- if name in tree:
>- tree = tree[name]
>- else:
>- tree[name] = {}
>- tree = tree[name]
>-
>- name = name_list[-1]
>- if name:
>- if name in tree:
>- assert tree[name] == 1
>- else:
>- tree[name] = 1
>-
>- def _AddPaths(self, paths):
>- for path in paths:
>- self._AddPath(path)
>-
>- def PathElement(self, path):
>- """Returns an internal representation of directory tree entry for path."""
>- tree = self.tree
>- name_list = self.abspath(path).split(self.path_separator)
>- for name in name_list:
>- if not name:
>- continue
>- tree = tree.get(name, None)
>- if tree is None:
>- break
>-
>- return tree
>-
>- # Silences pylint warning about using standard names.
>- # pylint: disable-msg=C6409
>- def normpath(self, path):
>- return os.path.normpath(path)
>-
>- def abspath(self, path):
>- return self.normpath(os.path.join(self.current_dir, path))
>-
>- def isfile(self, path):
>- return self.PathElement(self.abspath(path)) == 1
>-
>- def isdir(self, path):
>- return type(self.PathElement(self.abspath(path))) == type(dict())
>-
>- def basename(self, path):
>- return os.path.basename(path)
>-
>- def dirname(self, path):
>- return os.path.dirname(path)
>-
>- def join(self, *kargs):
>- return os.path.join(*kargs)
>-
>-
>-class FakeOs(object):
>- """A fake os module for testing."""
>- P_WAIT = os.P_WAIT
>-
>- def __init__(self, fake_path_module):
>- self.path = fake_path_module
>-
>- # Some methods/attributes are delegated to the real os module.
>- self.environ = os.environ
>-
>- # pylint: disable-msg=C6409
>- def listdir(self, path):
>- assert self.path.isdir(path)
>- return self.path.PathElement(path).iterkeys()
>-
>- def spawnv(self, wait, executable, *kargs):
>- assert wait == FakeOs.P_WAIT
>- return self.spawn_impl(executable, kargs)
>-
>-
>-class GetTestsToRunTest(unittest.TestCase):
>- """Exercises TestRunner.GetTestsToRun."""
>-
>- def NormalizeGetTestsToRunResults(self, results):
>- """Normalizes path data returned from GetTestsToRun for comparison."""
>-
>- def NormalizePythonTestPair(pair):
>- """Normalizes path data in the (directory, python_script) pair."""
>-
>- return (os.path.normpath(pair[0]), os.path.normpath(pair[1]))
>-
>- def NormalizeBinaryTestPair(pair):
>- """Normalizes path data in the (directory, binary_executable) pair."""
>-
>- directory, executable = map(os.path.normpath, pair)
>-
>- # On Windows and Cygwin, the test file names have the .exe extension, but
>- # they can be invoked either by name or by name+extension. Our test must
>- # accommodate both situations.
>- if run_tests_util.IS_WINDOWS or run_tests_util.IS_CYGWIN:
>- executable = re.sub(r'\.exe$', '', executable)
>- return (directory, executable)
>-
>- python_tests = sets.Set(map(NormalizePythonTestPair, results[0]))
>- binary_tests = sets.Set(map(NormalizeBinaryTestPair, results[1]))
>- return (python_tests, binary_tests)
>-
>- def AssertResultsEqual(self, results, expected):
>- """Asserts results returned by GetTestsToRun equal to expected results."""
>-
>- self.assertEqual(self.NormalizeGetTestsToRunResults(results),
>- self.NormalizeGetTestsToRunResults(expected),
>- 'Incorrect set of tests returned:\n%s\nexpected:\n%s' %
>- (results, expected))
>-
>- def setUp(self):
>- self.fake_os = FakeOs(FakePath(
>- current_dir=os.path.abspath(os.path.dirname(run_tests_util.__file__)),
>- known_paths=[AddExeExtension(GTEST_DBG_DIR + '/gtest_unittest'),
>- AddExeExtension(GTEST_OPT_DIR + '/gtest_unittest'),
>- 'test/gtest_color_test.py']))
>- self.fake_configurations = ['dbg', 'opt']
>- self.test_runner = run_tests_util.TestRunner(script_dir='.',
>- injected_os=self.fake_os,
>- injected_subprocess=None)
>-
>- def testBinaryTestsOnly(self):
>- """Exercises GetTestsToRun with parameters designating binary tests only."""
>-
>- # A default build.
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- ['gtest_unittest'],
>- '',
>- False,
>- available_configurations=self.fake_configurations),
>- ([],
>- [(GTEST_DBG_DIR, GTEST_DBG_DIR + '/gtest_unittest')]))
>-
>- # An explicitly specified directory.
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- [GTEST_DBG_DIR, 'gtest_unittest'],
>- '',
>- False,
>- available_configurations=self.fake_configurations),
>- ([],
>- [(GTEST_DBG_DIR, GTEST_DBG_DIR + '/gtest_unittest')]))
>-
>- # A particular configuration.
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- ['gtest_unittest'],
>- 'other',
>- False,
>- available_configurations=self.fake_configurations),
>- ([],
>- [(GTEST_OTHER_DIR, GTEST_OTHER_DIR + '/gtest_unittest')]))
>-
>- # All available configurations
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- ['gtest_unittest'],
>- 'all',
>- False,
>- available_configurations=self.fake_configurations),
>- ([],
>- [(GTEST_DBG_DIR, GTEST_DBG_DIR + '/gtest_unittest'),
>- (GTEST_OPT_DIR, GTEST_OPT_DIR + '/gtest_unittest')]))
>-
>- # All built configurations (unbuilt don't cause failure).
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- ['gtest_unittest'],
>- '',
>- True,
>- available_configurations=self.fake_configurations + ['unbuilt']),
>- ([],
>- [(GTEST_DBG_DIR, GTEST_DBG_DIR + '/gtest_unittest'),
>- (GTEST_OPT_DIR, GTEST_OPT_DIR + '/gtest_unittest')]))
>-
>- # A combination of an explicit directory and a configuration.
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- [GTEST_DBG_DIR, 'gtest_unittest'],
>- 'opt',
>- False,
>- available_configurations=self.fake_configurations),
>- ([],
>- [(GTEST_DBG_DIR, GTEST_DBG_DIR + '/gtest_unittest'),
>- (GTEST_OPT_DIR, GTEST_OPT_DIR + '/gtest_unittest')]))
>-
>- # Same test specified in an explicit directory and via a configuration.
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- [GTEST_DBG_DIR, 'gtest_unittest'],
>- 'dbg',
>- False,
>- available_configurations=self.fake_configurations),
>- ([],
>- [(GTEST_DBG_DIR, GTEST_DBG_DIR + '/gtest_unittest')]))
>-
>- # All built configurations + explicit directory + explicit configuration.
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- [GTEST_DBG_DIR, 'gtest_unittest'],
>- 'opt',
>- True,
>- available_configurations=self.fake_configurations),
>- ([],
>- [(GTEST_DBG_DIR, GTEST_DBG_DIR + '/gtest_unittest'),
>- (GTEST_OPT_DIR, GTEST_OPT_DIR + '/gtest_unittest')]))
>-
>- def testPythonTestsOnly(self):
>- """Exercises GetTestsToRun with parameters designating Python tests only."""
>-
>- # A default build.
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- ['gtest_color_test.py'],
>- '',
>- False,
>- available_configurations=self.fake_configurations),
>- ([(GTEST_DBG_DIR, 'test/gtest_color_test.py')],
>- []))
>-
>- # An explicitly specified directory.
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- [GTEST_DBG_DIR, 'test/gtest_color_test.py'],
>- '',
>- False,
>- available_configurations=self.fake_configurations),
>- ([(GTEST_DBG_DIR, 'test/gtest_color_test.py')],
>- []))
>-
>- # A particular configuration.
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- ['gtest_color_test.py'],
>- 'other',
>- False,
>- available_configurations=self.fake_configurations),
>- ([(GTEST_OTHER_DIR, 'test/gtest_color_test.py')],
>- []))
>-
>- # All available configurations
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- ['test/gtest_color_test.py'],
>- 'all',
>- False,
>- available_configurations=self.fake_configurations),
>- ([(GTEST_DBG_DIR, 'test/gtest_color_test.py'),
>- (GTEST_OPT_DIR, 'test/gtest_color_test.py')],
>- []))
>-
>- # All built configurations (unbuilt don't cause failure).
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- ['gtest_color_test.py'],
>- '',
>- True,
>- available_configurations=self.fake_configurations + ['unbuilt']),
>- ([(GTEST_DBG_DIR, 'test/gtest_color_test.py'),
>- (GTEST_OPT_DIR, 'test/gtest_color_test.py')],
>- []))
>-
>- # A combination of an explicit directory and a configuration.
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- [GTEST_DBG_DIR, 'gtest_color_test.py'],
>- 'opt',
>- False,
>- available_configurations=self.fake_configurations),
>- ([(GTEST_DBG_DIR, 'test/gtest_color_test.py'),
>- (GTEST_OPT_DIR, 'test/gtest_color_test.py')],
>- []))
>-
>- # Same test specified in an explicit directory and via a configuration.
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- [GTEST_DBG_DIR, 'gtest_color_test.py'],
>- 'dbg',
>- False,
>- available_configurations=self.fake_configurations),
>- ([(GTEST_DBG_DIR, 'test/gtest_color_test.py')],
>- []))
>-
>- # All built configurations + explicit directory + explicit configuration.
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- [GTEST_DBG_DIR, 'gtest_color_test.py'],
>- 'opt',
>- True,
>- available_configurations=self.fake_configurations),
>- ([(GTEST_DBG_DIR, 'test/gtest_color_test.py'),
>- (GTEST_OPT_DIR, 'test/gtest_color_test.py')],
>- []))
>-
>- def testCombinationOfBinaryAndPythonTests(self):
>- """Exercises GetTestsToRun with mixed binary/Python tests."""
>-
>- # Use only default configuration for this test.
>-
>- # Neither binary nor Python tests are specified so find all.
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- [],
>- '',
>- False,
>- available_configurations=self.fake_configurations),
>- ([(GTEST_DBG_DIR, 'test/gtest_color_test.py')],
>- [(GTEST_DBG_DIR, GTEST_DBG_DIR + '/gtest_unittest')]))
>-
>- # Specifying both binary and Python tests.
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- ['gtest_unittest', 'gtest_color_test.py'],
>- '',
>- False,
>- available_configurations=self.fake_configurations),
>- ([(GTEST_DBG_DIR, 'test/gtest_color_test.py')],
>- [(GTEST_DBG_DIR, GTEST_DBG_DIR + '/gtest_unittest')]))
>-
>- # Specifying binary tests suppresses Python tests.
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- ['gtest_unittest'],
>- '',
>- False,
>- available_configurations=self.fake_configurations),
>- ([],
>- [(GTEST_DBG_DIR, GTEST_DBG_DIR + '/gtest_unittest')]))
>-
>- # Specifying Python tests suppresses binary tests.
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- ['gtest_color_test.py'],
>- '',
>- False,
>- available_configurations=self.fake_configurations),
>- ([(GTEST_DBG_DIR, 'test/gtest_color_test.py')],
>- []))
>-
>- def testIgnoresNonTestFiles(self):
>- """Verifies that GetTestsToRun ignores non-test files in the filesystem."""
>-
>- self.fake_os = FakeOs(FakePath(
>- current_dir=os.path.abspath(os.path.dirname(run_tests_util.__file__)),
>- known_paths=[AddExeExtension(GTEST_DBG_DIR + '/gtest_nontest'),
>- 'test/']))
>- self.test_runner = run_tests_util.TestRunner(script_dir='.',
>- injected_os=self.fake_os,
>- injected_subprocess=None)
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- [],
>- '',
>- True,
>- available_configurations=self.fake_configurations),
>- ([], []))
>-
>- def testWorksFromDifferentDir(self):
>- """Exercises GetTestsToRun from a directory different from run_test.py's."""
>-
>- # Here we simulate an test script in directory /d/ called from the
>- # directory /a/b/c/.
>- self.fake_os = FakeOs(FakePath(
>- current_dir=os.path.abspath('/a/b/c'),
>- known_paths=[
>- '/a/b/c/',
>- AddExeExtension('/d/' + GTEST_DBG_DIR + '/gtest_unittest'),
>- AddExeExtension('/d/' + GTEST_OPT_DIR + '/gtest_unittest'),
>- '/d/test/gtest_color_test.py']))
>- self.fake_configurations = ['dbg', 'opt']
>- self.test_runner = run_tests_util.TestRunner(script_dir='/d/',
>- injected_os=self.fake_os,
>- injected_subprocess=None)
>- # A binary test.
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- ['gtest_unittest'],
>- '',
>- False,
>- available_configurations=self.fake_configurations),
>- ([],
>- [('/d/' + GTEST_DBG_DIR, '/d/' + GTEST_DBG_DIR + '/gtest_unittest')]))
>-
>- # A Python test.
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- ['gtest_color_test.py'],
>- '',
>- False,
>- available_configurations=self.fake_configurations),
>- ([('/d/' + GTEST_DBG_DIR, '/d/test/gtest_color_test.py')], []))
>-
>- def testNonTestBinary(self):
>- """Exercises GetTestsToRun with a non-test parameter."""
>-
>- self.assert_(
>- not self.test_runner.GetTestsToRun(
>- ['gtest_unittest_not_really'],
>- '',
>- False,
>- available_configurations=self.fake_configurations))
>-
>- def testNonExistingPythonTest(self):
>- """Exercises GetTestsToRun with a non-existent Python test parameter."""
>-
>- self.assert_(
>- not self.test_runner.GetTestsToRun(
>- ['nonexistent_test.py'],
>- '',
>- False,
>- available_configurations=self.fake_configurations))
>-
>- if run_tests_util.IS_WINDOWS or run_tests_util.IS_CYGWIN:
>-
>- def testDoesNotPickNonExeFilesOnWindows(self):
>- """Verifies that GetTestsToRun does not find _test files on Windows."""
>-
>- self.fake_os = FakeOs(FakePath(
>- current_dir=os.path.abspath(os.path.dirname(run_tests_util.__file__)),
>- known_paths=['/d/' + GTEST_DBG_DIR + '/gtest_test', 'test/']))
>- self.test_runner = run_tests_util.TestRunner(script_dir='.',
>- injected_os=self.fake_os,
>- injected_subprocess=None)
>- self.AssertResultsEqual(
>- self.test_runner.GetTestsToRun(
>- [],
>- '',
>- True,
>- available_configurations=self.fake_configurations),
>- ([], []))
>-
>-
>-class RunTestsTest(unittest.TestCase):
>- """Exercises TestRunner.RunTests."""
>-
>- def SpawnSuccess(self, unused_executable, unused_argv):
>- """Fakes test success by returning 0 as an exit code."""
>-
>- self.num_spawn_calls += 1
>- return 0
>-
>- def SpawnFailure(self, unused_executable, unused_argv):
>- """Fakes test success by returning 1 as an exit code."""
>-
>- self.num_spawn_calls += 1
>- return 1
>-
>- def setUp(self):
>- self.fake_os = FakeOs(FakePath(
>- current_dir=os.path.abspath(os.path.dirname(run_tests_util.__file__)),
>- known_paths=[
>- AddExeExtension(GTEST_DBG_DIR + '/gtest_unittest'),
>- AddExeExtension(GTEST_OPT_DIR + '/gtest_unittest'),
>- 'test/gtest_color_test.py']))
>- self.fake_configurations = ['dbg', 'opt']
>- self.test_runner = run_tests_util.TestRunner(
>- script_dir=os.path.dirname(__file__) or '.',
>- injected_os=self.fake_os,
>- injected_subprocess=None)
>- self.num_spawn_calls = 0 # A number of calls to spawn.
>-
>- def testRunPythonTestSuccess(self):
>- """Exercises RunTests to handle a Python test success."""
>-
>- self.fake_os.spawn_impl = self.SpawnSuccess
>- self.assertEqual(
>- self.test_runner.RunTests(
>- [(GTEST_DBG_DIR, 'test/gtest_color_test.py')],
>- []),
>- 0)
>- self.assertEqual(self.num_spawn_calls, 1)
>-
>- def testRunBinaryTestSuccess(self):
>- """Exercises RunTests to handle a binary test success."""
>-
>- self.fake_os.spawn_impl = self.SpawnSuccess
>- self.assertEqual(
>- self.test_runner.RunTests(
>- [],
>- [(GTEST_DBG_DIR, GTEST_DBG_DIR + '/gtest_unittest')]),
>- 0)
>- self.assertEqual(self.num_spawn_calls, 1)
>-
>- def testRunPythonTestFauilure(self):
>- """Exercises RunTests to handle a Python test failure."""
>-
>- self.fake_os.spawn_impl = self.SpawnFailure
>- self.assertEqual(
>- self.test_runner.RunTests(
>- [(GTEST_DBG_DIR, 'test/gtest_color_test.py')],
>- []),
>- 1)
>- self.assertEqual(self.num_spawn_calls, 1)
>-
>- def testRunBinaryTestFailure(self):
>- """Exercises RunTests to handle a binary test failure."""
>-
>- self.fake_os.spawn_impl = self.SpawnFailure
>- self.assertEqual(
>- self.test_runner.RunTests(
>- [],
>- [(GTEST_DBG_DIR, GTEST_DBG_DIR + '/gtest_unittest')]),
>- 1)
>- self.assertEqual(self.num_spawn_calls, 1)
>-
>- def testCombinedTestSuccess(self):
>- """Exercises RunTests to handle a success of both Python and binary test."""
>-
>- self.fake_os.spawn_impl = self.SpawnSuccess
>- self.assertEqual(
>- self.test_runner.RunTests(
>- [(GTEST_DBG_DIR, GTEST_DBG_DIR + '/gtest_unittest')],
>- [(GTEST_DBG_DIR, GTEST_DBG_DIR + '/gtest_unittest')]),
>- 0)
>- self.assertEqual(self.num_spawn_calls, 2)
>-
>- def testCombinedTestSuccessAndFailure(self):
>- """Exercises RunTests to handle a success of both Python and binary test."""
>-
>- def SpawnImpl(executable, argv):
>- self.num_spawn_calls += 1
>- # Simulates failure of a Python test and success of a binary test.
>- if '.py' in executable or '.py' in argv[0]:
>- return 1
>- else:
>- return 0
>-
>- self.fake_os.spawn_impl = SpawnImpl
>- self.assertEqual(
>- self.test_runner.RunTests(
>- [(GTEST_DBG_DIR, GTEST_DBG_DIR + '/gtest_unittest')],
>- [(GTEST_DBG_DIR, GTEST_DBG_DIR + '/gtest_unittest')]),
>- 0)
>- self.assertEqual(self.num_spawn_calls, 2)
>-
>-
>-class ParseArgsTest(unittest.TestCase):
>- """Exercises ParseArgs."""
>-
>- def testNoOptions(self):
>- options, args = run_tests_util.ParseArgs('gtest', argv=['script.py'])
>- self.assertEqual(args, ['script.py'])
>- self.assert_(options.configurations is None)
>- self.assertFalse(options.built_configurations)
>-
>- def testOptionC(self):
>- options, args = run_tests_util.ParseArgs(
>- 'gtest', argv=['script.py', '-c', 'dbg'])
>- self.assertEqual(args, ['script.py'])
>- self.assertEqual(options.configurations, 'dbg')
>- self.assertFalse(options.built_configurations)
>-
>- def testOptionA(self):
>- options, args = run_tests_util.ParseArgs('gtest', argv=['script.py', '-a'])
>- self.assertEqual(args, ['script.py'])
>- self.assertEqual(options.configurations, 'all')
>- self.assertFalse(options.built_configurations)
>-
>- def testOptionB(self):
>- options, args = run_tests_util.ParseArgs('gtest', argv=['script.py', '-b'])
>- self.assertEqual(args, ['script.py'])
>- self.assert_(options.configurations is None)
>- self.assertTrue(options.built_configurations)
>-
>- def testOptionCAndOptionB(self):
>- options, args = run_tests_util.ParseArgs(
>- 'gtest', argv=['script.py', '-c', 'dbg', '-b'])
>- self.assertEqual(args, ['script.py'])
>- self.assertEqual(options.configurations, 'dbg')
>- self.assertTrue(options.built_configurations)
>-
>- def testOptionH(self):
>- help_called = [False]
>-
>- # Suppresses lint warning on unused arguments. These arguments are
>- # required by optparse, even though they are unused.
>- # pylint: disable-msg=W0613
>- def VerifyHelp(option, opt, value, parser):
>- help_called[0] = True
>-
>- # Verifies that -h causes the help callback to be called.
>- help_called[0] = False
>- _, args = run_tests_util.ParseArgs(
>- 'gtest', argv=['script.py', '-h'], help_callback=VerifyHelp)
>- self.assertEqual(args, ['script.py'])
>- self.assertTrue(help_called[0])
>-
>- # Verifies that --help causes the help callback to be called.
>- help_called[0] = False
>- _, args = run_tests_util.ParseArgs(
>- 'gtest', argv=['script.py', '--help'], help_callback=VerifyHelp)
>- self.assertEqual(args, ['script.py'])
>- self.assertTrue(help_called[0])
>-
>-
>-if __name__ == '__main__':
>- unittest.main()
>diff --git a/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig b/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig
>index 576f3d9bf0e24f6ee9891813e4e18e4f1c1be462..76f3ab295a910678c55c50fa7f8ac74e77302f96 100644
>--- a/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig
>+++ b/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig
>@@ -5,7 +5,7 @@
> // examples. It is set in the "Based On:" dropdown in the "Project" info
> // dialog.
> // This file is based on the Xcode Configuration files in:
>-// http://code.google.com/p/google-toolbox-for-mac/
>+// https://github.com/google/google-toolbox-for-mac
> // 
> 
> #include "General.xcconfig"
>@@ -29,9 +29,6 @@ OTHER_CFLAGS = $(OTHER_CFLAGS) -DDEBUG=1
> // // Turns on special C++ STL checks to "encourage" good STL use
> // GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) _GLIBCXX_DEBUG_PEDANTIC _GLIBCXX_DEBUG _GLIBCPP_CONCEPT_CHECKS
> 
>-// Used by HEADER_SEARCH_PATHS in General.xcconfig
>-WEBCORE_PRIVATE_HEADERS_DIR = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
>-
> ONLY_ACTIVE_ARCH = YES
> 
> SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
>diff --git a/Source/ThirdParty/gtest/xcode/Config/FrameworkTarget.xcconfig b/Source/ThirdParty/gtest/xcode/Config/FrameworkTarget.xcconfig
>index f4da9d23991635abdcda82b6a06eac3fc85890ad..7d024cd294867c15732be2e89c79b87ebaedaf45 100644
>--- a/Source/ThirdParty/gtest/xcode/Config/FrameworkTarget.xcconfig
>+++ b/Source/ThirdParty/gtest/xcode/Config/FrameworkTarget.xcconfig
>@@ -4,7 +4,7 @@
> // These are Framework target settings for the gtest framework and examples. It
> // is set in the "Based On:" dropdown in the "Target" info dialog.
> // This file is based on the Xcode Configuration files in:
>-// http://code.google.com/p/google-toolbox-for-mac/
>+// https://github.com/google/google-toolbox-for-mac
> // 
> 
> // Dynamic libs need to be position independent
>diff --git a/Source/ThirdParty/gtest/xcode/Config/General.xcconfig b/Source/ThirdParty/gtest/xcode/Config/General.xcconfig
>index 3bd2a586a5705fcf66ec2d9592afac3d8d6d7de0..53e03de51cc2f9b7156bd5674a173a0f3a3fa41c 100644
>--- a/Source/ThirdParty/gtest/xcode/Config/General.xcconfig
>+++ b/Source/ThirdParty/gtest/xcode/Config/General.xcconfig
>@@ -18,7 +18,7 @@ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
> 
> ARCHS = $(ARCHS_STANDARD_32_64_BIT);
> 
>-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" ../ ../include/
>+HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include ../ ../include/
> 
> // Zerolink prevents link warnings so turn it off
> ZERO_LINK = NO
>@@ -59,8 +59,6 @@ ALWAYS_SEARCH_USER_PATHS = NO
> // Turn on position dependent code for most cases (overridden where appropriate)
> GCC_DYNAMIC_NO_PIC = YES
> 
>-GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) GTEST_HAS_TR1_TUPLE=0 GTEST_HAS_RTTI=0;
>-
> CLANG_CXX_LIBRARY = libc++;
> 
> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
>diff --git a/Source/ThirdParty/gtest/xcode/Config/ProductionProject.xcconfig b/Source/ThirdParty/gtest/xcode/Config/ProductionProject.xcconfig
>index 016c6878e97610188daa8629d3521ab94776bac6..d9275f02f8572a01835c850797adabcb5045619c 100644
>--- a/Source/ThirdParty/gtest/xcode/Config/ProductionProject.xcconfig
>+++ b/Source/ThirdParty/gtest/xcode/Config/ProductionProject.xcconfig
>@@ -10,25 +10,6 @@
> 
> #include "ReleaseProject.xcconfig"
> 
>-// Used by HEADER_SEARCH_PATHS in General.xcconfig
>-WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
>-WEBCORE_PRIVATE_HEADERS_DIR_NO = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/PrivateHeaders;
>-WEBCORE_PRIVATE_HEADERS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
>-
>-FRAMEWORK_SEARCH_PATHS = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) $(inherited);
>-
> ONLY_ACTIVE_ARCH = NO
> 
> SDKROOT = macosx.internal;
>-
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
>-WK_USE_OVERRIDE_FRAMEWORKS_DIR[sdk=macosx*] = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
>-
>-WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
>-WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
>-
>-WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
>-WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
>diff --git a/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig b/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig
>index 13e917fbfa2ddf2d3ee531598dc0fb0f2b5bf876..e0ddbe964d9b0067ac91b663ec40eeaf08934cc1 100644
>--- a/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig
>+++ b/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig
>@@ -5,7 +5,7 @@
> // and examples. It is set in the "Based On:" dropdown in the "Project" info
> // dialog.
> // This file is based on the Xcode Configuration files in:
>-// http://code.google.com/p/google-toolbox-for-mac/
>+// https://github.com/google/google-toolbox-for-mac
> // 
> 
> #include "General.xcconfig"
>@@ -31,9 +31,6 @@ OTHER_CFLAGS = $(OTHER_CFLAGS) -DNDEBUG=1 -Wno-unused-variable
> // When we strip we want to strip all symbols in release, but save externals.
> STRIP_STYLE = all
> 
>-// Used by HEADER_SEARCH_PATHS in General.xcconfig
>-WEBCORE_PRIVATE_HEADERS_DIR = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
>-
> ONLY_ACTIVE_ARCH = YES
> 
> SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
>diff --git a/Source/ThirdParty/gtest/xcode/Config/StaticLibraryTarget.xcconfig b/Source/ThirdParty/gtest/xcode/Config/StaticLibraryTarget.xcconfig
>index dd33255a94477020cf11f7055e44ae2528eb9f97..04b73bc92d0121d958f5f8699daf377eb698c39a 100644
>--- a/Source/ThirdParty/gtest/xcode/Config/StaticLibraryTarget.xcconfig
>+++ b/Source/ThirdParty/gtest/xcode/Config/StaticLibraryTarget.xcconfig
>@@ -4,7 +4,7 @@
> // These are static library target settings for libgtest.a. It
> // is set in the "Based On:" dropdown in the "Target" info dialog.
> // This file is based on the Xcode Configuration files in:
>-// http://code.google.com/p/google-toolbox-for-mac/
>+// https://github.com/google/google-toolbox-for-mac
> // 
> 
> // Static libs can be included in bundles so make them position independent
>diff --git a/Source/ThirdParty/gtest/xcode/Samples/FrameworkSample/widget_test.cc b/Source/ThirdParty/gtest/xcode/Samples/FrameworkSample/widget_test.cc
>index 61c0d2ffd76d1806aa35979d8ae36410648aaa15..872599421851408e76aab6c560b81892459bbd2d 100644
>--- a/Source/ThirdParty/gtest/xcode/Samples/FrameworkSample/widget_test.cc
>+++ b/Source/ThirdParty/gtest/xcode/Samples/FrameworkSample/widget_test.cc
>@@ -36,7 +36,7 @@
> // This is a simple test file for the Widget class in the Widget.framework
> 
> #include <string>
>-#include <gtest/gtest.h>
>+#include "gtest/gtest.h"
> 
> #include <Widget/widget.h>
> 
>diff --git a/Source/ThirdParty/gtest/xcode/Scripts/versiongenerate.py b/Source/ThirdParty/gtest/xcode/Scripts/versiongenerate.py
>old mode 100644
>new mode 100755
>index 81de8c96ac5d86ca639456c90c433067bdfd40e5..bdd7541ad797fa673f65da38168e1580fd7dde3a
>--- a/Source/ThirdParty/gtest/xcode/Scripts/versiongenerate.py
>+++ b/Source/ThirdParty/gtest/xcode/Scripts/versiongenerate.py
>@@ -29,7 +29,7 @@
> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
>-"""A script to prepare version informtion for use the gtest Info.plist file.
>+"""A script to prepare version information for use the gtest Info.plist file.
> 
> This script extracts the version information from the configure.ac file and
> uses it to generate a header file containing the same information. The
>@@ -42,7 +42,7 @@
> 1. The AC_INIT macro will be contained within the first 1024 characters
> of configure.ac
> 2. The version string will be 3 integers separated by periods and will be
>- surrounded by squre brackets, "[" and "]" (e.g. [1.0.1]). The first
>+ surrounded by square brackets, "[" and "]" (e.g. [1.0.1]). The first
> segment represents the major version, the second represents the minor
> version and the third represents the fix version.
> 3. No ")" character exists between the opening "(" and closing ")" of
>@@ -68,7 +68,7 @@ config_file.close()
> 
> # Extract the version string from the AC_INIT macro
> # The following init_expression means:
>-# Extract three integers separated by periods and surrounded by squre
>+# Extract three integers separated by periods and surrounded by square
> # brackets(e.g. "[1.0.1]") between "AC_INIT(" and ")". Do not be greedy
> # (*? is the non-greedy flag) since that would pull in everything between
> # the first "(" and the last ")" in the file.
>@@ -88,7 +88,7 @@ file_data = """//
> // is executed in a "Run Script" build phase when creating gtest.framework. This
> // header file is not used during compilation of C-source. Rather, it simply
> // defines some version strings for substitution in the Info.plist. Because of
>-// this, we are not not restricted to C-syntax nor are we using include guards.
>+// this, we are not restricted to C-syntax nor are we using include guards.
> //
> 
> #define GTEST_VERSIONINFO_SHORT %s.%s
>diff --git a/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj b/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj
>index 1ff3fbafefbaac3b838248b17d56876b3d5f6be8..77fc488e01b6e80ccb5c59c39422c34772e4c004 100644
>--- a/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj
>+++ b/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj
>@@ -37,7 +37,6 @@
> /* End PBXAggregateTarget section */
> 
> /* Begin PBXBuildFile section */
>-		1A0A4C4514B7A3B500895135 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A0A4C4414B7A3B500895135 /* JavaScriptCore.framework */; };
> 		224A12A30E9EADCC00BD17FD /* gtest-test-part.h in Headers */ = {isa = PBXBuildFile; fileRef = 224A12A20E9EADCC00BD17FD /* gtest-test-part.h */; settings = {ATTRIBUTES = (Public, ); }; };
> 		3BF6F2A00E79B5AD000F2EEE /* gtest-type-util.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 3BF6F29F0E79B5AD000F2EEE /* gtest-type-util.h */; };
> 		3BF6F2A50E79B616000F2EEE /* gtest-typed-test.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BF6F2A40E79B616000F2EEE /* gtest-typed-test.h */; settings = {ATTRIBUTES = (Public, ); }; };
>@@ -47,7 +46,7 @@
> 		4048843B0E2F799B00CF7658 /* gtest.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DE0E2F799B00CF7658 /* gtest.h */; settings = {ATTRIBUTES = (Public, ); }; };
> 		4048843C0E2F799B00CF7658 /* gtest_pred_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DF0E2F799B00CF7658 /* gtest_pred_impl.h */; settings = {ATTRIBUTES = (Public, ); }; };
> 		4048843D0E2F799B00CF7658 /* gtest_prod.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883E00E2F799B00CF7658 /* gtest_prod.h */; settings = {ATTRIBUTES = (Public, ); }; };
>-		404884500E2F799B00CF7658 /* README in Resources */ = {isa = PBXBuildFile; fileRef = 404883F60E2F799B00CF7658 /* README */; };
>+		404884500E2F799B00CF7658 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 404883F60E2F799B00CF7658 /* README.md */; };
> 		404884A00E2F7BE600CF7658 /* gtest-death-test-internal.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E20E2F799B00CF7658 /* gtest-death-test-internal.h */; };
> 		404884A10E2F7BE600CF7658 /* gtest-filepath.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E30E2F799B00CF7658 /* gtest-filepath.h */; };
> 		404884A20E2F7BE600CF7658 /* gtest-internal.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E40E2F799B00CF7658 /* gtest-internal.h */; };
>@@ -55,7 +54,7 @@
> 		404884A40E2F7BE600CF7658 /* gtest-string.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E60E2F799B00CF7658 /* gtest-string.h */; };
> 		404884AC0E2F7CD900CF7658 /* CHANGES in Resources */ = {isa = PBXBuildFile; fileRef = 404884A90E2F7CD900CF7658 /* CHANGES */; };
> 		404884AD0E2F7CD900CF7658 /* CONTRIBUTORS in Resources */ = {isa = PBXBuildFile; fileRef = 404884AA0E2F7CD900CF7658 /* CONTRIBUTORS */; };
>-		404884AE0E2F7CD900CF7658 /* COPYING in Resources */ = {isa = PBXBuildFile; fileRef = 404884AB0E2F7CD900CF7658 /* COPYING */; };
>+		404884AE0E2F7CD900CF7658 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 404884AB0E2F7CD900CF7658 /* LICENSE */; };
> 		40899F3A0FFA70D4000B29AE /* gtest-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = 224A12A10E9EADA700BD17FD /* gtest-all.cc */; };
> 		40899F500FFA7281000B29AE /* gtest-tuple.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 40899F4D0FFA7271000B29AE /* gtest-tuple.h */; };
> 		40899F530FFA72A0000B29AE /* gtest_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3B238C120E7FE13C00846E11 /* gtest_unittest.cc */; };
>@@ -79,6 +78,14 @@
> 		4539C9380EC280E200A70F4C /* gtest-linked_ptr.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 4539C9350EC280E200A70F4C /* gtest-linked_ptr.h */; };
> 		4539C9390EC280E200A70F4C /* gtest-param-util-generated.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 4539C9360EC280E200A70F4C /* gtest-param-util-generated.h */; };
> 		4539C93A0EC280E200A70F4C /* gtest-param-util.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 4539C9370EC280E200A70F4C /* gtest-param-util.h */; };
>+		4567C8181264FF71007740BE /* gtest-printers.h in Headers */ = {isa = PBXBuildFile; fileRef = 4567C8171264FF71007740BE /* gtest-printers.h */; settings = {ATTRIBUTES = (Public, ); }; };
>+		F67D4F3E1C7F5D8B0017C729 /* gtest-port-arch.h in Headers */ = {isa = PBXBuildFile; fileRef = F67D4F3D1C7F5D8B0017C729 /* gtest-port-arch.h */; };
>+		F67D4F3F1C7F5DA70017C729 /* gtest-port-arch.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = F67D4F3D1C7F5D8B0017C729 /* gtest-port-arch.h */; };
>+		F67D4F441C7F5DD00017C729 /* gtest-port.h in Headers */ = {isa = PBXBuildFile; fileRef = F67D4F411C7F5DD00017C729 /* gtest-port.h */; };
>+		F67D4F451C7F5DD00017C729 /* gtest-printers.h in Headers */ = {isa = PBXBuildFile; fileRef = F67D4F421C7F5DD00017C729 /* gtest-printers.h */; };
>+		F67D4F461C7F5DD00017C729 /* gtest.h in Headers */ = {isa = PBXBuildFile; fileRef = F67D4F431C7F5DD00017C729 /* gtest.h */; };
>+		F67D4F481C7F5E160017C729 /* gtest-port.h in Copy Headers Internal Custom */ = {isa = PBXBuildFile; fileRef = F67D4F411C7F5DD00017C729 /* gtest-port.h */; };
>+		F67D4F491C7F5E260017C729 /* gtest-printers.h in Copy Headers Internal Custom */ = {isa = PBXBuildFile; fileRef = F67D4F421C7F5DD00017C729 /* gtest-printers.h */; };
> /* End PBXBuildFile section */
> 
> /* Begin PBXContainerItemProxy section */
>@@ -188,6 +195,7 @@
> 				4539C9380EC280E200A70F4C /* gtest-linked_ptr.h in Copy Headers Internal */,
> 				4539C9390EC280E200A70F4C /* gtest-param-util-generated.h in Copy Headers Internal */,
> 				4539C93A0EC280E200A70F4C /* gtest-param-util.h in Copy Headers Internal */,
>+				F67D4F3F1C7F5DA70017C729 /* gtest-port-arch.h in Copy Headers Internal */,
> 				404884A30E2F7BE600CF7658 /* gtest-port.h in Copy Headers Internal */,
> 				404884A40E2F7BE600CF7658 /* gtest-string.h in Copy Headers Internal */,
> 				40899F500FFA7281000B29AE /* gtest-tuple.h in Copy Headers Internal */,
>@@ -196,10 +204,21 @@
> 			name = "Copy Headers Internal";
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>+		F67D4F471C7F5DF60017C729 /* Copy Headers Internal Custom */ = {
>+			isa = PBXCopyFilesBuildPhase;
>+			buildActionMask = 2147483647;
>+			dstPath = Headers/internal/custom;
>+			dstSubfolderSpec = 6;
>+			files = (
>+				F67D4F481C7F5E160017C729 /* gtest-port.h in Copy Headers Internal Custom */,
>+				F67D4F491C7F5E260017C729 /* gtest-printers.h in Copy Headers Internal Custom */,
>+			);
>+			name = "Copy Headers Internal Custom";
>+			runOnlyForDeploymentPostprocessing = 0;
>+		};
> /* End PBXCopyFilesBuildPhase section */
> 
> /* Begin PBXFileReference section */
>-		1A0A4C4414B7A3B500895135 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
> 		224A12A10E9EADA700BD17FD /* gtest-all.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = "gtest-all.cc"; sourceTree = "<group>"; };
> 		224A12A20E9EADCC00BD17FD /* gtest-test-part.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = "gtest-test-part.h"; sourceTree = "<group>"; };
> 		3B238C120E7FE13C00846E11 /* gtest_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gtest_unittest.cc; sourceTree = "<group>"; };
>@@ -218,11 +237,11 @@
> 		404883E40E2F799B00CF7658 /* gtest-internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-internal.h"; sourceTree = "<group>"; };
> 		404883E50E2F799B00CF7658 /* gtest-port.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-port.h"; sourceTree = "<group>"; };
> 		404883E60E2F799B00CF7658 /* gtest-string.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-string.h"; sourceTree = "<group>"; };
>-		404883F60E2F799B00CF7658 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README; path = ../README; sourceTree = SOURCE_ROOT; };
>+		404883F60E2F799B00CF7658 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README.md; path = ../README.md; sourceTree = SOURCE_ROOT; };
> 		4048840D0E2F799B00CF7658 /* gtest_main.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gtest_main.cc; sourceTree = "<group>"; };
> 		404884A90E2F7CD900CF7658 /* CHANGES */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CHANGES; path = ../CHANGES; sourceTree = SOURCE_ROOT; };
> 		404884AA0E2F7CD900CF7658 /* CONTRIBUTORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CONTRIBUTORS; path = ../CONTRIBUTORS; sourceTree = SOURCE_ROOT; };
>-		404884AB0E2F7CD900CF7658 /* COPYING */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = COPYING; path = ../COPYING; sourceTree = SOURCE_ROOT; };
>+		404884AB0E2F7CD900CF7658 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = SOURCE_ROOT; };
> 		40899F430FFA7184000B29AE /* gtest_unittest-framework */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "gtest_unittest-framework"; sourceTree = BUILT_PRODUCTS_DIR; };
> 		40899F4D0FFA7271000B29AE /* gtest-tuple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-tuple.h"; sourceTree = "<group>"; };
> 		40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = StaticLibraryTarget.xcconfig; sourceTree = "<group>"; };
>@@ -245,6 +264,11 @@
> 		4539C9350EC280E200A70F4C /* gtest-linked_ptr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-linked_ptr.h"; sourceTree = "<group>"; };
> 		4539C9360EC280E200A70F4C /* gtest-param-util-generated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-param-util-generated.h"; sourceTree = "<group>"; };
> 		4539C9370EC280E200A70F4C /* gtest-param-util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-param-util.h"; sourceTree = "<group>"; };
>+		4567C8171264FF71007740BE /* gtest-printers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-printers.h"; sourceTree = "<group>"; };
>+		F67D4F3D1C7F5D8B0017C729 /* gtest-port-arch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-port-arch.h"; sourceTree = "<group>"; };
>+		F67D4F411C7F5DD00017C729 /* gtest-port.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-port.h"; sourceTree = "<group>"; };
>+		F67D4F421C7F5DD00017C729 /* gtest-printers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-printers.h"; sourceTree = "<group>"; };
>+		F67D4F431C7F5DD00017C729 /* gtest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gtest.h; sourceTree = "<group>"; };
> /* End PBXFileReference section */
> 
> /* Begin PBXFrameworksBuildPhase section */
>@@ -284,14 +308,6 @@
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>-		444D117214A2628F009FEC3F /* Frameworks */ = {
>-			isa = PBXFrameworksBuildPhase;
>-			buildActionMask = 2147483647;
>-			files = (
>-				1A0A4C4514B7A3B500895135 /* JavaScriptCore.framework in Frameworks */,
>-			);
>-			runOnlyForDeploymentPostprocessing = 0;
>-		};
> /* End PBXFrameworksBuildPhase section */
> 
> /* Begin PBXGroup section */
>@@ -316,7 +332,6 @@
> 				08FB77ACFE841707C02AAC07 /* Source */,
> 				40D4CF4E0E30F5E200294801 /* Resources */,
> 				403EE37B0E377822004BD1E2 /* Scripts */,
>-				1A0A4C4614B7A3BC00895135 /* Frameworks */,
> 				034768DDFF38A45A11DB9C8B /* Products */,
> 			);
> 			name = gtest;
>@@ -327,24 +342,16 @@
> 			children = (
> 				404884A90E2F7CD900CF7658 /* CHANGES */,
> 				404884AA0E2F7CD900CF7658 /* CONTRIBUTORS */,
>-				404884AB0E2F7CD900CF7658 /* COPYING */,
> 				404883D90E2F799B00CF7658 /* include */,
>-				404883F60E2F799B00CF7658 /* README */,
>+				404884AB0E2F7CD900CF7658 /* LICENSE */,
> 				4089A02F0FFACF84000B29AE /* samples */,
> 				404884070E2F799B00CF7658 /* src */,
> 				3B238BF00E7FE13B00846E11 /* test */,
>+				404883F60E2F799B00CF7658 /* README.md */,
> 			);
> 			name = Source;
> 			sourceTree = "<group>";
> 		};
>-		1A0A4C4614B7A3BC00895135 /* Frameworks */ = {
>-			isa = PBXGroup;
>-			children = (
>-				1A0A4C4414B7A3B500895135 /* JavaScriptCore.framework */,
>-			);
>-			name = Frameworks;
>-			sourceTree = "<group>";
>-		};
> 		3B238BF00E7FE13B00846E11 /* test */ = {
> 			isa = PBXGroup;
> 			children = (
>@@ -379,6 +386,7 @@
> 				404883DB0E2F799B00CF7658 /* gtest-death-test.h */,
> 				404883DC0E2F799B00CF7658 /* gtest-message.h */,
> 				4539C9330EC280AE00A70F4C /* gtest-param-test.h */,
>+				4567C8171264FF71007740BE /* gtest-printers.h */,
> 				404883DD0E2F799B00CF7658 /* gtest-spi.h */,
> 				224A12A20E9EADCC00BD17FD /* gtest-test-part.h */,
> 				3BF6F2A40E79B616000F2EEE /* gtest-typed-test.h */,
>@@ -392,12 +400,14 @@
> 		404883E10E2F799B00CF7658 /* internal */ = {
> 			isa = PBXGroup;
> 			children = (
>+				F67D4F401C7F5DD00017C729 /* custom */,
> 				404883E20E2F799B00CF7658 /* gtest-death-test-internal.h */,
> 				404883E30E2F799B00CF7658 /* gtest-filepath.h */,
> 				404883E40E2F799B00CF7658 /* gtest-internal.h */,
> 				4539C9350EC280E200A70F4C /* gtest-linked_ptr.h */,
> 				4539C9360EC280E200A70F4C /* gtest-param-util-generated.h */,
> 				4539C9370EC280E200A70F4C /* gtest-param-util.h */,
>+				F67D4F3D1C7F5D8B0017C729 /* gtest-port-arch.h */,
> 				404883E50E2F799B00CF7658 /* gtest-port.h */,
> 				404883E60E2F799B00CF7658 /* gtest-string.h */,
> 				40899F4D0FFA7271000B29AE /* gtest-tuple.h */,
>@@ -448,6 +458,16 @@
> 			path = Resources;
> 			sourceTree = "<group>";
> 		};
>+		F67D4F401C7F5DD00017C729 /* custom */ = {
>+			isa = PBXGroup;
>+			children = (
>+				F67D4F411C7F5DD00017C729 /* gtest-port.h */,
>+				F67D4F421C7F5DD00017C729 /* gtest-printers.h */,
>+				F67D4F431C7F5DD00017C729 /* gtest.h */,
>+			);
>+			path = custom;
>+			sourceTree = "<group>";
>+		};
> /* End PBXGroup section */
> 
> /* Begin PBXHeadersBuildPhase section */
>@@ -458,9 +478,14 @@
> 				404884380E2F799B00CF7658 /* gtest-death-test.h in Headers */,
> 				404884390E2F799B00CF7658 /* gtest-message.h in Headers */,
> 				4539C9340EC280AE00A70F4C /* gtest-param-test.h in Headers */,
>+				F67D4F3E1C7F5D8B0017C729 /* gtest-port-arch.h in Headers */,
>+				F67D4F441C7F5DD00017C729 /* gtest-port.h in Headers */,
>+				F67D4F451C7F5DD00017C729 /* gtest-printers.h in Headers */,
>+				4567C8181264FF71007740BE /* gtest-printers.h in Headers */,
> 				4048843A0E2F799B00CF7658 /* gtest-spi.h in Headers */,
> 				224A12A30E9EADCC00BD17FD /* gtest-test-part.h in Headers */,
> 				3BF6F2A50E79B616000F2EEE /* gtest-typed-test.h in Headers */,
>+				F67D4F461C7F5DD00017C729 /* gtest.h in Headers */,
> 				4048843B0E2F799B00CF7658 /* gtest.h in Headers */,
> 				4048843C0E2F799B00CF7658 /* gtest_pred_impl.h in Headers */,
> 				4048843D0E2F799B00CF7658 /* gtest_prod.h in Headers */,
>@@ -577,8 +602,8 @@
> 				8D07F2C10486CC7A007CD1D0 /* Sources */,
> 				8D07F2BD0486CC7A007CD1D0 /* Headers */,
> 				404884A50E2F7C0400CF7658 /* Copy Headers Internal */,
>+				F67D4F471C7F5DF60017C729 /* Copy Headers Internal Custom */,
> 				8D07F2BF0486CC7A007CD1D0 /* Resources */,
>-				444D117214A2628F009FEC3F /* Frameworks */,
> 			);
> 			buildRules = (
> 			);
>@@ -638,9 +663,9 @@
> 			files = (
> 				404884AC0E2F7CD900CF7658 /* CHANGES in Resources */,
> 				404884AD0E2F7CD900CF7658 /* CONTRIBUTORS in Resources */,
>-				404884AE0E2F7CD900CF7658 /* COPYING in Resources */,
> 				40C84978101A36540083642A /* libgtest_main.a in Resources */,
>-				404884500E2F799B00CF7658 /* README in Resources */,
>+				404884AE0E2F7CD900CF7658 /* LICENSE in Resources */,
>+				404884500E2F799B00CF7658 /* README.md in Resources */,
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index e2b377bb8a506163753a41ab6227bfd5e17f599c..4c7e3a57e95ccd58eb695c5d3a2943a78fe10920 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-08-30 Ross Kirsling <ross.kirsling@sony.com>
>+
>+ Update googletest
>+ https://bugs.webkit.org/show_bug.cgi?id=175722
>+
>+ Reviewed by NOBODY (OOPS!).
>+
>+ * TestWebKitAPI/config.h:
>+ Instead of modifying the gtest source, add the necessary WTF includes here.
>+
>+ * TestWebKitAPI/Configurations/Base.xcconfig
>+ Remove obsoleted definitions GTEST_HAS_TR1_TUPLE=0 and GTEST_HAS_RTTI=0.
>+
> 2018-08-30 Thomas Denney <tdenney@apple.com>
> 
> [WHLSL] Fix array indexing behavior
>diff --git a/Tools/TestWebKitAPI/Configurations/Base.xcconfig b/Tools/TestWebKitAPI/Configurations/Base.xcconfig
>index 3c2e59eb6c5d41c3b2f349ffcce528468bcaa25b..3f4bdfbc9b614d27381079ce4602a66e4226c4bf 100644
>--- a/Tools/TestWebKitAPI/Configurations/Base.xcconfig
>+++ b/Tools/TestWebKitAPI/Configurations/Base.xcconfig
>@@ -35,7 +35,7 @@ CLANG_WARN_CXX0X_EXTENSIONS = NO;
> HEADER_SEARCH_PATHS = ${BUILT_PRODUCTS_DIR}/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport;
> 
> GCC_NO_COMMON_BLOCKS = YES;
>-GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) GTEST_HAS_TR1_TUPLE=0 GTEST_HAS_RTTI=0 U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 $(GCC_PREPROCESSOR_DEFINITIONS_$(PLATFORM_NAME));
>+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 $(GCC_PREPROCESSOR_DEFINITIONS_$(PLATFORM_NAME));
> GCC_PREPROCESSOR_DEFINITIONS_macosx = ENABLE_DASHBOARD_SUPPORT;
> DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
> PREBINDING = NO
>diff --git a/Tools/TestWebKitAPI/config.h b/Tools/TestWebKitAPI/config.h
>index edf8a6f1f56b0bedffe84e660ee8ef504c4c52ca..0c2c4ae7bf0e9ce5e987958e54843ed437462246 100644
>--- a/Tools/TestWebKitAPI/config.h
>+++ b/Tools/TestWebKitAPI/config.h
>@@ -57,8 +57,14 @@
> 
> #ifdef __cplusplus
> #include <gtest/gtest.h>
>+#include <wtf/Assertions.h>
>+#undef new
>+#undef delete
>+#include <wtf/FastMalloc.h>
> #endif
> 
>+#include <wtf/DisallowCType.h>
>+
> #ifdef __clang__
> // Finish working around the less strict coding standards of the gtest framework.
> #pragma clang diagnostic pop

Actions: View | Formatted Diff | Diff

Attachments on bug 175722: 320105 | 320249 | 320284 | 348556 | 348561 | 348573 | 348597 | 348700 | 348701 | 348740 | 348741 | 348745