From c5530f2053c380dc0302ba7bdd0e16c559ee4fdf Mon Sep 17 00:00:00 2001 From: mosen Date: Sun, 6 Nov 2016 21:38:46 +1100 Subject: [PATCH] Remove totally unused service test. (#43) Update transport test to use new signature of management.Service (NewService) --- management/service_test.go | 23 ----------------------- management/transport_test.go | 13 ++++++++++--- 2 files changed, 10 insertions(+), 26 deletions(-) delete mode 100644 management/service_test.go diff --git a/management/service_test.go b/management/service_test.go deleted file mode 100644 index 8e26ad1a..00000000 --- a/management/service_test.go +++ /dev/null @@ -1,23 +0,0 @@ -package management - -import "testing" - -func svcSetup() { - -} - -func svcTearDown() { - -} - -func TestService_InstalledApps(t *testing.T) { - svcSetup() - defer svcTearDown() - - svc := NewService(nil, nil, nil, nil, nil) - _, err := svc.InstalledApps("00000000-1111-2222-3333-444455556666") - if err != nil { - t.Fatal(err) - } - -} diff --git a/management/transport_test.go b/management/transport_test.go index a7637bcd..34a63f9c 100644 --- a/management/transport_test.go +++ b/management/transport_test.go @@ -12,6 +12,8 @@ import ( "github.com/go-kit/kit/log" "github.com/jmoiron/sqlx" "github.com/micromdm/dep" + "github.com/micromdm/micromdm/application" + "github.com/micromdm/micromdm/certificate" "github.com/micromdm/micromdm/device" "github.com/micromdm/micromdm/workflow" "golang.org/x/net/context" @@ -327,12 +329,17 @@ func newServer(t *testing.T) (*httptest.Server, Service) { t.Fatal(err) } - as, err := applications.NewDB("postgres", testConn, logger) + as, err := application.NewDB("postgres", testConn, logger) if err != nil { t.Fatal(err) } - svc := NewService(ds, ps, dc, nil, as) + cs, err := certificate.NewDB("postgres", testConn, logger) + if err != nil { + t.Fatal(err) + } + + svc := NewService(ds, ps, dc, nil, as, cs) handler := ServiceHandler(ctx, svc, logger) server := httptest.NewServer(handler) return server, svc @@ -443,7 +450,7 @@ func TestFetchDEPDevices(t *testing.T) { if err != nil { t.Fatal(err) } - svc := NewService(ds, nil, dc, nil, nil) + svc := NewService(ds, nil, dc, nil, nil, nil) handler := ServiceHandler(ctx, svc, logger) server := httptest.NewServer(handler) defer server.Close()