- fix x-forwarded parameters

smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainServiceIntegrationTest.java

@@ -2,6 +2,8 @@ package eu.europa.ec.edelivery.smp.services.ui;
 
 
 import eu.europa.ec.edelivery.smp.data.model.DBDomain;
+import eu.europa.ec.edelivery.smp.data.model.DBServiceGroup;
+import eu.europa.ec.edelivery.smp.data.ui.DeleteEntityValidation;
 import eu.europa.ec.edelivery.smp.data.ui.DomainRO;
 import eu.europa.ec.edelivery.smp.data.ui.ServiceResult;
 import eu.europa.ec.edelivery.smp.services.AbstractServiceIntegrationTest;
@@ -16,7 +18,7 @@ import static org.junit.Assert.*;
 
 
 /**
- *  Purpose of class is to test ServiceGroupService base methods
+ *  Purpose of class is to test UIDomainService base methods
  *
  * @author Joze Rihtarsic
  * @since 4.1
@@ -76,4 +78,44 @@ public class UIDomainServiceIntegrationTest extends AbstractServiceIntegrationTe
         assertNotNull(res.getServiceEntities().get(0).getSmlClientKeyAlias());
         assertNotNull(res.getServiceEntities().get(0).getSmlSubdomain());
     }
+
+    @Test
+    public void validateDeleteRequest(){
+
+        DeleteEntityValidation dev= new DeleteEntityValidation();
+        dev.getListIds().add((long)10);
+
+        DeleteEntityValidation res = testInstance.validateDeleteRequest(dev);
+
+        assertEquals(true, res.isValidOperation());
+
+    }
+
+    @Test
+    public void validateDeleteRequestNotToDelete(){
+        // given
+        DBDomain d = TestDBUtils.createDBDomain("domain");
+        DBDomain d2 = TestDBUtils.createDBDomain("domain1");
+
+        domainDao.persistFlushDetach(d);
+        domainDao.persistFlushDetach(d2);
+
+        DBServiceGroup sg = TestDBUtils.createDBServiceGroup();
+        sg.addDomain(d);
+        serviceGroupDao.persistFlushDetach(sg);
+
+        // when
+        DeleteEntityValidation dev= new DeleteEntityValidation();
+        dev.getListIds().add(d.getId());
+        dev.getListIds().add(d2.getId());
+
+        DeleteEntityValidation res = testInstance.validateDeleteRequest(dev);
+
+        // then
+        assertEquals(false, res.isValidOperation());
+        assertEquals(1, res.getListDeleteNotPermitedIds().size());
+        assertEquals(d.getId(), res.getListDeleteNotPermitedIds().get(0));
+        assertEquals("Could not delete domains used by Service groups! Domain: domain (domain ) uses by:1 SG.", res.getStringMessage());
+
+    }
 }

smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIServiceGroupSearchServiceTest.java

+package eu.europa.ec.edelivery.smp.services.ui;
+
+import eu.europa.ec.edelivery.smp.data.model.DBServiceGroup;
+import eu.europa.ec.edelivery.smp.data.model.DBUser;
+import eu.europa.ec.edelivery.smp.data.ui.ServiceGroupRO;
+import eu.europa.ec.edelivery.smp.data.ui.ServiceGroupSearchRO;
+import eu.europa.ec.edelivery.smp.data.ui.ServiceResult;
+import eu.europa.ec.edelivery.smp.services.AbstractServiceIntegrationTest;
+import eu.europa.ec.edelivery.smp.testutil.TestConstants;
+import eu.europa.ec.edelivery.smp.testutil.TestDBUtils;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+
+@ContextConfiguration(classes = {UIServiceGroupSearchService.class, UIServiceMetadataService.class})
+public class UIServiceGroupSearchServiceTest extends AbstractServiceIntegrationTest {
+    @Rule
+    public ExpectedException expectedExeption = ExpectedException.none();
+
+    @Autowired
+    protected UIServiceGroupSearchService testInstance;
+
+    @Autowired
+    protected UIServiceMetadataService uiServiceMetadataService;
+
+
+    protected void insertDataObjectsForOwner(int size, DBUser owner) {
+        for (int i = 0; i < size; i++) {
+            insertServiceGroup(String.format("%4d", i), true, owner);
+        }
+    }
+
+    protected void insertDataObjects(int size) {
+        insertDataObjectsForOwner(size, null);
+    }
+
+    protected DBServiceGroup insertServiceGroup(String id, boolean withExtension, DBUser owner) {
+        DBServiceGroup d = TestDBUtils.createDBServiceGroup(String.format("0007:%s:utest", id), TestConstants.TEST_SG_SCHEMA_1, withExtension);
+        if (owner != null) {
+            d.getUsers().add(owner);
+        }
+        serviceGroupDao.persistFlushDetach(d);
+        return d;
+    }
+
+    @Test
+    public void testGetTableListEmpty() {
+
+        // given
+
+        //when
+        ServiceResult<ServiceGroupSearchRO> res = testInstance.getTableList(-1, -1, null, null, null);
+        // then
+        assertNotNull(res);
+        assertEquals(0, res.getCount().intValue());
+        assertEquals(0, res.getPage().intValue());
+        assertEquals(-1, res.getPageSize().intValue());
+        assertEquals(0, res.getServiceEntities().size());
+        assertNull(res.getFilter());
+    }
+
+    @Test
+    public void testGetTableList15() {
+
+        // given
+        insertDataObjects(15);
+        //when
+        ServiceResult<ServiceGroupSearchRO> res = testInstance.getTableList(-1, -1, null, null, null);
+
+
+        // then
+        assertNotNull(res);
+        assertEquals(15, res.getCount().intValue());
+        assertEquals(0, res.getPage().intValue());
+        assertEquals(-1, res.getPageSize().intValue());
+        assertEquals(15, res.getServiceEntities().size());
+        assertNull(res.getFilter());
+
+        // all table properties should not be null
+        assertNotNull(res);
+        assertNotNull(res.getServiceEntities().get(0).getParticipantIdentifier());
+        assertNotNull(res.getServiceEntities().get(0).getParticipantScheme());
+    }
+
+
+    @Test
+    public void convertToRo() {
+        // given
+        DBServiceGroup  sg = TestDBUtils.createDBServiceGroup();
+        // then when
+        ServiceGroupSearchRO sgr = testInstance.convertToRo(sg);
+        // then
+        assertEquals(sg.getId(), sgr.getId());
+        assertEquals(sg.getParticipantScheme(), sgr.getParticipantScheme());
+        assertEquals(sg.getParticipantIdentifier(), sgr.getParticipantIdentifier());
+    }
+}
\ No newline at end of file

smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/smlintegration/SmlConnectorTest.java

@@ -14,6 +14,7 @@
 package eu.europa.ec.edelivery.smp.smlintegration;
 
 import eu.europa.ec.bdmsl.ws.soap.*;
+import eu.europa.ec.edelivery.smp.data.model.DBDomain;
 import eu.europa.ec.edelivery.smp.sml.SmlConnector;
 import org.junit.Before;
 import org.junit.Test;
@@ -31,6 +32,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
 import static org.springframework.beans.factory.config.ConfigurableBeanFactory.SCOPE_PROTOTYPE;
 
 /**
@@ -45,8 +49,13 @@ public class SmlConnectorTest {
 
     private static List<IManageParticipantIdentifierWS> smlClientMocks = new ArrayList<>();
     private static final ParticipantIdentifierType PARTICIPANT_ID = new ParticipantIdentifierType("sample:value", "sample:scheme");
-//    private static final DBDomain DEFAULT_DOMAIN = new DBDomain("default_domain_id", null, null, "SAMPLE-SMP-ID", null);
+    private static final DBDomain DEFAULT_DOMAIN;
 
+    static {
+        DEFAULT_DOMAIN = new DBDomain();
+        DEFAULT_DOMAIN.setDomainCode("default_domain_id");
+        DEFAULT_DOMAIN.setSmlSmpId("SAMPLE-SMP-ID");
+    }
     @Autowired
     private SmlConnector smlConnector;
 
@@ -70,16 +79,15 @@ public class SmlConnectorTest {
 
     @Test
     public void testRegisterInDns() throws UnauthorizedFault, NotFoundFault, InternalErrorFault, BadRequestFault {
-  /*      //when
+    //when
         smlConnector.registerInDns(PARTICIPANT_ID, DEFAULT_DOMAIN);
 
         //then
         assertEquals(1, smlClientMocks.size());
         verify(smlClientMocks.get(0)).create(any());
         Mockito.verifyNoMoreInteractions(smlClientMocks.toArray());
-        */
     }
