Commit 328be50d authored by Anton Bukov's avatar Anton Bukov

Merge pull request #6 from Gluttton/remove_gmock_dependency

Remove Google Mock redundant dependency.
parents ed1ca1c3 47d35e0a
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "boolinq.h" #include "boolinq.h"
...@@ -46,4 +45,4 @@ TEST(All, ThreeIntsSecond) ...@@ -46,4 +45,4 @@ TEST(All, ThreeIntsSecond)
EXPECT_FALSE(rng.all([](int a){return a>1;})); EXPECT_FALSE(rng.all([](int a){return a>1;}));
EXPECT_FALSE(rng.all([](int a){return a==1;})); EXPECT_FALSE(rng.all([](int a){return a==1;}));
EXPECT_FALSE(rng.all([](int a){return a<2;})); EXPECT_FALSE(rng.all([](int a){return a<2;}));
} }
\ No newline at end of file
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "boolinq.h" #include "boolinq.h"
...@@ -30,4 +29,4 @@ TEST(Any, ThreeInts) ...@@ -30,4 +29,4 @@ TEST(Any, ThreeInts)
EXPECT_FALSE(rng.any([](int a){return a==4;})); EXPECT_FALSE(rng.any([](int a){return a==4;}));
EXPECT_FALSE(rng.any([](int a){return a<1;})); EXPECT_FALSE(rng.any([](int a){return a<1;}));
EXPECT_FALSE(rng.any([](int a){return a>3;})); EXPECT_FALSE(rng.any([](int a){return a>3;}));
} }
\ No newline at end of file
#include <list> #include <list>
#include <vector> #include <vector>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "boolinq.h" #include "boolinq.h"
......
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "CommonTests.h" #include "CommonTests.h"
......
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "CommonTests.h" #include "CommonTests.h"
...@@ -124,4 +123,4 @@ TEST(BytesRange, IntsLF) ...@@ -124,4 +123,4 @@ TEST(BytesRange, IntsLF)
auto dst = rng.bytes(LastToFirst); auto dst = rng.bytes(LastToFirst);
CheckRangeEqArray(dst, ans); CheckRangeEqArray(dst, ans);
} }
\ No newline at end of file
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "CommonTests.h" #include "CommonTests.h"
...@@ -56,4 +55,4 @@ TEST(ConcatRange, ArrayVectorArray) ...@@ -56,4 +55,4 @@ TEST(ConcatRange, ArrayVectorArray)
auto dst = rng1.concat(rng2).concat(rng3); auto dst = rng1.concat(rng2).concat(rng3);
CheckRangeEqArray(dst, ans); CheckRangeEqArray(dst, ans);
} }
\ No newline at end of file
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "boolinq.h" #include "boolinq.h"
...@@ -44,4 +43,4 @@ TEST(Contains, FiveStrings) ...@@ -44,4 +43,4 @@ TEST(Contains, FiveStrings)
EXPECT_FALSE(rng.contains("dino")); EXPECT_FALSE(rng.contains("dino"));
EXPECT_FALSE(rng.contains("lord")); EXPECT_FALSE(rng.contains("lord"));
} }
\ No newline at end of file
#include <list> #include <list>
#include <vector> #include <vector>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "boolinq.h" #include "boolinq.h"
......
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "CommonTests.h" #include "CommonTests.h"
...@@ -101,4 +100,4 @@ TEST(DistinctRange, OneFieldFront) ...@@ -101,4 +100,4 @@ TEST(DistinctRange, OneFieldFront)
auto dst = rng.distinct([](const Man & man){return man.age;}); auto dst = rng.distinct([](const Man & man){return man.age;});
CheckRangeEqSet(dst, ans); CheckRangeEqSet(dst, ans);
} }
\ No newline at end of file
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "CommonTests.h" #include "CommonTests.h"
......
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "boolinq.h" #include "boolinq.h"
...@@ -38,4 +37,4 @@ TEST(ElementAt, FiveStrings) ...@@ -38,4 +37,4 @@ TEST(ElementAt, FiveStrings)
EXPECT_EQ("nokia", rng.elementAt(2)); EXPECT_EQ("nokia", rng.elementAt(2));
EXPECT_EQ("oracle", rng.elementAt(3)); EXPECT_EQ("oracle", rng.elementAt(3));
EXPECT_EQ("ponny", rng.elementAt(4)); EXPECT_EQ("ponny", rng.elementAt(4));
} }
\ No newline at end of file
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "boolinq.h" #include "boolinq.h"
......
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "CommonTests.h" #include "CommonTests.h"
...@@ -130,4 +129,4 @@ TEST(GroupByRange, CountChildrenByAge) ...@@ -130,4 +129,4 @@ TEST(GroupByRange, CountChildrenByAge)
EXPECT_THROW(dst.nextObject(), EnumeratorEndException); EXPECT_THROW(dst.nextObject(), EnumeratorEndException);
} }
*/ */
\ No newline at end of file
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "CommonTests.h" #include "CommonTests.h"
...@@ -92,4 +91,4 @@ TEST(IterRange, EmptyVector) ...@@ -92,4 +91,4 @@ TEST(IterRange, EmptyVector)
auto rng = from(src); auto rng = from(src);
EXPECT_THROW(rng.nextObject(), EnumeratorEndException); EXPECT_THROW(rng.nextObject(), EnumeratorEndException);
} }
\ No newline at end of file
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "boolinq.h" #include "boolinq.h"
......
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "boolinq.h" #include "boolinq.h"
...@@ -32,4 +31,4 @@ TEST(Max, FiveStrings) ...@@ -32,4 +31,4 @@ TEST(Max, FiveStrings)
EXPECT_EQ("zip", rng.max()); EXPECT_EQ("zip", rng.max());
EXPECT_EQ("apple", rng.max([](std::string s){return s.size();})); EXPECT_EQ("apple", rng.max([](std::string s){return s.size();}));
} }
\ No newline at end of file
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "boolinq.h" #include "boolinq.h"
......
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "CommonTests.h" #include "CommonTests.h"
...@@ -123,4 +122,4 @@ TEST(OrderByRange, RandomStringByLength) ...@@ -123,4 +122,4 @@ TEST(OrderByRange, RandomStringByLength)
auto dst = rng.orderBy([](std::string a){return a.size();}); auto dst = rng.orderBy([](std::string a){return a.size();});
CheckRangeEqArray(dst, ans, [](const std::string & s){return s.size();}); CheckRangeEqArray(dst, ans, [](const std::string & s){return s.size();});
} }
\ No newline at end of file
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "CommonTests.h" #include "CommonTests.h"
...@@ -31,4 +30,4 @@ TEST(ReverseRange, DoubleReverse) ...@@ -31,4 +30,4 @@ TEST(ReverseRange, DoubleReverse)
auto dst = rng.reverse().reverse(); auto dst = rng.reverse().reverse();
CheckRangeEqArray(dst, ans); CheckRangeEqArray(dst, ans);
} }
\ No newline at end of file
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "CommonTests.h" #include "CommonTests.h"
......
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "CommonTests.h" #include "CommonTests.h"
......
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "CommonTests.h" #include "CommonTests.h"
......
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <iostream> #include <iostream>
......
#include <list> #include <list>
#include <vector> #include <vector>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "boolinq.h" #include "boolinq.h"
......
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "CommonTests.h" #include "CommonTests.h"
......
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "CommonTests.h" #include "CommonTests.h"
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#include <deque> #include <deque>
#include <vector> #include <vector>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "CommonTests.h" #include "CommonTests.h"
......
#include <deque> #include <deque>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "boolinq.h" #include "boolinq.h"
......
#include <list> #include <list>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "boolinq.h" #include "boolinq.h"
......
#include <vector> #include <vector>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "boolinq.h" #include "boolinq.h"
......
#include <vector> #include <vector>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "boolinq.h" #include "boolinq.h"
......
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "CommonTests.h" #include "CommonTests.h"
...@@ -42,4 +41,4 @@ TEST(UnbitsRange, OneByteLH) ...@@ -42,4 +41,4 @@ TEST(UnbitsRange, OneByteLH)
auto dst = rng.unbits(LowToHigh); auto dst = rng.unbits(LowToHigh);
CheckRangeEqArray(dst, ans); CheckRangeEqArray(dst, ans);
} }
\ No newline at end of file
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "CommonTests.h" #include "CommonTests.h"
......
#include <vector> #include <vector>
#include <string> #include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "CommonTests.h" #include "CommonTests.h"
......
#include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
...@@ -25,4 +24,4 @@ int main(int argc, char * argv[]) ...@@ -25,4 +24,4 @@ int main(int argc, char * argv[])
{ {
::testing::InitGoogleMock(&argc, argv); ::testing::InitGoogleMock(&argc, argv);
return RUN_ALL_TESTS(); return RUN_ALL_TESTS();
} }
\ No newline at end of file
Subproject commit 7aef63c873a1dc58860fc7736bda3cb961831bab
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment