This commit is contained in:
Francesco Mangiacrapa 2020-06-03 17:46:48 +02:00
parent a68ff2eb60
commit bd4e02e825
18 changed files with 81 additions and 31 deletions

View File

@ -705,8 +705,8 @@ public class DataCatalogueImpl implements DataCatalogue {
dataset.setName(nameToUse);
dataset.setTitle(title);
// CkanOrganization orgOwner = client.getOrganization(organizationNameOrId);
// dataset.setOwnerOrg(orgOwner.getId());
CkanOrganization orgOwner = ckanCaller.getOrganization(organizationNameOrId);
dataset.setOwnerOrg(orgOwner.getId());
dataset.setAuthor(author);
dataset.setAuthorEmail(authorMail);
dataset.setMaintainer(maintainer);
@ -719,7 +719,6 @@ public class DataCatalogueImpl implements DataCatalogue {
Segment htmlSeg = new Segment(descriptionEscaped, 0, descriptionEscaped.length());
Renderer htmlRend = new Renderer(htmlSeg);
dataset.setNotes(htmlRend.toString());
LOG.debug("Description escaped " + htmlRend.toString());
}
@ -792,7 +791,7 @@ public class DataCatalogueImpl implements DataCatalogue {
// try to create
String jsonValueDataset = MarshUnmarshCkanObject.toJsonValueDataset(dataset);
LOG.trace("Serialized dataset is: " + jsonValueDataset);
LOG.debug("Serialized dataset is: " + jsonValueDataset);
jsonValueDataset = gCatCaller.createDataset(jsonValueDataset,true);
LOG.debug("Created dataset is: " + jsonValueDataset);

View File

@ -1,10 +1,19 @@
package org.gcube.datacatalogue.ckanutillibrary.test;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.datacatalogue.ckanutillibrary.server.ApplicationProfileScopePerUrlReader;
import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogueFactory;
import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogueImpl;
import org.gcube.datacatalogue.ckanutillibrary.shared.ResourceBean;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.LoggerFactory;
@ -23,11 +32,12 @@ public class TestDataCatalogueLib {
private static final org.slf4j.Logger logger = LoggerFactory.getLogger(TestDataCatalogueLib.class);
private DataCatalogueFactory factory;
private String scope = "/pred4s/preprod/preVRE";
private String scope = "/gcube/devsec/devVRE";
//private String scope = "/d4science.research-infrastructures.eu/SoBigData/Catalogue-TerritoriAperti";
//private String scope = "/d4science.research-infrastructures.eu/gCubeApps/BiodiversityLab";
//private String testUser = "costantino_perciante";
private String testUser = "francesco_mangiacrapa";
private String testUser = "francesco.mangiacrapa";
private String authorizationToken = "";
String subjectId = "aa_father4";
String objectId = "bb_son4";
@ -92,7 +102,7 @@ public class TestDataCatalogueLib {
* @return the user role by group
* @throws Exception the exception
*/
@Test
//@Test
public void getUserRoleByGroup() throws Exception{
DataCatalogueImpl instance = factory.getUtilsPerScope(scope);
String username = testUser;
@ -121,8 +131,7 @@ public class TestDataCatalogueLib {
//@Test
public void getRoleOfUserInOrganization() throws Exception{
String orgName = "nextnext";
String orgName = "devvre";
DataCatalogueImpl utils = factory.getUtilsPerScope(scope);
CkanOrganization org = utils.getOrganizationByName(orgName);
String role = utils.getRoleOfUserInOrganization(testUser, org.getName());
@ -132,7 +141,7 @@ public class TestDataCatalogueLib {
//@Test
public void getOrganizationForName() throws Exception{
String orgName = "nextnext";
String orgName = "devvre";
DataCatalogueImpl utils = factory.getUtilsPerScope(scope);
@ -147,7 +156,63 @@ public class TestDataCatalogueLib {
}
}
}
//
//@Test
public void getLandingPages() throws Exception{
DataCatalogueImpl utils = factory.getUtilsPerScope(scope);
logger.debug("Landing pages " + utils.getLandingPages());
}
@Test
public void createDataset() throws Exception{
try {
ScopeProvider.instance.set(scope);
SecurityTokenProvider.instance.set(authorizationToken);
DataCatalogueImpl instance = factory.getUtilsPerScope(scope);
String licenseId = instance.getLicenses().get(0).getId();
Map<String, List<String>> customFieldsMultiple = new HashMap<String, List<String>>();
for (int i = 0; i < 10; i++) {
List<String> values = new ArrayList<String>();
for (int j = 0; j < new Random().nextInt(3); j++) {
values.add("value "+ new Random().nextInt());
}
customFieldsMultiple.put("key "+new Random().nextInt(), values);
}
boolean setSearchable = true;
boolean setPublic = false;
List<ResourceBean> resources = null;
String createdDataset = instance.createCKanDatasetMultipleCustomFields(
testUser,
"first dataset by catalogue-util-library",
"firstdatasetbycatalogue-util-library",
"nextnext",
testUser,
null,
null,
null,
1,
"the description",
licenseId,
Arrays.asList("tag 1","tag 2","tag 3"),
customFieldsMultiple,
resources,
setPublic,
setSearchable);
logger.info(createdDataset);
}catch (Exception e) {
e.printStackTrace();
}
}
@ -165,13 +230,7 @@ public class TestDataCatalogueLib {
//
// }
//
// //@Test
// public void getLandingPages() throws Exception{
//
// DataCatalogueImpl utils = factory.getUtilsPerScope(scope);
// logger.debug("Landing pages " + utils.getLandingPages());
//
// }
//
//
@ -384,13 +443,6 @@ public class TestDataCatalogueLib {
// }
// }
//
// //@Test
// public void editorCreateDataset() throws Exception{
//
// DataCatalogueImpl instance = factory.getUtilsPerScope("/gcube/devsec/devVRE");
// instance.createCKanDataset(instance.getApiKeyFromUsername("user_editor_devvre"), "dataset_as_editor_devvre_private", null, "devvre", null, null, null, null, 1, null, null, null, null, null, false);
//
// }
//
// //@Test
// public void adminCreateDataset() throws Exception{

View File

@ -6,7 +6,7 @@ Specification-Version: 0.1.0-SNAPSHOT
Implementation-Title: CKan utility library
Implementation-Version: 0.1.0-SNAPSHOT
Implementation-Vendor-Id: org.gcube.datacatalogue
Build-Time: 20200603-095004
Build-Time: 20200603-143116
Created-By: Maven Integration for Eclipse
SCM-Branch:
SCM-Revision:

View File

@ -1,5 +1,5 @@
#Generated by Maven Integration for Eclipse
#Wed Jun 03 11:50:06 CEST 2020
#Wed Jun 03 16:31:16 CEST 2020
version=0.1.0-SNAPSHOT
groupId=org.gcube.datacatalogue
m2e.projectName=catalogue-util-library

View File

@ -705,8 +705,8 @@ public class DataCatalogueImpl implements DataCatalogue {
dataset.setName(nameToUse);
dataset.setTitle(title);
// CkanOrganization orgOwner = client.getOrganization(organizationNameOrId);
// dataset.setOwnerOrg(orgOwner.getId());
CkanOrganization orgOwner = ckanCaller.getOrganization(organizationNameOrId);
dataset.setOwnerOrg(orgOwner.getId());
dataset.setAuthor(author);
dataset.setAuthorEmail(authorMail);
dataset.setMaintainer(maintainer);
@ -719,7 +719,6 @@ public class DataCatalogueImpl implements DataCatalogue {
Segment htmlSeg = new Segment(descriptionEscaped, 0, descriptionEscaped.length());
Renderer htmlRend = new Renderer(htmlSeg);
dataset.setNotes(htmlRend.toString());
LOG.debug("Description escaped " + htmlRend.toString());
}
@ -792,7 +791,7 @@ public class DataCatalogueImpl implements DataCatalogue {
// try to create
String jsonValueDataset = MarshUnmarshCkanObject.toJsonValueDataset(dataset);
LOG.trace("Serialized dataset is: " + jsonValueDataset);
LOG.debug("Serialized dataset is: " + jsonValueDataset);
jsonValueDataset = gCatCaller.createDataset(jsonValueDataset,true);
LOG.debug("Created dataset is: " + jsonValueDataset);