(commons-net) branch master updated: Simplify test fixtures

[gg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git


The following commit(s) were added to refs/heads/master by this push:
     new 8d47a19a Simplify test fixtures
8d47a19a is described below

commit 8d47a19a7a4fcc92bd034dfc5a0bfd4a9063ef4f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Mar 14 15:35:18 2025 -0400

    Simplify test fixtures
    
    - Javadoc
    - Better local variable names
---
 .../commons/net/smtp/SimpleSMTPHeaderTestCase.java | 39 +++++++++++-----------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java b/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java
index cfe5ff47..b25701b4 100644
--- a/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java
+++ b/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java
@@ -31,12 +31,14 @@ import java.util.regex.Pattern;
 import org.junit.Before;
 import org.junit.Test;
 
+/**
+ * Tests {@link SimpleSMTPHeader}.
+ */
 public class SimpleSMTPHeaderTestCase {
 
-    private SimpleSMTPHeader header;
     private Date beforeDate;
 
-    // Returns the msg without a date
+    /** Returns the msg without a date. */
     private String checkDate(final String msg) {
         final Pattern pat = Pattern.compile("^(Date: (.+))$", Pattern.MULTILINE);
         final Matcher m = pat.matcher(msg);
@@ -75,33 +77,32 @@ public class SimpleSMTPHeaderTestCase {
     @Before
     public void setUp() {
         beforeDate = new Date();
-        header = new SimpleSMTPHeader("from@here.invalid", "to@there.invalid", "Test email");
     }
 
     @Test
     public void testToString() {
-        assertNotNull(header);
         // Note that the DotTerminatedMessageWriter converts LF to CRLF
+        final SimpleSMTPHeader header = new SimpleSMTPHeader("from@here.invalid", "to@there.invalid", "Test email");
         assertEquals("From: from@here.invalid\nTo: to@there.invalid\nSubject: Test email\n\n", checkDate(header.toString()));
     }
 
     @Test
     public void testToStringAddHeader() {
-        final SimpleSMTPHeader fromHeader = new SimpleSMTPHeader("from@here.invalid", null, null);
-        assertNotNull(fromHeader);
-        fromHeader.addHeaderField("X-Header1", "value 1");
-        fromHeader.addHeaderField("X-Header2", "value 2");
+        final SimpleSMTPHeader header = new SimpleSMTPHeader("from@here.invalid", null, null);
+        assertNotNull(header);
+        header.addHeaderField("X-Header1", "value 1");
+        header.addHeaderField("X-Header2", "value 2");
         // Note that the DotTerminatedMessageWriter converts LF to CRLF
-        assertEquals("X-Header1: value 1\nX-Header2: value 2\nFrom: from@here.invalid\n\n", checkDate(fromHeader.toString()));
+        assertEquals("X-Header1: value 1\nX-Header2: value 2\nFrom: from@here.invalid\n\n", checkDate(header.toString()));
     }
 
     @Test
     public void testToStringAddHeaderDate() {
-        final SimpleSMTPHeader hdr = new SimpleSMTPHeader("from@here.invalid", null, null);
-        assertNotNull(hdr);
-        hdr.addHeaderField("Date", "dummy date");
+        final SimpleSMTPHeader header = new SimpleSMTPHeader("from@here.invalid", null, null);
+        assertNotNull(header);
+        header.addHeaderField("Date", "dummy date");
         // does not replace the Date field
-        assertEquals("Date: dummy date\nFrom: from@here.invalid\n\n", hdr.toString());
+        assertEquals("Date: dummy date\nFrom: from@here.invalid\n\n", header.toString());
     }
 
     @Test
@@ -111,17 +112,17 @@ public class SimpleSMTPHeaderTestCase {
 
     @Test
     public void testToStringNoSubject() {
-        final SimpleSMTPHeader hdr = new SimpleSMTPHeader("from@here.invalid", "to@there.invalid", null);
-        assertNotNull(hdr);
+        final SimpleSMTPHeader header = new SimpleSMTPHeader("from@here.invalid", "to@there.invalid", null);
+        assertNotNull(header);
         // Note that the DotTerminatedMessageWriter converts LF to CRLF
-        assertEquals("From: from@here.invalid\nTo: to@there.invalid\n\n", checkDate(hdr.toString()));
+        assertEquals("From: from@here.invalid\nTo: to@there.invalid\n\n", checkDate(header.toString()));
     }
 
     @Test
     public void testToStringNoTo() {
-        final SimpleSMTPHeader hdr = new SimpleSMTPHeader("from@here.invalid", null, null);
-        assertNotNull(hdr);
+        final SimpleSMTPHeader header = new SimpleSMTPHeader("from@here.invalid", null, null);
+        assertNotNull(header);
         // Note that the DotTerminatedMessageWriter converts LF to CRLF
-        assertEquals("From: from@here.invalid\n\n", checkDate(hdr.toString()));
+        assertEquals("From: from@here.invalid\n\n", checkDate(header.toString()));
     }
 }