Code Review
/
ric-plt
/
xapp-frame.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Special version for alarm manager" into alarm_wa
[ric-plt/xapp-frame.git]
/
pkg
/
xapp
/
utils_test.go
diff --git
a/pkg/xapp/utils_test.go
b/pkg/xapp/utils_test.go
index
358fbe2
..
21ae8b9
100644
(file)
--- a/
pkg/xapp/utils_test.go
+++ b/
pkg/xapp/utils_test.go
@@
-20,7
+20,9
@@
package xapp
import (
package xapp
import (
+ "io/ioutil"
"net/http"
"net/http"
+ "os"
"testing"
"github.com/stretchr/testify/assert"
"testing"
"github.com/stretchr/testify/assert"
@@
-36,58
+38,66
@@
func TestNewUtils(t *testing.T) {
utils.FetchFiles("./", []string{"go.mod"})
utils.FetchFiles("./", []string{"go.mod"})
utils.FetchFiles("./", []string{"go.mod"})
utils.FetchFiles("./", []string{"go.mod"})
+ tmpFile, err := ioutil.TempFile("", "symptom")
+ assert.Equal(t, err, nil)
+ defer os.Remove(tmpFile.Name())
+
+ err = utils.ZipFiles(tmpFile, "/tmp/abcd", []string{"/tmp/abcd/file.txt"})
+ assert.Equal(t, err, nil)
+
utils.DeleteFile("/tmp/abcd")
}
func TestSymptomdata(t *testing.T) {
utils.DeleteFile("/tmp/abcd")
}
func TestSymptomdata(t *testing.T) {
+ os.Setenv("RMR_STASH_RT", "config/uta_rtg.rt.stash.inc")
assert.Equal(t, Resource.CollectDefaultSymptomData("abcd.tgz", "data"), "/tmp/xapp/")
}
func TestSymptomdataCollection(t *testing.T) {
assert.Equal(t, Resource.CollectDefaultSymptomData("abcd.tgz", "data"), "/tmp/xapp/")
}
func TestSymptomdataCollection(t *testing.T) {
- var handler = func(w http.ResponseWriter, r *http.Request) {
+ var handler
1
= func(w http.ResponseWriter, r *http.Request) {
Resource.SendSymptomDataJson(w, r, "data", "aaaa")
Resource.SendSymptomDataFile(w, r, "./config", "symptomdata.gz")
}
Resource.SendSymptomDataJson(w, r, "data", "aaaa")
Resource.SendSymptomDataFile(w, r, "./config", "symptomdata.gz")
}
- Resource.InjectQueryRoute("/ric/v1/user
", handler
, "GET", "foo", "bar", "id", "mykey")
+ Resource.InjectQueryRoute("/ric/v1/user
1", handler1
, "GET", "foo", "bar", "id", "mykey")
- req, _ := http.NewRequest("GET", "/ric/v1/user?foo=bar&id=mykey", nil)
+ req, _ := http.NewRequest("GET", "/ric/v1/user
1
?foo=bar&id=mykey", nil)
resp := executeRequest(req, nil)
checkResponseCode(t, http.StatusOK, resp.Code)
}
func TestSymptomdataCollectionError(t *testing.T) {
resp := executeRequest(req, nil)
checkResponseCode(t, http.StatusOK, resp.Code)
}
func TestSymptomdataCollectionError(t *testing.T) {
- var handler = func(w http.ResponseWriter, r *http.Request) {
+ var handler
2
= func(w http.ResponseWriter, r *http.Request) {
Resource.SendSymptomDataError(w, r, "Error text")
}
Resource.SendSymptomDataError(w, r, "Error text")
}
- Resource.InjectQueryRoute("/ric/v1/user
", handler
, "GET", "foo", "bar", "id", "mykey")
+ Resource.InjectQueryRoute("/ric/v1/user
2", handler2
, "GET", "foo", "bar", "id", "mykey")
- req, _ := http.NewRequest("GET", "/ric/v1/user?foo=bar&id=mykey", nil)
+ req, _ := http.NewRequest("GET", "/ric/v1/user
2
?foo=bar&id=mykey", nil)
resp := executeRequest(req, nil)
resp := executeRequest(req, nil)
- checkResponseCode(t, http.Status
OK
, resp.Code)
+ checkResponseCode(t, http.Status
InternalServerError
, resp.Code)
}
func TestGetSymptomDataParams(t *testing.T) {
}
func TestGetSymptomDataParams(t *testing.T) {
- var handler = func(w http.ResponseWriter, r *http.Request) {
+ var handler
3
= func(w http.ResponseWriter, r *http.Request) {
Resource.GetSymptomDataParams(w, r)
}
Resource.GetSymptomDataParams(w, r)
}
- Resource.InjectQueryRoute("/ric/v1/user
", handler, "GET", "foo", "bar", "id", "mykey
")
+ Resource.InjectQueryRoute("/ric/v1/user
3", handler3, "GET", "timeout", "10", "fromtime", "1", "totime", "2
")
- req, _ := http.NewRequest("GET", "/ric/v1/user
?foo=bar&id=mykey
", nil)
+ req, _ := http.NewRequest("GET", "/ric/v1/user
3?timeout=10&fromtime=1&totime=2
", nil)
resp := executeRequest(req, nil)
checkResponseCode(t, http.StatusOK, resp.Code)
}
func TestAppconfigHandler(t *testing.T) {
resp := executeRequest(req, nil)
checkResponseCode(t, http.StatusOK, resp.Code)
}
func TestAppconfigHandler(t *testing.T) {
- var handler = func(w http.ResponseWriter, r *http.Request) {
+ var handler
4
= func(w http.ResponseWriter, r *http.Request) {
appconfigHandler(w, r)
}
appconfigHandler(w, r)
}
- Resource.InjectQueryRoute("/ric/v1/user
", handler
, "GET", "foo", "bar", "id", "mykey")
+ Resource.InjectQueryRoute("/ric/v1/user
4", handler4
, "GET", "foo", "bar", "id", "mykey")
- req, _ := http.NewRequest("GET", "/ric/v1/user?foo=bar&id=mykey", nil)
+ req, _ := http.NewRequest("GET", "/ric/v1/user
4
?foo=bar&id=mykey", nil)
resp := executeRequest(req, nil)
resp := executeRequest(req, nil)
- checkResponseCode(t, http.Status
OK
, resp.Code)
+ checkResponseCode(t, http.Status
InternalServerError
, resp.Code)
}
}