Skip to content

Commit 8179a1c

Browse files
committed
Update parent pom which switched to Junit 5
1 parent 5d5ddf6 commit 8179a1c

File tree

4 files changed

+20
-30
lines changed

4 files changed

+20
-30
lines changed

Diff for: pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.github.bbottema</groupId>
88
<artifactId>standard-project-parent</artifactId>
9-
<version>1.0.24</version>
9+
<version>1.0.42</version>
1010
</parent>
1111

1212
<groupId>org.simplejavamail</groupId>

Diff for: src/test/java/org/simplejavamail/utils/mail/dkim/CannonicalizationTest.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.simplejavamail.utils.mail.dkim;
22

3-
import static org.junit.Assert.assertEquals;
3+
import org.junit.jupiter.api.Test;
44

5-
import org.junit.Test;
5+
import static org.assertj.core.api.Assertions.assertThat;
6+
import static org.junit.jupiter.api.Assertions.assertEquals;
67

78
public class CannonicalizationTest {
89

@@ -62,10 +63,9 @@ private void checkBody(String body, String simpleResult, String relaxedResult, S
6263

6364
}
6465

65-
private void checkBody(Canonicalization canonicalization, String body, String result, String description) {
66-
67-
assertEquals(canonicalization.name() + " / " + description, result, canonicalization.canonicalizeBody(body));
68-
66+
private void checkBody(Canonicalization canonicalization, String body, String actual, String description) {
67+
String expected = canonicalization.name() + " / " + description;
68+
String message = canonicalization.canonicalizeBody(body);
69+
assertThat(actual).as(message).isEqualTo(expected);
6970
}
70-
71-
}
71+
}

Diff for: src/test/java/org/simplejavamail/utils/mail/dkim/DkimMessageTest.java

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.simplejavamail.utils.mail.dkim;
22

3-
import static org.junit.Assert.assertArrayEquals;
4-
53
import java.io.ByteArrayOutputStream;
64
import java.io.File;
75
import java.io.IOException;
@@ -14,9 +12,10 @@
1412
import jakarta.mail.Session;
1513
import jakarta.mail.internet.InternetAddress;
1614
import jakarta.mail.internet.MimeMessage;
15+
import org.junit.jupiter.api.BeforeEach;
16+
import org.junit.jupiter.api.Test;
1717

18-
import org.junit.Before;
19-
import org.junit.Test;
18+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
2019

2120
public class DkimMessageTest {
2221

@@ -58,7 +57,7 @@ private static void createSignedMessage(Canonicalization canonicalization, Signi
5857
Utils.write(new File("./src/test/resources/" + folderName, file.getName()), bytes);
5958
}
6059

61-
@Before
60+
@BeforeEach
6261
public void fixateSystemTimeZone() {
6362
System.setProperty("user.timezone", "UTC");
6463
}
@@ -84,8 +83,7 @@ private void checkCreatesSameMessageAsBefore(Canonicalization canonicalization,
8483
byte[] actual = writeMessage(Utils.getSigner(canonicalization, algorithm), body);
8584

8685
String configuration = canonicalization.name() + " " + algorithm.getHashNotation().toUpperCase();
87-
assertArrayEquals(configuration + " / " + file.getName(), expected, actual);
88-
86+
assertArrayEquals(expected, actual, configuration + " / " + file.getName());
8987
}
9088

9189
private static String getFolderName(Canonicalization canonicalization, SigningAlgorithm algorithm) {

Diff for: src/test/java/org/simplejavamail/utils/mail/dkim/DomainKeyTest.java

+6-14
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
package org.simplejavamail.utils.mail.dkim;
22

3-
import static org.junit.Assert.assertArrayEquals;
4-
import static org.junit.Assert.assertEquals;
5-
import static org.junit.Assert.assertNotNull;
6-
73
import java.io.ByteArrayOutputStream;
84
import java.util.Base64;
95
import java.util.HashMap;
@@ -16,8 +12,10 @@
1612
import jakarta.mail.Session;
1713
import jakarta.mail.internet.InternetAddress;
1814
import jakarta.mail.internet.MimeMessage;
15+
import org.junit.jupiter.api.Test;
1916

20-
import org.junit.Test;
17+
import static org.assertj.core.api.Assertions.assertThat;
18+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
2119

2220
public class DomainKeyTest {
2321

@@ -35,16 +33,13 @@ public void checkDomainKeyRecognizesPublicKey() throws Exception {
3533

3634
DomainKey domainKey = new DomainKey(tags);
3735

38-
assertNotNull(domainKey);
36+
assertThat(domainKey).isNotNull();
3937
assertArrayEquals(Base64.getDecoder().decode(EXAMPLE_DOMAIN_KEY), domainKey.getPublicKey().getEncoded());
40-
4138
}
4239

4340
@Test
4441
public void checkHashWithEmptyBody() throws Exception {
45-
4642
checkBodyHash("", "empty body");
47-
4843
}
4944

5045
private void checkBodyHash(String body, String description) throws Exception {
@@ -56,15 +51,12 @@ private void checkBodyHash(String body, String description) throws Exception {
5651
}
5752
}
5853

59-
private void checkBodyHash(Canonicalization canonicalization, SigningAlgorithm algorithm, String body,
60-
String description) throws Exception {
61-
54+
private void checkBodyHash(Canonicalization canonicalization, SigningAlgorithm algorithm, String body, String description) throws Exception {
6255
String configuration = canonicalization.name() + " " + algorithm.getHashNotation().toUpperCase();
6356
String expected = Utils.digest(canonicalization.canonicalizeBody(body), algorithm.getHashNotation());
6457
String actual = calculateBodyHashWithSigner(Utils.getSigner(canonicalization, algorithm));
6558

66-
assertEquals(configuration + " / " + description, expected, actual);
67-
59+
assertThat(actual).as(configuration + " / " + description).isEqualTo(expected);
6860
}
6961

7062
private String calculateBodyHashWithSigner(DkimSigner dkimSigner) throws Exception {

0 commit comments

Comments
 (0)