diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTestBase.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTestConstants.java similarity index 97% rename from smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTestBase.java rename to smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTestConstants.java index d6dafebd104c633d7bbca1353f98d1442fe6234a..dcdc803ddeafe0900f67062042eab3bceb1b0f12 100644 --- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTestBase.java +++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTestConstants.java @@ -15,7 +15,7 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -public class SmlConnectorTestBase { +public class SmlConnectorTestConstants { protected static final ParticipantIdentifierType PARTICIPANT_ID = new ParticipantIdentifierType("sample:value", "sample:scheme"); protected static final DBDomain DEFAULT_DOMAIN; diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTestDomain.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTestDomain.java index 85b53fca2a1541b1e7dfa07b7bbe555543e40bfb..e807d73eb7d57ebb5e22d22f2f6b82361d81bff7 100644 --- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTestDomain.java +++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTestDomain.java @@ -34,6 +34,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; +import static eu.europa.ec.edelivery.smp.sml.SmlConnectorTestConstants.*; import static org.junit.Assert.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; @@ -48,7 +49,7 @@ import static org.mockito.Mockito.verify; ConversionTestConfig.class, PropertiesSingleDomainTestConfig.class}) @TestPropertySource(properties = { "bdmsl.integration.enabled=true"}) -public class SmlConnectorTestDomain extends SmlConnectorTestBase { +public class SmlConnectorTestDomain { @Rule public ExpectedException expectedExeption = ExpectedException.none(); @@ -66,6 +67,7 @@ public class SmlConnectorTestDomain extends SmlConnectorTestBase { @Test public void testRegisterDomainInDns() throws UnauthorizedFault, InternalErrorFault, BadRequestFault { //when + boolean result = smlConnector.registerDomain(DEFAULT_DOMAIN); //then diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTestParticipant.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTestParticipant.java index 9f76df43926fe1a30d35cf605439d5b96e4cb16b..83698b4df852cad92d40c7e72db0eddaf24b6097 100644 --- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTestParticipant.java +++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTestParticipant.java @@ -34,6 +34,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; +import static eu.europa.ec.edelivery.smp.sml.SmlConnectorTestConstants.*; import static org.junit.Assert.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; @@ -48,7 +49,7 @@ import static org.mockito.Mockito.verify; ConversionTestConfig.class, PropertiesSingleDomainTestConfig.class}) @TestPropertySource(properties = { "bdmsl.integration.enabled=true"}) -public class SmlConnectorTestParticipant extends SmlConnectorTestBase { +public class SmlConnectorTestParticipant { @Rule public ExpectedException expectedException = ExpectedException.none();