[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5406 Speed up ParameterizedIndexUpgradeToolIT.

[larsh]

This is an automated email from the ASF dual-hosted git repository.

larsh pushed a commit to branch 4.x-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push:
     new 04e71d9  PHOENIX-5406 Speed up ParameterizedIndexUpgradeToolIT.
04e71d9 is described below

commit 04e71d913d8abc4d42f18c57d631308e88fced74
Author: Lars Hofhansl <la...@apache.org>
AuthorDate: Wed Jul 24 18:42:47 2019 -0700

    PHOENIX-5406 Speed up ParameterizedIndexUpgradeToolIT.
---
 .../end2end/ParameterizedIndexUpgradeToolIT.java   | 17 --------
 .../apache/phoenix/index/IndexUpgradeToolTest.java | 48 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 17 deletions(-)

diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParameterizedIndexUpgradeToolIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParameterizedIndexUpgradeToolIT.java
index 24c0f39..ceea647 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParameterizedIndexUpgradeToolIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParameterizedIndexUpgradeToolIT.java
@@ -18,7 +18,6 @@
 package org.apache.phoenix.end2end;
 
 import com.google.common.collect.Maps;
-import org.apache.commons.cli.CommandLine;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.Admin;
 import org.apache.phoenix.hbase.index.IndexRegionObserver;
@@ -280,22 +279,6 @@ public class ParameterizedIndexUpgradeToolIT extends 
BaseTest {
         validate(true);
     }
 
-    @Test
-    public void testCommandLineParsing() {
-
-        String outputFile = "/tmp/index_upgrade_" + 
UUID.randomUUID().toString();
-        String [] args = {"-o", upgrade ? UPGRADE_OP : ROLLBACK_OP, "-tb",
-                INPUT_LIST, "-lf", outputFile, "-d"};
-        IndexUpgradeTool iut = new IndexUpgradeTool();
-
-        CommandLine cmd = iut.parseOptions(args);
-        iut.initializeTool(cmd);
-        Assert.assertEquals(iut.getDryRun(),true);
-        Assert.assertEquals(iut.getInputTables(), INPUT_LIST);
-        Assert.assertEquals(iut.getOperation(), upgrade ? UPGRADE_OP : 
ROLLBACK_OP);
-        Assert.assertEquals(iut.getLogFile(), outputFile);
-    }
-
     @After
     public void cleanup() throws SQLException {
         //TEST.MOCK1,TEST1.MOCK2,TEST.MOCK3
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/index/IndexUpgradeToolTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/index/IndexUpgradeToolTest.java
new file mode 100644
index 0000000..e985479
--- /dev/null
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/index/IndexUpgradeToolTest.java
@@ -0,0 +1,48 @@
+package org.apache.phoenix.index;
+
+import static org.apache.phoenix.mapreduce.index.IndexUpgradeTool.ROLLBACK_OP;
+import static org.apache.phoenix.mapreduce.index.IndexUpgradeTool.UPGRADE_OP;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.UUID;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.phoenix.mapreduce.index.IndexUpgradeTool;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class IndexUpgradeToolTest {
+    private static final String INPUT_LIST = 
"TEST.MOCK1,TEST1.MOCK2,TEST.MOCK3";
+    private final boolean upgrade;
+
+    public IndexUpgradeToolTest(boolean upgrade) {
+        this.upgrade = upgrade;
+    }
+
+    @Test
+    public void testCommandLineParsing() {
+
+        String outputFile = "/tmp/index_upgrade_" + 
UUID.randomUUID().toString();
+        String [] args = {"-o", upgrade ? UPGRADE_OP : ROLLBACK_OP, "-tb",
+                INPUT_LIST, "-lf", outputFile, "-d"};
+        IndexUpgradeTool iut = new IndexUpgradeTool();
+
+        CommandLine cmd = iut.parseOptions(args);
+        iut.initializeTool(cmd);
+        Assert.assertEquals(iut.getDryRun(),true);
+        Assert.assertEquals(iut.getInputTables(), INPUT_LIST);
+        Assert.assertEquals(iut.getOperation(), upgrade ? UPGRADE_OP : 
ROLLBACK_OP);
+        Assert.assertEquals(iut.getLogFile(), outputFile);
+    }
+
+    @Parameters(name ="IndexUpgradeToolTest_mutable={1}")
+    public static Collection<Boolean> data() {
+        return Arrays.asList( false, true);
+    }
+
+}