storage: use connection string for postgres

gtfs_test.go

@@ -0,0 +1,9 @@
+package gtfs_test
+
+// Most tests in this package run against the in-memory and storage
+// backends by default. If PostgresConnStr is set, they'll also run
+// against postgres.
+
+const (
+	PostgresConnStr = "" // "postgres://postgres:mysecretpassword@localhost:5432/gtfs?sslmode=disable"
+)

realtime_integration_test.go

@@ -72,8 +72,6 @@ func TestRealtimeIntegrationNYCFerryDelaysOnER(t *testing.T) {
 		},
 	}, departures)
 
-	fmt.Println("Failure below")
-
 	// Makes sure delay got propagated to Dumbo.
 	//
 	// Minor note: the original schedule has this departing 11:13,

realtime_test.go

@@ -29,17 +29,9 @@ func staticAndReaderFromFiles(t *testing.T, backend string, files map[string][]s
 		s, err = storage.NewSQLiteStorage()
 		require.NoError(t, err)
 	} else if backend == "postgres" {
-		s, err = storage.NewPSQLStorage(storage.PSQLConfig{
-			Host:     "localhost",
-			Port:     5432,
-			User:     "postgres",
-			Password: "mysecretpassword",
-			DBName:   "gtfs",
-			ClearDB:  true,
-		})
+		s, err = storage.NewPSQLStorage(PostgresConnStr, true)
 		require.NoError(t, err)
 	} else {
-
 		t.Fatalf("Unknown backend: %s", backend)
 	}
 

static_bench_test.go

@@ -1,15 +1,16 @@
-package gtfs
+package gtfs_test
 
 import (
 	"io/ioutil"
 	"testing"
 	"time"
 
+	"tidbyt.dev/gtfs"
 	"tidbyt.dev/gtfs/parse"
 	"tidbyt.dev/gtfs/storage"
 )
 
-func loadFeed(b *testing.B, backend string, filename string) *Static {
+func loadFeed(b *testing.B, backend string, filename string) *gtfs.Static {
 	var s storage.Storage
 	var err error
 	if backend == "memory" {
@@ -20,14 +21,7 @@ func loadFeed(b *testing.B, backend string, filename string) *Static {
 			b.Error(err)
 		}
 	} else if backend == "postgres" {
-		s, err = storage.NewPSQLStorage(storage.PSQLConfig{
-			Host:     "localhost",
-			Port:     5432,
-			User:     "postgres",
-			Password: "mysecretpassword",
-			DBName:   "gtfs",
-			ClearDB:  false,
-		})
+		s, err = storage.NewPSQLStorage(PostgresConnStr, true)
 		if err != nil {
 			b.Error(err)
 		}
@@ -58,7 +52,7 @@ func loadFeed(b *testing.B, backend string, filename string) *Static {
 		b.Error(err)
 	}
 
-	static, err := NewStatic(reader, metadata)
+	static, err := gtfs.NewStatic(reader, metadata)
 	if err != nil {
 		b.Error(err)
 	}
@@ -83,7 +77,12 @@ func benchNearbyStops(b *testing.B, backend string) {
 func benchDepartures(b *testing.B, backend string) {
 	static := loadFeed(b, backend, "testdata/caltrain_20160406.zip")
 
-	when := time.Date(2020, 2, 3, 8, 0, 0, 0, static.location)
+	tz, err := time.LoadLocation("America/Los_Angeles")
+	if err != nil {
+		b.Error(err)
+	}
+
+	when := time.Date(2020, 2, 3, 8, 0, 0, 0, tz)
 	window := 1 * time.Hour
 
 	stops, err := static.NearbyStops(40.734673, -73.989951, 0, nil)
@@ -118,8 +117,10 @@ func BenchmarkGTFSStatic(b *testing.B) {
 		b.Run(test.Name+"_sqlite", func(b *testing.B) {
 			test.Bench(b, "sqlite")
 		})
-		b.Run(test.Name+"_postgres", func(b *testing.B) {
-			test.Bench(b, "postgres")
-		})
+		if PostgresConnStr != "" {
+			b.Run(test.Name+"_postgres", func(b *testing.B) {
+				test.Bench(b, "postgres")
+			})
+		}
 	}
 }

static_integration_test.go

@@ -22,14 +22,7 @@ func loadFeed2(t *testing.T, backend string, filename string) (*gtfs.Static, sto
 		s, err = storage.NewSQLiteStorage()
 		require.NoError(t, err)
 	} else if backend == "postgres" {
-		s, err = storage.NewPSQLStorage(storage.PSQLConfig{
-			Host:     "localhost",
-			Port:     5432,
-			User:     "postgres",
-			Password: "mysecretpassword",
-			DBName:   "gtfs",
-			ClearDB:  true,
-		})
+		s, err = storage.NewPSQLStorage(PostgresConnStr, true)
 		require.NoError(t, err)
 	} else {
 		t.Fatalf("unknown backend %q", backend)
@@ -247,8 +240,10 @@ func TestStaticIntegration(t *testing.T) {
 		t.Run(test.Name+"_memory", func(t *testing.T) {
 			test.Test(t, "memory")
 		})
-		// t.Run(test.Name+"_postgres", func(t *testing.T) {
-		//	test.Test(t, "postgres")
-		// })
+		if PostgresConnStr != "" {
+			t.Run(test.Name+"_postgres", func(t *testing.T) {
+				test.Test(t, "postgres")
+			})
+		}
 	}
 }