removed redundent tests

Signed-off-by: [email protected] <[email protected]>

Author: [email protected]

platform/view/services/storage/driver/sql/common/test_utils.go

@@ -7,15 +7,10 @@ SPDX-License-Identifier: Apache-2.0
 package common
 
 import (
-	"context"
-	"regexp"
 	"testing"
 
-	"github.com/DATA-DOG/go-sqlmock"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/driver"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
-	"github.com/stretchr/testify/require"
 	_ "modernc.org/sqlite"
 )
 
@@ -57,28 +52,3 @@ func TestCases(t *testing.T,
 		})
 	}
 }
-
-func PutBindings(t *testing.T, store driver.BindingStore, mock sqlmock.Sqlmock) {
-	ctx := context.Background()
-
-	// Input identities
-	longTerm := view.Identity("long")
-	e1 := view.Identity("eph1")
-	e2 := view.Identity("eph2")
-
-	// Expected SQL query
-
-	expectedSQL := regexp.QuoteMeta(`SELECT long_term_id FROM bindings WHERE ephemeral_hash = $1`)
-	mock.ExpectQuery(expectedSQL).
-		WithArgs(longTerm.UniqueID()).
-		WillReturnRows(sqlmock.NewRows([]string{"long_term_id"})) // empty rows = no results
-
-	expectedSQL = regexp.QuoteMeta(`INSERT INTO bindings (ephemeral_hash, long_term_id) VALUES ($1, $2), ($3, $4), ($5, $6) ON CONFLICT DO NOTHING;`)
-	mock.ExpectExec(expectedSQL).
-		WithArgs(longTerm.UniqueID(), longTerm, e1.UniqueID(), longTerm, e2.UniqueID(), longTerm).
-		WillReturnResult(sqlmock.NewResult(1, 2))
-
-	err := store.PutBindings(ctx, longTerm, e1, e2)
-	require.NoError(t, err)
-	require.NoError(t, mock.ExpectationsWereMet())
-}

platform/view/services/storage/driver/sql/postgres/binding_test.go

@@ -10,50 +10,14 @@ import (
 	"context"
 	"testing"
 
-	"github.com/DATA-DOG/go-sqlmock"
-	common3 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/driver/common"
 	testing2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/driver/common/testing"
-	common2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/driver/sql/common"
 
-	// postgres2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/driver/sql/postgres"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 	"github.com/stretchr/testify/require"
 )
 
 func TestPutBindingsMultipleEphemerals(t *testing.T) {
-	// Create mock DB and mock expectations
-	db, mock, err := sqlmock.New()
-	require.NoError(t, err)
-	defer func() { _ = db.Close() }()
-
-	// Wrap sqlmock's db into RWDB
-	rwdb := &common3.RWDB{
-		WriteDB: db,
-		ReadDB:  db,
-	}
-
-	// Prepare table names
-	tables := common2.TableNames{
-		Binding: "bindings",
-	}
-
-	// Create store using constructor
-	store, err := NewBindingStore(rwdb, tables)
-	require.NoError(t, err)
-
-	common2.PutBindings(t, store, mock)
-}
-
-func TestPutBindingsMultipleEphemeralsFull(t *testing.T) {
-	// if os.Getenv("TEST_POSTGRES") != "true" {
-	// 	t.Skip("set environment variable TEST_POSTGRES to true to include postgres test")
-	// }
-	// if testing.Short() {
-	// 	t.Skip("skipping postgres test in short mode")
-	// }
-
 	t.Log("starting postgres")
-	// terminate, pgConnStr, err := postgres2.StartPostgres(t, false)
 	terminate, pgConnStr, err := StartPostgres(t, false)
 	require.NoError(t, err)
 	defer terminate()

platform/view/services/storage/driver/sql/sqlite/binding_test.go

@@ -12,40 +12,14 @@ import (
 	"path"
 	"testing"
 
-	"github.com/DATA-DOG/go-sqlmock"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
-	common3 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/driver/common"
 	common2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/driver/sql/common"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestPutBindingsMultipleEphemerals(t *testing.T) {
-	// Create mock DB and mock expectations
-	db, mock, err := sqlmock.New()
-	require.NoError(t, err)
-	defer func() { _ = db.Close() }()
-
-	// Wrap sqlmock's db into RWDB
-	rwdb := &common3.RWDB{
-		WriteDB: db,
-		ReadDB:  db,
-	}
-
-	// Prepare table names
-	tables := common2.TableNames{
-		Binding: "bindings",
-	}
-
-	// Create store using constructor
-	store, err := NewBindingStore(rwdb, tables)
-	require.NoError(t, err)
-
-	common2.PutBindings(t, store, mock)
-}
-
-func TestPutBindingsMultipleEphemeralsFull(t *testing.T) {
 	tempDir := t.TempDir()
 	o := Opts{
 		DataSource: fmt.Sprintf("file:%s.sqlite?_pragma=busy_timeout(1000)", path.Join(tempDir, "benchmark")),