app type transition (#7167)

api4/job_test.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/platform/app"
 	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/store"
 )
@@ -26,7 +25,7 @@ func TestCreateJob(t *testing.T) {
 	received, resp := th.SystemAdminClient.CreateJob(job)
 	CheckNoError(t, resp)
 
-	defer app.Srv.Store.Job().Delete(received.Id)
+	defer th.App.Srv.Store.Job().Delete(received.Id)
 
 	job = &model.Job{
 		Type: model.NewId(),
@@ -47,11 +46,11 @@ func TestGetJob(t *testing.T) {
 		Id:     model.NewId(),
 		Status: model.JOB_STATUS_PENDING,
 	}
-	if result := <-app.Srv.Store.Job().Save(job); result.Err != nil {
+	if result := <-th.App.Srv.Store.Job().Save(job); result.Err != nil {
 		t.Fatal(result.Err)
 	}
 
-	defer app.Srv.Store.Job().Delete(job.Id)
+	defer th.App.Srv.Store.Job().Delete(job.Id)
 
 	received, resp := th.SystemAdminClient.GetJob(job.Id)
 	CheckNoError(t, resp)
@@ -95,8 +94,8 @@ func TestGetJobs(t *testing.T) {
 	}
 
 	for _, job := range jobs {
-		store.Must(app.Srv.Store.Job().Save(job))
-		defer app.Srv.Store.Job().Delete(job.Id)
+		store.Must(th.App.Srv.Store.Job().Save(job))
+		defer th.App.Srv.Store.Job().Delete(job.Id)
 	}
 
 	received, resp := th.SystemAdminClient.GetJobs(0, 2)
@@ -151,8 +150,8 @@ func TestGetJobsByType(t *testing.T) {
 	}
 
 	for _, job := range jobs {
-		store.Must(app.Srv.Store.Job().Save(job))
-		defer app.Srv.Store.Job().Delete(job.Id)
+		store.Must(th.App.Srv.Store.Job().Save(job))
+		defer th.App.Srv.Store.Job().Delete(job.Id)
 	}
 
 	received, resp := th.SystemAdminClient.GetJobsByType(jobType, 0, 2)
@@ -208,8 +207,8 @@ func TestCancelJob(t *testing.T) {
 	}
 
 	for _, job := range jobs {
-		store.Must(app.Srv.Store.Job().Save(job))
-		defer app.Srv.Store.Job().Delete(job.Id)
+		store.Must(th.App.Srv.Store.Job().Save(job))
+		defer th.App.Srv.Store.Job().Delete(job.Id)
 	}
 
 	_, resp := th.Client.CancelJob(jobs[0].Id)