Skip to content

Commit a4865e7

Browse files
shahzadloneshahzadlone
committed
PR(TEST): Fix all the tests
1 parent b7a4836 commit a4865e7

File tree

72 files changed

+841
-1088
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+841
-1088
lines changed

‎tests/integration/acp/add_policy/basic_test.go

-4
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ func TestACP_AddPolicy_BasicYAML_ValidPolicyID(t *testing.T) {
4646
- actor
4747
4848
`,
49-
50-
ExpectedPolicyID: "66f3e364004a181e9b129f65dea317322d2285226e926d7e8cdfd644954e4262",
5149
},
5250
},
5351
}
@@ -92,8 +90,6 @@ func TestACP_AddPolicy_BasicJSON_ValidPolicyID(t *testing.T) {
9290
}
9391
}
9492
`,
95-
96-
ExpectedPolicyID: "66f3e364004a181e9b129f65dea317322d2285226e926d7e8cdfd644954e4262",
9793
},
9894
},
9995
}

‎tests/integration/acp/add_policy/with_extra_perms_and_relations_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ func TestACP_AddPolicy_ExtraPermissionsAndExtraRelations_ValidPolicyID(t *testin
5353
types:
5454
- actor
5555
`,
56-
57-
ExpectedPolicyID: "af2a2eaa2d6701262ea60665487c87e3d41ab727194e1ea18ec16348149a02cc",
5856
},
5957
},
6058
}

‎tests/integration/acp/add_policy/with_extra_perms_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ func TestACP_AddPolicy_ExtraPermissions_ValidPolicyID(t *testing.T) {
4747
actor:
4848
name: actor
4949
`,
50-
51-
ExpectedPolicyID: "a756ba5a7fe25e3fc36a4f113016a49b718b09028c917199ae68f478addc048c",
5250
},
5351
},
5452
}

‎tests/integration/acp/add_policy/with_extra_relations_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ func TestACP_AddPolicy_ExtraRelations_ValidPolicyID(t *testing.T) {
5151
types:
5252
- actor
5353
`,
54-
55-
ExpectedPolicyID: "bdfe4d449b8a42b1daf247e37b5a62ee139ff5b79fa15a970d5d7ae32c08d1e5",
5654
},
5755
},
5856
}

‎tests/integration/acp/add_policy/with_managed_relation_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ func TestACP_AddPolicy_WithRelationManagingOtherRelation_ValidPolicyID(t *testin
5252
types:
5353
- actor
5454
`,
55-
56-
ExpectedPolicyID: "725caeee6c5043f019e7dc3bb6a627520c235f063e862696c67ac89b5c1fc840",
5755
},
5856
},
5957
}

‎tests/integration/acp/add_policy/with_multi_policies_test.go

+26-12
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ package test_acp_add_policy
1313
import (
1414
"testing"
1515

16+
"github.com/sourcenetwork/immutable"
17+
1618
testUtils "github.com/sourcenetwork/defradb/tests/integration"
1719
)
1820

@@ -46,8 +48,6 @@ func TestACP_AddPolicy_AddMultipleDifferentPolicies_ValidPolicyIDs(t *testing.T)
4648
- actor
4749
4850
`,
49-
50-
ExpectedPolicyID: "2eb8b503c9fc0b7c1f7b04d68a6faa0f82a299db0ae02fed68f9897612439cb6",
5151
},
5252

5353
testUtils.AddPolicy{
@@ -81,8 +81,6 @@ func TestACP_AddPolicy_AddMultipleDifferentPolicies_ValidPolicyIDs(t *testing.T)
8181
types:
8282
- actor
8383
`,
84-
85-
ExpectedPolicyID: "6b766a9aafabf0bf65102f73b7cd81963b65e1fd87ce763f386cc685147325ee",
8684
},
8785
},
8886
}
@@ -128,7 +126,9 @@ func TestACP_AddPolicy_AddMultipleDifferentPoliciesInDifferentFmts_ValidPolicyID
128126
}
129127
`,
130128

131-
ExpectedPolicyID: "66f3e364004a181e9b129f65dea317322d2285226e926d7e8cdfd644954e4262",
129+
ExpectedPolicyID: immutable.Some(
130+
"66f3e364004a181e9b129f65dea317322d2285226e926d7e8cdfd644954e4262",
131+
),
132132
},
133133

134134
testUtils.AddPolicy{
@@ -163,7 +163,9 @@ func TestACP_AddPolicy_AddMultipleDifferentPoliciesInDifferentFmts_ValidPolicyID
163163
- actor
164164
`,
165165

