gtest-spi.h (googletest-release-1.10.0) | : | gtest-spi.h (googletest-release-1.11.0) | ||
---|---|---|---|---|
skipping to change at line 36 | skipping to change at line 36 | |||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | |||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||
// | // | |||
// Utilities for testing Google Test itself and code that uses Google Test | // Utilities for testing Google Test itself and code that uses Google Test | |||
// (e.g. frameworks built on top of Google Test). | // (e.g. frameworks built on top of Google Test). | |||
// GOOGLETEST_CM0004 DO NOT DELETE | // GOOGLETEST_CM0004 DO NOT DELETE | |||
#ifndef GTEST_INCLUDE_GTEST_GTEST_SPI_H_ | #ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_SPI_H_ | |||
#define GTEST_INCLUDE_GTEST_GTEST_SPI_H_ | #define GOOGLETEST_INCLUDE_GTEST_GTEST_SPI_H_ | |||
#include "gtest/gtest.h" | #include "gtest/gtest.h" | |||
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \ | GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \ | |||
/* class A needs to have dll-interface to be used by clients of class B */) | /* class A needs to have dll-interface to be used by clients of class B */) | |||
namespace testing { | namespace testing { | |||
// This helper class can be used to mock out Google Test failure reporting | // 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. | // so that we can test Google Test or code that builds on Google Test. | |||
skipping to change at line 238 | skipping to change at line 238 | |||
>est_failures, ::testing::TestPartResult::kNonFatalFailure, \ | >est_failures, ::testing::TestPartResult::kNonFatalFailure, \ | |||
(substr));\ | (substr));\ | |||
{\ | {\ | |||
::testing::ScopedFakeTestPartResultReporter gtest_reporter(\ | ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\ | |||
::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, \ | ::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, \ | |||
>est_failures);\ | >est_failures);\ | |||
if (::testing::internal::AlwaysTrue()) { statement; }\ | if (::testing::internal::AlwaysTrue()) { statement; }\ | |||
}\ | }\ | |||
} while (::testing::internal::AlwaysFalse()) | } while (::testing::internal::AlwaysFalse()) | |||
#endif // GTEST_INCLUDE_GTEST_GTEST_SPI_H_ | #endif // GOOGLETEST_INCLUDE_GTEST_GTEST_SPI_H_ | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |