You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ch...@apache.org on 2017/06/29 02:11:46 UTC
[6/8] [text] added selectFrom method with varargs
added selectFrom method with varargs
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/df30bf96
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/df30bf96
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/df30bf96
Branch: refs/heads/master
Commit: df30bf96856287478f3a7dfa7f017ca175bdd352
Parents: f9177e2
Author: Amey Jadiye <am...@gmail.com>
Authored: Sat Jun 24 00:57:17 2017 +0530
Committer: Amey Jadiye <am...@gmail.com>
Committed: Sat Jun 24 00:57:17 2017 +0530
----------------------------------------------------------------------
.../commons/text/RandomStringGenerator.java | 26 +-----------------
.../commons/text/RandomStringGeneratorTest.java | 29 ++++++--------------
2 files changed, 9 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-text/blob/df30bf96/src/main/java/org/apache/commons/text/RandomStringGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/RandomStringGenerator.java b/src/main/java/org/apache/commons/text/RandomStringGenerator.java
index 0111746..dc338f0 100644
--- a/src/main/java/org/apache/commons/text/RandomStringGenerator.java
+++ b/src/main/java/org/apache/commons/text/RandomStringGenerator.java
@@ -409,7 +409,7 @@ public final class RandomStringGenerator {
* the Character can be, may be {@code null} or empty
* @return {@code this}, to allow method chaining
*/
- public Builder selectFromList(char[] chars) {
+ public Builder selectFrom(char ... chars) {
characterList = new ArrayList<Character>();
for (char c : chars) {
characterList.add(c);
@@ -418,30 +418,6 @@ public final class RandomStringGenerator {
}
/**
- * <p>
- * Limits the characters in the generated string to those who match at
- * supplied list of Character.
- * </p>
- *
- * <p>
- * Passing {@code null} or an empty array to this method will revert to the
- * default behaviour of allowing any character. Multiple calls to this
- * method will replace the previously stored Character.
- * </p>
- *
- * @param characterList set of preefined Characters for random string generation
- * the Character can be, may be {@code null} or empty
- * @return {@code this}, to allow method chaining
- */
- public Builder selectFromList(List<Character> characterList) {
- this.characterList = new ArrayList<Character>();
- for (char c : characterList) {
- this.characterList.add(c);
- }
- return this;
- }
-
- /**
* <p>Builds the {@code RandomStringGenerator} using the properties specified.</p>
* @return the configured {@code RandomStringGenerator}
*/
http://git-wip-us.apache.org/repos/asf/commons-text/blob/df30bf96/src/test/java/org/apache/commons/text/RandomStringGeneratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/text/RandomStringGeneratorTest.java b/src/test/java/org/apache/commons/text/RandomStringGeneratorTest.java
index 3769be2..bf00b5c 100644
--- a/src/test/java/org/apache/commons/text/RandomStringGeneratorTest.java
+++ b/src/test/java/org/apache/commons/text/RandomStringGeneratorTest.java
@@ -232,37 +232,24 @@ public class RandomStringGeneratorTest {
assertEquals("", generator.generate(0));
}
-
-
-
-
-
-
-
-
@Test
- public void testSelectFromList() {
- List<Character> list = new ArrayList<Character>();
- list.add('a');
- list.add('b');
- list.add('c');
- RandomStringGenerator generator = new RandomStringGenerator.Builder().selectFromList(list).build();
+ public void testSelectFromCharArray() {
+ String str = "abc";
+ char[] charArray = str.toCharArray();
+ RandomStringGenerator generator = new RandomStringGenerator.Builder().selectFrom(charArray).build();
String randomText = generator.generate(5);
for (char c : randomText.toCharArray()) {
- assertTrue(list.contains(c));
+ assertTrue(str.indexOf(c) != -1);
}
}
@Test
- public void testSelectFromCharArray() {
- String str = "abc";
- char[] charArray = str.toCharArray();
- RandomStringGenerator generator = new RandomStringGenerator.Builder().selectFromList(charArray).build();
-
+ public void testSelectFromCharVarargs() {
+ String str="abc";
+ RandomStringGenerator generator = new RandomStringGenerator.Builder().selectFrom('a','b','c').build();
String randomText = generator.generate(5);
-
for (char c : randomText.toCharArray()) {
assertTrue(str.indexOf(c) != -1);
}