X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Finternal%2Fconfig%2Fregistrator_test.go;h=b2f10ccd6ad00a7b572a2502ff9fe7b1da66bced;hb=refs%2Fchanges%2F18%2F7518%2F1;hp=2cffa2c3a6a6c3df05cf2957104f0855e77972f9;hpb=65a53d2388547247222d144b365401056bbdffc5;p=nonrtric.git diff --git a/dmaap-mediator-producer/internal/config/registrator_test.go b/dmaap-mediator-producer/internal/config/registrator_test.go index 2cffa2c3..b2f10ccd 100644 --- a/dmaap-mediator-producer/internal/config/registrator_test.go +++ b/dmaap-mediator-producer/internal/config/registrator_test.go @@ -21,6 +21,7 @@ package config import ( + "encoding/json" "io/ioutil" "net/http" "testing" @@ -39,8 +40,17 @@ func TestRegisterTypes(t *testing.T) { StatusCode: http.StatusCreated, }, nil) + schemaString := `{ + "type": "object", + "properties": {}, + "additionalProperties": false + }` + var schemaObj interface{} + json.Unmarshal([]byte(schemaString), &schemaObj) + type1 := TypeDefinition{ - Id: "Type1", + Identity: "Type1", + TypeSchema: schemaObj, } types := []TypeDefinition{type1} @@ -57,9 +67,9 @@ func TestRegisterTypes(t *testing.T) { assertions.Equal("http", actualRequest.URL.Scheme) assertions.Equal("localhost:9990", actualRequest.URL.Host) assertions.Equal("/data-producer/v1/info-types/Type1", actualRequest.URL.Path) - assertions.Equal("application/json; charset=utf-8", actualRequest.Header.Get("Content-Type")) + assertions.Equal("application/json", actualRequest.Header.Get("Content-Type")) body, _ := ioutil.ReadAll(actualRequest.Body) - expectedBody := []byte(`{"info_job_data_schema": {"type": "object","properties": {},"additionalProperties": false}}`) + expectedBody := []byte(`{"info_job_data_schema": {"additionalProperties":false,"properties":{},"type":"object"}}`) assertions.Equal(expectedBody, body) clientMock.AssertNumberOfCalls(t, "Do", 1) } @@ -92,7 +102,7 @@ func TestRegisterProducer(t *testing.T) { assertions.Equal("http", actualRequest.URL.Scheme) assertions.Equal("localhost:9990", actualRequest.URL.Host) assertions.Equal("/data-producer/v1/info-producers/Producer1", actualRequest.URL.Path) - assertions.Equal("application/json; charset=utf-8", actualRequest.Header.Get("Content-Type")) + assertions.Equal("application/json", actualRequest.Header.Get("Content-Type")) body, _ := ioutil.ReadAll(actualRequest.Body) expectedBody := []byte(`{"info_producer_supervision_callback_url":"supervisionCallbackUrl","supported_info_types":["type1"],"info_job_callback_url":"jobCallbackUrl"}`) assertions.Equal(expectedBody, body)