Skip to content

Commit 49e02a5

Browse files
garydgregorygarydgregory
committed
Use deprecated methods in specific method
1 parent 91e7eac commit 49e02a5

File tree

1 file changed

+33
-24
lines changed

1 file changed

+33
-24
lines changed

‎src/test/java/org/apache/commons/text/RandomStringGeneratorTest.java‎

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,28 @@ void testBadMinimumCodePoint() {
6060
}
6161

6262
@Test
63-
void testChangeOfFilter() {
63+
void testBuildDeprecated() {
6464
final RandomStringGenerator.Builder builder = RandomStringGenerator.builder().withinRange('a', 'z').filteredBy(A_FILTER);
6565
final String str = builder.filteredBy(B_FILTER).build().generate(100);
6666
for (final char c : str.toCharArray()) {
6767
assertEquals('b', c);
6868
}
6969
}
7070

71+
@Test
72+
void testChangeOfFilter() {
73+
final RandomStringGenerator.Builder builder = RandomStringGenerator.builder().withinRange('a', 'z').filteredBy(A_FILTER);
74+
final String str = builder.filteredBy(B_FILTER).get().generate(100);
75+
for (final char c : str.toCharArray()) {
76+
assertEquals('b', c);
77+
}
78+
}
79+
7180
@Test
7281
void testGenerateMinMaxLength() {
7382
final int minLength = 0;
7483
final int maxLength = 3;
75-
final RandomStringGenerator generator = RandomStringGenerator.builder().build();
84+
final RandomStringGenerator generator = RandomStringGenerator.builder().get();
7685
final String str = generator.generate(minLength, maxLength);
7786
final int codePointLength = codePointLength(str);
7887
assertTrue(codePointLength >= minLength && codePointLength <= maxLength);
@@ -81,15 +90,15 @@ void testGenerateMinMaxLength() {
8190
@Test
8291
void testGenerateMinMaxLengthInvalidLength() {
8392
assertThrowsExactly(IllegalArgumentException.class, () -> {
84-
final RandomStringGenerator generator = RandomStringGenerator.builder().build();
93+
final RandomStringGenerator generator = RandomStringGenerator.builder().get();
8594
generator.generate(-1, 0);
8695
});
8796
}
8897

8998
@Test
9099
void testGenerateMinMaxLengthMinGreaterThanMax() {
91100
assertThrowsExactly(IllegalArgumentException.class, () -> {
92-
final RandomStringGenerator generator = RandomStringGenerator.builder().build();
101+
final RandomStringGenerator generator = RandomStringGenerator.builder().get();
93102
generator.generate(1, 0);
94103
});
95104
}
@@ -100,19 +109,19 @@ void testGenerateTakingIntThrowsNullPointerException() {
100109
final RandomStringGenerator.Builder randomStringGeneratorBuilder = RandomStringGenerator.builder();
101110
final CharacterPredicate[] characterPredicateArray = new CharacterPredicate[2];
102111
randomStringGeneratorBuilder.filteredBy(characterPredicateArray);
103-
final RandomStringGenerator randomStringGenerator = randomStringGeneratorBuilder.build();
112+
final RandomStringGenerator randomStringGenerator = randomStringGeneratorBuilder.get();
104113
randomStringGenerator.generate(18);
105114
});
106115
}
107116

108117
@Test
109118
void testInvalidLength() {
110-
assertThrowsExactly(IllegalArgumentException.class, () -> RandomStringGenerator.builder().build().generate(-1));
119+
assertThrowsExactly(IllegalArgumentException.class, () -> RandomStringGenerator.builder().get().generate(-1));
111120
}
112121

113122
@Test
114123
void testMultipleFilters() {
115-
final String str = RandomStringGenerator.builder().withinRange('a', 'd').filteredBy(A_FILTER, B_FILTER).build().generate(5000);
124+
final String str = RandomStringGenerator.builder().withinRange('a', 'd').filteredBy(A_FILTER, B_FILTER).get().generate(5000);
116125
boolean aFound = false;
117126
boolean bFound = false;
118127
for (final char c : str.toCharArray()) {
@@ -130,7 +139,7 @@ void testMultipleFilters() {
130139
@Test
131140
void testNoLoneSurrogates() {
132141
final int length = 5000;
133-
final String str = RandomStringGenerator.builder().build().generate(length);
142+
final String str = RandomStringGenerator.builder().get().generate(length);
134143
char lastChar = str.charAt(0);
135144
for (int i = 1; i < str.length(); i++) {
136145
final char c = str.charAt(i);
@@ -153,7 +162,7 @@ void testNoPrivateCharacters() {
153162
final int startOfPrivateBMPChars = 0xE000;
154163
// Request a string in an area of the Basic Multilingual Plane that is
155164
// largely occupied by private characters
156-
final String str = RandomStringGenerator.builder().withinRange(startOfPrivateBMPChars, Character.MIN_SUPPLEMENTARY_CODE_POINT - 1).build()
165+
final String str = RandomStringGenerator.builder().withinRange(startOfPrivateBMPChars, Character.MIN_SUPPLEMENTARY_CODE_POINT - 1).get()
157166
.generate(5000);
158167
int i = 0;
159168
do {
@@ -186,7 +195,7 @@ void testPasswordExample() {
186195
void testRemoveFilters() {
187196
final RandomStringGenerator.Builder builder = RandomStringGenerator.builder().withinRange('a', 'z').filteredBy(A_FILTER);
188197
builder.filteredBy();
189-
final String str = builder.build().generate(100);
198+
final String str = builder.get().generate(100);
190199
for (final char c : str.toCharArray()) {
191200
if (c != 'a') {
192201
// filter was successfully removed
@@ -200,7 +209,7 @@ void testRemoveFilters() {
200209
void testSelectFromCharArray() {
201210
final String str = "abc";
202211
final char[] charArray = str.toCharArray();
203-
final RandomStringGenerator generator = RandomStringGenerator.builder().selectFrom(charArray).build();
212+
final RandomStringGenerator generator = RandomStringGenerator.builder().selectFrom(charArray).get();
204213
final String randomText = generator.generate(5);
205214
for (final char c : randomText.toCharArray()) {
206215
assertTrue(str.indexOf(c) != -1);
@@ -210,7 +219,7 @@ void testSelectFromCharArray() {
210219
@Test
211220
void testSelectFromCharVarargs() {
212221
final String str = "abc";
213-
final RandomStringGenerator generator = RandomStringGenerator.builder().selectFrom('a', 'b', 'c').build();
222+
final RandomStringGenerator generator = RandomStringGenerator.builder().selectFrom('a', 'b', 'c').get();
214223
final String randomText = generator.generate(5);
215224
for (final char c : randomText.toCharArray()) {
216225
assertTrue(str.indexOf(c) != -1);
@@ -230,7 +239,7 @@ void testSelectFromCharVarargs2(final boolean accumulate) {
230239
.selectFrom('a', 'b', 'c')
231240
.selectFrom('a', 'b', 'c', 'd')
232241
.selectFrom('a', 'b', 'c', 'd', 'e') // only this last call matters when accumulate is false
233-
.build();
242+
.get();
234243
// @formatter:on
235244
final String randomText = generator.generate(10);
236245
for (final char c : randomText.toCharArray()) {
@@ -261,7 +270,7 @@ void testSelectFromCharVarargs3(final boolean accumulate) {
261270

262271
@Test
263272
void testSelectFromCharVarargSize1() {
264-
final RandomStringGenerator generator = RandomStringGenerator.builder().selectFrom('a').build();
273+
final RandomStringGenerator generator = RandomStringGenerator.builder().selectFrom('a').get();
265274
final String randomText = generator.generate(5);
266275
for (final char c : randomText.toCharArray()) {
267276
assertEquals('a', c);
@@ -270,7 +279,7 @@ void testSelectFromCharVarargSize1() {
270279

271280
@Test
272281
void testSelectFromEmptyCharVarargs() {
273-
final RandomStringGenerator generator = RandomStringGenerator.builder().selectFrom().build();
282+
final RandomStringGenerator generator = RandomStringGenerator.builder().selectFrom().get();
274283
final String randomText = generator.generate(5);
275284
for (final char c : randomText.toCharArray()) {
276285
assertTrue(c >= Character.MIN_CODE_POINT && c <= Character.MAX_CODE_POINT);
@@ -280,21 +289,21 @@ void testSelectFromEmptyCharVarargs() {
280289
@Test
281290
void testSelectFromNullCharVarargs() {
282291
final int length = 5;
283-
RandomStringGenerator generator = RandomStringGenerator.builder().selectFrom(null).build();
292+
RandomStringGenerator generator = RandomStringGenerator.builder().selectFrom(null).get();
284293
String randomText = generator.generate(length);
285294
assertEquals(length, codePointLength(randomText));
286295
for (final char c : randomText.toCharArray()) {
287296
assertTrue(c >= Character.MIN_CODE_POINT && c <= Character.MAX_CODE_POINT);
288297
}
289298
//
290299
final Builder builder = RandomStringGenerator.builder().selectFrom('a');
291-
generator = builder.build();
300+
generator = builder.get();
292301
randomText = generator.generate(length);
293302
for (final char c : randomText.toCharArray()) {
294303
assertEquals('a', c);
295304
}
296305
// null input resets
297-
generator = builder.selectFrom(null).build();
306+
generator = builder.selectFrom(null).get();
298307
randomText = generator.generate(length);
299308
assertEquals(length, codePointLength(randomText));
300309
for (final char c : randomText.toCharArray()) {
@@ -305,7 +314,7 @@ void testSelectFromNullCharVarargs() {
305314
@Test
306315
void testSetLength() {
307316
final int length = 99;
308-
final RandomStringGenerator generator = RandomStringGenerator.builder().build();
317+
final RandomStringGenerator generator = RandomStringGenerator.builder().get();
309318
final String str = generator.generate(length);
310319
assertEquals(length, codePointLength(str));
311320
}
@@ -314,7 +323,7 @@ void testSetLength() {
314323
void testUsingRandomIntUnaryOperator() {
315324
final char testChar = 'a';
316325
final IntUnaryOperator testRandom = n -> testChar;
317-
final String str = RandomStringGenerator.builder().usingRandom(testRandom).build().generate(10);
326+
final String str = RandomStringGenerator.builder().usingRandom(testRandom).get().generate(10);
318327
for (final char c : str.toCharArray()) {
319328
assertEquals(testChar, c);
320329
}
@@ -324,7 +333,7 @@ void testUsingRandomIntUnaryOperator() {
324333
void testUsingRandomTextRandomProvider() {
325334
final char testChar = 'a';
326335
final TextRandomProvider testRandom = n -> testChar;
327-
final String str = RandomStringGenerator.builder().usingRandom(testRandom).build().generate(10);
336+
final String str = RandomStringGenerator.builder().usingRandom(testRandom).get().generate(10);
328337
for (final char c : str.toCharArray()) {
329338
assertEquals(testChar, c);
330339
}
@@ -339,7 +348,7 @@ void testWithinMultipleRanges() {
339348
.withinRange()
340349
.withinRange((char[][]) null)
341350
.withinRange(pairs)
342-
.build();
351+
.get();
343352
// @formatter:on
344353
final String str = generator.generate(length);
345354
int minimumCodePoint = 0, maximumCodePoint = 0;
@@ -360,7 +369,7 @@ void testWithinRange() {
360369
final int length = 5000;
361370
final int minimumCodePoint = 'a';
362371
final int maximumCodePoint = 'z';
363-
final RandomStringGenerator generator = RandomStringGenerator.builder().withinRange(minimumCodePoint, maximumCodePoint).build();
372+
final RandomStringGenerator generator = RandomStringGenerator.builder().withinRange(minimumCodePoint, maximumCodePoint).get();
364373
final String str = generator.generate(length);
365374
int i = 0;
366375
do {
@@ -372,7 +381,7 @@ void testWithinRange() {
372381

373382
@Test
374383
void testZeroLength() {
375-
final RandomStringGenerator generator = RandomStringGenerator.builder().build();
384+
final RandomStringGenerator generator = RandomStringGenerator.builder().get();
376385
assertEquals("", generator.generate(0));
377386
}
378387
}

0 commit comments

Comments
 (0)