From 3cba5f70fdf2a257f8d012acd2d8645fa02cfc5b Mon Sep 17 00:00:00 2001
From: Deluan <deluan@deluan.com>
Date: Tue, 24 Mar 2020 11:58:58 -0400
Subject: [PATCH] chore: add tests for all utils, removed unused functions

---
 utils/index_group_parser_test.go |  57 ++++++-----
 utils/ints_test.go               |  40 ++++++++
 utils/request_helpers_test.go    | 156 +++++++++++++++++++++++++++++++
 utils/strings.go                 |  25 -----
 utils/strings_test.go            | 155 +++++++-----------------------
 utils/time_test.go               |  17 ++--
 utils/utils_suite_test.go        |  13 +++
 7 files changed, 275 insertions(+), 188 deletions(-)
 create mode 100644 utils/ints_test.go
 create mode 100644 utils/request_helpers_test.go
 create mode 100644 utils/utils_suite_test.go

diff --git a/utils/index_group_parser_test.go b/utils/index_group_parser_test.go
index 16c747333..47fb804e1 100644
--- a/utils/index_group_parser_test.go
+++ b/utils/index_group_parser_test.go
@@ -1,43 +1,38 @@
 package utils
 
 import (
-	. "github.com/smartystreets/goconvey/convey"
-	"testing"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
 )
 
