Bump to gtest 1.10.0

[platform/upstream/gtest.git] / googletest / test / googletest-param-test-test.h

diff --git a/test/gtest-param-test_test.h b/googletest/test/googletest-param-test-test.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 91%
rename from test/gtest-param-test_test.h
rename to googletest/test/googletest-param-test-test.h
index 26ea122..6480570
--- a/test/gtest-param-test_test.h
+++ b/googletest/test/googletest-param-test-test.h
@@ -27,9 +27,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
-// Authors: vladl@google.com (Vlad Losev)
-//
-// The Google C++ Testing Framework (Google Test)
+// The Google C++ Testing and Mocking Framework (Google Test)
 //
 // This header file provides classes and functions used internally
 // for testing Google Test itself.
@@ -39,8 +37,6 @@
 
 #include "gtest/gtest.h"
 
-#if GTEST_HAS_PARAM_TEST
-
 // Test fixture for testing definition and instantiation of a test
 // in separate translation units.
 class ExternalInstantiationTest : public ::testing::TestWithParam<int> {
@@ -48,10 +44,8 @@ class ExternalInstantiationTest : public ::testing::TestWithParam<int> {
 
 // Test fixture for testing instantiation of a test in multiple
 // translation units.
-class InstantiationInMultipleTranslaionUnitsTest
+class InstantiationInMultipleTranslationUnitsTest
     : public ::testing::TestWithParam<int> {
 };
 
-#endif  // GTEST_HAS_PARAM_TEST
-
 #endif  // GTEST_TEST_GTEST_PARAM_TEST_TEST_H_