diff --git a/src/test/java/org/gcube/informationsystem/model/discovery/ISMDiscoveryTest.java b/src/test/java/org/gcube/informationsystem/model/discovery/ISMDiscoveryTest.java index 5096f74..1fb929a 100644 --- a/src/test/java/org/gcube/informationsystem/model/discovery/ISMDiscoveryTest.java +++ b/src/test/java/org/gcube/informationsystem/model/discovery/ISMDiscoveryTest.java @@ -1,8 +1,10 @@ package org.gcube.informationsystem.model.discovery; +import java.util.ArrayList; import java.util.List; import java.util.ServiceLoader; +import org.gcube.informationsystem.base.reference.AccessType; import org.gcube.informationsystem.base.reference.ISManageable; import org.gcube.informationsystem.base.reference.entities.BaseEntity; import org.gcube.informationsystem.base.reference.properties.BaseProperty; @@ -16,6 +18,7 @@ import org.gcube.informationsystem.types.reference.relations.RelationTypeDefinit import org.gcube.informationsystem.utils.ISMapper; import org.gcube.informationsystem.utils.discovery.ISMDiscovery; import org.gcube.informationsystem.utils.discovery.RegistrationProvider; +import org.gcube.informationsystem.utils.discovery.SchemaAction; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,6 +38,48 @@ public class ISMDiscoveryTest { } } + @Test + public void testDiscovery() throws Exception { + SchemaAction schemaAction = new SchemaAction() { + + @Override + public > void manageRelationClass(Class r) + throws Exception { + // TODO Auto-generated method stub + + } + + @Override + public

void managePropertyClass(Class

e) throws Exception { + // TODO Auto-generated method stub + + } + + @Override + public void manageEntityClass(Class e) throws Exception { + // TODO Auto-generated method stub + + } + }; + List packages = new ArrayList(); + + Class tdClz = TypeDefinition.class; + packages.add(tdClz.getPackage()); + + AccessType[] accessTypes = AccessType.values(); + for(AccessType accessType : accessTypes) { + Class clz = accessType.getTypeClass(); + packages.add(clz.getPackage()); + } + + ServiceLoader regsitrationProviders = ServiceLoader + .load(RegistrationProvider.class); + for(RegistrationProvider registrationProvider : regsitrationProviders) { + packages.addAll(registrationProvider.getPackagesToRegister()); + } + ISMDiscovery.manageISM(schemaAction, packages); + } + @Test public void testPropertyDiscovery() throws Exception { ISMDiscovery propertyDiscovery = new ISMDiscovery(BaseProperty.class); @@ -86,4 +131,6 @@ public class ISMDiscoveryTest { } } + + } diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java index 9b30f24..71a7c21 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java @@ -17,6 +17,7 @@ import org.gcube.common.authorization.library.utils.Caller; import org.gcube.common.scope.api.ScopeProvider; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,6 +49,11 @@ public class ContextTest { DEFAULT_TEST_SCOPE_NAME = "/gcube"; } + @Test + public void test() throws ObjectNotFound, Exception { + ContextTest.setContext("a34b486c-874c-4539-97c9-be8d9e00fd7f-98187548"); + } + public static String getCurrentScope(String token) throws ObjectNotFound, Exception { AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token); String context = authorizationEntry.getContext(); diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java b/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java index 3e10259..e857203 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java @@ -24,8 +24,6 @@ public class DataBaseCreator extends ContextTest { logger.debug("{} created", db); } - - protected Context create(Context context) throws ResourceRegistryException, IOException { ContextManagement contextManagement = new ContextManagement(); contextManagement.setJson(ISMapper.marshal(context)); @@ -56,15 +54,6 @@ public class DataBaseCreator extends ContextTest { nextNext.setParent(devNext); nextNext = create(nextNext); - /* - Context preprod = new ContextImpl("preprod"); - preprod.setParent(gcube); - preprod = create(preprod); - - Context preVRE = new ContextImpl("preVRE"); - preVRE.setParent(preprod); - preVRE = create(preVRE); - */ } } diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index 30be189..d214b8f 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -11,7 +11,9 @@ + +