generic-library/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Indents preprocessor directives.

Browse Source
This commit is contained in:
zhanyong.wan
2011-02-22 22:08:59 +00:00
parent 0980b4bd66
commit ffeb11d14a
35 changed files with 651 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test/gtest-param-test_test.cc
View File

@@ -37,19 +37,19 @@
#if GTEST_HAS_PARAM_TEST
#include <algorithm>
#include <iostream>
#include <list>
#include <sstream>
#include <string>
#include <vector>
# include <algorithm>
# include <iostream>
# include <list>
# include <sstream>
# include <string>
# include <vector>
// To include gtest-internal-inl.h.
#define GTEST_IMPLEMENTATION_ 1
#include "src/gtest-internal-inl.h" // for UnitTestOptions
#undef GTEST_IMPLEMENTATION_
# define GTEST_IMPLEMENTATION_ 1
# include "src/gtest-internal-inl.h" // for UnitTestOptions
# undef GTEST_IMPLEMENTATION_
#include "test/gtest-param-test_test.h"
# include "test/gtest-param-test_test.h"
using ::std::vector;
using ::std::sort;
@@ -62,12 +62,12 @@ using ::testing::TestWithParam;
using ::testing::Values;
using ::testing::ValuesIn;
#if GTEST_HAS_COMBINE
# if GTEST_HAS_COMBINE
using ::testing::Combine;
using ::std::tr1::get;
using ::std::tr1::make_tuple;
using ::std::tr1::tuple;
#endif // GTEST_HAS_COMBINE
# endif // GTEST_HAS_COMBINE
using ::testing::internal::ParamGenerator;
using ::testing::internal::UnitTestOptions;
@@ -85,7 +85,7 @@ template <typename T>
return stream.str();
}
#if GTEST_HAS_COMBINE
# if GTEST_HAS_COMBINE
// These overloads allow printing tuples in our tests. We cannot
// define an operator<< for tuples, as that definition needs to be in
@@ -121,7 +121,7 @@ template <typename T1, typename T2, typename T3, typename T4, typename T5,
return stream.str();
}
#endif // GTEST_HAS_COMBINE
# endif // GTEST_HAS_COMBINE
// Verifies that a sequence generated by the generator and accessed
// via the iterator object matches the expected one using Google Test
@@ -457,7 +457,7 @@ TEST(BoolTest, BoolWorks) {
VerifyGenerator(gen, expected_values);
}
#if GTEST_HAS_COMBINE
# if GTEST_HAS_COMBINE
// Tests that Combine() with two parameters generates the expected sequence.
TEST(CombineTest, CombineWithTwoParameters) {
@@ -542,7 +542,7 @@ TEST(CombineTest, CombineWithMaxNumberOfParameters) {
VerifyGenerator(gen, expected_values);
}
#endif // GTEST_HAS_COMBINE
# endif // GTEST_HAS_COMBINE
// Tests that an generator produces correct sequence after being
// assigned from another generator.