diff --git a/service.go b/service.go index fe1d950b..3bf9118f 100644 --- a/service.go +++ b/service.go @@ -372,19 +372,71 @@ func (s *service) Run() error { return s.Stop() } -type nameIface interface { - Name() string -} - func getNameIndex(n string, ifaces interface{}) int { - values, ok := ifaces.([]interface{}) - if !ok { - return 0 - } - for idx, iface := range values { - if ifc, ok := iface.(nameIface); ok && ifc.Name() == n { - return idx + switch values := ifaces.(type) { + case []router.Router: + for idx, iface := range values { + if iface.Name() == n { + return idx + } } + case []register.Register: + for idx, iface := range values { + if iface.Name() == n { + return idx + } + } + case []store.Store: + for idx, iface := range values { + if iface.Name() == n { + return idx + } + } + case []tracer.Tracer: + for idx, iface := range values { + if iface.Name() == n { + return idx + } + } + case []server.Server: + for idx, iface := range values { + if iface.Name() == n { + return idx + } + } + case []config.Config: + for idx, iface := range values { + if iface.Name() == n { + return idx + } + } + case []meter.Meter: + for idx, iface := range values { + if iface.Name() == n { + return idx + } + } + case []broker.Broker: + for idx, iface := range values { + if iface.Name() == n { + return idx + } + } + case []client.Client: + for idx, iface := range values { + if iface.Name() == n { + return idx + } + } + /* + case []logger.Logger: + for idx, iface := range values { + if iface.Name() == n { + return idx + } + } + */ } + return 0 } diff --git a/service_test.go b/service_test.go index 0063727e..582318da 100644 --- a/service_test.go +++ b/service_test.go @@ -17,20 +17,18 @@ import ( "go.unistack.org/micro/v4/tracer" ) -type testItem struct { - name string -} +func TestClient(t *testing.T) { + c1 := client.NewClient(options.Name("test1")) + c2 := client.NewClient(options.Name("test2")) -func (ti *testItem) Name() string { - return ti.name -} + svc := NewService(Client(c1, c2)) + if err := svc.Init(); err != nil { + t.Fatal(err) + } -func TestGetNameIndex(t *testing.T) { - item1 := &testItem{name: "first"} - item2 := &testItem{name: "second"} - items := []interface{}{item1, item2} - if idx := getNameIndex("second", items); idx != 1 { - t.Fatalf("getNameIndex func error, item not found") + x1 := svc.Client("test2") + if x1.Name() != "test2" { + t.Fatal("invalid client") } }