Participants: add Connected() function

- makes All() return disconnected players
- Connected() now behaves as All() did before

Author: markus-wa

datatables_test.go

@@ -42,7 +42,7 @@ func TestParser_BindNewPlayer_Issue98(t *testing.T) {
 	player := fakePlayerEntity(2)
 	p.bindNewPlayer(player)
 
-	assert.Len(t, p.GameState().Participants().All(), 1)
+	assert.Len(t, p.GameState().Participants().Connected(), 1)
 }
 
 func TestParser_BindNewPlayer_Issue98_Reconnect(t *testing.T) {

fake/participants.go

@@ -26,6 +26,11 @@ func (ptcp *Participants) All() []*common.Player {
 	return ptcp.Called().Get(0).([]*common.Player)
 }
 
+// Connected is a mock-implementation of IParticipants.Connected().
+func (ptcp *Participants) Connected() []*common.Player {
+	return ptcp.Called().Get(0).([]*common.Player)
+}
+
 // Playing is a mock-implementation of IParticipants.Playing().
 func (ptcp *Participants) Playing() []*common.Player {
 	return ptcp.Called().Get(0).([]*common.Player)

game_state.go

@@ -168,9 +168,19 @@ func (ptcp Participants) ByEntityID() map[int]*common.Player {
 	return res
 }
 
-// All returns all currently connected players & spectators.
+// All returns all currently known players & spectators, including disconnected ones, of the demo.
 // The returned slice is a snapshot and is not updated on changes.
 func (ptcp Participants) All() []*common.Player {
+	res := make([]*common.Player, 0, len(ptcp.playersByUserID))
+	for _, p := range ptcp.playersByUserID {
+		res = append(res, p)
+	}
+	return res
+}
+
+// Connected returns all currently connected players & spectators.
+// The returned slice is a snapshot and is not updated on changes.
+func (ptcp Participants) Connected() []*common.Player {
 	res, original := ptcp.initalizeSliceFromByUserID()
 	for _, p := range original {
 		res = append(res, p)

game_state_test.go

@@ -134,28 +134,28 @@ func TestParticipants_FindByHandle_InvalidEntityHandle(t *testing.T) {
 	assert.Nil(t, found)
 }
 
-func TestParticipants_SuppressNoEntity(t *testing.T) {
+func TestParticipants_Connected_SuppressNoEntity(t *testing.T) {
 	gs := newGameState()
 	pl := newPlayer()
 	gs.playersByUserID[0] = pl
 	pl2 := common.NewPlayer(0, func() int { return 0 })
 	pl2.IsConnected = true
 	gs.playersByUserID[1] = pl2
 
-	allPlayers := gs.Participants().All()
+	allPlayers := gs.Participants().Connected()
 
 	assert.ElementsMatch(t, []*common.Player{pl}, allPlayers)
 }
 
-func TestParticipants_SuppressNotConnected(t *testing.T) {
+func TestParticipants_Connected_SuppressNotConnected(t *testing.T) {
 	gs := newGameState()
 	pl := newPlayer()
 	gs.playersByUserID[0] = pl
 	pl2 := newPlayer()
 	pl2.IsConnected = false
 	gs.playersByUserID[1] = pl2
 
-	allPlayers := gs.Participants().All()
+	allPlayers := gs.Participants().Connected()
 
 	assert.ElementsMatch(t, []*common.Player{pl}, allPlayers)
 }

participants_interface.go

@@ -20,9 +20,12 @@ type IParticipants interface {
 	// The returned map is a snapshot and is not updated on changes (not a reference to the actual, underlying map).
 	// Includes spectators.
 	ByEntityID() map[int]*common.Player
-	// All returns all currently connected players & spectators.
+	// All returns all currently known players & spectators, including disconnected ones, of the demo.
 	// The returned slice is a snapshot and is not updated on changes.
 	All() []*common.Player
+	// Connected returns all currently connected players & spectators.
+	// The returned slice is a snapshot and is not updated on changes.
+	Connected() []*common.Player
 	// Playing returns all players that aren't spectating or unassigned.
 	// The returned slice is a snapshot and is not updated on changes.
 	Playing() []*common.Player