update tests for syntax compatibility

broadinstitute · Apr 16, 2019 · 219cd57 · 219cd57
1 parent cd077df
commit 219cd57
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/test/scala/org/broadinstitute/dsde/firecloud/service/UserApiServiceSpec.scala b/src/test/scala/org/broadinstitute/dsde/firecloud/service/UserApiServiceSpec.scala
@@ -23,7 +23,7 @@ class UserApiServiceSpec extends BaseServiceSpec with RegisterApiService with Us
 
   val registerServiceConstructor:() => RegisterService = RegisterService.constructor(app)
   val trialServiceConstructor:() => TrialService = TrialService.constructor(app, trialProjectManager)
-  val userServiceConstructor:(WithAccessToken) => UserService = UserService.constructor(app)
+  val userServiceConstructor:(UserInfo) => UserService = UserService.constructor(app)
   var workspaceServer: ClientAndServer = _
   var profileServer: ClientAndServer = _
   var samServer: ClientAndServer = _

diff --git a/...t/scala/org/broadinstitute/dsde/firecloud/webservice/ImportPermissionApiServiceSpec.scala b/...t/scala/org/broadinstitute/dsde/firecloud/webservice/ImportPermissionApiServiceSpec.scala
@@ -2,7 +2,7 @@ package org.broadinstitute.dsde.firecloud.webservice
 
 import org.broadinstitute.dsde.firecloud.{FireCloudException, FireCloudExceptionWithErrorReport}
 import org.broadinstitute.dsde.firecloud.dataaccess.MockRawlsDAO
-import org.broadinstitute.dsde.firecloud.model.{Trial, UserImportPermission, WithAccessToken}
+import org.broadinstitute.dsde.firecloud.model.{Trial, UserImportPermission, UserInfo, WithAccessToken}
 import org.broadinstitute.dsde.firecloud.model.ModelJsonProtocol.impUserImportPermission
 import org.broadinstitute.dsde.firecloud.model.Trial.{CreationStatuses, ProjectRoles, RawlsBillingProjectMembership}
 import org.broadinstitute.dsde.firecloud.service.{BaseServiceSpec, TrialService, UserService}
@@ -23,7 +23,7 @@ class ImportPermissionApiServiceSpec extends BaseServiceSpec with UserApiService
 
   val trialProjectManager = system.actorOf(ProjectManager.props(testApp.rawlsDAO, testApp.trialDAO, testApp.googleServicesDAO), "trial-project-manager")
   val trialServiceConstructor:() => TrialService = TrialService.constructor(testApp, trialProjectManager)
-  val userServiceConstructor:(WithAccessToken) => UserService = UserService.constructor(testApp)
+  val userServiceConstructor:(UserInfo) => UserService = UserService.constructor(testApp)
 
   "UserService /api/profile/importstatus endpoint tests" - {
 

diff --git a/src/test/scala/org/broadinstitute/dsde/firecloud/webservice/TrialApiServiceSpec.scala b/src/test/scala/org/broadinstitute/dsde/firecloud/webservice/TrialApiServiceSpec.scala
@@ -55,7 +55,7 @@ final class TrialApiServiceSpec extends BaseServiceSpec with UserApiService with
         rawlsDAO = localRawlsDao,
         googleServicesDAO = localGoogleDao),
       trialProjectManager)
-  val userServiceConstructor:(WithAccessToken) => UserService = UserService.constructor(app)
+  val userServiceConstructor:(UserInfo) => UserService = UserService.constructor(app)
 
   var localThurloeServer: ClientAndServer = _