Merge pull request #9 from shinshin86/followup-emotion-option

chore: follow-up improvements for emotion option (#7)

Author: shinshin86

cmd/vpeak/main.go

@@ -50,11 +50,15 @@ func runSpeakCommand(args []string) {
 		fmt.Println("  m2: Japanese Male 2")
 		fmt.Println("  m3: Japanese Male 3")
 		fmt.Println("  c:  Japanese Female Child")
-		fmt.Println("\nEmotion options:")
+		fmt.Println("\nEmotion options (values 0-100, comma-separate multiple):")
 		fmt.Println("  happy")
 		fmt.Println("  fun")
 		fmt.Println("  angry")
 		fmt.Println("  sad")
+		fmt.Println("\nEmotion examples:")
+		fmt.Println("  happy              (equivalent to happy=100)")
+		fmt.Println("  happy=50")
+		fmt.Println("  happy=40,fun=60")
 		fmt.Println("\nDictionary commands:")
 		fmt.Printf("  %s dict -h\n", os.Args[0])
 	}

vpeak.go

@@ -8,8 +8,8 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
-	"strings"
 	"strconv"
+	"strings"
 )
 
 var VoicepeakPath string
@@ -58,20 +58,19 @@ type Emotion struct {
 }
 
 func (e Emotion) String() string {
-	values := map[string]int{
-		"happy": e.Happy,
-		"sad":   e.Sad,
-		"angry": e.Angry,
-		"fun":   e.Fun,
-	}
-
 	var parts []string
-	for k, v := range values {
-		if v != 0 {
-			parts = append(parts, fmt.Sprintf("%s=%d", k, v))
-		}
+	if e.Happy != 0 {
+		parts = append(parts, fmt.Sprintf("happy=%d", e.Happy))
+	}
+	if e.Fun != 0 {
+		parts = append(parts, fmt.Sprintf("fun=%d", e.Fun))
+	}
+	if e.Angry != 0 {
+		parts = append(parts, fmt.Sprintf("angry=%d", e.Angry))
+	}
+	if e.Sad != 0 {
+		parts = append(parts, fmt.Sprintf("sad=%d", e.Sad))
 	}
-
 	return strings.Join(parts, ",")
 }
 

vpeak_test.go

@@ -0,0 +1,86 @@
+package vpeak
+
+import "testing"
+
+func TestParseEmotion(t *testing.T) {
+	tests := []struct {
+		name    string
+		input   string
+		want    Emotion
+		wantErr bool
+	}{
+		{"empty string", "", Emotion{}, false},
+		{"single emotion without value", "happy", Emotion{Happy: 100}, false},
+		{"single emotion with value", "happy=50", Emotion{Happy: 50}, false},
+		{"multiple emotions", "happy=40,fun=60", Emotion{Happy: 40, Fun: 60}, false},
+		{"all four emotions", "happy=10,fun=20,angry=30,sad=40", Emotion{Happy: 10, Fun: 20, Angry: 30, Sad: 40}, false},
+		{"boundary zero", "happy=0", Emotion{Happy: 0}, false},
+		{"boundary max", "happy=100", Emotion{Happy: 100}, false},
+		{"duplicate keys last wins", "happy=30,happy=70", Emotion{Happy: 70}, false},
+		{"invalid emotion name", "joyful=50", Emotion{}, true},
+		{"non-numeric value", "happy=abc", Emotion{}, true},
+		{"negative value", "happy=-1", Emotion{}, true},
+		{"value over max", "happy=101", Emotion{}, true},
+		{"empty value", "happy=", Emotion{}, true},
+		{"trailing comma", "happy=50,", Emotion{}, true},
+		{"leading comma", ",happy=50", Emotion{}, true},
+		{"empty middle segment", "happy=50,,sad=50", Emotion{}, true},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := ParseEmotion(tt.input)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("ParseEmotion(%q) error = %v, wantErr %v", tt.input, err, tt.wantErr)
+				return
+			}
+			if !tt.wantErr && got != tt.want {
+				t.Errorf("ParseEmotion(%q) = %+v, want %+v", tt.input, got, tt.want)
+			}
+		})
+	}
+}
+
+func TestEmotionString(t *testing.T) {
+	tests := []struct {
+		name string
+		e    Emotion
+		want string
+	}{
+		{"zero value", Emotion{}, ""},
+		{"only happy", Emotion{Happy: 50}, "happy=50"},
+		{"happy and fun", Emotion{Happy: 40, Fun: 60}, "happy=40,fun=60"},
+		{"all four in fixed order", Emotion{Happy: 10, Sad: 40, Angry: 30, Fun: 20}, "happy=10,fun=20,angry=30,sad=40"},
+		{"zero values are omitted", Emotion{Happy: 0, Sad: 50}, "sad=50"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := tt.e.String(); got != tt.want {
+				t.Errorf("Emotion.String() = %q, want %q", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestEmotionIsZero(t *testing.T) {
+	tests := []struct {
+		name string
+		e    Emotion
+		want bool
+	}{
+		{"all zero", Emotion{}, true},
+		{"happy set", Emotion{Happy: 1}, false},
+		{"sad set", Emotion{Sad: 1}, false},
+		{"angry set", Emotion{Angry: 1}, false},
+		{"fun set", Emotion{Fun: 1}, false},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := tt.e.IsZero(); got != tt.want {
+				t.Errorf("Emotion.IsZero() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}