Utilizing new client and overhauling Accumulator interface

Fixes #280
Fixes #281
Fixes #289

testutil/accumulator.go

@@ -22,7 +22,12 @@ type Accumulator struct {
 }
 
 // Add adds a measurement point to the accumulator
-func (a *Accumulator) Add(measurement string, value interface{}, tags map[string]string) {
+func (a *Accumulator) Add(
+	measurement string,
+	value interface{},
+	tags map[string]string,
+	t ...time.Time,
+) {
 	a.Lock()
 	defer a.Unlock()
 	if tags == nil {
@@ -38,24 +43,58 @@ func (a *Accumulator) Add(measurement string, value interface{}, tags map[string
 	)
 }
 
-// AddFieldsWithTime adds a measurement point with a specified timestamp.
-func (a *Accumulator) AddFieldsWithTime(
+// AddFields adds a measurement point with a specified timestamp.
+func (a *Accumulator) AddFields(
 	measurement string,
 	values map[string]interface{},
 	tags map[string]string,
-	timestamp time.Time,
+	timestamp ...time.Time,
 ) {
+	a.Lock()
+	defer a.Unlock()
+	var t time.Time
+	if len(timestamp) > 0 {
+		t = timestamp[0]
+	} else {
+		t = time.Now()
+	}
 	a.Points = append(
 		a.Points,
 		&Point{
 			Measurement: measurement,
 			Values:      values,
 			Tags:        tags,
-			Time:        timestamp,
+			Time:        t,
 		},
 	)
 }
 
+func (a *Accumulator) SetDefaultTags(tags map[string]string) {
+	// stub for implementing Accumulator interface.
+}
+
+func (a *Accumulator) AddDefaultTag(key, value string) {
+	// stub for implementing Accumulator interface.
+}
+
+func (a *Accumulator) Prefix() string {
+	// stub for implementing Accumulator interface.
+	return ""
+}
+
+func (a *Accumulator) SetPrefix(prefix string) {
+	// stub for implementing Accumulator interface.
+}
+
+func (a *Accumulator) Debug() bool {
+	// stub for implementing Accumulator interface.
+	return true
+}
+
+func (a *Accumulator) SetDebug(debug bool) {
+	// stub for implementing Accumulator interface.
+}
+
 // Get gets the specified measurement point from the accumulator
 func (a *Accumulator) Get(measurement string) (*Point, bool) {
 	for _, p := range a.Points {

testutil/testutil.go

@@ -4,9 +4,8 @@ import (
 	"net"
 	"net/url"
 	"os"
-	"time"
 
-	"github.com/influxdb/influxdb/client"
+	"github.com/influxdb/influxdb/client/v2"
 )
 
 var localhost = "localhost"
@@ -34,13 +33,14 @@ func GetLocalHost() string {
 // MockBatchPoints returns a mock BatchPoints object for using in unit tests
 // of telegraf output sinks.
 func MockBatchPoints() client.BatchPoints {
-	var bp client.BatchPoints
-	bp.Time = time.Now()
-	bp.Tags = map[string]string{"tag1": "value1"}
-	bp.Points = []client.Point{
-		{
-			Fields: map[string]interface{}{"value": 1.0},
-		},
-	}
+	// Create a new point batch
+	bp, _ := client.NewBatchPoints(client.BatchPointsConfig{})
+
+	// Create a point and add to batch
+	tags := map[string]string{"tag1": "value1"}
+	fields := map[string]interface{}{"value": 1.0}
+	pt := client.NewPoint("test_point", tags, fields)
+	bp.AddPoint(pt)
+
 	return bp
 }