Skip to content

Commit ed2b7e4

Browse files
author
eugenp
committed
test cleanup
1 parent 6b10bee commit ed2b7e4

File tree

2 files changed

+47
-42
lines changed

2 files changed

+47
-42
lines changed

core-java-8/src/test/java/org/baeldung/java8/base64/ApacheCommonsEncodeDecodeTest.java

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,43 +11,45 @@
1111

1212
public class ApacheCommonsEncodeDecodeTest {
1313

14+
// tests
15+
1416
@Test
1517
public void whenStringIsEncoded() throws UnsupportedEncodingException {
16-
String originalInput = "test input";
17-
Base64 base64 = new Base64();
18-
String encodedString = new String(base64.encode(originalInput.getBytes()));
18+
final String originalInput = "test input";
19+
final Base64 base64 = new Base64();
20+
final String encodedString = new String(base64.encode(originalInput.getBytes()));
1921

2022
assertNotNull(encodedString);
2123
assertNotEquals(originalInput, encodedString);
2224
}
2325

2426
@Test
2527
public void whenStringIsEncoded_thenStringCanBeDecoded() throws UnsupportedEncodingException {
26-
String originalInput = "test input";
27-
Base64 base64 = new Base64();
28-
String encodedString = new String(base64.encode(originalInput.getBytes()));
28+
final String originalInput = "test input";
29+
final Base64 base64 = new Base64();
30+
final String encodedString = new String(base64.encode(originalInput.getBytes()));
2931

30-
String decodedString = new String(base64.decode(encodedString.getBytes()));
32+
final String decodedString = new String(base64.decode(encodedString.getBytes()));
3133

3234
assertNotNull(decodedString);
3335
assertEquals(originalInput, decodedString);
3436
}
3537

3638
@Test
3739
public void whenStringIsEncodedUsingStaticMethod() throws UnsupportedEncodingException {
38-
String originalInput = "test input";
39-
String encodedString = new String(Base64.encodeBase64(originalInput.getBytes()));
40+
final String originalInput = "test input";
41+
final String encodedString = new String(Base64.encodeBase64(originalInput.getBytes()));
4042

4143
assertNotNull(encodedString);
4244
assertNotEquals(originalInput, encodedString);
4345
}
4446

4547
@Test
4648
public void whenStringIsEncodedUsingStaticMethod_thenStringCanBeDecodedUsingStaticMethod() throws UnsupportedEncodingException {
47-
String originalInput = "test input";
48-
String encodedString = new String(Base64.encodeBase64(originalInput.getBytes()));
49+
final String originalInput = "test input";
50+
final String encodedString = new String(Base64.encodeBase64(originalInput.getBytes()));
4951

50-
String decodedString = new String(Base64.decodeBase64(encodedString.getBytes()));
52+
final String decodedString = new String(Base64.decodeBase64(encodedString.getBytes()));
5153

5254
assertNotNull(decodedString);
5355
assertEquals(originalInput, decodedString);

core-java-8/src/test/java/org/baeldung/java8/base64/Java8EncodeDecodeTest.java

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -12,91 +12,94 @@
1212

1313
public class Java8EncodeDecodeTest {
1414

15+
// tests
16+
1517
@Test
1618
public void whenStringIsEncoded() throws UnsupportedEncodingException {
17-
String originalInput = "test input";
18-
String encodedString = Base64.getEncoder().encodeToString(originalInput.getBytes());
19+
final String originalInput = "test input";
20+
final String encodedString = Base64.getEncoder().encodeToString(originalInput.getBytes());
1921
assertNotNull(encodedString);
2022
assertNotEquals(originalInput, encodedString);
2123
}
2224

2325
@Test
2426
public void whenStringIsEncoded_thenStringCanBeDecoded() throws UnsupportedEncodingException {
25-
String originalInput = "test input";
26-
String encodedString = Base64.getEncoder().encodeToString(originalInput.getBytes());
27+
final String originalInput = "test input";
28+
final String encodedString = Base64.getEncoder().encodeToString(originalInput.getBytes());
2729

28-
byte[] decodedBytes = Base64.getDecoder().decode(encodedString);
29-
String decodedString = new String(decodedBytes);
30+
final byte[] decodedBytes = Base64.getDecoder().decode(encodedString);
31+
final String decodedString = new String(decodedBytes);
3032

3133
assertNotNull(decodedString);
3234
assertEquals(originalInput, decodedString);
3335

3436
}
35-
37+
3638
@Test
3739
public void whenStringIsEncodedWithoutPadding() throws UnsupportedEncodingException {
38-
String originalInput = "test input";
39-
String encodedString = Base64.getEncoder().withoutPadding().encodeToString(originalInput.getBytes());
40+
final String originalInput = "test input";
41+
final String encodedString = Base64.getEncoder().withoutPadding().encodeToString(originalInput.getBytes());
4042
assertNotNull(encodedString);
4143
assertNotEquals(originalInput, encodedString);
4244
}
43-
45+
4446
@Test
4547
public void whenStringIsEncodedWithoutPadding_thenStringCanBeDecoded() throws UnsupportedEncodingException {
46-
String originalInput = "test input";
47-
String encodedString = Base64.getEncoder().withoutPadding().encodeToString(originalInput.getBytes());
48+
final String originalInput = "test input";
49+
final String encodedString = Base64.getEncoder().withoutPadding().encodeToString(originalInput.getBytes());
4850

49-
byte[] decodedBytes = Base64.getDecoder().decode(encodedString);
50-
String decodedString = new String(decodedBytes);
51+
final byte[] decodedBytes = Base64.getDecoder().decode(encodedString);
52+
final String decodedString = new String(decodedBytes);
5153

5254
assertNotNull(decodedString);
5355
assertEquals(originalInput, decodedString);
5456

5557
}
5658

57-
5859
@Test
5960
public void whenURLIsEncoded() throws UnsupportedEncodingException {
60-
String originalURL = "https://www.google.co.nz/?gfe_rd=cr&ei=dzbFVf&gws_rd=ssl#q=java";
61-
String encodedURL = Base64.getUrlEncoder().encodeToString(originalURL.getBytes());
61+
final String originalURL = "https://www.google.co.nz/?gfe_rd=cr&ei=dzbFVf&gws_rd=ssl#q=java";
62+
final String encodedURL = Base64.getUrlEncoder().encodeToString(originalURL.getBytes());
6263
assertNotNull(encodedURL);
6364
assertNotEquals(originalURL, encodedURL);
6465
}
6566

6667
@Test
6768
public void whenURLIsEncoded_thenURLCanBeDecoded() throws UnsupportedEncodingException {
68-
String originalURL = "https://www.google.co.nz/?gfe_rd=cr&ei=dzbFVf&gws_rd=ssl#q=java";
69-
String encodedURL = Base64.getUrlEncoder().encodeToString(originalURL.getBytes());
70-
byte[] decodedBytes = Base64.getUrlDecoder().decode(encodedURL.getBytes());
71-
String decodedURL = new String(decodedBytes);
69+
final String originalURL = "https://www.google.co.nz/?gfe_rd=cr&ei=dzbFVf&gws_rd=ssl#q=java";
70+
final String encodedURL = Base64.getUrlEncoder().encodeToString(originalURL.getBytes());
71+
final byte[] decodedBytes = Base64.getUrlDecoder().decode(encodedURL.getBytes());
72+
final String decodedURL = new String(decodedBytes);
7273
assertNotNull(decodedURL);
7374
assertEquals(originalURL, decodedURL);
7475
}
7576

7677
@Test
7778
public void whenMIMEIsEncoded() throws UnsupportedEncodingException {
78-
StringBuilder buffer = getMimeBuffer();
79+
final StringBuilder buffer = getMimeBuffer();
7980

80-
byte[] forEncode = buffer.toString().getBytes();
81-
String encodedMime = Base64.getMimeEncoder().encodeToString(forEncode);
81+
final byte[] forEncode = buffer.toString().getBytes();
82+
final String encodedMime = Base64.getMimeEncoder().encodeToString(forEncode);
8283

8384
assertNotNull(encodedMime);
8485
}
8586

8687
@Test
8788
public void whenMIMEIsEncoded_thenMIMECanBeDecoded() throws UnsupportedEncodingException {
88-
StringBuilder buffer = getMimeBuffer();
89+
final StringBuilder buffer = getMimeBuffer();
8990

90-
byte[] forEncode = buffer.toString().getBytes();
91-
String encodedMime = Base64.getMimeEncoder().encodeToString(forEncode);
91+
final byte[] forEncode = buffer.toString().getBytes();
92+
final String encodedMime = Base64.getMimeEncoder().encodeToString(forEncode);
9293

93-
byte[] decodedBytes = Base64.getMimeDecoder().decode(encodedMime);
94-
String decodedMime = new String(decodedBytes);
94+
final byte[] decodedBytes = Base64.getMimeDecoder().decode(encodedMime);
95+
final String decodedMime = new String(decodedBytes);
9596
assertNotNull(decodedMime);
9697
}
9798

99+
//
100+
98101
private static StringBuilder getMimeBuffer() {
99-
StringBuilder buffer = new StringBuilder();
102+
final StringBuilder buffer = new StringBuilder();
100103
for (int count = 0; count < 10; ++count) {
101104
buffer.append(UUID.randomUUID().toString());
102105
}

0 commit comments

Comments
 (0)