Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
22e87e5c
by Tony Chemit at 2020-11-25T21:09:09+01:00
1 changed file:
Changes:
| ... | ... | @@ -22,12 +22,12 @@ package fr.ird.observe.navigation.select.ll; |
| 22 | 22 |
* #L%
|
| 23 | 23 |
*/
|
| 24 | 24 |
|
| 25 |
+import com.google.common.collect.ImmutableSet;
|
|
| 25 | 26 |
import com.google.gson.Gson;
|
| 26 | 27 |
import fr.ird.observe.gson.DtoGsonSupplierSupport;
|
| 27 | 28 |
import fr.ird.observe.navigation.edit.ProjectEditModel;
|
| 28 | 29 |
import fr.ird.observe.navigation.select.ProjectSelectModel;
|
| 29 | 30 |
import fr.ird.observe.navigation.select.ll.common.ProgramSelectNode;
|
| 30 |
-import fr.ird.observe.navigation.select.ll.logbook.SampleSelectNode;
|
|
| 31 | 31 |
import fr.ird.observe.toolkit.dto.navigation.NavigationModelNode;
|
| 32 | 32 |
import org.junit.Assert;
|
| 33 | 33 |
import org.junit.Before;
|
| ... | ... | @@ -69,8 +69,10 @@ public class ModuleSelectModelTest { |
| 69 | 69 |
ProjectSelectModel selectModel = new ProjectSelectModel();
|
| 70 | 70 |
ProjectEditModel editModel = new ProjectEditModel();
|
| 71 | 71 |
NavigationModelNode<?> actual = selectModel.forNavigationNode(editModel.getLl().getLogbookSample()).orElseThrow(IllegalStateException::new);
|
| 72 |
- SampleSelectNode required = selectModel.getLl().getLogbookSample();
|
|
| 73 |
- Assert.assertEquals(required, actual);
|
|
| 72 |
+ ImmutableSet<NavigationModelNode<?>> required = ImmutableSet.of(
|
|
| 73 |
+ selectModel.getLl().getLogbookSample(),
|
|
| 74 |
+ selectModel.getLl().getLogbookActivitySample());
|
|
| 75 |
+ Assert.assertTrue(required.contains(actual));
|
|
| 74 | 76 |
}
|
| 75 | 77 |
|
| 76 | 78 |
@Test
|