Merge 6e76c79e0a into dff929ddc9

bot/queue.go

@@ -211,22 +211,24 @@ func (q *Queue) Skip() {
 	}
 
 	// Remove all playlist skips if this is the last track of the playlist still in the queue.
-	if playlist := q.Queue[0].GetPlaylist(); playlist != nil {
-		id := playlist.GetID()
-		playlistIsFinished := true
+	if len(q.Queue) > 0 {
+		if playlist := q.Queue[0].GetPlaylist(); playlist != nil {
+			id := playlist.GetID()
+			playlistIsFinished := true
 
-		q.mutex.Unlock()
-		q.Traverse(func(i int, t interfaces.Track) {
-			if i != 0 && t.GetPlaylist() != nil {
-				if t.GetPlaylist().GetID() == id {
-					playlistIsFinished = false
+			q.mutex.Unlock()
+			q.Traverse(func(i int, t interfaces.Track) {
+				if i != 0 && t.GetPlaylist() != nil {
+					if t.GetPlaylist().GetID() == id {
+						playlistIsFinished = false
+					}
 				}
-			}
-		})
-		q.mutex.Lock()
+			})
+			q.mutex.Lock()
 
-		if playlistIsFinished {
-			DJ.Skips.ResetPlaylistSkips()
+			if playlistIsFinished {
+				DJ.Skips.ResetPlaylistSkips()
+			}
 		}
 	}
 

commands/reset_test.go

@@ -6,3 +6,86 @@
  */
 
 package commands
+
+import (
+	"testing"
+
+	"github.com/layeh/gumble/gumble"
+	"github.com/layeh/gumble/gumbleffmpeg"
+	"github.com/matthieugrieger/mumbledj/bot"
+	"github.com/spf13/viper"
+	"github.com/stretchr/testify/suite"
+)
+
+type ResetCommandTestSuite struct {
+	Command ResetCommand
+	suite.Suite
+}
+
+func (suite *ResetCommandTestSuite) SetupSuite() {
+	DJ = bot.NewMumbleDJ()
+	bot.DJ = DJ
+
+	// Trick the tests into thinking audio is already playing to avoid
+	// attempting to play tracks that don't exist.
+	DJ.AudioStream = new(gumbleffmpeg.Stream)
+
+	viper.Set("commands.reset.aliases", []string{"reset", "re"})
+	viper.Set("commands.reset.description", "Resets the queue by removing all queue items.")
+	viper.Set("commands.reset.is_admin", true)
+}
+
+func (suite *ResetCommandTestSuite) SetupTest() {
+	DJ.Queue = bot.NewQueue()
+}
+
+func (suite *ResetCommandTestSuite) TestAliases() {
+	suite.Equal([]string{"reset", "re"}, suite.Command.Aliases())
+}
+
+func (suite *ResetCommandTestSuite) TestDescription() {
+	suite.Equal("Resets the queue by removing all queue items.", suite.Command.Description())
+}
+
+func (suite *ResetCommandTestSuite) TestIsAdminCommand() {
+	suite.True(suite.Command.IsAdminCommand())
+}
+
+func (suite *ResetCommandTestSuite) TestResetWorksOnEmpty() {
+	// TODO: Assuming the Queue is currently empty, is that the case?
+	suite.Command.Execute(new(gumble.User))
+	suite.Zero(DJ.Queue.Length())
+}
+
+func (suite *ResetCommandTestSuite) TestResetWorksOneTrack() {
+	track := new(bot.Track)
+	track.Submitter = "test"
+	track.Title = "test"
+
+	DJ.Queue.AppendTrack(track)
+	// If this is non-nil, an error will occur the stream is not valid.
+	DJ.AudioStream = nil
+	suite.Command.Execute(new(gumble.User))
+	suite.Zero(DJ.Queue.Length())
+}
+
+func (suite *ResetCommandTestSuite) TestResetWorksMultipleTracks() {
+	track1 := new(bot.Track)
+	track1.Submitter = "test"
+	track1.Title = "test"
+	track2 := new(bot.Track)
+	track2.Submitter = "test"
+	track2.Title = "test"
+
+	DJ.Queue.AppendTrack(track1)
+	DJ.Queue.AppendTrack(track2)
+	// If this is non-nil, an error will occur the stream is not valid.
+	DJ.AudioStream = nil
+	suite.Command.Execute(new(gumble.User))
+	suite.Zero(DJ.Queue.Length())
+	DJ.AudioStream = new(gumbleffmpeg.Stream)
+}
+
+func TestResetCommandTestSuite(t *testing.T) {
+	suite.Run(t, new(ResetCommandTestSuite))
+}