Refactor runners and websocket tests

This commit is contained in:
Jan-Eric Hellenberg
2021-05-19 09:30:22 +02:00
parent fe2ec4df35
commit 17c9839fac
2 changed files with 108 additions and 73 deletions

View File

@@ -5,7 +5,6 @@ import (
"github.com/gorilla/websocket"
"github.com/stretchr/testify/suite"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
"gitlab.hpi.de/codeocean/codemoon/poseidon/environment"
"gitlab.hpi.de/codeocean/codemoon/poseidon/runner"
"net/http"
"net/http/httptest"
@@ -13,20 +12,19 @@ import (
"testing"
)
func TestWebsocketTestSuite(t *testing.T) {
suite.Run(t, new(WebsocketTestSuite))
}
type WebsocketTestSuite struct {
RunnerRouteTestSuite
server *httptest.Server
executionId runner.ExecutionId
}
func TestWebsocketTestSuite(t *testing.T) {
suite.Run(t, new(WebsocketTestSuite))
}
func (suite *WebsocketTestSuite) SetupTest() {
suite.runnerManager = &runner.ManagerMock{}
suite.environmentManager = &environment.ManagerMock{}
suite.router = NewRouter(suite.runnerManager, suite.environmentManager)
suite.router = NewRouter(suite.runnerManager, nil)
suite.runner = runner.NewRunner("test_runner")
suite.runnerManager.On("Get", suite.runner.Id()).Return(suite.runner, nil)
var err error
@@ -37,7 +35,6 @@ func (suite *WebsocketTestSuite) SetupTest() {
})
suite.Require().NoError(err)
// router.HandleFunc(fmt.Sprintf("%s/{%s}%s", RouteRunners, RunnerIdKey, WebsocketPath), connectToRunner).Methods(http.MethodGet).Name(WebsocketPath)
suite.server = httptest.NewServer(suite.router)
}