Skip to content

Commit 9395c0f

Browse files
committed
Format test
1 parent 78e41b3 commit 9395c0f

File tree

1 file changed

+30
-27
lines changed

1 file changed

+30
-27
lines changed

src/test/java/com/adyen/serializer/ModelTest.java

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ public void testFromJsonCheckoutPaymentMethodBcmcMobile() throws Exception {
198198
assertEquals("7219687191761347", storedPaymentMethodDetails.getStoredPaymentMethodId());
199199
}
200200

201-
// test null values are not serialized
201+
// test null values are not serialized
202202
@Test
203203
public void testToJsonTerminalSettingsSurchargeNotSet() throws JsonProcessingException {
204204
TerminalSettings terminalSettings = new TerminalSettings();
@@ -208,18 +208,19 @@ public void testToJsonTerminalSettingsSurchargeNotSet() throws JsonProcessingExc
208208
assertEquals("{\"connectivity\":{\"simcardStatus\":\"ACTIVATED\"}}", json);
209209
}
210210

211-
// test values set as null are not serialized when includeNullValues is false
212-
@Test
213-
public void testToJsonTerminalSettingsSurchargeSetToNullWithoutEnablingIncludeNullValues() throws JsonProcessingException {
214-
TerminalSettings terminalSettings = new TerminalSettings();
215-
terminalSettings
216-
.connectivity(new Connectivity().simcardStatus(Connectivity.SimcardStatusEnum.ACTIVATED))
217-
.setSurcharge(null);
218-
String json = terminalSettings.toJson();
219-
assertEquals("{\"connectivity\":{\"simcardStatus\":\"ACTIVATED\"}}", json);
220-
}
221-
222-
// test values set as null (using setters) are serialized
211+
// test values set as null are not serialized when includeNullValues is false
212+
@Test
213+
public void testToJsonTerminalSettingsSurchargeSetToNullWithoutEnablingIncludeNullValues()
214+
throws JsonProcessingException {
215+
TerminalSettings terminalSettings = new TerminalSettings();
216+
terminalSettings
217+
.connectivity(new Connectivity().simcardStatus(Connectivity.SimcardStatusEnum.ACTIVATED))
218+
.setSurcharge(null);
219+
String json = terminalSettings.toJson();
220+
assertEquals("{\"connectivity\":{\"simcardStatus\":\"ACTIVATED\"}}", json);
221+
}
222+
223+
// test values set as null (using setters) are serialized
223224
@Test
224225
public void testToJsonTerminalSettingsSurchargeSetToNull() throws JsonProcessingException {
225226
TerminalSettings terminalSettings = new TerminalSettings();
@@ -231,7 +232,7 @@ public void testToJsonTerminalSettingsSurchargeSetToNull() throws JsonProcessing
231232
assertEquals("{\"connectivity\":{\"simcardStatus\":\"ACTIVATED\"},\"surcharge\":null}", json);
232233
}
233234

234-
// test values set as null (using build methods) are serialized
235+
// test values set as null (using build methods) are serialized
235236
@Test
236237
public void testToJsonTerminalSettingsSurchargeChainToNull() throws JsonProcessingException {
237238
TerminalSettings terminalSettings = new TerminalSettings();
@@ -243,20 +244,22 @@ public void testToJsonTerminalSettingsSurchargeChainToNull() throws JsonProcessi
243244
assertEquals("{\"connectivity\":{\"simcardStatus\":\"ACTIVATED\"},\"surcharge\":null}", json);
244245
}
245246

246-
// test values, that are not explicitly SET as null, are not serialized (even when includeNullValues is true)
247-
@Test
248-
public void testToJsonFlagTrueButFieldNotSet() throws JsonProcessingException {
249-
TerminalSettings terminalSettings = new TerminalSettings();
250-
// must consider null values that are explicitly set
251-
terminalSettings.includeNullValues(true);
247+
// test values, that are not explicitly SET as null, are not serialized (even when
248+
// includeNullValues is true)
249+
@Test
250+
public void testToJsonFlagTrueButFieldNotSet() throws JsonProcessingException {
251+
TerminalSettings terminalSettings = new TerminalSettings();
252+
// must consider null values that are explicitly set
253+
terminalSettings.includeNullValues(true);
252254

253-
// We set connectivity, but we NEVER touch 'surcharge'
254-
terminalSettings.setConnectivity(new Connectivity().simcardStatus(Connectivity.SimcardStatusEnum.ACTIVATED));
255+
// We set connectivity, but we NEVER touch 'surcharge'
256+
terminalSettings.setConnectivity(
257+
new Connectivity().simcardStatus(Connectivity.SimcardStatusEnum.ACTIVATED));
255258

256-
String json = terminalSettings.toJson();
259+
String json = terminalSettings.toJson();
257260

258-
// Expectation: 'surcharge' should NOT be present, even though the flag is true.
259-
// It should only be present if we called setSurcharge().
260-
assertEquals("{\"connectivity\":{\"simcardStatus\":\"ACTIVATED\"}}", json);
261-
}
261+
// Expectation: 'surcharge' should NOT be present, even though the flag is true.
262+
// It should only be present if we called setSurcharge().
263+
assertEquals("{\"connectivity\":{\"simcardStatus\":\"ACTIVATED\"}}", json);
264+
}
262265
}

0 commit comments

Comments
 (0)