consul test

registry/consul/listener_test.go

+/*
+ * 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 consul
+
+import "github.com/stretchr/testify/assert"
+
+func (suite *ConsulRegistryTestSuite) testListener() {
+	event, err := suite.listener.Next()
+	assert.NoError(suite.t, err)
+	assert.True(suite.t, suite.providerUrl.URLEqual(event.Service))
+}

registry/consul/registry_test.go

+/*
+ * 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 consul
+
+import "github.com/stretchr/testify/assert"
+
+func (suite *ConsulRegistryTestSuite) testNewProviderRegistry() {
+	providerRegistryUrl := newProviderRegistryUrl(registryHost, registryPort)
+	providerRegistry, err := newConsulRegistry(providerRegistryUrl)
+	assert.NoError(suite.t, err)
+	suite.providerRegistry = providerRegistry
+}
+
+func (suite *ConsulRegistryTestSuite) testSubscribe() {
+	server := newServer(providerHost, providerPort)
+	suite.server = server
+	providerUrl := newProviderUrl(providerHost, providerPort, service, protocol)
+	suite.providerUrl = providerUrl
+	err := suite.providerRegistry.Register(providerUrl)
+	assert.NoError(suite.t, err)
+}
+
+func (suite *ConsulRegistryTestSuite) testNewConsumerRegistry() {
+	consumerRegistryUrl := newConsumerRegistryUrl(registryHost, registryPort)
+	consumerRegistry, err := newConsulRegistry(consumerRegistryUrl)
+	assert.NoError(suite.t, err)
+	suite.consumerRegistry = consumerRegistry
+}
+
+func (suite *ConsulRegistryTestSuite) testRegister() {
+	consumerUrl := newConsumerUrl(consumerHost, consumerPort, service, protocol)
+	listener, err := suite.consumerRegistry.Subscribe(consumerUrl)
+	assert.NoError(suite.t, err)
+	suite.listener = listener
+}

registry/consul/consul_test.go → registry/consul/utils_test.go

@@ -31,8 +31,11 @@ import (
 import (
 	"github.com/apache/dubbo-go/common"
 	"github.com/apache/dubbo-go/common/constant"
+	"github.com/apache/dubbo-go/registry"
+)
+
+import (
 	"github.com/hashicorp/consul/agent"
-	"github.com/stretchr/testify/assert"
 )
 
 var (
@@ -130,38 +133,48 @@ func (server *Server) close() {
 	server.wg.Wait()
 }
 
-func TestSomething(t *testing.T) {
-	providerRegistryUrl := newProviderRegistryUrl(registryHost, registryPort)
-	consumerRegistryUrl := newConsumerRegistryUrl(registryHost, registryPort)
-	providerUrl := newProviderUrl(providerHost, providerPort, service, protocol)
-	consumerUrl := newConsumerUrl(consumerHost, consumerPort, service, protocol)
+type ConsulRegistryTestSuite struct {
+	t                *testing.T
+	dataDir          string
+	consulAgent      *agent.TestAgent
+	providerRegistry registry.Registry
+	consumerRegistry registry.Registry
+	listener         registry.Listener
+	providerUrl      common.URL
+	server           *Server
+}
 
+func newConsulRegistryTestSuite(t *testing.T) *ConsulRegistryTestSuite {
 	dataDir, _ := ioutil.TempDir("./", "agent")
-	defer os.RemoveAll(dataDir)
-
 	hcl := `
 		ports { 
 			http = ` + strconv.Itoa(registryPort) + `
 		}
 		data_dir = "` + dataDir + `"
 	`
-	consulServer := &agent.TestAgent{Name: t.Name(), DataDir: dataDir, HCL: hcl}
-	consulServer.Start(t)
-	defer consulServer.Shutdown()
-
-	providerRegistry, err := newConsulRegistry(providerRegistryUrl)
-	assert.NoError(t, err)
-	consumerRegistry, err := newConsulRegistry(consumerRegistryUrl)
-	assert.NoError(t, err)
-
-	server := newServer(providerHost, providerPort)
-	defer server.close()
-	err = providerRegistry.Register(providerUrl)
-	assert.NoError(t, err)
-
-	listener, err := consumerRegistry.Subscribe(consumerUrl)
-	assert.NoError(t, err)
-	event, err := listener.Next()
-	assert.NoError(t, err)
-	assert.True(t, providerUrl.URLEqual(event.Service))
+	consulAgent := &agent.TestAgent{Name: t.Name(), DataDir: dataDir, HCL: hcl}
+	consulAgent.Start(t)
+
+	suite := &ConsulRegistryTestSuite{
+		t:           t,
+		dataDir:     dataDir,
+		consulAgent: consulAgent,
+	}
+	return suite
+}
+
+func (suite *ConsulRegistryTestSuite) close() {
+	suite.server.close()
+	suite.consulAgent.Shutdown()
+	os.RemoveAll(suite.dataDir)
+}
+
+func TestConsulRegistry(t *testing.T) {
+	suite := newConsulRegistryTestSuite(t)
+	defer suite.close()
+	suite.testNewProviderRegistry()
+	suite.testSubscribe()
+	suite.testNewConsumerRegistry()
+	suite.testRegister()
+	suite.testListener()
 }

registry/nacos/registry.go

@@ -120,7 +120,7 @@ func appendParam(target *bytes.Buffer, url common.URL, key string) {
 func createRegisterParam(url common.URL, serviceName string) vo.RegisterInstanceParam {
 	category := getCategory(url)
 	params := make(map[string]string, len(url.Params)+3)
-	for k, _ := range url.Params {
+	for k := range url.Params {
 		params[k] = url.Params.Get(k)
 	}
 	params[constant.NACOS_CATEGORY_KEY] = category