From 4970e2a37bf11eddb5f52b21facf899d2701dba9 Mon Sep 17 00:00:00 2001
From: Donald Guy <donald@tulip.co>
Date: Wed, 6 Jan 2016 19:25:40 -0500
Subject: [PATCH] 0.3.0 unit tests: existing postgresql

---
 plugins/postgresql/postgresql_test.go | 46 +++++++++------------------
 1 file changed, 15 insertions(+), 31 deletions(-)

diff --git a/plugins/postgresql/postgresql_test.go b/plugins/postgresql/postgresql_test.go
index 4a53a2e8f..566354e5f 100644
--- a/plugins/postgresql/postgresql_test.go
+++ b/plugins/postgresql/postgresql_test.go
@@ -15,13 +15,9 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 	}
 
 	p := &Postgresql{
-		Servers: []*Server{
-			{
-				Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
-					testutil.GetLocalHost()),
-				Databases: []string{"postgres"},
-			},
-		},
+		Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
+			testutil.GetLocalHost()),
+		Databases: []string{"postgres"},
 	}
 
 	var acc testutil.Accumulator
@@ -30,7 +26,7 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 	require.NoError(t, err)
 
 	availableColumns := make(map[string]bool)
-	for _, col := range p.Servers[0].OrderedColumns {
+	for _, col := range p.OrderedColumns {
 		availableColumns[col] = true
 	}
 
@@ -61,7 +57,7 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 	for _, metric := range intMetrics {
 		_, ok := availableColumns[metric]
 		if ok {
-			assert.True(t, acc.HasIntValue(metric))
+			assert.True(t, acc.HasIntField("postgresql", metric), metric)
 			metricsCounted++
 		}
 	}
@@ -69,7 +65,7 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
 	for _, metric := range floatMetrics {
 		_, ok := availableColumns[metric]
 		if ok {
-			assert.True(t, acc.HasFloatValue(metric))
+			assert.True(t, acc.HasFloatField("postgresql", metric), metric)
 			metricsCounted++
 		}
 	}
@@ -84,13 +80,9 @@ func TestPostgresqlTagsMetricsWithDatabaseName(t *testing.T) {
 	}
 
 	p := &Postgresql{
-		Servers: []*Server{
-			{
-				Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
-					testutil.GetLocalHost()),
-				Databases: []string{"postgres"},
-			},
-		},
+		Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
+			testutil.GetLocalHost()),
+		Databases: []string{"postgres"},
 	}
 
 	var acc testutil.Accumulator
@@ -98,7 +90,7 @@ func TestPostgresqlTagsMetricsWithDatabaseName(t *testing.T) {
 	err := p.Gather(&acc)
 	require.NoError(t, err)
 
-	point, ok := acc.Get("xact_commit")
+	point, ok := acc.Get("postgresql")
 	require.True(t, ok)
 
 	assert.Equal(t, "postgres", point.Tags["db"])
@@ -110,12 +102,8 @@ func TestPostgresqlDefaultsToAllDatabases(t *testing.T) {
 	}
 
 	p := &Postgresql{
-		Servers: []*Server{
-			{
-				Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
-					testutil.GetLocalHost()),
-			},
-		},
+		Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
+			testutil.GetLocalHost()),
 	}
 
 	var acc testutil.Accumulator
@@ -126,7 +114,7 @@ func TestPostgresqlDefaultsToAllDatabases(t *testing.T) {
 	var found bool
 
 	for _, pnt := range acc.Points {
-		if pnt.Measurement == "xact_commit" {
+		if pnt.Measurement == "postgresql" {
 			if pnt.Tags["db"] == "postgres" {
 				found = true
 				break
@@ -143,12 +131,8 @@ func TestPostgresqlIgnoresUnwantedColumns(t *testing.T) {
 	}
 
 	p := &Postgresql{
-		Servers: []*Server{
-			{
-				Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
-					testutil.GetLocalHost()),
-			},
-		},
+		Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
+			testutil.GetLocalHost()),
 	}
 
 	var acc testutil.Accumulator