Skip to content

Commit dd7fcd5

Browse files
committed
keep testTraversalOrder impl dependent
Signed-off-by: Samir Romdhani <samir.romdhani_externe@rte-france.com>
1 parent bb49f32 commit dd7fcd5

File tree

2 files changed

+25
-16
lines changed

2 files changed

+25
-16
lines changed

iidm/iidm-impl/src/test/java/com/powsybl/iidm/network/impl/tck/TopologyTraverserTest.java

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,27 @@
77
*/
88
package com.powsybl.iidm.network.impl.tck;
99

10+
import com.powsybl.iidm.network.Network;
1011
import com.powsybl.iidm.network.tck.AbstractTopologyTraverserTest;
12+
import com.powsybl.iidm.network.test.FictitiousSwitchFactory;
13+
import com.powsybl.math.graph.TraverseResult;
14+
import org.apache.commons.lang3.tuple.Pair;
15+
import org.junit.jupiter.api.Test;
1116

12-
class TopologyTraverserTest extends AbstractTopologyTraverserTest { }
17+
import java.util.List;
18+
19+
import static org.junit.jupiter.api.Assertions.assertEquals;
20+
21+
class TopologyTraverserTest extends AbstractTopologyTraverserTest {
22+
23+
@Test
24+
void testTraversalOrder() {
25+
Network network = FictitiousSwitchFactory.create();
26+
List<Pair<String, Integer>> visited = getVisitedList(network.getGenerator("CB").getTerminal(), s -> TraverseResult.CONTINUE);
27+
assertEquals(List.of(Pair.of("CB", 0), Pair.of("O", 0), Pair.of("P", 0), Pair.of("CF", 0),
28+
Pair.of("CH", 0), Pair.of("CC", 0), Pair.of("CD", 0), Pair.of("CE", 0),
29+
Pair.of("CJ", 1), Pair.of("CI", 1), Pair.of("CG", 0), Pair.of("CJ", 0),
30+
Pair.of("D", 0), Pair.of("CI", 0)),
31+
visited);
32+
}
33+
}

iidm/iidm-tck/src/test/java/com/powsybl/iidm/network/tck/AbstractTopologyTraverserTest.java

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import com.powsybl.iidm.network.*;
1111
import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory;
12-
import com.powsybl.iidm.network.test.FictitiousSwitchFactory;
1312
import com.powsybl.math.graph.TraverseResult;
1413
import org.apache.commons.lang3.tuple.Pair;
1514
import org.junit.jupiter.api.Test;
@@ -260,33 +259,22 @@ void testTerminateTraverser() {
260259
List<Pair<String, Integer>> visited1 = getVisitedList(startGNbv, s -> s != null && s.getId().equals("BR2") ? TraverseResult.TERMINATE_TRAVERSER : TraverseResult.CONTINUE);
261260
assertEquals(List.of(Pair.of("G", 0), Pair.of("BBS1", 0)), visited1);
262261

263-
List<Pair<String, Integer>>visited2 = getVisitedList(startGNbv, s -> TraverseResult.CONTINUE, t -> TraverseResult.TERMINATE_TRAVERSER);
262+
List<Pair<String, Integer>> visited2 = getVisitedList(startGNbv, s -> TraverseResult.CONTINUE, t -> TraverseResult.TERMINATE_TRAVERSER);
264263
assertEquals(List.of(Pair.of("G", 0)), visited2);
265264

266-
List<Pair<String, Integer>>visited3 = getVisitedList(startGNbv, s -> TraverseResult.CONTINUE,
265+
List<Pair<String, Integer>> visited3 = getVisitedList(startGNbv, s -> TraverseResult.CONTINUE,
267266
t -> t.getConnectable() instanceof BusbarSection ? TraverseResult.TERMINATE_TRAVERSER : TraverseResult.CONTINUE);
268267
assertEquals(List.of(Pair.of("G", 0), Pair.of("BBS1", 0)), visited3);
269268

270269
Terminal startLBbv = network.getLoad("LD2").getTerminal();
271270
List<Pair<String, Integer>>visited4 = getVisitedList(startLBbv, s -> TraverseResult.CONTINUE, t -> TraverseResult.TERMINATE_TRAVERSER);
272271
assertEquals(List.of(Pair.of("LD2", 0)), visited4);
273272

274-
List<Pair<String, Integer>>visited5 = getVisitedList(startLBbv, s -> TraverseResult.CONTINUE,
273+
List<Pair<String, Integer>> visited5 = getVisitedList(startLBbv, s -> TraverseResult.CONTINUE,
275274
t -> t.getConnectable().getId().equals("L2") ? TraverseResult.TERMINATE_TRAVERSER : TraverseResult.CONTINUE);
276275
assertEquals(List.of(Pair.of("LD2", 0), Pair.of("L2", 1)), visited5);
277276
}
278277

279-
@Test
280-
void testTraversalOrder() {
281-
Network network = FictitiousSwitchFactory.create();
282-
List<Pair<String, Integer>> visited = getVisitedList(network.getGenerator("CB").getTerminal(), s -> TraverseResult.CONTINUE);
283-
assertEquals(List.of(Pair.of("CB", 0), Pair.of("O", 0), Pair.of("P", 0), Pair.of("CF", 0),
284-
Pair.of("CH", 0), Pair.of("CC", 0), Pair.of("CD", 0), Pair.of("CE", 0),
285-
Pair.of("CJ", 1), Pair.of("CI", 1), Pair.of("CG", 0), Pair.of("CJ", 0),
286-
Pair.of("D", 0), Pair.of("CI", 0)),
287-
visited);
288-
}
289-
290278
protected List<Pair<String, Integer>> getVisitedList(Terminal start, Function<Switch, TraverseResult> switchTest) {
291279
return getVisitedList(start, switchTest, t -> TraverseResult.CONTINUE);
292280
}

0 commit comments

Comments
 (0)