fix failing MRSuite (not using the proper Embedded ES port)

Author: costin

src/test/java/org/elasticsearch/hadoop/integration/cascading/CascadingHadoopSearchTest.java

@@ -22,9 +22,7 @@
 import org.elasticsearch.hadoop.integration.TestSettings;
 import org.junit.Test;
 
-import cascading.flow.FlowConnectorProps;
 import cascading.flow.hadoop.HadoopFlowConnector;
-import cascading.operation.DebugLevel;
 import cascading.pipe.Pipe;
 import cascading.tap.Tap;
 

src/test/java/org/elasticsearch/hadoop/integration/mr/MRNewApiSaveTest.java

@@ -26,7 +26,9 @@
 import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.mapreduce.Mapper;
 import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
+import org.elasticsearch.hadoop.integration.TestSettings;
 import org.elasticsearch.hadoop.mr.ESOutputFormat;
+import org.elasticsearch.hadoop.util.TestUtils;
 import org.elasticsearch.hadoop.util.WritableUtils;
 import org.junit.Test;
 
@@ -54,6 +56,7 @@ protected void map(Object key, Object value, Context context) throws IOException
     @Test
     public void testBasicSave() throws Exception {
         Configuration conf = new Configuration();
+        TestUtils.addProperties(conf, TestSettings.TESTING_PROPS);
         conf.setBoolean("mapred.used.genericoptionsparser", true);
         conf.set("mapred.job.tracker", "local");
         conf.set("es.resource", "mrnewapi/save");

src/test/java/org/elasticsearch/hadoop/integration/mr/MRNewApiSearchTest.java

@@ -18,16 +18,18 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.MapWritable;
 import org.apache.hadoop.io.Text;
-import org.apache.hadoop.mapred.JobClient;
 import org.apache.hadoop.mapreduce.Job;
+import org.elasticsearch.hadoop.integration.TestSettings;
 import org.elasticsearch.hadoop.mr.ESInputFormat;
+import org.elasticsearch.hadoop.util.TestUtils;
 import org.junit.Test;
 
 public class MRNewApiSearchTest {
 
     @Test
     public void testBasicSearch() throws Exception {
         Configuration conf = new Configuration();
+        TestUtils.addProperties(conf, TestSettings.TESTING_PROPS);
         conf.setBoolean("mapred.used.genericoptionsparser", true);
         conf.set("mapred.job.tracker", "local");
         conf.set("es.resource", "mrnewapi/save/_search?q=*");

src/test/java/org/elasticsearch/hadoop/integration/mr/MROldApiSaveTest.java

@@ -31,7 +31,9 @@
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.TextInputFormat;
 import org.apache.hadoop.mapred.lib.IdentityReducer;
+import org.elasticsearch.hadoop.integration.TestSettings;
 import org.elasticsearch.hadoop.mr.ESOutputFormat;
+import org.elasticsearch.hadoop.util.TestUtils;
 import org.elasticsearch.hadoop.util.WritableUtils;
 import org.junit.Test;
 
@@ -59,6 +61,7 @@ public void map(Object key, Object value, OutputCollector output, Reporter repor
     @Test
     public void testBasicSave() throws Exception {
         JobConf conf = new JobConf();
+        TestUtils.addProperties(conf, TestSettings.TESTING_PROPS);
         conf.setInputFormat(TextInputFormat.class);
         conf.setOutputFormat(ESOutputFormat.class);
         conf.setMapOutputValueClass(MapWritable.class);

src/test/java/org/elasticsearch/hadoop/integration/mr/MROldApiSearchTest.java

@@ -19,14 +19,17 @@
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mapred.JobClient;
 import org.apache.hadoop.mapred.JobConf;
+import org.elasticsearch.hadoop.integration.TestSettings;
 import org.elasticsearch.hadoop.mr.ESInputFormat;
+import org.elasticsearch.hadoop.util.TestUtils;
 import org.junit.Test;
 
 public class MROldApiSearchTest {
 
     @Test
     public void testBasicSearch() throws Exception {
         JobConf conf = new JobConf();
+        TestUtils.addProperties(conf, TestSettings.TESTING_PROPS);
         conf.setInputFormat(ESInputFormat.class);
         conf.setOutputFormat(PrintStreamOutputFormat.class);
         conf.setOutputKeyClass(Text.class);

src/test/java/org/elasticsearch/hadoop/integration/rest/RestSaveTest.java

@@ -21,7 +21,6 @@
 
 import org.elasticsearch.hadoop.integration.TestSettings;
 import org.elasticsearch.hadoop.rest.BufferedRestClient;
-import org.elasticsearch.hadoop.rest.TestRestClient;
 import org.junit.Test;
 
 public class RestSaveTest {

src/test/java/org/elasticsearch/hadoop/util/TestUtils.java

@@ -16,9 +16,12 @@
 package org.elasticsearch.hadoop.util;
 
 import java.io.File;
+import java.util.Map.Entry;
+import java.util.Properties;
 
 import org.apache.commons.lang.reflect.FieldUtils;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.mapreduce.JobSubmissionFiles;
 
@@ -66,4 +69,11 @@ public static boolean delete(File file) {
         }
         return file.delete() & result;
     }
+
+    public static Configuration addProperties(Configuration conf, Properties props) {
+        for (Entry<Object, Object> entry : props.entrySet()) {
+            conf.set(entry.getKey().toString(), entry.getValue().toString());
+        }
+        return conf;
+    }
 }