Repository: oozie Updated Branches: refs/heads/oya bec5536a9 -> 09c538941
http://git-wip-us.apache.org/repos/asf/oozie/blob/09c53894/sharelib/hive2/src/test/java/org/apache/oozie/action/hadoop/TestHive2ActionExecutor.java ---------------------------------------------------------------------- diff --git a/sharelib/hive2/src/test/java/org/apache/oozie/action/hadoop/TestHive2ActionExecutor.java b/sharelib/hive2/src/test/java/org/apache/oozie/action/hadoop/TestHive2ActionExecutor.java index 39d8ba2..2127eb0 100644 --- a/sharelib/hive2/src/test/java/org/apache/oozie/action/hadoop/TestHive2ActionExecutor.java +++ b/sharelib/hive2/src/test/java/org/apache/oozie/action/hadoop/TestHive2ActionExecutor.java @@ -19,7 +19,6 @@ package org.apache.oozie.action.hadoop; import java.io.OutputStreamWriter; -import java.io.StringReader; import java.io.Writer; import java.text.MessageFormat; import java.util.ArrayList; @@ -29,15 +28,9 @@ import java.util.Map; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.mapred.JobClient; -import org.apache.hadoop.mapred.JobConf; -import org.apache.hadoop.mapred.JobID; -import org.apache.hadoop.mapred.RunningJob; import org.apache.oozie.WorkflowActionBean; import org.apache.oozie.WorkflowJobBean; import org.apache.oozie.client.WorkflowAction; -import org.apache.oozie.service.HadoopAccessorService; -import org.apache.oozie.service.Services; import org.apache.oozie.service.WorkflowAppService; import org.apache.oozie.util.XConfiguration; import org.apache.oozie.util.XmlUtils; @@ -207,9 +200,9 @@ public class TestHive2ActionExecutor extends ActionExecutorTestCase { waitUntilYarnAppDoneAndAssertSuccess(launcherId); Configuration conf = new XConfiguration(); conf.set("user.name", getTestUser()); - Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(), + Map<String, String> actionData = LauncherHelper.getActionData(getFileSystem(), context.getActionDir(), conf); - assertFalse(LauncherMapperHelper.hasIdSwap(actionData)); + assertFalse(LauncherHelper.hasIdSwap(actionData)); Hive2ActionExecutor ae = new Hive2ActionExecutor(); ae.check(context, context.getAction()); assertTrue(launcherId.equals(context.getAction().getExternalId())); @@ -236,9 +229,9 @@ public class TestHive2ActionExecutor extends ActionExecutorTestCase { waitUntilYarnAppDoneAndAssertSuccess(launcherId); Configuration conf = new XConfiguration(); conf.set("user.name", getTestUser()); - Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(), + Map<String, String> actionData = LauncherHelper.getActionData(getFileSystem(), context.getActionDir(), conf); - assertFalse(LauncherMapperHelper.hasIdSwap(actionData)); + assertFalse(LauncherHelper.hasIdSwap(actionData)); Hive2ActionExecutor ae = new Hive2ActionExecutor(); ae.check(context, context.getAction()); assertTrue(launcherId.equals(context.getAction().getExternalId())); @@ -267,9 +260,9 @@ public class TestHive2ActionExecutor extends ActionExecutorTestCase { waitUntilYarnAppDoneAndAssertSuccess(launcherId); Configuration conf = new XConfiguration(); conf.set("user.name", getTestUser()); - Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(), + Map<String, String> actionData = LauncherHelper.getActionData(getFileSystem(), context.getActionDir(), conf); - assertFalse(LauncherMapperHelper.hasIdSwap(actionData)); + assertFalse(LauncherHelper.hasIdSwap(actionData)); Hive2ActionExecutor ae = new Hive2ActionExecutor(); ae.check(context, context.getAction()); assertTrue(launcherId.equals(context.getAction().getExternalId())); http://git-wip-us.apache.org/repos/asf/oozie/blob/09c53894/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java ---------------------------------------------------------------------- diff --git a/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java b/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java index 6ab9fce..7c3c5bb 100644 --- a/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java +++ b/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java @@ -191,9 +191,9 @@ public class TestPigActionExecutor extends ActionExecutorTestCase { Configuration conf = new XConfiguration(); conf.set("user.name", getTestUser()); - Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(), + Map<String, String> actionData = LauncherHelper.getActionData(getFileSystem(), context.getActionDir(), conf); - assertTrue(LauncherMapperHelper.hasStatsData(actionData)); + assertTrue(LauncherHelper.hasStatsData(actionData)); PigActionExecutor ae = new PigActionExecutor(); WorkflowAction wfAction = context.getAction(); @@ -293,9 +293,9 @@ public class TestPigActionExecutor extends ActionExecutorTestCase { Configuration conf = new XConfiguration(); conf.set("user.name", getTestUser()); - Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(), + Map<String, String> actionData = LauncherHelper.getActionData(getFileSystem(), context.getActionDir(), conf); - assertFalse(LauncherMapperHelper.hasStatsData(actionData)); + assertFalse(LauncherHelper.hasStatsData(actionData)); PigActionExecutor ae = new PigActionExecutor(); WorkflowAction wfAction = context.getAction(); http://git-wip-us.apache.org/repos/asf/oozie/blob/09c53894/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java ---------------------------------------------------------------------- diff --git a/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java b/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java index 61d295c..41dc9f0 100644 --- a/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java +++ b/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java @@ -22,21 +22,12 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.PathFilter; -import org.apache.hadoop.mapred.JobClient; -import org.apache.hadoop.mapred.JobConf; -import org.apache.hadoop.mapred.JobID; -import org.apache.hadoop.mapred.RunningJob; import org.apache.oozie.WorkflowActionBean; import org.apache.oozie.WorkflowJobBean; import org.apache.oozie.client.WorkflowAction; -import org.apache.oozie.service.HadoopAccessorService; -import org.apache.oozie.service.Services; import org.apache.oozie.service.WorkflowAppService; import org.apache.oozie.util.IOUtils; import org.apache.oozie.util.XConfiguration; -import org.apache.oozie.util.XmlUtils; -import org.jdom.Element; -import org.jdom.Namespace; import java.io.BufferedReader; import java.io.File; @@ -44,7 +35,6 @@ import java.io.FileInputStream; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; -import java.io.StringReader; import java.sql.Connection; import java.sql.DriverManager; import java.sql.Statement; @@ -52,7 +42,6 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Properties; public class TestSqoopActionExecutor extends ActionExecutorTestCase { @@ -181,9 +170,9 @@ public class TestSqoopActionExecutor extends ActionExecutorTestCase { Context context = createContext(getActionXml()); final String launcherId = submitAction(context); waitUntilYarnAppDoneAndAssertSuccess(launcherId); - Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(), + Map<String, String> actionData = LauncherHelper.getActionData(getFileSystem(), context.getActionDir(), context.getProtoActionConf()); - assertFalse(LauncherMapperHelper.hasIdSwap(actionData)); + assertFalse(LauncherHelper.hasIdSwap(actionData)); SqoopActionExecutor ae = new SqoopActionExecutor(); ae.check(context, context.getAction()); @@ -216,9 +205,9 @@ public class TestSqoopActionExecutor extends ActionExecutorTestCase { Context context = createContext(getActionXmlEval()); final String launcherId = submitAction(context); waitUntilYarnAppDoneAndAssertSuccess(launcherId); - Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(), + Map<String, String> actionData = LauncherHelper.getActionData(getFileSystem(), context.getActionDir(), context.getProtoActionConf()); - assertFalse(LauncherMapperHelper.hasIdSwap(actionData)); + assertFalse(LauncherHelper.hasIdSwap(actionData)); SqoopActionExecutor ae = new SqoopActionExecutor(); ae.check(context, context.getAction()); @@ -239,9 +228,9 @@ public class TestSqoopActionExecutor extends ActionExecutorTestCase { Context context = createContext(getActionXmlFreeFromQuery()); final String launcherId = submitAction(context); waitUntilYarnAppDoneAndAssertSuccess(launcherId); - Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(), + Map<String, String> actionData = LauncherHelper.getActionData(getFileSystem(), context.getActionDir(), context.getProtoActionConf()); - assertFalse(LauncherMapperHelper.hasIdSwap(actionData)); + assertFalse(LauncherHelper.hasIdSwap(actionData)); SqoopActionExecutor ae = new SqoopActionExecutor(); ae.check(context, context.getAction()); http://git-wip-us.apache.org/repos/asf/oozie/blob/09c53894/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java ---------------------------------------------------------------------- diff --git a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java index 710571f..045f174 100644 --- a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java +++ b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java @@ -49,7 +49,6 @@ import org.apache.hadoop.fs.PathFilter; import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.JobClient; -import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.JobID; import org.apache.hadoop.mapred.RunningJob; import org.apache.hadoop.mapreduce.JobStatus; @@ -396,9 +395,9 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase { final String launcherId = submitAction(context); waitUntilYarnAppDoneAndAssertSuccess(launcherId); - Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(), + Map<String, String> actionData = LauncherHelper.getActionData(getFileSystem(), context.getActionDir(), context.getProtoActionConf()); - assertTrue(LauncherMapperHelper.hasIdSwap(actionData)); + assertTrue(LauncherHelper.hasIdSwap(actionData)); MapReduceActionExecutor ae = new MapReduceActionExecutor(); ae.check(context, context.getAction()); @@ -456,9 +455,9 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase { final String launcherId = submitAction(context); waitUntilYarnAppDoneAndAssertSuccess(launcherId); - Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(), + Map<String, String> actionData = LauncherHelper.getActionData(getFileSystem(), context.getActionDir(), context.getProtoActionConf()); - assertTrue(LauncherMapperHelper.hasIdSwap(actionData)); + assertTrue(LauncherHelper.hasIdSwap(actionData)); MapReduceActionExecutor ae = new MapReduceActionExecutor(); ae.check(context, context.getAction()); @@ -615,7 +614,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase { final String launcherId = submitAction(context); waitUntilYarnAppDoneAndAssertSuccess(launcherId); - final Map<String, String> actionData = LauncherMapperHelper.getActionData(fs, context.getActionDir(), + final Map<String, String> actionData = LauncherHelper.getActionData(fs, context.getActionDir(), context.getProtoActionConf()); Properties errorProps = PropertiesUtils.stringToProperties(actionData.get(LauncherMapper.ACTION_DATA_ERROR_PROPS)); assertEquals("An Exception occurred while instantiating the action config class", @@ -645,7 +644,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase { final String launcherId = submitAction(context); waitUntilYarnAppDoneAndAssertSuccess(launcherId); - final Map<String, String> actionData = LauncherMapperHelper.getActionData(fs, context.getActionDir(), + final Map<String, String> actionData = LauncherHelper.getActionData(fs, context.getActionDir(), context.getProtoActionConf()); Properties errorProps = PropertiesUtils.stringToProperties(actionData.get(LauncherMapper.ACTION_DATA_ERROR_PROPS)); assertEquals("doh", errorProps.getProperty("exception.message")); @@ -989,9 +988,9 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase { MapReduceActionExecutor ae = new MapReduceActionExecutor(); Configuration conf = ae.createBaseHadoopConf(context, XmlUtils.parseXml(actionXml)); - Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(), + Map<String, String> actionData = LauncherHelper.getActionData(getFileSystem(), context.getActionDir(), conf); - assertTrue(LauncherMapperHelper.hasIdSwap(actionData)); + assertTrue(LauncherHelper.hasIdSwap(actionData)); ae.check(context, context.getAction()); assertTrue(launcherId.equals(context.getAction().getExternalId())); @@ -1058,9 +1057,9 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase { final String launcherId = submitAction(context); waitUntilYarnAppDoneAndAssertSuccess(launcherId); - Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(), + Map<String, String> actionData = LauncherHelper.getActionData(getFileSystem(), context.getActionDir(), context.getProtoActionConf()); - assertTrue(LauncherMapperHelper.hasIdSwap(actionData)); + assertTrue(LauncherHelper.hasIdSwap(actionData)); MapReduceActionExecutor ae = new MapReduceActionExecutor(); ae.check(context, context.getAction()); @@ -1125,9 +1124,9 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase { final String launcherId = submitAction(context); waitUntilYarnAppDoneAndAssertSuccess(launcherId); - Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(), + Map<String, String> actionData = LauncherHelper.getActionData(getFileSystem(), context.getActionDir(), context.getProtoActionConf()); - assertTrue(LauncherMapperHelper.hasIdSwap(actionData)); + assertTrue(LauncherHelper.hasIdSwap(actionData)); MapReduceActionExecutor ae = new MapReduceActionExecutor(); ae.check(context, context.getAction()); @@ -1207,9 +1206,9 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase { final String launcherId = submitAction(context); waitUntilYarnAppDoneAndAssertSuccess(launcherId); - Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(), + Map<String, String> actionData = LauncherHelper.getActionData(getFileSystem(), context.getActionDir(), context.getProtoActionConf()); - assertTrue(LauncherMapperHelper.hasIdSwap(actionData)); + assertTrue(LauncherHelper.hasIdSwap(actionData)); MapReduceActionExecutor ae = new MapReduceActionExecutor(); ae.check(context, context.getAction());
