diff --git a/vendor/README b/vendor/README index 71c29019..0d01bd03 100644 --- a/vendor/README +++ b/vendor/README @@ -1,6 +1,6 @@ This directory contains external projects, taken from the following locations: scrypt: http://www.tarsnap.com/scrypt.html -googletest: https://github.com/google/googletest +googletest: https://github.com/google/googletest/tree/release-1.8.0 spdlog: https://github.com/gabime/spdlog/commit/0c7beb2e36008598cf80d0e8eb8635ac403febb9 - with own fix: https://github.com/cryfs/spdlog/commit/7b8d507615b8075fc6c8793a0965a32a708288c4 gitversion: https://github.com/smessmer/gitversion \ No newline at end of file diff --git a/vendor/googletest/CMakeLists.txt b/vendor/googletest/CMakeLists.txt index 4432149d..cca9e66c 100644 --- a/vendor/googletest/CMakeLists.txt +++ b/vendor/googletest/CMakeLists.txt @@ -4,7 +4,7 @@ if (BUILD_TESTING) # When test cases are build, disable "make install", because this would also install gtest libraries. macro(install) endmacro(install) - add_subdirectory(gtest-1.7.0) + add_subdirectory(gtest-1.8.0) project (googletest) add_library(${PROJECT_NAME} dummy.cpp) diff --git a/vendor/googletest/gtest-1.8.0/.gitignore b/vendor/googletest/gtest-1.8.0/.gitignore new file mode 100644 index 00000000..ce310bc3 --- /dev/null +++ b/vendor/googletest/gtest-1.8.0/.gitignore @@ -0,0 +1,2 @@ +# Ignore CI build directory +build/ diff --git a/vendor/googletest/gtest-1.8.0/.travis.yml b/vendor/googletest/gtest-1.8.0/.travis.yml new file mode 100644 index 00000000..3204dfac --- /dev/null +++ b/vendor/googletest/gtest-1.8.0/.travis.yml @@ -0,0 +1,46 @@ +# Build matrix / environment variable are explained on: +# http://about.travis-ci.org/docs/user/build-configuration/ +# This file can be validated on: +# http://lint.travis-ci.org/ + +install: +# /usr/bin/gcc is 4.6 always, but gcc-X.Y is available. +- if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi +# /usr/bin/clang is 3.4, lets override with modern one. +- if [ "$CXX" = "clang++" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi +- echo ${PATH} +- echo ${CXX} +- ${CXX} --version +- ${CXX} -v +addons: + apt: + # List of whitelisted in travis packages for ubuntu-precise can be found here: + # https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise + # List of whitelisted in travis apt-sources: + # https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.7 + packages: + - gcc-4.9 + - g++-4.9 + - clang-3.7 + - valgrind +os: + - linux + - osx +language: cpp +compiler: + - gcc + - clang +script: ./travis.sh +env: + matrix: + - GTEST_TARGET=googletest SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE_MAKE=true VERBOSE + - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE_MAKE=true VERBOSE + - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug CXX_FLAGS=-std=c++11 VERBOSE_MAKE=true VERBOSE +# - GTEST_TARGET=googletest SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false +# - GTEST_TARGET=googlemock SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false +notifications: + email: false +sudo: false diff --git a/vendor/googletest/gtest-1.7.0/CMakeLists.txt b/vendor/googletest/gtest-1.8.0/CMakeLists.txt similarity index 100% rename from vendor/googletest/gtest-1.7.0/CMakeLists.txt rename to vendor/googletest/gtest-1.8.0/CMakeLists.txt diff --git a/vendor/googletest/gtest-1.7.0/README.md b/vendor/googletest/gtest-1.8.0/README.md similarity index 96% rename from vendor/googletest/gtest-1.7.0/README.md rename to vendor/googletest/gtest-1.8.0/README.md index 20728771..076484e4 100644 --- a/vendor/googletest/gtest-1.7.0/README.md +++ b/vendor/googletest/gtest-1.8.0/README.md @@ -2,6 +2,7 @@ # Google Test # [![Build Status](https://travis-ci.org/google/googletest.svg?branch=master)](https://travis-ci.org/google/googletest) +[![Build status](https://ci.appveyor.com/api/projects/status/4o38plt0xbo1ubc8/branch/master?svg=true)](https://ci.appveyor.com/project/BillyDonahue/googletest/branch/master) Welcome to **Google Test**, Google's C++ test framework! @@ -105,7 +106,7 @@ package (as described below): ### Mac OS X Requirements ### * Mac OS X v10.4 Tiger or newer - * XCode Developer Tools + * Xcode Developer Tools ### Requirements for Contributors ### diff --git a/vendor/googletest/gtest-1.8.0/appveyor.yml b/vendor/googletest/gtest-1.8.0/appveyor.yml new file mode 100644 index 00000000..d613fd60 --- /dev/null +++ b/vendor/googletest/gtest-1.8.0/appveyor.yml @@ -0,0 +1,71 @@ +version: '{build}' + +os: Visual Studio 2015 + +environment: + matrix: + - Toolset: v140 + - Toolset: v120 + - Toolset: v110 + - Toolset: v100 + +platform: + - Win32 + - x64 + +configuration: +# - Release + - Debug + +build: + verbosity: minimal + +artifacts: + - path: '_build/Testing/Temporary/*' + name: test_results + +before_build: +- ps: | + Write-Output "Configuration: $env:CONFIGURATION" + Write-Output "Platform: $env:PLATFORM" + $generator = switch ($env:TOOLSET) + { + "v140" {"Visual Studio 14 2015"} + "v120" {"Visual Studio 12 2013"} + "v110" {"Visual Studio 11 2012"} + "v100" {"Visual Studio 10 2010"} + } + if ($env:PLATFORM -eq "x64") + { + $generator = "$generator Win64" + } + +build_script: +- ps: | + if (($env:TOOLSET -eq "v100") -and ($env:PLATFORM -eq "x64")) + { + return + } + md _build -Force | Out-Null + cd _build + + & cmake -G "$generator" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -Dgtest_build_tests=ON -Dgtest_build_samples=ON -Dgmock_build_tests=ON .. + if ($LastExitCode -ne 0) { + throw "Exec: $ErrorMessage" + } + & cmake --build . --config $env:CONFIGURATION + if ($LastExitCode -ne 0) { + throw "Exec: $ErrorMessage" + } + +test_script: +- ps: | + if (($env:Toolset -eq "v100") -and ($env:PLATFORM -eq "x64")) + { + return + } + + & ctest -C $env:CONFIGURATION --output-on-failure + if ($LastExitCode -ne 0) { + throw "Exec: $ErrorMessage" + } diff --git a/vendor/googletest/gtest-1.7.0/googlemock/CHANGES b/vendor/googletest/gtest-1.8.0/googlemock/CHANGES similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/CHANGES rename to vendor/googletest/gtest-1.8.0/googlemock/CHANGES diff --git a/vendor/googletest/gtest-1.7.0/googlemock/CMakeLists.txt b/vendor/googletest/gtest-1.8.0/googlemock/CMakeLists.txt similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/CMakeLists.txt rename to vendor/googletest/gtest-1.8.0/googlemock/CMakeLists.txt diff --git a/vendor/googletest/gtest-1.7.0/googlemock/CONTRIBUTORS b/vendor/googletest/gtest-1.8.0/googlemock/CONTRIBUTORS similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/CONTRIBUTORS rename to vendor/googletest/gtest-1.8.0/googlemock/CONTRIBUTORS diff --git a/vendor/googletest/gtest-1.7.0/googlemock/LICENSE b/vendor/googletest/gtest-1.8.0/googlemock/LICENSE similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/LICENSE rename to vendor/googletest/gtest-1.8.0/googlemock/LICENSE diff --git a/vendor/googletest/gtest-1.7.0/googlemock/Makefile.am b/vendor/googletest/gtest-1.8.0/googlemock/Makefile.am similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/Makefile.am rename to vendor/googletest/gtest-1.8.0/googlemock/Makefile.am diff --git a/vendor/googletest/gtest-1.7.0/googlemock/README.md b/vendor/googletest/gtest-1.8.0/googlemock/README.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/README.md rename to vendor/googletest/gtest-1.8.0/googlemock/README.md diff --git a/vendor/googletest/gtest-1.7.0/googlemock/build-aux/.keep b/vendor/googletest/gtest-1.8.0/googlemock/build-aux/.keep similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/build-aux/.keep rename to vendor/googletest/gtest-1.8.0/googlemock/build-aux/.keep diff --git a/vendor/googletest/gtest-1.7.0/googlemock/configure.ac b/vendor/googletest/gtest-1.8.0/googlemock/configure.ac similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/configure.ac rename to vendor/googletest/gtest-1.8.0/googlemock/configure.ac diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/CheatSheet.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/CheatSheet.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/CheatSheet.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/CheatSheet.md diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/CookBook.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/CookBook.md similarity index 99% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/CookBook.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/CookBook.md index c215b551..c52f1009 100644 --- a/vendor/googletest/gtest-1.7.0/googlemock/docs/CookBook.md +++ b/vendor/googletest/gtest-1.8.0/googlemock/docs/CookBook.md @@ -2103,7 +2103,7 @@ For better readability, Google Mock also gives you: * `WithArg(action)` (no `s` after `Arg`) when the inner `action` takes _one_ argument. As you may have realized, `InvokeWithoutArgs(...)` is just syntactic -sugar for `WithoutArgs(Inovke(...))`. +sugar for `WithoutArgs(Invoke(...))`. Here are more tips: diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/DesignDoc.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/DesignDoc.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/DesignDoc.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/DesignDoc.md diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/DevGuide.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/DevGuide.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/DevGuide.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/DevGuide.md diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/Documentation.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/Documentation.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/Documentation.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/Documentation.md diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/ForDummies.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/ForDummies.md similarity index 99% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/ForDummies.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/ForDummies.md index e2f362a6..0da4cbe2 100644 --- a/vendor/googletest/gtest-1.7.0/googlemock/docs/ForDummies.md +++ b/vendor/googletest/gtest-1.8.0/googlemock/docs/ForDummies.md @@ -44,7 +44,7 @@ We encourage you to use Google Mock as: * a _testing_ tool to cut your tests' outbound dependencies and probe the interaction between your module and its collaborators. # Getting Started # -Using Google Mock is easy! Inside your C++ source file, just #include `"gtest/gtest.h"` and `"gmock/gmock.h"`, and you are ready to go. +Using Google Mock is easy! Inside your C++ source file, just `#include` `"gtest/gtest.h"` and `"gmock/gmock.h"`, and you are ready to go. # A Case for Mock Turtles # Let's look at an example. Suppose you are developing a graphics program that relies on a LOGO-like API for drawing. How would you test that it does the right thing? Well, you can run it and compare the screen with a golden screen snapshot, but let's admit it: tests like this are expensive to run and fragile (What if you just upgraded to a shiny new graphics card that has better anti-aliasing? Suddenly you have to update all your golden images.). It would be too painful if all your tests are like this. Fortunately, you learned about Dependency Injection and know the right thing to do: instead of having your application talk to the drawing API directly, wrap the API in an interface (say, `Turtle`) and code to that interface: diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/FrequentlyAskedQuestions.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/FrequentlyAskedQuestions.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/FrequentlyAskedQuestions.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/FrequentlyAskedQuestions.md diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/KnownIssues.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/KnownIssues.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/KnownIssues.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/KnownIssues.md diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/v1_5/CheatSheet.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/v1_5/CheatSheet.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/v1_5/CheatSheet.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/v1_5/CheatSheet.md diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/v1_5/CookBook.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/v1_5/CookBook.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/v1_5/CookBook.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/v1_5/CookBook.md diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/v1_5/Documentation.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/v1_5/Documentation.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/v1_5/Documentation.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/v1_5/Documentation.md diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/v1_5/ForDummies.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/v1_5/ForDummies.md similarity index 99% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/v1_5/ForDummies.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/v1_5/ForDummies.md index f389606c..fcc3b561 100644 --- a/vendor/googletest/gtest-1.7.0/googlemock/docs/v1_5/ForDummies.md +++ b/vendor/googletest/gtest-1.8.0/googlemock/docs/v1_5/ForDummies.md @@ -44,7 +44,7 @@ We encourage you to use Google Mock as: * a _testing_ tool to cut your tests' outbound dependencies and probe the interaction between your module and its collaborators. # Getting Started # -Using Google Mock is easy! Inside your C++ source file, just #include `` and ``, and you are ready to go. +Using Google Mock is easy! Inside your C++ source file, just `#include` `` and ``, and you are ready to go. # A Case for Mock Turtles # Let's look at an example. Suppose you are developing a graphics program that relies on a LOGO-like API for drawing. How would you test that it does the right thing? Well, you can run it and compare the screen with a golden screen snapshot, but let's admit it: tests like this are expensive to run and fragile (What if you just upgraded to a shiny new graphics card that has better anti-aliasing? Suddenly you have to update all your golden images.). It would be too painful if all your tests are like this. Fortunately, you learned about Dependency Injection and know the right thing to do: instead of having your application talk to the drawing API directly, wrap the API in an interface (say, `Turtle`) and code to that interface: diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/v1_5/FrequentlyAskedQuestions.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/v1_5/FrequentlyAskedQuestions.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/v1_5/FrequentlyAskedQuestions.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/v1_5/FrequentlyAskedQuestions.md diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/v1_6/CheatSheet.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/v1_6/CheatSheet.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/v1_6/CheatSheet.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/v1_6/CheatSheet.md diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/v1_6/CookBook.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/v1_6/CookBook.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/v1_6/CookBook.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/v1_6/CookBook.md diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/v1_6/Documentation.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/v1_6/Documentation.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/v1_6/Documentation.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/v1_6/Documentation.md diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/v1_6/ForDummies.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/v1_6/ForDummies.md similarity index 99% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/v1_6/ForDummies.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/v1_6/ForDummies.md index 0891b8c4..19ee63ab 100644 --- a/vendor/googletest/gtest-1.7.0/googlemock/docs/v1_6/ForDummies.md +++ b/vendor/googletest/gtest-1.8.0/googlemock/docs/v1_6/ForDummies.md @@ -44,7 +44,7 @@ We encourage you to use Google Mock as: * a _testing_ tool to cut your tests' outbound dependencies and probe the interaction between your module and its collaborators. # Getting Started # -Using Google Mock is easy! Inside your C++ source file, just #include `"gtest/gtest.h"` and `"gmock/gmock.h"`, and you are ready to go. +Using Google Mock is easy! Inside your C++ source file, just `#include` `"gtest/gtest.h"` and `"gmock/gmock.h"`, and you are ready to go. # A Case for Mock Turtles # Let's look at an example. Suppose you are developing a graphics program that relies on a LOGO-like API for drawing. How would you test that it does the right thing? Well, you can run it and compare the screen with a golden screen snapshot, but let's admit it: tests like this are expensive to run and fragile (What if you just upgraded to a shiny new graphics card that has better anti-aliasing? Suddenly you have to update all your golden images.). It would be too painful if all your tests are like this. Fortunately, you learned about Dependency Injection and know the right thing to do: instead of having your application talk to the drawing API directly, wrap the API in an interface (say, `Turtle`) and code to that interface: diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/v1_6/FrequentlyAskedQuestions.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/v1_6/FrequentlyAskedQuestions.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/v1_6/FrequentlyAskedQuestions.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/v1_6/FrequentlyAskedQuestions.md diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/v1_7/CheatSheet.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/v1_7/CheatSheet.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/v1_7/CheatSheet.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/v1_7/CheatSheet.md diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/v1_7/CookBook.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/v1_7/CookBook.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/v1_7/CookBook.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/v1_7/CookBook.md diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/v1_7/Documentation.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/v1_7/Documentation.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/v1_7/Documentation.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/v1_7/Documentation.md diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/v1_7/ForDummies.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/v1_7/ForDummies.md similarity index 99% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/v1_7/ForDummies.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/v1_7/ForDummies.md index 2ed43007..ee03c5b9 100644 --- a/vendor/googletest/gtest-1.7.0/googlemock/docs/v1_7/ForDummies.md +++ b/vendor/googletest/gtest-1.8.0/googlemock/docs/v1_7/ForDummies.md @@ -44,7 +44,7 @@ We encourage you to use Google Mock as: * a _testing_ tool to cut your tests' outbound dependencies and probe the interaction between your module and its collaborators. # Getting Started # -Using Google Mock is easy! Inside your C++ source file, just #include `"gtest/gtest.h"` and `"gmock/gmock.h"`, and you are ready to go. +Using Google Mock is easy! Inside your C++ source file, just `#include` `"gtest/gtest.h"` and `"gmock/gmock.h"`, and you are ready to go. # A Case for Mock Turtles # Let's look at an example. Suppose you are developing a graphics program that relies on a LOGO-like API for drawing. How would you test that it does the right thing? Well, you can run it and compare the screen with a golden screen snapshot, but let's admit it: tests like this are expensive to run and fragile (What if you just upgraded to a shiny new graphics card that has better anti-aliasing? Suddenly you have to update all your golden images.). It would be too painful if all your tests are like this. Fortunately, you learned about Dependency Injection and know the right thing to do: instead of having your application talk to the drawing API directly, wrap the API in an interface (say, `Turtle`) and code to that interface: diff --git a/vendor/googletest/gtest-1.7.0/googlemock/docs/v1_7/FrequentlyAskedQuestions.md b/vendor/googletest/gtest-1.8.0/googlemock/docs/v1_7/FrequentlyAskedQuestions.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/docs/v1_7/FrequentlyAskedQuestions.md rename to vendor/googletest/gtest-1.8.0/googlemock/docs/v1_7/FrequentlyAskedQuestions.md diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-actions.h b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-actions.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-actions.h rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-actions.h diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-cardinalities.h b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-cardinalities.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-cardinalities.h rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-cardinalities.h diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-generated-actions.h b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-generated-actions.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-generated-actions.h rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-generated-actions.h diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-generated-actions.h.pump b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-generated-actions.h.pump similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-generated-actions.h.pump rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-generated-actions.h.pump diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-generated-function-mockers.h b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-generated-function-mockers.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-generated-function-mockers.h rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-generated-function-mockers.h diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-generated-function-mockers.h.pump b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-generated-function-mockers.h.pump similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-generated-function-mockers.h.pump rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-generated-function-mockers.h.pump diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-generated-matchers.h b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-generated-matchers.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-generated-matchers.h rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-generated-matchers.h diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-generated-matchers.h.pump b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-generated-matchers.h.pump similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-generated-matchers.h.pump rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-generated-matchers.h.pump diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-generated-nice-strict.h b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-generated-nice-strict.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-generated-nice-strict.h rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-generated-nice-strict.h diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-generated-nice-strict.h.pump b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-generated-nice-strict.h.pump similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-generated-nice-strict.h.pump rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-generated-nice-strict.h.pump diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-matchers.h b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-matchers.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-matchers.h rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-matchers.h diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-more-actions.h b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-more-actions.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-more-actions.h rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-more-actions.h diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-more-matchers.h b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-more-matchers.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-more-matchers.h rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-more-matchers.h diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-spec-builders.h b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-spec-builders.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock-spec-builders.h rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock-spec-builders.h diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock.h b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/gmock.h rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/gmock.h diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/internal/custom/gmock-matchers.h b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/internal/custom/gmock-matchers.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/internal/custom/gmock-matchers.h rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/internal/custom/gmock-matchers.h diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/internal/custom/gmock-port.h b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/internal/custom/gmock-port.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/internal/custom/gmock-port.h rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/internal/custom/gmock-port.h diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/internal/gmock-generated-internal-utils.h b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/internal/gmock-generated-internal-utils.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/internal/gmock-generated-internal-utils.h rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/internal/gmock-generated-internal-utils.h diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/internal/gmock-internal-utils.h b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/internal/gmock-internal-utils.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/internal/gmock-internal-utils.h rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/internal/gmock-internal-utils.h diff --git a/vendor/googletest/gtest-1.7.0/googlemock/include/gmock/internal/gmock-port.h b/vendor/googletest/gtest-1.8.0/googlemock/include/gmock/internal/gmock-port.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/include/gmock/internal/gmock-port.h rename to vendor/googletest/gtest-1.8.0/googlemock/include/gmock/internal/gmock-port.h diff --git a/vendor/googletest/gtest-1.7.0/googlemock/make/Makefile b/vendor/googletest/gtest-1.8.0/googlemock/make/Makefile similarity index 99% rename from vendor/googletest/gtest-1.7.0/googlemock/make/Makefile rename to vendor/googletest/gtest-1.8.0/googlemock/make/Makefile index c1cc0e90..7c13e05f 100644 --- a/vendor/googletest/gtest-1.7.0/googlemock/make/Makefile +++ b/vendor/googletest/gtest-1.8.0/googlemock/make/Makefile @@ -17,7 +17,7 @@ # Points to the root of Google Test, relative to where this file is. # Remember to tweak this if you move this file, or if you want to use # a copy of Google Test at a different location. -GTEST_DIR = ../gtest +GTEST_DIR = ../../googletest # Points to the root of Google Mock, relative to where this file is. # Remember to tweak this if you move this file. diff --git a/vendor/googletest/gtest-1.7.0/googlemock/msvc/2005/gmock.sln b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2005/gmock.sln similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/msvc/2005/gmock.sln rename to vendor/googletest/gtest-1.8.0/googlemock/msvc/2005/gmock.sln diff --git a/vendor/googletest/gtest-1.7.0/googlemock/msvc/2005/gmock.vcproj b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2005/gmock.vcproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/msvc/2005/gmock.vcproj rename to vendor/googletest/gtest-1.8.0/googlemock/msvc/2005/gmock.vcproj diff --git a/vendor/googletest/gtest-1.7.0/googlemock/msvc/2005/gmock_config.vsprops b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2005/gmock_config.vsprops similarity index 87% rename from vendor/googletest/gtest-1.7.0/googlemock/msvc/2005/gmock_config.vsprops rename to vendor/googletest/gtest-1.8.0/googlemock/msvc/2005/gmock_config.vsprops index 8b65cfb6..875939c1 100644 --- a/vendor/googletest/gtest-1.7.0/googlemock/msvc/2005/gmock_config.vsprops +++ b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2005/gmock_config.vsprops @@ -10,6 +10,6 @@ /> diff --git a/vendor/googletest/gtest-1.7.0/googlemock/msvc/2005/gmock_main.vcproj b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2005/gmock_main.vcproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/msvc/2005/gmock_main.vcproj rename to vendor/googletest/gtest-1.8.0/googlemock/msvc/2005/gmock_main.vcproj diff --git a/vendor/googletest/gtest-1.7.0/googlemock/msvc/2005/gmock_test.vcproj b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2005/gmock_test.vcproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/msvc/2005/gmock_test.vcproj rename to vendor/googletest/gtest-1.8.0/googlemock/msvc/2005/gmock_test.vcproj diff --git a/vendor/googletest/gtest-1.7.0/googlemock/msvc/2010/gmock.sln b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2010/gmock.sln similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/msvc/2010/gmock.sln rename to vendor/googletest/gtest-1.8.0/googlemock/msvc/2010/gmock.sln diff --git a/vendor/googletest/gtest-1.7.0/googlemock/msvc/2010/gmock.vcxproj b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2010/gmock.vcxproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/msvc/2010/gmock.vcxproj rename to vendor/googletest/gtest-1.8.0/googlemock/msvc/2010/gmock.vcxproj diff --git a/vendor/googletest/gtest-1.8.0/googlemock/msvc/2010/gmock_config.props b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2010/gmock_config.props new file mode 100644 index 00000000..441f31cf --- /dev/null +++ b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2010/gmock_config.props @@ -0,0 +1,19 @@ + + + + ../../../googletest + + + <_ProjectFileVersion>10.0.30319.1 + + + + $(GTestDir)/include;%(AdditionalIncludeDirectories) + + + + + $(GTestDir) + + + diff --git a/vendor/googletest/gtest-1.7.0/googlemock/msvc/2010/gmock_main.vcxproj b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2010/gmock_main.vcxproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/msvc/2010/gmock_main.vcxproj rename to vendor/googletest/gtest-1.8.0/googlemock/msvc/2010/gmock_main.vcxproj diff --git a/vendor/googletest/gtest-1.7.0/googlemock/msvc/2010/gmock_test.vcxproj b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2010/gmock_test.vcxproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/msvc/2010/gmock_test.vcxproj rename to vendor/googletest/gtest-1.8.0/googlemock/msvc/2010/gmock_test.vcxproj diff --git a/vendor/googletest/gtest-1.8.0/googlemock/msvc/2015/gmock.sln b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2015/gmock.sln new file mode 100644 index 00000000..c59e07fc --- /dev/null +++ b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2015/gmock.sln @@ -0,0 +1,32 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "gmock.vcxproj", "{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_test", "gmock_test.vcxproj", "{F10D22F8-AC7B-4213-8720-608E7D878CD2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_main", "gmock_main.vcxproj", "{E4EF614B-30DF-4954-8C53-580A0BF6B589}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.ActiveCfg = Debug|Win32 + {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.Build.0 = Debug|Win32 + {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.ActiveCfg = Release|Win32 + {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.Build.0 = Release|Win32 + {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.ActiveCfg = Debug|Win32 + {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.Build.0 = Debug|Win32 + {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.ActiveCfg = Release|Win32 + {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.Build.0 = Release|Win32 + {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.ActiveCfg = Debug|Win32 + {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.Build.0 = Debug|Win32 + {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.ActiveCfg = Release|Win32 + {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/vendor/googletest/gtest-1.8.0/googlemock/msvc/2015/gmock.vcxproj b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2015/gmock.vcxproj new file mode 100644 index 00000000..d5ddd091 --- /dev/null +++ b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2015/gmock.vcxproj @@ -0,0 +1,84 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {34681F0D-CE45-415D-B5F2-5C662DFE3BD5} + gmock + Win32Proj + + + + StaticLibrary + Unicode + true + v140 + + + StaticLibrary + Unicode + v140 + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + + + + Disabled + ..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + + + ..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + + + + $(GTestDir);%(AdditionalIncludeDirectories) + $(GTestDir);%(AdditionalIncludeDirectories) + + + + + + \ No newline at end of file diff --git a/vendor/googletest/gtest-1.7.0/googlemock/msvc/2010/gmock_config.props b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2015/gmock_config.props similarity index 91% rename from vendor/googletest/gtest-1.7.0/googlemock/msvc/2010/gmock_config.props rename to vendor/googletest/gtest-1.8.0/googlemock/msvc/2015/gmock_config.props index bd497f1d..77bc95b1 100644 --- a/vendor/googletest/gtest-1.7.0/googlemock/msvc/2010/gmock_config.props +++ b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2015/gmock_config.props @@ -1,19 +1,19 @@ - - - - ../../gtest - - - <_ProjectFileVersion>10.0.30319.1 - - - - $(GTestDir)/include;%(AdditionalIncludeDirectories) - - - - - $(GTestDir) - - - + + + + ../../../googletest + + + <_ProjectFileVersion>10.0.30319.1 + + + + $(GTestDir)/include;%(AdditionalIncludeDirectories) + + + + + $(GTestDir) + + + diff --git a/vendor/googletest/gtest-1.8.0/googlemock/msvc/2015/gmock_main.vcxproj b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2015/gmock_main.vcxproj new file mode 100644 index 00000000..76cc68b9 --- /dev/null +++ b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2015/gmock_main.vcxproj @@ -0,0 +1,90 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {E4EF614B-30DF-4954-8C53-580A0BF6B589} + gmock_main + Win32Proj + + + + StaticLibrary + Unicode + true + v140 + + + StaticLibrary + Unicode + v140 + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + + + + Disabled + ../../include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + + + ../../include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + + + {34681f0d-ce45-415d-b5f2-5c662dfe3bd5} + true + true + + + + + ../../include;%(AdditionalIncludeDirectories) + ../../include;%(AdditionalIncludeDirectories) + + + + + + \ No newline at end of file diff --git a/vendor/googletest/gtest-1.8.0/googlemock/msvc/2015/gmock_test.vcxproj b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2015/gmock_test.vcxproj new file mode 100644 index 00000000..76ea5534 --- /dev/null +++ b/vendor/googletest/gtest-1.8.0/googlemock/msvc/2015/gmock_test.vcxproj @@ -0,0 +1,103 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {F10D22F8-AC7B-4213-8720-608E7D878CD2} + gmock_test + Win32Proj + + + + Application + Unicode + true + v140 + + + Application + Unicode + v140 + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + true + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + false + + + + /bigobj %(AdditionalOptions) + Disabled + ..\..\include;..\..;$(GTestDir);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + true + Console + MachineX86 + + + + + /bigobj %(AdditionalOptions) + ..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + {e4ef614b-30df-4954-8c53-580a0bf6b589} + true + true + + + + + + + + + \ No newline at end of file diff --git a/vendor/googletest/gtest-1.7.0/googlemock/scripts/fuse_gmock_files.py b/vendor/googletest/gtest-1.8.0/googlemock/scripts/fuse_gmock_files.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/scripts/fuse_gmock_files.py rename to vendor/googletest/gtest-1.8.0/googlemock/scripts/fuse_gmock_files.py diff --git a/vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/LICENSE b/vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/LICENSE similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/LICENSE rename to vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/LICENSE diff --git a/vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/README b/vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/README similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/README rename to vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/README diff --git a/vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/README.cppclean b/vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/README.cppclean similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/README.cppclean rename to vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/README.cppclean diff --git a/vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/cpp/__init__.py b/vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/cpp/__init__.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/cpp/__init__.py rename to vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/cpp/__init__.py diff --git a/vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/cpp/ast.py b/vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/cpp/ast.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/cpp/ast.py rename to vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/cpp/ast.py diff --git a/vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/cpp/gmock_class.py b/vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/cpp/gmock_class.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/cpp/gmock_class.py rename to vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/cpp/gmock_class.py diff --git a/vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/cpp/gmock_class_test.py b/vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/cpp/gmock_class_test.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/cpp/gmock_class_test.py rename to vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/cpp/gmock_class_test.py diff --git a/vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/cpp/keywords.py b/vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/cpp/keywords.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/cpp/keywords.py rename to vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/cpp/keywords.py diff --git a/vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/cpp/tokenize.py b/vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/cpp/tokenize.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/cpp/tokenize.py rename to vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/cpp/tokenize.py diff --git a/vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/cpp/utils.py b/vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/cpp/utils.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/cpp/utils.py rename to vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/cpp/utils.py diff --git a/vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/gmock_gen.py b/vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/gmock_gen.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/scripts/generator/gmock_gen.py rename to vendor/googletest/gtest-1.8.0/googlemock/scripts/generator/gmock_gen.py diff --git a/vendor/googletest/gtest-1.7.0/googlemock/scripts/gmock-config.in b/vendor/googletest/gtest-1.8.0/googlemock/scripts/gmock-config.in similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/scripts/gmock-config.in rename to vendor/googletest/gtest-1.8.0/googlemock/scripts/gmock-config.in diff --git a/vendor/googletest/gtest-1.7.0/googlemock/scripts/gmock_doctor.py b/vendor/googletest/gtest-1.8.0/googlemock/scripts/gmock_doctor.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/scripts/gmock_doctor.py rename to vendor/googletest/gtest-1.8.0/googlemock/scripts/gmock_doctor.py diff --git a/vendor/googletest/gtest-1.7.0/googlemock/scripts/upload.py b/vendor/googletest/gtest-1.8.0/googlemock/scripts/upload.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/scripts/upload.py rename to vendor/googletest/gtest-1.8.0/googlemock/scripts/upload.py diff --git a/vendor/googletest/gtest-1.7.0/googlemock/scripts/upload_gmock.py b/vendor/googletest/gtest-1.8.0/googlemock/scripts/upload_gmock.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/scripts/upload_gmock.py rename to vendor/googletest/gtest-1.8.0/googlemock/scripts/upload_gmock.py diff --git a/vendor/googletest/gtest-1.7.0/googlemock/src/gmock-all.cc b/vendor/googletest/gtest-1.8.0/googlemock/src/gmock-all.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/src/gmock-all.cc rename to vendor/googletest/gtest-1.8.0/googlemock/src/gmock-all.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/src/gmock-cardinalities.cc b/vendor/googletest/gtest-1.8.0/googlemock/src/gmock-cardinalities.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/src/gmock-cardinalities.cc rename to vendor/googletest/gtest-1.8.0/googlemock/src/gmock-cardinalities.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/src/gmock-internal-utils.cc b/vendor/googletest/gtest-1.8.0/googlemock/src/gmock-internal-utils.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/src/gmock-internal-utils.cc rename to vendor/googletest/gtest-1.8.0/googlemock/src/gmock-internal-utils.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/src/gmock-matchers.cc b/vendor/googletest/gtest-1.8.0/googlemock/src/gmock-matchers.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/src/gmock-matchers.cc rename to vendor/googletest/gtest-1.8.0/googlemock/src/gmock-matchers.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/src/gmock-spec-builders.cc b/vendor/googletest/gtest-1.8.0/googlemock/src/gmock-spec-builders.cc similarity index 99% rename from vendor/googletest/gtest-1.7.0/googlemock/src/gmock-spec-builders.cc rename to vendor/googletest/gtest-1.8.0/googlemock/src/gmock-spec-builders.cc index 2b48af13..95513420 100644 --- a/vendor/googletest/gtest-1.7.0/googlemock/src/gmock-spec-builders.cc +++ b/vendor/googletest/gtest-1.8.0/googlemock/src/gmock-spec-builders.cc @@ -258,8 +258,8 @@ void ReportUninterestingCall(CallReaction reaction, const string& msg) { "\nNOTE: You can safely ignore the above warning unless this " "call should not happen. Do not suppress it by blindly adding " "an EXPECT_CALL() if you don't mean to enforce the call. " - "See http://code.google.com/p/googlemock/wiki/CookBook#" - "Knowing_When_to_Expect for details.\n", + "See https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md#" + "knowing-when-to-expect for details.\n", stack_frames_to_skip); break; default: // FAIL diff --git a/vendor/googletest/gtest-1.7.0/googlemock/src/gmock.cc b/vendor/googletest/gtest-1.8.0/googlemock/src/gmock.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/src/gmock.cc rename to vendor/googletest/gtest-1.8.0/googlemock/src/gmock.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/src/gmock_main.cc b/vendor/googletest/gtest-1.8.0/googlemock/src/gmock_main.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/src/gmock_main.cc rename to vendor/googletest/gtest-1.8.0/googlemock/src/gmock_main.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock-actions_test.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock-actions_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock-actions_test.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock-actions_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock-cardinalities_test.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock-cardinalities_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock-cardinalities_test.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock-cardinalities_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock-generated-actions_test.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock-generated-actions_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock-generated-actions_test.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock-generated-actions_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock-generated-function-mockers_test.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock-generated-function-mockers_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock-generated-function-mockers_test.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock-generated-function-mockers_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock-generated-internal-utils_test.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock-generated-internal-utils_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock-generated-internal-utils_test.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock-generated-internal-utils_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock-generated-matchers_test.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock-generated-matchers_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock-generated-matchers_test.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock-generated-matchers_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock-internal-utils_test.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock-internal-utils_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock-internal-utils_test.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock-internal-utils_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock-matchers_test.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock-matchers_test.cc similarity index 99% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock-matchers_test.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock-matchers_test.cc index 78c4c901..9f62c3d8 100644 --- a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock-matchers_test.cc +++ b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock-matchers_test.cc @@ -613,7 +613,7 @@ TEST(MatcherCastTest, FromSameType) { struct ConvertibleFromAny { ConvertibleFromAny(int a_value) : value(a_value) {} template - ConvertibleFromAny(const T& /*a_value*/) : value(-1) { + explicit ConvertibleFromAny(const T& /*a_value*/) : value(-1) { ADD_FAILURE() << "Conversion constructor called"; } int value; @@ -867,11 +867,15 @@ class Unprintable { public: Unprintable() : c_('a') {} - bool operator==(const Unprintable& /* rhs */) { return true; } private: char c_; }; +inline bool operator==(const Unprintable& /* lhs */, + const Unprintable& /* rhs */) { + return true; +} + TEST(EqTest, CanDescribeSelf) { Matcher m = Eq(Unprintable()); EXPECT_EQ("is equal to 1-byte object <61>", Describe(m)); diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock-more-actions_test.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock-more-actions_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock-more-actions_test.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock-more-actions_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock-nice-strict_test.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock-nice-strict_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock-nice-strict_test.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock-nice-strict_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock-port_test.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock-port_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock-port_test.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock-port_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock-spec-builders_test.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock-spec-builders_test.cc similarity index 99% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock-spec-builders_test.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock-spec-builders_test.cc index 342c22f5..59ea87c8 100644 --- a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock-spec-builders_test.cc +++ b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock-spec-builders_test.cc @@ -2117,8 +2117,8 @@ class GMockVerboseFlagTest : public VerboseFlagPreservingFixture { "NOTE: You can safely ignore the above warning unless this " "call should not happen. Do not suppress it by blindly adding " "an EXPECT_CALL() if you don't mean to enforce the call. " - "See http://code.google.com/p/googlemock/wiki/CookBook#" - "Knowing_When_to_Expect for details."; + "See https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md#" + "knowing-when-to-expect for details."; // A void-returning function. CaptureStdout(); diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock_all_test.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock_all_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock_all_test.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock_all_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock_ex_test.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock_ex_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock_ex_test.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock_ex_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock_leak_test.py b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock_leak_test.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock_leak_test.py rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock_leak_test.py diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock_leak_test_.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock_leak_test_.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock_leak_test_.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock_leak_test_.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock_link2_test.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock_link2_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock_link2_test.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock_link2_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock_link_test.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock_link_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock_link_test.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock_link_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock_link_test.h b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock_link_test.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock_link_test.h rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock_link_test.h diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock_output_test.py b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock_output_test.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock_output_test.py rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock_output_test.py diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock_output_test_.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock_output_test_.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock_output_test_.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock_output_test_.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock_output_test_golden.txt b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock_output_test_golden.txt similarity index 94% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock_output_test_golden.txt rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock_output_test_golden.txt index 650a8f07..689d5eeb 100644 --- a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock_output_test_golden.txt +++ b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock_output_test_golden.txt @@ -75,14 +75,14 @@ GMOCK WARNING: Uninteresting mock function call - returning default value. Function call: Bar2(0, 1) Returns: false -NOTE: You can safely ignore the above warning unless this call should not happen. Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call. See http://code.google.com/p/googlemock/wiki/CookBook#Knowing_When_to_Expect for details. +NOTE: You can safely ignore the above warning unless this call should not happen. Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call. See https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md#knowing-when-to-expect for details. [ OK ] GMockOutputTest.UninterestingCall [ RUN ] GMockOutputTest.UninterestingCallToVoidFunction GMOCK WARNING: Uninteresting mock function call - returning directly. Function call: Bar3(0, 1) -NOTE: You can safely ignore the above warning unless this call should not happen. Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call. See http://code.google.com/p/googlemock/wiki/CookBook#Knowing_When_to_Expect for details. +NOTE: You can safely ignore the above warning unless this call should not happen. Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call. See https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md#knowing-when-to-expect for details. [ OK ] GMockOutputTest.UninterestingCallToVoidFunction [ RUN ] GMockOutputTest.RetiredExpectation unknown file: Failure @@ -266,14 +266,14 @@ Uninteresting mock function call - taking default action specified at: FILE:#: Function call: Bar2(2, 2) Returns: true -NOTE: You can safely ignore the above warning unless this call should not happen. Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call. See http://code.google.com/p/googlemock/wiki/CookBook#Knowing_When_to_Expect for details. +NOTE: You can safely ignore the above warning unless this call should not happen. Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call. See https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md#knowing-when-to-expect for details. GMOCK WARNING: Uninteresting mock function call - taking default action specified at: FILE:#: Function call: Bar2(1, 1) Returns: false -NOTE: You can safely ignore the above warning unless this call should not happen. Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call. See http://code.google.com/p/googlemock/wiki/CookBook#Knowing_When_to_Expect for details. +NOTE: You can safely ignore the above warning unless this call should not happen. Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call. See https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md#knowing-when-to-expect for details. [ OK ] GMockOutputTest.UninterestingCallWithDefaultAction [ RUN ] GMockOutputTest.ExplicitActionsRunOutWithDefaultAction diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock_stress_test.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock_stress_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock_stress_test.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock_stress_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock_test.cc b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock_test.cc rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googlemock/test/gmock_test_utils.py b/vendor/googletest/gtest-1.8.0/googlemock/test/gmock_test_utils.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googlemock/test/gmock_test_utils.py rename to vendor/googletest/gtest-1.8.0/googlemock/test/gmock_test_utils.py diff --git a/vendor/googletest/gtest-1.8.0/googletest/.gitignore b/vendor/googletest/gtest-1.8.0/googletest/.gitignore new file mode 100644 index 00000000..4b7be4b9 --- /dev/null +++ b/vendor/googletest/gtest-1.8.0/googletest/.gitignore @@ -0,0 +1,2 @@ +# python +*.pyc diff --git a/vendor/googletest/gtest-1.7.0/googletest/CHANGES b/vendor/googletest/gtest-1.8.0/googletest/CHANGES similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/CHANGES rename to vendor/googletest/gtest-1.8.0/googletest/CHANGES diff --git a/vendor/googletest/gtest-1.7.0/googletest/CMakeLists.txt b/vendor/googletest/gtest-1.8.0/googletest/CMakeLists.txt similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/CMakeLists.txt rename to vendor/googletest/gtest-1.8.0/googletest/CMakeLists.txt diff --git a/vendor/googletest/gtest-1.7.0/googletest/CONTRIBUTORS b/vendor/googletest/gtest-1.8.0/googletest/CONTRIBUTORS similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/CONTRIBUTORS rename to vendor/googletest/gtest-1.8.0/googletest/CONTRIBUTORS diff --git a/vendor/googletest/gtest-1.7.0/googletest/LICENSE b/vendor/googletest/gtest-1.8.0/googletest/LICENSE similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/LICENSE rename to vendor/googletest/gtest-1.8.0/googletest/LICENSE diff --git a/vendor/googletest/gtest-1.7.0/googletest/Makefile.am b/vendor/googletest/gtest-1.8.0/googletest/Makefile.am similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/Makefile.am rename to vendor/googletest/gtest-1.8.0/googletest/Makefile.am diff --git a/vendor/googletest/gtest-1.7.0/googletest/README.md b/vendor/googletest/gtest-1.8.0/googletest/README.md similarity index 99% rename from vendor/googletest/gtest-1.7.0/googletest/README.md rename to vendor/googletest/gtest-1.8.0/googletest/README.md index e0ea1b0f..edd44080 100644 --- a/vendor/googletest/gtest-1.7.0/googletest/README.md +++ b/vendor/googletest/gtest-1.8.0/googletest/README.md @@ -221,7 +221,7 @@ 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 +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. diff --git a/vendor/googletest/gtest-1.7.0/googletest/build-aux/.keep b/vendor/googletest/gtest-1.8.0/googletest/build-aux/.keep similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/build-aux/.keep rename to vendor/googletest/gtest-1.8.0/googletest/build-aux/.keep diff --git a/vendor/googletest/gtest-1.7.0/googletest/cmake/internal_utils.cmake b/vendor/googletest/gtest-1.8.0/googletest/cmake/internal_utils.cmake similarity index 93% rename from vendor/googletest/gtest-1.7.0/googletest/cmake/internal_utils.cmake rename to vendor/googletest/gtest-1.8.0/googletest/cmake/internal_utils.cmake index 93e6dbb7..777b91ed 100644 --- a/vendor/googletest/gtest-1.7.0/googletest/cmake/internal_utils.cmake +++ b/vendor/googletest/gtest-1.8.0/googletest/cmake/internal_utils.cmake @@ -80,6 +80,10 @@ macro(config_compiler_and_linker) # http://stackoverflow.com/questions/3232669 explains the issue. set(cxx_base_flags "${cxx_base_flags} -wd4702") endif() + if (NOT (MSVC_VERSION GREATER 1900)) # 1900 is Visual Studio 2015 + # BigObj required for tests. + set(cxx_base_flags "${cxx_base_flags} -bigobj") + 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") @@ -235,8 +239,16 @@ function(py_test name) # directly bind it from cmake. ${CTEST_CONFIGURATION_TYPE} is known # only at ctest runtime (by calling ctest -c ), so # we have to escape $ to delay variable substitution here. - add_test(${name} - ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py + if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1) + add_test( + NAME ${name} + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py + --build_dir=${CMAKE_CURRENT_BINARY_DIR}/$) + else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1) + add_test( + ${name} + ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py --build_dir=${CMAKE_CURRENT_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE}) + endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1) endif() endfunction() diff --git a/vendor/googletest/gtest-1.7.0/googletest/codegear/gtest.cbproj b/vendor/googletest/gtest-1.8.0/googletest/codegear/gtest.cbproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/codegear/gtest.cbproj rename to vendor/googletest/gtest-1.8.0/googletest/codegear/gtest.cbproj diff --git a/vendor/googletest/gtest-1.7.0/googletest/codegear/gtest.groupproj b/vendor/googletest/gtest-1.8.0/googletest/codegear/gtest.groupproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/codegear/gtest.groupproj rename to vendor/googletest/gtest-1.8.0/googletest/codegear/gtest.groupproj diff --git a/vendor/googletest/gtest-1.7.0/googletest/codegear/gtest_all.cc b/vendor/googletest/gtest-1.8.0/googletest/codegear/gtest_all.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/codegear/gtest_all.cc rename to vendor/googletest/gtest-1.8.0/googletest/codegear/gtest_all.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/codegear/gtest_link.cc b/vendor/googletest/gtest-1.8.0/googletest/codegear/gtest_link.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/codegear/gtest_link.cc rename to vendor/googletest/gtest-1.8.0/googletest/codegear/gtest_link.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/codegear/gtest_main.cbproj b/vendor/googletest/gtest-1.8.0/googletest/codegear/gtest_main.cbproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/codegear/gtest_main.cbproj rename to vendor/googletest/gtest-1.8.0/googletest/codegear/gtest_main.cbproj diff --git a/vendor/googletest/gtest-1.7.0/googletest/codegear/gtest_unittest.cbproj b/vendor/googletest/gtest-1.8.0/googletest/codegear/gtest_unittest.cbproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/codegear/gtest_unittest.cbproj rename to vendor/googletest/gtest-1.8.0/googletest/codegear/gtest_unittest.cbproj diff --git a/vendor/googletest/gtest-1.7.0/googletest/configure.ac b/vendor/googletest/gtest-1.8.0/googletest/configure.ac similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/configure.ac rename to vendor/googletest/gtest-1.8.0/googletest/configure.ac diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/AdvancedGuide.md b/vendor/googletest/gtest-1.8.0/googletest/docs/AdvancedGuide.md similarity index 99% rename from vendor/googletest/gtest-1.7.0/googletest/docs/AdvancedGuide.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/AdvancedGuide.md index 5ad10e10..93a65200 100644 --- a/vendor/googletest/gtest-1.7.0/googletest/docs/AdvancedGuide.md +++ b/vendor/googletest/gtest-1.8.0/googletest/docs/AdvancedGuide.md @@ -312,8 +312,8 @@ want to learn more, see | **Fatal assertion** | **Nonfatal assertion** | **Verifies** | |:--------------------|:-----------------------|:-------------| -| `ASSERT_FLOAT_EQ(`_expected, actual_`);` | `EXPECT_FLOAT_EQ(`_expected, actual_`);` | the two `float` values are almost equal | -| `ASSERT_DOUBLE_EQ(`_expected, actual_`);` | `EXPECT_DOUBLE_EQ(`_expected, actual_`);` | the two `double` values are almost equal | +| `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 two values are within 4 ULP's from each other. @@ -1450,7 +1450,7 @@ two cases to consider: 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` +the entire `.cc` file being tested in your `*_test.cc` file. (`#include`ing `.cc` files is not a good way to reuse code - you should not do this in production code!) @@ -1551,8 +1551,8 @@ exception, you could catch the exception and assert on it. But Google Test doesn't use exceptions, so how do we test that a piece of code generates an expected failure? -`"gtest/gtest-spi.h"` contains some constructs to do this. After -#including this header, you can use +`"gtest/gtest-spi.h"` contains some constructs to do this. After +`#include`ing this header, you can use | `EXPECT_FATAL_FAILURE(`_statement, substring_`);` | |:--------------------------------------------------| @@ -1571,15 +1571,14 @@ For technical reasons, there are some caveats: 1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot reference local non-static variables or non-static members of `this` object. 1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot return a value. -_Note:_ Google Test is designed with threads in mind. Once the +_Note:_ Google Test is designed with threads in mind. Once the synchronization primitives in `"gtest/internal/gtest-port.h"` have been implemented, Google Test will become thread-safe, meaning that -you can then use assertions in multiple threads concurrently. Before - -that, however, Google Test only supports single-threaded usage. Once +you can then use assertions in multiple threads concurrently. Before +that, however, Google Test only supports single-threaded usage. Once thread-safe, `EXPECT_FATAL_FAILURE()` and `EXPECT_NONFATAL_FAILURE()` will capture failures in the current thread only. If _statement_ -creates new threads, failures in these threads will be ignored. If +creates new threads, failures in these threads will be ignored. If you want to capture failures from all threads instead, you should use the following macros: diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/DevGuide.md b/vendor/googletest/gtest-1.8.0/googletest/docs/DevGuide.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/DevGuide.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/DevGuide.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/Documentation.md b/vendor/googletest/gtest-1.8.0/googletest/docs/Documentation.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/Documentation.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/Documentation.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/FAQ.md b/vendor/googletest/gtest-1.8.0/googletest/docs/FAQ.md similarity index 99% rename from vendor/googletest/gtest-1.7.0/googletest/docs/FAQ.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/FAQ.md index 639c2509..5fd6cb72 100644 --- a/vendor/googletest/gtest-1.7.0/googletest/docs/FAQ.md +++ b/vendor/googletest/gtest-1.8.0/googletest/docs/FAQ.md @@ -994,7 +994,7 @@ you can use the _horrible_ hack of sniffing your executable name ## Google Test defines a macro that clashes with one defined by another library. How do I deal with that? ## 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 +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. diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/Primer.md b/vendor/googletest/gtest-1.8.0/googletest/docs/Primer.md similarity index 95% rename from vendor/googletest/gtest-1.7.0/googletest/docs/Primer.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/Primer.md index 9218fd51..474c1d2a 100644 --- a/vendor/googletest/gtest-1.7.0/googletest/docs/Primer.md +++ b/vendor/googletest/gtest-1.8.0/googletest/docs/Primer.md @@ -127,18 +127,14 @@ This section describes assertions that compare two values. | **Fatal assertion** | **Nonfatal assertion** | **Verifies** | |:--------------------|:-----------------------|:-------------| -|`ASSERT_EQ(`_expected_`, `_actual_`);`|`EXPECT_EQ(`_expected_`, `_actual_`);`| _expected_ `==` _actual_ | -|`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_ | +|`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_ | -In the event of a failure, Google Test prints both _val1_ and _val2_ -. In `ASSERT_EQ*` and `EXPECT_EQ*` (and all other equality assertions -we'll introduce later), you should put the expression you want to test -in the position of _actual_, and put its expected value in _expected_, -as Google Test's failure messages are optimized for this convention. +In the event of a failure, Google Test prints both _val1_ and _val2_. Value arguments must be comparable by the assertion's comparison operator or you'll get a compiler error. We used to require the @@ -172,6 +168,10 @@ 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 @@ -179,9 +179,9 @@ two `string` objects, use `EXPECT_EQ`, `EXPECT_NE`, and etc instead. | **Fatal assertion** | **Nonfatal assertion** | **Verifies** | |:--------------------|:-----------------------|:-------------| -| `ASSERT_STREQ(`_expected\_str_`, `_actual\_str_`);` | `EXPECT_STREQ(`_expected\_str_`, `_actual\_str_`);` | the two C strings have the same content | +| `ASSERT_STREQ(`_str1_`, `_str2_`);` | `EXPECT_STREQ(`_str1_`, `_str_2`);` | the two C strings have the same content | | `ASSERT_STRNE(`_str1_`, `_str2_`);` | `EXPECT_STRNE(`_str1_`, `_str2_`);` | the two C strings have different content | -| `ASSERT_STRCASEEQ(`_expected\_str_`, `_actual\_str_`);`| `EXPECT_STRCASEEQ(`_expected\_str_`, `_actual\_str_`);` | the two C strings have the same content, ignoring case | +| `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 content, ignoring case | Note that "CASE" in an assertion name means that case is ignored. diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/PumpManual.md b/vendor/googletest/gtest-1.8.0/googletest/docs/PumpManual.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/PumpManual.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/PumpManual.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/Samples.md b/vendor/googletest/gtest-1.8.0/googletest/docs/Samples.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/Samples.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/Samples.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_5_AdvancedGuide.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_5_AdvancedGuide.md similarity index 99% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_5_AdvancedGuide.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_5_AdvancedGuide.md index 9511f226..34e19c26 100644 --- a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_5_AdvancedGuide.md +++ b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_5_AdvancedGuide.md @@ -1365,7 +1365,7 @@ two cases to consider: 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` +the entire `.cc` file being tested in your `*_test.cc` file. (`#include`ing `.cc` files is not a good way to reuse code - you should not do this in production code!) @@ -1467,7 +1467,7 @@ Test doesn't use exceptions, so how do we test that a piece of code generates an expected failure? `` contains some constructs to do this. After -#including this header, you can use +`#include`ing this header, you can use | `EXPECT_FATAL_FAILURE(`_statement, substring_`);` | |:--------------------------------------------------| diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_5_Documentation.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_5_Documentation.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_5_Documentation.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_5_Documentation.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_5_FAQ.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_5_FAQ.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_5_FAQ.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_5_FAQ.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_5_Primer.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_5_Primer.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_5_Primer.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_5_Primer.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_5_PumpManual.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_5_PumpManual.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_5_PumpManual.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_5_PumpManual.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_5_XcodeGuide.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_5_XcodeGuide.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_5_XcodeGuide.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_5_XcodeGuide.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_6_AdvancedGuide.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_6_AdvancedGuide.md similarity index 99% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_6_AdvancedGuide.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_6_AdvancedGuide.md index 5225341a..78864b16 100644 --- a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_6_AdvancedGuide.md +++ b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_6_AdvancedGuide.md @@ -1447,7 +1447,7 @@ two cases to consider: 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` +the entire `.cc` file being tested in your `*_test.cc` file. (`#include`ing `.cc` files is not a good way to reuse code - you should not do this in production code!) @@ -1549,7 +1549,7 @@ Test doesn't use exceptions, so how do we test that a piece of code generates an expected failure? `"gtest/gtest-spi.h"` contains some constructs to do this. After -#including this header, you can use +`#include`ing this header, you can use | `EXPECT_FATAL_FAILURE(`_statement, substring_`);` | |:--------------------------------------------------| diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_6_Documentation.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_6_Documentation.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_6_Documentation.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_6_Documentation.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_6_FAQ.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_6_FAQ.md similarity index 99% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_6_FAQ.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_6_FAQ.md index 6d5d128a..2b7f7840 100644 --- a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_6_FAQ.md +++ b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_6_FAQ.md @@ -989,7 +989,7 @@ you can use the _horrible_ hack of sniffing your executable name ## Google Test defines a macro that clashes with one defined by another library. How do I deal with that? ## 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 +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. diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_6_Primer.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_6_Primer.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_6_Primer.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_6_Primer.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_6_PumpManual.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_6_PumpManual.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_6_PumpManual.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_6_PumpManual.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_6_Samples.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_6_Samples.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_6_Samples.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_6_Samples.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_6_XcodeGuide.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_6_XcodeGuide.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_6_XcodeGuide.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_6_XcodeGuide.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_7_AdvancedGuide.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_7_AdvancedGuide.md similarity index 99% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_7_AdvancedGuide.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_7_AdvancedGuide.md index 83a8f798..dd4af8f3 100644 --- a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_7_AdvancedGuide.md +++ b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_7_AdvancedGuide.md @@ -1448,7 +1448,7 @@ two cases to consider: 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` +the entire `.cc` file being tested in your `*_test.cc` file. (`#include`ing `.cc` files is not a good way to reuse code - you should not do this in production code!) @@ -1550,7 +1550,7 @@ Test doesn't use exceptions, so how do we test that a piece of code generates an expected failure? `"gtest/gtest-spi.h"` contains some constructs to do this. After -#including this header, you can use +`#include`ing this header, you can use | `EXPECT_FATAL_FAILURE(`_statement, substring_`);` | |:--------------------------------------------------| diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_7_Documentation.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_7_Documentation.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_7_Documentation.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_7_Documentation.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_7_FAQ.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_7_FAQ.md similarity index 99% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_7_FAQ.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_7_FAQ.md index ded1a48b..3dd914dc 100644 --- a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_7_FAQ.md +++ b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_7_FAQ.md @@ -989,7 +989,7 @@ you can use the _horrible_ hack of sniffing your executable name ## Google Test defines a macro that clashes with one defined by another library. How do I deal with that? ## 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 +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. diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_7_Primer.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_7_Primer.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_7_Primer.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_7_Primer.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_7_PumpManual.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_7_PumpManual.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_7_PumpManual.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_7_PumpManual.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_7_Samples.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_7_Samples.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_7_Samples.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_7_Samples.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/V1_7_XcodeGuide.md b/vendor/googletest/gtest-1.8.0/googletest/docs/V1_7_XcodeGuide.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/V1_7_XcodeGuide.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/V1_7_XcodeGuide.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/docs/XcodeGuide.md b/vendor/googletest/gtest-1.8.0/googletest/docs/XcodeGuide.md similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/docs/XcodeGuide.md rename to vendor/googletest/gtest-1.8.0/googletest/docs/XcodeGuide.md diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest-death-test.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest-death-test.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest-death-test.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest-death-test.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest-message.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest-message.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest-message.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest-message.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest-param-test.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest-param-test.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest-param-test.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest-param-test.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest-param-test.h.pump b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest-param-test.h.pump similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest-param-test.h.pump rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest-param-test.h.pump diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest-printers.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest-printers.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest-printers.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest-printers.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest-spi.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest-spi.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest-spi.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest-spi.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest-test-part.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest-test-part.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest-test-part.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest-test-part.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest-typed-test.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest-typed-test.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest-typed-test.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest-typed-test.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest.h similarity index 93% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest.h index 7b59c492..f846c5bd 100644 --- a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest.h +++ b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest.h @@ -1372,39 +1372,38 @@ namespace internal { // frame size of CmpHelperEQ. This helps reduce the overhead of some sanitizers // when calling EXPECT_* in a tight loop. template -AssertionResult CmpHelperEQFailure(const char* expected_expression, - const char* actual_expression, - const T1& expected, const T2& actual) { - return EqFailure(expected_expression, - actual_expression, - FormatForComparisonFailureMessage(expected, actual), - FormatForComparisonFailureMessage(actual, expected), +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 -AssertionResult CmpHelperEQ(const char* expected_expression, - const char* actual_expression, - const T1& expected, - const T2& actual) { +AssertionResult CmpHelperEQ(const char* lhs_expression, + const char* rhs_expression, + const T1& lhs, + const T2& rhs) { GTEST_DISABLE_MSC_WARNINGS_PUSH_(4389 /* signed/unsigned mismatch */) - if (expected == actual) { + if (lhs == rhs) { return AssertionSuccess(); } GTEST_DISABLE_MSC_WARNINGS_POP_() - return CmpHelperEQFailure(expected_expression, actual_expression, expected, - actual); + 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() @@ -1415,12 +1414,11 @@ class EqHelper { public: // This templatized version is for the general case. template - 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 @@ -1429,12 +1427,11 @@ 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); } }; @@ -1449,37 +1446,36 @@ class EqHelper { // EXPECT_EQ(false, a_bool). template static AssertionResult Compare( - const char* expected_expression, - const char* actual_expression, - const T1& expected, - const T2& actual, + 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::value>::type* = 0) { - return CmpHelperEQ(expected_expression, actual_expression, expected, - actual); + 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 static AssertionResult Compare( - const char* expected_expression, - const char* actual_expression, + 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* /* expected (NULL) */, - T* actual) { - // We already know that 'expected' is a null pointer. - return CmpHelperEQ(expected_expression, actual_expression, - static_cast(NULL), actual); + Secret* /* lhs (NULL) */, + T* rhs) { + // We already know that 'lhs' is a null pointer. + return CmpHelperEQ(lhs_expression, rhs_expression, + static_cast(NULL), rhs); } }; @@ -1538,18 +1534,18 @@ GTEST_IMPL_CMP_HELPER_(GT, >); // 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. // @@ -1571,10 +1567,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. // @@ -1632,28 +1628,28 @@ namespace internal { // // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. template -AssertionResult CmpHelperFloatingPointEQ(const char* expected_expression, - const char* actual_expression, - RawType expected, - RawType actual) { - const FloatingPoint lhs(expected), rhs(actual); +AssertionResult CmpHelperFloatingPointEQ(const char* lhs_expression, + const char* rhs_expression, + RawType lhs_value, + RawType rhs_value) { + const FloatingPoint lhs(lhs_value), rhs(rhs_value); if (lhs.AlmostEquals(rhs)) { return AssertionSuccess(); } - ::std::stringstream expected_ss; - expected_ss << std::setprecision(std::numeric_limits::digits10 + 2) - << expected; + ::std::stringstream lhs_ss; + lhs_ss << std::setprecision(std::numeric_limits::digits10 + 2) + << lhs_value; - ::std::stringstream actual_ss; - actual_ss << std::setprecision(std::numeric_limits::digits10 + 2) - << actual; + ::std::stringstream rhs_ss; + rhs_ss << std::setprecision(std::numeric_limits::digits10 + 2) + << rhs_value; - return EqFailure(expected_expression, - actual_expression, - StringStreamToString(&expected_ss), - StringStreamToString(&actual_ss), + return EqFailure(lhs_expression, + rhs_expression, + StringStreamToString(&lhs_ss), + StringStreamToString(&rhs_ss), false); } @@ -1861,13 +1857,13 @@ class TestWithParam : public Test, public WithParamInterface { // AssertionResult. For more information on how to use AssertionResult with // these macros see comments on that class. #define EXPECT_TRUE(condition) \ - GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \ + GTEST_TEST_BOOLEAN_((condition), #condition, false, true, \ GTEST_NONFATAL_FAILURE_) #define EXPECT_FALSE(condition) \ GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \ GTEST_NONFATAL_FAILURE_) #define ASSERT_TRUE(condition) \ - GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \ + GTEST_TEST_BOOLEAN_((condition), #condition, false, true, \ GTEST_FATAL_FAILURE_) #define ASSERT_FALSE(condition) \ GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \ @@ -1879,12 +1875,12 @@ class TestWithParam : public Test, public WithParamInterface { // 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, @@ -1906,8 +1902,8 @@ class TestWithParam : public Test, public WithParamInterface { // 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. // @@ -1923,12 +1919,12 @@ class TestWithParam : public Test, public WithParamInterface { // 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::Compare, \ - expected, actual) -#define EXPECT_NE(expected, actual) \ - EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNE, expected, actual) + EqHelper::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) \ @@ -1938,10 +1934,10 @@ class TestWithParam : public Test, public WithParamInterface { #define EXPECT_GT(val1, val2) \ EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2) -#define GTEST_ASSERT_EQ(expected, actual) \ +#define GTEST_ASSERT_EQ(val1, val2) \ ASSERT_PRED_FORMAT2(::testing::internal:: \ - EqHelper::Compare, \ - expected, actual) + EqHelper::Compare, \ + val1, val2) #define GTEST_ASSERT_NE(val1, val2) \ ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2) #define GTEST_ASSERT_LE(val1, val2) \ @@ -1996,29 +1992,29 @@ class TestWithParam : public Test, public WithParamInterface { // // 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. @@ -2028,21 +2024,21 @@ class TestWithParam : public Test, public WithParamInterface { // 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, \ - expected, actual) + val1, val2) -#define EXPECT_DOUBLE_EQ(expected, actual)\ +#define EXPECT_DOUBLE_EQ(val1, val2)\ EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ, \ - expected, actual) + val1, val2) -#define ASSERT_FLOAT_EQ(expected, actual)\ +#define ASSERT_FLOAT_EQ(val1, val2)\ ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ, \ - expected, actual) + val1, val2) -#define ASSERT_DOUBLE_EQ(expected, actual)\ +#define ASSERT_DOUBLE_EQ(val1, val2)\ ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ, \ - expected, actual) + val1, val2) #define EXPECT_NEAR(val1, val2, abs_error)\ EXPECT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \ diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest_pred_impl.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest_pred_impl.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest_pred_impl.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest_pred_impl.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest_prod.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest_prod.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/gtest_prod.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/gtest_prod.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/custom/gtest-port.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/custom/gtest-port.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/custom/gtest-port.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/custom/gtest-port.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/custom/gtest-printers.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/custom/gtest-printers.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/custom/gtest-printers.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/custom/gtest-printers.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/custom/gtest.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/custom/gtest.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/custom/gtest.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/custom/gtest.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-death-test-internal.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-death-test-internal.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-death-test-internal.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-death-test-internal.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-filepath.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-filepath.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-filepath.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-filepath.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-internal.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-internal.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-internal.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-internal.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-linked_ptr.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-linked_ptr.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-linked_ptr.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-linked_ptr.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-param-util-generated.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-param-util-generated.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-param-util-generated.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-param-util-generated.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-param-util-generated.h.pump b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-param-util-generated.h.pump similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-param-util-generated.h.pump rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-param-util-generated.h.pump diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-param-util.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-param-util.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-param-util.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-param-util.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-port-arch.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-port-arch.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-port-arch.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-port-arch.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-port.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-port.h similarity index 99% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-port.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-port.h index 7d6e4658..0094ed50 100644 --- a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-port.h +++ b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-port.h @@ -2546,10 +2546,9 @@ 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); -const char* StringFromGTestEnv(const char* flag, const char* default_val); +std::string StringFromGTestEnv(const char* flag, const char* default_val); } // namespace internal } // namespace testing #endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_ - diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-string.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-string.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-string.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-string.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-tuple.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-tuple.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-tuple.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-tuple.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-tuple.h.pump b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-tuple.h.pump similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-tuple.h.pump rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-tuple.h.pump diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-type-util.h b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-type-util.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-type-util.h rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-type-util.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-type-util.h.pump b/vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-type-util.h.pump similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/include/gtest/internal/gtest-type-util.h.pump rename to vendor/googletest/gtest-1.8.0/googletest/include/gtest/internal/gtest-type-util.h.pump diff --git a/vendor/googletest/gtest-1.7.0/googletest/m4/acx_pthread.m4 b/vendor/googletest/gtest-1.8.0/googletest/m4/acx_pthread.m4 similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/m4/acx_pthread.m4 rename to vendor/googletest/gtest-1.8.0/googletest/m4/acx_pthread.m4 diff --git a/vendor/googletest/gtest-1.7.0/googletest/m4/gtest.m4 b/vendor/googletest/gtest-1.8.0/googletest/m4/gtest.m4 similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/m4/gtest.m4 rename to vendor/googletest/gtest-1.8.0/googletest/m4/gtest.m4 diff --git a/vendor/googletest/gtest-1.7.0/googletest/make/Makefile b/vendor/googletest/gtest-1.8.0/googletest/make/Makefile similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/make/Makefile rename to vendor/googletest/gtest-1.8.0/googletest/make/Makefile diff --git a/vendor/googletest/gtest-1.7.0/googletest/msvc/gtest-md.sln b/vendor/googletest/gtest-1.8.0/googletest/msvc/gtest-md.sln similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/msvc/gtest-md.sln rename to vendor/googletest/gtest-1.8.0/googletest/msvc/gtest-md.sln diff --git a/vendor/googletest/gtest-1.7.0/googletest/msvc/gtest-md.vcproj b/vendor/googletest/gtest-1.8.0/googletest/msvc/gtest-md.vcproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/msvc/gtest-md.vcproj rename to vendor/googletest/gtest-1.8.0/googletest/msvc/gtest-md.vcproj diff --git a/vendor/googletest/gtest-1.7.0/googletest/msvc/gtest.sln b/vendor/googletest/gtest-1.8.0/googletest/msvc/gtest.sln similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/msvc/gtest.sln rename to vendor/googletest/gtest-1.8.0/googletest/msvc/gtest.sln diff --git a/vendor/googletest/gtest-1.7.0/googletest/msvc/gtest.vcproj b/vendor/googletest/gtest-1.8.0/googletest/msvc/gtest.vcproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/msvc/gtest.vcproj rename to vendor/googletest/gtest-1.8.0/googletest/msvc/gtest.vcproj diff --git a/vendor/googletest/gtest-1.7.0/googletest/msvc/gtest_main-md.vcproj b/vendor/googletest/gtest-1.8.0/googletest/msvc/gtest_main-md.vcproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/msvc/gtest_main-md.vcproj rename to vendor/googletest/gtest-1.8.0/googletest/msvc/gtest_main-md.vcproj diff --git a/vendor/googletest/gtest-1.7.0/googletest/msvc/gtest_main.vcproj b/vendor/googletest/gtest-1.8.0/googletest/msvc/gtest_main.vcproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/msvc/gtest_main.vcproj rename to vendor/googletest/gtest-1.8.0/googletest/msvc/gtest_main.vcproj diff --git a/vendor/googletest/gtest-1.7.0/googletest/msvc/gtest_prod_test-md.vcproj b/vendor/googletest/gtest-1.8.0/googletest/msvc/gtest_prod_test-md.vcproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/msvc/gtest_prod_test-md.vcproj rename to vendor/googletest/gtest-1.8.0/googletest/msvc/gtest_prod_test-md.vcproj diff --git a/vendor/googletest/gtest-1.7.0/googletest/msvc/gtest_prod_test.vcproj b/vendor/googletest/gtest-1.8.0/googletest/msvc/gtest_prod_test.vcproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/msvc/gtest_prod_test.vcproj rename to vendor/googletest/gtest-1.8.0/googletest/msvc/gtest_prod_test.vcproj diff --git a/vendor/googletest/gtest-1.7.0/googletest/msvc/gtest_unittest-md.vcproj b/vendor/googletest/gtest-1.8.0/googletest/msvc/gtest_unittest-md.vcproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/msvc/gtest_unittest-md.vcproj rename to vendor/googletest/gtest-1.8.0/googletest/msvc/gtest_unittest-md.vcproj diff --git a/vendor/googletest/gtest-1.7.0/googletest/msvc/gtest_unittest.vcproj b/vendor/googletest/gtest-1.8.0/googletest/msvc/gtest_unittest.vcproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/msvc/gtest_unittest.vcproj rename to vendor/googletest/gtest-1.8.0/googletest/msvc/gtest_unittest.vcproj diff --git a/vendor/googletest/gtest-1.7.0/googletest/samples/prime_tables.h b/vendor/googletest/gtest-1.8.0/googletest/samples/prime_tables.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/samples/prime_tables.h rename to vendor/googletest/gtest-1.8.0/googletest/samples/prime_tables.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/samples/sample1.cc b/vendor/googletest/gtest-1.8.0/googletest/samples/sample1.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/samples/sample1.cc rename to vendor/googletest/gtest-1.8.0/googletest/samples/sample1.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/samples/sample1.h b/vendor/googletest/gtest-1.8.0/googletest/samples/sample1.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/samples/sample1.h rename to vendor/googletest/gtest-1.8.0/googletest/samples/sample1.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/samples/sample10_unittest.cc b/vendor/googletest/gtest-1.8.0/googletest/samples/sample10_unittest.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/samples/sample10_unittest.cc rename to vendor/googletest/gtest-1.8.0/googletest/samples/sample10_unittest.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/samples/sample1_unittest.cc b/vendor/googletest/gtest-1.8.0/googletest/samples/sample1_unittest.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/samples/sample1_unittest.cc rename to vendor/googletest/gtest-1.8.0/googletest/samples/sample1_unittest.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/samples/sample2.cc b/vendor/googletest/gtest-1.8.0/googletest/samples/sample2.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/samples/sample2.cc rename to vendor/googletest/gtest-1.8.0/googletest/samples/sample2.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/samples/sample2.h b/vendor/googletest/gtest-1.8.0/googletest/samples/sample2.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/samples/sample2.h rename to vendor/googletest/gtest-1.8.0/googletest/samples/sample2.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/samples/sample2_unittest.cc b/vendor/googletest/gtest-1.8.0/googletest/samples/sample2_unittest.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/samples/sample2_unittest.cc rename to vendor/googletest/gtest-1.8.0/googletest/samples/sample2_unittest.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/samples/sample3-inl.h b/vendor/googletest/gtest-1.8.0/googletest/samples/sample3-inl.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/samples/sample3-inl.h rename to vendor/googletest/gtest-1.8.0/googletest/samples/sample3-inl.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/samples/sample3_unittest.cc b/vendor/googletest/gtest-1.8.0/googletest/samples/sample3_unittest.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/samples/sample3_unittest.cc rename to vendor/googletest/gtest-1.8.0/googletest/samples/sample3_unittest.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/samples/sample4.cc b/vendor/googletest/gtest-1.8.0/googletest/samples/sample4.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/samples/sample4.cc rename to vendor/googletest/gtest-1.8.0/googletest/samples/sample4.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/samples/sample4.h b/vendor/googletest/gtest-1.8.0/googletest/samples/sample4.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/samples/sample4.h rename to vendor/googletest/gtest-1.8.0/googletest/samples/sample4.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/samples/sample4_unittest.cc b/vendor/googletest/gtest-1.8.0/googletest/samples/sample4_unittest.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/samples/sample4_unittest.cc rename to vendor/googletest/gtest-1.8.0/googletest/samples/sample4_unittest.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/samples/sample5_unittest.cc b/vendor/googletest/gtest-1.8.0/googletest/samples/sample5_unittest.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/samples/sample5_unittest.cc rename to vendor/googletest/gtest-1.8.0/googletest/samples/sample5_unittest.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/samples/sample6_unittest.cc b/vendor/googletest/gtest-1.8.0/googletest/samples/sample6_unittest.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/samples/sample6_unittest.cc rename to vendor/googletest/gtest-1.8.0/googletest/samples/sample6_unittest.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/samples/sample7_unittest.cc b/vendor/googletest/gtest-1.8.0/googletest/samples/sample7_unittest.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/samples/sample7_unittest.cc rename to vendor/googletest/gtest-1.8.0/googletest/samples/sample7_unittest.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/samples/sample8_unittest.cc b/vendor/googletest/gtest-1.8.0/googletest/samples/sample8_unittest.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/samples/sample8_unittest.cc rename to vendor/googletest/gtest-1.8.0/googletest/samples/sample8_unittest.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/samples/sample9_unittest.cc b/vendor/googletest/gtest-1.8.0/googletest/samples/sample9_unittest.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/samples/sample9_unittest.cc rename to vendor/googletest/gtest-1.8.0/googletest/samples/sample9_unittest.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/scripts/common.py b/vendor/googletest/gtest-1.8.0/googletest/scripts/common.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/scripts/common.py rename to vendor/googletest/gtest-1.8.0/googletest/scripts/common.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/scripts/fuse_gtest_files.py b/vendor/googletest/gtest-1.8.0/googletest/scripts/fuse_gtest_files.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/scripts/fuse_gtest_files.py rename to vendor/googletest/gtest-1.8.0/googletest/scripts/fuse_gtest_files.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/scripts/gen_gtest_pred_impl.py b/vendor/googletest/gtest-1.8.0/googletest/scripts/gen_gtest_pred_impl.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/scripts/gen_gtest_pred_impl.py rename to vendor/googletest/gtest-1.8.0/googletest/scripts/gen_gtest_pred_impl.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/scripts/gtest-config.in b/vendor/googletest/gtest-1.8.0/googletest/scripts/gtest-config.in similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/scripts/gtest-config.in rename to vendor/googletest/gtest-1.8.0/googletest/scripts/gtest-config.in diff --git a/vendor/googletest/gtest-1.7.0/googletest/scripts/pump.py b/vendor/googletest/gtest-1.8.0/googletest/scripts/pump.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/scripts/pump.py rename to vendor/googletest/gtest-1.8.0/googletest/scripts/pump.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/scripts/release_docs.py b/vendor/googletest/gtest-1.8.0/googletest/scripts/release_docs.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/scripts/release_docs.py rename to vendor/googletest/gtest-1.8.0/googletest/scripts/release_docs.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/scripts/test/Makefile b/vendor/googletest/gtest-1.8.0/googletest/scripts/test/Makefile similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/scripts/test/Makefile rename to vendor/googletest/gtest-1.8.0/googletest/scripts/test/Makefile diff --git a/vendor/googletest/gtest-1.7.0/googletest/scripts/upload.py b/vendor/googletest/gtest-1.8.0/googletest/scripts/upload.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/scripts/upload.py rename to vendor/googletest/gtest-1.8.0/googletest/scripts/upload.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/scripts/upload_gtest.py b/vendor/googletest/gtest-1.8.0/googletest/scripts/upload_gtest.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/scripts/upload_gtest.py rename to vendor/googletest/gtest-1.8.0/googletest/scripts/upload_gtest.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/src/gtest-all.cc b/vendor/googletest/gtest-1.8.0/googletest/src/gtest-all.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/src/gtest-all.cc rename to vendor/googletest/gtest-1.8.0/googletest/src/gtest-all.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/src/gtest-death-test.cc b/vendor/googletest/gtest-1.8.0/googletest/src/gtest-death-test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/src/gtest-death-test.cc rename to vendor/googletest/gtest-1.8.0/googletest/src/gtest-death-test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/src/gtest-filepath.cc b/vendor/googletest/gtest-1.8.0/googletest/src/gtest-filepath.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/src/gtest-filepath.cc rename to vendor/googletest/gtest-1.8.0/googletest/src/gtest-filepath.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/src/gtest-internal-inl.h b/vendor/googletest/gtest-1.8.0/googletest/src/gtest-internal-inl.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/src/gtest-internal-inl.h rename to vendor/googletest/gtest-1.8.0/googletest/src/gtest-internal-inl.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/src/gtest-port.cc b/vendor/googletest/gtest-1.8.0/googletest/src/gtest-port.cc similarity index 98% rename from vendor/googletest/gtest-1.7.0/googletest/src/gtest-port.cc rename to vendor/googletest/gtest-1.8.0/googletest/src/gtest-port.cc index 0162fac4..e5bf3dd2 100644 --- a/vendor/googletest/gtest-1.7.0/googletest/src/gtest-port.cc +++ b/vendor/googletest/gtest-1.8.0/googletest/src/gtest-port.cc @@ -1226,13 +1226,33 @@ Int32 Int32FromGTestEnv(const char* flag, Int32 default_value) { // 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) { +std::string StringFromGTestEnv(const char* flag, const char* default_value) { #if defined(GTEST_GET_STRING_FROM_ENV_) return GTEST_GET_STRING_FROM_ENV_(flag, default_value); #endif // defined(GTEST_GET_STRING_FROM_ENV_) const std::string env_var = FlagToEnvVar(flag); - const char* const value = posix::GetEnv(env_var.c_str()); - return value == NULL ? default_value : value; + const char* value = posix::GetEnv(env_var.c_str()); + if (value != NULL) { + return value; + } + + // 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. + // + // The net priority order after flag processing is thus: + // --gtest_output command line flag + // GTEST_OUTPUT environment variable + // XML_OUTPUT_FILE environment variable + // 'default_value' + if (strcmp(flag, "output") == 0) { + value = posix::GetEnv("XML_OUTPUT_FILE"); + if (value != NULL) { + return std::string("xml:") + value; + } + } + return default_value; } } // namespace internal diff --git a/vendor/googletest/gtest-1.7.0/googletest/src/gtest-printers.cc b/vendor/googletest/gtest-1.8.0/googletest/src/gtest-printers.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/src/gtest-printers.cc rename to vendor/googletest/gtest-1.8.0/googletest/src/gtest-printers.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/src/gtest-test-part.cc b/vendor/googletest/gtest-1.8.0/googletest/src/gtest-test-part.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/src/gtest-test-part.cc rename to vendor/googletest/gtest-1.8.0/googletest/src/gtest-test-part.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/src/gtest-typed-test.cc b/vendor/googletest/gtest-1.8.0/googletest/src/gtest-typed-test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/src/gtest-typed-test.cc rename to vendor/googletest/gtest-1.8.0/googletest/src/gtest-typed-test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/src/gtest.cc b/vendor/googletest/gtest-1.8.0/googletest/src/gtest.cc similarity index 98% rename from vendor/googletest/gtest-1.7.0/googletest/src/gtest.cc rename to vendor/googletest/gtest-1.8.0/googletest/src/gtest.cc index 2bac245d..d882ab2e 100644 --- a/vendor/googletest/gtest-1.7.0/googletest/src/gtest.cc +++ b/vendor/googletest/gtest-1.8.0/googletest/src/gtest.cc @@ -1301,41 +1301,41 @@ std::vector SplitEscapedString(const std::string& str) { // 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 std::string& expected_value, - const std::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: " << lhs_expression; + if (lhs_value != lhs_expression) { + msg << "\n Which is: " << lhs_value; + } + msg << "\nTo be equal to: " << rhs_expression; + if (rhs_value != rhs_expression) { + msg << "\n Which is: " << rhs_value; } - msg << "\nExpected: " << expected_expression; if (ignoring_case) { - msg << " (ignoring case)"; - } - if (expected_value != expected_expression) { - msg << "\nWhich is: " << expected_value; + msg << "\nIgnoring case"; } - if (!expected_value.empty() && !actual_value.empty()) { - const std::vector expected_lines = - SplitEscapedString(expected_value); - const std::vector actual_lines = - SplitEscapedString(actual_value); - if (expected_lines.size() > 1 || actual_lines.size() > 1) { + if (!lhs_value.empty() && !rhs_value.empty()) { + const std::vector lhs_lines = + SplitEscapedString(lhs_value); + const std::vector rhs_lines = + SplitEscapedString(rhs_value); + if (lhs_lines.size() > 1 || rhs_lines.size() > 1) { msg << "\nWith diff:\n" - << edit_distance::CreateUnifiedDiff(expected_lines, actual_lines); + << edit_distance::CreateUnifiedDiff(lhs_lines, rhs_lines); } } @@ -1434,18 +1434,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); } @@ -1484,34 +1484,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, - PrintToString(expected), - PrintToString(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, - PrintToString(expected), - PrintToString(actual), + return EqFailure(lhs_expression, + rhs_expression, + PrintToString(lhs), + PrintToString(rhs), true); } @@ -1866,18 +1866,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, - PrintToString(expected), - PrintToString(actual), + return EqFailure(lhs_expression, + rhs_expression, + PrintToString(lhs), + PrintToString(rhs), false); } diff --git a/vendor/googletest/gtest-1.7.0/googletest/src/gtest_main.cc b/vendor/googletest/gtest-1.8.0/googletest/src/gtest_main.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/src/gtest_main.cc rename to vendor/googletest/gtest-1.8.0/googletest/src/gtest_main.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest-death-test_ex_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest-death-test_ex_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest-death-test_ex_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest-death-test_ex_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest-death-test_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest-death-test_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest-death-test_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest-death-test_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest-filepath_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest-filepath_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest-filepath_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest-filepath_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest-linked_ptr_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest-linked_ptr_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest-linked_ptr_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest-linked_ptr_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest-listener_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest-listener_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest-listener_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest-listener_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest-message_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest-message_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest-message_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest-message_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest-options_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest-options_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest-options_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest-options_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest-param-test2_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest-param-test2_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest-param-test2_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest-param-test2_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest-param-test_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest-param-test_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest-param-test_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest-param-test_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest-param-test_test.h b/vendor/googletest/gtest-1.8.0/googletest/test/gtest-param-test_test.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest-param-test_test.h rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest-param-test_test.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest-port_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest-port_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest-port_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest-port_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest-printers_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest-printers_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest-printers_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest-printers_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest-test-part_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest-test-part_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest-test-part_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest-test-part_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest-tuple_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest-tuple_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest-tuple_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest-tuple_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest-typed-test2_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest-typed-test2_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest-typed-test2_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest-typed-test2_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest-typed-test_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest-typed-test_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest-typed-test_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest-typed-test_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest-typed-test_test.h b/vendor/googletest/gtest-1.8.0/googletest/test/gtest-typed-test_test.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest-typed-test_test.h rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest-typed-test_test.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest-unittest-api_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest-unittest-api_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest-unittest-api_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest-unittest-api_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_all_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_all_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_all_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_all_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_break_on_failure_unittest.py b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_break_on_failure_unittest.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_break_on_failure_unittest.py rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_break_on_failure_unittest.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_break_on_failure_unittest_.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_break_on_failure_unittest_.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_break_on_failure_unittest_.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_break_on_failure_unittest_.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_catch_exceptions_test.py b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_catch_exceptions_test.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_catch_exceptions_test.py rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_catch_exceptions_test.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_catch_exceptions_test_.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_catch_exceptions_test_.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_catch_exceptions_test_.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_catch_exceptions_test_.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_color_test.py b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_color_test.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_color_test.py rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_color_test.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_color_test_.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_color_test_.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_color_test_.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_color_test_.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_env_var_test.py b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_env_var_test.py similarity index 86% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_env_var_test.py rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_env_var_test.py index 1fc6ebe5..424075cf 100755 --- a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_env_var_test.py +++ b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_env_var_test.py @@ -87,6 +87,7 @@ class GTestEnvVarTest(gtest_test_utils.TestCase): 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') @@ -98,6 +99,19 @@ class GTestEnvVarTest(gtest_test_utils.TestCase): 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/vendor/googletest/gtest-1.7.0/googletest/test/gtest_env_var_test_.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_env_var_test_.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_env_var_test_.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_env_var_test_.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_environment_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_environment_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_environment_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_environment_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_filter_unittest.py b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_filter_unittest.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_filter_unittest.py rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_filter_unittest.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_filter_unittest_.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_filter_unittest_.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_filter_unittest_.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_filter_unittest_.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_help_test.py b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_help_test.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_help_test.py rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_help_test.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_help_test_.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_help_test_.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_help_test_.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_help_test_.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_list_tests_unittest.py b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_list_tests_unittest.py similarity index 98% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_list_tests_unittest.py rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_list_tests_unittest.py index 925b09d9..f2d2fd1b 100755 --- a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_list_tests_unittest.py +++ b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_list_tests_unittest.py @@ -71,7 +71,7 @@ FooTest\. TypedTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\. TestA TestB -TypedTest/1\. # TypeParam = int\s*\* +TypedTest/1\. # TypeParam = int\s*\*( __ptr64)? TestA TestB TypedTest/2\. # TypeParam = .*MyArray @@ -80,7 +80,7 @@ TypedTest/2\. # TypeParam = .*MyArray My/TypeParamTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\. TestA TestB -My/TypeParamTest/1\. # TypeParam = int\s*\* +My/TypeParamTest/1\. # TypeParam = int\s*\*( __ptr64)? TestA TestB My/TypeParamTest/2\. # TypeParam = .*MyArray diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_list_tests_unittest_.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_list_tests_unittest_.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_list_tests_unittest_.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_list_tests_unittest_.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_main_unittest.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_main_unittest.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_main_unittest.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_main_unittest.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_no_test_unittest.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_no_test_unittest.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_no_test_unittest.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_no_test_unittest.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_output_test.py b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_output_test.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_output_test.py rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_output_test.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_output_test_.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_output_test_.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_output_test_.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_output_test_.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_output_test_golden_lin.txt b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_output_test_golden_lin.txt similarity index 95% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_output_test_golden_lin.txt rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_output_test_golden_lin.txt index 7fff8530..2223d560 100644 --- a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_output_test_golden_lin.txt +++ b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_output_test_golden_lin.txt @@ -5,8 +5,8 @@ Value of: false Actual: false Expected: true gtest_output_test_.cc:#: Failure -Value of: 3 -Expected: 2 + Expected: 2 +To be equal to: 3 [==========] Running 66 tests from 29 test cases. [----------] Global test environment set-up. FooEnvironment::SetUp() called. @@ -34,21 +34,21 @@ BarEnvironment::SetUp() called. [----------] 2 tests from NonfatalFailureTest [ RUN ] NonfatalFailureTest.EscapesStringOperands gtest_output_test_.cc:#: Failure -Value of: actual - Actual: "actual \"string\"" -Expected: kGoldenString -Which is: "\"Line" + Expected: kGoldenString + Which is: "\"Line" +To be equal to: actual + Which is: "actual \"string\"" gtest_output_test_.cc:#: Failure -Value of: actual - Actual: "actual \"string\"" -Expected: golden -Which is: "\"Line" + Expected: golden + Which is: "\"Line" +To be equal to: actual + Which is: "actual \"string\"" [ FAILED ] NonfatalFailureTest.EscapesStringOperands [ RUN ] NonfatalFailureTest.DiffForLongStrings gtest_output_test_.cc:#: Failure -Value of: "Line 2" -Expected: golden_str -Which is: "\"Line\0 1\"\nLine 2" + Expected: golden_str + Which is: "\"Line\0 1\"\nLine 2" +To be equal to: "Line 2" With diff: @@ -1,2 @@ -\"Line\0 1\" @@ -59,16 +59,16 @@ With diff: [ RUN ] FatalFailureTest.FatalFailureInSubroutine (expecting a failure that x should be 1) gtest_output_test_.cc:#: Failure -Value of: x - Actual: 2 -Expected: 1 + Expected: 1 +To be equal to: x + Which is: 2 [ FAILED ] FatalFailureTest.FatalFailureInSubroutine [ RUN ] FatalFailureTest.FatalFailureInNestedSubroutine (expecting a failure that x should be 1) gtest_output_test_.cc:#: Failure -Value of: x - Actual: 2 -Expected: 1 + Expected: 1 +To be equal to: x + Which is: 2 [ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine [ RUN ] FatalFailureTest.NonfatalFailureInSubroutine (expecting a failure on false) @@ -107,39 +107,39 @@ This failure is expected, and shouldn't have a trace. [ RUN ] SCOPED_TRACETest.WorksInLoop (expected to fail) gtest_output_test_.cc:#: Failure -Value of: n - Actual: 1 -Expected: 2 + Expected: 2 +To be equal to: n + Which is: 1 Google Test trace: gtest_output_test_.cc:#: i = 1 gtest_output_test_.cc:#: Failure -Value of: n - Actual: 2 -Expected: 1 + Expected: 1 +To be equal to: n + Which is: 2 Google Test trace: gtest_output_test_.cc:#: i = 2 [ FAILED ] SCOPED_TRACETest.WorksInLoop [ RUN ] SCOPED_TRACETest.WorksInSubroutine (expected to fail) gtest_output_test_.cc:#: Failure -Value of: n - Actual: 1 -Expected: 2 + Expected: 2 +To be equal to: n + Which is: 1 Google Test trace: gtest_output_test_.cc:#: n = 1 gtest_output_test_.cc:#: Failure -Value of: n - Actual: 2 -Expected: 1 + Expected: 1 +To be equal to: n + Which is: 2 Google Test trace: gtest_output_test_.cc:#: n = 2 [ FAILED ] SCOPED_TRACETest.WorksInSubroutine [ RUN ] SCOPED_TRACETest.CanBeNested (expected to fail) gtest_output_test_.cc:#: Failure -Value of: n - Actual: 2 -Expected: 1 + Expected: 1 +To be equal to: n + Which is: 2 Google Test trace: gtest_output_test_.cc:#: n = 2 gtest_output_test_.cc:#: @@ -437,9 +437,9 @@ Expected: 1 fatal failure [ OK ] TypedTest/0.Success [ RUN ] TypedTest/0.Failure gtest_output_test_.cc:#: Failure -Value of: TypeParam() - Actual: 0 -Expected: 1 + Expected: 1 +To be equal to: TypeParam() + Which is: 0 Expected failure [ FAILED ] TypedTest/0.Failure, where TypeParam = int [----------] 2 tests from Unsigned/TypedTestP/0, where TypeParam = unsigned char @@ -447,10 +447,10 @@ Expected failure [ OK ] Unsigned/TypedTestP/0.Success [ RUN ] Unsigned/TypedTestP/0.Failure gtest_output_test_.cc:#: Failure -Value of: TypeParam() - Actual: '\0' -Expected: 1U -Which is: 1 + Expected: 1U + Which is: 1 +To be equal to: TypeParam() + Which is: '\0' Expected failure [ FAILED ] Unsigned/TypedTestP/0.Failure, where TypeParam = unsigned char [----------] 2 tests from Unsigned/TypedTestP/1, where TypeParam = unsigned int @@ -458,10 +458,10 @@ Expected failure [ OK ] Unsigned/TypedTestP/1.Success [ RUN ] Unsigned/TypedTestP/1.Failure gtest_output_test_.cc:#: Failure -Value of: TypeParam() - Actual: 0 -Expected: 1U -Which is: 1 + Expected: 1U + Which is: 1 +To be equal to: TypeParam() + Which is: 0 Expected failure [ FAILED ] Unsigned/TypedTestP/1.Failure, where TypeParam = unsigned int [----------] 4 tests from ExpectFailureTest @@ -597,18 +597,18 @@ Expected non-fatal failure. [----------] 1 test from PrintingFailingParams/FailingParamTest [ RUN ] PrintingFailingParams/FailingParamTest.Fails/0 gtest_output_test_.cc:#: Failure -Value of: GetParam() - Actual: 2 -Expected: 1 + Expected: 1 +To be equal to: GetParam() + Which is: 2 [ FAILED ] PrintingFailingParams/FailingParamTest.Fails/0, where GetParam() = 2 [----------] 2 tests from PrintingStrings/ParamTest [ RUN ] PrintingStrings/ParamTest.Success/a [ OK ] PrintingStrings/ParamTest.Success/a [ RUN ] PrintingStrings/ParamTest.Failure/a gtest_output_test_.cc:#: Failure -Value of: GetParam() - Actual: "a" -Expected: "b" + Expected: "b" +To be equal to: GetParam() + Which is: "a" Expected failure [ FAILED ] PrintingStrings/ParamTest.Failure/a, where GetParam() = "a" [----------] Global test environment tear-down @@ -678,16 +678,16 @@ Expected fatal failure. [ RUN ] FatalFailureTest.FatalFailureInSubroutine (expecting a failure that x should be 1) gtest_output_test_.cc:#: Failure -Value of: x - Actual: 2 -Expected: 1 + Expected: 1 +To be equal to: x + Which is: 2 [ 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 + Expected: 1 +To be equal to: x + Which is: 2 [ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine (? ms) [ RUN ] FatalFailureTest.NonfatalFailureInSubroutine (expecting a failure on false) diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_pred_impl_unittest.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_pred_impl_unittest.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_pred_impl_unittest.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_pred_impl_unittest.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_premature_exit_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_premature_exit_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_premature_exit_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_premature_exit_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_prod_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_prod_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_prod_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_prod_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_repeat_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_repeat_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_repeat_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_repeat_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_shuffle_test.py b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_shuffle_test.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_shuffle_test.py rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_shuffle_test.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_shuffle_test_.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_shuffle_test_.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_shuffle_test_.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_shuffle_test_.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_sole_header_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_sole_header_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_sole_header_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_sole_header_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_stress_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_stress_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_stress_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_stress_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_test_utils.py b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_test_utils.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_test_utils.py rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_test_utils.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_throw_on_failure_ex_test.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_throw_on_failure_ex_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_throw_on_failure_ex_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_throw_on_failure_ex_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_throw_on_failure_test.py b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_throw_on_failure_test.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_throw_on_failure_test.py rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_throw_on_failure_test.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_throw_on_failure_test_.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_throw_on_failure_test_.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_throw_on_failure_test_.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_throw_on_failure_test_.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_uninitialized_test.py b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_uninitialized_test.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_uninitialized_test.py rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_uninitialized_test.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_uninitialized_test_.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_uninitialized_test_.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_uninitialized_test_.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_uninitialized_test_.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_unittest.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_unittest.cc similarity index 99% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_unittest.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_unittest.cc index 355252fc..88e94134 100644 --- a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_unittest.cc +++ b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_unittest.cc @@ -2466,7 +2466,7 @@ TEST(StringAssertionTest, ASSERT_STRCASEEQ) { ASSERT_STRCASEEQ("", ""); EXPECT_FATAL_FAILURE(ASSERT_STRCASEEQ("Hi", "hi2"), - "(ignoring case)"); + "Ignoring case"); } // Tests ASSERT_STRCASENE. @@ -3260,7 +3260,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_); } @@ -3528,35 +3528,35 @@ TEST(AssertionTest, EqFailure) { 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: foo\n" + " Which is: 5\n" + "To be equal to: bar\n" + " Which is: 6", msg1.c_str()); 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: foo\n" + " Which is: 5\n" + "To be equal to: 6", msg2.c_str()); 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: 5\n" + "To be equal to: bar\n" + " Which is: 6", msg3.c_str()); const std::string msg4( EqFailure("5", "6", foo_val, bar_val, false).failure_message()); EXPECT_STREQ( - "Value of: 6\n" - "Expected: 5", + " Expected: 5\n" + "To be equal to: 6", msg4.c_str()); const std::string msg5( @@ -3564,10 +3564,11 @@ TEST(AssertionTest, EqFailure) { 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: foo\n" + " Which is: \"x\"\n" + "To be equal to: bar\n" + " Which is: \"y\"\n" + "Ignoring case", msg5.c_str()); } @@ -3579,11 +3580,11 @@ TEST(AssertionTest, EqFailureWithDiff) { const std::string msg1( EqFailure("left", "right", left, right, false).failure_message()); EXPECT_STREQ( - "Value of: right\n" - " Actual: 1\\n2\\n3\\n4\\n5\\n6\\n7\\n8\\n9\\n11\\n12\\n13\\n14\n" - "Expected: left\n" - "Which is: " + " Expected: left\n" + " Which is: " "1\\n2XXX\\n3\\n5\\n6\\n7\\n8\\n9\\n10\\n11\\n12XXX\\n13\\n14\\n15\n" + "To be equal to: 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()); @@ -3678,9 +3679,9 @@ 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: 5\n" + "To be equal to: 2*3\n" + " Which is: 6"); } // Tests ASSERT_EQ(NULL, pointer). @@ -3697,7 +3698,7 @@ TEST(AssertionTest, ASSERT_EQ_NULL) { // A failure. static int n = 0; EXPECT_FATAL_FAILURE(ASSERT_EQ(NULL, &n), - "Value of: &n\n"); + "To be equal to: &n\n"); } #endif // GTEST_CAN_COMPARE_NULL @@ -3812,7 +3813,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"); + "To be equal to: x"); } // An uncopyable class. @@ -3861,7 +3862,7 @@ 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: x\n Which is: 5\nTo be equal to: y\n Which is: -1"); } // Tests that uncopyable objects can be used in expects. @@ -3873,7 +3874,7 @@ 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: x\n Which is: 5\nTo be equal to: y\n Which is: -1"); } enum NamedEnum { @@ -3885,7 +3886,7 @@ 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), "Actual: 1"); + 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 @@ -3949,9 +3950,9 @@ TEST(AssertionTest, AnonymousEnum) { // ICE's in C++Builder. EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseB), - "Value of: kCaseB"); + "To be equal to: kCaseB"); EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseC), - "Actual: 42"); + "Which is: 42"); # endif EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseC), @@ -4389,9 +4390,9 @@ TEST(ExpectTest, ExpectFalseWithAssertionResult) { 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: 5\n" + "To be equal to: 2*3\n" + " Which is: 6"); EXPECT_NONFATAL_FAILURE(EXPECT_EQ(5, 2 - 3), "2 - 3"); } @@ -4422,7 +4423,7 @@ TEST(ExpectTest, EXPECT_EQ_NULL) { // A failure. int n = 0; EXPECT_NONFATAL_FAILURE(EXPECT_EQ(NULL, &n), - "Value of: &n\n"); + "To be equal to: &n\n"); } #endif // GTEST_CAN_COMPARE_NULL @@ -4538,7 +4539,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"); + "To be equal to: true && false"); } @@ -4685,7 +4686,7 @@ TEST(EqAssertionTest, Bool) { EXPECT_FATAL_FAILURE({ bool false_value = false; ASSERT_EQ(false_value, true); - }, "Value of: true"); + }, "To be equal to: true"); } // Tests using int values in {EXPECT|ASSERT}_EQ. @@ -4719,10 +4720,10 @@ 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: L'\0'\n" + " Which is: L'\0' (0, 0x0)\n" + "To be equal to: L'x'\n" + " Which is: L'x' (120, 0x78)"); static wchar_t wchar; wchar = L'b'; @@ -4730,7 +4731,7 @@ TEST(EqAssertionTest, WideChar) { "wchar"); wchar = 0x8119; EXPECT_FATAL_FAILURE(ASSERT_EQ(static_cast(0x8120), wchar), - "Value of: wchar"); + "To be equal to: wchar"); } // Tests using ::std::string values in {EXPECT|ASSERT}_EQ. @@ -4759,8 +4760,8 @@ 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\""); + "To be equal to: str3\n" + " Which is: \"A \\0 in the middle\""); } #if GTEST_HAS_STD_WSTRING @@ -4880,7 +4881,7 @@ TEST(EqAssertionTest, CharPointer) { ASSERT_EQ(p1, p1); EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p0, p2), - "Value of: p2"); + "To be equal to: p2"); EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p1, p2), "p2"); EXPECT_FATAL_FAILURE(ASSERT_EQ(reinterpret_cast(0x1234), @@ -4902,7 +4903,7 @@ TEST(EqAssertionTest, WideCharPointer) { EXPECT_EQ(p0, p0); EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p0, p2), - "Value of: p2"); + "To be equal to: p2"); EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p1, p2), "p2"); void* pv3 = (void*)0x1234; // NOLINT diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_xml_outfile1_test_.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_xml_outfile1_test_.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_xml_outfile1_test_.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_xml_outfile1_test_.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_xml_outfile2_test_.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_xml_outfile2_test_.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_xml_outfile2_test_.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_xml_outfile2_test_.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_xml_outfiles_test.py b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_xml_outfiles_test.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_xml_outfiles_test.py rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_xml_outfiles_test.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_xml_output_unittest.py b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_xml_output_unittest.py similarity index 95% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_xml_output_unittest.py rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_xml_output_unittest.py index e77be3d3..bcd59759 100755 --- a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_xml_output_unittest.py +++ b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_xml_output_unittest.py @@ -64,20 +64,20 @@ EXPECTED_NON_EMPTY_XML = """ - + - - + + diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_xml_output_unittest_.cc b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_xml_output_unittest_.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_xml_output_unittest_.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_xml_output_unittest_.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/gtest_xml_test_utils.py b/vendor/googletest/gtest-1.8.0/googletest/test/gtest_xml_test_utils.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/gtest_xml_test_utils.py rename to vendor/googletest/gtest-1.8.0/googletest/test/gtest_xml_test_utils.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/production.cc b/vendor/googletest/gtest-1.8.0/googletest/test/production.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/production.cc rename to vendor/googletest/gtest-1.8.0/googletest/test/production.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/test/production.h b/vendor/googletest/gtest-1.8.0/googletest/test/production.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/test/production.h rename to vendor/googletest/gtest-1.8.0/googletest/test/production.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/xcode/Config/DebugProject.xcconfig b/vendor/googletest/gtest-1.8.0/googletest/xcode/Config/DebugProject.xcconfig similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/xcode/Config/DebugProject.xcconfig rename to vendor/googletest/gtest-1.8.0/googletest/xcode/Config/DebugProject.xcconfig diff --git a/vendor/googletest/gtest-1.7.0/googletest/xcode/Config/FrameworkTarget.xcconfig b/vendor/googletest/gtest-1.8.0/googletest/xcode/Config/FrameworkTarget.xcconfig similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/xcode/Config/FrameworkTarget.xcconfig rename to vendor/googletest/gtest-1.8.0/googletest/xcode/Config/FrameworkTarget.xcconfig diff --git a/vendor/googletest/gtest-1.7.0/googletest/xcode/Config/General.xcconfig b/vendor/googletest/gtest-1.8.0/googletest/xcode/Config/General.xcconfig similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/xcode/Config/General.xcconfig rename to vendor/googletest/gtest-1.8.0/googletest/xcode/Config/General.xcconfig diff --git a/vendor/googletest/gtest-1.7.0/googletest/xcode/Config/ReleaseProject.xcconfig b/vendor/googletest/gtest-1.8.0/googletest/xcode/Config/ReleaseProject.xcconfig similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/xcode/Config/ReleaseProject.xcconfig rename to vendor/googletest/gtest-1.8.0/googletest/xcode/Config/ReleaseProject.xcconfig diff --git a/vendor/googletest/gtest-1.7.0/googletest/xcode/Config/StaticLibraryTarget.xcconfig b/vendor/googletest/gtest-1.8.0/googletest/xcode/Config/StaticLibraryTarget.xcconfig similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/xcode/Config/StaticLibraryTarget.xcconfig rename to vendor/googletest/gtest-1.8.0/googletest/xcode/Config/StaticLibraryTarget.xcconfig diff --git a/vendor/googletest/gtest-1.7.0/googletest/xcode/Config/TestTarget.xcconfig b/vendor/googletest/gtest-1.8.0/googletest/xcode/Config/TestTarget.xcconfig similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/xcode/Config/TestTarget.xcconfig rename to vendor/googletest/gtest-1.8.0/googletest/xcode/Config/TestTarget.xcconfig diff --git a/vendor/googletest/gtest-1.7.0/googletest/xcode/Resources/Info.plist b/vendor/googletest/gtest-1.8.0/googletest/xcode/Resources/Info.plist similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/xcode/Resources/Info.plist rename to vendor/googletest/gtest-1.8.0/googletest/xcode/Resources/Info.plist diff --git a/vendor/googletest/gtest-1.7.0/googletest/xcode/Samples/FrameworkSample/Info.plist b/vendor/googletest/gtest-1.8.0/googletest/xcode/Samples/FrameworkSample/Info.plist similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/xcode/Samples/FrameworkSample/Info.plist rename to vendor/googletest/gtest-1.8.0/googletest/xcode/Samples/FrameworkSample/Info.plist diff --git a/vendor/googletest/gtest-1.7.0/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj b/vendor/googletest/gtest-1.8.0/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj rename to vendor/googletest/gtest-1.8.0/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj diff --git a/vendor/googletest/gtest-1.7.0/googletest/xcode/Samples/FrameworkSample/runtests.sh b/vendor/googletest/gtest-1.8.0/googletest/xcode/Samples/FrameworkSample/runtests.sh similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/xcode/Samples/FrameworkSample/runtests.sh rename to vendor/googletest/gtest-1.8.0/googletest/xcode/Samples/FrameworkSample/runtests.sh diff --git a/vendor/googletest/gtest-1.7.0/googletest/xcode/Samples/FrameworkSample/widget.cc b/vendor/googletest/gtest-1.8.0/googletest/xcode/Samples/FrameworkSample/widget.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/xcode/Samples/FrameworkSample/widget.cc rename to vendor/googletest/gtest-1.8.0/googletest/xcode/Samples/FrameworkSample/widget.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/xcode/Samples/FrameworkSample/widget.h b/vendor/googletest/gtest-1.8.0/googletest/xcode/Samples/FrameworkSample/widget.h similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/xcode/Samples/FrameworkSample/widget.h rename to vendor/googletest/gtest-1.8.0/googletest/xcode/Samples/FrameworkSample/widget.h diff --git a/vendor/googletest/gtest-1.7.0/googletest/xcode/Samples/FrameworkSample/widget_test.cc b/vendor/googletest/gtest-1.8.0/googletest/xcode/Samples/FrameworkSample/widget_test.cc similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/xcode/Samples/FrameworkSample/widget_test.cc rename to vendor/googletest/gtest-1.8.0/googletest/xcode/Samples/FrameworkSample/widget_test.cc diff --git a/vendor/googletest/gtest-1.7.0/googletest/xcode/Scripts/runtests.sh b/vendor/googletest/gtest-1.8.0/googletest/xcode/Scripts/runtests.sh similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/xcode/Scripts/runtests.sh rename to vendor/googletest/gtest-1.8.0/googletest/xcode/Scripts/runtests.sh diff --git a/vendor/googletest/gtest-1.7.0/googletest/xcode/Scripts/versiongenerate.py b/vendor/googletest/gtest-1.8.0/googletest/xcode/Scripts/versiongenerate.py similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/xcode/Scripts/versiongenerate.py rename to vendor/googletest/gtest-1.8.0/googletest/xcode/Scripts/versiongenerate.py diff --git a/vendor/googletest/gtest-1.7.0/googletest/xcode/gtest.xcodeproj/project.pbxproj b/vendor/googletest/gtest-1.8.0/googletest/xcode/gtest.xcodeproj/project.pbxproj similarity index 100% rename from vendor/googletest/gtest-1.7.0/googletest/xcode/gtest.xcodeproj/project.pbxproj rename to vendor/googletest/gtest-1.8.0/googletest/xcode/gtest.xcodeproj/project.pbxproj diff --git a/vendor/googletest/gtest-1.7.0/travis.sh b/vendor/googletest/gtest-1.8.0/travis.sh similarity index 89% rename from vendor/googletest/gtest-1.7.0/travis.sh rename to vendor/googletest/gtest-1.8.0/travis.sh index 20fe3e39..bdecbd96 100755 --- a/vendor/googletest/gtest-1.7.0/travis.sh +++ b/vendor/googletest/gtest-1.8.0/travis.sh @@ -12,4 +12,4 @@ cmake -Dgtest_build_samples=ON \ -DCMAKE_CXX_FLAGS=$CXX_FLAGS \ ../../$GTEST_TARGET make -make test +CTEST_OUTPUT_ON_FAILURE=1 make test