Re: [PATCH xorg-gtest 1/2] gtest: add gtest-spi.h header

2012-11-08 Thread Chase Douglas
On Tue, Nov 6, 2012 at 7:57 PM, Peter Hutterer wrote:

> This header is for self-testing, specifically EXPECT_FATAL_FAILURE
>
> Signed-off-by: Peter Hutterer 
> ---
>  gtest/include/Makefile.am   |   2 +-
>  gtest/include/gtest/gtest-spi.h | 232
> 
>  2 files changed, 233 insertions(+), 1 deletion(-)
>  create mode 100644 gtest/include/gtest/gtest-spi.h
>
> diff --git a/gtest/include/Makefile.am b/gtest/include/Makefile.am
> index 54d3088..6456b01 100644
> --- a/gtest/include/Makefile.am
> +++ b/gtest/include/Makefile.am
> @@ -22,4 +22,4 @@
>  # SOFTWARE.
>  #
>
> -nobase_include_HEADERS = gtest/gtest.h
> +nobase_include_HEADERS = gtest/gtest.h gtest/gtest-spi.h
> diff --git a/gtest/include/gtest/gtest-spi.h
> b/gtest/include/gtest/gtest-spi.h
> new file mode 100644
> index 000..f63fa9a
> --- /dev/null
> +++ b/gtest/include/gtest/gtest-spi.h
> @@ -0,0 +1,232 @@
> +// Copyright 2007, Google Inc.
> +// All rights reserved.
> +//
> +// Redistribution and use in source and binary forms, with or without
> +// modification, are permitted provided that the following conditions are
> +// met:
> +//
> +// * Redistributions of source code must retain the above copyright
> +// notice, this list of conditions and the following disclaimer.
> +// * Redistributions in binary form must reproduce the above
> +// copyright notice, this list of conditions and the following disclaimer
> +// in the documentation and/or other materials provided with the
> +// distribution.
> +// * Neither the name of Google Inc. nor the names of its
> +// contributors may be used to endorse or promote products derived from
> +// this software without specific prior written permission.
> +//
> +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> +//
> +// Author: w...@google.com (Zhanyong Wan)
> +//
> +// Utilities for testing Google Test itself and code that uses Google Test
> +// (e.g. frameworks built on top of Google Test).
> +
> +#ifndef GTEST_INCLUDE_GTEST_GTEST_SPI_H_
> +#define GTEST_INCLUDE_GTEST_GTEST_SPI_H_
> +
> +#include "gtest/gtest.h"
> +
> +namespace testing {
> +
> +// This helper class can be used to mock out Google Test failure reporting
> +// so that we can test Google Test or code that builds on Google Test.
> +//
> +// An object of this class appends a TestPartResult object to the
> +// TestPartResultArray object given in the constructor whenever a Google
> Test
> +// failure is reported. It can either intercept only failures that are
> +// generated in the same thread that created this object or it can
> intercept
> +// all generated failures. The scope of this mock object can be
> controlled with
> +// the second argument to the two arguments constructor.
> +class GTEST_API_ ScopedFakeTestPartResultReporter
> +: public TestPartResultReporterInterface {
> + public:
> +  // The two possible mocking modes of this object.
> +  enum InterceptMode {
> +INTERCEPT_ONLY_CURRENT_THREAD,  // Intercepts only thread local
> failures.
> +INTERCEPT_ALL_THREADS   // Intercepts all failures.
> +  };
> +
> +  // The c'tor sets this object as the test part result reporter used
> +  // by Google Test.  The 'result' parameter specifies where to report the
> +  // results. This reporter will only catch failures generated in the
> current
> +  // thread. DEPRECATED
> +  explicit ScopedFakeTestPartResultReporter(TestPartResultArray* result);
> +
> +  // Same as above, but you can choose the interception scope of this
> object.
> +  ScopedFakeTestPartResultReporter(InterceptMode intercept_mode,
> +   TestPartResultArray* result);
> +
> +  // The d'tor restores the previous test part result reporter.
> +  virtual ~ScopedFakeTestPartResultReporter();
> +
> +  // Appends the TestPartResult object to the TestPartResultArray
> +  // received in the constructor.
> +  //
> +  // This method is from the TestPartResultReporterInterface
> +  // interface.
> +  virtual void ReportTestPartResult(const TestPartResult& result);
> + private:
> +  void Init();
> +
> +  const InterceptMode intercept_mode_;
> +  TestPartResultReporterInterface* old_reporter_;
> +  TestPartResultArray* const result_;
>

[PATCH xorg-gtest 1/2] gtest: add gtest-spi.h header

2012-11-06 Thread Peter Hutterer
This header is for self-testing, specifically EXPECT_FATAL_FAILURE

Signed-off-by: Peter Hutterer 
---
 gtest/include/Makefile.am   |   2 +-
 gtest/include/gtest/gtest-spi.h | 232 
 2 files changed, 233 insertions(+), 1 deletion(-)
 create mode 100644 gtest/include/gtest/gtest-spi.h

diff --git a/gtest/include/Makefile.am b/gtest/include/Makefile.am
index 54d3088..6456b01 100644
--- a/gtest/include/Makefile.am
+++ b/gtest/include/Makefile.am
@@ -22,4 +22,4 @@
 # SOFTWARE.
 #
 
-nobase_include_HEADERS = gtest/gtest.h
+nobase_include_HEADERS = gtest/gtest.h gtest/gtest-spi.h
diff --git a/gtest/include/gtest/gtest-spi.h b/gtest/include/gtest/gtest-spi.h
new file mode 100644
index 000..f63fa9a
--- /dev/null
+++ b/gtest/include/gtest/gtest-spi.h
@@ -0,0 +1,232 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: w...@google.com (Zhanyong Wan)
+//
+// Utilities for testing Google Test itself and code that uses Google Test
+// (e.g. frameworks built on top of Google Test).
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_SPI_H_
+#define GTEST_INCLUDE_GTEST_GTEST_SPI_H_
+
+#include "gtest/gtest.h"
+
+namespace testing {
+
+// This helper class can be used to mock out Google Test failure reporting
+// so that we can test Google Test or code that builds on Google Test.
+//
+// An object of this class appends a TestPartResult object to the
+// TestPartResultArray object given in the constructor whenever a Google Test
+// failure is reported. It can either intercept only failures that are
+// generated in the same thread that created this object or it can intercept
+// all generated failures. The scope of this mock object can be controlled with
+// the second argument to the two arguments constructor.
+class GTEST_API_ ScopedFakeTestPartResultReporter
+: public TestPartResultReporterInterface {
+ public:
+  // The two possible mocking modes of this object.
+  enum InterceptMode {
+INTERCEPT_ONLY_CURRENT_THREAD,  // Intercepts only thread local failures.
+INTERCEPT_ALL_THREADS   // Intercepts all failures.
+  };
+
+  // The c'tor sets this object as the test part result reporter used
+  // by Google Test.  The 'result' parameter specifies where to report the
+  // results. This reporter will only catch failures generated in the current
+  // thread. DEPRECATED
+  explicit ScopedFakeTestPartResultReporter(TestPartResultArray* result);
+
+  // Same as above, but you can choose the interception scope of this object.
+  ScopedFakeTestPartResultReporter(InterceptMode intercept_mode,
+   TestPartResultArray* result);
+
+  // The d'tor restores the previous test part result reporter.
+  virtual ~ScopedFakeTestPartResultReporter();
+
+  // Appends the TestPartResult object to the TestPartResultArray
+  // received in the constructor.
+  //
+  // This method is from the TestPartResultReporterInterface
+  // interface.
+  virtual void ReportTestPartResult(const TestPartResult& result);
+ private:
+  void Init();
+
+  const InterceptMode intercept_mode_;
+  TestPartResultReporterInterface* old_reporter_;
+  TestPartResultArray* const result_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedFakeTestPartResultReporter);
+};
+
+namespace internal {
+
+// A helper class for implementing EXPECT_FATAL_FAILURE() and
+// EXPECT_NONFATAL_FAILURE().  Its destructor verifies that the given
+// TestPartResultArray contains exactly one failu