-func TestParseIndexGroup(t *testing.T) {
+var _ = Describe("ParseIndexGroup", func() {
+	Context("Two simple entries", func() {
+		It("returns the entries", func() {
+			parsed := ParseIndexGroups("A The")
 
-	Convey("Two simple entries", t, func() {
-		parsed := ParseIndexGroups("A The")
-
-		So(parsed, ShouldContainKey, "A")
-		So(parsed["A"], ShouldEqual, "A")
-
-		So(parsed, ShouldContainKey, "The")
-		So(parsed["The"], ShouldEqual, "The")
+			Expect(parsed).To(HaveLen(2))
+			Expect(parsed["A"]).To(Equal("A"))
+			Expect(parsed["The"]).To(Equal("The"))
+		})
 	})
-
-	Convey("An entry with a group", t, func() {
+	Context("An entry with a group", func() {
 		parsed := ParseIndexGroups("A-C(ABC) Z")
 
-		So(parsed, ShouldContainKey, "A")
-		So(parsed["A"], ShouldEqual, "A-C")
-		So(parsed, ShouldContainKey, "B")
-		So(parsed["B"], ShouldEqual, "A-C")
-		So(parsed, ShouldContainKey, "C")
-		So(parsed["C"], ShouldEqual, "A-C")
-
-		So(parsed["Z"], ShouldEqual, "Z")
-
+		It("parses the groups correctly", func() {
+			Expect(parsed).To(HaveLen(4))
+			Expect(parsed["A"]).To(Equal("A-C"))
+			Expect(parsed["B"]).To(Equal("A-C"))
+			Expect(parsed["C"]).To(Equal("A-C"))
+			Expect(parsed["Z"]).To(Equal("Z"))
+		})
 	})
-	Convey("Correctly parses UTF-8", t, func() {
+	Context("Correctly parses UTF-8", func() {
 		parsed := ParseIndexGroups("UTF8(宇A海)")
-
-		So(parsed, ShouldContainKey, "宇")
-		So(parsed["宇"], ShouldEqual, "UTF8")
-		So(parsed, ShouldContainKey, "A")
-		So(parsed["A"], ShouldEqual, "UTF8")
-		So(parsed, ShouldContainKey, "海")
-		So(parsed["海"], ShouldEqual, "UTF8")
+		It("parses the groups correctly", func() {
+			Expect(parsed).To(HaveLen(3))
+			Expect(parsed["宇"]).To(Equal("UTF8"))
+			Expect(parsed["A"]).To(Equal("UTF8"))
+			Expect(parsed["海"]).To(Equal("UTF8"))
+		})
 	})
-}
+})
diff --git a/utils/ints_test.go b/utils/ints_test.go
new file mode 100644
index 000000000..536cbbb9f
--- /dev/null
+++ b/utils/ints_test.go
@@ -0,0 +1,40 @@
+package utils
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Int utils", func() {
+	Describe("MinInt", func() {
+		It("returns the first value if it is the smallest", func() {
+			Expect(MinInt(1, 2)).To(Equal(1))
+		})
+		It("returns the second value if it is the smallest", func() {
+			Expect(MinInt(-4, -6)).To(Equal(-6))
+		})
+	})
+
+	Describe("MaxInt", func() {
+		It("returns the first value if it is the biggest", func() {
+			Expect(MaxInt(1, 2)).To(Equal(2))
+		})
+		It("returns the second value if it is the smallest", func() {
+			Expect(MaxInt(-4, -6)).To(Equal(-4))
+		})
+	})
+
+	Describe("IntInSlice", func() {
+		It("returns false if slice is empty", func() {
+			Expect(IntInSlice(1, nil)).To(BeFalse())
+		})
+
+		It("returns false if number is not in slice", func() {
+			Expect(IntInSlice(1, []int{3, 4, 5})).To(BeFalse())
+		})
+
+		It("returns true if number is in slice", func() {
+			Expect(IntInSlice(4, []int{3, 4, 5})).To(BeTrue())
+		})
+	})
+})
diff --git a/utils/request_helpers_test.go b/utils/request_helpers_test.go
new file mode 100644
index 000000000..0e1a1eaa2
--- /dev/null
+++ b/utils/request_helpers_test.go
@@ -0,0 +1,156 @@
+package utils
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"time"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Request Helpers", func() {
+	var r *http.Request
+
+	Describe("ParamString", func() {
+		BeforeEach(func() {
+			r = httptest.NewRequest("GET", "/ping?a=123", nil)
+		})
+
+		It("returns empty string if param does not exist", func() {
+			Expect(ParamString(r, "xx")).To(Equal(""))
+		})
+
+		It("returns param as string", func() {
+			Expect(ParamString(r, "a")).To(Equal("123"))
+		})
+	})
+
+	Describe("ParamStrings", func() {
+		BeforeEach(func() {
+			r = httptest.NewRequest("GET", "/ping?a=123&a=456", nil)
+		})
+
+		It("returns empty array if param does not exist", func() {
+			Expect(ParamStrings(r, "xx")).To(BeEmpty())
+		})
+
+		It("returns all param occurrences as []string", func() {
+			Expect(ParamStrings(r, "a")).To(Equal([]string{"123", "456"}))
+		})
+	})
+
+	Describe("ParamTime", func() {
+		d := time.Date(2002, 8, 9, 12, 11, 13, 1000000, time.Local)
+		t := ToMillis(d)
+		now := time.Now()
+		BeforeEach(func() {
+			r = httptest.NewRequest("GET", fmt.Sprintf("/ping?t=%d&inv=abc", t), nil)
+		})
+
+		It("returns default time if param does not exist", func() {
+			Expect(ParamTime(r, "xx", now)).To(Equal(now))
+		})
+
+		It("returns default time if param is an invalid timestamp", func() {
+			Expect(ParamTime(r, "inv", now)).To(Equal(now))
+		})
+
+		It("returns parsed time", func() {
+			Expect(ParamTime(r, "t", now)).To(Equal(d))
+		})
+	})
+
+	Describe("ParamTimes", func() {
+		d1 := time.Date(2002, 8, 9, 12, 11, 13, 1000000, time.Local)
+		d2 := time.Date(2002, 8, 9, 12, 13, 56, 0000000, time.Local)
+		t1 := ToMillis(d1)
+		t2 := ToMillis(d2)
+		BeforeEach(func() {
+			r = httptest.NewRequest("GET", fmt.Sprintf("/ping?t=%d&t=%d", t1, t2), nil)
+		})
+
+		It("returns empty string if param does not exist", func() {
+			Expect(ParamTimes(r, "xx")).To(BeEmpty())
+		})
+
+		It("returns all param occurrences as []time.Time", func() {
+			Expect(ParamTimes(r, "t")).To(Equal([]time.Time{d1, d2}))
+		})
+	})
+
+	Describe("ParamInt", func() {
+		BeforeEach(func() {
+			r = httptest.NewRequest("GET", "/ping?i=123&inv=123.45", nil)
+		})
+
+		It("returns default value if param does not exist", func() {
+			Expect(ParamInt(r, "xx", 999)).To(Equal(999))
+		})
+
+		It("returns default value if param is an invalid int", func() {
+			Expect(ParamInt(r, "inv", 999)).To(Equal(999))
+		})
+
+		It("returns parsed time", func() {
+			Expect(ParamInt(r, "i", 999)).To(Equal(123))
+		})
+	})
+
+	Describe("ParamInts", func() {
+		BeforeEach(func() {
+			r = httptest.NewRequest("GET", "/ping?i=123&i=456", nil)
+		})
+
+		It("returns empty array if param does not exist", func() {
+			Expect(ParamInts(r, "xx")).To(BeEmpty())
+		})
+
+		It("returns array of occurrences found", func() {
+			Expect(ParamInts(r, "i")).To(Equal([]int{123, 456}))
+		})
+	})
+
+	Describe("ParamBool", func() {
+		Context("value is true", func() {
+			BeforeEach(func() {
+				r = httptest.NewRequest("GET", "/ping?b=true&c=on&d=1", nil)
+			})
+
+			It("parses 'true'", func() {
+				Expect(ParamBool(r, "b", false)).To(BeTrue())
+			})
+
+			It("parses 'on'", func() {
+				Expect(ParamBool(r, "c", false)).To(BeTrue())
+			})
+
+			It("parses '1'", func() {
+				Expect(ParamBool(r, "d", false)).To(BeTrue())
+			})
+		})
+
+		Context("value is false", func() {
+			BeforeEach(func() {
+				r = httptest.NewRequest("GET", "/ping?b=false&c=off&d=0", nil)
+			})
+
+			It("returns default value if param does not exist", func() {
+				Expect(ParamBool(r, "xx", true)).To(BeTrue())
+			})
+
+			It("parses 'false'", func() {
+				Expect(ParamBool(r, "b", true)).To(BeFalse())
+			})
+
+			It("parses 'off'", func() {
+				Expect(ParamBool(r, "c", true)).To(BeFalse())
+			})
+
+			It("parses '0'", func() {
+				Expect(ParamBool(r, "d", true)).To(BeFalse())
+			})
+		})
+	})
+})
diff --git a/utils/strings.go b/utils/strings.go
index b0e6ca0ef..1611a19db 100644
--- a/utils/strings.go
+++ b/utils/strings.go
@@ -16,28 +16,3 @@ func NoArticle(name string) string {
 	}
 	return name
 }
-
-func LongestCommonPrefix(list []string) string {
-	if len(list) == 0 {
-		return ""
-	}
-
-	for l := 0; l < len(list[0]); l++ {
-		c := list[0][l]
-		for i := 1; i < len(list); i++ {
-			if l >= len(list[i]) || list[i][l] != c {
-				return list[i][0:l]
-			}
-		}
-	}
-	return list[0]
-}
-
-func StringInSlice(a string, list []string) bool {
-	for _, b := range list {
-		if b == a {
-			return true
-		}
-	}
-	return false
-}
diff --git a/utils/strings_test.go b/utils/strings_test.go
index 53ee8d4af..d5cde3049 100644
--- a/utils/strings_test.go
+++ b/utils/strings_test.go
@@ -1,128 +1,37 @@
 package utils
 
 import (
-	"testing"
+	"github.com/deluan/navidrome/conf"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
 )
 
-func TestLongestCommonPrefix(t *testing.T) {
-	expected := "/Music/iTunes 1/iTunes Media/Music/"
-	actual := LongestCommonPrefix(testStrings)
-	if actual != expected {
-		t.Errorf("Couldn't find longest common prefix: want '%s', got '%s'", expected, actual)
-	}
-}
-
-var testStrings = []string{
-	"/Music/iTunes 1/iTunes Media/Music/ABBA/Gold_ Greatest Hits/Dancing Queen.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/ABBA/Gold_ Greatest Hits/Mamma Mia.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Art Blakey/A Night At Birdland, Vol. 1/01 Annoucement By Pee Wee Marquette.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Art Blakey/A Night At Birdland, Vol. 1/02 Split Kick.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/As Frenéticas/As Frenéticas/Perigosa.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Bachman-Turner Overdrive/Gold/Down Down.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Bachman-Turner Overdrive/Gold/Hey You.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Bachman-Turner Overdrive/Gold/Hold Back The Water.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Belle And Sebastian/Write About Love/01 I Didn't See It Coming.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Belle And Sebastian/Write About Love/02 Come On Sister.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Black Eyed Peas/Elephunk/03 Let's Get Retarded.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Black Eyed Peas/Elephunk/04 Hey Mama.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Black Eyed Peas/Monkey Business/10 They Don't Want Music (Feat. James Brown).m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Black Eyed Peas/The E.N.D/1-01 Boom Boom Pow.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Black Eyed Peas/Timeless/01 Mas Que Nada.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Blondie/Heart Of Glass/Heart Of Glass.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Bob Dylan/Nashville Skyline/06 Lay Lady Lay.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Botany/Feeling Today - EP/03 Waterparker.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Céu/CéU/06 10 Contados.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Chance/Six Through Ten/03 Forgive+Forget.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Clive Tanaka Y Su Orquesta/Jet Set Siempre 1°/03 Neu Chicago (Side A) [For Dance].m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Absolute Rock Classics/1-02 Smoke on the water.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Almost Famous Soundtrack/10 Simple Man.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Audio News - Rock'n' Roll Forever/01 Rock Around The Clock.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Austin Powers_ International Man Of Mystery/01 The Magic Piper (Of Love).m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Austin Powers_ The Spy Who Shagged Me/04 American Woman.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Back To Dance/03 Long Cool Woman In A Black Dress.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Back To The 70's - O Album Da Década/03 American Pie.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Bambolê/09 In The Mood.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Bambolê - Volume II/03 Blue Moon.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Big Brother Brasil 2004/04 I Will Survive.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Collateral Soundtrack/03 Hands Of Time.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Estúpido Cupido/08 The Twist.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Forrest Gump - The Soundtrack/1-12 California Dreamin'.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Forrest Gump - The Soundtrack/1-16 Mrs. Robinson.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Ghost World - Original Motion Picture Soundtrack/01 Jaan Pechechaan Ho.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Grease [Original Soundtrack]/01 Grease.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/La Bamba/09 Summertime Blues.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Pretty Woman/10 Oh Pretty Woman.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Putumayo Presents African Groove/01 Saye Mogo Bana.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Putumayo Presents Arabic Groove/02 Galbi.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Putumayo Presents Asian Groove/03 Remember Tomorrow.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Putumayo Presents Blues Lounge/01 Midnight Dream.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Putumayo Presents Blues Lounge/03 Banal Reality.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Putumayo Presents Blues Lounge/04 Parchman Blues.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Putumayo Presents Blues Lounge/06 Run On.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Putumayo Presents Brazilian Groove/01 Maria Moita.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Putumayo Presents Brazilian Lounge/08 E Depois....m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Putumayo Presents Brazilian Lounge/11 Os Grilos.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Putumayo Presents Euro Lounge/01 Un Simple Histoire.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Putumayo Presents Euro Lounge/02 Limbe.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Putumayo Presents Euro Lounge/05 Sempre Di Domenica.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Putumayo Presents Euro Lounge/12 Voulez-Vous_.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Putumayo Presents World Lounge/03 Santa Maria.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Putumayo Presents_ A New Groove/02 Dirty Laundry.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Putumayo Presents_ Blues Around the World/02 Canceriano Sem Lar (Clinica Tobias Blues).m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Putumayo Presents_ Euro Groove/03 Check In.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Putumayo Presents_ World Groove/01 Attention.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Saturday Night Fever/01 Stayin' Alive.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/Saturday Night Fever/03 Night Fever.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/The Best Air Guitar Album In The World... Ever!/2-06 Johnny B. Goode.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/The Full Monty - Soundtrack/02 You Sexy Thing.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Compilations/The Full Monty - Soundtrack/11 We Are Family.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Cut Copy/Zonoscope (Bonus Version)/10 Corner of the Sky.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/David Bowie/Changesbowie/07 Diamond Dogs.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Douster & Savage Skulls/Get Rich or High Tryin' - EP/01 Bad Gal.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Elton John/Greatest Hits 1970-2002/1-04 Rocket Man (I Think It's Going to Be a Long, Long Time).m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Elvis Presley/ELV1S 30 #1 Hits/02 Don't Be Cruel.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Eric Clapton/The Cream Of Clapton/03 I Feel Free.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Fleetwood Mac/The Very Best Of Fleetwood Mac/02 Don't Stop.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Françoise Hardy/Comment te dire adieu/Comment te dire adieu.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Games/That We Can Play - EP/01 Strawberry Skies.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Grand Funk Railroad/Collectors Series/The Loco-Motion.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Henry Mancini/The Pink Panther (Music from the Film Score)/The Pink Panther Theme.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Holy Ghost!/Do It Again - Single/01 Do It Again.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/K.C. & The Sunshine Band/The Best of/03 I'm Your Boogie Man.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/K.C. & The Sunshine Band/Unknown Album/Megamix (Thats The Way, Shake Your Booty, Get Down Tonight, Give It Up).m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Kim Ann Foxman & Andy Butler/Creature - EP/01 Creature.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Nico/Chelsea Girl/01 The Fairest Of The Seasons.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/oOoOO/oOoOO - EP/02 Burnout Eyess.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Peter Frampton/The Very Best of Peter Frampton/Baby, I Love Your Way.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Peter Frampton/The Very Best of Peter Frampton/Show Me The Way.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Raul Seixas/A Arte De Raul Seixas/03 Metamorfose Ambulante.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Raul Seixas/A Arte De Raul Seixas/18 Eu Nasci há 10 Mil Anos Atrás.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Rick James/Street Songs/Super Freak.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Rita Lee/Fruto Proibido/Agora Só Falta Você.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Rita Lee/Fruto Proibido/Esse Tal De Roque Enrow.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Roberto Carlos/Roberto Carlos 1966/05 Negro Gato.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/SOHO/Goddess/02 Hippychick.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Stan Getz/Getz_Gilberto/05 Corcovado (Quiet Nights of Quiet Stars).m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Steely Dan/Pretzel Logic/Rikki Don't Loose That Number.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Stevie Wonder/For Once In My Life/I Don't Know Why.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Teebs/Ardour/While You Doooo.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/The Beatles/Magical Mystery Tour/08 Strawberry Fields Forever.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/The Beatles/Past Masters, Vol. 1/10 Long Tall Sally.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/The Beatles/Please Please Me/14 Twist And Shout.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/The Beatles/Sgt. Pepper's Lonely Hearts Club Band/03 Lucy In The Sky With Diamonds.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/The Black Crowes/Amorica/09 Wiser Time.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/The Black Crowes/By Your Side/05 Only A Fool.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/The Black Crowes/Shake Your Money Maker/04 Could I''ve Been So Blind.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/The Black Crowes/The Southern Harmony And Musical Companion/01 Sting Me.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/The Black Crowes/Three Snakes And One Charm/02 Good Friday.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/The Doors/Strange Days (40th Anniversary Mixes)/01 Strange Days.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/The Rolling Stones/Forty Licks/1-03 (I Can't Get No) Satisfaction.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/The Velvet Underground/The Velvet Underground & Nico/02 I'm Waiting For The Man.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/The Velvet Underground/The Velvet Underground & Nico/03 Femme Fatale.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/The Velvet Underground/White Light_White Heat/04 Here She Comes Now.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/The Who/Sings My Generation/My Generation.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Village People/The Very Best Of Village People/Macho Man.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Vondelpark/Sauna - EP/01 California Analog Dream.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/War/Why Can't We Be Friends/Low Rider.m4a",
-	"/Music/iTunes 1/iTunes Media/Music/Yes/Fragile/01 Roundabout.m4a",
-}
+var _ = Describe("Strings", func() {
+	Describe("NoArticle", func() {
+		Context("Empty articles list", func() {
+			BeforeEach(func() {
+				conf.Server.IgnoredArticles = ""
+			})
+			It("returns empty if string is empty", func() {
+				Expect(NoArticle("")).To(BeEmpty())
+			})
+			It("returns same string", func() {
+				Expect(NoArticle("The Beatles")).To(Equal("The Beatles"))
+			})
+		})
+		Context("Default articles", func() {
+			BeforeEach(func() {
+				conf.Server.IgnoredArticles = "The El La Los Las Le Les Os As O A"
+			})
+			It("returns empty if string is empty", func() {
+				Expect(NoArticle("")).To(BeEmpty())
+			})
+			It("remove prefix article from string", func() {
+				Expect(NoArticle("Os Paralamas do Sucesso")).To(Equal("Paralamas do Sucesso"))
+			})
+			It("does not remove article if it is part of the first word", func() {
+				Expect(NoArticle("Thelonious Monk")).To(Equal("Thelonious Monk"))
+			})
+		})
+	})
+})
diff --git a/utils/time_test.go b/utils/time_test.go
index 91e053658..802690087 100644
--- a/utils/time_test.go
+++ b/utils/time_test.go
@@ -1,17 +1,16 @@
 package utils
 
 import (
-	"testing"
 	"time"
 
-	. "github.com/smartystreets/goconvey/convey"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
 )
 
-func TestTimeConversion(t *testing.T) {
-
-	Convey("Conversion should work both ways", t, func() {
-		now := time.Date(2002, 8, 9, 12, 11, 13, 1000000, time.Local)
-		milli := ToMillis(now)
-		So(ToTime(milli).String(), ShouldEqual, now.String())
+var _ = Describe("Time Conversion", func() {
+	It("converts from Date to Millis and back to Date", func() {
+		date := time.Date(2002, 8, 9, 12, 11, 13, 1000000, time.Local)
+		milli := ToMillis(date)
+		Expect(ToTime(milli)).To(Equal(date))
 	})
-}
+})
diff --git a/utils/utils_suite_test.go b/utils/utils_suite_test.go
new file mode 100644
index 000000000..a88d17d83
--- /dev/null
+++ b/utils/utils_suite_test.go
@@ -0,0 +1,13 @@
+package utils
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+func TestUtils(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Utils Suite")
+}