From 59e81976d2e5f56004597f9d8504c3abc5b08b0d Mon Sep 17 00:00:00 2001
From: Bo Du <bokwandu@gmail.com>
Date: Wed, 13 Feb 2019 17:14:20 -0500
Subject: [PATCH] Code-reuse and rename.

---
 integration/client.go                         | 24 +++++++++++--------
 ... groupby_query_no_filter_no_order_test.go} |  5 ++--
 2 files changed, 16 insertions(+), 13 deletions(-)
 rename integration/{groupby_query_test.go => groupby_query_no_filter_no_order_test.go} (96%)

diff --git a/integration/client.go b/integration/client.go
index 0b7a5e4..5a4a78c 100644
--- a/integration/client.go
+++ b/integration/client.go
@@ -53,11 +53,7 @@ func (c client) write(data []byte) error {
 }
 
 func (c client) queryRaw(data []byte) (rawQueryResults, error) {
-	req, err := http.NewRequest(http.MethodPost, c.queryURL, bytes.NewReader(data))
-	if err != nil {
-		return rawQueryResults{}, err
-	}
-	resp, err := c.do(req)
+	resp, err := c.doQuery(data)
 	if err != nil {
 		return rawQueryResults{}, err
 	}
@@ -70,11 +66,7 @@ func (c client) queryRaw(data []byte) (rawQueryResults, error) {
 }
 
 func (c client) queryGroupBy(data []byte) (groupByQueryResults, error) {
-	req, err := http.NewRequest(http.MethodPost, c.queryURL, bytes.NewReader(data))
-	if err != nil {
-		return groupByQueryResults{}, err
-	}
-	resp, err := c.do(req)
+	resp, err := c.doQuery(data)
 	if err != nil {
 		return groupByQueryResults{}, err
 	}
@@ -86,6 +78,18 @@ func (c client) queryGroupBy(data []byte) (groupByQueryResults, error) {
 	return results, nil
 }
 
+func (c client) doQuery(data []byte) ([]byte, error) {
+	req, err := http.NewRequest(http.MethodPost, c.queryURL, bytes.NewReader(data))
+	if err != nil {
+		return nil, err
+	}
+	resp, err := c.do(req)
+	if err != nil {
+		return nil, err
+	}
+	return resp, nil
+}
+
 func (c client) do(req *http.Request) ([]byte, error) {
 	req.Header.Set("Content-Type", "application/json")
 	resp, err := c.client.Do(req)
diff --git a/integration/groupby_query_test.go b/integration/groupby_query_no_filter_no_order_test.go
similarity index 96%
rename from integration/groupby_query_test.go
rename to integration/groupby_query_no_filter_no_order_test.go
index 2a288cc..1c66558 100644
--- a/integration/groupby_query_test.go
+++ b/integration/groupby_query_no_filter_no_order_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestGroupByQuery(t *testing.T) {
+func TestGroupByQueryNoFilterNoOrder(t *testing.T) {
 	if testing.Short() {
 		t.SkipNow()
 	}
@@ -20,7 +20,7 @@ func TestGroupByQuery(t *testing.T) {
 	defer ts.close(t)
 
 	log := ts.dbOpts.InstrumentOptions().Logger()
-	log.Info("testing various groupby query")
+	log.Info("testing groupby query w/ no filter and no order")
 	require.NoError(t, ts.startServer())
 	log.Info("server is now up")
 
@@ -76,7 +76,6 @@ func TestGroupByQuery(t *testing.T) {
 		assert.NoError(t, err)
 		b, err := json.Marshal(resp)
 		assert.NoError(t, err)
-		log.Infof("FINAL RESP: %s", string(b))
 		assert.Equal(t, string(b), test.expectedResults)
 	}