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

OZG-6842 Apply code review comments

parent 5a12bb75
No related branches found
No related tags found
No related merge requests found
...@@ -31,7 +31,6 @@ public class OzgCloudVorgangQuery { ...@@ -31,7 +31,6 @@ public class OzgCloudVorgangQuery {
private final Query nestedQuery; private final Query nestedQuery;
} }
@Builder
public static record FormIdentification(String formId, String formEngineName) { public static record FormIdentification(String formId, String formEngineName) {
} }
......
...@@ -5,7 +5,6 @@ import java.util.UUID; ...@@ -5,7 +5,6 @@ import java.util.UUID;
import com.thedeanda.lorem.LoremIpsum; import com.thedeanda.lorem.LoremIpsum;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangQuery.FormIdentification; import de.ozgcloud.apilib.vorgang.OzgCloudVorgangQuery.FormIdentification;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangQuery.FormIdentification.FormIdentificationBuilder;
public class FormIdentificationTestFactory { public class FormIdentificationTestFactory {
...@@ -13,14 +12,7 @@ public class FormIdentificationTestFactory { ...@@ -13,14 +12,7 @@ public class FormIdentificationTestFactory {
public static final String FORM_ID = UUID.randomUUID().toString(); public static final String FORM_ID = UUID.randomUUID().toString();
public static FormIdentification create() { public static FormIdentification create() {
return createBuilder() return new FormIdentification(FORM_ID, FORM_ENGINE_NAME);
.build();
}
public static FormIdentificationBuilder createBuilder() {
return FormIdentification.builder()
.formId(FORM_ID)
.formEngineName(FORM_ENGINE_NAME);
} }
} }
...@@ -7,9 +7,10 @@ import de.ozgcloud.vorgang.vorgang.GrpcQuery; ...@@ -7,9 +7,10 @@ import de.ozgcloud.vorgang.vorgang.GrpcQuery;
public class GrpcFindVorgangRequestTestFactory { public class GrpcFindVorgangRequestTestFactory {
private static final GrpcOrderBy ORDER_BY = GrpcOrderBy.CREATED_AT_DESC;
public static final GrpcQuery QUERY = GrpcQueryTestFactory.create(); public static final GrpcQuery QUERY = GrpcQueryTestFactory.create();
public static final int LIMIT = (int) (Math.random() * 100); public static final int LIMIT = 10;
public static final int OFFSET = (int) (Math.random() * LIMIT); public static final int OFFSET = 12;
public static GrpcFindVorgangRequest create() { public static GrpcFindVorgangRequest create() {
return createBuilder() return createBuilder()
...@@ -21,7 +22,7 @@ public class GrpcFindVorgangRequestTestFactory { ...@@ -21,7 +22,7 @@ public class GrpcFindVorgangRequestTestFactory {
.setLimit(LIMIT) .setLimit(LIMIT)
.setOffset(OFFSET) .setOffset(OFFSET)
.setQuery(QUERY) .setQuery(QUERY)
.setOrderBy(GrpcOrderBy.CREATED_AT_DESC); .setOrderBy(ORDER_BY);
} }
} }
...@@ -7,7 +7,7 @@ import de.ozgcloud.vorgang.vorgang.GrpcVorgangHeader; ...@@ -7,7 +7,7 @@ import de.ozgcloud.vorgang.vorgang.GrpcVorgangHeader;
public class GrpcFindVorgangResponseTestFactory { public class GrpcFindVorgangResponseTestFactory {
public static final GrpcVorgangHeader VORGANG_HEADER = GrpcVorgangHeaderTestFactory.create(); public static final GrpcVorgangHeader VORGANG_HEADER = GrpcVorgangHeaderTestFactory.create();
public static final long TOTAL = (long) (Math.random() * 100); public static final long TOTAL = 1;
public static GrpcFindVorgangResponse create() { public static GrpcFindVorgangResponse create() {
return createBuilder().build(); return createBuilder().build();
......
...@@ -179,29 +179,29 @@ class GrpcOzgCloudVorgangServiceTest { ...@@ -179,29 +179,29 @@ class GrpcOzgCloudVorgangServiceTest {
} }
@Test @Test
void shouldGetVorgangServiceStub() { void shouldCallGetVorgangServiceStub() {
callService(); callFind();
verify(service).getVorgangServiceStub(); verify(service).getVorgangServiceStub();
} }
@Test @Test
void shouldBuildFindRequest() { void shouldBuildFindRequest() {
callService(); callFind();
verify(service).buildFindRequest(query, PAGE); verify(service).buildFindRequest(query, PAGE);
} }
@Test @Test
void shouldFindVorgang() { void shouldFindVorgang() {
callService(); callFind();
verify(stubWithInterceptor).findVorgang(request); verify(stubWithInterceptor).findVorgang(request);
} }
@Test @Test
void shouldMapResponse() { void shouldMapResponse() {
callService(); callFind();
verify(stubMapper).fromGrpc(GrpcFindVorgangResponseTestFactory.VORGANG_HEADER); verify(stubMapper).fromGrpc(GrpcFindVorgangResponseTestFactory.VORGANG_HEADER);
} }
...@@ -211,12 +211,12 @@ class GrpcOzgCloudVorgangServiceTest { ...@@ -211,12 +211,12 @@ class GrpcOzgCloudVorgangServiceTest {
var mappedVorgangStub = OzgCloudVorgangStubTestFactory.create(); var mappedVorgangStub = OzgCloudVorgangStubTestFactory.create();
when(stubMapper.fromGrpc(GrpcFindVorgangResponseTestFactory.VORGANG_HEADER)).thenReturn(mappedVorgangStub); when(stubMapper.fromGrpc(GrpcFindVorgangResponseTestFactory.VORGANG_HEADER)).thenReturn(mappedVorgangStub);
var vorgangStubs = callService(); var vorgangStubs = callFind();
assertThat(vorgangStubs).containsExactly(mappedVorgangStub); assertThat(vorgangStubs).containsExactly(mappedVorgangStub);
} }
private List<OzgCloudVorgangStub> callService() { private List<OzgCloudVorgangStub> callFind() {
return service.find(query, PAGE); return service.find(query, PAGE);
} }
} }
...@@ -238,19 +238,19 @@ class GrpcOzgCloudVorgangServiceTest { ...@@ -238,19 +238,19 @@ class GrpcOzgCloudVorgangServiceTest {
@Test @Test
void shouldMapToGrpcQuery() { void shouldMapToGrpcQuery() {
callService(); callBuildFindRequest();
verify(queryMapper).toGrpc(ozgCloudVorgangQuery); verify(queryMapper).toGrpc(ozgCloudVorgangQuery);
} }
@Test @Test
void shouldReturnRequest() { void shouldReturnRequest() {
var request = callService(); var request = callBuildFindRequest();
assertThat(request).usingRecursiveComparison().isEqualTo(GrpcFindVorgangRequestTestFactory.create()); assertThat(request).usingRecursiveComparison().isEqualTo(GrpcFindVorgangRequestTestFactory.create());
} }
private GrpcFindVorgangRequest callService() { private GrpcFindVorgangRequest callBuildFindRequest() {
return service.buildFindRequest(ozgCloudVorgangQuery, page); return service.buildFindRequest(ozgCloudVorgangQuery, page);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment