diff options
| author | Patrick Simianer <p@simianer.de> | 2013-12-04 20:13:07 +0100 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2013-12-04 20:13:07 +0100 |
| commit | 02647059daa297e7b2b3ca3a2c03d848ae3ad9f2 (patch) | |
| tree | a5d2b5d66a8cff38a9422378c66861a3fb493e80 /extractor/mocks/mock_data_array.h | |
| parent | 7b2cd4e93114baaa329c483a98d6f7999aad1ba0 (diff) | |
| parent | 7d391d8eb88d27c5637042fefe2d27e7b12f5587 (diff) | |
fix merge conflict
Diffstat (limited to 'extractor/mocks/mock_data_array.h')
| -rw-r--r-- | extractor/mocks/mock_data_array.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/extractor/mocks/mock_data_array.h b/extractor/mocks/mock_data_array.h index 6f85abb4..98e711d2 100644 --- a/extractor/mocks/mock_data_array.h +++ b/extractor/mocks/mock_data_array.h @@ -6,12 +6,13 @@ namespace extractor { class MockDataArray : public DataArray { public: - MOCK_CONST_METHOD0(GetData, const vector<int>&()); + MOCK_CONST_METHOD0(GetData, vector<int>()); MOCK_CONST_METHOD1(AtIndex, int(int index)); MOCK_CONST_METHOD1(GetWordAtIndex, string(int index)); + MOCK_CONST_METHOD2(GetWordIds, vector<int>(int start_index, int size)); + MOCK_CONST_METHOD2(GetWords, vector<string>(int start_index, int size)); MOCK_CONST_METHOD0(GetSize, int()); MOCK_CONST_METHOD0(GetVocabularySize, int()); - MOCK_CONST_METHOD1(HasWord, bool(const string& word)); MOCK_CONST_METHOD1(GetWordId, int(const string& word)); MOCK_CONST_METHOD1(GetWord, string(int word_id)); MOCK_CONST_METHOD1(GetSentenceLength, int(int sentence_id)); |