Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 22e87e5c by Tony Chemit at 2020-11-25T21:09:09+01:00 Fix model test which prove that something is wrong... - - - - - 1 changed file: - models/dto/src/test/java/fr/ird/observe/navigation/select/ll/ModuleSelectModelTest.java Changes: ===================================== models/dto/src/test/java/fr/ird/observe/navigation/select/ll/ModuleSelectModelTest.java ===================================== @@ -22,12 +22,12 @@ package fr.ird.observe.navigation.select.ll; * #L% */ +import com.google.common.collect.ImmutableSet; import com.google.gson.Gson; import fr.ird.observe.gson.DtoGsonSupplierSupport; import fr.ird.observe.navigation.edit.ProjectEditModel; import fr.ird.observe.navigation.select.ProjectSelectModel; import fr.ird.observe.navigation.select.ll.common.ProgramSelectNode; -import fr.ird.observe.navigation.select.ll.logbook.SampleSelectNode; import fr.ird.observe.toolkit.dto.navigation.NavigationModelNode; import org.junit.Assert; import org.junit.Before; @@ -69,8 +69,10 @@ public class ModuleSelectModelTest { ProjectSelectModel selectModel = new ProjectSelectModel(); ProjectEditModel editModel = new ProjectEditModel(); NavigationModelNode<?> actual = selectModel.forNavigationNode(editModel.getLl().getLogbookSample()).orElseThrow(IllegalStateException::new); - SampleSelectNode required = selectModel.getLl().getLogbookSample(); - Assert.assertEquals(required, actual); + ImmutableSet<NavigationModelNode<?>> required = ImmutableSet.of( + selectModel.getLl().getLogbookSample(), + selectModel.getLl().getLogbookActivitySample()); + Assert.assertTrue(required.contains(actual)); } @Test View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/22e87e5cd950308cb62c437d6f... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/22e87e5cd950308cb62c437d6f... You're receiving this email because of your account on gitlab.com.