Repository: sqoop Updated Branches: refs/heads/trunk 653668f0f -> 0c3db09ef
SQOOP-2132: Sqoop2: Upgrade configs with name conflicts (Jarek Jarcec Cecho via Abraham Elmahrek) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/0c3db09e Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/0c3db09e Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/0c3db09e Branch: refs/heads/trunk Commit: 0c3db09ef9b6d908425c7d69130cc501a7e10416 Parents: 653668f Author: Abraham Elmahrek <[email protected]> Authored: Wed Feb 25 17:50:02 2015 -0800 Committer: Abraham Elmahrek <[email protected]> Committed: Wed Feb 25 17:50:02 2015 -0800 ---------------------------------------------------------------------- .../sqoop/tool/TestMainframeImportTool.java | 47 -------------------- 1 file changed, 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/0c3db09e/src/test/org/apache/sqoop/tool/TestMainframeImportTool.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/tool/TestMainframeImportTool.java b/src/test/org/apache/sqoop/tool/TestMainframeImportTool.java index 936afd3..d91bbbe 100644 --- a/src/test/org/apache/sqoop/tool/TestMainframeImportTool.java +++ b/src/test/org/apache/sqoop/tool/TestMainframeImportTool.java @@ -18,8 +18,6 @@ package org.apache.sqoop.tool; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -43,13 +41,10 @@ public class TestMainframeImportTool extends BaseSqoopTestCase { private MainframeImportTool mfImportTool; - private final ByteArrayOutputStream outContent = new ByteArrayOutputStream(); - @Before public void setUp() { mfImportTool = new MainframeImportTool(); - System.setOut(new PrintStream(outContent)); } @After @@ -57,48 +52,6 @@ public class TestMainframeImportTool extends BaseSqoopTestCase { System.setOut(null); } - @Test - public void testPrintHelp() { - ToolOptions toolOptions = new ToolOptions(); - String separator = System.getProperty("line.separator"); - mfImportTool.printHelp(toolOptions); - String outputMsg = "usage: sqoop " - + mfImportTool.getToolName() - + " [GENERIC-ARGS] [TOOL-ARGS]" - + separator - + "" - + separator - + "" - + separator - + "Generic Hadoop command-line arguments:" - + separator - + "(must preceed any tool-specific arguments)" - + separator - + "Generic options supported are" - + separator - + "-conf <configuration file> specify an application configuration file" - + separator - + "-D <property=value> use value for given property" - + separator - + "-fs <local|namenode:port> specify a namenode" - + separator - + "-jt <local|jobtracker:port> specify a job tracker" - + separator - + "-files <comma separated list of files> " - + "specify comma separated files to be copied to the map reduce cluster" - + separator - + "-libjars <comma separated list of jars> " - + "specify comma separated jar files to include in the classpath." - + separator - + "-archives <comma separated list of archives> " - + "specify comma separated archives to be unarchived on the compute machines.\n" - + separator + "The general command line syntax is" + separator - + "bin/hadoop command [genericOptions] [commandOptions]\n" + separator - + "" + separator + "At minimum, you must specify --connect and --" - + MainframeImportTool.DS_ARG + separator; - assertEquals(outputMsg, outContent.toString()); - } - @SuppressWarnings("deprecation") @Test public void testGetImportOptions() throws SecurityException,
