Skip to content

Commit bda7d89

Browse files
robocanicrobocanic
committed
fix: unit-test
1 parent 4cf0e5d commit bda7d89

File tree

2 files changed

+24
-19
lines changed

2 files changed

+24
-19
lines changed

‎pkg/store/dbcommon/gorm_store_test.go‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ func (mr *mockResource) ResourceSpec() model.ResourceSpec {
7373
return mr.Spec
7474
}
7575

76+
func (mr *mockResource) ResourceMesh() string {
77+
return mr.Mesh
78+
}
79+
7680
func (mr *mockResource) String() string {
7781
b, err := json.Marshal(mr)
7882
if err != nil {
@@ -601,7 +605,7 @@ func TestGormStore_AddIndexers(t *testing.T) {
601605
indexers := map[string]cache.IndexFunc{
602606
"by-mesh": func(obj interface{}) ([]string, error) {
603607
resource := obj.(model.Resource)
604-
return []string{resource.Mesh()}, nil
608+
return []string{resource.ResourceMesh()}, nil
605609
},
606610
}
607611
err = store.AddIndexers(indexers)
@@ -624,7 +628,7 @@ func TestGormStore_IndexKeys(t *testing.T) {
624628
indexers := map[string]cache.IndexFunc{
625629
"by-mesh": func(obj interface{}) ([]string, error) {
626630
resource := obj.(model.Resource)
627-
return []string{resource.Mesh()}, nil
631+
return []string{resource.ResourceMesh()}, nil
628632
},
629633
}
630634
err = store.AddIndexers(indexers)
@@ -734,7 +738,7 @@ func TestGormStore_ListByIndexes(t *testing.T) {
734738
indexers := map[string]cache.IndexFunc{
735739
"by-mesh": func(obj interface{}) ([]string, error) {
736740
resource := obj.(model.Resource)
737-
return []string{resource.Mesh()}, nil
741+
return []string{resource.ResourceMesh()}, nil
738742
},
739743
}
740744
err = store.AddIndexers(indexers)
@@ -814,7 +818,7 @@ func TestGormStore_PageListByIndexes(t *testing.T) {
814818
indexers := map[string]cache.IndexFunc{
815819
"by-mesh": func(obj interface{}) ([]string, error) {
816820
resource := obj.(model.Resource)
817-
return []string{resource.Mesh()}, nil
821+
return []string{resource.ResourceMesh()}, nil
818822
},
819823
}
820824
err = store.AddIndexers(indexers)
@@ -897,7 +901,7 @@ func TestGormStore_PageListByIndexesOffsetBeyondTotal(t *testing.T) {
897901
indexers := map[string]cache.IndexFunc{
898902
"by-mesh": func(obj interface{}) ([]string, error) {
899903
resource := obj.(model.Resource)
900-
return []string{resource.Mesh()}, nil
904+
return []string{resource.ResourceMesh()}, nil
901905
},
902906
}
903907
err = store.AddIndexers(indexers)
@@ -936,7 +940,7 @@ func TestGormStore_MultipleIndexes(t *testing.T) {
936940
indexers := map[string]cache.IndexFunc{
937941
"by-mesh": func(obj interface{}) ([]string, error) {
938942
resource := obj.(model.Resource)
939-
return []string{resource.Mesh()}, nil
943+
return []string{resource.ResourceMesh()}, nil
940944
},
941945
"by-namespace": func(obj interface{}) ([]string, error) {
942946
resource := obj.(model.Resource)
@@ -1023,7 +1027,7 @@ func TestGormStore_ListIndexFuncValues(t *testing.T) {
10231027
indexers := map[string]cache.IndexFunc{
10241028
"by-mesh": func(obj interface{}) ([]string, error) {
10251029
resource := obj.(model.Resource)
1026-
return []string{resource.Mesh()}, nil
1030+
return []string{resource.ResourceMesh()}, nil
10271031
},
10281032
}
10291033
err = store.AddIndexers(indexers)
@@ -1104,7 +1108,7 @@ func TestGormStore_UpdateIndices(t *testing.T) {
11041108
indexers := map[string]cache.IndexFunc{
11051109
"by-mesh": func(obj interface{}) ([]string, error) {
11061110
resource := obj.(model.Resource)
1107-
return []string{resource.Mesh()}, nil
1111+
return []string{resource.ResourceMesh()}, nil
11081112
},
11091113
}
11101114
err = store.AddIndexers(indexers)
@@ -1156,7 +1160,7 @@ func TestGormStore_DeleteFromIndices(t *testing.T) {
11561160
indexers := map[string]cache.IndexFunc{
11571161
"by-mesh": func(obj interface{}) ([]string, error) {
11581162
resource := obj.(model.Resource)
1159-
return []string{resource.Mesh()}, nil
1163+
return []string{resource.ResourceMesh()}, nil
11601164
},
11611165
}
11621166
err = store.AddIndexers(indexers)
@@ -1198,7 +1202,7 @@ func TestGormStore_ReplaceIndices(t *testing.T) {
11981202
indexers := map[string]cache.IndexFunc{
11991203
"by-mesh": func(obj interface{}) ([]string, error) {
12001204
resource := obj.(model.Resource)
1201-
return []string{resource.Mesh()}, nil
1205+
return []string{resource.ResourceMesh()}, nil
12021206
},
12031207
}
12041208
err = store.AddIndexers(indexers)
@@ -1249,7 +1253,7 @@ func TestGormStore_InitRebuildIndices(t *testing.T) {
12491253
indexers := map[string]cache.IndexFunc{
12501254
"by-mesh": func(obj interface{}) ([]string, error) {
12511255
resource := obj.(model.Resource)
1252-
return []string{resource.Mesh()}, nil
1256+
return []string{resource.ResourceMesh()}, nil
12531257
},
12541258
}
12551259
err = store.AddIndexers(indexers)
@@ -1376,7 +1380,7 @@ func TestGormStore_ConcurrentOperations(t *testing.T) {
13761380
indexers := map[string]cache.IndexFunc{
13771381
"by-mesh": func(obj interface{}) ([]string, error) {
13781382
resource := obj.(model.Resource)
1379-
return []string{resource.Mesh()}, nil
1383+
return []string{resource.ResourceMesh()}, nil
13801384
},
13811385
}
13821386
err = store.AddIndexers(indexers)

‎pkg/store/memory/store_test.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ type mockResource struct {
4040
objectRef runtime.Object
4141
}
4242

43+
func (mr *mockResource) ResourceMesh() string {
44+
return mr.mesh
45+
}
46+
4347
func (mr *mockResource) GetObjectKind() schema.ObjectKind {
4448
return schema.EmptyObjectKind
4549
}
@@ -56,17 +60,14 @@ func (mr *mockResource) ResourceKey() string {
5660
return mr.key
5761
}
5862

59-
func (mr *mockResource) MeshName() string {
60-
return mr.mesh
61-
}
62-
6363
func (mr *mockResource) ResourceMeta() metav1.ObjectMeta {
6464
return mr.meta
6565
}
6666

6767
func (mr *mockResource) ResourceSpec() model.ResourceSpec {
6868
return mr.spec
6969
}
70+
7071
func (mr *mockResource) String() string {
7172
b, err := json.Marshal(mr)
7273
if err != nil {
@@ -361,7 +362,7 @@ func TestResourceStore_ListByIndexes(t *testing.T) {
361362
indexers := map[string]cache.IndexFunc{
362363
"by-mesh": func(obj interface{}) ([]string, error) {
363364
resource := obj.(model.Resource)
364-
return []string{resource.Mesh()}, nil
365+
return []string{resource.ResourceMesh()}, nil
365366
},
366367
}
367368
err = store.AddIndexers(indexers)
@@ -416,7 +417,7 @@ func TestResourceStore_PageListByIndexes(t *testing.T) {
416417
indexers := map[string]cache.IndexFunc{
417418
"by-mesh": func(obj interface{}) ([]string, error) {
418419
resource := obj.(model.Resource)
419-
return []string{resource.Mesh()}, nil
420+
return []string{resource.ResourceMesh()}, nil
420421
},
421422
}
422423
err = store.AddIndexers(indexers)
@@ -518,7 +519,7 @@ func TestResourceStore_MultipleIndexes(t *testing.T) {
518519
indexers := map[string]cache.IndexFunc{
519520
"by-mesh": func(obj interface{}) ([]string, error) {
520521
resource := obj.(model.Resource)
521-
return []string{resource.Mesh()}, nil
522+
return []string{resource.ResourceMesh()}, nil
522523
},
523524
"by-version": func(obj interface{}) ([]string, error) {
524525
resource := obj.(model.Resource)

0 commit comments

Comments
 (0)