From 2cbfc8e7afd172f621980a0b5a5d65d93e53014c Mon Sep 17 00:00:00 2001 From: Tristan Chuine Date: Wed, 12 Jul 2023 11:22:26 +0200 Subject: [PATCH 1/4] Remove EqualsVerifier library used to cheat on coverage Signed-off-by: Tristan Chuine --- pom.xml | 11 ----------- .../server/Impacts/ElementImpactTest.java | 5 +---- .../server/ModificationControllerTest.java | 14 ++------------ .../server/service/EquipmentInfosServiceTests.java | 5 ----- .../server/service/ModificationRepositoryTest.java | 4 +--- 5 files changed, 4 insertions(+), 35 deletions(-) diff --git a/pom.xml b/pom.xml index a048bace8..ba7450902 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,6 @@ 1.0.5 3.9 0.0.2 - 3.7.1 1.16.2 org.gridsuite.modification.server 3.24.2 @@ -120,11 +119,6 @@ log4j2-mock ${log4j2-mock-version} - - nl.jqno.equalsverifier - equalsverifier - ${equalsverifier-version} - org.testcontainers elasticsearch @@ -281,11 +275,6 @@ test - - nl.jqno.equalsverifier - equalsverifier - test - org.springframework.cloud spring-cloud-stream diff --git a/src/test/java/org/gridsuite/modification/server/Impacts/ElementImpactTest.java b/src/test/java/org/gridsuite/modification/server/Impacts/ElementImpactTest.java index de8cbccf9..ca6306bc0 100644 --- a/src/test/java/org/gridsuite/modification/server/Impacts/ElementImpactTest.java +++ b/src/test/java/org/gridsuite/modification/server/Impacts/ElementImpactTest.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.powsybl.iidm.network.IdentifiableType; -import nl.jqno.equalsverifier.EqualsVerifier; import org.gridsuite.modification.server.dto.NetworkModificationResult; import org.gridsuite.modification.server.dto.NetworkModificationResult.ApplicationStatus; import org.gridsuite.modification.server.impacts.SimpleElementImpact; @@ -21,6 +20,7 @@ import java.util.HashSet; import java.util.List; import java.util.TreeSet; + import static org.gridsuite.modification.server.Impacts.TestImpactUtils.*; import static org.junit.Assert.assertEquals; @@ -33,9 +33,6 @@ public class ElementImpactTest { @Test public void testElementImpact() throws IOException { - EqualsVerifier.simple().forClass(NetworkModificationResult.class).verify(); - EqualsVerifier.simple().forClass(SimpleElementImpact.class).verify(); - SimpleElementImpact creationImpact = createCreationImpactType(IdentifiableType.LINE, "lineId", new TreeSet<>(List.of("s1", "s2"))); SimpleElementImpact modificationImpact = createModificationImpactType(IdentifiableType.LOAD, "loadId", new TreeSet<>(List.of("s3"))); SimpleElementImpact deletionImpact = createDeletionImpactType(IdentifiableType.GENERATOR, "generatorId", new TreeSet<>(List.of("s4"))); diff --git a/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java b/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java index 88b45cc68..654324837 100644 --- a/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java +++ b/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java @@ -19,14 +19,11 @@ import com.powsybl.network.store.client.NetworkStoreService; import com.powsybl.network.store.client.PreloadingStrategy; import com.powsybl.network.store.iidm.impl.NetworkFactoryImpl; -import nl.jqno.equalsverifier.EqualsVerifier; import org.apache.commons.lang3.tuple.Pair; import org.gridsuite.modification.server.Impacts.TestImpactUtils; import org.gridsuite.modification.server.dto.*; import org.gridsuite.modification.server.dto.LoadCreationInfos.LoadCreationInfosBuilder; -import org.gridsuite.modification.server.dto.catalog.AerialLineTypeInfos; import org.gridsuite.modification.server.dto.catalog.LineTypeInfos; -import org.gridsuite.modification.server.dto.catalog.UndergroundLineTypeInfos; import org.gridsuite.modification.server.elasticsearch.EquipmentInfosRepository; import org.gridsuite.modification.server.elasticsearch.EquipmentInfosService; import org.gridsuite.modification.server.elasticsearch.TombstonedEquipmentInfosRepository; @@ -59,12 +56,10 @@ import static org.gridsuite.modification.server.Impacts.TestImpactUtils.*; import static org.gridsuite.modification.server.NetworkModificationException.Type.*; -import static org.gridsuite.modification.server.utils.assertions.Assertions.assertThat; import static org.gridsuite.modification.server.utils.TestUtils.assertLogMessage; +import static org.gridsuite.modification.server.utils.assertions.Assertions.assertThat; import static org.junit.Assert.*; -import static org.mockito.ArgumentMatchers.argThat; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.ArgumentMatchers.nullable; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.when; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; @@ -1043,11 +1038,6 @@ public void testGetPositionAfterAndBefore() { @Test public void testGetLineTypesCatalog() throws Exception { - // Exclude Id for those unit tests because it's exluded in dto - EqualsVerifier.simple().forClass(LineTypeInfos.class).withIgnoredFields("id").verify(); - EqualsVerifier.simple().forClass(AerialLineTypeInfos.class).withIgnoredFields("id").verify(); - EqualsVerifier.simple().forClass(UndergroundLineTypeInfos.class).withIgnoredFields("id").verify(); - MvcResult mvcResult; String resultAsString; diff --git a/src/test/java/org/gridsuite/modification/server/service/EquipmentInfosServiceTests.java b/src/test/java/org/gridsuite/modification/server/service/EquipmentInfosServiceTests.java index ba84b2e4f..18905efa4 100644 --- a/src/test/java/org/gridsuite/modification/server/service/EquipmentInfosServiceTests.java +++ b/src/test/java/org/gridsuite/modification/server/service/EquipmentInfosServiceTests.java @@ -11,7 +11,6 @@ import com.powsybl.iidm.network.Network; import com.powsybl.network.store.iidm.impl.NetworkFactoryImpl; import com.powsybl.network.store.iidm.impl.NetworkImpl; -import nl.jqno.equalsverifier.EqualsVerifier; import org.gridsuite.modification.server.NetworkModificationException; import org.gridsuite.modification.server.dto.VoltageLevelInfos; import org.gridsuite.modification.server.dto.elasticsearch.EquipmentInfos; @@ -64,10 +63,6 @@ private boolean existEquipmentInfos(String equipmentId, UUID networkUuid, String @Test public void testAddDeleteEquipmentInfos() { - EqualsVerifier.simple().forClass(EquipmentInfos.class).verify(); - EqualsVerifier.simple().forClass(TombstonedEquipmentInfos.class).verify(); - EqualsVerifier.simple().forClass(VoltageLevelInfos.class).verify(); - EquipmentInfos equipmentInfos = EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id1").variantId(VARIANT_NAME_1).name("name1").type(IdentifiableType.LOAD.name()).voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl1").name("vl1").build())).build(); equipmentInfosService.addAllEquipmentInfos(List.of(equipmentInfos)); assertNotNull(equipmentInfosRepository.findAllByNetworkUuidAndVariantId(NETWORK_UUID, VARIANT_NAME_1).get(0)); diff --git a/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java b/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java index 1326b75cc..b60a13578 100644 --- a/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java +++ b/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java @@ -9,7 +9,6 @@ import com.powsybl.iidm.network.*; import com.powsybl.iidm.network.extensions.ConnectablePosition; import com.vladmihalcea.sql.SQLStatementCountValidator; -import nl.jqno.equalsverifier.EqualsVerifier; import org.gridsuite.modification.server.NetworkModificationException; import org.gridsuite.modification.server.dto.*; import org.gridsuite.modification.server.entities.ModificationEntity; @@ -37,8 +36,8 @@ import static org.gridsuite.modification.server.NetworkModificationException.Type.MODIFICATION_GROUP_NOT_FOUND; import static org.gridsuite.modification.server.NetworkModificationException.Type.MODIFICATION_NOT_FOUND; -import static org.gridsuite.modification.server.utils.assertions.Assertions.assertThat; import static org.gridsuite.modification.server.utils.TestUtils.assertRequestsCount; +import static org.gridsuite.modification.server.utils.assertions.Assertions.assertThat; import static org.junit.Assert.*; @@ -1053,7 +1052,6 @@ public void testDeleteVoltageLevelOnLine() { private void testModificationEmbedded(IAttributeModificationEmbeddable modification, T val) { assertEquals(val, modification.getValue()); assertEquals(OperationType.SET, modification.getOpType()); - EqualsVerifier.simple().forClass(modification.getClass()).verify(); } @Test From bd4b4d3f0cc29e331b141356a7a42d93b1c10512 Mon Sep 17 00:00:00 2001 From: Tristan Chuine Date: Wed, 5 Jul 2023 14:46:39 +0200 Subject: [PATCH 2/4] Now use common lombok configuration Signed-off-by: Tristan Chuine --- .mvn/lombok-config-copy.marker | 0 lombok.config | 12 ++++++++++++ pom.xml | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 .mvn/lombok-config-copy.marker create mode 100644 lombok.config diff --git a/.mvn/lombok-config-copy.marker b/.mvn/lombok-config-copy.marker new file mode 100644 index 000000000..e69de29bb diff --git a/lombok.config b/lombok.config new file mode 100644 index 000000000..eee0afb02 --- /dev/null +++ b/lombok.config @@ -0,0 +1,12 @@ +import target/configs/powsybl-build-tools.jar!powsybl-build-tools/lombok.config +config.stopbubbling = true + +# Privileging SLF4J for uncoupling code and logging library +lombok.log.apacheCommons.flagUsage = WARNING +lombok.log.flogger.flagUsage = WARNING +lombok.log.javaUtilLogging.flagUsage = WARNING +lombok.log.jbosslog.flagUsage = WARNING +lombok.log.log4j.flagUsage = WARNING +lombok.log.log4j2.flagUsage = WARNING +#lombok.log.slf4j.flagUsage = NONE +#lombok.log.xslf4j.flagUsage = NONE diff --git a/pom.xml b/pom.xml index ba7450902..b94962a47 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ com.powsybl powsybl-parent-ws - 11 + 12 From 18ed9feca13351c8c0021f4d26d253a83297c7e8 Mon Sep 17 00:00:00 2001 From: Tristan Chuine Date: Wed, 12 Jul 2023 14:54:47 +0200 Subject: [PATCH 3/4] forget it Signed-off-by: Tristan Chuine --- lombok.config | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lombok.config b/lombok.config index eee0afb02..75c1b4284 100644 --- a/lombok.config +++ b/lombok.config @@ -1,12 +1,2 @@ import target/configs/powsybl-build-tools.jar!powsybl-build-tools/lombok.config config.stopbubbling = true - -# Privileging SLF4J for uncoupling code and logging library -lombok.log.apacheCommons.flagUsage = WARNING -lombok.log.flogger.flagUsage = WARNING -lombok.log.javaUtilLogging.flagUsage = WARNING -lombok.log.jbosslog.flagUsage = WARNING -lombok.log.log4j.flagUsage = WARNING -lombok.log.log4j2.flagUsage = WARNING -#lombok.log.slf4j.flagUsage = NONE -#lombok.log.xslf4j.flagUsage = NONE From b963ef8207176cb0596d51a3d596768a78d07bc3 Mon Sep 17 00:00:00 2001 From: Tristan Chuine Date: Wed, 12 Jul 2023 15:01:25 +0200 Subject: [PATCH 4/4] not necessary ? Signed-off-by: Tristan Chuine --- lombok.config | 1 - 1 file changed, 1 deletion(-) diff --git a/lombok.config b/lombok.config index 75c1b4284..4fa82504b 100644 --- a/lombok.config +++ b/lombok.config @@ -1,2 +1 @@ import target/configs/powsybl-build-tools.jar!powsybl-build-tools/lombok.config -config.stopbubbling = true