[test] Update stages with new commands, split engine test to multiples

Author: g3force

internal/app/controller/engine.go

@@ -151,6 +151,7 @@ func (e *Engine) processCommand(c *EventCommand) error {
 		return errors.Errorf("Unknown command: %v", c)
 	}
 
+	e.updatePreStages()
 	log.Printf("Processed command %v", *c)
 	return nil
 }
@@ -210,17 +211,25 @@ func (e *Engine) processStage(s *EventStage) error {
 		if nextIndex >= len(Stages) {
 			return errors.New("No next stage")
 		}
-		e.State.Stage = Stages[nextIndex]
+		e.updateStage(Stages[nextIndex])
 	} else if s.StageOperation == StagePrevious {
 		nextIndex := index - 1
 		if nextIndex < 0 {
 			return errors.New("No previous stage")
 		}
-		e.State.Stage = Stages[nextIndex]
+		e.updateStage(Stages[nextIndex])
 	} else {
 		return errors.Errorf("Unknown stage operation: %v", s.StageOperation)
 	}
 
+	log.Printf("Processed stage %v", s.StageOperation)
+
+	return nil
+}
+
+func (e *Engine) updateStage(stage Stage) {
+	e.State.Stage = stage
+
 	e.State.StageTimeLeft = e.StageTimes[e.State.Stage]
 	e.State.StageTimeElapsed = 0
 
@@ -233,10 +242,6 @@ func (e *Engine) processStage(s *EventStage) error {
 		e.State.TeamState[TeamBlue].TimeoutsLeft = e.config.Overtime.Timeouts
 		e.State.TeamState[TeamBlue].TimeoutTimeLeft = e.config.Overtime.TimeoutDuration
 	}
-
-	log.Printf("Processed stage %v", s.StageOperation)
-
-	return nil
 }
 
 func (e *Engine) processCard(card *EventCard) error {
@@ -322,6 +327,22 @@ func revokeCard(card *EventCard, teamState *TeamInfo) error {
 	return nil
 }
 
+func (e *Engine) updatePreStages() {
+	proceedPreStages := e.State.GameState != GameStateHalted
+	if proceedPreStages {
+		switch e.State.Stage {
+		case StagePreGame:
+			e.updateStage(StageFirstHalf)
+		case StageSecondHalfPre:
+			e.updateStage(StageSecondHalf)
+		case StageOvertimeFirstHalfPre:
+			e.updateStage(StageOvertimeFirstHalf)
+		case StageOvertimeSecondHalfPre:
+			e.updateStage(StageOvertimeSecondHalf)
+		}
+	}
+}
+
 func strToDuration(s string) (duration time.Duration, err error) {
 	duration = 0
 	err = nil

internal/app/controller/engine_test.go

@@ -5,6 +5,7 @@ import (
 	"io/ioutil"
 	"path/filepath"
 	"reflect"
+	"strings"
 	"testing"
 )
 
@@ -14,23 +15,34 @@ type StateTransitions struct {
 }
 
 func Test_transitions(t *testing.T) {
-	path := filepath.Join("testdata", "stateTransitions.json")
+	files, err := ioutil.ReadDir("testdata")
+	if err != nil {
+		t.Fatal(err)
+	}
+	for _, f := range files {
+		if !f.IsDir() && strings.HasPrefix(f.Name(), "transition_") {
+			processTransitionFile(t, f.Name())
+		}
+	}
+}
+
+func processTransitionFile(t *testing.T, fileName string) {
+	path := filepath.Join("testdata", fileName)
 	bytes, err := ioutil.ReadFile(path)
 	if err != nil {
 		t.Fatal(err)
 	}
 	stateTransitions := make([]StateTransitions, 0)
 	json.Unmarshal(bytes, &stateTransitions)
-
 	config := DefaultConfig().Game
 	e := NewEngine(config)
-	for _, s := range stateTransitions {
+	for i, s := range stateTransitions {
 
 		if s.Event != nil {
 			e.Process(*s.Event)
 
 			if s.State != nil && !reflect.DeepEqual(*e.State, *s.State) {
-				t.Errorf("\nExpected: %v\n     got: %v", *s.State, *e.State)
+				t.Errorf("Step %v of %v failed.\nExpected: %v\n     got: %v", i+1, fileName, *s.State, *e.State)
 			}
 		}