Skip to content

Commit

Permalink
feat: fix setters in tests [DHIS2-14458]
Browse files Browse the repository at this point in the history
  • Loading branch information
david-mackessy committed Dec 6, 2023
1 parent 4101e6b commit f799edb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ void testOptionSetMerge() throws IOException {
"metadata/optionSet_update.csv",
CsvImportClass.OPTION_SET,
null,
params -> params.setMetadataMergeMode(MetadataMergeMode.MERGE));
params -> params.setMergeMode(MetadataMergeMode.MERGE));
assertEquals(2, importReport.getStats().getCreated());
OptionSet optionSet = optionService.getOptionSetByCode("COLOR");
// Total 5 options added
Expand All @@ -169,7 +169,7 @@ void testOptionSetMergeDuplicate() throws IOException {
null,
params -> {
params.setIdentifier(PreheatIdentifier.CODE);
params.setMetadataMergeMode(MetadataMergeMode.MERGE);
params.setMergeMode(MetadataMergeMode.MERGE);
});
// Only 2 new Options are added
assertEquals(2, importReport.getStats().getCreated());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ void testImportSharingWithMergeModeReplace() throws IOException {
new ClassPathResource("dxf2/dataset_with_accesses_merge_mode.json").getInputStream(),
RenderFormat.JSON);
params = createParams(ImportStrategy.CREATE_AND_UPDATE);
params.setMetadataMergeMode(MetadataMergeMode.REPLACE);
params.setMergeMode(MetadataMergeMode.REPLACE);
params.setUser(UID.of(user));
report = importService.importMetadata(params, new MetadataObjects(metadata));
assertEquals(Status.OK, report.getStatus());
Expand Down

0 comments on commit f799edb

Please sign in to comment.