[core] Fix some tests

Author: m.gond

workspace/fr.cnes.sitools.core/src/fr/cnes/sitools/dataset/AbstractDataSetResource.java

@@ -231,7 +231,7 @@ public final Response checkUnicity(DataSet datasetInput, boolean includeDatasetI
       for (DataSet dataset : storedDatasets) {
         // if the attachment is empty it will be filled latter by a unique attachment
         // empty attachment must not be checked for unicity
-        if (!dataset.getSitoolsAttachementForUsers().equals("")) {
+        if (!Util.isEmpty(dataset.getSitoolsAttachementForUsers()) && !dataset.getId().equals(datasetInput.getId())) {
           storedDatasetUrlAttach.add(dataset.getSitoolsAttachementForUsers());
         }
       }

workspace/fr.cnes.sitools.core/src/fr/cnes/sitools/dataset/database/jdbc/RequestPostgres.java

@@ -226,7 +226,7 @@ else if (predicat.getRightValue() instanceof GeometryObject) {
           coords += "," + geom.getPoints().get(0).getX() + " " + geom.getPoints().get(0).getY();
         }
         coords += "))";
-        pred += "ST_GeomFromText('" + coords + "', 40000)";
+        pred += "ST_GeomFromText('" + coords + "', 4326)";
       }
       else {
         pred += ((String) predicat.getRightValue()).replace("\"", "\'").replace("*", "%");

workspace/fr.cnes.sitools.core/test/src/fr/cnes/sitools/AbstractDataSetConverterTestCase.java

@@ -81,7 +81,7 @@ protected String getBaseUrlConverter() {
   @Test
   public void test() throws InterruptedException {
     docAPI.setActive(false);
-    DataSet ds = CreateDatasetUtil.createDatasetFusePG(datasetId, "/fuse");
+    DataSet ds = CreateDatasetUtil.createDatasetFusePG(datasetId, "/fuse_for_converters");
     Column virtualColumn = new Column();
     virtualColumn.setId("virtual");
     virtualColumn.setHeader("virtual");

workspace/fr.cnes.sitools.core/test/src/fr/cnes/sitools/AbstractDataSetManagerTestCase.java

@@ -603,7 +603,7 @@ public void persistDataset(DataSet item) throws InterruptedException {
 
         Response response = getResponse(getMediaTest(), result, DataSet.class);
         assertNotNull(response);
-        assertTrue(response.getSuccess());
+        assertTrue(response.getMessage(), response.getSuccess());
         assertNotNull(response.getItem());
 
         DataSet ds = (DataSet) response.getItem();

workspace/fr.cnes.sitools.core/test/src/fr/cnes/sitools/AbstractUserRoleTestCase.java

@@ -1,4 +1,4 @@
- /*******************************************************************************
+/*******************************************************************************
  * Copyright 2010-2014 CNES - CENTRE NATIONAL d'ETUDES SPATIALES
  *
  * This file is part of SITools2.
@@ -24,16 +24,23 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import fr.cnes.sitools.security.authorization.client.ResourceAuthorization;
+import fr.cnes.sitools.security.authorization.client.RoleAndMethodsAuthorization;
+import fr.cnes.sitools.server.Consts;
+import fr.cnes.sitools.utils.GetRepresentationUtils;
+import fr.cnes.sitools.utils.GetResponseUtils;
 import org.junit.Test;
 import org.restlet.data.ChallengeResponse;
 import org.restlet.data.ChallengeScheme;
 import org.restlet.data.MediaType;
+import org.restlet.data.Method;
 import org.restlet.engine.Engine;
 import org.restlet.representation.Representation;
 import org.restlet.resource.ClientResource;
@@ -55,10 +62,12 @@ public class AbstractUserRoleTestCase extends AbstractSitoolsServerTestCase {
 
   private String userpwd = "admin";
 
+  private String appName = "";
+
   private SitoolsSettings settings = SitoolsSettings.getInstance();
 
   /**
-   * 
+   *
    */
   @Test
   public void testUserRole() {
@@ -77,7 +86,7 @@ public void testUserRole() {
   }
 
   /**
-   * 
+   *
    */
   @Test
   public void testUserRoleDocAPI() {
@@ -95,9 +104,9 @@ public void testUserRoleDocAPI() {
 
     docAPI.close();
   }
-  
+
   /**
-   * 
+   *
    */
   @Test
   public void testUserRoleCreateThenDelete() {
@@ -116,7 +125,34 @@ public void testUserRoleCreateThenDelete() {
   }
 
   /**
-   * 
+   * Create a role
+   * Add the role to an authorization on an application
+   * Delete the role => Should fail
+   * Remove all authorization for this role
+   * Delete the role => Should be OK
+   */
+  @Test
+  public void testUserRoleCreateAndDeleteWhenUsedOnApplication() throws IOException {
+
+    Role role = new Role();
+    role.setId("role_tmp");
+    role.setName("role_tmp");
+    role.setDescription("A temporary role for tests");
+    persistRole(role);
+
+    ResourceAuthorization auth = createAuthorizationObject(role.getName());
+    persistAuthorization(auth);
+
+    deleteRole(role, false);
+
+    deleteAuthorization(auth);
+
+    deleteRole(role, true);
+
+  }
+
+  /**
+   *
    * @param name
    * @param pwd
    * @param expectedRoles
@@ -167,7 +203,7 @@ private void getUserRoleNoUserError() {
 
   /**
    * Assert that the 2 list of roles are the same
-   * 
+   *
    * @param expectedRoles
    *          the expected list of roles
    * @param roles
@@ -176,11 +212,11 @@ private void getUserRoleNoUserError() {
   private void assertRoles(List<Role> expectedRoles, List<Role> roles) {
     if (expectedRoles != null && roles != null) {
       assertEquals(expectedRoles.size(), roles.size());
-      for (Iterator<Role> iterator = expectedRoles.iterator(); iterator.hasNext();) {
+      for (Iterator<Role> iterator = expectedRoles.iterator(); iterator.hasNext(); ) {
         Role expectedRole = (Role) iterator.next();
         String roleName = expectedRole.getName();
         boolean found = false;
-        for (Iterator<Role> iterator2 = roles.iterator(); iterator2.hasNext() && !found;) {
+        for (Iterator<Role> iterator2 = roles.iterator(); iterator2.hasNext() && !found; ) {
           Role role = (Role) iterator2.next();
           if (role.getName().equals(roleName)) {
             found = true;
@@ -198,12 +234,151 @@ private void assertRoles(List<Role> expectedRoles, List<Role> roles) {
 
   }
 
+  private String getBaseUrlRoles() {
+    return getBaseUrl() + settings.getString(Consts.APP_ROLES_URL);
+  }
+
+  /**
+   * Invokes POST method to create a new Role
+   *
+   * @param item
+   *          Role
+   */
+  public void persistRole(Role item) {
+    Representation rep = GetRepresentationUtils.getRepresentationRole(item, getMediaTest());
+    ClientResource cr = new ClientResource(getBaseUrlRoles());
+    docAPI.appendRequest(Method.POST, cr, rep);
+    Representation result = cr.post(rep, getMediaTest());
+    if (!docAPI.appendResponse(result)) {
+      assertNotNull(result);
+      assertTrue(cr.getStatus().isSuccess());
+
+      Response response = GetResponseUtils.getResponseRole(getMediaTest(), result, Role.class);
+      assertTrue(response.getSuccess());
+      Role role = (Role) response.getItem();
+      assertEquals(role.getName(), item.getName());
+      assertEquals(role.getDescription(), item.getDescription());
+    }
+    RIAPUtils.exhaust(result);
+  }
+
+
+  /**
+   * Invokes DELETE method for deleting Role with specified id.
+   *
+   * @param item
+   *          Role
+   */
+  public void deleteRole(Role item, boolean expectSuccess) {
+    String url = getBaseUrlRoles() + "/" + item.getId();
+    ClientResource cr = new ClientResource(url);
+    docAPI.appendRequest(Method.DELETE, cr);
+    Representation result = cr.delete(getMediaTest());
+    if (!docAPI.appendResponse(result)) {
+      assertNotNull(result);
+      assertTrue(cr.getStatus().isSuccess());
+      if (expectSuccess) {
+        Response response = GetResponseUtils.getResponseRole(getMediaTest(), result, Role.class);
+        assertTrue(response.getMessage(), response.getSuccess());
+      }
+      else {
+        Response response = GetResponseUtils
+            .getResponseResourceAuthorization(getMediaTest(), result, ResourceAuthorization.class, true);
+        assertFalse(response.getMessage(), response.getSuccess());
+      }
+    }
+    RIAPUtils.exhaust(result);
+  }
+
+  private String getBaseUrlAuthorizations() {
+    return getBaseUrl() + settings.getString(Consts.APP_AUTHORIZATIONS_URL);
+  }
+
+  /**
+   * Create an object for tests
+   *
+   * @return ResourceAuthorization
+   */
+  private ResourceAuthorization createAuthorizationObject(String roleName) {
+    ResourceAuthorization item = new ResourceAuthorization();
+    item.setId("urn:uuid:SolrApplication:type:fr.cnes.sitools.solr.SolrApplication");
+    item.setName("SolrApplication");
+    item.setDescription("Sample Solr integration");
+    item.setUrl("http://localhost:8182/sitools/solr");
+    ArrayList<RoleAndMethodsAuthorization> authorizations = new ArrayList<RoleAndMethodsAuthorization>();
+    RoleAndMethodsAuthorization aut = new RoleAndMethodsAuthorization();
+    aut.setRole(roleName);
+    aut.setAllMethod(true);
+    aut.setGetMethod(true);
+    authorizations.add(aut);
+    item.setAuthorizations(authorizations);
+    return item;
+  }
+
+  /**
+   * Invoke POST
+   *
+   * @param item
+   *          RsourceAuthorization
+   * @throws IOException
+   *           Exception when copying configuration files from TEST to data/TESTS
+   */
+  public void persistAuthorization(ResourceAuthorization item) throws IOException {
+    Representation rep = GetRepresentationUtils.getRepresentationResourceAuthorization(item, getMediaTest());
+    String url = getBaseUrlAuthorizations();
+    if (docAPI.isActive()) {
+      Map<String, String> parameters = new LinkedHashMap<String, String>();
+      putDocAPI(url, "", rep, parameters, url);
+    }
+    else {
+      ClientResource cr = new ClientResource(url);
+      Representation result = cr.post(rep, getMediaTest());
+      assertNotNull(result);
+      assertTrue(cr.getStatus().isSuccess());
+      Response response = GetResponseUtils
+          .getResponseResourceAuthorization(getMediaTest(), result, ResourceAuthorization.class, false);
+      assertTrue(response.getSuccess());
+      ResourceAuthorization authorization = (ResourceAuthorization) response.getItem();
+      assertEquals(authorization.getName(), item.getName());
+      assertEquals(authorization.getDescription(), item.getDescription());
+      RIAPUtils.exhaust(result);
+    }
+  }
+
+  /**
+   * Invoke Delete
+   *
+   * @param item
+   *          ResourceAuthorization
+   * @throws IOException
+   *           Exception when copying configuration files from TEST to data/TESTS
+   */
+  public void deleteAuthorization(ResourceAuthorization item) throws IOException {
+    ClientResource cr = new ClientResource(getBaseUrlAuthorizations() + "/" + item.getId());
+    if (docAPI.isActive()) {
+      Map<String, String> parameters = new LinkedHashMap<String, String>();
+      parameters.put("identifier", "Identifier application");
+      deleteDocAPI(getBaseUrlAuthorizations() + "/" + item.getId(), "", parameters,
+          getBaseUrlAuthorizations() + "/%identifier%");
+    }
+    else {
+      Representation result = cr.delete(getMediaTest());
+      assertNotNull(result);
+      assertTrue(cr.getStatus().isSuccess());
+      Response response = getResponse(getMediaTest(), result, ResourceAuthorization.class, false);
+      assertTrue(response.getSuccess());
+      assertEquals(null, response.getTotal());
+      RIAPUtils.exhaust(result);
+    }
+  }
+
+
   // ------------------------------------------------------------
   // RESPONSE REPRESENTATION WRAPPING
 
   /**
    * REST API Response wrapper for single item expected.
-   * 
+   *
    * @param media
    *          MediaType expected
    * @param representation
@@ -218,7 +393,7 @@ public static Response getResponse(MediaType media, Representation representatio
 
   /**
    * REST API Response Representation wrapper for single or multiple items expexted
-   * 
+   *
    * @param media
    *          MediaType expected
    * @param representation
@@ -229,7 +404,8 @@ public static Response getResponse(MediaType media, Representation representatio
    *          if true wrap the data property else wrap the item property
    * @return Response
    */
-  public static Response getResponse(MediaType media, Representation representation, Class<?> dataClass, boolean isArray) {
+  public static Response getResponse(MediaType media, Representation representation, Class<?> dataClass,
+      boolean isArray) {
     try {
       if (!media.isCompatible(getMediaTest()) && !media.isCompatible(MediaType.APPLICATION_XML)) {
         Engine.getLogger(AbstractSitoolsTestCase.class.getName()).warning("Only JSON or XML supported in tests");