From 9edd7946d9eb71141ecaeb9cc5da1a77afd484fd Mon Sep 17 00:00:00 2001
From: pantianying <601666418@qq.com>
Date: Sun, 22 Mar 2020 13:35:55 +0800
Subject: [PATCH] complement UT
---
cluster/router/tag/file.go | 3 +-
cluster/router/tag/file_test.go | 62 ++++++++++++++++++++++++++
cluster/router/tag/router_rule_test.go | 40 +++++++++++++++++
3 files changed, 103 insertions(+), 2 deletions(-)
create mode 100644 cluster/router/tag/file_test.go
create mode 100644 cluster/router/tag/router_rule_test.go
diff --git a/cluster/router/tag/file.go b/cluster/router/tag/file.go
index b9d67284a..c9fb88db7 100644
--- a/cluster/router/tag/file.go
+++ b/cluster/router/tag/file.go
@@ -40,7 +40,6 @@ type FileTagRouter struct {
routerRule *RouterRule
url *common.URL
force bool
- priority int64
}
// NewFileTagRouter Create file tag router instance with content ( from config file)
@@ -72,7 +71,7 @@ func (f *FileTagRouter) URL() common.URL {
// Priority Return Priority in listenable router
func (f *FileTagRouter) Priority() int64 {
- return f.priority
+ return f.router.priority
}
func (f *FileTagRouter) Route(invokers []protocol.Invoker, url *common.URL, invocation protocol.Invocation) []protocol.Invoker {
diff --git a/cluster/router/tag/file_test.go b/cluster/router/tag/file_test.go
new file mode 100644
index 000000000..94fcf9e0e
--- /dev/null
+++ b/cluster/router/tag/file_test.go
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tag
+
+import (
+ "testing"
+)
+
+import (
+ "github.com/stretchr/testify/assert"
+)
+
+import (
+ "github.com/apache/dubbo-go/common/constant"
+)
+
+func TestNewFileTagRouter(t *testing.T) {
+ router, e := NewFileTagRouter([]byte(`priority: 100
+force: true`))
+ assert.Nil(t, e)
+ assert.NotNil(t, router)
+ assert.Equal(t, 100, router.routerRule.Priority)
+ assert.Equal(t, true, router.routerRule.Force)
+}
+
+func TestFileTagRouter_URL(t *testing.T) {
+ router, e := NewFileTagRouter([]byte(`priority: 100
+force: true`))
+ assert.Nil(t, e)
+ assert.NotNil(t, router)
+ url := router.URL()
+ assert.NotNil(t, url)
+ force := url.GetParam(constant.ForceUseTag, "false")
+ priority := url.GetParam(constant.RouterPriority, "0")
+ assert.Equal(t, "true", force)
+ assert.Equal(t, "100", priority)
+
+}
+
+func TestFileTagRouter_Priority(t *testing.T) {
+ router, e := NewFileTagRouter([]byte(`priority: 100
+force: true`))
+ assert.Nil(t, e)
+ assert.NotNil(t, router)
+ priority := router.Priority()
+ assert.Equal(t, int64(100), priority)
+}
diff --git a/cluster/router/tag/router_rule_test.go b/cluster/router/tag/router_rule_test.go
new file mode 100644
index 000000000..b61c1cb9c
--- /dev/null
+++ b/cluster/router/tag/router_rule_test.go
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tag
+
+import (
+ "testing"
+)
+
+import (
+ "github.com/stretchr/testify/assert"
+)
+
+func TestParse(t *testing.T) {
+ yml := `
+scope: application
+runtime: true
+force: true
+`
+ rule, e := Parse(yml)
+ assert.Nil(t, e)
+ assert.NotNil(t, rule)
+ assert.Equal(t, true, rule.Force)
+ assert.Equal(t, true, rule.Runtime)
+ assert.Equal(t, "application", rule.Scope)
+}
--
GitLab