Skip to content

Commit 1920c8a

Browse files
kaladaykaladay
committed
MODWRKFLOW-18: Use constants for variable names in unit tests.
1 parent c9c2e53 commit 1920c8a

37 files changed

Lines changed: 1260 additions & 949 deletions

‎components/src/main/test/java/org/folio/rest/workflow/model/AbstractGatewayTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ void testDirectionGetterSetter() {
3030

3131
@Test
3232
void testNodesGetterSetter() {
33-
Node node = new Node();
33+
Node node = new Node();
3434
abstractGateway.getNodes().add(node);
3535
assertEquals(1, abstractGateway.getNodes().size());
3636
}

‎components/src/main/test/java/org/folio/rest/workflow/model/EndEventTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ public class EndEventTest {
77
void testEndEventInheritance() {
88
EndEvent endEvent = new EndEvent();
99

10-
assertTrue(endEvent.getId() == null);
11-
assertTrue(endEvent.getName() == null);
10+
assertTrue(endEvent.getId() == null);
11+
assertTrue(endEvent.getName() == null);
1212

13-
assertTrue(endEvent.isEndEvent());
13+
assertTrue(endEvent.isEndEvent());
1414
}
1515
}

‎components/src/test/java/org/folio/rest/workflow/model/AbstractGatewayTest.java‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import java.util.Map;
1414
import java.util.stream.Stream;
1515
import org.folio.rest.workflow.enums.Direction;
16-
import org.folio.rest.workflow.enums.InputAttribute;
1716
import org.junit.jupiter.api.BeforeEach;
1817
import org.junit.jupiter.api.Test;
1918
import org.junit.jupiter.api.extension.ExtendWith;
@@ -26,6 +25,13 @@
2625
@ExtendWith(MockitoExtension.class)
2726
class AbstractGatewayTest {
2827

28+
private static final String DESCRIPTION = "description";
29+
private static final String DESERIALIZEAS = "deserializeAs";
30+
private static final String DIRECTION = "direction";
31+
private static final String ID = "id";
32+
private static final String NAME = "name";
33+
private static final String NODES = "nodes";
34+
2935
@Mock
3036
private Node node;
3137

@@ -42,92 +48,92 @@ void beforeEach() {
4248

4349
@Test
4450
void getIdWorksTest() {
45-
setField(abstractGateway, "id", VALUE);
51+
setField(abstractGateway, ID, VALUE);
4652

4753
assertEquals(VALUE, abstractGateway.getId());
4854
}
4955

5056
@Test
5157
void setIdWorksTest() {
52-
setField(abstractGateway, "id", null);
58+
setField(abstractGateway, ID, null);
5359

5460
abstractGateway.setId(VALUE);
55-
assertEquals(VALUE, getField(abstractGateway, "id"));
61+
assertEquals(VALUE, getField(abstractGateway, ID));
5662
}
5763

5864
@Test
5965
void getNameWorksTest() {
60-
setField(abstractGateway, "name", VALUE);
66+
setField(abstractGateway, NAME, VALUE);
6167

6268
assertEquals(VALUE, abstractGateway.getName());
6369
}
6470

6571
@Test
6672
void setNameWorksTest() {
67-
setField(abstractGateway, "name", null);
73+
setField(abstractGateway, NAME, null);
6874

6975
abstractGateway.setName(VALUE);
70-
assertEquals(VALUE, getField(abstractGateway, "name"));
76+
assertEquals(VALUE, getField(abstractGateway, NAME));
7177
}
7278

7379
@Test
7480
void getDescriptionWorksTest() {
75-
setField(abstractGateway, "description", VALUE);
81+
setField(abstractGateway, DESCRIPTION, VALUE);
7682

7783
assertEquals(VALUE, abstractGateway.getDescription());
7884
}
7985

8086
@Test
8187
void setDescriptionWorksTest() {
82-
setField(abstractGateway, "description", null);
88+
setField(abstractGateway, DESCRIPTION, null);
8389

8490
abstractGateway.setDescription(VALUE);
85-
assertEquals(VALUE, getField(abstractGateway, "description"));
91+
assertEquals(VALUE, getField(abstractGateway, DESCRIPTION));
8692
}
8793

8894
@Test
8995
void getDeserializeAsWorksTest() {
90-
setField(abstractGateway, "deserializeAs", VALUE);
96+
setField(abstractGateway, DESERIALIZEAS, VALUE);
9197

9298
assertEquals(VALUE, abstractGateway.getDeserializeAs());
9399
}
94100

95101
@Test
96102
void setDeserializeAsWorksTest() {
97-
setField(abstractGateway, "deserializeAs", null);
103+
setField(abstractGateway, DESERIALIZEAS, null);
98104

99105
abstractGateway.setDeserializeAs(VALUE);
100-
assertEquals(VALUE, getField(abstractGateway, "deserializeAs"));
106+
assertEquals(VALUE, getField(abstractGateway, DESERIALIZEAS));
101107
}
102108

103109
@Test
104110
void getDirectionWorksTest() {
105-
setField(abstractGateway, "direction", CONVERGING);
111+
setField(abstractGateway, DIRECTION, CONVERGING);
106112

107113
assertEquals(CONVERGING, abstractGateway.getDirection());
108114
}
109115

110116
@Test
111117
void setDirectionWorksTest() {
112-
setField(abstractGateway, "direction", null);
118+
setField(abstractGateway, DIRECTION, null);
113119

114120
abstractGateway.setDirection(CONVERGING);
115-
assertEquals(CONVERGING, getField(abstractGateway, "direction"));
121+
assertEquals(CONVERGING, getField(abstractGateway, DIRECTION));
116122
}
117123

118124
@Test
119125
void getNodesWorksTest() {
120-
setField(abstractGateway, "nodes", nodes);
126+
setField(abstractGateway, NODES, nodes);
121127

122128
assertEquals(nodes, abstractGateway.getNodes());
123129
}
124130

125131
@Test
126132
void setNodesWorksTest() {
127-
setField(abstractGateway, "nodes", null);
133+
setField(abstractGateway, NODES, null);
128134

129135
abstractGateway.setNodes(nodes);
130-
assertEquals(nodes, getField(abstractGateway, "nodes"));
136+
assertEquals(nodes, getField(abstractGateway, NODES));
131137
}
132138

133139
@ParameterizedTest
@@ -158,9 +164,6 @@ private static Stream<Arguments> providePrePersistFor() {
158164

159165
final List<Node> emptyList = new ArrayList<>();
160166

161-
final ArrayList<InputAttribute> attrList = new ArrayList<>();
162-
attrList.add(InputAttribute.MAX);
163-
164167
return List.of(
165168
Arguments.of(
166169
helperFieldMap(null, null),
@@ -188,8 +191,8 @@ private static Stream<Arguments> providePrePersistFor() {
188191
private static Map<String, Object> helperFieldMap(Direction direction, List<Node> nodes) {
189192
final Map<String, Object> map = new HashMap<>();
190193

191-
map.put("direction", direction);
192-
map.put("nodes", nodes);
194+
map.put(DIRECTION, direction);
195+
map.put(NODES, nodes);
193196

194197
return map;
195198
}

‎components/src/test/java/org/folio/rest/workflow/model/AbstractProcessTest.java‎

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@
2222
@ExtendWith(MockitoExtension.class)
2323
class AbstractProcessTest {
2424

25+
private static final String ASYNCAFTER = "asyncAfter";
26+
private static final String ASYNCBEFORE = "asyncBefore";
27+
private static final String DESCRIPTION = "description";
28+
private static final String DESERIALIZEAS = "deserializeAs";
29+
private static final String ID = "id";
30+
private static final String NAME = "name";
31+
private static final String NODES = "nodes";
32+
2533
@Mock
2634
private Node node;
2735

@@ -38,107 +46,107 @@ void beforeEach() {
3846

3947
@Test
4048
void getIdWorksTest() {
41-
setField(abstractProcess, "id", VALUE);
49+
setField(abstractProcess, ID, VALUE);
4250

4351
assertEquals(VALUE, abstractProcess.getId());
4452
}
4553

4654
@Test
4755
void setIdWorksTest() {
48-
setField(abstractProcess, "id", null);
56+
setField(abstractProcess, ID, null);
4957

5058
abstractProcess.setId(VALUE);
51-
assertEquals(VALUE, getField(abstractProcess, "id"));
59+
assertEquals(VALUE, getField(abstractProcess, ID));
5260
}
5361

5462
@Test
5563
void getNameWorksTest() {
56-
setField(abstractProcess, "name", VALUE);
64+
setField(abstractProcess, NAME, VALUE);
5765

5866
assertEquals(VALUE, abstractProcess.getName());
5967
}
6068

6169
@Test
6270
void setNameWorksTest() {
63-
setField(abstractProcess, "name", null);
71+
setField(abstractProcess, NAME, null);
6472

6573
abstractProcess.setName(VALUE);
66-
assertEquals(VALUE, getField(abstractProcess, "name"));
74+
assertEquals(VALUE, getField(abstractProcess, NAME));
6775
}
6876

6977
@Test
7078
void getDescriptionWorksTest() {
71-
setField(abstractProcess, "description", VALUE);
79+
setField(abstractProcess, DESCRIPTION, VALUE);
7280

7381
assertEquals(VALUE, abstractProcess.getDescription());
7482
}
7583

7684
@Test
7785
void setDescriptionWorksTest() {
78-
setField(abstractProcess, "description", null);
86+
setField(abstractProcess, DESCRIPTION, null);
7987

8088
abstractProcess.setDescription(VALUE);
81-
assertEquals(VALUE, getField(abstractProcess, "description"));
89+
assertEquals(VALUE, getField(abstractProcess, DESCRIPTION));
8290
}
8391

8492
@Test
8593
void getDeserializeAsWorksTest() {
86-
setField(abstractProcess, "deserializeAs", VALUE);
94+
setField(abstractProcess, DESERIALIZEAS, VALUE);
8795

8896
assertEquals(VALUE, abstractProcess.getDeserializeAs());
8997
}
9098

9199
@Test
92100
void setDeserializeAsWorksTest() {
93-
setField(abstractProcess, "deserializeAs", null);
101+
setField(abstractProcess, DESERIALIZEAS, null);
94102

95103
abstractProcess.setDeserializeAs(VALUE);
96-
assertEquals(VALUE, getField(abstractProcess, "deserializeAs"));
104+
assertEquals(VALUE, getField(abstractProcess, DESERIALIZEAS));
97105
}
98106

99107
@Test
100108
void getAsyncBeforeWorksTest() {
101-
setField(abstractProcess, "asyncBefore", true);
109+
setField(abstractProcess, ASYNCBEFORE, true);
102110

103111
assertEquals(true, abstractProcess.getAsyncBefore());
104112
}
105113

106114
@Test
107115
void setAsyncBeforeWorksTest() {
108-
setField(abstractProcess, "asyncBefore", false);
116+
setField(abstractProcess, ASYNCBEFORE, false);
109117

110118
abstractProcess.setAsyncBefore(true);
111-
assertEquals(true, getField(abstractProcess, "asyncBefore"));
119+
assertEquals(true, getField(abstractProcess, ASYNCBEFORE));
112120
}
113121

114122
@Test
115123
void getAsyncAfterWorksTest() {
116-
setField(abstractProcess, "asyncAfter", true);
124+
setField(abstractProcess, ASYNCAFTER, true);
117125

118126
assertEquals(true, abstractProcess.getAsyncAfter());
119127
}
120128

121129
@Test
122130
void setAsyncAfterWorksTest() {
123-
setField(abstractProcess, "asyncAfter", false);
131+
setField(abstractProcess, ASYNCAFTER, false);
124132

125133
abstractProcess.setAsyncAfter(true);
126-
assertEquals(true, getField(abstractProcess, "asyncAfter"));
134+
assertEquals(true, getField(abstractProcess, ASYNCAFTER));
127135
}
128136

129137
@Test
130138
void getNodesWorksTest() {
131-
setField(abstractProcess, "nodes", nodes);
139+
setField(abstractProcess, NODES, nodes);
132140

133141
assertEquals(nodes, abstractProcess.getNodes());
134142
}
135143

136144
@Test
137145
void setNodesWorksTest() {
138-
setField(abstractProcess, "nodes", null);
146+
setField(abstractProcess, NODES, null);
139147

140148
abstractProcess.setNodes(nodes);
141-
assertEquals(nodes, getField(abstractProcess, "nodes"));
149+
assertEquals(nodes, getField(abstractProcess, NODES));
142150
}
143151

144152
@ParameterizedTest
@@ -201,9 +209,9 @@ private static Stream<Arguments> providePrePersistFor() {
201209
private static Map<String, Object> helperFieldMap(Boolean asyncBefore, Boolean asyncAfter, List<Node> nodes) {
202210
final Map<String, Object> map = new HashMap<>();
203211

204-
map.put("asyncBefore", asyncBefore);
205-
map.put("asyncAfter", asyncAfter);
206-
map.put("nodes", nodes);
212+
map.put(ASYNCAFTER, asyncAfter);
213+
map.put(ASYNCBEFORE, asyncBefore);
214+
map.put(NODES, nodes);
207215

208216
return map;
209217
}

0 commit comments

Comments
 (0)