Commit Graph

65 Commits

Author SHA1 Message Date
kosak
b54098a9ab Expand equality failure messages with a by-line diff. 2014-07-28 21:54:50 +00:00
billydonahue
8120f66c32 Push upstream to SVN. 2014-05-15 19:42:15 +00:00
kosak
aa34ae2508 Delete whitespace, and change the return type of ImplicitlyConvertible::MakeFrom() to From&. 2013-12-03 01:36:29 +00:00
zhanyong.wan
2d3543f81d avoids clash with the max() macro on Windows 2013-09-18 17:49:56 +00:00
zhanyong.wan
6a036a5c8c Fixes a nasty issue in gtest's template instantiation. 2013-02-28 23:46:07 +00:00
zhanyong.wan
1b89db9705 Removes an unused variable; also refactors to support an up-coming
googlemock change.
2013-02-28 22:55:25 +00:00
kosak
cc1fdb58ca Removes testing::internal::String::Format(), which causes problems as it truncates the result at 4096 chars. Also update an obsolete link in comment. 2013-02-22 20:10:40 +00:00
zhanyong.wan
65b5c22436 Fixes an out-dated URL. 2013-02-02 18:45:13 +00:00
jgm
87fdda2cf2 Unfortunately, the svn repo is a bit out of date. This commit contains 8
changes that haven't made it to svn. The descriptions of each change are listed
below.

- Fixes some python shebang lines.

- Add ElementsAreArray overloads to gmock. ElementsAreArray now makes a copy of
  its input elements before the conversion to a Matcher. ElementsAreArray can
  now take a vector as input. ElementsAreArray can now take an iterator pair as
  input.

- Templatize MatchAndExplain to allow independent string types for the matcher
  and matchee. I also templatized the ConstCharPointer version of
  MatchAndExplain to avoid calls with "char*" from using the new templated
  MatchAndExplain.

- Fixes the bug where the constructor of the return type of ElementsAre() saves
  a reference instead of a copy of the arguments.

- Extends ElementsAre() to accept arrays whose sizes aren't known.

- Switches gTest's internal FilePath class from testing::internal::String to
  std::string. testing::internal::String was introduced when gTest couldn't
  depend on std::string.  It's now deprecated.

- Switches gTest & gMock from using testing::internal::String objects to
  std::string. Some static methods of String are still in use.  We may be able
  to remove some but not all of them.  In particular, String::Format() should
  eventually be removed as it truncates the result at 4096 characters, often
  causing problems.
