@@ -662,27 +662,27 @@ void testNodeManipulation() throws Exception {
662
662
/* expected :
663
663
root
664
664
/ \
665
- node1 node2
665
+ node1(hypo 1) node2(loadflow)
666
666
*/
667
667
assertChildrenEquals (Set .of (node1 , node2 ), root .getChildren ());
668
668
669
669
node2 .setName ("niark" );
670
670
node1 .setName ("condriak" );
671
671
node1 .setModificationGroupUuid (UUID .randomUUID ());
672
- createNode (root .getStudyId (), children .get (1 ), node2 , userId );
673
- createNode (root .getStudyId (), children .get (1 ), node1 , userId );
672
+ AbstractNode child = children .get (0 ).getName ().equals ("loadflow" ) ? children .get (0 ) : children .get (1 );
673
+ createNode (root .getStudyId (), child , node2 , userId );
674
+ createNode (root .getStudyId (), child , node1 , userId );
674
675
675
676
/* expected
676
677
root
677
678
/ \
678
- node1 node2
679
+ node1 node2(loadflow)
679
680
/ \
680
681
node(condriak) node(niark)
681
682
*/
682
683
683
684
root = getRootNode (root .getStudyId (), firstRootNetwork );
684
- AbstractNode child ;
685
- if (root .getChildren ().get (0 ).getName ().equals (children .get (1 ).getName ())) {
685
+ if (root .getChildren ().get (0 ).getName ().equals (child .getName ())) {
686
686
child = root .getChildren ().get (0 );
687
687
} else {
688
688
child = root .getChildren ().get (1 );
@@ -693,23 +693,26 @@ void testNodeManipulation() throws Exception {
693
693
deleteNode (root .getStudyId (), List .of (child ), false , Set .of (child ), true , userId );
694
694
695
695
/* expected
696
- root
697
- / | \
698
- node node node
696
+ root
697
+ / | \
698
+ node node node
699
+ (hypo 1) (condriak) (niark)
699
700
*/
700
701
701
702
root = getRootNode (root .getStudyId (), firstRootNetwork );
702
703
assertEquals (3 , root .getChildren ().size ());
703
704
child = root .getChildren ().get (0 );
705
+
704
706
createNode (root .getStudyId (), child , node4 , userId );
705
707
706
708
deleteNode (root .getStudyId (), List .of (child ), true , Set .of (child , node4 ), userId );
707
709
708
710
/* expected
709
- root
710
- |
711
- node
711
+ root
712
+ | \
713
+ node node
712
714
*/
715
+
713
716
root = getRootNode (root .getStudyId (), firstRootNetwork );
714
717
assertEquals (2 , root .getChildren ().size ());
715
718
assertEquals (3 , nodeRepository .findAll ().size ());
0 commit comments