-
Notifications
You must be signed in to change notification settings - Fork 8.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FAB-3407] Increase test coverage for mvcc validation
This CR - Introduces unit tests to improve the code coverage for package /fabric/core/ledger/kvledger/txmgmt/validator/statebasedval - Fixes a bug that was discovered by the new unit test for a boundary condition Change-Id: I2d7b41e3d721bfe6f4fc5869d22ffc7db66dc884 Signed-off-by: manish <manish.sethi@gmail.com>
- Loading branch information
1 parent
ecc29dd
commit f9cc350
Showing
3 changed files
with
121 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
core/ledger/kvledger/txmgmt/validator/statebasedval/range_query_validator_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| Copyright IBM Corp. 2017 All Rights Reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package statebasedval | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/hyperledger/fabric/common/ledger/testutil" | ||
| "github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/rwsetutil" | ||
| "github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/statedb" | ||
| "github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/statedb/stateleveldb" | ||
| "github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/version" | ||
| "github.com/hyperledger/fabric/protos/ledger/rwset/kvrwset" | ||
| ) | ||
|
|
||
| func TestRangeQueryBoundaryConditions(t *testing.T) { | ||
| batch := statedb.NewUpdateBatch() | ||
| batch.Put("ns1", "key1", []byte("value1"), version.NewHeight(1, 0)) | ||
| batch.Put("ns1", "key2", []byte("value2"), version.NewHeight(1, 1)) | ||
| batch.Put("ns1", "key3", []byte("value3"), version.NewHeight(1, 2)) | ||
| batch.Put("ns1", "key4", []byte("value4"), version.NewHeight(1, 3)) | ||
| batch.Put("ns1", "key5", []byte("value5"), version.NewHeight(1, 4)) | ||
|
|
||
| testcase1 := "NoResults" | ||
| rqi1 := &kvrwset.RangeQueryInfo{StartKey: "key7", EndKey: "key10", ItrExhausted: true} | ||
| rqi1.SetRawReads([]*kvrwset.KVRead{}) | ||
| testRangeQuery(t, testcase1, batch, version.NewHeight(1, 4), "ns1", rqi1, true) | ||
|
|
||
| testcase2 := "NoResultsDuringValidation" | ||
| rqi2 := &kvrwset.RangeQueryInfo{StartKey: "key7", EndKey: "key10", ItrExhausted: true} | ||
| rqi2.SetRawReads([]*kvrwset.KVRead{rwsetutil.NewKVRead("key8", version.NewHeight(1, 8))}) | ||
| testRangeQuery(t, testcase2, batch, version.NewHeight(1, 4), "ns1", rqi2, false) | ||
|
|
||
| testcase3 := "OneExtraTailingResultsDuringValidation" | ||
| rqi3 := &kvrwset.RangeQueryInfo{StartKey: "key1", EndKey: "key4", ItrExhausted: true} | ||
| rqi3.SetRawReads([]*kvrwset.KVRead{ | ||
| rwsetutil.NewKVRead("key1", version.NewHeight(1, 0)), | ||
| rwsetutil.NewKVRead("key2", version.NewHeight(1, 1)), | ||
| }) | ||
| testRangeQuery(t, testcase3, batch, version.NewHeight(1, 4), "ns1", rqi3, false) | ||
|
|
||
| testcase4 := "TwoExtraTailingResultsDuringValidation" | ||
| rqi4 := &kvrwset.RangeQueryInfo{StartKey: "key1", EndKey: "key5", ItrExhausted: true} | ||
| rqi4.SetRawReads([]*kvrwset.KVRead{ | ||
| rwsetutil.NewKVRead("key1", version.NewHeight(1, 0)), | ||
| rwsetutil.NewKVRead("key2", version.NewHeight(1, 1)), | ||
| }) | ||
| testRangeQuery(t, testcase4, batch, version.NewHeight(1, 4), "ns1", rqi4, false) | ||
| } | ||
|
|
||
| func testRangeQuery(t *testing.T, testcase string, stateData *statedb.UpdateBatch, savepoint *version.Height, | ||
| ns string, rqi *kvrwset.RangeQueryInfo, expectedResult bool) { | ||
| t.Run(testcase, func(t *testing.T) { | ||
| testDBEnv := stateleveldb.NewTestVDBEnv(t) | ||
| defer testDBEnv.Cleanup() | ||
| db, err := testDBEnv.DBProvider.GetDBHandle("TestDB") | ||
| testutil.AssertNoError(t, err, "") | ||
| if stateData != nil { | ||
| db.ApplyUpdates(stateData, savepoint) | ||
| } | ||
|
|
||
| itr, err := db.GetStateRangeScanIterator(ns, rqi.StartKey, rqi.EndKey) | ||
| testutil.AssertNoError(t, err, "") | ||
| validator := &rangeQueryResultsValidator{} | ||
| validator.init(rqi, itr) | ||
| isValid, err := validator.validate() | ||
| testutil.AssertNoError(t, err, "") | ||
| testutil.AssertEquals(t, isValid, expectedResult) | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters