[VOL-2736]host and port should be specified as a single argument not as two separate arguments
Change-Id: I312fe753ac0fe62c942f335371e6449809ecfb85
diff --git a/pkg/kafka/kafka_inter_container_library_test.go b/pkg/kafka/kafka_inter_container_library_test.go
index f32c16c..09286ad 100644
--- a/pkg/kafka/kafka_inter_container_library_test.go
+++ b/pkg/kafka/kafka_inter_container_library_test.go
@@ -22,29 +22,19 @@
func TestDefaultKafkaProxy(t *testing.T) {
actualResult := newInterContainerProxy()
- assert.Equal(t, actualResult.kafkaHost, DefaultKafkaHost)
- assert.Equal(t, actualResult.kafkaPort, DefaultKafkaPort)
+ assert.Equal(t, actualResult.kafkaAddress, DefaultKafkaAddress)
assert.Equal(t, actualResult.defaultRequestHandlerInterface, interface{}(nil))
}
-func TestKafkaProxyOptionHost(t *testing.T) {
- actualResult := newInterContainerProxy(InterContainerHost("10.20.30.40"))
- assert.Equal(t, actualResult.kafkaHost, "10.20.30.40")
- assert.Equal(t, actualResult.kafkaPort, DefaultKafkaPort)
- assert.Equal(t, actualResult.defaultRequestHandlerInterface, interface{}(nil))
-}
-
-func TestKafkaProxyOptionPort(t *testing.T) {
- actualResult := newInterContainerProxy(InterContainerPort(1020))
- assert.Equal(t, actualResult.kafkaHost, DefaultKafkaHost)
- assert.Equal(t, actualResult.kafkaPort, 1020)
+func TestKafkaProxyOptionAddress(t *testing.T) {
+ actualResult := newInterContainerProxy(InterContainerAddress("10.20.30.40:1020"))
+ assert.Equal(t, actualResult.kafkaAddress, "10.20.30.40:1020")
assert.Equal(t, actualResult.defaultRequestHandlerInterface, interface{}(nil))
}
func TestKafkaProxyOptionTopic(t *testing.T) {
actualResult := newInterContainerProxy(DefaultTopic(&Topic{Name: "Adapter"}))
- assert.Equal(t, actualResult.kafkaHost, DefaultKafkaHost)
- assert.Equal(t, actualResult.kafkaPort, DefaultKafkaPort)
+ assert.Equal(t, actualResult.kafkaAddress, DefaultKafkaAddress)
assert.Equal(t, actualResult.defaultRequestHandlerInterface, interface{}(nil))
assert.Equal(t, actualResult.defaultTopic.Name, "Adapter")
}
@@ -55,20 +45,17 @@
func TestKafkaProxyOptionTargetInterface(t *testing.T) {
var m *myInterface
actualResult := newInterContainerProxy(RequestHandlerInterface(m))
- assert.Equal(t, actualResult.kafkaHost, DefaultKafkaHost)
- assert.Equal(t, actualResult.kafkaPort, DefaultKafkaPort)
+ assert.Equal(t, actualResult.kafkaAddress, DefaultKafkaAddress)
assert.Equal(t, actualResult.defaultRequestHandlerInterface, m)
}
func TestKafkaProxyChangeAllOptions(t *testing.T) {
var m *myInterface
actualResult := newInterContainerProxy(
- InterContainerHost("10.20.30.40"),
- InterContainerPort(1020),
+ InterContainerAddress("10.20.30.40:1020"),
DefaultTopic(&Topic{Name: "Adapter"}),
RequestHandlerInterface(m))
- assert.Equal(t, actualResult.kafkaHost, "10.20.30.40")
- assert.Equal(t, actualResult.kafkaPort, 1020)
+ assert.Equal(t, actualResult.kafkaAddress, "10.20.30.40:1020")
assert.Equal(t, actualResult.defaultRequestHandlerInterface, m)
assert.Equal(t, actualResult.defaultTopic.Name, "Adapter")
}
@@ -80,8 +67,7 @@
client := NewSaramaClient()
probe := newInterContainerProxy(
- InterContainerHost("10.20.30.40"),
- InterContainerPort(1020),
+ InterContainerAddress("10.20.30.40:1020"),
DefaultTopic(&Topic{Name: "Adapter"}),
RequestHandlerInterface(m),
MsgClient(client),