166-
ExpectedPolicyID: "757c772e9c4418de530ecd72cbc56dfc4e0c22aa2f3b2d219afa7663b2f0af00",
166+
ExpectedPolicyID: immutable.Some(
167+
"757c772e9c4418de530ecd72cbc56dfc4e0c22aa2f3b2d219afa7663b2f0af00",
168+
),
167169
},
168170
},
169171
}
@@ -203,15 +205,19 @@ func TestACP_AddPolicy_AddDuplicatePolicyByOtherCreator_ValidPolicyIDs(t *testin
203205

204206
Policy: policyUsedByBoth,
205207

206-
ExpectedPolicyID: "66f3e364004a181e9b129f65dea317322d2285226e926d7e8cdfd644954e4262",
208+
ExpectedPolicyID: immutable.Some(
209+
"66f3e364004a181e9b129f65dea317322d2285226e926d7e8cdfd644954e4262",
210+
),
207211
},
208212

209213
testUtils.AddPolicy{
210214
Identity: testUtils.ClientIdentity(2),
211215

212216
Policy: policyUsedByBoth,
213217

214-
ExpectedPolicyID: "ec02815cb630850678bda5e2d75cfacebc96f5610e32a602f7bfc414e21474ad",
218+
ExpectedPolicyID: immutable.Some(
219+
"ec02815cb630850678bda5e2d75cfacebc96f5610e32a602f7bfc414e21474ad",
220+
),
215221
},
216222
},
217223
}
@@ -250,7 +256,9 @@ func TestACP_AddPolicy_AddMultipleDuplicatePolicies_Error(t *testing.T) {
250256
251257
`,
252258

253-
ExpectedPolicyID: "66f3e364004a181e9b129f65dea317322d2285226e926d7e8cdfd644954e4262",
259+
ExpectedPolicyID: immutable.Some(
260+
"66f3e364004a181e9b129f65dea317322d2285226e926d7e8cdfd644954e4262",
261+
),
254262
},
255263

256264
testUtils.AddPolicy{
@@ -278,7 +286,9 @@ func TestACP_AddPolicy_AddMultipleDuplicatePolicies_Error(t *testing.T) {
278286
279287
`,
280288

281-
ExpectedPolicyID: "ec02815cb630850678bda5e2d75cfacebc96f5610e32a602f7bfc414e21474ad",
289+
ExpectedPolicyID: immutable.Some(
290+
"ec02815cb630850678bda5e2d75cfacebc96f5610e32a602f7bfc414e21474ad",
291+
),
282292
},
283293
},
284294
}
@@ -316,7 +326,9 @@ func TestACP_AddPolicy_AddMultipleDuplicatePoliciesDifferentFmts_ProducesDiffere
316326
- actor
317327
`,
318328

319-
ExpectedPolicyID: "66f3e364004a181e9b129f65dea317322d2285226e926d7e8cdfd644954e4262",
329+
ExpectedPolicyID: immutable.Some(
330+
"66f3e364004a181e9b129f65dea317322d2285226e926d7e8cdfd644954e4262",
331+
),
320332
},
321333

322334
testUtils.AddPolicy{
@@ -351,7 +363,9 @@ func TestACP_AddPolicy_AddMultipleDuplicatePoliciesDifferentFmts_ProducesDiffere
351363
}
352364
`,
353365

354-
ExpectedPolicyID: "ec02815cb630850678bda5e2d75cfacebc96f5610e32a602f7bfc414e21474ad",
366+
ExpectedPolicyID: immutable.Some(
367+
"ec02815cb630850678bda5e2d75cfacebc96f5610e32a602f7bfc414e21474ad",
368+
),
355369
},
356370
},
357371
}

