Simplify BalancedLayout test
License: MIT Signed-off-by: rht <rhtbot@gmail.com>
rht committed
Nov 18, 2015 at 16:03 UTC
89ba9942c5b2de42b246344102e57d29f3ddc354
2 files changed
+21
-68
importer/balanced/balanced_test.go
+21
-67
@@ -49,13 +49,11 @@ func TestSizeBasedSplit(t *testing.T) {
49
t.SkipNow()
50
}
51
52
- bs := chunk.SizeSplitterGen(512)
53
- testFileConsistency(t, bs, 32*512)
54
- bs = chunk.SizeSplitterGen(4096)
55
- testFileConsistency(t, bs, 32*4096)
52
+ testFileConsistency(t, 32*512, 512)
53
+ testFileConsistency(t, 32*4096, 4096)
54
55
// Uneven offset
58
- testFileConsistency(t, bs, 31*4095)
56
+ testFileConsistency(t, 31*4095, 4096)
57
}
58
59
func dup(b []byte) []byte {
@@ -64,51 +62,20 @@ func dup(b []byte) []byte {
62
return o
63
}
64
67
-func testFileConsistency(t *testing.T, bs chunk.SplitterGen, nbytes int) {
68
- should := make([]byte, nbytes)
69
- u.NewTimeSeededRand().Read(should)
70
-
71
- read := bytes.NewReader(should)
65
+func testFileConsistency(t *testing.T, nbytes int64, blksize int64) {
66
ds := mdtest.Mock()
73
- nd, err := buildTestDag(ds, bs(read))
74
- if err != nil {
75
- t.Fatal(err)
76
- }
67
+ nd, should := getTestDag(t, ds, nbytes, blksize)
68
69
r, err := uio.NewDagReader(context.Background(), nd, ds)
70
if err != nil {
71
t.Fatal(err)
72
}
73
83
- out, err := ioutil.ReadAll(r)
84
- if err != nil {
85
- t.Fatal(err)
86
- }
87
-
88
- err = arrComp(out, should)
89
- if err != nil {
90
- t.Fatal(err)
91
- }
74
+ dagrArrComp(t, r, should)
75
}
76
77
func TestBuilderConsistency(t *testing.T) {
95
- dagserv := mdtest.Mock()
96
- nd, should := getTestDag(t, dagserv, 100000, chunk.DefaultBlockSize)
97
-
98
- r, err := uio.NewDagReader(context.Background(), nd, dagserv)
99
- if err != nil {
100
- t.Fatal(err)
101
- }
102
-
103
- out, err := ioutil.ReadAll(r)
104
- if err != nil {
105
- t.Fatal(err)
106
- }
107
-
108
- err = arrComp(out, should)
109
- if err != nil {
110
- t.Fatal(err)
111
- }
78
+ testFileConsistency(t, 100000, chunk.DefaultBlockSize)
79
}
80
81
func arrComp(a, b []byte) error {
@@ -123,6 +90,17 @@ func arrComp(a, b []byte) error {
90
return nil
91
}
92
93
+func dagrArrComp(t *testing.T, r io.Reader, should []byte) {
94
+ out, err := ioutil.ReadAll(r)
95
+ if err != nil {
96
+ t.Fatal(err)
97
+ }
98
+
99
+ if err := arrComp(out, should); err != nil {
100
+ t.Fatal(err)
101
+ }
102
+}
103
+
104
type dagservAndPinner struct {
105
ds dag.DAGService
106
mp pin.Pinner
@@ -166,15 +144,7 @@ func TestSeekingBasic(t *testing.T) {
144
t.Fatal("Failed to seek to correct offset")
145
}
146
169
- out, err := ioutil.ReadAll(rs)
170
- if err != nil {
171
- t.Fatal(err)
172
- }
173
-
174
- err = arrComp(out, should[start:])
175
- if err != nil {
176
- t.Fatal(err)
177
- }
147
+ dagrArrComp(t, rs, should[start:])
148
}
149
150
func TestSeekToBegin(t *testing.T) {
@@ -202,15 +172,7 @@ func TestSeekToBegin(t *testing.T) {
172
t.Fatal("Failed to seek to beginning")
173
}
174
205
- out, err := ioutil.ReadAll(rs)
206
- if err != nil {
207
- t.Fatal(err)
208
- }
209
-
210
- err = arrComp(out, should)
211
- if err != nil {
212
- t.Fatal(err)
213
- }
175
+ dagrArrComp(t, rs, should)
176
}
177
178
func TestSeekToAlmostBegin(t *testing.T) {
@@ -238,15 +200,7 @@ func TestSeekToAlmostBegin(t *testing.T) {
200
t.Fatal("Failed to seek to almost beginning")
201
}
202
241
- out, err := ioutil.ReadAll(rs)
242
- if err != nil {
243
- t.Fatal(err)
244
- }
245
-
246
- err = arrComp(out, should[1:])
247
- if err != nil {
248
- t.Fatal(err)
249
- }
203
+ dagrArrComp(t, rs, should[1:])
204
}
205
206
func TestSeekEnd(t *testing.T) {
importer/helpers/dagbuilder.go
-1
@@ -52,7 +52,6 @@ func (db *DagBuilderHelper) prepareNext() {
52
func (db *DagBuilderHelper) Done() bool {
53
// ensure we have an accurate perspective on data
54
// as `done` this may be called before `next`.
55
- //db.prepareNext() // idempotent
55
db.prepareNext() // idempotent
56
return db.nextData == nil
57
}