Merge branch 'feature/application'

app/rest/api/import_test.go

@@ -54,6 +54,17 @@ func TestImportRejected(t *testing.T) {
 	assert.Equal(t, http.StatusForbidden, resp.StatusCode)
 }
 
+func TestImportShutdown(t *testing.T) {
+	srv := Import{}
+	go func() {
+		time.Sleep(100 * time.Millisecond)
+		srv.Shutdown()
+	}()
+	st := time.Now()
+	srv.Run(0)
+	assert.True(t, time.Since(st).Seconds() < 1, "should take about 100ms")
+}
+
 func prepImportSrv(t *testing.T) (svc *Import, ts *httptest.Server) {
 	b, err := engine.NewBoltDB(bolt.Options{}, engine.BoltSite{FileName: testDb, SiteID: "radio-t"})
 	require.Nil(t, err)

app/rest/auth/provider_test.go

@@ -77,6 +77,17 @@ func TestLogout(t *testing.T) {
 	assert.Equal(t, "", resp.Cookies()[1].Value)
 }
 
+func TestInitProvider(t *testing.T) {
+	params := Params{Cid: "cid", Csecret: "csecret", RemarkURL: "url"}
+	provider := Provider{Name: "test", RedirectURL: "redir", Secret: "123456"}
+	res := initProvider(params, provider)
+	assert.Equal(t, "cid", res.conf.ClientID)
+	assert.Equal(t, "csecret", res.conf.ClientSecret)
+	assert.Equal(t, "redir", res.RedirectURL)
+	assert.Equal(t, "123456", res.Secret)
+	assert.Equal(t, "test", res.Name)
+}
+
 func mockProvider(t *testing.T, loginPort, authPort int) (provider Provider, ts *http.Server, oauth *http.Server) {
 
 	provider = Provider{