Merge pull request #2 from ChinX/syncer
move mocks to 'syncer/pkg/mock/'
diff --git a/syncer/test/dcmock/instance.go b/syncer/pkg/mock/mockplugin/instance.go
similarity index 99%
rename from syncer/test/dcmock/instance.go
rename to syncer/pkg/mock/mockplugin/instance.go
index ed52838..71250aa 100644
--- a/syncer/test/dcmock/instance.go
+++ b/syncer/pkg/mock/mockplugin/instance.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package dcmock
+package mockplugin
import (
"context"
diff --git a/syncer/test/dcmock/service.go b/syncer/pkg/mock/mockplugin/service.go
similarity index 98%
rename from syncer/test/dcmock/service.go
rename to syncer/pkg/mock/mockplugin/service.go
index a4ac462..97bbaba 100644
--- a/syncer/test/dcmock/service.go
+++ b/syncer/pkg/mock/mockplugin/service.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package dcmock
+package mockplugin
import (
"context"
diff --git a/syncer/test/dcmock/servicecenter.go b/syncer/pkg/mock/mockplugin/servicecenter.go
similarity index 99%
rename from syncer/test/dcmock/servicecenter.go
rename to syncer/pkg/mock/mockplugin/servicecenter.go
index 821aeaa..695fa46 100644
--- a/syncer/test/dcmock/servicecenter.go
+++ b/syncer/pkg/mock/mockplugin/servicecenter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package dcmock
+package mockplugin
import (
"context"
diff --git a/syncer/test/servicecenter/instance.go b/syncer/pkg/mock/mockservicecenter/instance.go
similarity index 98%
rename from syncer/test/servicecenter/instance.go
rename to syncer/pkg/mock/mockservicecenter/instance.go
index 960eed6..e0747cd 100644
--- a/syncer/test/servicecenter/instance.go
+++ b/syncer/pkg/mock/mockservicecenter/instance.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package servicecenter
+package mockservicecenter
import (
"net/http"
diff --git a/syncer/test/servicecenter/service.go b/syncer/pkg/mock/mockservicecenter/service.go
similarity index 97%
rename from syncer/test/servicecenter/service.go
rename to syncer/pkg/mock/mockservicecenter/service.go
index 623035c..0f73877 100644
--- a/syncer/test/servicecenter/service.go
+++ b/syncer/pkg/mock/mockservicecenter/service.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package servicecenter
+package mockservicecenter
import (
"net/http"
diff --git a/syncer/test/servicecenter/servicecenter.go b/syncer/pkg/mock/mockservicecenter/servicecenter.go
similarity index 99%
rename from syncer/test/servicecenter/servicecenter.go
rename to syncer/pkg/mock/mockservicecenter/servicecenter.go
index cdadf63..723a558 100644
--- a/syncer/test/servicecenter/servicecenter.go
+++ b/syncer/pkg/mock/mockservicecenter/servicecenter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package servicecenter
+package mockservicecenter
import (
"errors"
diff --git a/syncer/test/sotrage/storage.go b/syncer/pkg/mock/mocksotrage/storage.go
similarity index 98%
rename from syncer/test/sotrage/storage.go
rename to syncer/pkg/mock/mocksotrage/storage.go
index 48b5472..e72366c 100644
--- a/syncer/test/sotrage/storage.go
+++ b/syncer/pkg/mock/mocksotrage/storage.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package storage
+package mocksotrage
import (
"sync"
diff --git a/syncer/plugins/servicecenter/servicecenter_test.go b/syncer/plugins/servicecenter/servicecenter_test.go
index d0a5636..7b82fca 100644
--- a/syncer/plugins/servicecenter/servicecenter_test.go
+++ b/syncer/plugins/servicecenter/servicecenter_test.go
@@ -21,8 +21,8 @@
"net/http/httptest"
"testing"
+ "github.com/apache/servicecomb-service-center/syncer/pkg/mock/mockservicecenter"
"github.com/apache/servicecomb-service-center/syncer/plugins"
- "github.com/apache/servicecomb-service-center/syncer/test/servicecenter"
)
func TestClient_GetAll(t *testing.T) {
@@ -45,7 +45,7 @@
if adaptor == nil {
t.Errorf("get repository adaptor %s failed", PluginName)
}
- svr := servicecenter.NewMockServer()
+ svr := mockservicecenter.NewMockServer()
if svr == nil {
t.Error("new httptest server failed")
}
diff --git a/syncer/servicecenter/servicecenter_test.go b/syncer/servicecenter/servicecenter_test.go
index c320260..f6628c8 100644
--- a/syncer/servicecenter/servicecenter_test.go
+++ b/syncer/servicecenter/servicecenter_test.go
@@ -23,10 +23,10 @@
"github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/syncer/config"
+ "github.com/apache/servicecomb-service-center/syncer/pkg/mock/mockplugin"
+ "github.com/apache/servicecomb-service-center/syncer/pkg/mock/mocksotrage"
"github.com/apache/servicecomb-service-center/syncer/plugins"
pb "github.com/apache/servicecomb-service-center/syncer/proto"
- "github.com/apache/servicecomb-service-center/syncer/test/dcmock"
- storage "github.com/apache/servicecomb-service-center/syncer/test/sotrage"
)
func TestNewServicecenter(t *testing.T) {
@@ -50,15 +50,15 @@
func TestOnEvent(t *testing.T) {
conf := config.DefaultConfig()
- conf.ServicecenterPlugin = dcmock.PluginName
+ conf.ServicecenterPlugin = mockplugin.PluginName
initPlugin(conf)
- dc, err := NewServicecenter([]string{"http://127.0.0.1:30100"}, storage.New())
+ dc, err := NewServicecenter([]string{"http://127.0.0.1:30100"}, mocksotrage.New())
if err != nil {
t.Fatal(err)
return
}
- dcmock.SetGetAll(func(ctx context.Context) (data *pb.SyncData, e error) {
+ mockplugin.SetGetAll(func(ctx context.Context) (data *pb.SyncData, e error) {
return nil, errors.New("test error")
})
@@ -68,7 +68,7 @@
t.Log(err)
}
- dcmock.SetGetAll(nil)
+ mockplugin.SetGetAll(nil)
dc.FlushData()
data = dc.Discovery()
@@ -80,7 +80,7 @@
nodeName := "test_node"
dc.Registry(nodeName, data)
- dcmock.SetGetAll(dcmock.NewGetAll)
+ mockplugin.SetGetAll(mockplugin.NewGetAll)
dc.FlushData()
newData := dc.Discovery()
if err != nil {
@@ -90,19 +90,19 @@
dc.Registry(nodeName, newData)
- dcmock.SetRegisterInstance(func(ctx context.Context, domainProject, serviceId string, instance *proto.MicroServiceInstance) (s string, e error) {
+ mockplugin.SetRegisterInstance(func(ctx context.Context, domainProject, serviceId string, instance *proto.MicroServiceInstance) (s string, e error) {
return "", errors.New("test error")
})
dc.Registry(nodeName, data)
- dcmock.SetRegisterInstance(nil)
+ mockplugin.SetRegisterInstance(nil)
dc.Registry(nodeName, data)
dc.Registry(nodeName, data)
- dcmock.SetHeartbeat(func(ctx context.Context, domainProject, serviceId, instanceId string) error {
+ mockplugin.SetHeartbeat(func(ctx context.Context, domainProject, serviceId, instanceId string) error {
return errors.New("test error")
})
