test: Specify which collection to update in test framework (#601)

* Rename collectionIndex cid suggests a CID, which is not what this is * Rename documentIndex Makes the difference between documentIndex and collectionIndex more obvious * Specify which collection to update in test framework And only update that collection
sourcenetwork · Jul 7, 2022 · ef43456 · ef43456
1 parent 7e90fbb
commit ef43456
Show file tree

Hide file tree

Showing 8 changed files with 102 additions and 70 deletions.
diff --git a/tests/integration/mutation/relation/delete/single_id_test.go b/tests/integration/mutation/relation/delete/single_id_test.go
@@ -147,12 +147,14 @@ func TestRelationalDeletionOfADocumentUsingSingleKey_Success(t *testing.T) {
 					}`),
 				},
 			},
-			Updates: map[int][]string{
-				0: {
-					`{
-						"name": "Teiva Harsanyiiiiiiiiii",
-						"age": 49
-					}`,
+			Updates: map[int]map[int][]string{
+				1: {
+					0: {
+						`{
+							"name": "Teiva Harsanyiiiiiiiiii",
+							"age": 49
+						}`,
+					},
 				},
 			},
 			Results: []map[string]interface{}{

diff --git a/tests/integration/mutation/simple/delete/explain_simple_delete_test.go b/tests/integration/mutation/simple/delete/explain_simple_delete_test.go
@@ -163,13 +163,15 @@ func TestExplainDeletionUsingMultiAndSingleIDs_Success(t *testing.T) {
 				},
 			},
 
-			Updates: map[int][]string{
+			Updates: map[int]map[int][]string{
 				0: {
-					(`{
-										"age":  27,
-										"points": 48.2,
-										"verified": false
-							}`),
+					0: {
+						`{
+							"age":  27,
+							"points": 48.2,
+							"verified": false
+						}`,
+					},
 				},
 			},
 

diff --git a/tests/integration/mutation/simple/delete/multi_ids_test.go b/tests/integration/mutation/simple/delete/multi_ids_test.go
@@ -136,13 +136,15 @@ func TestDeletionOfMultipleDocumentUsingMultipleKeys_Success(t *testing.T) {
 					}`),
 				},
 			},
-			Updates: map[int][]string{
+			Updates: map[int]map[int][]string{
 				0: {
-					(`{
-								"age":  27,
-								"points": 48.2,
-								"verified": false
-					}`),
+					0: {
+						`{
+							"age":  27,
+							"points": 48.2,
+							"verified": false
+						}`,
+					},
 				},
 			},
 			Results: []map[string]interface{}{

diff --git a/tests/integration/mutation/simple/delete/single_id_test.go b/tests/integration/mutation/simple/delete/single_id_test.go
@@ -86,13 +86,15 @@ func TestDeletionOfADocumentUsingSingleKey_Success(t *testing.T) {
 					}`),
 				},
 			},
-			Updates: map[int][]string{
+			Updates: map[int]map[int][]string{
 				0: {
-					(`{
-						"age":  27,
-						"points": 48.2,
-						"verified": false
-					}`),
+					0: {
+						`{
+							"age":  27,
+							"points": 48.2,
+							"verified": false
+						}`,
+					},
 				},
 			},
 			Results: []map[string]interface{}{

diff --git a/tests/integration/query/all_commits/with_dockey_test.go b/tests/integration/query/all_commits/with_dockey_test.go
@@ -121,10 +121,13 @@ func TestQueryAllCommitsWithDockeyAndUpdate(t *testing.T) {
 				}`,
 			},
 		},
-		Updates: map[int][]string{
+		Updates: map[int]map[int][]string{
 			0: {
-				// update to change age to 22 on document 0
-				(`{"Age": 22}`),
+				0: {
+					`{
+						"Age": 22
+					}`,
+				},
 			},
 		},
 		Results: []map[string]interface{}{
@@ -165,10 +168,13 @@ func TestQueryAllCommitsWithDockeyAndUpdateAndLinks(t *testing.T) {
 				}`,
 			},
 		},
-		Updates: map[int][]string{
+		Updates: map[int]map[int][]string{
 			0: {
-				// update to change age to 22 on document 0
-				(`{"Age": 22}`),
+				0: {
+					`{
+						"Age": 22
+					}`,
+				},
 			},
 		},
 		Results: []map[string]interface{}{

diff --git a/tests/integration/query/one_to_many/with_cid_dockey_test.go b/tests/integration/query/one_to_many/with_cid_dockey_test.go
@@ -143,10 +143,13 @@ func TestQueryOneToManyWithChildUpdateAndFirstCidAndDocKey(t *testing.T) {
 				"verified": true
 			}`)},
 		},
-		Updates: map[int][]string{
-			0: {
-				// update to change age to 22 on document 0, collection 1
-				`{"age": 22}`,
+		Updates: map[int]map[int][]string{
+			1: {
+				0: {
+					`{
+						"age": 22
+					}`,
+				},
 			},
 		},
 		Results: []map[string]interface{}{
@@ -194,10 +197,13 @@ func TestQueryOneToManyWithParentUpdateAndFirstCidAndDocKey(t *testing.T) {
 				"verified": true
 			}`)},
 		},
-		Updates: map[int][]string{
+		Updates: map[int]map[int][]string{
 			0: {
-				// update to change age to 22 on document 0, collection 0
-				`{"rating": 4.5}`,
+				0: {
+					`{
+						"rating": 4.5
+					}`,
+				},
 			},
 		},
 		Results: []map[string]interface{}{
@@ -245,10 +251,13 @@ func TestQueryOneToManyWithParentUpdateAndLastCidAndDocKey(t *testing.T) {
 				"verified": true
 			}`)},
 		},
-		Updates: map[int][]string{
+		Updates: map[int]map[int][]string{
 			0: {
-				// update to change age to 22 on document 0, collection 0
-				`{"rating": 4.5}`,
+				0: {
+					`{
+						"rating": 4.5
+					}`,
+				},
 			},
 		},
 		Results: []map[string]interface{}{

diff --git a/tests/integration/query/simple/with_cid_dockey_test.go b/tests/integration/query/simple/with_cid_dockey_test.go
@@ -117,12 +117,14 @@ func TestQuerySimpleWithUpdateAndFirstCidAndDocKey(t *testing.T) {
 				}`,
 			},
 		},
-		Updates: map[int][]string{
+		Updates: map[int]map[int][]string{
 			0: {
-				// update to change age to 22 on document 0
-				`{"Age": 22}`,
-				// then update it again to change age to 23 on document 0
-				`{"Age": 23}`,
+				0: {
+					// update to change age to 22 on document 0
+					`{"Age": 22}`,
+					// then update it again to change age to 23 on document 0
+					`{"Age": 23}`,
+				},
 			},
 		},
 		Results: []map[string]interface{}{
@@ -156,12 +158,14 @@ func TestQuerySimpleWithUpdateAndLastCidAndDocKey(t *testing.T) {
 				}`,
 			},
 		},
-		Updates: map[int][]string{
+		Updates: map[int]map[int][]string{
 			0: {
-				// update to change age to 22 on document 0
-				`{"Age": 22}`,
-				// then update it again to change age to 23 on document 0
-				`{"Age": 23}`,
+				0: {
+					// update to change age to 22 on document 0
+					`{"Age": 22}`,
+					// then update it again to change age to 23 on document 0
+					`{"Age": 23}`,
+				},
 			},
 		},
 		Results: []map[string]interface{}{
@@ -195,12 +199,14 @@ func TestQuerySimpleWithUpdateAndMiddleCidAndDocKey(t *testing.T) {
 				}`,
 			},
 		},
-		Updates: map[int][]string{
+		Updates: map[int]map[int][]string{
 			0: {
-				// update to change age to 22 on document 0
-				`{"Age": 22}`,
-				// then update it again to change age to 23 on document 0
-				`{"Age": 23}`,
+				0: {
+					// update to change age to 22 on document 0
+					`{"Age": 22}`,
+					// then update it again to change age to 23 on document 0
+					`{"Age": 23}`,
+				},
 			},
 		},
 		Results: []map[string]interface{}{

diff --git a/tests/integration/utils.go b/tests/integration/utils.go
@@ -77,7 +77,7 @@ type QueryTestCase struct {
 
 	// updates is a map from document index, to a list
 	// of changes in strinigied JSON format
-	Updates map[int][]string
+	Updates map[int]map[int][]string
 	Results []map[string]interface{}
 	// The expected content of an expected error
 	ExpectedError string
@@ -479,28 +479,31 @@ func setupDatabase(
 	}
 
 	// insert docs
-	for cid, docs := range test.Docs {
-		for i, docStr := range docs {
+	for collectionIndex, docs := range test.Docs {
+		collectionUpdates, hasCollectionUpdates := test.Updates[collectionIndex]
+		for documentIndex, docStr := range docs {
 			doc, err := client.NewDocFromJSON([]byte(docStr))
 			if assertError(t, test.Description, err, test.ExpectedError) {
 				return
 			}
-			err = collections[cid].Save(ctx, doc)
+			err = collections[collectionIndex].Save(ctx, doc)
 			if assertError(t, test.Description, err, test.ExpectedError) {
 				return
 			}
 
-			// check for updates
-			updates, ok := test.Updates[i]
-			if ok {
-				for _, u := range updates {
-					err = doc.SetWithJSON([]byte(u))
-					if assertError(t, test.Description, err, test.ExpectedError) {
-						return
-					}
-					err = collections[cid].Save(ctx, doc)
-					if assertError(t, test.Description, err, test.ExpectedError) {
-						return
+			if hasCollectionUpdates {
+				documentUpdates, hasDocumentUpdates := collectionUpdates[documentIndex]
+
+				if hasDocumentUpdates {
+					for _, u := range documentUpdates {
+						err = doc.SetWithJSON([]byte(u))
+						if assertError(t, test.Description, err, test.ExpectedError) {
+							return
+						}
+						err = collections[collectionIndex].Save(ctx, doc)
+						if assertError(t, test.Description, err, test.ExpectedError) {
+							return
+						}
 					}
 				}
 			}