diff options
author | Paul Baltescu <pauldb89@gmail.com> | 2013-06-25 17:28:54 +0100 |
---|---|---|
committer | Paul Baltescu <pauldb89@gmail.com> | 2013-06-25 17:28:54 +0100 |
commit | 36bc55a33b5f075f6479c64f94d60ecbbd1f3270 (patch) | |
tree | b32b113529eac6ed35458bb2675850343a16432d /extractor/fast_intersector_test.cc | |
parent | cd4dbb5c0b581efb0369330ea330f2b473628a96 (diff) |
Undo last commit.
Diffstat (limited to 'extractor/fast_intersector_test.cc')
-rw-r--r-- | extractor/fast_intersector_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extractor/fast_intersector_test.cc b/extractor/fast_intersector_test.cc index 2e618b63..76c3aaea 100644 --- a/extractor/fast_intersector_test.cc +++ b/extractor/fast_intersector_test.cc @@ -60,14 +60,14 @@ class FastIntersectorTest : public Test { precomputation = make_shared<MockPrecomputation>(); EXPECT_CALL(*precomputation, GetCollocations()) - .WillRepeatedly(Return(collocations)); + .WillRepeatedly(ReturnRef(collocations)); phrase_builder = make_shared<PhraseBuilder>(vocabulary); intersector = make_shared<FastIntersector>(suffix_array, precomputation, vocabulary, 15, 1); } - Collocations collocations; + Index collocations; shared_ptr<MockDataArray> data_array; shared_ptr<MockSuffixArray> suffix_array; shared_ptr<MockPrecomputation> precomputation; @@ -82,9 +82,9 @@ TEST_F(FastIntersectorTest, TestCachedCollocation) { Phrase phrase = phrase_builder->Build(symbols); PhraseLocation prefix_location(15, 16), suffix_location(16, 17); - collocations.push_back(make_pair(symbols, expected_location)); + collocations[symbols] = expected_location; EXPECT_CALL(*precomputation, GetCollocations()) - .WillRepeatedly(Return(collocations)); + .WillRepeatedly(ReturnRef(collocations)); intersector = make_shared<FastIntersector>(suffix_array, precomputation, vocabulary, 15, 1); |