#89 Generalise the three Storage interfaces and structs into one generic storage manager.

pkg/execution/local_storage.go

@@ -1,42 +0,0 @@
-package execution
-
-import (
-	"github.com/openHPI/poseidon/pkg/dto"
-	"sync"
-)
-
-// localStorage stores execution objects in the local application memory.
-// ToDo: Create implementation that use some persistent storage like a database.
-type localStorage struct {
-	sync.RWMutex
-	executions map[ID]*dto.ExecutionRequest
-}
-
-// NewLocalStorage responds with an Storer implementation.
-// This implementation stores the data thread-safe in the local application memory.
-func NewLocalStorage() *localStorage {
-	return &localStorage{
-		executions: make(map[ID]*dto.ExecutionRequest),
-	}
-}
-
-func (s *localStorage) Add(id ID, executionRequest *dto.ExecutionRequest) {
-	s.Lock()
-	defer s.Unlock()
-	s.executions[id] = executionRequest
-}
-
-func (s *localStorage) Exists(id ID) bool {
-	s.Lock()
-	defer s.Unlock()
-	_, ok := s.executions[id]
-	return ok
-}
-
-func (s *localStorage) Pop(id ID) (*dto.ExecutionRequest, bool) {
-	s.Lock()
-	defer s.Unlock()
-	request, ok := s.executions[id]
-	delete(s.executions, id)
-	return request, ok
-}

pkg/execution/local_storage_test.go

@@ -1,70 +0,0 @@
-package execution
-
-import (
-	"github.com/openHPI/poseidon/pkg/dto"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"testing"
-)
-
-var (
-	testExecutionRequest = dto.ExecutionRequest{
-		Command:   "echo 'Hello Poseidon'",
-		TimeLimit: 42,
-		Environment: map[string]string{
-			"PATH": "/bin",
-		},
-	}
-	anotherTestExecutionRequest = dto.ExecutionRequest{
-		Command:     "echo 'Bye Poseidon'",
-		TimeLimit:   1337,
-		Environment: nil,
-	}
-	testID = ID("test")
-)
-
-func TestNewLocalExecutionStorage(t *testing.T) {
-	storage := NewLocalStorage()
-	assert.Zero(t, len(storage.executions))
-}
-
-func TestLocalStorage(t *testing.T) {
-	storage := NewLocalStorage()
-
-	t.Run("cannot pop when id does not exist", func(t *testing.T) {
-		request, ok := storage.Pop(testID)
-		assert.False(t, ok)
-		assert.Nil(t, request)
-	})
-
-	t.Run("adds execution request", func(t *testing.T) {
-		storage.Add(testID, &testExecutionRequest)
-
-		request, ok := storage.executions[testID]
-		assert.Equal(t, len(storage.executions), 1)
-		assert.True(t, ok)
-		assert.Equal(t, testExecutionRequest, *request)
-	})
-
-	t.Run("overwrites execution request", func(t *testing.T) {
-		storage.Add(testID, &anotherTestExecutionRequest)
-
-		request, ok := storage.executions[testID]
-		assert.Equal(t, len(storage.executions), 1)
-		assert.True(t, ok)
-		require.NotNil(t, request)
-		assert.Equal(t, anotherTestExecutionRequest, *request)
-	})
-
-	t.Run("removes execution request", func(t *testing.T) {
-		request, ok := storage.Pop(testID)
-
-		assert.True(t, ok)
-		require.NotNil(t, request)
-		assert.Equal(t, anotherTestExecutionRequest, *request)
-
-		request, ok = storage.executions[testID]
-		assert.Nil(t, request)
-		assert.False(t, ok)
-	})
-}