From def99d1960daf1843cd77d65071bd19b99294fcb Mon Sep 17 00:00:00 2001 From: Senthil Nathan N Date: Wed, 24 Jun 2020 13:29:06 +0530 Subject: [PATCH] pvtstatepurgemgmt pkg -- consistently use testify/require (#1448) Signed-off-by: senthil --- .../txmgmt/privacyenabledstate/db_test.go | 121 +++++++++--------- .../privacyenabledstate/optimization_test.go | 38 +++--- .../privacyenabledstate/test_exports.go | 11 +- .../txmgmt/privacyenabledstate/types_test.go | 44 +++---- 4 files changed, 106 insertions(+), 108 deletions(-) diff --git a/core/ledger/kvledger/txmgmt/privacyenabledstate/db_test.go b/core/ledger/kvledger/txmgmt/privacyenabledstate/db_test.go index 27542ade60f..84da4bbb1f8 100644 --- a/core/ledger/kvledger/txmgmt/privacyenabledstate/db_test.go +++ b/core/ledger/kvledger/txmgmt/privacyenabledstate/db_test.go @@ -24,7 +24,6 @@ import ( "github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/statedb/stateleveldb" "github.com/hyperledger/fabric/core/ledger/mock" "github.com/hyperledger/fabric/core/ledger/util" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -115,24 +114,24 @@ func testDB(t *testing.T, env TestEnv) { } vv, err := db.GetState("ns1", "key1") - assert.NoError(t, err) - assert.Equal(t, &statedb.VersionedValue{Value: []byte("value1"), Version: version.NewHeight(1, 1)}, vv) + require.NoError(t, err) + require.Equal(t, &statedb.VersionedValue{Value: []byte("value1"), Version: version.NewHeight(1, 1)}, vv) vv, err = db.GetPrivateData("ns1", "coll1", "key1") - assert.NoError(t, err) - assert.Equal(t, &statedb.VersionedValue{Value: []byte("pvt_value1"), Version: version.NewHeight(1, 4)}, vv) + require.NoError(t, err) + require.Equal(t, &statedb.VersionedValue{Value: []byte("pvt_value1"), Version: version.NewHeight(1, 4)}, vv) vv, err = db.GetPrivateDataHash("ns1", "coll1", "key1") - assert.NoError(t, err) - assert.Equal(t, &statedb.VersionedValue{Value: util.ComputeStringHash("pvt_value1"), Version: version.NewHeight(1, 4)}, vv) + require.NoError(t, err) + require.Equal(t, &statedb.VersionedValue{Value: util.ComputeStringHash("pvt_value1"), Version: version.NewHeight(1, 4)}, vv) vv, err = db.GetValueHash("ns1", "coll1", util.ComputeStringHash("key1")) - assert.NoError(t, err) - assert.Equal(t, &statedb.VersionedValue{Value: util.ComputeStringHash("pvt_value1"), Version: version.NewHeight(1, 4)}, vv) + require.NoError(t, err) + require.Equal(t, &statedb.VersionedValue{Value: util.ComputeStringHash("pvt_value1"), Version: version.NewHeight(1, 4)}, vv) committedVersion, err := db.GetKeyHashVersion("ns1", "coll1", util.ComputeStringHash("key1")) - assert.NoError(t, err) - assert.Equal(t, version.NewHeight(1, 4), committedVersion) + require.NoError(t, err) + require.Equal(t, version.NewHeight(1, 4), committedVersion) updates = NewUpdateBatch() updates.PubUpdates.Delete("ns1", "key1", version.NewHeight(2, 7)) @@ -140,16 +139,16 @@ func testDB(t *testing.T, env TestEnv) { db.ApplyPrivacyAwareUpdates(updates, version.NewHeight(2, 7)) vv, err = db.GetState("ns1", "key1") - assert.NoError(t, err) - assert.Nil(t, vv) + require.NoError(t, err) + require.Nil(t, vv) vv, err = db.GetPrivateData("ns1", "coll1", "key1") - assert.NoError(t, err) - assert.Nil(t, vv) + require.NoError(t, err) + require.Nil(t, vv) vv, err = db.GetValueHash("ns1", "coll1", util.ComputeStringHash("key1")) - assert.NoError(t, err) - assert.Nil(t, vv) + require.NoError(t, err) + require.Nil(t, vv) } func TestGetStateMultipleKeys(t *testing.T) { @@ -177,8 +176,8 @@ func testGetStateMultipleKeys(t *testing.T, env TestEnv) { db.ApplyPrivacyAwareUpdates(updates, version.NewHeight(2, 6)) versionedVals, err := db.GetStateMultipleKeys("ns1", []string{"key1", "key3"}) - assert.NoError(t, err) - assert.Equal(t, + require.NoError(t, err) + require.Equal(t, []*statedb.VersionedValue{ {Value: []byte("value1"), Version: version.NewHeight(1, 1)}, {Value: []byte("value3"), Version: version.NewHeight(1, 3)}, @@ -186,8 +185,8 @@ func testGetStateMultipleKeys(t *testing.T, env TestEnv) { versionedVals) pvtVersionedVals, err := db.GetPrivateDataMultipleKeys("ns1", "coll1", []string{"key1", "key3"}) - assert.NoError(t, err) - assert.Equal(t, + require.NoError(t, err) + require.Equal(t, []*statedb.VersionedValue{ {Value: []byte("pvt_value1"), Version: version.NewHeight(1, 4)}, {Value: []byte("pvt_value3"), Version: version.NewHeight(1, 6)}, @@ -294,42 +293,42 @@ func testQueryOnCouchDB(t *testing.T, env TestEnv) { // query for owner=jerry, use namespace "ns1" itr, err := db.ExecuteQuery("ns1", `{"selector":{"owner":"jerry"}}`) - assert.NoError(t, err) + require.NoError(t, err) testQueryItr(t, itr, []string{testKey(1)}, []string{"jerry"}) // query for owner=jerry, use namespace "ns2" itr, err = db.ExecuteQuery("ns2", `{"selector":{"owner":"jerry"}}`) - assert.NoError(t, err) + require.NoError(t, err) testQueryItr(t, itr, []string{testKey(1)}, []string{"jerry"}) // query for pvt data owner=jerry, use namespace "ns1" itr, err = db.ExecuteQueryOnPrivateData("ns1", "coll1", `{"selector":{"owner":"jerry"}}`) - assert.NoError(t, err) + require.NoError(t, err) testQueryItr(t, itr, []string{testKey(1)}, []string{"jerry"}) // query for pvt data owner=jerry, use namespace "ns2" itr, err = db.ExecuteQueryOnPrivateData("ns2", "coll1", `{"selector":{"owner":"jerry"}}`) - assert.NoError(t, err) + require.NoError(t, err) testQueryItr(t, itr, []string{testKey(1)}, []string{"jerry"}) // query using bad query string _, err = db.ExecuteQueryOnPrivateData("ns1", "coll1", "this is an invalid query string") - assert.Error(t, err, "Should have received an error for invalid query string") + require.Error(t, err, "Should have received an error for invalid query string") // query returns 0 records itr, err = db.ExecuteQueryOnPrivateData("ns1", "coll1", `{"selector":{"owner":"not_a_valid_name"}}`) - assert.NoError(t, err) + require.NoError(t, err) testQueryItr(t, itr, []string{}, []string{}) // query with embedded implicit "AND" and explicit "OR", namespace "ns1" itr, err = db.ExecuteQueryOnPrivateData("ns1", "coll1", `{"selector":{"color":"green","$or":[{"owner":"fred"},{"owner":"mary"}]}}`) - assert.NoError(t, err) + require.NoError(t, err) testQueryItr(t, itr, []string{testKey(8), testKey(9)}, []string{"green"}, []string{"green"}) // query with integer with digit-count equals 7 and response received is also received // with same digit-count and there is no float transformation itr, err = db.ExecuteQueryOnPrivateData("ns2", "coll1", `{"selector":{"$and":[{"size":{"$eq": 1000007}}]}}`) - assert.NoError(t, err) + require.NoError(t, err) testQueryItr(t, itr, []string{testKey(10)}, []string{"joe", "1000007"}) } @@ -366,12 +365,12 @@ func testLongDBNameOnCouchDB(t *testing.T, env TestEnv) { db.ApplyPrivacyAwareUpdates(updates, version.NewHeight(2, 6)) vv, err := db.GetState(ns, "key1") - assert.NoError(t, err) - assert.Equal(t, &statedb.VersionedValue{Value: []byte("value1"), Version: version.NewHeight(1, 1)}, vv) + require.NoError(t, err) + require.Equal(t, &statedb.VersionedValue{Value: []byte("value1"), Version: version.NewHeight(1, 1)}, vv) vv, err = db.GetPrivateData(ns, coll, "key1") - assert.NoError(t, err) - assert.Equal(t, &statedb.VersionedValue{Value: []byte("pvt_value"), Version: version.NewHeight(1, 2)}, vv) + require.NoError(t, err) + require.Equal(t, &statedb.VersionedValue{Value: []byte("pvt_value"), Version: version.NewHeight(1, 2)}, vv) } func testItr(t *testing.T, itr statedb.ResultsIterator, expectedKeys []string) { @@ -380,11 +379,11 @@ func testItr(t *testing.T, itr statedb.ResultsIterator, expectedKeys []string) { queryResult, _ := itr.Next() vkv := queryResult.(*statedb.VersionedKV) key := vkv.Key - assert.Equal(t, expectedKey, key) + require.Equal(t, expectedKey, key) } last, err := itr.Next() - assert.NoError(t, err) - assert.Nil(t, last) + require.NoError(t, err) + require.Nil(t, last) } func testQueryItr(t *testing.T, itr statedb.ResultsIterator, expectedKeys []string, expectedValStrs ...[]string) { @@ -394,14 +393,14 @@ func testQueryItr(t *testing.T, itr statedb.ResultsIterator, expectedKeys []stri vkv := queryResult.(*statedb.VersionedKV) key := vkv.Key valStr := string(vkv.Value) - assert.Equal(t, expectedKey, key) + require.Equal(t, expectedKey, key) for _, expectedValStr := range expectedValStrs[i] { - assert.Contains(t, valStr, expectedValStr) + require.Contains(t, valStr, expectedValStr) } } last, err := itr.Next() - assert.NoError(t, err) - assert.Nil(t, last) + require.NoError(t, err) + require.Nil(t, last) } func testKey(i int) string { @@ -455,26 +454,26 @@ func testHandleChainCodeDeploy(t *testing.T, env TestEnv) { // Test the retrieveIndexArtifacts method fileEntries, err := ccprovider.ExtractFileEntries(dbArtifactsTarBytes, "couchdb") - assert.NoError(t, err) + require.NoError(t, err) // There should be 3 entries - assert.Len(t, fileEntries, 3) + require.Len(t, fileEntries, 3) // There should be 2 entries for main - assert.Len(t, fileEntries["META-INF/statedb/couchdb/indexes"], 2) + require.Len(t, fileEntries["META-INF/statedb/couchdb/indexes"], 2) // There should be 1 entry for collectionMarbles - assert.Len(t, fileEntries["META-INF/statedb/couchdb/collections/collectionMarbles/indexes"], 1) + require.Len(t, fileEntries["META-INF/statedb/couchdb/collections/collectionMarbles/indexes"], 1) // Verify the content of the array item expectedJSON := []byte(`{"index":{"fields":["docType","owner"]},"ddoc":"indexCollectionMarbles", "name":"indexCollectionMarbles","type":"json"}`) actualJSON := fileEntries["META-INF/statedb/couchdb/collections/collectionMarbles/indexes"][0].FileContent - assert.Equal(t, expectedJSON, actualJSON) + require.Equal(t, expectedJSON, actualJSON) // The collection config is added to the chaincodeDef but missing collectionMarblesPrivateDetails. // Hence, the index on collectionMarblesPrivateDetails cannot be created err = db.HandleChaincodeDeploy(chaincodeDef, dbArtifactsTarBytes) - assert.NoError(t, err) + require.NoError(t, err) coll2 := createCollectionConfig("collectionMarblesPrivateDetails") ccp = &peer.CollectionConfigPackage{Config: []*peer.CollectionConfig{coll1, coll2}} @@ -485,7 +484,7 @@ func testHandleChainCodeDeploy(t *testing.T, env TestEnv) { // Hence, the existing indexes must be updated and the new index must be created for // collectionMarblesPrivateDetails err = db.HandleChaincodeDeploy(chaincodeDef, dbArtifactsTarBytes) - assert.NoError(t, err) + require.NoError(t, err) chaincodeDef = &cceventmgmt.ChaincodeDefinition{Name: "ns1", Hash: nil, Version: "", CollectionConfigs: nil} @@ -494,19 +493,19 @@ func testHandleChainCodeDeploy(t *testing.T, env TestEnv) { // any collection config for this chaincode. Hence, index creation/update on all collections // should fail err = db.HandleChaincodeDeploy(chaincodeDef, dbArtifactsTarBytes) - assert.NoError(t, err) + require.NoError(t, err) //Test HandleChaincodeDefinition with a nil tar file err = db.HandleChaincodeDeploy(chaincodeDef, nil) - assert.NoError(t, err) + require.NoError(t, err) //Test HandleChaincodeDefinition with a bad tar file err = db.HandleChaincodeDeploy(chaincodeDef, []byte(`This is a really bad tar file`)) - assert.NoError(t, err, "Error should not have been thrown for a bad tar file") + require.NoError(t, err, "Error should not have been thrown for a bad tar file") //Test HandleChaincodeDefinition with a nil chaincodeDef err = db.HandleChaincodeDeploy(nil, dbArtifactsTarBytes) - assert.Error(t, err, "Error should have been thrown for a nil chaincodeDefinition") + require.Error(t, err, "Error should have been thrown for a nil chaincodeDefinition") // Create a tar file for test with 2 index definitions - one of them being errorneous badSyntaxFileContent := `{"index":{"fields": This is a bad json}` @@ -519,13 +518,13 @@ func testHandleChainCodeDeploy(t *testing.T, env TestEnv) { // Test the retrieveIndexArtifacts method fileEntries, err = ccprovider.ExtractFileEntries(dbArtifactsTarBytes, "couchdb") - assert.NoError(t, err) + require.NoError(t, err) // There should be 1 entry - assert.Len(t, fileEntries, 1) + require.Len(t, fileEntries, 1) err = db.HandleChaincodeDeploy(chaincodeDef, dbArtifactsTarBytes) - assert.NoError(t, err) + require.NoError(t, err) } @@ -553,18 +552,18 @@ func testMetadataRetrieval(t *testing.T, env TestEnv) { db.ApplyPrivacyAwareUpdates(updates, version.NewHeight(2, 6)) vm, _ := db.GetStateMetadata("ns1", "key1") - assert.Equal(t, vm, []byte("metadata1")) + require.Equal(t, vm, []byte("metadata1")) vm, _ = db.GetStateMetadata("ns1", "key2") - assert.Nil(t, vm) + require.Nil(t, vm) vm, _ = db.GetStateMetadata("ns2", "key3") - assert.Nil(t, vm) + require.Nil(t, vm) vm, _ = db.GetPrivateDataMetadataByHash("ns1", "coll1", util.ComputeStringHash("key1")) - assert.Equal(t, vm, []byte("metadata1")) + require.Equal(t, vm, []byte("metadata1")) vm, _ = db.GetPrivateDataMetadataByHash("ns1", "coll1", util.ComputeStringHash("key2")) - assert.Nil(t, vm) + require.Nil(t, vm) vm, _ = db.GetPrivateDataMetadataByHash("ns2", "coll1", util.ComputeStringHash("key3")) - assert.Nil(t, vm) + require.Nil(t, vm) } func putPvtUpdates(t *testing.T, updates *UpdateBatch, ns, coll, key string, value []byte, ver *version.Height) { @@ -585,7 +584,7 @@ func deletePvtUpdates(t *testing.T, updates *UpdateBatch, ns, coll, key string, func generateLedgerID(t *testing.T) string { bytes := make([]byte, 8) _, err := io.ReadFull(rand.Reader, bytes) - assert.NoError(t, err) + require.NoError(t, err) return fmt.Sprintf("x%s", hex.EncodeToString(bytes)) } diff --git a/core/ledger/kvledger/txmgmt/privacyenabledstate/optimization_test.go b/core/ledger/kvledger/txmgmt/privacyenabledstate/optimization_test.go index d8c982ff9ae..8c5cdd84c61 100644 --- a/core/ledger/kvledger/txmgmt/privacyenabledstate/optimization_test.go +++ b/core/ledger/kvledger/txmgmt/privacyenabledstate/optimization_test.go @@ -12,7 +12,7 @@ import ( "github.com/hyperledger/fabric/core/ledger/internal/version" "github.com/hyperledger/fabric/core/ledger/kvledger/bookkeeping" "github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/statedb/mock" - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestMetadataHintCorrectness(t *testing.T) { @@ -21,7 +21,7 @@ func TestMetadataHintCorrectness(t *testing.T) { bookkeeper := bookkeepingTestEnv.TestProvider.GetDBHandle("ledger1", bookkeeping.MetadataPresenceIndicator) metadataHint := newMetadataHint(bookkeeper) - assert.False(t, metadataHint.metadataEverUsedFor("ns1")) + require.False(t, metadataHint.metadataEverUsedFor("ns1")) updates := NewUpdateBatch() updates.PubUpdates.PutValAndMetadata("ns1", "key", []byte("value"), []byte("metadata"), version.NewHeight(1, 1)) @@ -33,22 +33,22 @@ func TestMetadataHintCorrectness(t *testing.T) { metadataHint.setMetadataUsedFlag(updates) t.Run("MetadataAddedInCurrentSession", func(t *testing.T) { - assert.True(t, metadataHint.metadataEverUsedFor("ns1")) - assert.True(t, metadataHint.metadataEverUsedFor("ns2")) - assert.True(t, metadataHint.metadataEverUsedFor("ns1_pvt")) - assert.True(t, metadataHint.metadataEverUsedFor("ns2_pvt")) - assert.False(t, metadataHint.metadataEverUsedFor("ns3")) - assert.False(t, metadataHint.metadataEverUsedFor("ns4")) + require.True(t, metadataHint.metadataEverUsedFor("ns1")) + require.True(t, metadataHint.metadataEverUsedFor("ns2")) + require.True(t, metadataHint.metadataEverUsedFor("ns1_pvt")) + require.True(t, metadataHint.metadataEverUsedFor("ns2_pvt")) + require.False(t, metadataHint.metadataEverUsedFor("ns3")) + require.False(t, metadataHint.metadataEverUsedFor("ns4")) }) t.Run("MetadataFromPersistence", func(t *testing.T) { metadataHintFromPersistence := newMetadataHint(bookkeeper) - assert.True(t, metadataHintFromPersistence.metadataEverUsedFor("ns1")) - assert.True(t, metadataHintFromPersistence.metadataEverUsedFor("ns2")) - assert.True(t, metadataHintFromPersistence.metadataEverUsedFor("ns1_pvt")) - assert.True(t, metadataHintFromPersistence.metadataEverUsedFor("ns2_pvt")) - assert.False(t, metadataHintFromPersistence.metadataEverUsedFor("ns3")) - assert.False(t, metadataHintFromPersistence.metadataEverUsedFor("ns4")) + require.True(t, metadataHintFromPersistence.metadataEverUsedFor("ns1")) + require.True(t, metadataHintFromPersistence.metadataEverUsedFor("ns2")) + require.True(t, metadataHintFromPersistence.metadataEverUsedFor("ns1_pvt")) + require.True(t, metadataHintFromPersistence.metadataEverUsedFor("ns2_pvt")) + require.False(t, metadataHintFromPersistence.metadataEverUsedFor("ns3")) + require.False(t, metadataHintFromPersistence.metadataEverUsedFor("ns4")) }) } @@ -59,22 +59,22 @@ func TestMetadataHintOptimizationSkippingGoingToDB(t *testing.T) { mockVersionedDB := &mock.VersionedDB{} db, err := NewDB(mockVersionedDB, "testledger", newMetadataHint(bookkeeper)) - assert.NoError(t, err) + require.NoError(t, err) updates := NewUpdateBatch() updates.PubUpdates.PutValAndMetadata("ns1", "key", []byte("value"), []byte("metadata"), version.NewHeight(1, 1)) updates.PubUpdates.PutValAndMetadata("ns2", "key", []byte("value"), nil, version.NewHeight(1, 2)) db.ApplyPrivacyAwareUpdates(updates, version.NewHeight(1, 3)) db.GetStateMetadata("ns1", "randomkey") - assert.Equal(t, 1, mockVersionedDB.GetStateCallCount()) + require.Equal(t, 1, mockVersionedDB.GetStateCallCount()) db.GetPrivateDataMetadataByHash("ns1", "randomColl", []byte("randomKeyhash")) - assert.Equal(t, 2, mockVersionedDB.GetStateCallCount()) + require.Equal(t, 2, mockVersionedDB.GetStateCallCount()) db.GetStateMetadata("ns2", "randomkey") db.GetPrivateDataMetadataByHash("ns2", "randomColl", []byte("randomKeyhash")) - assert.Equal(t, 2, mockVersionedDB.GetStateCallCount()) + require.Equal(t, 2, mockVersionedDB.GetStateCallCount()) db.GetStateMetadata("randomeNs", "randomkey") db.GetPrivateDataMetadataByHash("randomeNs", "randomColl", []byte("randomKeyhash")) - assert.Equal(t, 2, mockVersionedDB.GetStateCallCount()) + require.Equal(t, 2, mockVersionedDB.GetStateCallCount()) } diff --git a/core/ledger/kvledger/txmgmt/privacyenabledstate/test_exports.go b/core/ledger/kvledger/txmgmt/privacyenabledstate/test_exports.go index 547ac15036e..d2ae3505343 100644 --- a/core/ledger/kvledger/txmgmt/privacyenabledstate/test_exports.go +++ b/core/ledger/kvledger/txmgmt/privacyenabledstate/test_exports.go @@ -20,7 +20,6 @@ import ( "github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/statedb/statecouchdb" "github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/statedb/stateleveldb" "github.com/hyperledger/fabric/core/ledger/mock" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -67,7 +66,7 @@ func (env *LevelDBTestEnv) Init(t testing.TB) { }, []string{"lscc", "_lifecycle"}, ) - assert.NoError(t, err) + require.NoError(t, err) env.t = t env.provider = dbProvider env.dbPath = dbPath @@ -86,7 +85,7 @@ func (env *LevelDBTestEnv) StopExternalResource() { // GetDBHandle implements corresponding function from interface TestEnv func (env *LevelDBTestEnv) GetDBHandle(id string) *DB { db, err := env.provider.GetDBHandle(id, nil) - assert.NoError(env.t, err) + require.NoError(env.t, err) return db } @@ -178,7 +177,7 @@ func (env *CouchDBTestEnv) Init(t testing.TB) { stateDBConfig, []string{"lscc", "_lifecycle"}, ) - assert.NoError(t, err) + require.NoError(t, err) env.provider = dbProvider env.redoPath = redoPath env.couchDBConfig = stateDBConfig.CouchDB @@ -187,7 +186,7 @@ func (env *CouchDBTestEnv) Init(t testing.TB) { // GetDBHandle implements corresponding function from interface TestEnv func (env *CouchDBTestEnv) GetDBHandle(id string) *DB { db, err := env.provider.GetDBHandle(id, &testmock.ChannelInfoProvider{}) - assert.NoError(env.t, err) + require.NoError(env.t, err) return db } @@ -211,7 +210,7 @@ func (env *CouchDBTestEnv) DecodeDBValue(dbVal []byte) statedb.VersionedValue { // Cleanup implements corresponding function from interface TestEnv func (env *CouchDBTestEnv) Cleanup() { if env.provider != nil { - assert.NoError(env.t, statecouchdb.DropApplicationDBs(env.couchDBConfig)) + require.NoError(env.t, statecouchdb.DropApplicationDBs(env.couchDBConfig)) } os.RemoveAll(env.redoPath) env.bookkeeperTestEnv.Cleanup() diff --git a/core/ledger/kvledger/txmgmt/privacyenabledstate/types_test.go b/core/ledger/kvledger/txmgmt/privacyenabledstate/types_test.go index 02d178e804f..f8ace2eee67 100644 --- a/core/ledger/kvledger/txmgmt/privacyenabledstate/types_test.go +++ b/core/ledger/kvledger/txmgmt/privacyenabledstate/types_test.go @@ -14,7 +14,7 @@ import ( "github.com/hyperledger/fabric/common/flogging" "github.com/hyperledger/fabric/core/ledger/internal/version" "github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/statedb" - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestMain(m *testing.M) { @@ -41,31 +41,31 @@ func TestBatch(t *testing.T) { for j := 0; j < 5; j++ { for k := 0; k < 5; k++ { vv := batch.Get(fmt.Sprintf("ns-%d", i), fmt.Sprintf("collection-%d", j), fmt.Sprintf("key-%d", k)) - assert.NotNil(t, vv) - assert.Equal(t, + require.NotNil(t, vv) + require.Equal(t, &statedb.VersionedValue{Value: []byte(fmt.Sprintf("value-%d-%d-%d", i, j, k)), Version: v}, vv) } } } - assert.Nil(t, batch.Get("ns-1", "collection-1", "key-5")) - assert.Nil(t, batch.Get("ns-1", "collection-5", "key-1")) - assert.Nil(t, batch.Get("ns-5", "collection-1", "key-1")) + require.Nil(t, batch.Get("ns-1", "collection-1", "key-5")) + require.Nil(t, batch.Get("ns-1", "collection-5", "key-1")) + require.Nil(t, batch.Get("ns-5", "collection-1", "key-1")) } func TestHashBatchContains(t *testing.T) { batch := NewHashedUpdateBatch() batch.Put("ns1", "coll1", []byte("key1"), []byte("val1"), version.NewHeight(1, 1)) - assert.True(t, batch.Contains("ns1", "coll1", []byte("key1"))) - assert.False(t, batch.Contains("ns1", "coll1", []byte("key2"))) - assert.False(t, batch.Contains("ns1", "coll2", []byte("key1"))) - assert.False(t, batch.Contains("ns2", "coll1", []byte("key1"))) + require.True(t, batch.Contains("ns1", "coll1", []byte("key1"))) + require.False(t, batch.Contains("ns1", "coll1", []byte("key2"))) + require.False(t, batch.Contains("ns1", "coll2", []byte("key1"))) + require.False(t, batch.Contains("ns2", "coll1", []byte("key1"))) batch.Delete("ns1", "coll1", []byte("deleteKey"), version.NewHeight(1, 1)) - assert.True(t, batch.Contains("ns1", "coll1", []byte("deleteKey"))) - assert.False(t, batch.Contains("ns1", "coll1", []byte("deleteKey1"))) - assert.False(t, batch.Contains("ns1", "coll2", []byte("deleteKey"))) - assert.False(t, batch.Contains("ns2", "coll1", []byte("deleteKey"))) + require.True(t, batch.Contains("ns1", "coll1", []byte("deleteKey"))) + require.False(t, batch.Contains("ns1", "coll1", []byte("deleteKey1"))) + require.False(t, batch.Contains("ns1", "coll2", []byte("deleteKey"))) + require.False(t, batch.Contains("ns2", "coll1", []byte("deleteKey"))) } func TestCompositeKeyMap(t *testing.T) { @@ -75,17 +75,17 @@ func TestCompositeKeyMap(t *testing.T) { b.Put("ns2", "coll1", "key1", []byte("testVal3"), nil) b.Put("ns2", "coll2", "key2", []byte("testVal4"), nil) m := b.ToCompositeKeyMap() - assert.Len(t, m, 4) + require.Len(t, m, 4) vv, ok := m[PvtdataCompositeKey{"ns1", "coll1", "key1"}] - assert.True(t, ok) - assert.Equal(t, []byte("testVal1"), vv.Value) + require.True(t, ok) + require.Equal(t, []byte("testVal1"), vv.Value) vv, ok = m[PvtdataCompositeKey{"ns1", "coll2", "key2"}] - assert.Nil(t, vv.Value) - assert.True(t, ok) + require.Nil(t, vv.Value) + require.True(t, ok) _, ok = m[PvtdataCompositeKey{"ns2", "coll1", "key1"}] - assert.True(t, ok) + require.True(t, ok) _, ok = m[PvtdataCompositeKey{"ns2", "coll2", "key2"}] - assert.True(t, ok) + require.True(t, ok) _, ok = m[PvtdataCompositeKey{"ns2", "coll1", "key8888"}] - assert.False(t, ok) + require.False(t, ok) }