‎tests/integration/acp/add_policy/with_multiple_resources_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ func TestACP_AddPolicy_MultipleResources_ValidID(t *testing.T) {
6262
types:
6363
- actor
6464
`,
65-
66-
ExpectedPolicyID: "a9e1a113ccc2609d7f99a42531017f0fbc9b736640ec8ffc7f09a1e29583ca45",
6765
},
6866
},
6967
}

‎tests/integration/acp/add_policy/with_no_perms_test.go

-8
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ func TestACP_AddPolicy_NoPermissionsOnlyOwner_ValidID(t *testing.T) {
5050
- actor
5151
5252
`,
53-
54-
ExpectedPolicyID: "db6e4d3efc58f8a7bfe8f35c73c39630f1ad3e6fad7ffeb22563d1284bd176dc",
5553
},
5654
},
5755
}
@@ -88,8 +86,6 @@ func TestACP_AddPolicy_NoPermissionsMultiRelations_ValidID(t *testing.T) {
8886
- actor
8987
9088
`,
91-
92-
ExpectedPolicyID: "106a38bfb702608e26feda961d9fffd74141ef34eccc17b3de2c15dd7620da46",
9389
},
9490
},
9591
}
@@ -121,8 +117,6 @@ func TestACP_AddPolicy_NoPermissionsLabelOnlyOwner_ValidID(t *testing.T) {
121117
- actor
122118
123119
`,
124-
125-
ExpectedPolicyID: "db6e4d3efc58f8a7bfe8f35c73c39630f1ad3e6fad7ffeb22563d1284bd176dc",
126120
},
127121
},
128122
}
@@ -157,8 +151,6 @@ func TestACP_AddPolicy_NoPermissionsLabelMultiRelations_ValidID(t *testing.T) {
157151
- actor
158152
159153
`,
160-
161-
ExpectedPolicyID: "106a38bfb702608e26feda961d9fffd74141ef34eccc17b3de2c15dd7620da46",
162154
},
163155
},
164156
}

‎tests/integration/acp/add_policy/with_no_resources_test.go

-4
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ func TestACP_AddPolicy_NoResource_ValidID(t *testing.T) {
3838
3939
resources:
4040
`,
41-
42-
ExpectedPolicyID: "e3ffe8e802e4612dc41d7a638cd77dc16d51eb1db0d18682eec75b05234e6ee2",
4341
},
4442
},
4543
}
@@ -65,8 +63,6 @@ func TestACP_AddPolicy_NoResourceLabel_ValidID(t *testing.T) {
6563
actor:
6664
name: actor
6765
`,
68-
69-
ExpectedPolicyID: "e3ffe8e802e4612dc41d7a638cd77dc16d51eb1db0d18682eec75b05234e6ee2",
7066
},
7167
},
7268
}

‎tests/integration/acp/add_policy/with_perm_expr_test.go

-4
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ func TestACP_AddPolicy_PermissionExprWithOwnerInTheEndWithMinus_ValidID(t *testi
4848
types:
4949
- actor
5050
`,
51-
52-
ExpectedPolicyID: "2b10641de73790b95452f496a37ad53a8d8a0703803f35f6961457af912947c0",
5351
},
5452
},
5553
}
@@ -90,8 +88,6 @@ func TestACP_AddPolicy_PermissionExprWithOwnerInTheEndWithMinusNoSpace_ValidID(t
9088
types:
9189
- actor
9290
`,
93-
94-
ExpectedPolicyID: "b6b305214247a08903e01466a1bfd01516206458d2725506797300b285e63690",
9591
},
9692
},
9793
}

‎tests/integration/acp/add_policy/with_permissionless_owner_test.go

-6
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ func TestACP_AddPolicy_PermissionlessOwnerWrite_ValidID(t *testing.T) {
5555
types:
5656
- actor
5757
`,
58-
59-
ExpectedPolicyID: "9328e41c1969c6269bfd82162b45831ccec8df9fc8d57902620ad43baaa0d77d",
6058
},
6159
},
6260
}
@@ -96,8 +94,6 @@ func TestACP_AddPolicy_PermissionlessOwnerRead_ValidID(t *testing.T) {
9694
types:
9795
- actor
9896
`,
99-
100-
ExpectedPolicyID: "74f3c0996d5b1669b9efda5ef45f93a925df9f770e2dcd53f352b5f0693a2b0f",
10197
},
10298
},
10399
}
@@ -137,8 +133,6 @@ func TestACP_AddPolicy_PermissionlessOwnerReadWrite_ValidID(t *testing.T) {
137133
types:
138134
- actor
139135
`,
140-
141-
ExpectedPolicyID: "9328e41c1969c6269bfd82162b45831ccec8df9fc8d57902620ad43baaa0d77d",
142136
},
143137
},
144138
}

