From 6884fdfb52e0eb42ecec0316188192356481f6b1 Mon Sep 17 00:00:00 2001
From: Jack Christensen <jack@jackchristensen.com>
Date: Fri, 11 Jul 2014 08:33:09 -0500
Subject: [PATCH] Move Query tests together

---
 conn_test.go | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/conn_test.go b/conn_test.go
index 6e3e4b28..218d0200 100644
--- a/conn_test.go
+++ b/conn_test.go
@@ -580,6 +580,30 @@ func TestConnQueryUnpreparedEncoder(t *testing.T) {
 	ensureConnValid(t, conn)
 }
 
+func TestQueryPreparedEncodeError(t *testing.T) {
+	t.Parallel()
+
+	conn := mustConnect(t, *defaultConnConfig)
+	defer closeConn(t, conn)
+
+	mustPrepare(t, conn, "testTranscode", "select $1::integer")
+	defer func() {
+		if err := conn.Deallocate("testTranscode"); err != nil {
+			t.Fatalf("Unable to deallocate prepared statement: %v", err)
+		}
+	}()
+
+	_, err := conn.Query("testTranscode", "wrong")
+	switch {
+	case err == nil:
+		t.Error("Expected transcode error to return error, but it didn't")
+	case err.Error() == "Expected integer representable in int32, received string wrong":
+		// Correct behavior
+	default:
+		t.Errorf("Expected transcode error, received %v", err)
+	}
+}
+
 func TestPrepare(t *testing.T) {
 	t.Parallel()
 
@@ -1100,27 +1124,3 @@ func TestQueryRowNoResults(t *testing.T) {
 		ensureConnValid(t, conn)
 	}
 }
-
-func TestQueryPreparedEncodeError(t *testing.T) {
-	t.Parallel()
-
-	conn := mustConnect(t, *defaultConnConfig)
-	defer closeConn(t, conn)
-
-	mustPrepare(t, conn, "testTranscode", "select $1::integer")
-	defer func() {
-		if err := conn.Deallocate("testTranscode"); err != nil {
-			t.Fatalf("Unable to deallocate prepared statement: %v", err)
-		}
-	}()
-
-	_, err := conn.Query("testTranscode", "wrong")
-	switch {
-	case err == nil:
-		t.Error("Expected transcode error to return error, but it didn't")
-	case err.Error() == "Expected integer representable in int32, received string wrong":
-		// Correct behavior
-	default:
-		t.Errorf("Expected transcode error, received %v", err)
-	}
-}