gtest-test-part.h (googletest-release-1.11.0) | : | gtest-test-part.h (googletest-release-1.12.0) | ||
---|---|---|---|---|
skipping to change at line 29 | skipping to change at line 29 | |||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | |||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | |||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | |||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | |||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |||
// 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. | |||
// | ||||
// GOOGLETEST_CM0001 DO NOT DELETE | // IWYU pragma: private, include "gtest/gtest.h" | |||
// IWYU pragma: friend gtest/.* | ||||
// IWYU pragma: friend gmock/.* | ||||
#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_TEST_PART_H_ | #ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_TEST_PART_H_ | |||
#define GOOGLETEST_INCLUDE_GTEST_GTEST_TEST_PART_H_ | #define GOOGLETEST_INCLUDE_GTEST_GTEST_TEST_PART_H_ | |||
#include <iosfwd> | #include <iosfwd> | |||
#include <vector> | #include <vector> | |||
#include "gtest/internal/gtest-internal.h" | #include "gtest/internal/gtest-internal.h" | |||
#include "gtest/internal/gtest-string.h" | #include "gtest/internal/gtest-string.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 { | |||
// A copyable object representing the result of a test part (i.e. an | // A copyable object representing the result of a test part (i.e. an | |||
// assertion or an explicit FAIL(), ADD_FAILURE(), or SUCCESS()). | // assertion or an explicit FAIL(), ADD_FAILURE(), or SUCCESS()). | |||
skipping to change at line 145 | skipping to change at line 148 | |||
// Returns the TestPartResult at the given index (0-based). | // Returns the TestPartResult at the given index (0-based). | |||
const TestPartResult& GetTestPartResult(int index) const; | const TestPartResult& GetTestPartResult(int index) const; | |||
// Returns the number of TestPartResult objects in the array. | // Returns the number of TestPartResult objects in the array. | |||
int size() const; | int size() const; | |||
private: | private: | |||
std::vector<TestPartResult> array_; | std::vector<TestPartResult> array_; | |||
GTEST_DISALLOW_COPY_AND_ASSIGN_(TestPartResultArray); | TestPartResultArray(const TestPartResultArray&) = delete; | |||
TestPartResultArray& operator=(const TestPartResultArray&) = delete; | ||||
}; | }; | |||
// This interface knows how to report a test part result. | // This interface knows how to report a test part result. | |||
class GTEST_API_ TestPartResultReporterInterface { | class GTEST_API_ TestPartResultReporterInterface { | |||
public: | public: | |||
virtual ~TestPartResultReporterInterface() {} | virtual ~TestPartResultReporterInterface() {} | |||
virtual void ReportTestPartResult(const TestPartResult& result) = 0; | virtual void ReportTestPartResult(const TestPartResult& result) = 0; | |||
}; | }; | |||
skipping to change at line 171 | skipping to change at line 175 | |||
// reported, it only delegates the reporting to the former result reporter. | // reported, it only delegates the reporting to the former result reporter. | |||
// The original result reporter is restored in the destructor. | // The original result reporter is restored in the destructor. | |||
// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. | // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. | |||
class GTEST_API_ HasNewFatalFailureHelper | class GTEST_API_ HasNewFatalFailureHelper | |||
: public TestPartResultReporterInterface { | : public TestPartResultReporterInterface { | |||
public: | public: | |||
HasNewFatalFailureHelper(); | HasNewFatalFailureHelper(); | |||
~HasNewFatalFailureHelper() override; | ~HasNewFatalFailureHelper() override; | |||
void ReportTestPartResult(const TestPartResult& result) override; | void ReportTestPartResult(const TestPartResult& result) override; | |||
bool has_new_fatal_failure() const { return has_new_fatal_failure_; } | bool has_new_fatal_failure() const { return has_new_fatal_failure_; } | |||
private: | private: | |||
bool has_new_fatal_failure_; | bool has_new_fatal_failure_; | |||
TestPartResultReporterInterface* original_reporter_; | TestPartResultReporterInterface* original_reporter_; | |||
GTEST_DISALLOW_COPY_AND_ASSIGN_(HasNewFatalFailureHelper); | HasNewFatalFailureHelper(const HasNewFatalFailureHelper&) = delete; | |||
HasNewFatalFailureHelper& operator=(const HasNewFatalFailureHelper&) = delete; | ||||
}; | }; | |||
} // namespace internal | } // namespace internal | |||
} // namespace testing | } // namespace testing | |||
GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251 | GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251 | |||
#endif // GOOGLETEST_INCLUDE_GTEST_GTEST_TEST_PART_H_ | #endif // GOOGLETEST_INCLUDE_GTEST_GTEST_TEST_PART_H_ | |||
End of changes. 5 change blocks. | ||||
4 lines changed or deleted | 10 lines changed or added |