organicmaps/googletest
13
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-04-04 21:15:03 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Refactor Combine() generator function

Browse source
This commit is contained in:
stoorx 2025-02-24 14:26:21 +03:00
parent 96e776c3c0
commit 76e7406a5c
2 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
googletest/include/gtest/gtest-param-test.h
View file

@ -404,9 +404,12 @@ inline internal::ParamGenerator<bool> Bool() { return Values(false, true); }
// INSTANTIATE_TEST_SUITE_P(TwoBoolSequence, FlagDependentTest,
// Combine(Bool(), Bool()));
//
template <typename... Generator>
internal::CartesianProductHolder<Generator...> Combine(const Generator&... g) {
return internal::CartesianProductHolder<Generator...>(g...);
template <typename... T>
internal::ParamGenerator<std::tuple<T...>> Combine(
internal::ParamGenerator<T>&&... generators) {
return internal::ParamGenerator<std::tuple<T...>>(
new internal::CartesianProductGenerator<std::tuple<T...>, T...>(
std::forward<decltype(generators)>(generators)...));
}
// ConvertGenerator() wraps a parameter generator in order to cast each produced

26
googletest/include/gtest/internal/gtest-param-util.h
View file

@ -807,14 +807,14 @@ internal::ParamGenerator<typename Container::value_type> ValuesIn(
namespace internal {
template <typename... T>
class CartesianProductGenerator
: public ParamGeneratorInterface<::std::tuple<T...>> {
template <typename R, typename... T>
class CartesianProductGenerator : public ParamGeneratorInterface<R> {
public:
typedef ::std::tuple<T...> ParamType;
using ParamType = R;
explicit CartesianProductGenerator(ParamGenerator<T>&&... g)
: generators_(std::forward<decltype(g)>(g)...) {}
CartesianProductGenerator(const std::tuple<ParamGenerator<T>...>& g)
: generators_(g) {}
~CartesianProductGenerator() override = default;
ParamIteratorInterface<ParamType>* Begin() const override {
@ -924,20 +924,6 @@ class CartesianProductGenerator
std::tuple<ParamGenerator<T>...> generators_;
};
template <class... Gen>
class CartesianProductHolder {
public:
CartesianProductHolder(const Gen&... g) : generators_(g...) {}
template <typename... T>
operator ParamGenerator<::std::tuple<T...>>() const {
return ParamGenerator<::std::tuple<T...>>(
new CartesianProductGenerator<T...>(generators_));
}
private:
std::tuple<Gen...> generators_;
};
template <typename From, typename To, typename Func>
class ParamGeneratorConverter : public ParamGeneratorInterface<To> {
public: