diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceGroupServiceTestService.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceGroupServiceIntegrationTest.java
similarity index 97%
rename from smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceGroupServiceTestService.java
rename to smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceGroupServiceIntegrationTest.java
index aa6d1454eeef87dacd2b19ee7851e30ef624d524..9f5628c02eb484180cd156146173fee435764988 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceGroupServiceTestService.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceGroupServiceIntegrationTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue;
* @author Joze Rihtarsic
* @since 4.1
*/
-public class ServiceGroupServiceTestService extends AbstractServiceIntegrationTest {
+public class ServiceGroupServiceIntegrationTest extends AbstractServiceIntegrationTest {
@Rule
public ExpectedException expectedExeption = ExpectedException.none();
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorDomainIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorDomainIntegrationTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..c669b798f2d71357b6a95a089b8b506d2f7946f2
--- /dev/null
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorDomainIntegrationTest.java
@@ -0,0 +1,192 @@
+
+/*
+ * Copyright 2018 European Commission | CEF eDelivery
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and limitations under the Licence.
+ */
+
+package eu.europa.ec.edelivery.smp.sml;
+
+ import eu.europa.ec.bdmsl.ws.soap.BadRequestFault;
+ import eu.europa.ec.bdmsl.ws.soap.InternalErrorFault;
+ import eu.europa.ec.bdmsl.ws.soap.NotFoundFault;
+ import eu.europa.ec.bdmsl.ws.soap.UnauthorizedFault;
+ import eu.europa.ec.edelivery.smp.config.ConversionTestConfig;
+ import eu.europa.ec.edelivery.smp.config.PropertiesSingleDomainTestConfig;
+ import eu.europa.ec.edelivery.smp.config.SmlIntegrationConfiguration;
+ import eu.europa.ec.edelivery.smp.exceptions.SMPRuntimeException;
+ import eu.europa.ec.edelivery.smp.services.SecurityUtilsServices;
+ import eu.europa.ec.edelivery.smp.services.ui.UIKeystoreService;
+ import org.junit.Before;
+ import org.junit.Rule;
+ import org.junit.Test;
+ import org.junit.rules.ExpectedException;
+ import org.junit.runner.RunWith;
+ import org.mockito.Mockito;
+ import org.springframework.beans.factory.annotation.Autowired;
+ 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;
+
+/**
+ * Created by JRC
+ * since 4.1.
+ */
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = {SmlConnector.class, SmlIntegrationConfiguration.class,
+ SecurityUtilsServices.class, UIKeystoreService.class,
+ ConversionTestConfig.class, PropertiesSingleDomainTestConfig.class})
+@TestPropertySource(properties = {
+ "bdmsl.integration.enabled=true"})
+public class SmlConnectorDomainIntegrationTest {
+
+ @Rule
+ public ExpectedException expectedExeption = ExpectedException.none();
+
+ @Autowired
+ protected SmlConnector smlConnector;
+ @Autowired
+ SmlIntegrationConfiguration mockSml;
+
+ @Before
+ public void setup() {
+ mockSml.reset();
+ }
+
+ @Test
+ public void testRegisterDomainInDns() throws UnauthorizedFault, InternalErrorFault, BadRequestFault {
+ //when
+
+ boolean result = smlConnector.registerDomain(DEFAULT_DOMAIN);
+
+ //then
+ assertTrue(result);
+ assertEquals(1, mockSml.getSmpManagerClientMocks().size());
+ verify(mockSml.getSmpManagerClientMocks().get(0)).create(any());
+ Mockito.verifyNoMoreInteractions(mockSml.getSmpManagerClientMocks().toArray());
+ }
+
+ @Test
+ public void testRegisterDomainInDnsAlreadyExists() throws UnauthorizedFault, InternalErrorFault, BadRequestFault {
+ //when
+ BadRequestFault ex = new BadRequestFault(ERROR_SMP_ALREADY_EXISTS);
+ mockSml.setThrowException(ex);
+ boolean result = smlConnector.registerDomain(DEFAULT_DOMAIN);
+
+ //then
+ assertTrue(result);
+ assertEquals(1, mockSml.getSmpManagerClientMocks().size());
+ verify(mockSml.getSmpManagerClientMocks().get(0)).create(any());
+ Mockito.verifyNoMoreInteractions(mockSml.getSmpManagerClientMocks().toArray());
+ }
+
+ @Test
+ public void testRegisterDomainInDnsUnknownException() {
+ //when
+ String message = "something unexpected";
+ Exception ex = new Exception(message);
+ mockSml.setThrowException(ex);
+ expectedExeption.expectMessage(message);
+ expectedExeption.expect(SMPRuntimeException.class);
+
+ smlConnector.registerDomain(DEFAULT_DOMAIN);
+ }
+
+ @Test
+ public void testRegisterDomainInDnsNewClientIsAlwaysCreated() throws UnauthorizedFault, NotFoundFault, InternalErrorFault, BadRequestFault {
+ //when
+ smlConnector.registerDomain(DEFAULT_DOMAIN);
+ smlConnector.registerDomain(DEFAULT_DOMAIN);
+
+ //then
+ assertEquals(2, mockSml.getSmpManagerClientMocks().size());
+ verify(mockSml.getSmpManagerClientMocks().get(0)).create(any());
+ verify(mockSml.getSmpManagerClientMocks().get(1)).create(any());
+ Mockito.verifyNoMoreInteractions(mockSml.getSmpManagerClientMocks().toArray());
+ }
+
+ @Test
+ public void testDomainUnregisterFromDns() throws UnauthorizedFault, NotFoundFault, InternalErrorFault, BadRequestFault {
+ //when
+ boolean result = smlConnector.unregisterDomain(DEFAULT_DOMAIN);
+
+ //then
+ assertTrue(result);
+ assertEquals(1, mockSml.getSmpManagerClientMocks().size());
+ verify(mockSml.getSmpManagerClientMocks().get(0)).delete(any());
+ Mockito.verifyNoMoreInteractions(mockSml.getSmpManagerClientMocks().toArray());
+ }
+
+ @Test
+ public void testUnregisterDomainFromDnsNewClientIsAlwaysCreated() throws UnauthorizedFault, NotFoundFault, InternalErrorFault, BadRequestFault {
+ //when
+ smlConnector.unregisterDomain(DEFAULT_DOMAIN);
+ smlConnector.unregisterDomain(DEFAULT_DOMAIN);
+
+ //then
+ assertEquals(2, mockSml.getSmpManagerClientMocks().size());
+ verify(mockSml.getSmpManagerClientMocks().get(0)).delete(any());
+ verify(mockSml.getSmpManagerClientMocks().get(1)).delete(any());
+ Mockito.verifyNoMoreInteractions(mockSml.getSmpManagerClientMocks().toArray());
+ }
+
+ @Test
+ public void testUnregisterDomainFromDnsThrowUnknownBadRequestFault() {
+ //when
+ BadRequestFault ex = new BadRequestFault(ERROR_UNEXPECTED_MESSAGE);
+ mockSml.setThrowException(ex);
+ expectedExeption.expectMessage(ERROR_UNEXPECTED_MESSAGE);
+ expectedExeption.expect(SMPRuntimeException.class);
+
+ smlConnector.unregisterDomain(DEFAULT_DOMAIN);
+ }
+
+ @Test
+ public void testUnregisterDomainFromDnsThrowUnknownException() {
+ //when
+ String message = "something unexpected";
+ Exception ex = new Exception(message);
+ mockSml.setThrowException(ex);
+ expectedExeption.expectMessage(message);
+ expectedExeption.expect(SMPRuntimeException.class);
+
+ smlConnector.unregisterDomain(DEFAULT_DOMAIN);
+ }
+
+ @Test
+ public void testUnregisterDomainFromDnsNotExists() {
+ //when
+ BadRequestFault ex = new BadRequestFault(ERROR_SMP_NOT_EXISTS);
+ mockSml.setThrowException(ex);
+ boolean suc = smlConnector.unregisterDomain(DEFAULT_DOMAIN);
+
+ assertTrue(suc);
+ }
+
+ @Test
+ public void testIsOkMessageForDomainNull() {
+ boolean suc = smlConnector.isOkMessage(DEFAULT_DOMAIN, null);
+
+ assertFalse(suc);
+ }
+
+ @Test
+ public void testIsOkMessageForDomainFalse() {
+
+ boolean suc = smlConnector.isOkMessage(DEFAULT_DOMAIN, ERROR_UNEXPECTED_MESSAGE);
+
+ assertFalse(suc);
+ }
+}
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorParticipantIntegrationTest.java
similarity index 99%
rename from smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTest.java
rename to smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorParticipantIntegrationTest.java
index cce08e605cabe1713a9f7834a4bb8a5a3c5899e1..131df18226088661c7f295f3738c4dcc4640be69 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorParticipantIntegrationTest.java
@@ -49,7 +49,7 @@ import static org.mockito.Mockito.verify;
ConversionTestConfig.class, PropertiesSingleDomainTestConfig.class})
@TestPropertySource(properties = {
"bdmsl.integration.enabled=true"})
-public class SmlConnectorTest {
+public class SmlConnectorParticipantIntegrationTest {
@Rule
public ExpectedException expectedException = ExpectedException.none();
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ServiceGroupControllerTestSingleDomain.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ServiceGroupControllerSingleDomainTest.java
similarity index 99%
rename from smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ServiceGroupControllerTestSingleDomain.java
rename to smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ServiceGroupControllerSingleDomainTest.java
index 22b6f2329221a3b9834b9692416e08262489b56e..ac9d18f075d685c1d9fab2467d475f6c4faa4dd0 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ServiceGroupControllerTestSingleDomain.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ServiceGroupControllerSingleDomainTest.java
@@ -63,7 +63,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@Sql("classpath:/cleanup-database.sql")
@Sql("classpath:/webapp_integration_test_data_one_domain.sql")
@SqlConfig(encoding = "UTF-8")
-public class ServiceGroupControllerTestSingleDomain {
+public class ServiceGroupControllerSingleDomainTest {
private static final String PARTICIPANT_SCHEME = "ehealth-participantid-qns";
private static final String PARTICIPANT_ID = "urn:poland:ncpb";