From eebbaa251391b0e710f131c60046e5ce53244be7 Mon Sep 17 00:00:00 2001
From: Winni Neessen <wn@neessen.net>
Date: Fri, 25 Oct 2024 09:40:15 +0200
Subject: [PATCH] Refactor and reintegrate content type tests in file_test.go

Reintegrates previously commented out tests for file content types, ensuring they are part of a structured t.Run block. Enhances readability and maintains functionality by checking the presence and correctness of attachments in a more concise manner.
---
 file_test.go | 65 ++++++++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 35 deletions(-)

diff --git a/file_test.go b/file_test.go
index 9e23db5..66ec84f 100644
--- a/file_test.go
+++ b/file_test.go
@@ -155,39 +155,34 @@ func TestFile(t *testing.T) {
 			})
 		}
 	})
+	t.Run("WithFileContentType", func(t *testing.T) {
+		tests := []struct {
+			name        string
+			contentType ContentType
+		}{
+			{"File content-type: text/plain", TypeTextPlain},
+			{"File content-type: html/html", TypeTextHTML},
+			{"File content-type: application/octet-stream", TypeAppOctetStream},
+			{"File content-type: application/pgp-encrypted", TypePGPEncrypted},
+			{"File content-type: application/pgp-signature", TypePGPSignature},
+		}
+		for _, tt := range tests {
+			t.Run(tt.name, func(t *testing.T) {
+				message := NewMsg()
+				message.AttachFile("file.go", WithFileContentType(tt.contentType))
+				attachments := message.GetAttachments()
+				if len(attachments) <= 0 {
+					t.Fatalf("failed to retrieve attachments list")
+				}
+				firstAttachment := attachments[0]
+				if firstAttachment == nil {
+					t.Fatalf("failed to retrieve first attachment, got nil")
+				}
+				if firstAttachment.ContentType != tt.contentType {
+					t.Errorf("WithFileContentType() failed. Expected: %s, got: %s", tt.contentType,
+						firstAttachment.ContentType)
+				}
+			})
+		}
+	})
 }
-
-/*
-
-
-// TestFile_WithFileContentType tests the WithFileContentType option
-func TestFile_WithFileContentType(t *testing.T) {
-	tests := []struct {
-		name string
-		ct   ContentType
-		want string
-	}{
-		{"File content-type: text/plain", TypeTextPlain, "text/plain"},
-		{"File content-type: html/html", TypeTextHTML, "text/html"},
-		{"File content-type: application/octet-stream", TypeAppOctetStream, "application/octet-stream"},
-		{"File content-type: application/pgp-encrypted", TypePGPEncrypted, "application/pgp-encrypted"},
-		{"File content-type: application/pgp-signature", TypePGPSignature, "application/pgp-signature"},
-	}
-	for _, tt := range tests {
-		m := NewMsg()
-		t.Run(tt.name, func(t *testing.T) {
-			m.AttachFile("file.go", WithFileContentType(tt.ct))
-			al := m.GetAttachments()
-			if len(al) <= 0 {
-				t.Errorf("AttachFile() failed. Attachment list is empty")
-			}
-			a := al[0]
-			if a.ContentType != ContentType(tt.want) {
-				t.Errorf("WithFileContentType() failed. Expected: %s, got: %s", tt.want, a.ContentType)
-			}
-		})
-	}
-}
-
-
-*/