consistent test style

andreas-schroeder · Oct 19, 2016 · 2d7d131 · 2d7d131
1 parent 0468948
commit 2d7d131
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 33 deletions.
diff --git a/check/cluster_health_check_test.go b/check/cluster_health_check_test.go
@@ -46,17 +46,8 @@ func Test_checkClusterHealth_WhenSomeBrokerMissingInZK_ReportsRed(t *testing.T)
 func Test_checkClusterHealth_WhenSomePartitionMissingInZK_ReportsRed(t *testing.T) {
  check := newTestCheck()
 
- zkTopics := []ZkTopic{
- {
- Name: "some-topic",
- Partitions: map[int32][]int32{
- 3: {2, 1},
- },
- },
- }
-
  clusterStatus := check.checkClusterHealth(
- healthyMetadata("some-topic"), zkTopics, healthyZkBrokers())
+ healthyMetadata("some-topic"), partitionMissingZkTopics(), healthyZkBrokers())
 
  if clusterStatus.Status != red {
  t.Errorf("CheckHealth reported cluster status as %v, expected %s", clusterStatus.Status, red)
@@ -66,17 +57,8 @@ func Test_checkClusterHealth_WhenSomePartitionMissingInZK_ReportsRed(t *testing.
 func Test_checkClusterHealth_WhenSomeReplicaMissingInZK_ReportsRed(t *testing.T) {
  check := newTestCheck()
 
- zkTopics := []ZkTopic{
- {
- Name: "some-topic",
- Partitions: map[int32][]int32{
- 2: {1},
- },
- },
- }
-
  clusterStatus := check.checkClusterHealth(
- healthyMetadata("some-topic"), zkTopics, healthyZkBrokers())
+ healthyMetadata("some-topic"), replicaMissingZkTopics(), healthyZkBrokers())
 
  if clusterStatus.Status != red {
  t.Errorf("CheckHealth reported cluster status as %v, expected %s", clusterStatus.Status, red)
@@ -86,10 +68,8 @@ func Test_checkClusterHealth_WhenSomeReplicaMissingInZK_ReportsRed(t *testing.T)
 func Test_checkClusterHealth_WhenSomeTopicMissingInZK_ReportsRed(t *testing.T) {
  check := newTestCheck()
 
- zkTopics := []ZkTopic{}
-
  clusterStatus := check.checkClusterHealth(
- healthyMetadata("some-topic"), zkTopics, healthyZkBrokers())
+ healthyMetadata("some-topic"), []ZkTopic{}, healthyZkBrokers())
 
  if clusterStatus.Status != red {
  t.Errorf("CheckHealth reported cluster status as %v, expected %s", clusterStatus.Status, red)
@@ -99,17 +79,8 @@ func Test_checkClusterHealth_WhenSomeTopicMissingInZK_ReportsRed(t *testing.T) {
 func Test_checkClusterHealth_WhenSomeTopicMissingInMetadata_ReportsRed(t *testing.T) {
  check := newTestCheck()
 
- zkTopics := []ZkTopic{
- {
- Name: "some-topic",
- Partitions: map[int32][]int32{
- 3: {2, 1},
- },
- },
- }
-
  clusterStatus := check.checkClusterHealth(
- healthyMetadata(), zkTopics, healthyZkBrokers())
+ healthyMetadata( /* no topic */ ), healthyZkTopics(), healthyZkBrokers())
 
  if clusterStatus.Status != red {
  t.Errorf("CheckHealth reported cluster status as %v, expected %s", clusterStatus.Status, red)

diff --git a/check/test_helpers.go b/check/test_helpers.go
@@ -186,6 +186,26 @@ func healthyZkTopics() []ZkTopic {
  }
 }
 
+func replicaMissingZkTopics() []ZkTopic {
+ return []ZkTopic{
+ {
+ Name: "some-topic",
+ Partitions: map[int32][]int32{
+ 2: {1},
+ },
+ },
+ }
+}
+
+func partitionMissingZkTopics() []ZkTopic {
+ return []ZkTopic{
+ {
+ Name: "some-topic",
+ Partitions: map[int32][]int32{},
+ },
+ }
+}
+
 func healthyZkBrokers() []int32 {
  return []int32{1, 2}
 }