simplify httpserver tests

Author: robbyt

runnables/httpserver/mocks_test.go

@@ -2,10 +2,7 @@ package httpserver
 
 import (
 	"context"
-	"errors"
-	"fmt"
 
-	"github.com/robbyt/go-supervisor/internal/finitestate"
 	"github.com/stretchr/testify/mock"
 )
 
@@ -67,126 +64,6 @@ func (m *MockStateMachine) GetStateChanWithTimeout(ctx context.Context) <-chan s
 // GetStateChanBuffer mocks the GetStateChanBuffer method of the stateMachine interface.
 // It returns a channel with a configurable buffer size that emits the state machine's state whenever it changes.
 
-// MockRunner is a special version of Runner that allows direct manipulation
-// of config storage for testing purposes
-type MockRunner struct {
-	storedConfig *Config
-	mockFSM      fsm
-	callback     func() (*Config, error)
-	ctx          context.Context
-	// Custom error responses for testing
-	stopServerErr       error
-	setStateErrorCalled bool
-}
-
-// Creates a new MockRunner with mocked config storage
-func NewMockRunner(configCallback func() (*Config, error), f fsm) *MockRunner {
-	return &MockRunner{
-		callback: configCallback,
-		mockFSM:  f,
-		ctx:      context.Background(),
-	}
-}
-
-// getConfig implementation for MockRunner
-func (r *MockRunner) getConfig() *Config {
-	return r.storedConfig
-}
-
-// setConfig implementation for MockRunner
-func (r *MockRunner) setConfig(config *Config) {
-	r.storedConfig = config
-}
-
-// configCallback returns the MockRunner's callback
-func (r *MockRunner) configCallback() (*Config, error) {
-	return r.callback()
-}
-
-// String returns a string representation of the MockRunner
-func (r *MockRunner) String() string {
-	config := r.getConfig()
-	if config == nil {
-		return "MockRunner<nil>"
-	}
-	return fmt.Sprintf("MockRunner{listening: %s}", config.ListenAddr)
-}
-
-// reloadConfig implementation similar to Runner's reloadConfig
-func (r *MockRunner) reloadConfig() error {
-	newConfig, err := r.configCallback()
-	if err != nil {
-		return fmt.Errorf("failed to reload config: %w", err)
-	}
-
-	if newConfig == nil {
-		return errors.New("config callback returned nil")
-	}
-
-	oldConfig := r.getConfig()
-	if oldConfig == nil {
-		r.setConfig(newConfig)
-		return nil
-	}
-
-	if newConfig.Equal(oldConfig) {
-		// Config unchanged, skip reload and return early
-		return ErrOldConfig
-	}
-
-	r.setConfig(newConfig)
-	return nil
-}
-
-// stopServer is a mock implementation of Runner.stopServer
-func (r *MockRunner) stopServer(ctx context.Context) error {
-	return r.stopServerErr
-}
-
-// setStateError is a mock implementation of Runner.setStateError
-func (r *MockRunner) setStateError() {
-	r.setStateErrorCalled = true
-	if err := r.mockFSM.SetState(finitestate.StatusError); err != nil {
-		// In test code, we just panic on state machine errors to make failures obvious
-		panic(fmt.Sprintf("Failed to set error state: %v", err))
-	}
-}
-
-// Reload is a simplified implementation of the Runner.Reload method for testing
-func (r *MockRunner) Reload() {
-	// Attempt to transition to reloading state
-	if err := r.mockFSM.Transition(finitestate.StatusReloading); err != nil {
-		return
-	}
-
-	// Try to reload config
-	err := r.reloadConfig()
-	if err != nil {
-		if errors.Is(err, ErrOldConfig) {
-			// Config unchanged, go back to running
-			if stateErr := r.mockFSM.Transition(finitestate.StatusRunning); stateErr != nil {
-				r.setStateError()
-			}
-			return
-		}
-		r.setStateError()
-		return
-	}
-
-	// Try to stop server
-	if err := r.stopServer(r.ctx); err != nil {
-		r.setStateError()
-		return
-	}
-
-	// For testing, we'll skip the actual boot() step
-	// just transition to running state
-	if err := r.mockFSM.Transition(finitestate.StatusRunning); err != nil {
-		r.setStateError()
-		return
-	}
-}
-
 // MockHttpServer is a mock implementation of the HttpServer interface
 type MockHttpServer struct {
 	mock.Mock