more tests

This commit is contained in:
Timo Bejan 2021-09-20 10:37:42 +03:00
parent 317c93ff71
commit e7273d3c47
4 changed files with 27 additions and 4 deletions

View File

@ -2,6 +2,7 @@ package com.iqser.red.service.peristence.v1.server.integration.service;
import com.iqser.red.service.peristence.v1.server.integration.client.DictionaryClient;
import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.Type;
import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.Dossier;
import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.DossierTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -14,7 +15,8 @@ public class TypeProvider {
@Autowired
private DictionaryClient dictionaryClient;
public Type testAndProvideType(DossierTemplate dossierTemplate, String typeName) {
public Type testAndProvideType(DossierTemplate dossierTemplate, Dossier dossier, String typeName) {
var type = new Type();
type.setType(typeName);
@ -26,7 +28,7 @@ public class TypeProvider {
type.setRecommendation(false);
type.setCaseInsensitive(true);
type.setDossierTemplateId(dossierTemplate.getId());
type.setDossierId(dossier != null ? dossier.getId() : null);
var createdType = dictionaryClient.addType(type);
@ -40,7 +42,7 @@ public class TypeProvider {
}
public Type testAndProvideType(DossierTemplate dossierTemplate) {
return testAndProvideType(dossierTemplate, "test");
return testAndProvideType(dossierTemplate, null, "test");
}

View File

@ -46,5 +46,15 @@ public class DigitalSignatureTest extends AbstractPersistenceServerServiceTest {
assertThat(loadedSignature.getReason()).isEqualTo("new test");
digitalSignatureClient.deleteDigitalSignature();
try {
digitalSignatureClient.getDigitalSignature();
} catch (FeignException.FeignClientException e) {
assertThat(e.status()).isEqualTo(404);
}
}
}

View File

@ -33,7 +33,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
var file = fileTesterAndProvider.testAndProvideFile(dossier);
var type = typeProvider.testAndProvideType(dossier.getDossierTemplate(), "manual");
var type = typeProvider.testAndProvideType(dossier.getDossierTemplate(),null, "manual");
var comment = manualRedactionClient.addComment(dossier.getId(), file.getId(), "1", CommentRequest.builder().text("test").user("1").build());

View File

@ -2,6 +2,7 @@ package com.iqser.red.service.peristence.v1.server.integration.tests;
import com.iqser.red.service.peristence.v1.server.integration.client.DictionaryClient;
import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider;
import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider;
import com.iqser.red.service.peristence.v1.server.integration.service.TypeProvider;
import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.Colors;
@ -24,6 +25,9 @@ public class TypeTest extends AbstractPersistenceServerServiceTest {
@Autowired
private DossierTemplateTesterAndProvider dossierTemplateTesterAndProvider;
@Autowired
private DossierTesterAndProvider dossierTesterAndProvider;
@Autowired
private DictionaryClient dictionaryClient;
@ -67,6 +71,13 @@ public class TypeTest extends AbstractPersistenceServerServiceTest {
var typesForTemplate = dictionaryClient.getAllTypesForDossierTemplate(loadedType.getDossierTemplateId());
assertThat(typesForTemplate).isEmpty();
var dossier = dossierTesterAndProvider.provideTestDossier();
var dossierType = typeProvider.testAndProvideType(dossierTemplate,dossier,"dossier-dict");
var typesForDossier = dictionaryClient.getAllTypesForDossier(dossierType.getDossierId());
assertThat(typesForDossier).isNotEmpty();
}
@Test