From 72bba7fb4278bf4126f6abf66952815edb1476f2 Mon Sep 17 00:00:00 2001
From: Jack Christensen <jack@jackchristensen.com>
Date: Mon, 25 May 2020 11:36:18 -0500
Subject: [PATCH] Move batch simple protocol test to batch_test.go

---
 batch_test.go | 41 +++++++++++++++++++++++++++++++++++++++++
 conn_test.go  | 41 -----------------------------------------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/batch_test.go b/batch_test.go
index f487c52a..113ce3cf 100644
--- a/batch_test.go
+++ b/batch_test.go
@@ -725,3 +725,44 @@ func TestLogBatchStatementsOnBatchResultClose(t *testing.T) {
 		t.Errorf("Expected second query to be 'select 1 = 1;' but was '%s'", l1.logs[1].data["sql"])
 	}
 }
+
+func TestSendBatchSimpleProtocol(t *testing.T) {
+	t.Parallel()
+
+	config := mustParseConfig(t, os.Getenv("PGX_TEST_DATABASE"))
+	config.PreferSimpleProtocol = true
+
+	ctx, cancelFunc := context.WithCancel(context.Background())
+	defer cancelFunc()
+
+	conn := mustConnect(t, config)
+	defer closeConn(t, conn)
+
+	var batch pgx.Batch
+	batch.Queue("SELECT 1::int")
+	batch.Queue("SELECT 2::int; SELECT $1::int", 3)
+	results := conn.SendBatch(ctx, &batch)
+	rows, err := results.Query()
+	assert.NoError(t, err)
+	assert.True(t, rows.Next())
+	values, err := rows.Values()
+	assert.NoError(t, err)
+	assert.Equal(t, int32(1), values[0])
+	assert.False(t, rows.Next())
+
+	rows, err = results.Query()
+	assert.NoError(t, err)
+	assert.True(t, rows.Next())
+	values, err = rows.Values()
+	assert.NoError(t, err)
+	assert.Equal(t, int32(2), values[0])
+	assert.False(t, rows.Next())
+
+	rows, err = results.Query()
+	assert.NoError(t, err)
+	assert.True(t, rows.Next())
+	values, err = rows.Values()
+	assert.NoError(t, err)
+	assert.Equal(t, int32(3), values[0])
+	assert.False(t, rows.Next())
+}
diff --git a/conn_test.go b/conn_test.go
index da0520df..72022b21 100644
--- a/conn_test.go
+++ b/conn_test.go
@@ -360,47 +360,6 @@ func TestExecPerQuerySimpleProtocol(t *testing.T) {
 
 }
 
-func TestSendBatchSimpleProtocol(t *testing.T) {
-	t.Parallel()
-
-	config := mustParseConfig(t, os.Getenv("PGX_TEST_DATABASE"))
-	config.PreferSimpleProtocol = true
-
-	ctx, cancelFunc := context.WithCancel(context.Background())
-	defer cancelFunc()
-
-	conn := mustConnect(t, config)
-	defer closeConn(t, conn)
-
-	var batch pgx.Batch
-	batch.Queue("SELECT 1::int")
-	batch.Queue("SELECT 2::int; SELECT $1::int", 3)
-	results := conn.SendBatch(ctx, &batch)
-	rows, err := results.Query()
-	assert.NoError(t, err)
-	assert.True(t, rows.Next())
-	values, err := rows.Values()
-	assert.NoError(t, err)
-	assert.Equal(t, int32(1), values[0])
-	assert.False(t, rows.Next())
-
-	rows, err = results.Query()
-	assert.NoError(t, err)
-	assert.True(t, rows.Next())
-	values, err = rows.Values()
-	assert.NoError(t, err)
-	assert.Equal(t, int32(2), values[0])
-	assert.False(t, rows.Next())
-
-	rows, err = results.Query()
-	assert.NoError(t, err)
-	assert.True(t, rows.Next())
-	values, err = rows.Values()
-	assert.NoError(t, err)
-	assert.Equal(t, int32(3), values[0])
-	assert.False(t, rows.Next())
-}
-
 func TestPrepare(t *testing.T) {
 	t.Parallel()