gtest-typed-test_test.h (googletest-release-1.10.0) | : | gtest-typed-test_test.h (googletest-release-1.11.0) | ||
---|---|---|---|---|
skipping to change at line 30 | skipping to change at line 30 | |||
// 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. | |||
#ifndef GTEST_TEST_GTEST_TYPED_TEST_TEST_H_ | #ifndef GOOGLETEST_TEST_GTEST_TYPED_TEST_TEST_H_ | |||
#define GTEST_TEST_GTEST_TYPED_TEST_TEST_H_ | #define GOOGLETEST_TEST_GTEST_TYPED_TEST_TEST_H_ | |||
#include "gtest/gtest.h" | #include "gtest/gtest.h" | |||
#if GTEST_HAS_TYPED_TEST_P | ||||
using testing::Test; | using testing::Test; | |||
// For testing that the same type-parameterized test case can be | // For testing that the same type-parameterized test case can be | |||
// instantiated in different translation units linked together. | // instantiated in different translation units linked together. | |||
// ContainerTest will be instantiated in both gtest-typed-test_test.cc | // ContainerTest will be instantiated in both gtest-typed-test_test.cc | |||
// and gtest-typed-test2_test.cc. | // and gtest-typed-test2_test.cc. | |||
template <typename T> | template <typename T> | |||
class ContainerTest : public Test { | class ContainerTest : public Test { | |||
}; | }; | |||
skipping to change at line 62 | skipping to change at line 60 | |||
} | } | |||
TYPED_TEST_P(ContainerTest, InitialSizeIsZero) { | TYPED_TEST_P(ContainerTest, InitialSizeIsZero) { | |||
TypeParam container; | TypeParam container; | |||
EXPECT_EQ(0U, container.size()); | EXPECT_EQ(0U, container.size()); | |||
} | } | |||
REGISTER_TYPED_TEST_SUITE_P(ContainerTest, | REGISTER_TYPED_TEST_SUITE_P(ContainerTest, | |||
CanBeDefaultConstructed, InitialSizeIsZero); | CanBeDefaultConstructed, InitialSizeIsZero); | |||
#endif // GTEST_HAS_TYPED_TEST_P | #endif // GOOGLETEST_TEST_GTEST_TYPED_TEST_TEST_H_ | |||
#endif // GTEST_TEST_GTEST_TYPED_TEST_TEST_H_ | ||||
End of changes. 3 change blocks. | ||||
4 lines changed or deleted | 2 lines changed or added |