Merge "[ FAB-5726 ] Test dyn add/mod/del identites"

hyperledger · Feb 7, 2018 · 7d487dd · 7d487dd
2 parents 626f8a7 + b9d3e01
commit 7d487dd
Show file tree

Hide file tree

Showing 2 changed files with 516 additions and 4 deletions.
diff --git a/lib/serveraffiliations_test.go b/lib/serveraffiliations_test.go
@@ -435,12 +435,19 @@ func TestAffiliationNode(t *testing.T) {
 	an.insertByName("a.b.c")
 	an.insertByName("a")
 	an.insertByName("a.c.b")
+	an.insertByName("a.d.b.c.e.f.g.h.i.j.z")
 	root := an.GetRoot()
 	assert.Equal(t, root.Name, "a")
-	assert.Equal(t, root.Affiliations[0].Name, "a.b")
-	assert.Equal(t, root.Affiliations[0].Affiliations[0].Name, "a.b.c")
-	assert.Equal(t, root.Affiliations[1].Name, "a.c")
-	assert.Equal(t, root.Affiliations[1].Affiliations[0].Name, "a.c.b")
+	assert.True(t, searchChildren(root.Affiliations, "a.b"))
+	assert.True(t, searchChildren(root.Affiliations, "a.b.c"))
+	assert.True(t, searchChildren(root.Affiliations, "a.c"))
+	assert.True(t, searchChildren(root.Affiliations, "a.d.b.c.e.f.g.h.i.j"))
+	assert.False(t, searchChildren(root.Affiliations, "b"))
+	assert.False(t, searchChildren(root.Affiliations, "c.b"))
+	assert.False(t, searchChildren(root.Affiliations, "z"))
+	an.insertByName("x")
+	root = an.GetRoot()
+	assert.Equal(t, root.Name, "")
 }
 
 func searchTree(resp *api.AffiliationResponse, find string) bool {