Skip to content
Snippets Groups Projects
Commit 8819c5b5 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6944 fix import

parent 4d3d6d64
Branches
No related tags found
No related merge requests found
...@@ -47,6 +47,7 @@ import de.ozgcloud.vorgang.servicekonto.ServiceKontoTestFactory; ...@@ -47,6 +47,7 @@ import de.ozgcloud.vorgang.servicekonto.ServiceKontoTestFactory;
import de.ozgcloud.vorgang.vorgang.Vorgang; import de.ozgcloud.vorgang.vorgang.Vorgang;
import de.ozgcloud.vorgang.vorgang.VorgangHeadTestFactory; import de.ozgcloud.vorgang.vorgang.VorgangHeadTestFactory;
import de.ozgcloud.vorgang.vorgang.VorgangTestFactory; import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
import io.grpc.stub.CallStreamObserver;
import io.grpc.stub.StreamObserver; import io.grpc.stub.StreamObserver;
@SpringBootTest(classes = { VorgangManagerServerApplication.class }, properties = { @SpringBootTest(classes = { VorgangManagerServerApplication.class }, properties = {
...@@ -99,7 +100,8 @@ class AntragraumITCase { ...@@ -99,7 +100,8 @@ class AntragraumITCase {
@BeforeEach @BeforeEach
void mock() { void mock() {
when(decrypter.decryptPostfachId(any())).thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE); when(decrypter.decryptPostfachId(any()))
.thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE);
when(verifier.verify(any())).thenReturn(Collections.emptyList()); when(verifier.verify(any())).thenReturn(Collections.emptyList());
} }
...@@ -113,10 +115,12 @@ class AntragraumITCase { ...@@ -113,10 +115,12 @@ class AntragraumITCase {
@BeforeEach @BeforeEach
void prepareDatabase() { void prepareDatabase() {
vorgangTrustLevel3 = mongoOperations.save(createVorgang(TrustLevel.LEVEL_3), Vorgang.COLLECTION_NAME); vorgangTrustLevel3 = mongoOperations.save(createVorgang(TrustLevel.LEVEL_3), Vorgang.COLLECTION_NAME);
mongoOperations.save(createPostfachNachrichtVorgangAttachedItem(vorgangTrustLevel3.getId()), VorgangAttachedItem.COLLECTION_NAME); mongoOperations.save(createPostfachNachrichtVorgangAttachedItem(vorgangTrustLevel3.getId()),
VorgangAttachedItem.COLLECTION_NAME);
vorgangTrustLevel2 = mongoOperations.save(createVorgang(TrustLevel.LEVEL_2), Vorgang.COLLECTION_NAME); vorgangTrustLevel2 = mongoOperations.save(createVorgang(TrustLevel.LEVEL_2), Vorgang.COLLECTION_NAME);
mongoOperations.save(createPostfachNachrichtVorgangAttachedItem(vorgangTrustLevel2.getId()), VorgangAttachedItem.COLLECTION_NAME); mongoOperations.save(createPostfachNachrichtVorgangAttachedItem(vorgangTrustLevel2.getId()),
VorgangAttachedItem.COLLECTION_NAME);
} }
@Test @Test
...@@ -153,7 +157,8 @@ class AntragraumITCase { ...@@ -153,7 +157,8 @@ class AntragraumITCase {
@BeforeEach @BeforeEach
void prepareDatabase() { void prepareDatabase() {
var vorgang = mongoOperations.save(createVorgang(TrustLevel.LEVEL_3), Vorgang.COLLECTION_NAME); var vorgang = mongoOperations.save(createVorgang(TrustLevel.LEVEL_3), Vorgang.COLLECTION_NAME);
mongoOperations.save(createPostfachNachrichtVorgangAttachedItem(vorgang.getId()), VorgangAttachedItem.COLLECTION_NAME); mongoOperations.save(createPostfachNachrichtVorgangAttachedItem(vorgang.getId()),
VorgangAttachedItem.COLLECTION_NAME);
} }
@Test @Test
...@@ -192,7 +197,8 @@ class AntragraumITCase { ...@@ -192,7 +197,8 @@ class AntragraumITCase {
private List<GrpcRueckfrageHead> findRueckfragen() { private List<GrpcRueckfrageHead> findRueckfragen() {
grpcService.findRueckfragen( grpcService.findRueckfragen(
GrpcFindRueckfrageRequestTestFactory.createBuilder().setSamlToken(TestUtils.loadTextFile("SamlResponse.xml")).build(), GrpcFindRueckfrageRequestTestFactory.createBuilder()
.setSamlToken(TestUtils.loadTextFile("SamlResponse.xml")).build(),
responseObserver); responseObserver);
verify(responseObserver, timeout(30000)).onNext(captor.capture()); verify(responseObserver, timeout(30000)).onNext(captor.capture());
return captor.getValue().getRueckfrageHeadList(); return captor.getValue().getRueckfrageHeadList();
...@@ -214,7 +220,8 @@ class AntragraumITCase { ...@@ -214,7 +220,8 @@ class AntragraumITCase {
@BeforeEach @BeforeEach
void prepareDatabase() { void prepareDatabase() {
savedVorgang = mongoOperations.save(VorgangTestFactory.createBuilder().id(null).build(), Vorgang.COLLECTION_NAME); savedVorgang = mongoOperations.save(VorgangTestFactory.createBuilder().id(null).build(),
Vorgang.COLLECTION_NAME);
vorgangAttachedItem = mongoOperations.save(createPostfachNachrichtVorgangAttachedItem(savedVorgang.getId()), vorgangAttachedItem = mongoOperations.save(createPostfachNachrichtVorgangAttachedItem(savedVorgang.getId()),
VorgangAttachedItem.COLLECTION_NAME); VorgangAttachedItem.COLLECTION_NAME);
...@@ -224,7 +231,8 @@ class AntragraumITCase { ...@@ -224,7 +231,8 @@ class AntragraumITCase {
@Test @Test
void shouldReturnOnMatchingPostfachId() { void shouldReturnOnMatchingPostfachId() {
when(decrypter.decryptPostfachId(any())).thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE); when(decrypter.decryptPostfachId(any()))
.thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE);
var request = GrpcGetRueckfrageRequestTestFactory.createBuilder() var request = GrpcGetRueckfrageRequestTestFactory.createBuilder()
.setId(vorgangAttachedItem.getId()) .setId(vorgangAttachedItem.getId())
.setSamlToken(TestUtils.loadTextFile("SamlResponse.xml")) .setSamlToken(TestUtils.loadTextFile("SamlResponse.xml"))
...@@ -271,9 +279,11 @@ class AntragraumITCase { ...@@ -271,9 +279,11 @@ class AntragraumITCase {
void prepareDatabase() { void prepareDatabase() {
fileId = gridFsTemplate.store(GridFsTestFactory.createUpload()).toString(); fileId = gridFsTemplate.store(GridFsTestFactory.createUpload()).toString();
savedVorgang = mongoOperations.save(createVorgang(TrustLevel.LEVEL_3), Vorgang.COLLECTION_NAME); savedVorgang = mongoOperations.save(createVorgang(TrustLevel.LEVEL_3), Vorgang.COLLECTION_NAME);
vorgangAttachedItem = mongoOperations.save(createPostfachNachrichtVorgangAttachedItem(savedVorgang.getId(), fileId), vorgangAttachedItem = mongoOperations.save(
createPostfachNachrichtVorgangAttachedItem(savedVorgang.getId(), fileId),
VorgangAttachedItem.COLLECTION_NAME); VorgangAttachedItem.COLLECTION_NAME);
vorgangAttachedItemDifferentAttachment = mongoOperations.save(createPostfachNachrichtVorgangAttachedItem(savedVorgang.getId()), vorgangAttachedItemDifferentAttachment = mongoOperations.save(
createPostfachNachrichtVorgangAttachedItem(savedVorgang.getId()),
VorgangAttachedItem.COLLECTION_NAME); VorgangAttachedItem.COLLECTION_NAME);
} }
...@@ -281,7 +291,8 @@ class AntragraumITCase { ...@@ -281,7 +291,8 @@ class AntragraumITCase {
void shouldSendMetadata() { void shouldSendMetadata() {
when(verifier.verify(any())).thenReturn(Collections.emptyList()); when(verifier.verify(any())).thenReturn(Collections.emptyList());
when(decrypter.decryptTrustLevel(any())).thenReturn(TrustLevel.LEVEL_3.getValue()); when(decrypter.decryptTrustLevel(any())).thenReturn(TrustLevel.LEVEL_3.getValue());
when(decrypter.decryptPostfachId(any())).thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE); when(decrypter.decryptPostfachId(any()))
.thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE);
var request = GrpcGetAttachmentMetadataRequest.newBuilder() var request = GrpcGetAttachmentMetadataRequest.newBuilder()
.setSamlToken(SAML_TOKEN) .setSamlToken(SAML_TOKEN)
.setNachrichtId(vorgangAttachedItem.getId()) .setNachrichtId(vorgangAttachedItem.getId())
...@@ -303,7 +314,8 @@ class AntragraumITCase { ...@@ -303,7 +314,8 @@ class AntragraumITCase {
void shouldFailDueToInvalidToken() { void shouldFailDueToInvalidToken() {
when(verifier.verify(any())).thenReturn(List.of(new Saml2Error("invalid_signature", "Signature missing"))); when(verifier.verify(any())).thenReturn(List.of(new Saml2Error("invalid_signature", "Signature missing")));
when(decrypter.decryptTrustLevel(any())).thenReturn(TrustLevel.LEVEL_3.getValue()); when(decrypter.decryptTrustLevel(any())).thenReturn(TrustLevel.LEVEL_3.getValue());
when(decrypter.decryptPostfachId(any())).thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE); when(decrypter.decryptPostfachId(any()))
.thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE);
var request = GrpcGetAttachmentMetadataRequest.newBuilder() var request = GrpcGetAttachmentMetadataRequest.newBuilder()
.setSamlToken(SAML_TOKEN) .setSamlToken(SAML_TOKEN)
.setNachrichtId(vorgangAttachedItem.getId()) .setNachrichtId(vorgangAttachedItem.getId())
...@@ -338,7 +350,8 @@ class AntragraumITCase { ...@@ -338,7 +350,8 @@ class AntragraumITCase {
void shouldFailDueToTrustLevelTooLow() { void shouldFailDueToTrustLevelTooLow() {
when(verifier.verify(any())).thenReturn(Collections.emptyList()); when(verifier.verify(any())).thenReturn(Collections.emptyList());
when(decrypter.decryptTrustLevel(any())).thenReturn(TrustLevel.LEVEL_2.getValue()); when(decrypter.decryptTrustLevel(any())).thenReturn(TrustLevel.LEVEL_2.getValue());
when(decrypter.decryptPostfachId(any())).thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE); when(decrypter.decryptPostfachId(any()))
.thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE);
var request = GrpcGetAttachmentMetadataRequest.newBuilder() var request = GrpcGetAttachmentMetadataRequest.newBuilder()
.setSamlToken(SAML_TOKEN) .setSamlToken(SAML_TOKEN)
.setNachrichtId(vorgangAttachedItem.getId()) .setNachrichtId(vorgangAttachedItem.getId())
...@@ -355,7 +368,8 @@ class AntragraumITCase { ...@@ -355,7 +368,8 @@ class AntragraumITCase {
void shouldFailDueToFileIdNotInPostfachNachricht() { void shouldFailDueToFileIdNotInPostfachNachricht() {
when(verifier.verify(any())).thenReturn(Collections.emptyList()); when(verifier.verify(any())).thenReturn(Collections.emptyList());
when(decrypter.decryptTrustLevel(any())).thenReturn(TrustLevel.LEVEL_3.getValue()); when(decrypter.decryptTrustLevel(any())).thenReturn(TrustLevel.LEVEL_3.getValue());
when(decrypter.decryptPostfachId(any())).thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE); when(decrypter.decryptPostfachId(any()))
.thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE);
var request = GrpcGetAttachmentMetadataRequest.newBuilder() var request = GrpcGetAttachmentMetadataRequest.newBuilder()
.setSamlToken(SAML_TOKEN) .setSamlToken(SAML_TOKEN)
.setNachrichtId(vorgangAttachedItemDifferentAttachment.getId()) .setNachrichtId(vorgangAttachedItemDifferentAttachment.getId())
...@@ -389,9 +403,11 @@ class AntragraumITCase { ...@@ -389,9 +403,11 @@ class AntragraumITCase {
void prepareDatabase() { void prepareDatabase() {
fileId = gridFsTemplate.store(GridFsTestFactory.createUpload()).toString(); fileId = gridFsTemplate.store(GridFsTestFactory.createUpload()).toString();
var savedVorgang = mongoOperations.save(createVorgang(TrustLevel.LEVEL_3), Vorgang.COLLECTION_NAME); var savedVorgang = mongoOperations.save(createVorgang(TrustLevel.LEVEL_3), Vorgang.COLLECTION_NAME);
vorgangAttachedItem = mongoOperations.save(createPostfachNachrichtVorgangAttachedItem(savedVorgang.getId(), fileId), vorgangAttachedItem = mongoOperations.save(
createPostfachNachrichtVorgangAttachedItem(savedVorgang.getId(), fileId),
VorgangAttachedItem.COLLECTION_NAME); VorgangAttachedItem.COLLECTION_NAME);
vorgangAttachedItemDifferentAttachment = mongoOperations.save(createPostfachNachrichtVorgangAttachedItem(savedVorgang.getId()), vorgangAttachedItemDifferentAttachment = mongoOperations.save(
createPostfachNachrichtVorgangAttachedItem(savedVorgang.getId()),
VorgangAttachedItem.COLLECTION_NAME); VorgangAttachedItem.COLLECTION_NAME);
} }
...@@ -399,7 +415,8 @@ class AntragraumITCase { ...@@ -399,7 +415,8 @@ class AntragraumITCase {
void shouldSendContent() { void shouldSendContent() {
when(verifier.verify(any())).thenReturn(Collections.emptyList()); when(verifier.verify(any())).thenReturn(Collections.emptyList());
when(decrypter.decryptTrustLevel(any())).thenReturn(TrustLevel.LEVEL_3.getValue()); when(decrypter.decryptTrustLevel(any())).thenReturn(TrustLevel.LEVEL_3.getValue());
when(decrypter.decryptPostfachId(any())).thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE); when(decrypter.decryptPostfachId(any()))
.thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE);
var request = GrpcGetAttachmentContentRequest.newBuilder() var request = GrpcGetAttachmentContentRequest.newBuilder()
.setSamlToken(SAML_TOKEN) .setSamlToken(SAML_TOKEN)
.setNachrichtId(vorgangAttachedItem.getId()) .setNachrichtId(vorgangAttachedItem.getId())
...@@ -417,7 +434,8 @@ class AntragraumITCase { ...@@ -417,7 +434,8 @@ class AntragraumITCase {
void shouldFailDueToInvalidToken() { void shouldFailDueToInvalidToken() {
when(verifier.verify(any())).thenReturn(List.of(new Saml2Error("invalid_signature", "Signature missing"))); when(verifier.verify(any())).thenReturn(List.of(new Saml2Error("invalid_signature", "Signature missing")));
when(decrypter.decryptTrustLevel(any())).thenReturn(TrustLevel.LEVEL_3.getValue()); when(decrypter.decryptTrustLevel(any())).thenReturn(TrustLevel.LEVEL_3.getValue());
when(decrypter.decryptPostfachId(any())).thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE); when(decrypter.decryptPostfachId(any()))
.thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE);
var request = GrpcGetAttachmentContentRequest.newBuilder() var request = GrpcGetAttachmentContentRequest.newBuilder()
.setSamlToken(SAML_TOKEN) .setSamlToken(SAML_TOKEN)
.setNachrichtId(vorgangAttachedItem.getId()) .setNachrichtId(vorgangAttachedItem.getId())
...@@ -452,7 +470,8 @@ class AntragraumITCase { ...@@ -452,7 +470,8 @@ class AntragraumITCase {
void shouldFailDueToTrustLevelTooLow() { void shouldFailDueToTrustLevelTooLow() {
when(verifier.verify(any())).thenReturn(Collections.emptyList()); when(verifier.verify(any())).thenReturn(Collections.emptyList());
when(decrypter.decryptTrustLevel(any())).thenReturn(TrustLevel.LEVEL_2.getValue()); when(decrypter.decryptTrustLevel(any())).thenReturn(TrustLevel.LEVEL_2.getValue());
when(decrypter.decryptPostfachId(any())).thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE); when(decrypter.decryptPostfachId(any()))
.thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE);
var request = GrpcGetAttachmentContentRequest.newBuilder() var request = GrpcGetAttachmentContentRequest.newBuilder()
.setSamlToken(SAML_TOKEN) .setSamlToken(SAML_TOKEN)
.setNachrichtId(vorgangAttachedItem.getId()) .setNachrichtId(vorgangAttachedItem.getId())
...@@ -469,7 +488,8 @@ class AntragraumITCase { ...@@ -469,7 +488,8 @@ class AntragraumITCase {
void shouldFailDueToFileIdNotInPostfachNachricht() { void shouldFailDueToFileIdNotInPostfachNachricht() {
when(verifier.verify(any())).thenReturn(Collections.emptyList()); when(verifier.verify(any())).thenReturn(Collections.emptyList());
when(decrypter.decryptTrustLevel(any())).thenReturn(TrustLevel.LEVEL_3.getValue()); when(decrypter.decryptTrustLevel(any())).thenReturn(TrustLevel.LEVEL_3.getValue());
when(decrypter.decryptPostfachId(any())).thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE); when(decrypter.decryptPostfachId(any()))
.thenReturn(PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE);
var request = GrpcGetAttachmentContentRequest.newBuilder() var request = GrpcGetAttachmentContentRequest.newBuilder()
.setSamlToken(SAML_TOKEN) .setSamlToken(SAML_TOKEN)
.setNachrichtId(vorgangAttachedItemDifferentAttachment.getId()) .setNachrichtId(vorgangAttachedItemDifferentAttachment.getId())
...@@ -487,7 +507,8 @@ class AntragraumITCase { ...@@ -487,7 +507,8 @@ class AntragraumITCase {
return VorgangTestFactory.createBuilder() return VorgangTestFactory.createBuilder()
.id(null) .id(null)
.version(0) .version(0)
.header(VorgangHeadTestFactory.createBuilder().serviceKonto(createBayernIdServiceKonto(trustLevel)).build()) .header(VorgangHeadTestFactory.createBuilder().serviceKonto(createBayernIdServiceKonto(trustLevel))
.build())
.build(); .build();
} }
...@@ -530,7 +551,8 @@ class AntragraumITCase { ...@@ -530,7 +551,8 @@ class AntragraumITCase {
PostfachAddress.TYPE_FIELD, 0, PostfachAddress.TYPE_FIELD, 0,
PostfachAddress.VERSION_FIELD, 1, PostfachAddress.VERSION_FIELD, 1,
PostfachAddress.IDENTIFIER_FIELD, PostfachAddress.IDENTIFIER_FIELD,
Map.of(PostfachAddress.FIELD_POSTFACH_ID, PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE), Map.of(PostfachAddress.FIELD_POSTFACH_ID,
PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE),
PostfachAddress.SERVICEKONTO_TYPE_FIELD, "BAYERN_ID")); PostfachAddress.SERVICEKONTO_TYPE_FIELD, "BAYERN_ID"));
return nachrichtItem; return nachrichtItem;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment