Cover all possible password cases

2 files changed, 111 insertions, 40 deletions

diff --git a/src/test/java/com/beust/jcommander/JCommanderTest.java b/src/test/java/com/beust/jcommander/JCommanderTest.java
index c1befe1..65c8e8c 100644
--- a/src/test/java/com/beust/jcommander/JCommanderTest.java
+++ b/src/test/java/com/beust/jcommander/JCommanderTest.java
@@ -866,46 +866,6 @@ public class JCommanderTest {
         jc.parse("--configure");
     }
 
-    public static class PasswordTestingArgs {
-        @Parameter(names = {"--password", "-p"}, description = "Private key password",
-                password = true, required = true)
-        public String password;
-
-        @Parameter(names = {"--port", "-o"}, description = "Port to bind server to",
-                required = true)
-        public int port;
-    }
-
-    @Test
-    public void passwordNotRequiredToAsk() {
-        PasswordTestingArgs a = new PasswordTestingArgs();
-        final String expectedPassword = "somepassword";
-        final int expectedPort = 7;
-        new JCommander(a, "--password", expectedPassword, "--port", String.valueOf(7));
-        Assert.assertEquals(a.port, expectedPort);
-        Assert.assertEquals(a.password, expectedPassword);
-    }
-
-    @Test(expectedExceptions = ParameterException.class)
-    public void passwordWithExcessiveArity() {
-        PasswordTestingArgs a = new PasswordTestingArgs();
-        new JCommander(a, "--password", "somepassword", "someotherarg", "--port", String.valueOf(7));
-    }
-
-    @Test
-    public void passwordRequiredAsked() {
-        PasswordTestingArgs a = new PasswordTestingArgs();
-        InputStream stdin = System.in;
-        try {
-            System.setIn(new ByteArrayInputStream("password".getBytes()));
-            new JCommander(a, "--port", "7", "--password");
-            Assert.assertEquals(a.port, 7);
-            Assert.assertEquals(a.password, "password");
-        } finally {
-            System.setIn(stdin);
-        }
-    }
-
     public void dynamicParameters() {
         class Command {
             @DynamicParameter(names = {"-P"}, description = "Additional command parameters")
diff --git a/src/test/java/com/beust/jcommander/PasswordTest.java b/src/test/java/com/beust/jcommander/PasswordTest.java
new file mode 100644
index 0000000..ff1792e
--- /dev/null
+++ b/src/test/java/com/beust/jcommander/PasswordTest.java
@@ -0,0 +1,111 @@
+package com.beust.jcommander;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class PasswordTest {
+
+    @DataProvider(name = "args")
+    public Object[][] createArgs() {
+        return new Object[][] {
+                { new PasswordTestingArgs() },
+                { new OptionalPasswordTestingArgs() },
+        };
+    }
+
+    public interface Args {
+
+        String getPassword();
+
+        int getPort();
+
+    }
+
+    public static class PasswordTestingArgs implements PasswordTest.Args {
+        @Parameter(names = {"--password", "-p"}, description = "Private key password",
+                password = true, required = true)
+        public String password;
+
+        @Parameter(names = {"--port", "-o"}, description = "Port to bind server to",
+                required = true)
+        public int port;
+
+        @Override
+        public String getPassword() {
+            return password;
+        }
+
+        @Override
+        public int getPort() {
+            return port;
+        }
+    }
+
+    @Test(dataProvider = "args")
+    public void passwordNotAsked(Args a) {
+        String expectedPassword = "somepassword";
+        int expectedPort = 7;
+        new JCommander(a, "--password", expectedPassword, "--port", String.valueOf(7));
+        Assert.assertEquals(a.getPort(), expectedPort);
+        Assert.assertEquals(a.getPassword(), expectedPassword);
+    }
+
+    @Test(dataProvider = "args", expectedExceptions = ParameterException.class)
+    public void passwordWithExcessiveArity(Args a) {
+        new JCommander(a, "--password", "somepassword", "someotherarg", "--port", String.valueOf(7));
+    }
+
+    @Test(dataProvider = "args")
+    public void passwordAsked(Args a) {
+        InputStream stdin = System.in;
+        String password = "password";
+        int port = 7;
+        try {
+            System.setIn(new ByteArrayInputStream(password.getBytes()));
+            new JCommander(a, "--port", String.valueOf(port), "--password");
+            Assert.assertEquals(a.getPort(), port);
+            Assert.assertEquals(a.getPassword(), password);
+        } finally {
+            System.setIn(stdin);
+        }
+    }
+
+    public static class OptionalPasswordTestingArgs implements PasswordTest.Args {
+        @Parameter(names = {"--password", "-p"}, description = "Private key password",
+                password = true)
+        public String password;
+
+        @Parameter(names = {"--port", "-o"}, description = "Port to bind server to",
+                required = true)
+        public int port;
+
+        @Override
+        public String getPassword() {
+            return password;
+        }
+
+        @Override
+        public int getPort() {
+            return port;
+        }
+    }
+
+    @Test
+    public void passwordOptionalNotProvided() {
+        Args a = new OptionalPasswordTestingArgs();
+        new JCommander(a, "--port", "7");
+        Assert.assertEquals(a.getPort(), 7);
+        Assert.assertEquals(a.getPassword(), null);
+    }
+
+    @Test(expectedExceptions = ParameterException.class)
+    public void passwordRequredNotProvided() {
+        Args a = new PasswordTestingArgs();
+        new JCommander(a, "--port", "7");
+    }
+
+}