revert schema fixture change

nasdf · Sep 20, 2024 · 5727a12 · 5727a12
1 parent 17b7482
commit 5727a12
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 41 deletions.
diff --git a/tests/integration/query/simple/with_filter/utils.go b/tests/integration/query/simple/with_filter/utils.go
@@ -23,7 +23,6 @@ var userCollectionGQLSchema = (`
 		HeightM: Float
 		Verified: Boolean
 		CreatedAt: DateTime
-		FavoriteNumbers: [Int!]
 	}
 `)
 

diff --git a/tests/integration/query/simple/with_filter/with_and_test.go b/tests/integration/query/simple/with_filter/with_and_test.go
@@ -74,6 +74,12 @@ func TestQuerySimple_WithInlineIntArray_GreaterThanAndLessThanFilter_Succeeds(t
 	test := testUtils.TestCase{
 		Description: "Simple query with logical compound filter (and) on inline int array",
 		Actions: []any{
+			testUtils.SchemaUpdate{
+				Schema: `type Users {
+					Name: String
+					FavoriteNumbers: [Int!]
+				}`,
+			},
 			testUtils.CreateDoc{
 				Doc: `{
 					"Name": "Bob",
@@ -106,5 +112,5 @@ func TestQuerySimple_WithInlineIntArray_GreaterThanAndLessThanFilter_Succeeds(t
 		},
 	}
 
-	executeTestCase(t, test)
+	testUtils.ExecuteTestCase(t, test)
 }
diff --git a/tests/integration/query/simple/with_filter/with_ge_datetime_test.go b/tests/integration/query/simple/with_filter/with_ge_datetime_test.go
@@ -150,10 +150,10 @@ func TestQuerySimpleWithDateTimeGEFilterBlockWithNilValue(t *testing.T) {
 				Results: map[string]any{
 					"Users": []map[string]any{
 						{
-							"Name": "John",
+							"Name": "Bob",
 						},
 						{
-							"Name": "Bob",
+							"Name": "John",
 						},
 					},
 				},

diff --git a/tests/integration/query/simple/with_filter/with_ge_float_test.go b/tests/integration/query/simple/with_filter/with_ge_float_test.go
@@ -148,10 +148,10 @@ func TestQuerySimpleWithHeightMGEFilterBlockWithNilValue(t *testing.T) {
 				Results: map[string]any{
 					"Users": []map[string]any{
 						{
-							"Name": "Bob",
+							"Name": "John",
 						},
 						{
-							"Name": "John",
+							"Name": "Bob",
 						},
 					},
 				},

diff --git a/tests/integration/query/simple/with_filter/with_ge_int_test.go b/tests/integration/query/simple/with_filter/with_ge_int_test.go
@@ -112,10 +112,10 @@ func TestQuerySimpleWithIntGEFilterBlockWithNilValue(t *testing.T) {
 				Results: map[string]any{
 					"Users": []map[string]any{
 						{
-							"Name": "John",
+							"Name": "Bob",
 						},
 						{
-							"Name": "Bob",
+							"Name": "John",
 						},
 					},
 				},

diff --git a/tests/integration/query/simple/with_filter/with_gt_float_test.go b/tests/integration/query/simple/with_filter/with_gt_float_test.go
@@ -100,10 +100,10 @@ func TestQuerySimpleWithFloatGreaterThanFilterBlock(t *testing.T) {
 					Results: map[string]any{
 						"Users": []map[string]any{
 							{
-								"Name": "Bob",
+								"Name": "John",
 							},
 							{
-								"Name": "John",
+								"Name": "Bob",
 							},
 						},
 					},

diff --git a/tests/integration/query/simple/with_filter/with_in_test.go b/tests/integration/query/simple/with_filter/with_in_test.go
@@ -53,14 +53,14 @@ func TestQuerySimpleWithIntInFilter(t *testing.T) {
 				}`,
 				Results: map[string]any{
 					"Users": []map[string]any{
-						{
-							"Name": "Alice",
-							"Age":  int64(19),
-						},
 						{
 							"Name": "Carlo",
 							"Age":  int64(55),
 						},
+						{
+							"Name": "Alice",
+							"Age":  int64(19),
+						},
 					},
 				},
 			},
@@ -164,16 +164,16 @@ func TestQuerySimpleWithIntInFilterWithNullValue(t *testing.T) {
 				Results: map[string]any{
 					"Users": []map[string]any{
 						{
-							"Name": "Alice",
-							"Age":  int64(19),
+							"Name": "Fred",
+							"Age":  nil,
 						},
 						{
 							"Name": "Carlo",
 							"Age":  int64(55),
 						},
 						{
-							"Name": "Fred",
-							"Age":  nil,
+							"Name": "Alice",
+							"Age":  int64(19),
 						},
 					},
 				},

diff --git a/tests/integration/query/simple/with_filter/with_ne_bool_test.go b/tests/integration/query/simple/with_filter/with_ne_bool_test.go
@@ -90,10 +90,10 @@ func TestQuerySimpleWithBoolNotEqualsNilFilterBlock(t *testing.T) {
 				Results: map[string]any{
 					"Users": []map[string]any{
 						{
-							"Name": "Fred",
+							"Name": "John",
 						},
 						{
-							"Name": "John",
+							"Name": "Fred",
 						},
 					},
 				},
@@ -134,10 +134,10 @@ func TestQuerySimpleWithBoolNotEqualsFalseFilterBlock(t *testing.T) {
 				Results: map[string]any{
 					"Users": []map[string]any{
 						{
-							"Name": "Bob",
+							"Name": "John",
 						},
 						{
-							"Name": "John",
+							"Name": "Bob",
 						},
 					},
 				},

diff --git a/tests/integration/query/simple/with_filter/with_ne_datetime_test.go b/tests/integration/query/simple/with_filter/with_ne_datetime_test.go
@@ -87,10 +87,10 @@ func TestQuerySimpleWithDateTimeNotEqualsNilFilterBlock(t *testing.T) {
 				Results: map[string]any{
 					"Users": []map[string]any{
 						{
-							"Name": "John",
+							"Name": "Bob",
 						},
 						{
-							"Name": "Bob",
+							"Name": "John",
 						},
 					},
 				},

diff --git a/tests/integration/query/simple/with_filter/with_ne_float_test.go b/tests/integration/query/simple/with_filter/with_ne_float_test.go
@@ -82,10 +82,10 @@ func TestQuerySimpleWithFloatNotEqualsNilFilterBlock(t *testing.T) {
 				Results: map[string]any{
 					"Users": []map[string]any{
 						{
-							"Name": "Bob",
+							"Name": "John",
 						},
 						{
-							"Name": "John",
+							"Name": "Bob",
 						},
 					},
 				},

diff --git a/tests/integration/query/simple/with_filter/with_not_test.go b/tests/integration/query/simple/with_filter/with_not_test.go
@@ -57,14 +57,14 @@ func TestQuerySimple_WithNotEqualToXFilter_NoError(t *testing.T) {
 							"Name": "John",
 							"Age":  int64(21),
 						},
-						{
-							"Name": "Alice",
-							"Age":  int64(19),
-						},
 						{
 							"Name": "Bob",
 							"Age":  int64(32),
 						},
+						{
+							"Name": "Alice",
+							"Age":  int64(19),
+						},
 					},
 				},
 			},
@@ -270,10 +270,6 @@ func TestQuerySimple_WithNotEqualToXAndNotYFilter_NoError(t *testing.T) {
 							"Name": "John",
 							"Age":  int64(21),
 						},
-						{
-							"Name": "Alice",
-							"Age":  int64(19),
-						},
 						{
 							"Name": "Bob",
 							"Age":  int64(32),
@@ -282,6 +278,10 @@ func TestQuerySimple_WithNotEqualToXAndNotYFilter_NoError(t *testing.T) {
 							"Name": "Carlo",
 							"Age":  int64(55),
 						},
+						{
+							"Name": "Alice",
+							"Age":  int64(19),
+						},
 					},
 				},
 			},

diff --git a/tests/integration/query/simple/with_filter/with_or_test.go b/tests/integration/query/simple/with_filter/with_or_test.go
@@ -53,14 +53,14 @@ func TestQuerySimpleWithIntEqualToXOrYFilter(t *testing.T) {
 				}`,
 				Results: map[string]any{
 					"Users": []map[string]any{
-						{
-							"Name": "Alice",
-							"Age":  int64(19),
-						},
 						{
 							"Name": "Carlo",
 							"Age":  int64(55),
 						},
+						{
+							"Name": "Alice",
+							"Age":  int64(19),
+						},
 					},
 				},
 			},
@@ -74,6 +74,12 @@ func TestQuerySimple_WithInlineIntArray_EqualToXOrYFilter_Succeeds(t *testing.T)
 	test := testUtils.TestCase{
 		Description: "Simple query with logical compound filter (or) on inline int array",
 		Actions: []any{
+			testUtils.SchemaUpdate{
+				Schema: `type Users {
+					Name: String
+					FavoriteNumbers: [Int!]
+				}`,
+			},
 			testUtils.CreateDoc{
 				Doc: `{
 					"Name": "Bob",
@@ -98,16 +104,16 @@ func TestQuerySimple_WithInlineIntArray_EqualToXOrYFilter_Succeeds(t *testing.T)
 				Results: map[string]any{
 					"Users": []map[string]any{
 						{
-							"Name": "Bob",
+							"Name": "Alice",
 						},
 						{
-							"Name": "Alice",
+							"Name": "Bob",
 						},
 					},
 				},
 			},
 		},
 	}
 
-	executeTestCase(t, test)
+	testUtils.ExecuteTestCase(t, test)
 }