Skip to content

GitLab

Commit 7df6213e authored by Mildred Ki'Lya's avatar Mildred Ki'Lya Committed by Shanti Bouchez-Mongardé
Browse files
Options

merkledag/traverse: Fix tests after node pointer removal 

License: MIT
Signed-off-by: default avatarMildred Ki'Lya <mildred-pub.git@mildred.fr>
parent 29695e9e
Show whitespace changes
Inline Side-by-side
Showing with 79 additions and 61 deletions
traverse/traverse_test.go
View file @ 7df6213e
...@@ -6,12 +6,14 @@ import ( ...@@ -6,12 +6,14 @@ import (
"testing" "testing"
mdag "github.com/ipfs/go-ipfs/merkledag" mdag "github.com/ipfs/go-ipfs/merkledag"
mdagtest "github.com/ipfs/go-ipfs/merkledag/test"
) )
func TestDFSPreNoSkip(t *testing.T) { func TestDFSPreNoSkip(t *testing.T) {
opts := Options{Order: DFSPre} ds := mdagtest.Mock()
opts := Options{Order: DFSPre, DAG: ds}
testWalkOutputs(t, newFan(t), opts, []byte(` testWalkOutputs(t, newFan(t, ds), opts, []byte(`
0 /a 0 /a
1 /a/aa 1 /a/aa
1 /a/ab 1 /a/ab
...@@ -19,7 +21,7 @@ func TestDFSPreNoSkip(t *testing.T) { ...@@ -19,7 +21,7 @@ func TestDFSPreNoSkip(t *testing.T) {
1 /a/ad 1 /a/ad
`)) `))
testWalkOutputs(t, newLinkedList(t), opts, []byte(` testWalkOutputs(t, newLinkedList(t, ds), opts, []byte(`
0 /a 0 /a
1 /a/aa 1 /a/aa
2 /a/aa/aaa 2 /a/aa/aaa
...@@ -27,7 +29,7 @@ func TestDFSPreNoSkip(t *testing.T) { ...@@ -27,7 +29,7 @@ func TestDFSPreNoSkip(t *testing.T) {
4 /a/aa/aaa/aaaa/aaaaa 4 /a/aa/aaa/aaaa/aaaaa
`)) `))
testWalkOutputs(t, newBinaryTree(t), opts, []byte(` testWalkOutputs(t, newBinaryTree(t, ds), opts, []byte(`
0 /a 0 /a
1 /a/aa 1 /a/aa
2 /a/aa/aaa 2 /a/aa/aaa
...@@ -37,7 +39,7 @@ func TestDFSPreNoSkip(t *testing.T) { ...@@ -37,7 +39,7 @@ func TestDFSPreNoSkip(t *testing.T) {
2 /a/ab/abb 2 /a/ab/abb
`)) `))
testWalkOutputs(t, newBinaryDAG(t), opts, []byte(` testWalkOutputs(t, newBinaryDAG(t, ds), opts, []byte(`
0 /a 0 /a
1 /a/aa 1 /a/aa
2 /a/aa/aaa 2 /a/aa/aaa
...@@ -73,9 +75,10 @@ func TestDFSPreNoSkip(t *testing.T) { ...@@ -73,9 +75,10 @@ func TestDFSPreNoSkip(t *testing.T) {
} }
func TestDFSPreSkip(t *testing.T) { func TestDFSPreSkip(t *testing.T) {
opts := Options{Order: DFSPre, SkipDuplicates: true} ds := mdagtest.Mock()
opts := Options{Order: DFSPre, SkipDuplicates: true, DAG: ds}
testWalkOutputs(t, newFan(t), opts, []byte(` testWalkOutputs(t, newFan(t, ds), opts, []byte(`
0 /a 0 /a
1 /a/aa 1 /a/aa
1 /a/ab 1 /a/ab
...@@ -83,7 +86,7 @@ func TestDFSPreSkip(t *testing.T) { ...@@ -83,7 +86,7 @@ func TestDFSPreSkip(t *testing.T) {
1 /a/ad 1 /a/ad
`)) `))
testWalkOutputs(t, newLinkedList(t), opts, []byte(` testWalkOutputs(t, newLinkedList(t, ds), opts, []byte(`
0 /a 0 /a
1 /a/aa 1 /a/aa
2 /a/aa/aaa 2 /a/aa/aaa
...@@ -91,7 +94,7 @@ func TestDFSPreSkip(t *testing.T) { ...@@ -91,7 +94,7 @@ func TestDFSPreSkip(t *testing.T) {
4 /a/aa/aaa/aaaa/aaaaa 4 /a/aa/aaa/aaaa/aaaaa
`)) `))
testWalkOutputs(t, newBinaryTree(t), opts, []byte(` testWalkOutputs(t, newBinaryTree(t, ds), opts, []byte(`
0 /a 0 /a
1 /a/aa 1 /a/aa
2 /a/aa/aaa 2 /a/aa/aaa
...@@ -101,7 +104,7 @@ func TestDFSPreSkip(t *testing.T) { ...@@ -101,7 +104,7 @@ func TestDFSPreSkip(t *testing.T) {
2 /a/ab/abb 2 /a/ab/abb
`)) `))
testWalkOutputs(t, newBinaryDAG(t), opts, []byte(` testWalkOutputs(t, newBinaryDAG(t, ds), opts, []byte(`
0 /a 0 /a
1 /a/aa 1 /a/aa
2 /a/aa/aaa 2 /a/aa/aaa
...@@ -111,9 +114,10 @@ func TestDFSPreSkip(t *testing.T) { ...@@ -111,9 +114,10 @@ func TestDFSPreSkip(t *testing.T) {
} }
func TestDFSPostNoSkip(t *testing.T) { func TestDFSPostNoSkip(t *testing.T) {
opts := Options{Order: DFSPost} ds := mdagtest.Mock()
opts := Options{Order: DFSPost, DAG: ds}
testWalkOutputs(t, newFan(t), opts, []byte(` testWalkOutputs(t, newFan(t, ds), opts, []byte(`
1 /a/aa 1 /a/aa
1 /a/ab 1 /a/ab
1 /a/ac 1 /a/ac
...@@ -121,7 +125,7 @@ func TestDFSPostNoSkip(t *testing.T) { ...@@ -121,7 +125,7 @@ func TestDFSPostNoSkip(t *testing.T) {
0 /a 0 /a
`)) `))
testWalkOutputs(t, newLinkedList(t), opts, []byte(` testWalkOutputs(t, newLinkedList(t, ds), opts, []byte(`
4 /a/aa/aaa/aaaa/aaaaa 4 /a/aa/aaa/aaaa/aaaaa
3 /a/aa/aaa/aaaa 3 /a/aa/aaa/aaaa
2 /a/aa/aaa 2 /a/aa/aaa
...@@ -129,7 +133,7 @@ func TestDFSPostNoSkip(t *testing.T) { ...@@ -129,7 +133,7 @@ func TestDFSPostNoSkip(t *testing.T) {
0 /a 0 /a
`)) `))
testWalkOutputs(t, newBinaryTree(t), opts, []byte(` testWalkOutputs(t, newBinaryTree(t, ds), opts, []byte(`
2 /a/aa/aaa 2 /a/aa/aaa
2 /a/aa/aab 2 /a/aa/aab
1 /a/aa 1 /a/aa
...@@ -139,7 +143,7 @@ func TestDFSPostNoSkip(t *testing.T) { ...@@ -139,7 +143,7 @@ func TestDFSPostNoSkip(t *testing.T) {
0 /a 0 /a
`)) `))
testWalkOutputs(t, newBinaryDAG(t), opts, []byte(` testWalkOutputs(t, newBinaryDAG(t, ds), opts, []byte(`
4 /a/aa/aaa/aaaa/aaaaa 4 /a/aa/aaa/aaaa/aaaaa
4 /a/aa/aaa/aaaa/aaaaa 4 /a/aa/aaa/aaaa/aaaaa
3 /a/aa/aaa/aaaa 3 /a/aa/aaa/aaaa
...@@ -175,9 +179,10 @@ func TestDFSPostNoSkip(t *testing.T) { ...@@ -175,9 +179,10 @@ func TestDFSPostNoSkip(t *testing.T) {
} }
func TestDFSPostSkip(t *testing.T) { func TestDFSPostSkip(t *testing.T) {
opts := Options{Order: DFSPost, SkipDuplicates: true} ds := mdagtest.Mock()
opts := Options{Order: DFSPost, SkipDuplicates: true, DAG: ds}
testWalkOutputs(t, newFan(t), opts, []byte(` testWalkOutputs(t, newFan(t, ds), opts, []byte(`
1 /a/aa 1 /a/aa
1 /a/ab 1 /a/ab
1 /a/ac 1 /a/ac
...@@ -185,7 +190,7 @@ func TestDFSPostSkip(t *testing.T) { ...@@ -185,7 +190,7 @@ func TestDFSPostSkip(t *testing.T) {
0 /a 0 /a
`)) `))
testWalkOutputs(t, newLinkedList(t), opts, []byte(` testWalkOutputs(t, newLinkedList(t, ds), opts, []byte(`
4 /a/aa/aaa/aaaa/aaaaa 4 /a/aa/aaa/aaaa/aaaaa
3 /a/aa/aaa/aaaa 3 /a/aa/aaa/aaaa
2 /a/aa/aaa 2 /a/aa/aaa
...@@ -193,7 +198,7 @@ func TestDFSPostSkip(t *testing.T) { ...@@ -193,7 +198,7 @@ func TestDFSPostSkip(t *testing.T) {
0 /a 0 /a
`)) `))
testWalkOutputs(t, newBinaryTree(t), opts, []byte(` testWalkOutputs(t, newBinaryTree(t, ds), opts, []byte(`
2 /a/aa/aaa 2 /a/aa/aaa
2 /a/aa/aab 2 /a/aa/aab
1 /a/aa 1 /a/aa
...@@ -203,7 +208,7 @@ func TestDFSPostSkip(t *testing.T) { ...@@ -203,7 +208,7 @@ func TestDFSPostSkip(t *testing.T) {
0 /a 0 /a
`)) `))
testWalkOutputs(t, newBinaryDAG(t), opts, []byte(` testWalkOutputs(t, newBinaryDAG(t, ds), opts, []byte(`
4 /a/aa/aaa/aaaa/aaaaa 4 /a/aa/aaa/aaaa/aaaaa
3 /a/aa/aaa/aaaa 3 /a/aa/aaa/aaaa
2 /a/aa/aaa 2 /a/aa/aaa
...@@ -213,9 +218,10 @@ func TestDFSPostSkip(t *testing.T) { ...@@ -213,9 +218,10 @@ func TestDFSPostSkip(t *testing.T) {
} }
func TestBFSNoSkip(t *testing.T) { func TestBFSNoSkip(t *testing.T) {
opts := Options{Order: BFS} ds := mdagtest.Mock()
opts := Options{Order: BFS, DAG: ds}
testWalkOutputs(t, newFan(t), opts, []byte(` testWalkOutputs(t, newFan(t, ds), opts, []byte(`
0 /a 0 /a
1 /a/aa 1 /a/aa
1 /a/ab 1 /a/ab
...@@ -223,7 +229,7 @@ func TestBFSNoSkip(t *testing.T) { ...@@ -223,7 +229,7 @@ func TestBFSNoSkip(t *testing.T) {
1 /a/ad 1 /a/ad
`)) `))
testWalkOutputs(t, newLinkedList(t), opts, []byte(` testWalkOutputs(t, newLinkedList(t, ds), opts, []byte(`
0 /a 0 /a
1 /a/aa 1 /a/aa
2 /a/aa/aaa 2 /a/aa/aaa
...@@ -231,7 +237,7 @@ func TestBFSNoSkip(t *testing.T) { ...@@ -231,7 +237,7 @@ func TestBFSNoSkip(t *testing.T) {
4 /a/aa/aaa/aaaa/aaaaa 4 /a/aa/aaa/aaaa/aaaaa
`)) `))
testWalkOutputs(t, newBinaryTree(t), opts, []byte(` testWalkOutputs(t, newBinaryTree(t, ds), opts, []byte(`
0 /a 0 /a
1 /a/aa 1 /a/aa
1 /a/ab 1 /a/ab
...@@ -241,7 +247,7 @@ func TestBFSNoSkip(t *testing.T) { ...@@ -241,7 +247,7 @@ func TestBFSNoSkip(t *testing.T) {
2 /a/ab/abb 2 /a/ab/abb
`)) `))
testWalkOutputs(t, newBinaryDAG(t), opts, []byte(` testWalkOutputs(t, newBinaryDAG(t, ds), opts, []byte(`
0 /a 0 /a
1 /a/aa 1 /a/aa
1 /a/aa 1 /a/aa
...@@ -277,9 +283,10 @@ func TestBFSNoSkip(t *testing.T) { ...@@ -277,9 +283,10 @@ func TestBFSNoSkip(t *testing.T) {
} }
func TestBFSSkip(t *testing.T) { func TestBFSSkip(t *testing.T) {
opts := Options{Order: BFS, SkipDuplicates: true} ds := mdagtest.Mock()
opts := Options{Order: BFS, SkipDuplicates: true, DAG: ds}
testWalkOutputs(t, newFan(t), opts, []byte(` testWalkOutputs(t, newFan(t, ds), opts, []byte(`
0 /a 0 /a
1 /a/aa 1 /a/aa
1 /a/ab 1 /a/ab
...@@ -287,7 +294,7 @@ func TestBFSSkip(t *testing.T) { ...@@ -287,7 +294,7 @@ func TestBFSSkip(t *testing.T) {
1 /a/ad 1 /a/ad
`)) `))
testWalkOutputs(t, newLinkedList(t), opts, []byte(` testWalkOutputs(t, newLinkedList(t, ds), opts, []byte(`
0 /a 0 /a
1 /a/aa 1 /a/aa
2 /a/aa/aaa 2 /a/aa/aaa
...@@ -295,7 +302,7 @@ func TestBFSSkip(t *testing.T) { ...@@ -295,7 +302,7 @@ func TestBFSSkip(t *testing.T) {
4 /a/aa/aaa/aaaa/aaaaa 4 /a/aa/aaa/aaaa/aaaaa
`)) `))
testWalkOutputs(t, newBinaryTree(t), opts, []byte(` testWalkOutputs(t, newBinaryTree(t, ds), opts, []byte(`
0 /a 0 /a
1 /a/aa 1 /a/aa
1 /a/ab 1 /a/ab
...@@ -305,7 +312,7 @@ func TestBFSSkip(t *testing.T) { ...@@ -305,7 +312,7 @@ func TestBFSSkip(t *testing.T) {
2 /a/ab/abb 2 /a/ab/abb
`)) `))
testWalkOutputs(t, newBinaryDAG(t), opts, []byte(` testWalkOutputs(t, newBinaryDAG(t, ds), opts, []byte(`
0 /a 0 /a
1 /a/aa 1 /a/aa
2 /a/aa/aaa 2 /a/aa/aaa
...@@ -341,57 +348,68 @@ func testWalkOutputs(t *testing.T, root *mdag.Node, opts Options, expect []byte) ...@@ -341,57 +348,68 @@ func testWalkOutputs(t *testing.T, root *mdag.Node, opts Options, expect []byte)
} }
} }
func newFan(t *testing.T) *mdag.Node { func newFan(t *testing.T, ds mdag.DAGService) *mdag.Node {
a := &mdag.Node{Data: []byte("/a")} a := &mdag.Node{Data: []byte("/a")}
addChild(t, a, "aa") addLink(t, ds, a, child(t, ds, a, "aa"))
addChild(t, a, "ab") addLink(t, ds, a, child(t, ds, a, "ab"))
addChild(t, a, "ac") addLink(t, ds, a, child(t, ds, a, "ac"))
addChild(t, a, "ad") addLink(t, ds, a, child(t, ds, a, "ad"))
return a return a
} }
func newLinkedList(t *testing.T) *mdag.Node { func newLinkedList(t *testing.T, ds mdag.DAGService) *mdag.Node {
a := &mdag.Node{Data: []byte("/a")} a := &mdag.Node{Data: []byte("/a")}
aa := addChild(t, a, "aa") aa := child(t, ds, a, "aa")
aaa := addChild(t, aa, "aaa") aaa := child(t, ds, aa, "aaa")
aaaa := addChild(t, aaa, "aaaa") aaaa := child(t, ds, aaa, "aaaa")
addChild(t, aaaa, "aaaaa") aaaaa := child(t, ds, aaaa, "aaaaa")
addLink(t, ds, aaaa, aaaaa)
addLink(t, ds, aaa, aaaa)
addLink(t, ds, aa, aaa)
addLink(t, ds, a, aa)
return a return a
} }
func newBinaryTree(t *testing.T) *mdag.Node { func newBinaryTree(t *testing.T, ds mdag.DAGService) *mdag.Node {
a := &mdag.Node{Data: []byte("/a")} a := &mdag.Node{Data: []byte("/a")}
aa := addChild(t, a, "aa") aa := child(t, ds, a, "aa")
ab := addChild(t, a, "ab") ab := child(t, ds, a, "ab")
addChild(t, aa, "aaa") addLink(t, ds, aa, child(t, ds, aa, "aaa"))
addChild(t, aa, "aab") addLink(t, ds, aa, child(t, ds, aa, "aab"))
addChild(t, ab, "aba") addLink(t, ds, ab, child(t, ds, ab, "aba"))
addChild(t, ab, "abb") addLink(t, ds, ab, child(t, ds, ab, "abb"))
addLink(t, ds, a, aa)
addLink(t, ds, a, ab)
return a return a
} }
func newBinaryDAG(t *testing.T) *mdag.Node { func newBinaryDAG(t *testing.T, ds mdag.DAGService) *mdag.Node {
a := &mdag.Node{Data: []byte("/a")} a := &mdag.Node{Data: []byte("/a")}
aa := addChild(t, a, "aa") aa := child(t, ds, a, "aa")
aaa := addChild(t, aa, "aaa") aaa := child(t, ds, aa, "aaa")
aaaa := addChild(t, aaa, "aaaa") aaaa := child(t, ds, aaa, "aaaa")
aaaaa := addChild(t, aaaa, "aaaaa") aaaaa := child(t, ds, aaaa, "aaaaa")
addLink(t, a, aa) addLink(t, ds, aaaa, aaaaa)
addLink(t, aa, aaa) addLink(t, ds, aaaa, aaaaa)
addLink(t, aaa, aaaa) addLink(t, ds, aaa, aaaa)
addLink(t, aaaa, aaaaa) addLink(t, ds, aaa, aaaa)
addLink(t, ds, aa, aaa)
addLink(t, ds, aa, aaa)
addLink(t, ds, a, aa)
addLink(t, ds, a, aa)
return a return a
} }
func addLink(t *testing.T, a, b *mdag.Node) { func addLink(t *testing.T, ds mdag.DAGService, a, b *mdag.Node) {
to := string(a.Data) + "2" + string(b.Data) to := string(a.Data) + "2" + string(b.Data)
if _, err := ds.Add(b); err != nil {
t.Error(err)
}
if err := a.AddNodeLink(to, b); err != nil { if err := a.AddNodeLink(to, b); err != nil {
t.Error(err) t.Error(err)
} }
} }
func addChild(t *testing.T, a *mdag.Node, name string) *mdag.Node { func child(t *testing.T, ds mdag.DAGService, a *mdag.Node, name string) *mdag.Node {
c := &mdag.Node{Data: []byte(string(a.Data) + "/" + name)} return &mdag.Node{Data: []byte(string(a.Data) + "/" + name)}
addLink(t, a, c)
return c
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment