test: Expand commit query tests

tests/integration/query/all_commits/simple_test.go

@@ -16,77 +16,25 @@ import (
 	testUtils "github.com/sourcenetwork/defradb/tests/integration"
 )
 
-func TestQueryAllCommitsSingleDAG(t *testing.T) {
+// This test is for documentation reasons only. This is not
+// desired behaviour (should return all commits).
+func TestQueryAllCommits(t *testing.T) {
 	test := testUtils.QueryTestCase{
-		Description: "Simple latest commits query",
+		Description: "Simple all commits query",
 		Query: `query {
-					allCommits(dockey: "bae-52b9170d-b77a-5887-b877-cbdbb99b009f") {
+					allCommits {
 						cid
-						links {
-							cid
-							name
-						}
 					}
 				}`,
 		Docs: map[int][]string{
 			0: {
-				(`{
-				"Name": "John",
-				"Age": 21
-			}`)},
-		},
-		Results: []map[string]interface{}{
-			{
-				"cid": "bafybeid57gpbwi4i6bg7g357vwwyzsmr4bjo22rmhoxrwqvdxlqxcgaqvu",
-				"links": []map[string]interface{}{
-					{
-						"cid":  "bafybeidst2mzxhdoh4ayjdjoh4vibo7vwnuoxk3xgyk5mzmep55jklni2a",
-						"name": "Age",
-					},
-					{
-						"cid":  "bafybeihhypcsqt7blkrqtcmpl43eo3yunrog5pchox5naji6hisdme4swm",
-						"name": "Name",
-					},
-				},
-			},
-		},
-	}
-
-	executeTestCase(t, test)
-}
-
-func TestQueryAllCommitsMultipleDAG(t *testing.T) {
-	test := testUtils.QueryTestCase{
-		Description: "Simple latest commits query",
-		Query: `query {
-					allCommits(dockey: "bae-52b9170d-b77a-5887-b877-cbdbb99b009f") {
-						cid
-						height
-					}
+				`{
+					"Name": "John",
+					"Age": 21
 				}`,
-		Docs: map[int][]string{
-			0: {
-				(`{
-				"Name": "John",
-				"Age": 21
-			}`)},
-		},
-		Updates: map[int][]string{
-			0: {
-				// update to change age to 22 on document 0
-				(`{"Age": 22}`),
-			},
-		},
-		Results: []map[string]interface{}{
-			{
-				"cid":    "bafybeibrbfg35mwggcj4vnskak4qn45hp7fy5a4zp2n34sbq5vt5utr6pq",
-				"height": int64(2),
-			},
-			{
-				"cid":    "bafybeid57gpbwi4i6bg7g357vwwyzsmr4bjo22rmhoxrwqvdxlqxcgaqvu",
-				"height": int64(1),
 			},
 		},
+		ExpectedError: "Field \"allCommits\" argument \"dockey\" of type \"ID!\" is required but not provided.",
 	}
 
 	executeTestCase(t, test)

tests/integration/query/all_commits/with_count_test.go → tests/integration/query/all_commits/with_dockey_count_test.go

@@ -16,9 +16,9 @@ import (
 	testUtils "github.com/sourcenetwork/defradb/tests/integration"
 )
 
-func TestQueryAllCommitsSingleDAGWithLinkCount(t *testing.T) {
+func TestQueryAllCommitsWithDockeyAndLinkCount(t *testing.T) {
 	test := testUtils.QueryTestCase{
-		Description: "Simple latest commits query",
+		Description: "Simple latest commits query with dockey and link count",
 		Query: `query {
 					allCommits(dockey: "bae-52b9170d-b77a-5887-b877-cbdbb99b009f") {
 						cid
@@ -27,10 +27,11 @@ func TestQueryAllCommitsSingleDAGWithLinkCount(t *testing.T) {
 				}`,
 		Docs: map[int][]string{
 			0: {
-				(`{
-				"Name": "John",
-				"Age": 21
-			}`)},
+				`{
+					"Name": "John",
+					"Age": 21
+				}`,
+			},
 		},
 		Results: []map[string]interface{}{
 			{

tests/integration/query/all_commits/with_dockey_field_test.go

@@ -0,0 +1,113 @@
+// Copyright 2022 Democratized Data Foundation
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+
+package all_commits
+
+import (
+	"testing"
+
+	testUtils "github.com/sourcenetwork/defradb/tests/integration"
+)
+
+func TestQueryAllCommitsWithDockeyAndUnknownField(t *testing.T) {
+	test := testUtils.QueryTestCase{
+		Description: "Simple all commits query with dockey and unknown field",
+		Query: `query {
+					allCommits(dockey: "bae-52b9170d-b77a-5887-b877-cbdbb99b009f", field: "not a field") {
+						cid
+					}
+				}`,
+		Docs: map[int][]string{
+			0: {
+				`{
+					"Name": "John",
+					"Age": 21
+				}`,
+			},
+		},
+		Results: []map[string]interface{}{},
+	}
+
+	executeTestCase(t, test)
+}
+
+func TestQueryAllCommitsWithDockeyAndUnknownFieldId(t *testing.T) {
+	test := testUtils.QueryTestCase{
+		Description: "Simple all commits query with dockey and unknown field id",
+		Query: `query {
+					allCommits(dockey: "bae-52b9170d-b77a-5887-b877-cbdbb99b009f", field: "999999") {
+						cid
+					}
+				}`,
+		Docs: map[int][]string{
+			0: {
+				`{
+					"Name": "John",
+					"Age": 21
+				}`,
+			},
+		},
+		Results: []map[string]interface{}{},
+	}
+
+	executeTestCase(t, test)
+}
+
+// This test is for documentation reasons only. This is not
+// desired behaviour (should return all commits for dockey-field).
+func TestQueryAllCommitsWithDockeyAndField(t *testing.T) {
+	test := testUtils.QueryTestCase{
+		Description: "Simple all commits query with dockey and field",
+		Query: `query {
+					allCommits(dockey: "bae-52b9170d-b77a-5887-b877-cbdbb99b009f", field: "Age") {
+						cid
+					}
+				}`,
+		Docs: map[int][]string{
+			0: {
+				`{
+					"Name": "John",
+					"Age": 21
+				}`,
+			},
+		},
+		Results: []map[string]interface{}{},
+	}
+
+	executeTestCase(t, test)
+}
+
+// This test is for documentation reasons only. This is not
+// desired behaviour (users should not be specifying field ids).
+func TestQueryAllCommitsWithDockeyAndFieldId(t *testing.T) {
+	test := testUtils.QueryTestCase{
+		Description: "Simple all commits query with dockey and field id",
+		Query: `query {
+					allCommits(dockey: "bae-52b9170d-b77a-5887-b877-cbdbb99b009f", field: "1") {
+						cid
+					}
+				}`,
+		Docs: map[int][]string{
+			0: {
+				`{
+					"Name": "John",
+					"Age": 21
+				}`,
+			},
+		},
+		Results: []map[string]interface{}{
+			{
+				"cid": "bafybeidst2mzxhdoh4ayjdjoh4vibo7vwnuoxk3xgyk5mzmep55jklni2a",
+			},
+		},
+	}
+
+	executeTestCase(t, test)
+}