2012-11-15 15:47:38 +00:00
vladlosev
b535c1767e Removes obsolete debug code. 2012-09-06 17:09:27 +00:00
zhanyong.wan
a88c9a88e4 Improves gtest's failure messages. In particulars, char pointers and
char arrays are not escapped properly.
2012-06-07 20:34:34 +00:00
vladlosev
cc265df8b4 Fixes broken build on VC++ 7.1. 2011-06-13 19:00:37 +00:00
vladlosev
7e29bb7f7e Adds support for building Google Mock as a shared library (DLL). 2011-05-20 00:38:55 +00:00
vladlosev
ee2f8caecc Simplifies the code by removing condfitional section that is no longer necessary. 2011-05-12 17:32:42 +00:00
zhanyong.wan
c91a353c47 Fixes XL C++ 10.1 compiler errors (based on patch by Hady Zalek); cleans up formatting of GTEST_NO_INLINE_. 2011-04-15 19:50:39 +00:00
zhanyong.wan
6323646e19 fixes XL C++ compiler errors (by Pasi Valminen) 2011-04-08 02:42:59 +00:00
zhanyong.wan
5017fe0090 Fixes compatibility with Sun C++ (by Hady Zalek); fixes compatibility
with Android (by Zachary Vorhies).
2011-03-11 23:05:00 +00:00
zhanyong.wan
5451ffe816 Makes IsContainerTest compatible with Sun C++ and Visual Age C++, based on Hady Zalek's report and experiment; also fixes a bug that causes it to think that a class named const_iterator is a container; also clarifies the Borland C++ compatibility fix in the comments based on Josh Kelley's suggestion. 2011-03-09 01:13:19 +00:00
zhanyong.wan
603533a0a4 Fixes compatibility with Borland C++Builder. Original patch by Josh
Kelley.  Simplified by Zhanyong Wan.
2011-03-05 08:04:01 +00:00
zhanyong.wan
ffeb11d14a Indents preprocessor directives. 2011-02-22 22:08:59 +00:00
vladlosev
9d7455f984 Adds null check for file locations in XML output printer. 2011-02-02 10:07:04 +00:00
zhanyong.wan
9bcf4d0a65 Adds type_param and value_param as <testcase> attributes to the XML
report; also removes the comment() and test_case_comment() fields of
TestInfo.  Proposed and initally implemented by Joey Oravec.
Re-implemented by Vlad Losev.
2011-02-02 00:49:33 +00:00
zhanyong.wan
48b1315108 Fixes GCC 4.6 warnings (patch by Jeffrey Yasskin). 2011-01-10 18:17:59 +00:00
zhanyong.wan
dac3e879c5 Include gtest headers as user headers instead of system headers. 2010-09-14 05:35:59 +00:00
zhanyong.wan
35c3975649 Casts char to unsigned char before calling isspace() etc to avoid undefined behavior (by Zhanyong Wan); removes conditional #includes keyed on GTEST_HAS_PROTOBUF_ (by Zhanyong Wan); publishes GTEST_HAS_STREAM_REDIRECTION (by Vlad Losev); forward declares some classes properly (by Samuel Benzaquen); honors the --gtest_catch_exceptions flag (by Vlad Losev). 2010-08-31 18:21:13 +00:00
zhanyong.wan
7c598c4f1a Adds ADD_FAILURE_AT (by Zhanyong Wan); disables -Wswitch-default (by Vlad Losev). 2010-07-26 21:59:50 +00:00
zhanyong.wan
e2a7f03b80 Allows EXPECT_EQ to accept arguments that don't have operator << (by Zhanyong Wan).
Allows a user to customize how the universal printer prints a pointer of a specific type by overloading << (by Zhanyong Wan).
Works around a bug in Cymbian's C++ compiler (by Vlad Losev).
2010-07-21 22:15:17 +00:00
zhanyong.wan
985a30360c Adds tests for SkipPrefix(). 2010-06-08 22:51:46 +00:00
zhanyong.wan
55d166a222 Adds GTEST_REMOVE_REFERENCE_AND_CONST_. 2010-05-17 19:31:00 +00:00
zhanyong.wan
61baf319bb Suppresses some Clang warnings (by Chandler Carruth, Jeffrey Yasskin, and Zhanyong Wan). 2010-05-10 17:23:54 +00:00
zhanyong.wan
2ccea88c99 Moves the universal printer from gmock to gtest and refactors the cmake script for reusing in gmock (by Vlad Losev). 2010-05-10 17:11:58 +00:00
zhanyong.wan
9f0824b0a6 Adds missing gtest DLL exports. 2010-03-22 21:23:51 +00:00
zhanyong.wan
83589cca34 Supports building gtest as a DLL (by Vlad Losev). 2010-03-05 21:21:06 +00:00
zhanyong.wan
0d27868d0f Simplifies the implementation by using std::vector instead of Vector. 2010-02-25 01:09:07 +00:00
zhanyong.wan
88e97c822c Removes uses of GTEST_HAS_STD_STRING. 2009-12-16 23:34:59 +00:00
zhanyong.wan
44bafcb62d Fixes the "passing non-POD to ellipsis" warning in Sun Studio. Based on Alexander Demin's patch. 2009-12-07 20:45:16 +00:00
zhanyong.wan
891b3716c4 Exposes SkipPrefix s.t. it can be used by gmock (by Vlad Losev). 2009-12-01 19:39:52 +00:00
vladlosev
bad778caa3 Implements support for AssertionResult in Boolean assertions such as EXPECT_TRUE; Fixes Google Tests's tuple implementation to default-initialize its fields in the default constructor (by Zhanyong Wan); Populates gtest_stress_test.cc with actual tests. 2009-10-20 21:03:10 +00:00
zhanyong.wan
f8b268ee86 Makes gtest compile cleanly with MSVC's /W4 (by Zhanyong Wan).
Renames EventListenrs to TestEventListeners (by Zhanyong Wan).
Fixes invalid characters in XML report (by Vlad Losev).
Refacotrs SConscript (by Vlad Losev).
2009-09-30 20:23:50 +00:00
zhanyong.wan
2534ae201e Adds a Random class to support --gtest_shuffle (by Josh Kelley); Makes the scons script build in a deterministic order (by Zhanyong Wan). 2009-09-21 19:42:03 +00:00
zhanyong.wan
e5373af0cb Renames the TestPartResult type enums and adjusts the order of methods in the event listener interface (by Vlad Losev). 2009-09-18 18:16:20 +00:00
zhanyong.wan
12d740faef Makes gtest compile clean with MSVC's warning 4100 (unused formal parameter) enabled. 2009-09-17 05:04:08 +00:00
zhanyong.wan
866f4a9446 Simplifies the implementation of GTEST_LOG_ & GTEST_LOG_; renames
GTEST_HIDE_UNREACHABLE_CODE_ to
GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_ (by Vlad Losev).
2009-09-16 06:59:17 +00:00
zhanyong.wan
16e9dd6e28 More implementation of the event listener interface (by Vlad Losev); Reduces the stack space usage of assertions by moving AssertHelper's fields to the heap (by Jorg Brown); Makes String faster, smaller, and simpler (by Zhanyong Wan); Fixes a bug in String::Format() (by Chandler); Adds the /MD version of VC projects to the distribution (by Vlad Losev). 2009-09-04 18:30:25 +00:00
zhanyong.wan
c214ebc830 More refactoring for the event listener API, by Vlad Losev. 2009-07-16 00:36:55 +00:00
zhanyong.wan
89080477ae Adds color support for TERM=linux (by Alexander Demin); renames List to Vector (by Zhanyong Wan); implements Vector::Erase (by Vlad Losev). 2009-07-13 19:25:02 +00:00
zhanyong.wan
600105ee3a Makes List a random-access data structure. This simplifies the implementation and makes it easier to implement test shuffling. 2009-07-01 22:55:05 +00:00
zhanyong.wan
ef29ce3576 Turns on exceptions when compiling gtest_output_test (by Vlad Losev); moves TestCase to gtest.h to prepare for the event listener API (by Vlad Losev). 2009-06-22 23:29:24 +00:00
zhanyong.wan
4853a50337 Fixes compatibility with Windows CE and Symbian (By Tim Baverstock and Mika). 2009-06-19 17:23:54 +00:00
zhanyong.wan
c78ae6196d Ports gtest to C++Builder, by Josh Kelley. 2009-04-28 00:28:09 +00:00