15 files changed, 64 insertions, 1 deletions
diff --git a/extractor/mocks/mock_alignment.h b/extractor/mocks/mock_alignment.h
index 4a5077ad..3d745e9d 100644
--- a/extractor/mocks/mock_alignment.h
+++ b/extractor/mocks/mock_alignment.h
@@ -2,9 +2,13 @@
 
 #include "../alignment.h"
 
+namespace extractor {
+
 typedef vector<pair<int, int> > SentenceLinks;
 
 class MockAlignment : public Alignment {
  public:
   MOCK_CONST_METHOD1(GetLinks, SentenceLinks(int sentence_id));
 };
+
+} // namespace extractor
diff --git a/extractor/mocks/mock_data_array.h b/extractor/mocks/mock_data_array.h
index 004e8906..cf9f3671 100644
--- a/extractor/mocks/mock_data_array.h
+++ b/extractor/mocks/mock_data_array.h
@@ -2,6 +2,8 @@
 
 #include "../data_array.h"
 
+namespace extractor {
+
 class MockDataArray : public DataArray {
  public:
   MOCK_CONST_METHOD0(GetData, const vector<int>&());
@@ -17,3 +19,5 @@ class MockDataArray : public DataArray {
   MOCK_CONST_METHOD1(GetSentenceStart, int(int sentence_id));
   MOCK_CONST_METHOD1(GetSentenceId, int(int position));
 };
+
+} // namespace extractor
diff --git a/extractor/mocks/mock_fast_intersector.h b/extractor/mocks/mock_fast_intersector.h
index 201386f2..665add65 100644
--- a/extractor/mocks/mock_fast_intersector.h
+++ b/extractor/mocks/mock_fast_intersector.h
@@ -4,8 +4,12 @@
 #include "../phrase.h"
 #include "../phrase_location.h"
 
+namespace extractor {
+
 class MockFastIntersector : public FastIntersector {
  public:
   MOCK_METHOD3(Intersect, PhraseLocation(PhraseLocation&, PhraseLocation&,
                                          const Phrase&));
 };
+
+} // namespace extractor
diff --git a/extractor/mocks/mock_feature.h b/extractor/mocks/mock_feature.h
index d2137629..19ba4de9 100644
--- a/extractor/mocks/mock_feature.h
+++ b/extractor/mocks/mock_feature.h
@@ -2,8 +2,14 @@
 
 #include "../features/feature.h"
 
+namespace extractor {
+namespace features {
+
 class MockFeature : public Feature {
  public:
   MOCK_CONST_METHOD1(Score, double(const FeatureContext& context));
   MOCK_CONST_METHOD0(GetName, string());
 };
+
+} // namespace features
+} // namespace extractor
diff --git a/extractor/mocks/mock_matchings_finder.h b/extractor/mocks/mock_matchings_finder.h
index 3e80d266..ffbb06c7 100644
--- a/extractor/mocks/mock_matchings_finder.h
+++ b/extractor/mocks/mock_matchings_finder.h
@@ -3,7 +3,11 @@
 #include "../matchings_finder.h"
 #include "../phrase_location.h"
 
+namespace extractor {
+
 class MockMatchingsFinder : public MatchingsFinder {
  public:
   MOCK_METHOD3(Find, PhraseLocation(PhraseLocation&, const string&, int));
 };
+
+} // namespace extractor
diff --git a/extractor/mocks/mock_precomputation.h b/extractor/mocks/mock_precomputation.h
index 9bc72235..64934b94 100644
--- a/extractor/mocks/mock_precomputation.h
+++ b/extractor/mocks/mock_precomputation.h
@@ -2,7 +2,11 @@
 
 #include "../precomputation.h"
 
+namespace extractor {
+
 class MockPrecomputation : public Precomputation {
  public:
   MOCK_CONST_METHOD0(GetCollocations, const Index&());
 };
+
+} // namespace extractor
diff --git a/extractor/mocks/mock_rule_extractor.h b/extractor/mocks/mock_rule_extractor.h
index f18e009a..28b644b0 100644
--- a/extractor/mocks/mock_rule_extractor.h
+++ b/extractor/mocks/mock_rule_extractor.h
@@ -5,8 +5,12 @@
 #include "../rule.h"
 #include "../rule_extractor.h"
 
+namespace extractor {
+
 class MockRuleExtractor : public RuleExtractor {
  public:
   MOCK_CONST_METHOD2(ExtractRules, vector<Rule>(const Phrase&,
       const PhraseLocation&));
 };
+
+} // namespace extractor
diff --git a/extractor/mocks/mock_rule_extractor_helper.h b/extractor/mocks/mock_rule_extractor_helper.h
index 63ff1048..3b0ac0f5 100644
--- a/extractor/mocks/mock_rule_extractor_helper.h
+++ b/extractor/mocks/mock_rule_extractor_helper.h
@@ -6,6 +6,8 @@
 
 using namespace std;
 
+namespace extractor {
+
 typedef unordered_map<int, int> Indexes;
 
 class MockRuleExtractorHelper : public RuleExtractorHelper {
@@ -76,3 +78,5 @@ class MockRuleExtractorHelper : public RuleExtractorHelper {
   bool met_constraints;
   bool get_gaps;
 };
+
+} // namespace extractor
diff --git a/extractor/mocks/mock_rule_factory.h b/extractor/mocks/mock_rule_factory.h
index 2a96be93..11cb9ab5 100644
--- a/extractor/mocks/mock_rule_factory.h
+++ b/extractor/mocks/mock_rule_factory.h
@@ -3,7 +3,11 @@
 #include "../grammar.h"
 #include "../rule_factory.h"
 
+namespace extractor {
+
 class MockHieroCachingRuleFactory : public HieroCachingRuleFactory {
  public:
   MOCK_METHOD1(GetGrammar, Grammar(const vector<int>& word_ids));
 };
+
+} // namespace extractor
diff --git a/extractor/mocks/mock_sampler.h b/extractor/mocks/mock_sampler.h
index b2306109..7022f7b3 100644
--- a/extractor/mocks/mock_sampler.h
+++ b/extractor/mocks/mock_sampler.h
@@ -3,7 +3,11 @@
 #include "../phrase_location.h"
 #include "../sampler.h"
 
+namespace extractor {
+
 class MockSampler : public Sampler {
  public:
   MOCK_CONST_METHOD1(Sample, PhraseLocation(const PhraseLocation& location));
 };
+
+} // namespace extractor
diff --git a/extractor/mocks/mock_scorer.h b/extractor/mocks/mock_scorer.h
index 48115ef4..4d593ddf 100644
--- a/extractor/mocks/mock_scorer.h
+++ b/extractor/mocks/mock_scorer.h
@@ -3,8 +3,13 @@
 #include "../scorer.h"
 #include "../features/feature.h"
 
+namespace extractor {
+
 class MockScorer : public Scorer {
  public:
-  MOCK_CONST_METHOD1(Score, vector<double>(const FeatureContext& context));
+  MOCK_CONST_METHOD1(Score, vector<double>(
+      const features::FeatureContext& context));
   MOCK_CONST_METHOD0(GetFeatureNames, vector<string>());
 };
+
+} // namespace extractor
diff --git a/extractor/mocks/mock_suffix_array.h b/extractor/mocks/mock_suffix_array.h
index 11a3a443..6886232a 100644
--- a/extractor/mocks/mock_suffix_array.h
+++ b/extractor/mocks/mock_suffix_array.h
@@ -9,6 +9,8 @@
 
 using namespace std;
 
+namespace extractor {
+
 class MockSuffixArray : public SuffixArray {
  public:
   MOCK_CONST_METHOD0(GetSize, int());
@@ -17,3 +19,5 @@ class MockSuffixArray : public SuffixArray {
   MOCK_CONST_METHOD1(GetSuffix, int(int));
   MOCK_CONST_METHOD4(Lookup, PhraseLocation(int, int, const string& word, int));
 };
+
+} // namespace extractor
diff --git a/extractor/mocks/mock_target_phrase_extractor.h b/extractor/mocks/mock_target_phrase_extractor.h
index 6dc6bba6..e5e9aeab 100644
--- a/extractor/mocks/mock_target_phrase_extractor.h
+++ b/extractor/mocks/mock_target_phrase_extractor.h
@@ -2,6 +2,8 @@
 
 #include "../target_phrase_extractor.h"
 
+namespace extractor {
+
 typedef pair<Phrase, PhraseAlignment> PhraseExtract;
 
 class MockTargetPhraseExtractor : public TargetPhraseExtractor {
@@ -10,3 +12,5 @@ class MockTargetPhraseExtractor : public TargetPhraseExtractor {
       const vector<pair<int, int> > &, const vector<int>&, int, int,
       const unordered_map<int, int>&, int));
 };
+
+} // namespace extractor
diff --git a/extractor/mocks/mock_translation_table.h b/extractor/mocks/mock_translation_table.h
index a35c9327..358c854f 100644
--- a/extractor/mocks/mock_translation_table.h
+++ b/extractor/mocks/mock_translation_table.h
@@ -2,8 +2,12 @@
 
 #include "../translation_table.h"
 
+namespace extractor {
+
 class MockTranslationTable : public TranslationTable {
  public:
   MOCK_METHOD2(GetSourceGivenTargetScore, double(const string&, const string&));
   MOCK_METHOD2(GetTargetGivenSourceScore, double(const string&, const string&));
 };
+
+} // namespace extractor
diff --git a/extractor/mocks/mock_vocabulary.h b/extractor/mocks/mock_vocabulary.h
index e5c191f5..802c29b4 100644
--- a/extractor/mocks/mock_vocabulary.h
+++ b/extractor/mocks/mock_vocabulary.h
@@ -2,8 +2,12 @@
 
 #include "../vocabulary.h"
 
+namespace extractor {
+
 class MockVocabulary : public Vocabulary {
  public:
   MOCK_METHOD1(GetTerminalValue, string(int word_id));
   MOCK_METHOD1(GetTerminalIndex, int(const string& word));
 };
+
+} // namespace extractor