Mirrors/VILLASweb-backend-go
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web-backend-go/ synced 2025-03-30 00:00:12 +01:00
Code Issues Releases Wiki Activity

use proper go naming style

Browse source
This commit is contained in:
Steffen Vogel 2021-02-08 11:49:47 +01:00
parent fab5fbf66a
commit b22569bbdb
2 changed files with 48 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
routes/component-configuration/config_test.go
View file

@ -39,8 +39,7 @@ import (
) )
var router *gin.Engine var router *gin.Engine
var base_api_configs = "/api/v2/configs" var baseAPIConfigs = "/api/v2/configs"
var base_api_auth = "/api/v2/authenticate"
type ConfigRequest struct { type ConfigRequest struct {
Name string `json:"name,omitempty"` Name string `json:"name,omitempty"`
@ -187,7 +186,7 @@ func TestAddConfig(t *testing.T) {
// try to POST with no access // try to POST with no access
// should result in unprocessable entity // should result in unprocessable entity
code, resp, err := helper.TestEndpoint(router, token, code, resp, err := helper.TestEndpoint(router, token,
base_api_configs, "POST", helper.KeyModels{"config": newConfig1}) baseAPIConfigs, "POST", helper.KeyModels{"config": newConfig1})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 422, code, "Response body: \n%v\n", resp) assert.Equalf(t, 422, code, "Response body: \n%v\n", resp)
@ -197,7 +196,7 @@ func TestAddConfig(t *testing.T) {
// try to POST non JSON body // try to POST non JSON body
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
base_api_configs, "POST", "this is not JSON") baseAPIConfigs, "POST", "this is not JSON")
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 400, code, "Response body: \n%v\n", resp) assert.Equalf(t, 400, code, "Response body: \n%v\n", resp)
@ -207,7 +206,7 @@ func TestAddConfig(t *testing.T) {
// test POST newConfig // test POST newConfig
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
base_api_configs, "POST", helper.KeyModels{"config": newConfig1}) baseAPIConfigs, "POST", helper.KeyModels{"config": newConfig1})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
@ -221,7 +220,7 @@ func TestAddConfig(t *testing.T) {
// Get the newConfig // Get the newConfig
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_configs, newConfigID), "GET", nil) fmt.Sprintf("%v/%v", baseAPIConfigs, newConfigID), "GET", nil)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
@ -236,7 +235,7 @@ func TestAddConfig(t *testing.T) {
} }
// this should NOT work and return a unprocessable entity 442 status code // this should NOT work and return a unprocessable entity 442 status code
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
base_api_configs, "POST", helper.KeyModels{"config": malformedNewConfig}) baseAPIConfigs, "POST", helper.KeyModels{"config": malformedNewConfig})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 422, code, "Response body: \n%v\n", resp) assert.Equalf(t, 422, code, "Response body: \n%v\n", resp)
@ -247,7 +246,7 @@ func TestAddConfig(t *testing.T) {
// Try to GET the newConfig with no access // Try to GET the newConfig with no access
// Should result in unprocessable entity // Should result in unprocessable entity
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_configs, newConfigID), "GET", nil) fmt.Sprintf("%v/%v", baseAPIConfigs, newConfigID), "GET", nil)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 422, code, "Response body: \n%v\n", resp) assert.Equalf(t, 422, code, "Response body: \n%v\n", resp)
@ -272,7 +271,7 @@ func TestUpdateConfig(t *testing.T) {
newConfig1.ScenarioID = scenarioID newConfig1.ScenarioID = scenarioID
newConfig1.ICID = ICID newConfig1.ICID = ICID
code, resp, err := helper.TestEndpoint(router, token, code, resp, err := helper.TestEndpoint(router, token,
base_api_configs, "POST", helper.KeyModels{"config": newConfig1}) baseAPIConfigs, "POST", helper.KeyModels{"config": newConfig1})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
@ -292,7 +291,7 @@ func TestUpdateConfig(t *testing.T) {
// try to PUT with no access // try to PUT with no access
// should result in unprocessable entity // should result in unprocessable entity
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_configs, newConfigID), "PUT", helper.KeyModels{"config": updatedConfig}) fmt.Sprintf("%v/%v", baseAPIConfigs, newConfigID), "PUT", helper.KeyModels{"config": updatedConfig})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 422, code, "Response body: \n%v\n", resp) assert.Equalf(t, 422, code, "Response body: \n%v\n", resp)
@ -303,7 +302,7 @@ func TestUpdateConfig(t *testing.T) {
// try to PUT as guest // try to PUT as guest
// should NOT work and result in unprocessable entity // should NOT work and result in unprocessable entity
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_configs, newConfigID), "PUT", helper.KeyModels{"config": updatedConfig}) fmt.Sprintf("%v/%v", baseAPIConfigs, newConfigID), "PUT", helper.KeyModels{"config": updatedConfig})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 422, code, "Response body: \n%v\n", resp) assert.Equalf(t, 422, code, "Response body: \n%v\n", resp)
@ -314,13 +313,13 @@ func TestUpdateConfig(t *testing.T) {
// try to PUT a non JSON body // try to PUT a non JSON body
// should result in a bad request // should result in a bad request
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_configs, newConfigID), "PUT", "This is not JSON") fmt.Sprintf("%v/%v", baseAPIConfigs, newConfigID), "PUT", "This is not JSON")
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 400, code, "Response body: \n%v\n", resp) assert.Equalf(t, 400, code, "Response body: \n%v\n", resp)
// test PUT // test PUT
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_configs, newConfigID), "PUT", helper.KeyModels{"config": updatedConfig}) fmt.Sprintf("%v/%v", baseAPIConfigs, newConfigID), "PUT", helper.KeyModels{"config": updatedConfig})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
@ -332,7 +331,7 @@ func TestUpdateConfig(t *testing.T) {
updatedConfig.ICID = ICID + 1 updatedConfig.ICID = ICID + 1
// test PUT again // test PUT again
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_configs, newConfigID), "PUT", helper.KeyModels{"config": updatedConfig}) fmt.Sprintf("%v/%v", baseAPIConfigs, newConfigID), "PUT", helper.KeyModels{"config": updatedConfig})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
@ -342,7 +341,7 @@ func TestUpdateConfig(t *testing.T) {
// Get the updateConfig // Get the updateConfig
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_configs, newConfigID), "GET", nil) fmt.Sprintf("%v/%v", baseAPIConfigs, newConfigID), "GET", nil)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
@ -352,7 +351,7 @@ func TestUpdateConfig(t *testing.T) {
// try to update a component config that does not exist (should return not found 404 status code) // try to update a component config that does not exist (should return not found 404 status code)
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_configs, newConfigID+1), "PUT", helper.KeyModels{"config": updatedConfig}) fmt.Sprintf("%v/%v", baseAPIConfigs, newConfigID+1), "PUT", helper.KeyModels{"config": updatedConfig})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 404, code, "Response body: \n%v\n", resp) assert.Equalf(t, 404, code, "Response body: \n%v\n", resp)
} }
@ -375,7 +374,7 @@ func TestDeleteConfig(t *testing.T) {
// test POST newConfig // test POST newConfig
code, resp, err := helper.TestEndpoint(router, token, code, resp, err := helper.TestEndpoint(router, token,
base_api_configs, "POST", helper.KeyModels{"config": newConfig1}) baseAPIConfigs, "POST", helper.KeyModels{"config": newConfig1})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
@ -390,7 +389,7 @@ func TestDeleteConfig(t *testing.T) {
// try to DELETE with no access // try to DELETE with no access
// should result in unprocessable entity // should result in unprocessable entity
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_configs, newConfigID), "DELETE", nil) fmt.Sprintf("%v/%v", baseAPIConfigs, newConfigID), "DELETE", nil)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 422, code, "Response body: \n%v\n", resp) assert.Equalf(t, 422, code, "Response body: \n%v\n", resp)
@ -400,12 +399,12 @@ func TestDeleteConfig(t *testing.T) {
// Count the number of all the component config returned for scenario // Count the number of all the component config returned for scenario
initialNumber, err := helper.LengthOfResponse(router, token, initialNumber, err := helper.LengthOfResponse(router, token,
fmt.Sprintf("%v?scenarioID=%v", base_api_configs, scenarioID), "GET", nil) fmt.Sprintf("%v?scenarioID=%v", baseAPIConfigs, scenarioID), "GET", nil)
assert.NoError(t, err) assert.NoError(t, err)
// Delete the added newConfig // Delete the added newConfig
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_configs, newConfigID), "DELETE", nil) fmt.Sprintf("%v/%v", baseAPIConfigs, newConfigID), "DELETE", nil)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
@ -415,7 +414,7 @@ func TestDeleteConfig(t *testing.T) {
// Again count the number of all the component configs returned // Again count the number of all the component configs returned
finalNumber, err := helper.LengthOfResponse(router, token, finalNumber, err := helper.LengthOfResponse(router, token,
fmt.Sprintf("%v?scenarioID=%v", base_api_configs, scenarioID), "GET", nil) fmt.Sprintf("%v?scenarioID=%v", baseAPIConfigs, scenarioID), "GET", nil)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, initialNumber-1, finalNumber) assert.Equal(t, initialNumber-1, finalNumber)
@ -439,13 +438,13 @@ func TestGetAllConfigsOfScenario(t *testing.T) {
// test POST newConfig // test POST newConfig
code, resp, err := helper.TestEndpoint(router, token, code, resp, err := helper.TestEndpoint(router, token,
base_api_configs, "POST", helper.KeyModels{"config": newConfig1}) baseAPIConfigs, "POST", helper.KeyModels{"config": newConfig1})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
// Count the number of all the component config returned for scenario // Count the number of all the component config returned for scenario
NumberOfConfigs, err := helper.LengthOfResponse(router, token, NumberOfConfigs, err := helper.LengthOfResponse(router, token,
fmt.Sprintf("%v?scenarioID=%v", base_api_configs, scenarioID), "GET", nil) fmt.Sprintf("%v?scenarioID=%v", baseAPIConfigs, scenarioID), "GET", nil)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, 1, NumberOfConfigs) assert.Equal(t, 1, NumberOfConfigs)
@ -457,7 +456,7 @@ func TestGetAllConfigsOfScenario(t *testing.T) {
// try to get configs without access // try to get configs without access
// should result in unprocessable entity // should result in unprocessable entity
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v?scenarioID=%v", base_api_configs, scenarioID), "GET", nil) fmt.Sprintf("%v?scenarioID=%v", baseAPIConfigs, scenarioID), "GET", nil)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 422, code, "Response body: \n%v\n", resp) assert.Equalf(t, 422, code, "Response body: \n%v\n", resp)

51
routes/result/result_test.go
View file

@ -46,8 +46,7 @@ import (
) )
var router *gin.Engine var router *gin.Engine
var base_api_results = "/api/v2/results" var baseAPIResults = "/api/v2/results"
var base_api_auth = "/api/v2/authenticate"
type ScenarioRequest struct { type ScenarioRequest struct {
Name string `json:"name,omitempty"` Name string `json:"name,omitempty"`
@ -143,13 +142,13 @@ func TestGetAllResultsOfScenario(t *testing.T) {
newResult.ScenarioID = scenarioID newResult.ScenarioID = scenarioID
newResult.ConfigSnapshots = confSnapshots newResult.ConfigSnapshots = confSnapshots
code, resp, err := helper.TestEndpoint(router, token, code, resp, err := helper.TestEndpoint(router, token,
base_api_results, "POST", helper.KeyModels{"result": newResult}) baseAPIResults, "POST", helper.KeyModels{"result": newResult})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
// Count the number of all the results returned for scenario // Count the number of all the results returned for scenario
NumberOfConfigs, err := helper.LengthOfResponse(router, token, NumberOfConfigs, err := helper.LengthOfResponse(router, token,
fmt.Sprintf("%v?scenarioID=%v", base_api_results, scenarioID), "GET", nil) fmt.Sprintf("%v?scenarioID=%v", baseAPIResults, scenarioID), "GET", nil)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, 1, NumberOfConfigs) assert.Equal(t, 1, NumberOfConfigs)
@ -161,7 +160,7 @@ func TestGetAllResultsOfScenario(t *testing.T) {
// try to get results without access // try to get results without access
// should result in unprocessable entity // should result in unprocessable entity
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v?scenarioID=%v", base_api_results, scenarioID), "GET", nil) fmt.Sprintf("%v?scenarioID=%v", baseAPIResults, scenarioID), "GET", nil)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 422, code, "Response body: \n%v\n", resp) assert.Equalf(t, 422, code, "Response body: \n%v\n", resp)
@ -187,7 +186,7 @@ func TestAddGetUpdateDeleteResult(t *testing.T) {
// try to POST with no access // try to POST with no access
// should result in unprocessable entity // should result in unprocessable entity
code, resp, err := helper.TestEndpoint(router, token, code, resp, err := helper.TestEndpoint(router, token,
base_api_results, "POST", helper.KeyModels{"result": newResult}) baseAPIResults, "POST", helper.KeyModels{"result": newResult})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 422, code, "Response body: \n%v\n", resp) assert.Equalf(t, 422, code, "Response body: \n%v\n", resp)
@ -197,13 +196,13 @@ func TestAddGetUpdateDeleteResult(t *testing.T) {
// try to POST non JSON body // try to POST non JSON body
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
base_api_results, "POST", "this is not JSON") baseAPIResults, "POST", "this is not JSON")
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 400, code, "Response body: \n%v\n", resp) assert.Equalf(t, 400, code, "Response body: \n%v\n", resp)
// test POST newResult // test POST newResult
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
base_api_results, "POST", helper.KeyModels{"result": newResult}) baseAPIResults, "POST", helper.KeyModels{"result": newResult})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
@ -217,7 +216,7 @@ func TestAddGetUpdateDeleteResult(t *testing.T) {
// Get the newResult // Get the newResult
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_results, newResultID), "GET", nil) fmt.Sprintf("%v/%v", baseAPIResults, newResultID), "GET", nil)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
@ -232,7 +231,7 @@ func TestAddGetUpdateDeleteResult(t *testing.T) {
} }
// this should NOT work and return a unprocessable entity 442 status code // this should NOT work and return a unprocessable entity 442 status code
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
base_api_results, "POST", helper.KeyModels{"result": malformedNewResult}) baseAPIResults, "POST", helper.KeyModels{"result": malformedNewResult})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 422, code, "Response body: \n%v\n", resp) assert.Equalf(t, 422, code, "Response body: \n%v\n", resp)
@ -243,7 +242,7 @@ func TestAddGetUpdateDeleteResult(t *testing.T) {
// Try to GET the newResult with no access // Try to GET the newResult with no access
// Should result in unprocessable entity // Should result in unprocessable entity
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_results, newResultID), "GET", nil) fmt.Sprintf("%v/%v", baseAPIResults, newResultID), "GET", nil)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 422, code, "Response body: \n%v\n", resp) assert.Equalf(t, 422, code, "Response body: \n%v\n", resp)
@ -257,7 +256,7 @@ func TestAddGetUpdateDeleteResult(t *testing.T) {
// try to PUT with no access // try to PUT with no access
// should result in unprocessable entity // should result in unprocessable entity
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_results, newResultID), "PUT", helper.KeyModels{"result": updatedResult}) fmt.Sprintf("%v/%v", baseAPIResults, newResultID), "PUT", helper.KeyModels{"result": updatedResult})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 422, code, "Response body: \n%v\n", resp) assert.Equalf(t, 422, code, "Response body: \n%v\n", resp)
@ -268,7 +267,7 @@ func TestAddGetUpdateDeleteResult(t *testing.T) {
// try to PUT as guest // try to PUT as guest
// should NOT work and result in unprocessable entity // should NOT work and result in unprocessable entity
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_results, newResultID), "PUT", helper.KeyModels{"result": updatedResult}) fmt.Sprintf("%v/%v", baseAPIResults, newResultID), "PUT", helper.KeyModels{"result": updatedResult})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 422, code, "Response body: \n%v\n", resp) assert.Equalf(t, 422, code, "Response body: \n%v\n", resp)
@ -279,13 +278,13 @@ func TestAddGetUpdateDeleteResult(t *testing.T) {
// try to PUT a non JSON body // try to PUT a non JSON body
// should result in a bad request // should result in a bad request
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_results, newResultID), "PUT", "This is not JSON") fmt.Sprintf("%v/%v", baseAPIResults, newResultID), "PUT", "This is not JSON")
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 400, code, "Response body: \n%v\n", resp) assert.Equalf(t, 400, code, "Response body: \n%v\n", resp)
// test PUT // test PUT
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_results, newResultID), "PUT", helper.KeyModels{"result": updatedResult}) fmt.Sprintf("%v/%v", baseAPIResults, newResultID), "PUT", helper.KeyModels{"result": updatedResult})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
@ -295,7 +294,7 @@ func TestAddGetUpdateDeleteResult(t *testing.T) {
// try to update a result that does not exist (should return not found 404 status code) // try to update a result that does not exist (should return not found 404 status code)
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_results, newResultID+1), "PUT", helper.KeyModels{"result": updatedResult}) fmt.Sprintf("%v/%v", baseAPIResults, newResultID+1), "PUT", helper.KeyModels{"result": updatedResult})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 404, code, "Response body: \n%v\n", resp) assert.Equalf(t, 404, code, "Response body: \n%v\n", resp)
@ -309,7 +308,7 @@ func TestAddGetUpdateDeleteResult(t *testing.T) {
// try to DELETE with no access // try to DELETE with no access
// should result in unprocessable entity // should result in unprocessable entity
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_results, newResultID), "DELETE", nil) fmt.Sprintf("%v/%v", baseAPIResults, newResultID), "DELETE", nil)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 422, code, "Response body: \n%v\n", resp) assert.Equalf(t, 422, code, "Response body: \n%v\n", resp)
@ -319,12 +318,12 @@ func TestAddGetUpdateDeleteResult(t *testing.T) {
// Count the number of all the results returned for scenario // Count the number of all the results returned for scenario
initialNumber, err := helper.LengthOfResponse(router, token, initialNumber, err := helper.LengthOfResponse(router, token,
fmt.Sprintf("%v?scenarioID=%v", base_api_results, scenarioID), "GET", nil) fmt.Sprintf("%v?scenarioID=%v", baseAPIResults, scenarioID), "GET", nil)
assert.NoError(t, err) assert.NoError(t, err)
// Delete the added newResult // Delete the added newResult
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_results, newResultID), "DELETE", nil) fmt.Sprintf("%v/%v", baseAPIResults, newResultID), "DELETE", nil)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
@ -334,7 +333,7 @@ func TestAddGetUpdateDeleteResult(t *testing.T) {
// Again count the number of all the results returned // Again count the number of all the results returned
finalNumber, err := helper.LengthOfResponse(router, token, finalNumber, err := helper.LengthOfResponse(router, token,
fmt.Sprintf("%v?scenarioID=%v", base_api_results, scenarioID), "GET", nil) fmt.Sprintf("%v?scenarioID=%v", baseAPIResults, scenarioID), "GET", nil)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, initialNumber-1, finalNumber) assert.Equal(t, initialNumber-1, finalNumber)
@ -360,7 +359,7 @@ func TestAddDeleteResultFile(t *testing.T) {
// test POST newResult // test POST newResult
code, resp, err := helper.TestEndpoint(router, token, code, resp, err := helper.TestEndpoint(router, token,
base_api_results, "POST", helper.KeyModels{"result": newResult}) baseAPIResults, "POST", helper.KeyModels{"result": newResult})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
@ -398,7 +397,7 @@ func TestAddDeleteResultFile(t *testing.T) {
// Create the request // Create the request
w := httptest.NewRecorder() w := httptest.NewRecorder()
req, err := http.NewRequest("POST", fmt.Sprintf("%v/%v/file", base_api_results, newResultID), bodyBuf) req, err := http.NewRequest("POST", fmt.Sprintf("%v/%v/file", baseAPIResults, newResultID), bodyBuf)
assert.NoError(t, err, "create request") assert.NoError(t, err, "create request")
req.Header.Set("Content-Type", contentType) req.Header.Set("Content-Type", contentType)
@ -419,7 +418,7 @@ func TestAddDeleteResultFile(t *testing.T) {
// DELETE the file // DELETE the file
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v/file/%v", base_api_results, newResultID, fileID), "DELETE", nil) fmt.Sprintf("%v/%v/file/%v", baseAPIResults, newResultID, fileID), "DELETE", nil)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
@ -449,7 +448,7 @@ func TestAddDeleteResultFile(t *testing.T) {
// Create the request // Create the request
w2 := httptest.NewRecorder() w2 := httptest.NewRecorder()
req2, err := http.NewRequest("POST", fmt.Sprintf("%v/%v/file", base_api_results, newResultID), bodyBuf2) req2, err := http.NewRequest("POST", fmt.Sprintf("%v/%v/file", baseAPIResults, newResultID), bodyBuf2)
assert.NoError(t, err, "create request") assert.NoError(t, err, "create request")
req2.Header.Set("Content-Type", contentType2) req2.Header.Set("Content-Type", contentType2)
@ -468,7 +467,7 @@ func TestAddDeleteResultFile(t *testing.T) {
// DELETE result inlc. file // DELETE result inlc. file
code, resp, err = helper.TestEndpoint(router, token, code, resp, err = helper.TestEndpoint(router, token,
fmt.Sprintf("%v/%v", base_api_results, newResultID), "DELETE", nil) fmt.Sprintf("%v/%v", baseAPIResults, newResultID), "DELETE", nil)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 200, code, "Response body: \n%v\n", resp) assert.Equalf(t, 200, code, "Response body: \n%v\n", resp)
@ -478,7 +477,7 @@ func TestAddDeleteResultFile(t *testing.T) {
// Again count the number of all the results returned // Again count the number of all the results returned
finalNumber, err := helper.LengthOfResponse(router, token, finalNumber, err := helper.LengthOfResponse(router, token,
fmt.Sprintf("%v?scenarioID=%v", base_api_results, scenarioID), "GET", nil) fmt.Sprintf("%v?scenarioID=%v", baseAPIResults, scenarioID), "GET", nil)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, 0, finalNumber) assert.Equal(t, 0, finalNumber)