Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vorgang-manager
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OZG-Cloud
app
vorgang-manager
Commits
c18ed4ac
Commit
c18ed4ac
authored
6 months ago
by
OZGCloud
Browse files
Options
Downloads
Patches
Plain Diff
OZG-6162 add qualifier in CollaborationITCase
parent
abb212c5
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
+6
-3
6 additions, 3 deletions
...e/ozgcloud/vorgang/collaboration/CollaborationITCase.java
with
6 additions
and
3 deletions
vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
+
6
−
3
View file @
c18ed4ac
...
@@ -47,6 +47,7 @@ import org.mockito.ArgumentCaptor;
...
@@ -47,6 +47,7 @@ import org.mockito.ArgumentCaptor;
import
org.mockito.Captor
;
import
org.mockito.Captor
;
import
org.mockito.Mock
;
import
org.mockito.Mock
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.mock.mockito.MockBean
;
import
org.springframework.boot.test.mock.mockito.MockBean
;
import
org.springframework.data.mongodb.core.MongoOperations
;
import
org.springframework.data.mongodb.core.MongoOperations
;
...
@@ -61,6 +62,7 @@ import com.thedeanda.lorem.LoremIpsum;
...
@@ -61,6 +62,7 @@ import com.thedeanda.lorem.LoremIpsum;
import
de.ozgcloud.apilib.user.OzgCloudUserId
;
import
de.ozgcloud.apilib.user.OzgCloudUserId
;
import
de.ozgcloud.apilib.user.OzgCloudUserProfile
;
import
de.ozgcloud.apilib.user.OzgCloudUserProfile
;
import
de.ozgcloud.apilib.user.OzgCloudUserProfileService
;
import
de.ozgcloud.apilib.user.OzgCloudUserProfileService
;
import
de.ozgcloud.collaboration.CollaborationManagerConfiguration
;
import
de.ozgcloud.collaboration.CollaborationRequest
;
import
de.ozgcloud.collaboration.CollaborationRequest
;
import
de.ozgcloud.collaboration.CollaborationServiceGrpc.CollaborationServiceBlockingStub
;
import
de.ozgcloud.collaboration.CollaborationServiceGrpc.CollaborationServiceBlockingStub
;
import
de.ozgcloud.collaboration.GrpcGetFileContentRequest
;
import
de.ozgcloud.collaboration.GrpcGetFileContentRequest
;
...
@@ -122,7 +124,8 @@ class CollaborationITCase {
...
@@ -122,7 +124,8 @@ class CollaborationITCase {
private
MongoOperations
mongoOperations
;
private
MongoOperations
mongoOperations
;
@MockBean
@MockBean
private
OzgCloudUserProfileService
ozgCloudUserProfileService
;
@Qualifier
(
CollaborationManagerConfiguration
.
OZG_CLOUD_USER_PROFILE_SERVICE_NAME
)
private
OzgCloudUserProfileService
collaborationOzgCloudUserProfileService
;
@MockBean
@MockBean
private
PostfachRemoteService
postfachRemoteService
;
private
PostfachRemoteService
postfachRemoteService
;
...
@@ -241,7 +244,7 @@ class CollaborationITCase {
...
@@ -241,7 +244,7 @@ class CollaborationITCase {
@BeforeEach
@BeforeEach
void
init
()
{
void
init
()
{
when
(
ozgCloudUserProfile
.
getId
()).
thenReturn
(
OzgCloudUserId
.
from
(
CommandTestFactory
.
CREATED_BY
));
when
(
ozgCloudUserProfile
.
getId
()).
thenReturn
(
OzgCloudUserId
.
from
(
CommandTestFactory
.
CREATED_BY
));
when
(
o
zgCloudUserProfileService
.
getById
(
any
())).
thenReturn
(
ozgCloudUserProfile
);
when
(
collaborationO
zgCloudUserProfileService
.
getById
(
any
())).
thenReturn
(
ozgCloudUserProfile
);
}
}
@Test
@Test
...
@@ -289,7 +292,7 @@ class CollaborationITCase {
...
@@ -289,7 +292,7 @@ class CollaborationITCase {
@BeforeEach
@BeforeEach
void
init
()
{
void
init
()
{
when
(
ozgCloudUserProfile
.
getId
()).
thenReturn
(
OzgCloudUserId
.
from
(
CommandTestFactory
.
CREATED_BY
));
when
(
ozgCloudUserProfile
.
getId
()).
thenReturn
(
OzgCloudUserId
.
from
(
CommandTestFactory
.
CREATED_BY
));
when
(
o
zgCloudUserProfileService
.
getById
(
any
())).
thenReturn
(
ozgCloudUserProfile
);
when
(
collaborationO
zgCloudUserProfileService
.
getById
(
any
())).
thenReturn
(
ozgCloudUserProfile
);
}
}
@Test
@Test
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment