From 5e19efbad8ddc21c82af4e3a76c02bccbe6adef2 Mon Sep 17 00:00:00 2001 From: Julien Riou Date: Sun, 28 Feb 2021 09:45:19 +0100 Subject: [PATCH] Replace strings with regexp for Twitter hashtags Signed-off-by: Julien Riou --- twitter_test.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/twitter_test.go b/twitter_test.go index 2c652f7..0ce7b65 100644 --- a/twitter_test.go +++ b/twitter_test.go @@ -11,14 +11,18 @@ func TestBuildHashtags(t *testing.T) { expected string }{ {"MSI GeForce RTX 3060 GAMING X", "#nvidia #rtx3060"}, - {"MSI GeForce RTX 3060 Ti GAMING X", "#nvidia #rtx3060ti"}, + {"MSI GeForce RTX 3060 Ti GAMING X", "#nvidia #rtx3060ti"}, // with space (3060 Ti) + {"MSI RTX 3060Ti VENTUS 2X OC", "#nvidia #rtx3060ti"}, // without space (3060Ti) {"MSI GeForce RTX 3070 GAMING TRIO", "#nvidia #rtx3070"}, {"MSI GeForce RTX 3080 SUPRIM X", "#nvidia #rtx3080"}, {"MSI GeForce RTX 3090 GAMING X TRIO 24G", "#nvidia #rtx3090"}, - {"MSI Radeon RX 5700 XT GAMING X", "#amd #rx5700xt"}, + {"MSI Radeon RX 5700 XT GAMING X", "#amd #rx5700xt"}, // with space (5700 XT) + {"ASUS Radeon RX 5700XT ROG-STRIX-RX5700XT-O8G-GAMING", "#amd #rx5700xt"}, // without space (5700XT) {"MSI Radeon RX 6800", "#amd #rx6800"}, - {"MSI Radeon RX 6800 XT", "#amd #rx6800xt"}, - {"MSI Radeon RX 6900 XT GAMING X TRIO 16G", "#amd #rx6900xt"}, + {"MSI Radeon RX 6800 XT", "#amd #rx6800xt"}, // with space (6800 XT) + {"POWERCOLOR RX 6800XT Red Dragon", "#amd #rx6800xt"}, // without space (6800XT) + {"MSI Radeon RX 6900 XT GAMING X TRIO 16G", "#amd #rx6900xt"}, // with space (6900 XT) + {"POWERCOLOR RED DEVIL RX 6900XT 16GB", "#amd #rx6900xt"}, // without space (6900XT) {"unknown product", ""}, {"", ""}, } @@ -28,19 +32,15 @@ func TestBuildHashtags(t *testing.T) { user: nil, db: nil, hashtagsMap: []map[string]string{ - {"rtx 3060 ti": "#nvidia #rtx3060ti"}, - {"rtx 3060ti": "#nvidia #rtx3060ti"}, + {"rtx 3060( )?ti": "#nvidia #rtx3060ti"}, {"rtx 3060": "#nvidia #rtx3060"}, {"rtx 3070": "#nvidia #rtx3070"}, {"rtx 3080": "#nvidia #rtx3080"}, {"rtx 3090": "#nvidia #rtx3090"}, - {"rx 6800 xt": "#amd #rx6800xt"}, - {"rx 6800xt": "#amd #rx6800xt"}, - {"rx 6900xt": "#amd #rx6900xt"}, - {"rx 6900 xt": "#amd #rx6900xt"}, + {"rx 6800( )?xt": "#amd #rx6800xt"}, + {"rx 6900( )?xt": "#amd #rx6900xt"}, {"rx 6800": "#amd #rx6800"}, - {"rx 5700 xt": "#amd #rx5700xt"}, - {"rx 5700xt": "#amd #rx5700xt"}, + {"rx 5700( )?xt": "#amd #rx5700xt"}, }, } @@ -48,9 +48,9 @@ func TestBuildHashtags(t *testing.T) { t.Run(fmt.Sprintf("TestBuildHashtags#%d", i), func(t *testing.T) { got := notifier.buildHashtags(tc.input) if got != tc.expected { - t.Errorf("got %s, want %s", got, tc.expected) + t.Errorf("for %s, got %s, want %s", tc.input, got, tc.expected) } else { - t.Logf("success") + t.Logf("for %s, want %s, got %s", tc.input, got, tc.expected) } }) }