Copy latest code
Change-Id: Ibfcfce723adc532458911ec1df798fcd511fddaa
Signed-off-by: ss412g <shuky.har-noy@intl.att.com>
diff --git a/E2Manager/httpserver/http_server_test.go b/E2Manager/httpserver/http_server_test.go
index c841681..e6e1ef5 100644
--- a/E2Manager/httpserver/http_server_test.go
+++ b/E2Manager/httpserver/http_server_test.go
@@ -21,37 +21,39 @@
package httpserver
import (
+ "e2mgr/logger"
"e2mgr/mocks"
"github.com/gorilla/mux"
"github.com/stretchr/testify/assert"
"net/http"
"net/http/httptest"
"testing"
+ "time"
)
-func setupRouterAndMocks() (*mux.Router, *mocks.ControllerMock, *mocks.NodebControllerMock) {
- controllerMock := &mocks.ControllerMock{}
- controllerMock.On("Shutdown").Return(nil)
- controllerMock.On("X2Reset").Return(nil)
- controllerMock.On("X2Setup").Return(nil)
- controllerMock.On("EndcSetup").Return(nil)
- controllerMock.On("GetNodeb").Return(nil)
- controllerMock.On("GetNodebIdList").Return(nil)
-
-
+func setupRouterAndMocks() (*mux.Router, *mocks.RootControllerMock, *mocks.NodebControllerMock, *mocks.E2TControllerMock) {
+ rootControllerMock := &mocks.RootControllerMock{}
+ rootControllerMock.On("HandleHealthCheckRequest").Return(nil)
nodebControllerMock := &mocks.NodebControllerMock{}
+ nodebControllerMock.On("Shutdown").Return(nil)
+ nodebControllerMock.On("X2Reset").Return(nil)
+ nodebControllerMock.On("X2Setup").Return(nil)
+ nodebControllerMock.On("EndcSetup").Return(nil)
+ nodebControllerMock.On("GetNodeb").Return(nil)
nodebControllerMock.On("GetNodebIdList").Return(nil)
- nodebControllerMock.On("GetNodeb").Return(nil) // TODO: remove
- nodebControllerMock.On("HandleHealthCheckRequest").Return(nil)
+
+ e2tControllerMock := &mocks.E2TControllerMock{}
+
+ e2tControllerMock.On("GetE2TInstances").Return(nil)
router := mux.NewRouter()
- initializeRoutes(router, nodebControllerMock, controllerMock)
- return router, controllerMock, nodebControllerMock
+ initializeRoutes(router, rootControllerMock, nodebControllerMock, e2tControllerMock)
+ return router, rootControllerMock, nodebControllerMock, e2tControllerMock
}
func TestRoutePostEndcSetup(t *testing.T) {
- router, controllerMock, _ := setupRouterAndMocks()
+ router, _, nodebControllerMock, _ := setupRouterAndMocks()
req, err := http.NewRequest("POST", "/v1/nodeb/endc-setup", nil)
if err != nil {
@@ -60,11 +62,11 @@
rr := httptest.NewRecorder()
router.ServeHTTP(rr, req)
- controllerMock.AssertNumberOfCalls(t,"EndcSetup", 1)
+ nodebControllerMock.AssertNumberOfCalls(t, "EndcSetup", 1)
}
func TestRoutePostX2Setup(t *testing.T) {
- router, controllerMock, _ := setupRouterAndMocks()
+ router, _, nodebControllerMock, _ := setupRouterAndMocks()
req, err := http.NewRequest("POST", "/v1/nodeb/x2-setup", nil)
if err != nil {
@@ -73,11 +75,11 @@
rr := httptest.NewRecorder()
router.ServeHTTP(rr, req)
- controllerMock.AssertNumberOfCalls(t,"X2Setup", 1)
+ nodebControllerMock.AssertNumberOfCalls(t, "X2Setup", 1)
}
func TestRouteGetNodebIds(t *testing.T) {
- router, controllerMock, _ := setupRouterAndMocks()
+ router, _, nodebControllerMock, _ := setupRouterAndMocks()
req, err := http.NewRequest("GET", "/v1/nodeb/ids", nil)
if err != nil {
@@ -86,11 +88,11 @@
rr := httptest.NewRecorder()
router.ServeHTTP(rr, req)
- controllerMock.AssertNumberOfCalls(t, "GetNodebIdList", 1)
+ nodebControllerMock.AssertNumberOfCalls(t, "GetNodebIdList", 1)
}
func TestRouteGetNodebRanName(t *testing.T) {
- router, controllerMock,_ := setupRouterAndMocks()
+ router, _, nodebControllerMock, _ := setupRouterAndMocks()
req, err := http.NewRequest("GET", "/v1/nodeb/ran1", nil)
if err != nil {
@@ -101,11 +103,11 @@
assert.Equal(t, http.StatusOK, rr.Code, "handler returned wrong status code")
assert.Equal(t, "ran1", rr.Body.String(), "handler returned wrong body")
- controllerMock.AssertNumberOfCalls(t, "GetNodeb", 1)
+ nodebControllerMock.AssertNumberOfCalls(t, "GetNodeb", 1)
}
func TestRouteGetHealth(t *testing.T) {
- router, _, nodebControllerMock := setupRouterAndMocks()
+ router, rootControllerMock, _, _ := setupRouterAndMocks()
req, err := http.NewRequest("GET", "/v1/health", nil)
if err != nil {
@@ -114,11 +116,11 @@
rr := httptest.NewRecorder()
router.ServeHTTP(rr, req)
- nodebControllerMock.AssertNumberOfCalls(t, "HandleHealthCheckRequest", 1)
+ rootControllerMock.AssertNumberOfCalls(t, "HandleHealthCheckRequest", 1)
}
func TestRoutePutNodebShutdown(t *testing.T) {
- router, controllerMock, _ := setupRouterAndMocks()
+ router, _, nodebControllerMock, _ := setupRouterAndMocks()
req, err := http.NewRequest("PUT", "/v1/nodeb/shutdown", nil)
if err != nil {
@@ -127,11 +129,11 @@
rr := httptest.NewRecorder()
router.ServeHTTP(rr, req)
- controllerMock.AssertNumberOfCalls(t, "Shutdown", 1)
+ nodebControllerMock.AssertNumberOfCalls(t, "Shutdown", 1)
}
func TestRoutePutNodebResetRanName(t *testing.T) {
- router, controllerMock, _ := setupRouterAndMocks()
+ router, _, nodebControllerMock, _ := setupRouterAndMocks()
req, err := http.NewRequest("PUT", "/v1/nodeb/ran1/reset", nil)
if err != nil {
@@ -142,11 +144,11 @@
assert.Equal(t, http.StatusOK, rr.Code, "handler returned wrong status code")
assert.Equal(t, "ran1", rr.Body.String(), "handler returned wrong body")
- controllerMock.AssertNumberOfCalls(t, "X2Reset", 1)
+ nodebControllerMock.AssertNumberOfCalls(t, "X2Reset", 1)
}
func TestRouteNotFound(t *testing.T) {
- router, _, _ := setupRouterAndMocks()
+ router, _, _,_ := setupRouterAndMocks()
req, err := http.NewRequest("GET", "/v1/no/such/route", nil)
if err != nil {
@@ -156,4 +158,31 @@
router.ServeHTTP(rr, req)
assert.Equal(t, http.StatusNotFound, rr.Code, "handler returned wrong status code")
-}
\ No newline at end of file
+}
+
+func TestRunError(t *testing.T) {
+ log := initLog(t)
+ err := Run(log, 1234567, &mocks.RootControllerMock{}, &mocks.NodebControllerMock{}, &mocks.E2TControllerMock{})
+ assert.NotNil(t, err)
+}
+
+func TestRun(t *testing.T) {
+ log := initLog(t)
+ _, rootControllerMock, nodebControllerMock, e2tControllerMock := setupRouterAndMocks()
+ go Run(log, 11223, rootControllerMock, nodebControllerMock, e2tControllerMock)
+
+ time.Sleep(time.Millisecond * 100)
+ resp, err := http.Get("http://localhost:11223/v1/health")
+ if err != nil {
+ t.Fatalf("failed to perform GET to http://localhost:11223/v1/health")
+ }
+ assert.Equal(t, 200, resp.StatusCode)
+}
+
+func initLog(t *testing.T) *logger.Logger {
+ log, err := logger.InitLogger(logger.InfoLevel)
+ if err != nil {
+ t.Errorf("#initLog test - failed to initialize logger, error: %s", err)
+ }
+ return log
+}