add uint test

kitex-contrib · Dec 12, 2023 · 6a15315 · 6a15315
1 parent c71441a
commit 6a15315
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 5 deletions.
diff --git a/core/xdsresource/lds_test.go b/core/xdsresource/lds_test.go
@@ -104,9 +104,24 @@ func TestUnmarshallLDSThriftProxy(t *testing.T) {
 		r := tp.Routes[0]
 		assert.NotNil(t, r.Match)
 		assert.True(t, r.Match.MatchPath("method"))
-		for k, v := range map[string]string{"k1": "v1", "k2": "v2"} {
-			assert.Equal(t, v, r.Match.GetTags()[k])
-		}
+		assert.True(t, r.Match.GetTags().Match(map[string]string{
+			"k1": "v1",
+			"k2": "v2",
+			"k3": "prehello",
+			"k4": "a4",
+		}))
+		assert.True(t, r.Match.GetTags().Match(map[string]string{
+			"k1": "v1",
+			"k2": "v2",
+			"k3": "pre",
+			"k4": "a4",
+		}))
+		assert.False(t, r.Match.GetTags().Match(map[string]string{
+			"k1": "v1",
+			"k2": "v2",
+			"k3": "pr",
+			"k4": "a4",
+		}))
 		assert.NotNil(t, r.WeightedClusters)
 	}
 	f(lis.NetworkFilters[0])

diff --git a/core/xdsresource/matcher.go b/core/xdsresource/matcher.go
@@ -56,7 +56,7 @@ func BuildMatchers(headers []*v3.HeaderMatcher) Matchers {
 				}
 			case *v3matcher.StringMatcher_Prefix:
 				if p.Prefix != "" {
-					ms[header.Name] = ExactMatcher(p.Prefix)
+					ms[header.Name] = PrefixMatcher(p.Prefix)
 				}
 			case *v3matcher.StringMatcher_SafeRegex:
 				// only support google re2

diff --git a/core/xdsresource/rds_test.go b/core/xdsresource/rds_test.go
@@ -131,7 +131,7 @@ func TestHTTPRouteMatch_MatchPath(t *testing.T) {
 	type fields struct {
 		Path   string
 		Prefix string
-		Tags   map[string]string
+		Tags   Matchers
 	}
 	type args struct {
 		path string

diff --git a/core/xdsresource/testutil.go b/core/xdsresource/testutil.go
@@ -68,6 +68,28 @@ var (
 									},
 								},
 							},
+							{
+								Name: "k3",
+								HeaderMatchSpecifier: &v3routepb.HeaderMatcher_StringMatch{
+									StringMatch: &v3matcher.StringMatcher{
+										MatchPattern: &v3matcher.StringMatcher_Prefix{
+											Prefix: "pre",
+										},
+									},
+								},
+							},
+							{
+								Name: "k4",
+								HeaderMatchSpecifier: &v3routepb.HeaderMatcher_StringMatch{
+									StringMatch: &v3matcher.StringMatcher{
+										MatchPattern: &v3matcher.StringMatcher_SafeRegex{
+											SafeRegex: &v3matcher.RegexMatcher{
+												Regex: "[a-z][1-9]",
+											},
+										},
+									},
+								},
+							},
 						},
 					},
 					Route: &v3thrift_proxy.RouteAction{