‎tests/integration/acp/add_policy/with_unused_relations_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ func TestACP_AddPolicy_UnusedRelation_ValidID(t *testing.T) {
4949
- actor
5050
5151
`,
52-
53-
ExpectedPolicyID: "ab1102f656ed1f2b037a3c9586611c701243f2086fa64211bd7baff7271c2030",
5452
},
5553
},
5654
}

‎tests/integration/acp/demo/demo_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ func TestACP_DEMO(t *testing.T) {
128128
}
129129
`,
130130

131-
// Replace: immutable.Some([]int{0, 0, 1}),
132131
Replace: map[string]testUtils.ReplaceType{
133132
"Policy0": testUtils.NewPolicyIndex(0),
134133
"Policy1": testUtils.NewPolicyIndex(1),

‎tests/integration/acp/index/create_test.go

+14-8
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,24 @@ func TestACP_IndexCreateWithSeparateRequest_OnCollectionWithPolicy_NoError(t *te
2222
Actions: []any{
2323

2424
testUtils.AddPolicy{
25-
Identity: testUtils.ClientIdentity(1),
26-
Policy: userPolicy,
27-
ExpectedPolicyID: "94eb195c0e459aa79e02a1986c7e731c5015721c18a373f2b2a0ed140a04b454",
25+
Identity: testUtils.ClientIdentity(1),
26+
Policy: userPolicy,
2827
},
2928

3029
testUtils.SchemaUpdate{
3130
Schema: `
3231
type Users @policy(
33-
id: "94eb195c0e459aa79e02a1986c7e731c5015721c18a373f2b2a0ed140a04b454",
32+
id: "{{.Policy0}}",
3433
resource: "users"
3534
) {
3635
name: String
3736
age: Int
3837
}
3938
`,
39+
40+
Replace: map[string]testUtils.ReplaceType{
41+
"Policy0": testUtils.NewPolicyIndex(0),
42+
},
4043
},
4144

4245
testUtils.CreateIndex{
@@ -70,21 +73,24 @@ func TestACP_IndexCreateWithDirective_OnCollectionWithPolicy_NoError(t *testing.
7073
Actions: []any{
7174

7275
testUtils.AddPolicy{
73-
Identity: testUtils.ClientIdentity(1),
74-
Policy: userPolicy,
75-
ExpectedPolicyID: "94eb195c0e459aa79e02a1986c7e731c5015721c18a373f2b2a0ed140a04b454",
76+
Identity: testUtils.ClientIdentity(1),
77+
Policy: userPolicy,
7678
},
7779

7880
testUtils.SchemaUpdate{
7981
Schema: `
8082
type Users @policy(
81-
id: "94eb195c0e459aa79e02a1986c7e731c5015721c18a373f2b2a0ed140a04b454",
83+
id: "{{.Policy0}}",
8284
resource: "users"
8385
) {
8486
name: String @index
8587
age: Int
8688
}
8789
`,
90+
91+
Replace: map[string]testUtils.ReplaceType{
92+
"Policy0": testUtils.NewPolicyIndex(0),
93+
},
8894
},
8995

9096
testUtils.Request{

0 commit comments

Comments
 (0)