diff --git a/common/strmatcher/strmatcher_test.go b/common/strmatcher/strmatcher_test.go new file mode 100644 index 00000000..f9cf2e73 --- /dev/null +++ b/common/strmatcher/strmatcher_test.go @@ -0,0 +1,94 @@ +package strmatcher_test + +import ( + "reflect" + "testing" + + "v2ray.com/core/common" + . "v2ray.com/core/common/strmatcher" +) + +// See https://github.com/v2fly/v2ray-core/issues/92#issuecomment-673238489 +func TestMatcherGroup(t *testing.T) { + rules := []struct { + Type Type + Domain string + }{ + { + Type: Regex, + Domain: "apis\\.us$", + }, + { + Type: Substr, + Domain: "apis", + }, + { + Type: Domain, + Domain: "googleapis.com", + }, + { + Type: Domain, + Domain: "com", + }, + { + Type: Full, + Domain: "www.baidu.com", + }, + { + Type: Substr, + Domain: "apis", + }, + { + Type: Domain, + Domain: "googleapis.com", + }, + { + Type: Full, + Domain: "fonts.googleapis.com", + }, + { + Type: Full, + Domain: "www.baidu.com", + }, + { + Type: Domain, + Domain: "example.com", + }, + } + cases := []struct { + Input string + Output []uint32 + }{ + { + Input: "www.baidu.com", + Output: []uint32{5, 9, 4}, + }, + { + Input: "fonts.googleapis.com", + Output: []uint32{8, 3, 7, 4, 2, 6}, + }, + { + Input: "example.googleapis.com", + Output: []uint32{3, 7, 4, 2, 6}, + }, + { + Input: "testapis.us", + Output: []uint32{1, 2, 6}, + }, + { + Input: "example.com", + Output: []uint32{10, 4}, + }, + } + matcherGroup := &MatcherGroup{} + for _, rule := range rules { + matcher, err := rule.Type.New(rule.Domain) + common.Must(err) + matcherGroup.Add(matcher) + } + for _, test := range cases { + if m := matcherGroup.Match(test.Input); !reflect.DeepEqual(m, test.Output) { + t.Error("unexpected output: ", m, " for test case ", test) + } + } +} diff --git a/release/install-release.sh b/release/install-release.sh index ba2ab100..61c7ee5d 100755 --- a/release/install-release.sh +++ b/release/install-release.sh @@ -16,5 +16,7 @@ colorEcho(){ echo -e "\033[${1}${@:2}\033[0m" 1>& 2 } -colorEcho ${RED} "WARN: This script will be obsolete soon, please switch to the fhs-install-v2ray project in time." -colorEcho ${YELLOW} "URL: https://github.com/v2fly/fhs-install-v2ray" +colorEcho ${RED} "ERROR: This script has been DISCARDED, please switch to fhs-install-v2ray project." +colorEcho ${YELLOW} "HOW TO USE: https://github.com/v2fly/fhs-install-v2ray" +colorEcho ${YELLOW} "TO MIGRATE: https://github.com/v2fly/fhs-install-v2ray/wiki/Migrate-from-the-old-script-to-this" +exit 255