Skip to content

Commit

Permalink
Separate tests when several JSONs or SVGs are generated
Browse files Browse the repository at this point in the history 
In order to generate all svg files even if one test fails

Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
  • Loading branch information
@flo-dup
flo-dup committed Dec 8, 2020
1 parent f66e03e commit 0e59963
Show file tree
Hide file tree
Showing 6 changed files with 144 additions and 83 deletions.
12 changes: 9 additions & 3 deletions single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestCase11SubstationGraph.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ public void setUp() {
}

@Test
public void test() {
public void testHorizontal() {

// build substation graph
Graph gvl = graphBuilder.buildVoltageLevelGraph("vl1", true, true);
Expand All @@ -226,14 +226,20 @@ public void test() {
// write Json and compare to reference (with horizontal substation layout)
new HorizontalSubstationLayoutFactory().create(g, new PositionVoltageLevelLayoutFactory()).run(getLayoutParameters());
assertEquals(toString("/TestCase11SubstationGraphH.json"), toJson(g, "/TestCase11SubstationGraphH.json"));
}

// rebuild substation graph
g = graphBuilder.buildSubstationGraph(substation.getId(), false);
@Test
public void testVertical() {
// build substation graph
SubstationGraph g = graphBuilder.buildSubstationGraph(substation.getId(), false);

// write Json and compare to reference (with vertical substation layout)
new VerticalSubstationLayoutFactory().create(g, new PositionVoltageLevelLayoutFactory()).run(getLayoutParameters());
assertEquals(toString("/TestCase11SubstationGraphV.json"), toJson(g, "/TestCase11SubstationGraphV.json"));
}

@Test
public void testHorizontalMetadata() {
// compare metadata of substation diagram with reference
// (with horizontal substation layout)
SubstationDiagram diagram = SubstationDiagram.build(graphBuilder, substation.getId());
Expand Down
62 changes: 48 additions & 14 deletions single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestCase12GraphWith3WT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,28 +219,54 @@ public void setUp() {
createSwitch(vl3, "bself6", "bself6", SwitchKind.BREAKER, true, false, true, 17, 16);
}

private void separateBusVoltages() {
Load load = network.getLoad("load1");
load.getTerminal().getBusView().getBus().setV(392);
load.getTerminal().getBusView().getBus().setAngle(-2.3);

Generator generator = network.getGenerator("gen1");
generator.getTerminal().getBusView().getBus().setV(403);
generator.getTerminal().getBusView().getBus().setAngle(-1.7);
}

@Test
public void test() {
public void testVl1() {
// build voltage level 1 graph
Graph g1 = graphBuilder.buildVoltageLevelGraph(vl1.getId(), false, true);
new ImplicitCellDetector().detectCells(g1);
new BlockOrganizer().organize(g1);
new PositionVoltageLevelLayout(g1).run(getLayoutParameters());

// write JSON and compare to reference (horizontal layout)
assertEquals(toString("/TestCase12GraphVL1.json"), toJson(g1, "/TestCase12GraphVL1.json"));
}

@Test
public void testVl2() {
// build voltage level 2 graph
Graph g2 = graphBuilder.buildVoltageLevelGraph(vl2.getId(), false, true);
new ImplicitCellDetector().detectCells(g2);
new BlockOrganizer().organize(g2);
new PositionVoltageLevelLayout(g2).run(getLayoutParameters());

// write JSON and compare to reference (horizontal layout)
assertEquals(toString("/TestCase12GraphVL2.json"), toJson(g2, "/TestCase12GraphVL2.json"));
}

@Test
public void testVl3() {
// build voltage level 3 graph
Graph g3 = graphBuilder.buildVoltageLevelGraph(vl3.getId(), false, true);
new ImplicitCellDetector().detectCells(g3);
new BlockOrganizer().organize(g3);
new PositionVoltageLevelLayout(g3).run(getLayoutParameters());

// write JSON and compare to reference (horizontal layout)
assertEquals(toString("/TestCase12GraphVL1.json"), toJson(g1, "/TestCase12GraphVL1.json"));
assertEquals(toString("/TestCase12GraphVL2.json"), toJson(g2, "/TestCase12GraphVL2.json"));
assertEquals(toString("/TestCase12GraphVL3.json"), toJson(g3, "/TestCase12GraphVL3.json"));
}

@Test
public void testMetadata() {

// Optimize SVG by avoiding duplication
getLayoutParameters().setAvoidSVGComponentsDuplication(true);
Expand All @@ -254,14 +280,8 @@ public void test() {
}

@Test
public void testNodesInfos() {
Load load = network.getLoad("load1");
load.getTerminal().getBusView().getBus().setV(392);
load.getTerminal().getBusView().getBus().setAngle(-2.3);

Generator generator = network.getGenerator("gen1");
generator.getTerminal().getBusView().getBus().setV(403);
generator.getTerminal().getBusView().getBus().setAngle(-1.7);
public void testNodesInfosNominalVoltageStyle() {
separateBusVoltages();

getLayoutParameters()
.setAdaptCellHeightToContent(true)
Expand All @@ -274,21 +294,35 @@ public void testNodesInfos() {
new PositionVoltageLevelLayout(g1).run(getLayoutParameters());

DiagramStyleProvider vNomStyleProvider = new NominalVoltageDiagramStyleProvider(network);
DiagramStyleProvider topoStyleProvider = new TopologicalStyleProvider(network);

ComponentLibrary componentLibrary = new ResourcesComponentLibrary("/ConvergenceLibrary");
DefaultDiagramLabelProvider initProvider = new DefaultDiagramLabelProvider(network, componentLibrary, getLayoutParameters());

// write SVGs and compare to reference
assertEquals(toString("/TestCase12GraphWithNodesInfosNominalVoltage.svg"),
toSVG(g1, "/TestCase12GraphWithNodesInfosNominalVoltage.svg", getLayoutParameters(), initProvider, vNomStyleProvider));
toSVG(g1, "/TestCase12GraphWithNodesInfosNominalVoltage.svg", getLayoutParameters(), initProvider, vNomStyleProvider));
}

@Test
public void testNodesInfosTopologicalStyle() {
separateBusVoltages();

g1 = graphBuilder.buildVoltageLevelGraph(vl1.getId(), false, true);
getLayoutParameters()
.setAdaptCellHeightToContent(true)
.setAddNodesInfos(true);

Graph g1 = graphBuilder.buildVoltageLevelGraph(vl1.getId(), false, true);
new ImplicitCellDetector().detectCells(g1);
new BlockOrganizer().organize(g1);
new PositionVoltageLevelLayout(g1).run(getLayoutParameters());

DiagramStyleProvider topoStyleProvider = new TopologicalStyleProvider(network);

ComponentLibrary componentLibrary = new ResourcesComponentLibrary("/ConvergenceLibrary");
DefaultDiagramLabelProvider initProvider = new DefaultDiagramLabelProvider(network, componentLibrary, getLayoutParameters());

assertEquals(toString("/TestCase12GraphWithNodesInfosTopological.svg"),
toSVG(g1, "/TestCase12GraphWithNodesInfosTopological.svg", getLayoutParameters(), initProvider, topoStyleProvider));
}

}
14 changes: 9 additions & 5 deletions single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestNodeDecorators.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
public class TestNodeDecorators extends AbstractTestCaseIidm {

private LayoutParameters layoutParameters;
private Graph graph;

@Override
public LayoutParameters getLayoutParameters() {
Expand All @@ -45,18 +46,21 @@ public void setUp() {
// Layout parameters :
layoutParameters = createDefaultLayoutParameters()
.setCellWidth(80);

graph = TestSVGWriter.createVoltageLevelGraph1();
}

@Test
public void test() {

Graph graph = TestSVGWriter.createVoltageLevelGraph1();

public void testSvg() {
TestDiagramLabelProvider nodeDecoratorLabelProvider = new TestDiagramLabelProvider();
assertEquals(toString("/vl1_decorated.svg"), toSVG(graph, "/vl1_decorated.svg", getLayoutParameters(),
nodeDecoratorLabelProvider, new DefaultDiagramStyleProvider()));
}

// Same tests than before, with optimized svg :
@Test
public void testSvgWithClones() {
// Same tests than above, with optimized svg :
TestDiagramLabelProvider nodeDecoratorLabelProvider = new TestDiagramLabelProvider();
getLayoutParameters().setAvoidSVGComponentsDuplication(true);
assertEquals(toString("/vl1_decorated_opt.svg"), toSVG(graph, "/vl1_decorated_opt.svg", getLayoutParameters(),
nodeDecoratorLabelProvider, new DefaultDiagramStyleProvider()));
Expand Down
115 changes: 72 additions & 43 deletions single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestSVGWriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
import org.junit.Test;

import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.Map;

import static org.junit.Assert.assertEquals;

Expand Down Expand Up @@ -700,69 +698,100 @@ public InitialValue getInitialValue(Node node) {
}

@Test
public void test() {

DiagramStyleProvider styleProvider = new DefaultDiagramStyleProvider();
public void testVl1() {
assertEquals(toString("/vl1.svg"),
toSVG(g1, "/vl1.svg", getLayoutParameters(), initValueProvider, new DefaultDiagramStyleProvider()));
}

Map<String, Graph> mapGr = new LinkedHashMap<>();
mapGr.put("/vl1.svg", g1);
mapGr.put("/vl2.svg", g2);
mapGr.put("/vl3.svg", g3);
@Test
public void testVl2() {
assertEquals(toString("/vl2.svg"),
toSVG(g2, "/vl2.svg", getLayoutParameters(), initValueProvider, new DefaultDiagramStyleProvider()));
}

for (String filename : mapGr.keySet()) {
// SVG file generation first voltage level and comparison to reference :
assertEquals(toString(filename), toSVG(mapGr.get(filename), filename, layoutParameters, initValueProvider, styleProvider));
}
@Test
public void testVl3() {
assertEquals(toString("/vl3.svg"),
toSVG(g3, "/vl3.svg", getLayoutParameters(), initValueProvider, new DefaultDiagramStyleProvider()));
}

@Test
public void testSubstation() {
// SVG file generation for substation and comparison to reference
assertEquals(toString("/substation.svg"), toSVG(substG, "/substation.svg", layoutParameters, initValueProvider, styleProvider));
assertEquals(toString("/substation.svg"),
toSVG(substG, "/substation.svg", getLayoutParameters(), initValueProvider, new DefaultDiagramStyleProvider()));
}

@Test
public void testSubstationArrowSymmetry() {
// SVG file generation for substation with symmetric feeder arrow and comparison to reference
createSubstationGraph();
getLayoutParameters().setFeederArrowSymmetry(true);
assertEquals(toString("/substation_feeder_arrow_symmetry.svg"),
toSVG(substG, "/substation_feeder_arrow_symmetry.svg", new LayoutParameters(layoutParameters).setFeederArrowSymmetry(true), initValueProvider, styleProvider));
toSVG(substG, "/substation_feeder_arrow_symmetry.svg", getLayoutParameters(), initValueProvider, new DefaultDiagramStyleProvider()));
}

@Test
public void testSubstationNoFeederValues() {
// SVG file generation for substation and comparison to reference but with no feeder values
createSubstationGraph();
assertEquals(toString("/substation_no_feeder_values.svg"), toSVG(substG, "/substation_no_feeder_values.svg", layoutParameters, noFeederValueProvider, styleProvider));
assertEquals(toString("/substation_no_feeder_values.svg"),
toSVG(substG, "/substation_no_feeder_values.svg", getLayoutParameters(), noFeederValueProvider, new DefaultDiagramStyleProvider()));
}

// Same tests than before, with optimized svg :
//
layoutParameters.setAvoidSVGComponentsDuplication(true);
@Test
public void testVl1Optimized() {
// Same tests than before, with optimized svg
getLayoutParameters().setAvoidSVGComponentsDuplication(true);
assertEquals(toString("/vl1_optimized.svg"),
toSVG(g1, "/vl1_optimized.svg", getLayoutParameters(), initValueProvider, new DefaultDiagramStyleProvider()));
}

mapGr.clear();
mapGr.put("/vl1_optimized.svg", g1);
mapGr.put("/vl2_optimized.svg", g2);
mapGr.put("/vl3_optimized.svg", g3);
@Test
public void testVl2Optimized() {
// Same tests than before, with optimized svg
getLayoutParameters().setAvoidSVGComponentsDuplication(true);
assertEquals(toString("/vl2_optimized.svg"),
toSVG(g2, "/vl2_optimized.svg", getLayoutParameters(), initValueProvider, new DefaultDiagramStyleProvider()));
}

for (String filename : mapGr.keySet()) {
// SVG file generation first voltage level and comparison to reference :
assertEquals(toString(filename), toSVG(mapGr.get(filename), filename, layoutParameters, initValueProvider, styleProvider));
}
@Test
public void testVl3Optimized() {
// Same tests than before, with optimized svg
getLayoutParameters().setAvoidSVGComponentsDuplication(true);
assertEquals(toString("/vl3_optimized.svg"),
toSVG(g3, "/vl3_optimized.svg", getLayoutParameters(), initValueProvider, new DefaultDiagramStyleProvider()));
}

// SVG file generation for substation and comparison to reference
createSubstationGraph();
assertEquals(toString("/substation_optimized.svg"), toSVG(substG, "/substation_optimized.svg", layoutParameters, initValueProvider, styleProvider));
@Test
public void testSubstationOptimized() {
// Same tests than before, with optimized svg
getLayoutParameters().setAvoidSVGComponentsDuplication(true);
assertEquals(toString("/substation_optimized.svg"),
toSVG(substG, "/substation_optimized.svg", getLayoutParameters(), initValueProvider, new DefaultDiagramStyleProvider()));
}

@Test
public void testWriteZone() {
getLayoutParameters().setShowGrid(false);
assertEquals(toString("/zone.svg"),
toSVG(zGraph, "/zone.svg", getLayoutParameters(), initValueProvider, new DefaultDiagramStyleProvider()));
}

@Test
public void testStraightWires() {
DiagramStyleProvider styleProvider = new DefaultDiagramStyleProvider();
layoutParameters.setShowGrid(false);
assertEquals(toString("/zone.svg"), toSVG(zGraph, "/zone.svg", layoutParameters, initValueProvider, styleProvider));
getLayoutParameters().setDrawStraightWires(true);
assertEquals(toString("/vl1_straightWires.svg"),
toSVG(g1, "/vl1_straightWires.svg", getLayoutParameters(), initValueProvider, styleProvider));
}

@Test
public void testLayoutParameters() {
public void testTooltip() {
DiagramStyleProvider styleProvider = new DefaultDiagramStyleProvider();
layoutParameters.setDrawStraightWires(true);
layoutParameters.setTooltipEnabled(true);
assertEquals(toString("/vl1_lpChanged.svg"),
toSVG(g1, "/vl1_lpChanged.svg", layoutParameters, initValueProvider, styleProvider));

layoutParameters.setAvoidSVGComponentsDuplication(true);
assertEquals(toString("/vl1_lpChanged_opt.svg"),
toSVG(g1, "/vl1_lpChanged_opt.svg", layoutParameters, initValueProvider, styleProvider));
getLayoutParameters()
.setTooltipEnabled(true)
.setAvoidSVGComponentsDuplication(true);
assertEquals(toString("/vl1_tooltip_opt.svg"),
toSVG(g1, "/vl1_tooltip_opt.svg", getLayoutParameters(), initValueProvider, styleProvider));
}

}

0 comments on commit 0e59963

Please sign in to comment.