diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/AliasesIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/AliasesIT.java index dbbed0c4..32d6a536 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/AliasesIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/AliasesIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractAliasesTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,19 +16,16 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class AliasesIT extends AbstractAliasesTest { - @Disabled("network merge not implemented") + @Override @Test public void mergeFailWhenAliasEqualsToAnAliasOfOtherNetwork() { // FIXME network merge not implemented - super.mergeFailWhenAliasEqualsToAnAliasOfOtherNetwork(); } - @Disabled("network merge not implemented") @Override @Test public void mergeFailWhenAliasEqualsToAnIdOfOtherNetwork() { // FIXME network merge not implemented - super.mergeFailWhenAliasEqualsToAnIdOfOtherNetwork(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/BatteryIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/BatteryIT.java index 9880e801..c729a495 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/BatteryIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/BatteryIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractBatteryTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,19 +16,16 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class BatteryIT extends AbstractBatteryTest { - @Disabled("exception message aren't homogenized with the powsybl-core") + @Test @Override public void testRemove() { // FIXME remove this test when exception msg are homogenized with the powsybl-core - super.testRemove(); } - @Disabled("primary key constraints violation on DB") @Override @Test public void testSetterGetterInMultiVariants() { //FIXME remove when we fix primary key constraints violation on DB - super.testSetterGetterInMultiVariants(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/BusBreakerIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/BusBreakerIT.java index f8f58bfc..6be60cd2 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/BusBreakerIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/BusBreakerIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractBusBreakerTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,11 +16,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class BusBreakerIT extends AbstractBusBreakerTest { - @Disabled("missing reason") + @Test @Override public void testDisconnectConnect() { // FIXME - super.testDisconnectConnect(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/CurrentLimitsIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/CurrentLimitsIT.java index 70c4ebeb..1fad9e5d 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/CurrentLimitsIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/CurrentLimitsIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractCurrentLimitsTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,51 +16,40 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class CurrentLimitsIT extends AbstractCurrentLimitsTest { - @Disabled("Bus.getV/setV not getting/updating correctly the V in all views") + @Override @Test public void test() { // FIXME delete this test when we fix Bus.getV/setV not getting/updating correctly the V in all views - super.test(); } - @Disabled("Bus.getV/setV not getting/updating correctly the V in all views") @Override @Test public void testForThreeWindingsTransformerLeg1() { // FIXME delete this test when we fix Bus.getV/setV not getting/updating correctly the V in all views - super.testForThreeWindingsTransformerLeg1(); } - @Disabled("Bus.getV/setV not getting/updating correctly the V in all views") @Override @Test public void testForThreeWindingsTransformerLeg2() { // FIXME delete this test when we fix Bus.getV/setV not getting/updating correctly the V in all views - super.testForThreeWindingsTransformerLeg2(); } - @Disabled("Bus.getV/setV not getting/updating correctly the V in all views") @Override @Test public void testForThreeWindingsTransformerLeg3() { // FIXME delete this test when we fix Bus.getV/setV not getting/updating correctly the V in all views - super.testForThreeWindingsTransformerLeg3(); } - @Disabled("Bus.getV/setV not getting/updating correctly the V in all views") @Override @Test public void testLimitWithoutTempLimit() { // FIXME delete this test when we fix Bus.getV/setV not getting/updating correctly the V in all views - super.testLimitWithoutTempLimit(); } - @Disabled("Bus.getV/setV not getting/updating correctly the V in all views") @Override @Test public void testSetterGetter() { // FIXME delete this test when we fix Bus.getV/setV not getting/updating correctly the V in all views - super.testSetterGetter(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/DanglingLineIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/DanglingLineIT.java index ed8487f4..2793ed52 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/DanglingLineIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/DanglingLineIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractDanglingLineTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,11 +16,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class DanglingLineIT extends AbstractDanglingLineTest { - @Disabled("primary key constraints violation on DB") + @Override @Test public void testSetterGetterInMultiVariants() { //FIXME remove when we fix primary key constraints violation on DB - super.testSetterGetterInMultiVariants(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/ExceptionIsThrownWhenRemoveVariantAndWorkingVariantIsNotSetIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/ExceptionIsThrownWhenRemoveVariantAndWorkingVariantIsNotSetIT.java index a3b3b0b1..9d77bb07 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/ExceptionIsThrownWhenRemoveVariantAndWorkingVariantIsNotSetIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/ExceptionIsThrownWhenRemoveVariantAndWorkingVariantIsNotSetIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractExceptionIsThrownWhenRemoveVariantAndWorkingVariantIsNotSetTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,11 +16,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class ExceptionIsThrownWhenRemoveVariantAndWorkingVariantIsNotSetIT extends AbstractExceptionIsThrownWhenRemoveVariantAndWorkingVariantIsNotSetTest { - @Disabled("multi-thread access isn't supported") + @Override @Test public void test() throws InterruptedException { // FIXME delete this test when multi-thread access is supported - super.test(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/GeneratorIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/GeneratorIT.java index 4b3109e5..81710e31 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/GeneratorIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/GeneratorIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractGeneratorTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,19 +16,16 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class GeneratorIT extends AbstractGeneratorTest { - @Disabled("exception message aren't homogenized with the powsybl-core") + @Override @Test public void testRemove() { // FIXME remove this test when exception msg are homogenized with the powsybl-core - super.testRemove(); } - @Disabled("primary key constraints violation on DB") @Override @Test public void testSetterGetterInMultiVariants() { //FIXME remove when we fix primary key constraints violation on DB - super.testSetterGetterInMultiVariants(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/GroundIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/GroundIT.java index 3f501648..98181744 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/GroundIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/GroundIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractGroundTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -21,11 +20,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class GroundIT extends AbstractGroundTest { - @Disabled("subnetworks aren't implemented") + @Override @Test public void testOnSubnetwork() { // FIXME remove this test when subnetworks are implemented - super.testOnSubnetwork(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/HvdcLineIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/HvdcLineIT.java index 849ab669..3f8ec257 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/HvdcLineIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/HvdcLineIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractHvdcLineTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,11 +16,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class HvdcLineIT extends AbstractHvdcLineTest { - @Disabled("primary key constraints violation on DB") + @Test @Override public void testSetterGetterInMultiVariants() { //FIXME remove when we fix primary key constraints violation on DB - super.testSetterGetterInMultiVariants(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/IdentifiableExtensionIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/IdentifiableExtensionIT.java index 139fb7e6..757404de 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/IdentifiableExtensionIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/IdentifiableExtensionIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractIdentifiableExtensionTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,11 +16,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class IdentifiableExtensionIT extends AbstractIdentifiableExtensionTest { - @Disabled("ZipLoadModelAdder isn't implemented") + @Test @Override public void test() { //FIXME remove this test when ZipLoadModelAdder is implemented - super.test(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/LccIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/LccIT.java index b7dc8d40..7b4d81de 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/LccIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/LccIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractLccTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,11 +16,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class LccIT extends AbstractLccTest { - @Disabled("waiting the release containing this PR: https://github.com/powsybl/powsybl-core/pull/3015") + @Override @Test public void testHvdcLineRemove() { // FIXME remove this test when we use the release containing this PR : https://github.com/powsybl/powsybl-core/pull/3015 - super.testHvdcLineRemove(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/LineIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/LineIT.java index 0ef75913..6ed94519 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/LineIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/LineIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractLineTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,35 +16,28 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class LineIT extends AbstractLineTest { - @Disabled("waiting the release containing this PR: https://github.com/powsybl/powsybl-core/pull/3022") + @Test @Override public void baseAcLineTests() { // FIXME remove this test when we use the release containing this PR : https://github.com/powsybl/powsybl-core/pull/3022 - super.baseAcLineTests(); } - @Disabled("exception message aren't homogenized with the powsybl-core") @Test @Override public void testRemoveAcLine() { // FIXME remove this test when exception msg are homogenized with the powsybl-core - super.testRemoveAcLine(); } - @Disabled("powsybl-network-store-server not use powsybl network store 1.18.0") @Test @Override public void testMove1NbNetwork() { // TODO : remove this function as soon as powsybl network store server will use powsybl network store 1.18.0 (it will correct this test) - super.testMove1NbNetwork(); } - @Disabled("powsybl-network-store-server not use powsybl network store 1.18.0") @Test @Override public void testMove2Nb() { // TODO : remove this function as soon as powsybl network store server will use powsybl network store 1.18.0 (it will correct this test) - super.testMove2Nb(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/LoadIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/LoadIT.java index a9e3eeab..b2a77e43 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/LoadIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/LoadIT.java @@ -11,7 +11,6 @@ import com.powsybl.iidm.network.tck.AbstractLoadTest; import com.powsybl.iidm.network.test.FictitiousSwitchFactory; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -22,12 +21,11 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class LoadIT extends AbstractLoadTest { - @Disabled("ZipLoadModelAdder isn't implemented") + @Override @Test public void testZipLoadModel() { //TODO remove this test when ZipLoadModelAdder is implemented - super.testZipLoadModel(); } @Override @@ -39,11 +37,9 @@ public void testExponentialLoadModel() { assertNull(voltageLevel.newLoad().newExponentialModel().setNp(0.0).setNq(0.0).add()); } - @Disabled("primary key constraints violation on DB") @Test @Override public void testSetterGetterInMultiVariants() { //FIXME remove when we fix primary key constraints violation on DB - super.testSetterGetterInMultiVariants(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/MainConnectedComponentWithSwitchIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/MainConnectedComponentWithSwitchIT.java index 684c62b4..7c3e9830 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/MainConnectedComponentWithSwitchIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/MainConnectedComponentWithSwitchIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractMainConnectedComponentWithSwitchTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,11 +16,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class MainConnectedComponentWithSwitchIT extends AbstractMainConnectedComponentWithSwitchTest { - @Disabled("losing the v of buses / use the right views") + @Test @Override public void test() { // FIXME remove this test when we stop losing the v of buses / use the right views - super.test(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/ManipulationsOnVariantsIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/ManipulationsOnVariantsIT.java index 9026a0f5..dd1b909b 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/ManipulationsOnVariantsIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/ManipulationsOnVariantsIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractManipulationsOnVariantsTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,7 +16,7 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class ManipulationsOnVariantsIT extends AbstractManipulationsOnVariantsTest { - @Disabled("we don't have the same cloneVariant implementation (see comment for details)") + @Test @Override /* we need to override this test because we don't have the same cloneVariant implementation : @@ -26,6 +25,5 @@ class ManipulationsOnVariantsIT extends AbstractManipulationsOnVariantsTest { * should we change this behavior ? */ public void baseTests() { //FIXME see comment - super.baseTests(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/MergeNetworkIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/MergeNetworkIT.java index 6723c7b7..69fc0896 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/MergeNetworkIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/MergeNetworkIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractMergeNetworkTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -19,243 +18,183 @@ class MergeNetworkIT extends AbstractMergeNetworkTest { /* FIXME remove all these tests when network merge is implemented */ - @Disabled("network merge is implemented") @Test @Override public void checkMergingDifferentFormat() { // FIXME - super.checkMergingDifferentFormat(); } - @Disabled("network merge is implemented") @Test @Override public void testMerge() { // FIXME - super.testMerge(); } - @Disabled("network merge is implemented") @Test @Override public void failMergeIfMultiVariants() { // FIXME - super.failMergeIfMultiVariants(); } - @Disabled("network merge is implemented") @Test @Override public void failMergeWithSameObj() { // FIXME - super.failMergeWithSameObj(); } - @Disabled("network merge is implemented") @Test @Override public void multipleDanglingLinesInMergedNetwork() { // FIXME - super.multipleDanglingLinesInMergedNetwork(); } - @Disabled("network merge is implemented") @Test @Override public void test() { // FIXME - super.test(); } - @Disabled("network merge is implemented") @Test @Override public void mergeThenCloneVariantBug() { // FIXME - super.mergeThenCloneVariantBug(); } - @Disabled("network merge is implemented") @Test @Override public void multipleDanglingLinesInMergingNetwork() { // FIXME - super.multipleDanglingLinesInMergingNetwork(); } - @Disabled("network merge is implemented") @Test @Override public void checkMergingSameFormat() { // FIXME - super.checkMergingSameFormat(); } - @Disabled("network merge is implemented") @Test @Override public void testMergeAndDetach() { // FIXME - super.testMergeAndDetach(); } - @Disabled("network merge is implemented") @Test @Override public void testMergeAndDetachWithExtensions() { // FIXME - super.testMergeAndDetachWithExtensions(); } - @Disabled("network merge is implemented") @Test @Override public void failDetachWithALineBetween2Subnetworks() { //FIXME - super.failDetachWithALineBetween2Subnetworks(); } - @Disabled("network merge is implemented") @Test @Override public void failDetachIfMultiVariants() { //FIXME - super.failDetachIfMultiVariants(); } - @Disabled("network merge is implemented") @Test @Override public void testMerge3Networks() { // FIXME - super.testMerge3Networks(); } - @Disabled("network merge is implemented") @Test @Override public void failMergeDanglingLinesWithSameId() { // FIXME - super.failMergeDanglingLinesWithSameId(); } - @Disabled("network merge is implemented") @Test @Override public void testValidationLevelWhenMerging2Eq() { // FIXME - super.testValidationLevelWhenMerging2Eq(); } - @Disabled("network merge is implemented") @Test @Override public void testValidationLevelWhenMergingEqAndSsh() { // FIXME - super.testValidationLevelWhenMergingEqAndSsh(); } - @Disabled("network merge is implemented") @Test @Override public void testValidationLevelWhenMerging2Ssh() { // FIXME - super.testValidationLevelWhenMerging2Ssh(); } - @Disabled("network merge is implemented") @Test @Override public void failMergeOnlyOneNetwork() { // FIXME - super.failMergeOnlyOneNetwork(); } - @Disabled("network merge is implemented") @Test @Override public void failMergeOnSubnetworks() { // FIXME - super.failMergeOnSubnetworks(); } - @Disabled("network merge is implemented") @Test @Override public void failMergeSubnetworks() { // FIXME - super.failMergeSubnetworks(); } - @Disabled("network merge is implemented") @Test @Override public void failMergeContainingSubnetworks() { // FIXME - super.failMergeContainingSubnetworks(); } - @Disabled("network merge is implemented") @Test @Override public void testNoEmptyAdditionalSubnetworkIsCreated() { // FIXME - super.testNoEmptyAdditionalSubnetworkIsCreated(); } - @Disabled("network merge is implemented") @Test @Override public void testListeners() { // FIXME - super.testListeners(); } - @Disabled("network merge is implemented") @Test @Override public void dontCreateATieLineWithAlreadyMergedDanglingLinesInMergedNetwork() { // FIXME - super.dontCreateATieLineWithAlreadyMergedDanglingLinesInMergedNetwork(); } - @Disabled("network merge is implemented") @Test @Override public void dontCreateATieLineWithAlreadyMergedDanglingLinesInMergingNetwork() { // FIXME - super.dontCreateATieLineWithAlreadyMergedDanglingLinesInMergingNetwork(); } - @Disabled("network merge is implemented") @Test @Override public void multipleConnectedDanglingLinesInMergedNetwork() { // FIXME - super.multipleConnectedDanglingLinesInMergedNetwork(); } - @Disabled("network merge is implemented") @Test @Override public void multipleConnectedDanglingLinesWithSamePairingKey() { // FIXME - super.multipleConnectedDanglingLinesWithSamePairingKey(); } - @Disabled("network merge is implemented") @Test @Override public void invertDanglingLinesWhenCreatingATieLine() { // FIXME - super.invertDanglingLinesWhenCreatingATieLine(); } - @Disabled("network merge is implemented") @Test @Override public void testMergeAndDetachWithProperties() { // FIXME - super.testMergeAndDetachWithProperties(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/MultiVariantNetworkIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/MultiVariantNetworkIT.java index 217d7656..d57ed563 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/MultiVariantNetworkIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/MultiVariantNetworkIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractMultiVariantNetworkTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,35 +16,28 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class MultiVariantNetworkIT extends AbstractMultiVariantNetworkTest { - @Disabled("multi-thread access isn't supported") + @Test @Override public void multiThreadTest() throws InterruptedException { // FIXME delete this test when multi-thread access is supported - super.multiThreadTest(); } - @Disabled("multi-thread access isn't supported") @Test @Override public void multiVariantTopologyTest() { // FIXME delete this test when multi-thread access is supported - super.multiVariantTopologyTest(); } - @Disabled("multi-thread access isn't supported") @Test @Override public void variantNotSetTest() throws InterruptedException { // FIXME delete this test when multi-thread access is supported - super.variantNotSetTest(); } - @Disabled("multi-thread access isn't supported") @Test @Override public void variantSetTest() throws InterruptedException { // FIXME delete this test when multi-thread access is supported - super.variantSetTest(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/NetworkIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/NetworkIT.java index 8431699b..e08b0258 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/NetworkIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/NetworkIT.java @@ -12,7 +12,6 @@ import com.powsybl.iidm.network.test.NetworkTest1Factory; import com.powsybl.iidm.network.util.Networks; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -29,28 +28,23 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class NetworkIT extends AbstractNetworkTest { - @Disabled("using the \"Default\" NetworkFactory in the base class") + @Test @Override public void testWith() { // FIXME remove this when we fix the fact that we use the "Default" NetworkFactory in the base class - super.testWith(); } - @Disabled("Unsupported operation: Validation level below STEADY_STATE_HYPOTHESIS not supported") @Test @Override public void testScadaNetwork() { // FIXME test throws UnsupportedOperationException: Validation level below STEADY_STATE_HYPOTHESIS not supported - super.testScadaNetwork(); } - @Disabled("waiting the release containing this PR: https://github.com/powsybl/powsybl-core/pull/3020") @Test @Override public void testStreams() { // FIXME remove this test when we use the release containing this PR : https://github.com/powsybl/powsybl-core/pull/3020 - super.testStreams(); } // see FIXME-Override below @@ -210,27 +204,21 @@ public void testNetwork1() { */ } - @Disabled("missing validation on CurrentLimitAdder") @Test @Override public void testPermanentLimitViaAdder() { // FIXME remove this test when we add validation on CurrentLimitAdder - super.testPermanentLimitViaAdder(); } - @Disabled("missing validation on CurrentLimitAdder") @Test @Override public void testPermanentLimitOnUnselectedOperationalLimitsGroup() { // FIXME remove this test when we add validation on CurrentLimitAdder - super.testPermanentLimitOnUnselectedOperationalLimitsGroup(); } - @Disabled("missing validation on CurrentLimitAdder") @Test @Override public void testPermanentLimitOnSelectedOperationalLimitsGroup() { // FIXME remove this test when we add validation on CurrentLimitAdder - super.testPermanentLimitOnSelectedOperationalLimitsGroup(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/NullPointerWhenRemovingMergedLineBugIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/NullPointerWhenRemovingMergedLineBugIT.java index 7d40e3d9..0cdf46cb 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/NullPointerWhenRemovingMergedLineBugIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/NullPointerWhenRemovingMergedLineBugIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractNullPointerWhenRemovingMergedLineBugTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,11 +16,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class NullPointerWhenRemovingMergedLineBugIT extends AbstractNullPointerWhenRemovingMergedLineBugTest { - @Disabled("network merge isn't implemented") + @Override @Test public void test() { // FIXME remove this test when network merge is implemented - super.test(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/ShuntCompensatorIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/ShuntCompensatorIT.java index 18b48970..fa16f7c4 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/ShuntCompensatorIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/ShuntCompensatorIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractShuntCompensatorTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,14 +16,13 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class ShuntCompensatorIT extends AbstractShuntCompensatorTest { - @Disabled("primary key constraints violation on DB") + @Test @Override public void testSetterGetterInMultiVariants() { //FIXME remove when we fix primary key constraints violation on DB } - @Disabled("waiting the release containing this PR: https://github.com/powsybl/powsybl-core/pull/2847") @Override @Test public void baseLinearShuntTest() { diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/StaticVarCompensatorIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/StaticVarCompensatorIT.java index be347924..65eeef9b 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/StaticVarCompensatorIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/StaticVarCompensatorIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractStaticVarCompensatorTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,19 +16,16 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class StaticVarCompensatorIT extends AbstractStaticVarCompensatorTest { - @Disabled("regulating terminal isn't moved when the equipment regulated is deleted") + @Override @Test public void regulatingTerminalTest() { // FIXME delete this test when the regulating terminal is moved when the equipment regulated is deleted - super.regulatingTerminalTest(); } - @Disabled("primary key constraints violation on DB") @Override @Test public void testSetterGetterInMultiVariants() { //FIXME remove when we fix primary key constraints violation on DB - super.testSetterGetterInMultiVariants(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/SubstationIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/SubstationIT.java index 3514ad6e..c4c12a14 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/SubstationIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/SubstationIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractSubstationTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,11 +16,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class SubstationIT extends AbstractSubstationTest { - @Disabled("exception message aren't homogenized") + @Test @Override public void baseTests() { // FIXME remove this test when exception msg are homogenized with the powsybl-core - super.baseTests(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/SwitchSetRetainedIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/SwitchSetRetainedIT.java index 311aff0d..e5b14a5e 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/SwitchSetRetainedIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/SwitchSetRetainedIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractSwitchSetRetainedTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,7 +16,7 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class SwitchSetRetainedIT extends AbstractSwitchSetRetainedTest { - @Disabled("network-store not support multi-thread access") + @Test @Override public void test() { diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/TapChangerIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/TapChangerIT.java index f2747967..823fd2bc 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/TapChangerIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/TapChangerIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractTapChangerTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,35 +16,28 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class TapChangerIT extends AbstractTapChangerTest { - @Disabled("TapChanger.getNeutralPosition and getNeutralStep aren't implemented") + @Override @Test public void baseTestsRatioTapChanger() { // TODO remove this test when TapChanger.getNeutralPosition and getNeutralStep are implemented - super.baseTestsRatioTapChanger(); } - @Disabled("TapChanger.getNeutralPosition and getNeutralStep aren't implemented") @Override @Test public void baseTestsPhaseTapChanger() { // TODO remove this test when TapChanger.getNeutralPosition and getNeutralStep are implemented - super.baseTestsPhaseTapChanger(); } - @Disabled("TapChanger.getNeutralPosition and getNeutralStep aren't implemented") @Override @Test public void undefinedRegulationValueOnlyWarning() { // TODO remove this test when TapChanger.getNeutralPosition and getNeutralStep are implemented - super.undefinedRegulationValueOnlyWarning(); } - @Disabled("primary key constraints violation on DB") @Test @Override public void testTapChangerSetterGetterInMultiVariants() { //FIXME remove when we fix primary key constraints violation on DB - super.testTapChangerSetterGetterInMultiVariants(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/TerminalFinderIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/TerminalFinderIT.java index 07755e54..6adff186 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/TerminalFinderIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/TerminalFinderIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractTerminalFinderTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,19 +16,16 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class TerminalFinderIT extends AbstractTerminalFinderTest { - @Disabled("order differences on getConnectedTerminals") + @Override @Test public void testLineTerminal1() { // FIXME remove this when we fix order differences on getConnectedTerminals - super.testLineTerminal1(); } - @Disabled("order differences on getConnectedTerminals") @Override @Test public void testLineTerminal2() { // FIXME remove this when we fix order differences on getConnectedTerminals - super.testLineTerminal2(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/ThreeWindingsTransformerIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/ThreeWindingsTransformerIT.java index 540f5126..6e084a46 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/ThreeWindingsTransformerIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/ThreeWindingsTransformerIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractThreeWindingsTransformerTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,11 +16,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class ThreeWindingsTransformerIT extends AbstractThreeWindingsTransformerTest { - @Disabled("waiting the release containing this PR: https://github.com/powsybl/powsybl-core/pull/3019") + @Override @Test public void baseTests() { // FIXME : remove this test when we use the release containing this PR : https://github.com/powsybl/powsybl-core/pull/3019 - super.baseTests(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/TwoWindingsTransformerIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/TwoWindingsTransformerIT.java index 6ccccea6..b1ab10ab 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/TwoWindingsTransformerIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/TwoWindingsTransformerIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractTwoWindingsTransformerTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,11 +16,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class TwoWindingsTransformerIT extends AbstractTwoWindingsTransformerTest { - @Disabled("waiting the release containing this PR: https://github.com/powsybl/powsybl-core/pull/3019") + @Test @Override public void baseTests() { // FIXME : remove this test when we use the release containing this PR : https://github.com/powsybl/powsybl-core/pull/3019 - super.baseTests(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/VoltageLevelExportIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/VoltageLevelExportIT.java index 11a1a27f..95d00c25 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/VoltageLevelExportIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/VoltageLevelExportIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractVoltageLevelExportTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -19,19 +18,16 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class VoltageLevelExportIT extends AbstractVoltageLevelExportTest { - @Disabled("VoltageLevelImpl.exportTopology isn't implemented") + @Test @Override public void nodeBreakerTest() throws IOException { // FIXME remove this test when VoltageLevelImpl.exportTopology is implemented - super.nodeBreakerTest(); } - @Disabled("VoltageLevelImpl.exportTopology isn't implemented") @Test @Override public void busBreakerTest() throws IOException { // FIXME remove this test when VoltageLevelImpl.exportTopology is implemented - super.busBreakerTest(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/VoltageLevelIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/VoltageLevelIT.java index 757613e7..3c3c761d 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/VoltageLevelIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/VoltageLevelIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractVoltageLevelTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,11 +16,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class VoltageLevelIT extends AbstractVoltageLevelTest { - @Disabled("exception message aren't homogenized with the powsybl-core") + @Test @Override public void baseTests() { // FIXME remove this test when exception msg are homogenized with the powsybl-core - super.baseTests(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/VscIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/VscIT.java index e809cd2a..f113a21c 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/VscIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/VscIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.AbstractVscTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,11 +16,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class VscIT extends AbstractVscTest { - @Disabled("fix primary key constraints violation on DB") + @Test @Override public void testSetterGetterInMultiVariants() { //FIXME remove when we fix primary key constraints violation on DB - super.testSetterGetterInMultiVariants(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/ActivePowerControlIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/ActivePowerControlIT.java index f7718d3c..779fe716 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/ActivePowerControlIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/ActivePowerControlIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.extensions.AbstractActivePowerControlTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,11 +16,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class ActivePowerControlIT extends AbstractActivePowerControlTest { - @Disabled("primary key constraints violation on DB") + @Override @Test public void variantsCloneTest() { //FIXME remove when we fix primary key constraints violation on DB - super.variantsCloneTest(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/CoordinatedReactivePowerControlIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/CoordinatedReactivePowerControlIT.java index 876052b2..01747747 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/CoordinatedReactivePowerControlIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/CoordinatedReactivePowerControlIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.extensions.AbstractCoordinatedReactiveControlTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,11 +16,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class CoordinatedReactivePowerControlIT extends AbstractCoordinatedReactiveControlTest { - @Disabled("primary key constraints violation on DB") + @Test @Override public void variantsCloneTest() { //FIXME remove when we fix primary key constraints violation on DB - super.variantsCloneTest(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/HvdcAngleDroopActivePowerIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/HvdcAngleDroopActivePowerIT.java index ebeb3013..fcf061a0 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/HvdcAngleDroopActivePowerIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/HvdcAngleDroopActivePowerIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.extensions.AbstractHvdcAngleDroopActivePowerTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,11 +16,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class HvdcAngleDroopActivePowerIT extends AbstractHvdcAngleDroopActivePowerTest { - @Disabled("primary key constraints violation on DB") + @Test @Override public void variantsCloneTest() { //FIXME remove when we fix primary key constraints violation on DB - super.variantsCloneTest(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/HvdcOperatorActivePowerRangeIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/HvdcOperatorActivePowerRangeIT.java index 09ed9440..08cc0cfe 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/HvdcOperatorActivePowerRangeIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/HvdcOperatorActivePowerRangeIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.extensions.AbstractHvdcOperatorActivePowerRangeTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,11 +16,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class HvdcOperatorActivePowerRangeIT extends AbstractHvdcOperatorActivePowerRangeTest { - @Disabled("primary key constraints violation on DB") + @Override @Test public void variantsCloneTest() { //FIXME remove when we fix primary key constraints violation on DB - super.variantsCloneTest(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/LoadDetailIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/LoadDetailIT.java index 9d0cbbc9..4412dd5b 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/LoadDetailIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/LoadDetailIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.extensions.AbstractLoadDetailTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,11 +16,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class LoadDetailIT extends AbstractLoadDetailTest { - @Disabled("primary key constraints violation on DB") + @Override @Test public void variantsCloneTest() { //FIXME remove when we fix primary key constraints violation on DB - super.variantsCloneTest(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/RemoveReactivePowerControlIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/RemoveReactivePowerControlIT.java index 62101654..fd58345f 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/RemoveReactivePowerControlIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/RemoveReactivePowerControlIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.extensions.AbstractRemoteReactivePowerControlTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,11 +16,10 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class RemoveReactivePowerControlIT extends AbstractRemoteReactivePowerControlTest { - @Disabled("primary key constraints violation on DB") + @Test @Override public void variantsCloneTest() { //FIXME remove when we fix primary key constraints violation on DB - super.variantsCloneTest(); } } diff --git a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/SlackTerminalIT.java b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/SlackTerminalIT.java index 4ed5e961..b346bc41 100644 --- a/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/SlackTerminalIT.java +++ b/network-store-iidm-tck/src/test/java/com/powsybl/network/store/tck/extensions/SlackTerminalIT.java @@ -8,7 +8,6 @@ import com.powsybl.iidm.network.tck.extensions.AbstractSlackTerminalTest; import com.powsybl.network.store.server.NetworkStoreApplication; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; @@ -17,19 +16,16 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, properties = {"spring.config.location=classpath:application.yaml"}) @ContextHierarchy({@ContextConfiguration(classes = {NetworkStoreApplication.class})}) class SlackTerminalIT extends AbstractSlackTerminalTest { - @Disabled("primary key constraints violation on DB") + @Override @Test public void variantsResetTest() { //FIXME remove when we fix primary key constraints violation on DB - super.variantsResetTest(); } - @Disabled("primary key constraints violation on DB") @Override @Test public void variantsCloneTest() { //FIXME remove when we fix primary key constraints violation on DB - super.variantsCloneTest(); } }