X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=dmaap-mediator-producer%2Finternal%2Fconfig%2Fconfig_test.go;h=4a65dc0db92ef310bb8ea6d8fb33bf4e36f5f3d9;hb=f0e49a07dad877f94f635dda4ab477b9636536c8;hp=88ba1d8b4d6252191a03cc2ff16a980beaa36ad9;hpb=a77cd650f99b29be6c53a690157529e7e158d70e;p=nonrtric.git

diff --git a/dmaap-mediator-producer/internal/config/config_test.go b/dmaap-mediator-producer/internal/config/config_test.go
index 88ba1d8b..4a65dc0d 100644
--- a/dmaap-mediator-producer/internal/config/config_test.go
+++ b/dmaap-mediator-producer/internal/config/config_test.go
@@ -21,34 +21,71 @@
 package config
 
 import (
+	"bytes"
 	"os"
 	"reflect"
 	"testing"
+
+	log "github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/require"
 )
 
 func TestNew_envVarsSetConfigContainSetValues(t *testing.T) {
 	os.Setenv("LOG_LEVEL", "Debug")
-	os.Setenv("INFO_JOB_CALLBACK_URL", "jobCallbackUrl")
+	os.Setenv("INFO_PRODUCER_SUPERVISION_CALLBACK_HOST", "supervisionCallbackHost")
+	os.Setenv("INFO_PRODUCER_SUPERVISION_CALLBACK_PORT", "8095")
+	os.Setenv("INFO_JOB_CALLBACK_HOST", "jobCallbackHost")
+	os.Setenv("INFO_JOB_CALLBACK_PORT", "8096")
 	os.Setenv("INFO_COORD_ADDR", "infoCoordAddr")
-	os.Setenv("INFO_PRODUCER_SUPERVISION_CALLBACK_URL", "supervisionCallbackUrl")
-	defer os.Clearenv()
+	t.Cleanup(func() {
+		os.Clearenv()
+	})
+	wantConfig := Config{
+		LogLevel:                            "Debug",
+		InfoProducerSupervisionCallbackHost: "supervisionCallbackHost",
+		InfoProducerSupervisionCallbackPort: 8095,
+		InfoJobCallbackHost:                 "jobCallbackHost",
+		InfoJobCallbackPort:                 8096,
+		InfoCoordinatorAddress:              "infoCoordAddr",
+	}
+	if got := New(); !reflect.DeepEqual(got, &wantConfig) {
+		t.Errorf("New() = %v, want %v", got, &wantConfig)
+	}
+}
+
+func TestNew_faultyIntValueSetConfigContainDefaultValueAndWarnInLog(t *testing.T) {
+	assertions := require.New(t)
+	var buf bytes.Buffer
+	log.SetOutput(&buf)
+
+	os.Setenv("INFO_PRODUCER_SUPERVISION_CALLBACK_PORT", "wrong")
+	t.Cleanup(func() {
+		log.SetOutput(os.Stderr)
+		os.Clearenv()
+	})
 	wantConfig := Config{
-		LogLevel:                           "Debug",
-		InfoJobCallbackUrl:                 "jobCallbackUrl",
-		InfoCoordinatorAddress:             "infoCoordAddr",
-		InfoProducerSupervisionCallbackUrl: "supervisionCallbackUrl",
+		LogLevel:                            "Info",
+		InfoProducerSupervisionCallbackHost: "",
+		InfoProducerSupervisionCallbackPort: 8085,
+		InfoJobCallbackHost:                 "",
+		InfoJobCallbackPort:                 8086,
+		InfoCoordinatorAddress:              "http://enrichmentservice:8083",
 	}
 	if got := New(); !reflect.DeepEqual(got, &wantConfig) {
 		t.Errorf("New() = %v, want %v", got, &wantConfig)
 	}
+	logString := buf.String()
+	assertions.Contains(logString, "Invalid int value: wrong for variable: INFO_PRODUCER_SUPERVISION_CALLBACK_PORT. Default value: 8085 will be used")
 }
 
 func TestNew_envVarsNotSetConfigContainDefaultValues(t *testing.T) {
 	wantConfig := Config{
-		LogLevel:                           "Info",
-		InfoJobCallbackUrl:                 "",
-		InfoCoordinatorAddress:             "http://enrichmentservice:8083",
-		InfoProducerSupervisionCallbackUrl: "",
+		LogLevel:                            "Info",
+		InfoProducerSupervisionCallbackHost: "",
+		InfoProducerSupervisionCallbackPort: 8085,
+		InfoJobCallbackHost:                 "",
+		InfoJobCallbackPort:                 8086,
+		InfoCoordinatorAddress:              "http://enrichmentservice:8083",
 	}
 	if got := New(); !reflect.DeepEqual(got, &wantConfig) {
 		t.Errorf("New() = %v, want %v", got, &wantConfig)