-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
- Loading branch information
Showing
9 changed files
with
145 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
src/test/scala/org/broadinstitute/dsde/firecloud/webservice/WorkspaceApiServiceJobSpec.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| package org.broadinstitute.dsde.firecloud.webservice | ||
|
|
||
| import akka.http.scaladsl.model.StatusCodes.OK | ||
| import akka.http.scaladsl.server.Route.seal | ||
| import org.broadinstitute.dsde.firecloud.dataaccess.ImportServiceDAO | ||
| import org.broadinstitute.dsde.firecloud.model.{ImportServiceListResponse, ModelSchema, UserInfo, WithAccessToken} | ||
| import org.broadinstitute.dsde.firecloud.service.{BaseServiceSpec, PermissionReportService, WorkspaceService} | ||
| import org.broadinstitute.dsde.firecloud.{EntityService, FireCloudConfig} | ||
| import org.broadinstitute.dsde.rawls.model._ | ||
| import org.joda.time.DateTime | ||
| import org.mockito.ArgumentMatchers | ||
| import org.mockito.ArgumentMatchers.any | ||
| import org.mockito.Mockito.{clearInvocations, times, verify, when} | ||
| import org.scalatest.BeforeAndAfterEach | ||
| import org.scalatestplus.mockito.MockitoSugar | ||
|
|
||
| import java.util.UUID | ||
| import scala.concurrent.{ExecutionContext, Future} | ||
|
|
||
| class WorkspaceApiServiceJobSpec extends BaseServiceSpec with WorkspaceApiService with MockitoSugar with | ||
| BeforeAndAfterEach { | ||
|
|
||
| // mock for ImportServiceDAO | ||
| private val mockitoImportServiceDAO = mock[ImportServiceDAO] | ||
|
|
||
| // setup for the WorkspaceApiService routes | ||
| override val executionContext: ExecutionContext = ExecutionContext.Implicits.global | ||
| override val workspaceServiceConstructor: WithAccessToken => WorkspaceService = WorkspaceService.constructor(app | ||
| .copy(importServiceDAO = mockitoImportServiceDAO)) | ||
| override val permissionReportServiceConstructor: UserInfo => PermissionReportService = PermissionReportService | ||
| .constructor(app) | ||
| override val entityServiceConstructor: ModelSchema => EntityService = EntityService.constructor(app.copy | ||
| (importServiceDAO = mockitoImportServiceDAO)) | ||
|
|
||
| // dummy data for use in tests below | ||
| private val dummyUserId = "1234" | ||
| private val workspace = WorkspaceDetails("namespace", "name", "workspace_id", "buckety_bucket", Some | ||
| ("wf-collection"), DateTime.now(), DateTime.now(), "my_workspace_creator", Some(Map()), //attributes | ||
| isLocked = false, //locked | ||
| Some(Set.empty), //authorizationDomain | ||
| WorkspaceVersions.V2, GoogleProjectId("googleProject"), Some(GoogleProjectNumber("googleProjectNumber")), Some | ||
| (RawlsBillingAccountName("billingAccount")), None, None, Option(DateTime.now()), None, None, WorkspaceState.Ready) | ||
| private val importList = List( | ||
| ImportServiceListResponse(UUID.randomUUID().toString, "running", "filetype1", None), | ||
| ImportServiceListResponse(UUID.randomUUID().toString, "error", "filetype2", Some("my error message")), | ||
| ImportServiceListResponse(UUID.randomUUID().toString, "success", "filetype3", None) | ||
| ) | ||
|
|
||
| // a few shortcuts for accessing the routes | ||
| private final val workspacesRoot = FireCloudConfig.Rawls.authPrefix + FireCloudConfig.Rawls.workspacesPath | ||
| private final val pfbImportPath = workspacesRoot + "/%s/%s/importPFB".format(workspace.namespace, workspace.name) | ||
| private final val importJobPath = workspacesRoot + "/%s/%s/importJob".format(workspace.namespace, workspace.name) | ||
|
|
||
| "WorkspaceService list-jobs API" - { | ||
| // test both the importPFB and importJob routes | ||
| List(pfbImportPath, importJobPath) foreach { pathUnderTest => | ||
| s"for path $pathUnderTest" - { | ||
| // test running_only=true and running_only=false | ||
| List(true, false) foreach { runningOnly => | ||
| s"should call ImportServiceDAO.listJobs with running_only=$runningOnly" in { | ||
| // reset mock invocation counts and configure its return value | ||
| clearInvocations(mockitoImportServiceDAO) | ||
| when(mockitoImportServiceDAO.listJobs(any[String], any[String], any[Boolean])(any[UserInfo])).thenReturn( | ||
| Future.successful(importList)) | ||
| // execute the route | ||
| (Get(s"$pathUnderTest?running_only=$runningOnly") ~> dummyUserIdHeaders(dummyUserId) ~> seal | ||
| (workspaceRoutes)) ~> check { | ||
| // route should return 200 OK | ||
| status should equal(OK) | ||
| // we should have invoked the ImportServiceDAO correctly | ||
| verify(mockitoImportServiceDAO, times(1)).listJobs(ArgumentMatchers.eq(workspace.namespace), | ||
| ArgumentMatchers.eq(workspace.name), ArgumentMatchers.eq(runningOnly))(any[UserInfo]) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters