DRY tests

data_row_reader_test.go

@@ -6,87 +6,31 @@ import (
 
 func TestDataRowReaderReadValue(t *testing.T) {
 	conn := getSharedConnection()
-	var v interface{}
-	var err error
 
-	onDataRow := func(r *DataRowReader) error {
-		v = r.ReadValue()
-		return nil
-	}
+	test := func(sql string, expected interface{}) {
+		var v interface{}
 
-	err = conn.SelectFunc("select null", onDataRow)
-	if err != nil {
-		t.Fatalf("Select failed: %v", err)
-	}
-	if v != nil {
-		t.Errorf("Wrong value returned: %v", v)
-	}
+		onDataRow := func(r *DataRowReader) error {
+			v = r.ReadValue()
+			return nil
+		}
 
-	err = conn.SelectFunc("select 'Jack'", onDataRow)
-	if err != nil {
-		t.Fatalf("Select failed: %v", err)
-	}
-	if typedValue, _ := v.(string); typedValue != "Jack" {
-		t.Errorf("Wrong value returned: %v", typedValue)
-	}
-
-	err = conn.SelectFunc("select true", onDataRow)
-	if err != nil {
-		t.Errorf("Unable to select bool: %#v", err)
-	} else {
-		s, ok := v.(bool)
-		if !(ok && s == true) {
-			t.Errorf("Expected true, received: %#v", v)
+		err := conn.SelectFunc(sql, onDataRow)
+		if err != nil {
+			t.Fatalf("Select failed: %v", err)
+		}
+		if v != expected {
+			t.Errorf("Expected: %#v Received: %#v", expected, v)
 		}
 	}
 
-	err = conn.SelectFunc("select false", onDataRow)
-	if err != nil {
-		t.Errorf("Unable to select bool: %v", err)
-	} else {
-		s, ok := v.(bool)
-		if !(ok && s == false) {
-			t.Errorf("Expected false, received: %#v", v)
-		}
-	}
-
-	err = conn.SelectFunc("select 1::int2", onDataRow)
-	if err != nil {
-		t.Errorf("Unable to select int2: %v", err)
-	} else {
-		s, ok := v.(int16)
-		if !(ok && s == 1) {
-			t.Errorf("Expected 1, received: %#v", v)
-		}
-	}
-
-	err = conn.SelectFunc("select 1::int4", onDataRow)
-	if err != nil {
-		t.Errorf("Unable to select int4: %v", err)
-	} else {
-		s, ok := v.(int32)
-		if !(ok && s == 1) {
-			t.Errorf("Expected 1, received: %#v", v)
-		}
-	}
-
-	err = conn.SelectFunc("select 1::int8", onDataRow)
-	if err != nil {
-		t.Errorf("Unable to select int8: %#v", err)
-	} else {
-		s, ok := v.(int64)
-		if !(ok && s == 1) {
-			t.Errorf("Expected 1, received: %#v", v)
-		}
-	}
-
-	err = conn.SelectFunc("select 1.23::float4", onDataRow)
-	if err != nil {
-		t.Errorf("Unable to select float4: %#v", err)
-	} else {
-		s, ok := v.(float32)
-		if !(ok && s == float32(1.23)) {
-			t.Errorf("Expected 1.23, received: %#v", v)
-		}
-	}
+	test("select null", nil)
+	test("select 'Jack'", "Jack")
+	test("select true", true)
+	test("select false", false)
+	test("select 1::int2", int16(1))
+	test("select 1::int4", int32(1))
+	test("select 1::int8", int64(1))
+	test("select 1.23::float4", float32(1.23))
+	test("select 1.23::float8", float64(1.23))
 }