fix merge conflict

1 files changed, 3 insertions, 5 deletions

diff --git a/extractor/rule_factory_test.cc b/extractor/rule_factory_test.cc
index f26cc567..332c5959 100644
--- a/extractor/rule_factory_test.cc
+++ b/extractor/rule_factory_test.cc
@@ -40,7 +40,7 @@ class RuleFactoryTest : public Test {
         .WillRepeatedly(Return(feature_names));
 
     sampler = make_shared<MockSampler>();
-    EXPECT_CALL(*sampler, Sample(_))
+    EXPECT_CALL(*sampler, Sample(_, _))
         .WillRepeatedly(Return(PhraseLocation(0, 1)));
 
     Phrase phrase;
@@ -77,8 +77,7 @@ TEST_F(RuleFactoryTest, TestGetGrammarDifferentWords) {
 
   vector<int> word_ids = {2, 3, 4};
   unordered_set<int> blacklisted_sentence_ids;
-  shared_ptr<DataArray> source_data_array;
-  Grammar grammar = factory->GetGrammar(word_ids, blacklisted_sentence_ids, source_data_array);
+  Grammar grammar = factory->GetGrammar(word_ids, blacklisted_sentence_ids);
   EXPECT_EQ(feature_names, grammar.GetFeatureNames());
   EXPECT_EQ(7, grammar.GetRules().size());
 }
@@ -97,8 +96,7 @@ TEST_F(RuleFactoryTest, TestGetGrammarRepeatingWords) {
 
   vector<int> word_ids = {2, 3, 4, 2, 3};
   unordered_set<int> blacklisted_sentence_ids;
-  shared_ptr<DataArray> source_data_array;
-  Grammar grammar = factory->GetGrammar(word_ids, blacklisted_sentence_ids, source_data_array);
+  Grammar grammar = factory->GetGrammar(word_ids, blacklisted_sentence_ids);
   EXPECT_EQ(feature_names, grammar.GetFeatureNames());
   EXPECT_EQ(28, grammar.GetRules().size());
 }