[java-idp-oidc] branch master updated: Refactoring: properly initialize service before tests.
Henri Mikkonen
henri.mikkonen at iki.fi
Fri Feb 7 07:49:36 EST 2020
This is an automated email from the git hooks/post-receive script.
hjmikkon pushed a commit to branch master
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=d2078f20913f61fe82a847d945844941c54ed367
The following commit(s) were added to refs/heads/master by this push:
new d2078f2 Refactoring: properly initialize service before tests.
d2078f2 is described below
commit d2078f20913f61fe82a847d945844941c54ed367
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Feb 7 14:49:31 2020 +0200
Refactoring: properly initialize service before tests.
---
...loadClientResolverServiceConfigurationTest.java | 33 +++++++++++-----------
...adProviderResolverServiceConfigurationTest.java | 27 ++++++++++--------
2 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadClientResolverServiceConfigurationTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadClientResolverServiceConfigurationTest.java
index b615c8c..65e36a5 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadClientResolverServiceConfigurationTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadClientResolverServiceConfigurationTest.java
@@ -26,9 +26,7 @@ import javax.servlet.http.HttpServletResponse;
import org.geant.idpextension.oidc.metadata.impl.ChainingClientInformationResolver;
import org.geant.idpextension.oidc.metadata.resolver.ClientInformationResolver;
-import org.geant.idpextension.oidc.metadata.resolver.RefreshableClientInformationResolver;
import org.geant.idpextension.oidc.metadata.resolver.RelyingPartyClientInformationProvider;
-import org.joda.time.DateTime;
import org.opensaml.profile.context.ProfileRequestContext;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
@@ -48,7 +46,6 @@ import net.shibboleth.idp.profile.impl.ReloadServiceConfiguration;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.service.ReloadableService;
-import net.shibboleth.utilities.java.support.service.ServiceException;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
@@ -68,26 +65,29 @@ public class ReloadClientResolverServiceConfigurationTest {
private List<Resource> twoResolvers;
@BeforeClass public void setup() throws IOException, ComponentInitializationException {
- service = new ReloadableSpringService<>(ClientInformationResolver.class, new ClientInformationResolverServiceStrategy());
- service.setFailFast(true);
- service.setId("mockId");
-
oneResolver = new ArrayList<>();
oneResolver.add(new ClassPathResource("/org/geant/idpextension/oidc/metadata/impl/oidc-metadata-providers.xml"));
twoResolvers = new ArrayList<>();
twoResolvers.add(new ClassPathResource("/org/geant/idpextension/oidc/metadata/impl/oidc-metadata-providers2.xml"));
+ }
- service.setServiceConfigurations(oneResolver);
+ public void setupResolver(final List<Resource> serviceLocations) throws ComponentInitializationException {
+ service = new ReloadableSpringService<>(ClientInformationResolver.class, new ClientInformationResolverServiceStrategy());
+ service.setFailFast(true);
+ service.setId("mockId");
+
+ service.setServiceConfigurations(serviceLocations);
+ service.initialize();
}
@BeforeMethod public void setUpAction() throws ComponentInitializationException {
src = new RequestContextBuilder().buildRequestContext();
}
- @Test public void oneResource() {
+ @Test public void oneResource() throws ComponentInitializationException {
+ setupResolver(oneResolver);
final Instant time = service.getLastReloadAttemptInstant();
- service.setServiceConfigurations(oneResolver);
service.reload();
Assert.assertNotEquals(time, service.getLastReloadAttemptInstant());
final ServiceableComponent<ClientInformationResolver> component = service.getServiceableComponent();
@@ -105,9 +105,9 @@ public class ReloadClientResolverServiceConfigurationTest {
return chain.getResolvers().size();
}
- @Test public void twoResources() {
+ @Test public void twoResources() throws ComponentInitializationException {
+ setupResolver(twoResolvers);
final Instant time = service.getLastReloadAttemptInstant();
- service.setServiceConfigurations(twoResolvers);
service.reload();
Assert.assertNotEquals(time, service.getLastReloadAttemptInstant());
final ServiceableComponent<ClientInformationResolver> component = service.getServiceableComponent();
@@ -116,25 +116,26 @@ public class ReloadClientResolverServiceConfigurationTest {
Assert.assertEquals(getChainSize(resolver), 2);
}
- @Test(expectedExceptions = ServiceException.class) public void noResources()
+ @Test(expectedExceptions = ComponentInitializationException.class) public void noResources()
throws ComponentInitializationException {
- service.setServiceConfigurations(new ArrayList<Resource>());
- service.reload();
+ setupResolver(new ArrayList<Resource>());
}
@Test public void serviceAction() throws ComponentInitializationException {
+ setupResolver(oneResolver);
final Instant time = service.getLastReloadAttemptInstant();
final MockHttpServletResponse response = new MockHttpServletResponse();
final ReloadServiceConfiguration action = initializeAction(service, response);
final Event event = action.execute(src);
+ service.getServiceableComponent().unpinComponent();
ActionTestingSupport.assertProceedEvent(event);
Assert.assertNotEquals(time, service.getLastReloadAttemptInstant());
Assert.assertEquals(response.getStatus(), HttpServletResponse.SC_OK);
}
-
+
protected static ReloadServiceConfiguration initializeAction(final ReloadableService<?> reloadableService,
final HttpServletResponse response) throws ComponentInitializationException {
final ReloadServiceConfiguration action = new ReloadServiceConfiguration();
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadProviderResolverServiceConfigurationTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadProviderResolverServiceConfigurationTest.java
index bd6bf3f..7441491 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadProviderResolverServiceConfigurationTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ReloadProviderResolverServiceConfigurationTest.java
@@ -44,7 +44,6 @@ import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.impl.ReloadServiceConfiguration;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.service.ServiceException;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
@@ -62,23 +61,26 @@ public class ReloadProviderResolverServiceConfigurationTest {
private List<Resource> oneResolver;
@BeforeClass public void setup() throws IOException, ComponentInitializationException {
- service = new ReloadableSpringService(ProviderMetadataResolver.class, new ProviderMetadataResolverServiceStrategy());
- service.setFailFast(true);
- service.setId("mockId");
oneResolver = new ArrayList<>();
oneResolver.add(new ClassPathResource("/org/geant/idpextension/oidc/metadata/impl/oidc-metadata-providers.xml"));
-
- service.setServiceConfigurations(oneResolver);
}
-
+
+ public void setupResolver(final List<Resource> serviceConfigurations) throws ComponentInitializationException {
+ service = new ReloadableSpringService(ProviderMetadataResolver.class, new ProviderMetadataResolverServiceStrategy());
+ service.setFailFast(true);
+ service.setId("mockId");
+ service.setServiceConfigurations(serviceConfigurations);
+ service.initialize();
+ }
+
@BeforeMethod public void setUpAction() throws ComponentInitializationException {
src = new RequestContextBuilder().buildRequestContext();
}
- @Test public void oneResource() {
+ @Test public void oneResource() throws ComponentInitializationException {
+ setupResolver(oneResolver);
final Instant time = service.getLastReloadAttemptInstant();
- service.setServiceConfigurations(oneResolver);
service.reload();
Assert.assertNotEquals(time, service.getLastReloadAttemptInstant());
final ServiceableComponent<RefreshableProviderMetadataResolver> component = service.getServiceableComponent();
@@ -90,13 +92,13 @@ public class ReloadProviderResolverServiceConfigurationTest {
Assert.assertTrue(embedded instanceof FilesystemProviderMetadataResolver);
}
- @Test(expectedExceptions = ServiceException.class) public void noResources()
+ @Test(expectedExceptions = ComponentInitializationException.class) public void noResources()
throws ComponentInitializationException {
- service.setServiceConfigurations(new ArrayList<Resource>());
- service.reload();
+ setupResolver(new ArrayList<Resource>());
}
@Test public void serviceAction() throws ComponentInitializationException {
+ setupResolver(oneResolver);
final Instant time = service.getLastReloadAttemptInstant();
final MockHttpServletResponse response = new MockHttpServletResponse();
@@ -104,6 +106,7 @@ public class ReloadProviderResolverServiceConfigurationTest {
final ReloadServiceConfiguration action =
ReloadClientResolverServiceConfigurationTest.initializeAction(service, response);
final Event event = action.execute(src);
+ service.getServiceableComponent().unpinComponent();
ActionTestingSupport.assertProceedEvent(event);
Assert.assertNotEquals(time, service.getLastReloadAttemptInstant());
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list