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 ad87181..185767c 100644 --- a/src/test/java/org/gcube/informationsystem/model/discovery/ISMDiscoveryTest.java +++ b/src/test/java/org/gcube/informationsystem/model/discovery/ISMDiscoveryTest.java @@ -1,6 +1,11 @@ package org.gcube.informationsystem.model.discovery; +import java.util.List; +import java.util.ServiceLoader; + import org.gcube.informationsystem.model.impl.utils.discovery.ISMDiscovery; +import org.gcube.informationsystem.model.impl.utils.discovery.RegistrationProvider; +import org.gcube.informationsystem.model.reference.ISManageable; import org.gcube.informationsystem.model.reference.embedded.Embedded; import org.gcube.informationsystem.model.reference.entity.Entity; import org.gcube.informationsystem.model.reference.relation.Relation; @@ -12,9 +17,20 @@ public class ISMDiscoveryTest { private static Logger logger = LoggerFactory.getLogger(ISMDiscovery.class); + private void addDiscoveredModel(ISMDiscovery ismDiscovery) { + ServiceLoader regsitrationProviders = ServiceLoader.load(RegistrationProvider.class); + for (RegistrationProvider registrationProvider : regsitrationProviders) { + List packages = registrationProvider.getPackagesToRegister(); + for(Package p : packages) { + ismDiscovery.addPackage(p); + } + } + } + @Test public void testEmbeddedDiscovery() throws Exception{ ISMDiscovery embeddedDiscovery = new ISMDiscovery<>(Embedded.class); + addDiscoveredModel(embeddedDiscovery); embeddedDiscovery.discover(); for(Class embedded : embeddedDiscovery.getDiscovered()) { @@ -25,6 +41,7 @@ public class ISMDiscoveryTest { @Test public void testEntityDiscovery() throws Exception{ ISMDiscovery entityDiscovery = new ISMDiscovery<>(Entity.class); + addDiscoveredModel(entityDiscovery); entityDiscovery.discover(); for(Class entity : entityDiscovery.getDiscovered()) { @@ -36,6 +53,7 @@ public class ISMDiscoveryTest { public void testRelationDiscovery() throws Exception{ @SuppressWarnings("rawtypes") ISMDiscovery relationDiscovery = new ISMDiscovery<>(Relation.class); + addDiscoveredModel(relationDiscovery); relationDiscovery.discover(); } diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index 90ae346..30be189 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -10,7 +10,7 @@ - +