From 725d8fc8abdacbbe4a30f44fd3c10106dab7aac0 Mon Sep 17 00:00:00 2001
From: Mathieu BAGUE <mathieu.bague@rte-france.com>
Date: Mon, 31 May 2021 23:03:11 +0200
Subject: [PATCH] Small fixes

Signed-off-by: Mathieu BAGUE <mathieu.bague@rte-france.com>
---
 src/iidm/converter/xml/TerminalRefXml.cpp | 6 +++---
 test/iidm/NodeBreakerVoltageLevelTest.cpp | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/iidm/converter/xml/TerminalRefXml.cpp b/src/iidm/converter/xml/TerminalRefXml.cpp
index 3a7ecad2..1b149dac 100644
--- a/src/iidm/converter/xml/TerminalRefXml.cpp
+++ b/src/iidm/converter/xml/TerminalRefXml.cpp
@@ -59,9 +59,9 @@ void TerminalRefXml::writeTerminalRef(const Terminal& terminal, NetworkXmlWriter
     if (!context.getFilter().test(c)) {
         throw PowsyblException(stdcxx::format("Oups, terminal ref point to a filtered equipment %1%", c.get().getId()));
     }
-    if (terminal.getVoltageLevel().getTopologyKind() == TopologyKind::NODE_BREAKER
-        && context.getOptions().getTopologyLevel() != TopologyLevel::NODE_BREAKER
-        && stdcxx::isInstanceOf<BusbarSection>(terminal.getConnectable())) {
+    if (terminal.getVoltageLevel().getTopologyKind() == TopologyKind::NODE_BREAKER &&
+            context.getOptions().getTopologyLevel() != TopologyLevel::NODE_BREAKER &&
+            stdcxx::isInstanceOf<BusbarSection>(terminal.getConnectable())) {
         throw PowsyblException(stdcxx::format("Terminal ref should not point to a busbar section (here %1%). Try to export in node-breaker or delete this terminal ref.", terminal.getConnectable().get().getId()));
     }
     writer.writeStartElement(nsPrefix, elementName);
diff --git a/test/iidm/NodeBreakerVoltageLevelTest.cpp b/test/iidm/NodeBreakerVoltageLevelTest.cpp
index 2f9f1336..1f848dfe 100644
--- a/test/iidm/NodeBreakerVoltageLevelTest.cpp
+++ b/test/iidm/NodeBreakerVoltageLevelTest.cpp
@@ -1231,9 +1231,10 @@ BOOST_AUTO_TEST_CASE(NbkComprehensiveErrorMessage) {
     stdcxx::Properties properties;
     properties.set(converter::ExportOptions::TOPOLOGY_LEVEL, "NODE_BREAKER");
 
+    std::stringstream ss;
+
     // make sure no error is thrown while exporting to NODE_BREAKER topology
     BOOST_CHECK_NO_THROW({
-         std::stringstream ss;
          Network::writeXml("network.xiidm", ss, network, converter::ExportOptions(properties));
          Network::readXml("network.xiidm", ss);
     });