htwkmooc/poseidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement merge request review comments

Browse Source
This commit is contained in:
Maximilian Paß
2021-05-10 11:58:57 +02:00
parent ed735f284f
commit 5a5ab8f02b
4 changed files with 40 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
api/websocket_test.go
View File

@ -1,13 +1,12 @@
package api
import (
"errors"
"fmt"
"github.com/gorilla/mux"
"github.com/gorilla/websocket"
"github.com/stretchr/testify/suite"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
"gitlab.hpi.de/codeocean/codemoon/poseidon/environment/pool"
"gitlab.hpi.de/codeocean/codemoon/poseidon/environment"
"gitlab.hpi.de/codeocean/codemoon/poseidon/runner"
"net/http"
"net/http/httptest"
@ -23,19 +22,21 @@ type WebsocketTestSuite struct {
executionId runner.ExecutionId
}
func TestWebsocketTestSuite(t *testing.T) {
suite.Run(t, new(WebsocketTestSuite))
}
func (suite *WebsocketTestSuite) SetupSuite() {
runnerPool := pool.NewLocalRunnerPool()
runnerPool := environment.NewLocalRunnerPool()
suite.runner = runner.NewExerciseRunner("testRunner")
runnerPool.AddRunner(suite.runner)
runnerPool.Add(suite.runner)
var err error
suite.executionId, err = suite.runner.AddExecution(dto.ExecutionRequest{
Command: "command",
TimeLimit: 10,
Environment: nil,
})
if !suite.NoError(err) {
return
}
suite.Require().NoError(err)
router := mux.NewRouter()
router.Use(findRunnerMiddleware(runnerPool))
@ -44,15 +45,11 @@ func (suite *WebsocketTestSuite) SetupSuite() {
suite.router = router
}
func (suite *WebsocketTestSuite) url(scheme, runnerId string, executionId runner.ExecutionId) (*url.URL, error) {
func (suite *WebsocketTestSuite) websocketUrl(scheme, runnerId string, executionId runner.ExecutionId) (*url.URL, error) {
websocketUrl, err := url.Parse(suite.server.URL)
if !suite.NoError(err, "Error: parsing test server url") {
return nil, errors.New("could not parse server url")
}
suite.Require().NoError(err, "Error: parsing test server url")
path, err := suite.router.Get(WebsocketPath).URL(RunnerIdKey, runnerId)
if !suite.NoError(err) {
return nil, errors.New("could not set runnerId")
}
suite.Require().NoError(err, "could not set runnerId")
websocketUrl.Scheme = scheme
websocketUrl.Path = path.Path
websocketUrl.RawQuery = fmt.Sprintf("executionId=%s", executionId)
@ -63,29 +60,24 @@ func (suite *WebsocketTestSuite) TearDownSuite() {
suite.server.Close()
}
func TestWebsocketTestSuite(t *testing.T) {
suite.Run(t, new(WebsocketTestSuite))
}
func (suite *WebsocketTestSuite) TestEstablishWebsocketConnection() {
path, err := suite.url("ws", suite.runner.Id(), suite.executionId)
if !suite.NoError(err) {
return
}
func (suite *WebsocketTestSuite) TestWebsocketConnectionCanBeEstablished() {
path, err := suite.websocketUrl("ws", suite.runner.Id(), suite.executionId)
suite.Require().NoError(err)
_, _, err = websocket.DefaultDialer.Dial(path.String(), nil)
if !suite.NoError(err) {
return
}
suite.Require().NoError(err)
}
func (suite *WebsocketTestSuite) TestWebsocketReturns404IfExecutionDoesNotExist() {
wsUrl, err := suite.url("http", suite.runner.Id(), "invalid-execution-id")
if !suite.NoError(err) {
return
}
response, err := http.Get(wsUrl.String())
if !suite.NoError(err) {
return
}
wsUrl, err := suite.websocketUrl("ws", suite.runner.Id(), "invalid-execution-id")
suite.Require().NoError(err)
_, response, _ := websocket.DefaultDialer.Dial(wsUrl.String(), nil)
suite.Equal(http.StatusNotFound, response.StatusCode)
}
func (suite *WebsocketTestSuite) TestWebsocketReturns400IfRequestedViaHttp() {
wsUrl, err := suite.websocketUrl("http", suite.runner.Id(), suite.executionId)
suite.Require().NoError(err)
response, err := http.Get(wsUrl.String())
suite.Require().NoError(err)
suite.Equal(http.StatusBadRequest, response.StatusCode)
}