Fixed readme and gc test

Author: vgarvardt

README.md

@@ -18,23 +18,23 @@ The store accepts an adapter interface that interacts with the DB. Adapter and i
 package main
 
 import (
+	"context"
 	"os"
 	"time"
 
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 	pg "github.com/vgarvardt/go-oauth2-pg"
-	"github.com/vgarvardt/go-pg-adapter/pgxadapter"
+	"github.com/vgarvardt/go-pg-adapter/pgx4adapter"
 	"gopkg.in/oauth2.v3/manage"
 )
 
 func main() {
-	pgxConnConfig, _ := pgx.ParseURI(os.Getenv("DB_URI"))
-	pgxConn, _ := pgx.Connect(pgxConnConfig)
+	pgxConn, _ := pgx.Connect(context.TODO(), os.Getenv("DB_URI"))
 
 	manager := manage.NewDefaultManager()
 
 	// use PostgreSQL token store with pgx.Connection adapter
-	adapter := pgxadapter.NewConn(pgxConn)
+	adapter := pgx4adapter.NewConn(pgxConn)
 	tokenStore, _ := pg.NewTokenStore(adapter, pg.WithTokenStoreGCInterval(time.Minute))
 	defer tokenStore.Close()
 

token_store_test.go

@@ -95,7 +95,10 @@ func TestTokenStore_initTable(t *testing.T) {
 func TestTokenStore_gc(t *testing.T) {
 	adapter := new(mockAdapter)
 
+	var execCalls int
 	adapter.On("Exec", mock.Anything, mock.Anything, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+		execCalls++
+
 		query := args.Get(1).(string)
 		// new line character is the character at position 0
 		assert.Equal(t, 0, strings.Index(query, "DELETE FROM"))
@@ -111,7 +114,8 @@ func TestTokenStore_gc(t *testing.T) {
 	time.Sleep(5 * time.Second)
 
 	// in 5 seconds we should have 4-5 gc calls
-	adapter.AssertNumberOfCalls(t, "Exec", 4)
+	assert.True(t, 3 < execCalls)
+	assert.True(t, 5 >= execCalls)
 }
 
 func generateTokenTableName() string {