-/*
+
     @Test
     public void testRegisterInDnsNewClientIsAlwaysCreated() throws UnauthorizedFault, NotFoundFault, InternalErrorFault, BadRequestFault {
         //when
@@ -115,5 +123,5 @@ public class SmlConnectorTest {
         verify(smlClientMocks.get(0)).delete(any());
         verify(smlClientMocks.get(1)).delete(any());
         Mockito.verifyNoMoreInteractions(smlClientMocks.toArray());
-    } */
+    }
 }

smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/ApplicationResource.java

@@ -40,7 +40,7 @@ public class ApplicationResource {
 
     @RequestMapping(method = RequestMethod.GET, path = "name")
     public  String getName() {
-        return "SMP TEST";
+        return artifactName;
     }
 
     @RequestMapping(method = RequestMethod.GET, path = "rootContext")

smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/ApplicationResourceTest.java

+package eu.europa.ec.edelivery.smp.ui;
+
+import eu.europa.ec.edelivery.smp.config.PropertiesTestConfig;
+import eu.europa.ec.edelivery.smp.config.SmpAppConfig;
+import eu.europa.ec.edelivery.smp.config.SmpWebAppConfig;
+import eu.europa.ec.edelivery.smp.config.SpringSecurityConfig;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mock.web.MockServletContext;
+import org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.test.context.jdbc.SqlConfig;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.RequestPostProcessor;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.ContextLoaderListener;
+import org.springframework.web.context.WebApplicationContext;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import static org.junit.Assert.*;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = {
+        PropertiesTestConfig.class,
+        SmpAppConfig.class,
+        SmpWebAppConfig.class,
+        SpringSecurityConfig.class})
+@WebAppConfiguration
+@Sql("classpath:/cleanup-database.sql")
+@Sql("classpath:/webapp_integration_test_data.sql")
+@SqlConfig(encoding = "UTF-8")
+public class ApplicationResourceTest {
+    private static final String PATH="/ui/rest/application";
+
+    @Autowired
+    private WebApplicationContext webAppContext;
+
+    private MockMvc mvc;
+    private static final RequestPostProcessor ADMIN_CREDENTIALS = httpBasic("smp_admin", "test123");
+    @Before
+    public void setup() {
+        mvc = MockMvcBuilders.webAppContextSetup(webAppContext)
+                .apply(SecurityMockMvcConfigurers.springSecurity())
+                .build();
+
+
+
+        initServletContext();
+    }
+
+    private void initServletContext() {
+        MockServletContext sc = new MockServletContext("");
+        ServletContextListener listener = new ContextLoaderListener(webAppContext);
+        ServletContextEvent event = new ServletContextEvent(sc);
+    }
+
+    @Test
+    public void getName() throws Exception {
+        String value = mvc.perform(get(PATH + "/name"))
+                .andExpect(status().isOk())
+                .andReturn()
+                .getResponse()
+                .getContentAsString();
+
+        assertEquals("eDelivery SMP", value);
+
+    }
+    @Test
+    public void getRootContext() throws Exception {
+        String value = mvc.perform(get(PATH + "/rootContext"))
+                .andExpect(status().isOk())
+                .andReturn()
+                .getResponse()
+                .getContentAsString();
+
+        assertEquals("/", value);
+    }
+
+    @Test
+    public void getDisplayVersion() throws Exception {
+        String value = mvc.perform(get(PATH + "/info"))
+                .andExpect(status().isOk())
+                .andReturn()
+                .getResponse()
+                .getContentAsString();
+
+        assertEquals("{\"version\":\"eDelivery SMP Version [4.1.0-SNAPSHOT] Build-Time [22/10/2018|Central European Time]\"}", value);
+    }
+}
\ No newline at end of file