-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge develop to branch 2393
- Loading branch information
Showing
2 changed files
with
175 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
174 changes: 174 additions & 0 deletions
174
.../internet2/tier/shibboleth/admin/ui/service/JPADynamicRegistrationServiceImplTests.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,174 @@ | ||
| package edu.internet2.tier.shibboleth.admin.ui.service | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper | ||
| import edu.internet2.tier.shibboleth.admin.ui.AbstractBaseDataJpaTest | ||
| import edu.internet2.tier.shibboleth.admin.ui.configuration.JsonSchemaComponentsConfiguration | ||
| import edu.internet2.tier.shibboleth.admin.ui.controller.DynamicRegistrationController | ||
| import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor | ||
| import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptorProtocol | ||
| import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.AssertionConsumerServiceRepresentation | ||
| import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation | ||
| import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation | ||
| import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.KeyDescriptorRepresentation | ||
| import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.LogoutEndpointRepresentation | ||
| import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.MduiRepresentation | ||
| import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.OrganizationRepresentation | ||
| import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.SecurityInfoRepresentation | ||
| import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ServiceProviderSsoDescriptorRepresentation | ||
| import edu.internet2.tier.shibboleth.admin.ui.domain.oidc.DynamicRegistrationInfo | ||
| import edu.internet2.tier.shibboleth.admin.ui.domain.oidc.GrantType | ||
| import edu.internet2.tier.shibboleth.admin.ui.domain.oidc.OAuthRPExtensions | ||
| import edu.internet2.tier.shibboleth.admin.ui.jsonschema.JsonSchemaResourceLocation | ||
| import edu.internet2.tier.shibboleth.admin.ui.jsonschema.LowLevelJsonSchemaValidator | ||
| import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects | ||
| import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository | ||
| import edu.internet2.tier.shibboleth.admin.ui.security.model.Approvers | ||
| import edu.internet2.tier.shibboleth.admin.ui.security.model.Group | ||
| import edu.internet2.tier.shibboleth.admin.ui.security.model.Role | ||
| import edu.internet2.tier.shibboleth.admin.ui.security.model.User | ||
| import edu.internet2.tier.shibboleth.admin.ui.security.repository.DynamicRegistrationInfoRepository | ||
| import edu.internet2.tier.shibboleth.admin.ui.util.RandomGenerator | ||
| import edu.internet2.tier.shibboleth.admin.ui.util.TestObjectGenerator | ||
| import edu.internet2.tier.shibboleth.admin.ui.util.WithMockAdmin | ||
| import edu.internet2.tier.shibboleth.admin.util.EntityDescriptorConversionUtils | ||
| import org.skyscreamer.jsonassert.JSONAssert | ||
| import org.springframework.beans.factory.annotation.Autowired | ||
| import org.springframework.boot.test.json.JacksonTester | ||
| import org.springframework.context.annotation.PropertySource | ||
| import org.springframework.core.io.DefaultResourceLoader | ||
| import org.springframework.mock.http.MockHttpInputMessage | ||
| import org.springframework.security.test.context.support.WithMockUser | ||
| import org.springframework.test.web.servlet.result.MockMvcResultHandlers | ||
| import org.springframework.test.web.servlet.setup.MockMvcBuilders | ||
| import org.springframework.transaction.annotation.Transactional | ||
| import org.xmlunit.builder.DiffBuilder | ||
| import org.xmlunit.builder.Input | ||
| import org.xmlunit.diff.DefaultNodeMatcher | ||
| import org.xmlunit.diff.ElementSelectors | ||
| import spock.lang.Ignore | ||
|
|
||
| import java.time.LocalDateTime | ||
|
|
||
| import static edu.internet2.tier.shibboleth.admin.ui.jsonschema.JsonSchemaLocationLookup.metadataSourcesOIDCSchema | ||
| import static edu.internet2.tier.shibboleth.admin.ui.jsonschema.JsonSchemaLocationLookup.metadataSourcesSAMLSchema | ||
| import static org.springframework.http.MediaType.APPLICATION_JSON | ||
| import static org.springframework.http.MediaType.APPLICATION_JSON | ||
| import static org.springframework.http.MediaType.APPLICATION_JSON | ||
| import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get | ||
| import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status | ||
|
|
||
| @PropertySource("classpath:application.yml") | ||
| class JPADynamicRegistrationServiceImplTests extends AbstractBaseDataJpaTest { | ||
| @Autowired | ||
| EntityService entityService | ||
|
|
||
| @Autowired | ||
| ObjectMapper mapper | ||
|
|
||
| @Autowired | ||
| JPADynamicRegistrationServiceImpl service | ||
|
|
||
| @Autowired | ||
| TestObjectGenerator testObjectGenerator | ||
|
|
||
| RandomGenerator generator | ||
| JacksonTester<EntityDescriptorRepresentation> jacksonTester | ||
|
|
||
| @Autowired | ||
| DynamicRegistrationInfoRepository repository | ||
|
|
||
| // @Transactional | ||
| // def setup() { | ||
| // Group ga = new Group() | ||
| // ga.setResourceId("testingGroupAAA") | ||
| // ga.setName("Group AAA") | ||
| // ga = groupService.createGroup(ga) | ||
| // | ||
| // Group gb = new Group() | ||
| // gb.setResourceId("testingGroupBBB") | ||
| // gb.setName("Group BBB") | ||
| // gb = groupService.createGroup(gb) | ||
| // | ||
| // Optional<Role> userRole = roleRepository.findByName("ROLE_USER") | ||
| // User user = new User(username: "someUser", roles:[userRole.get()], password: "foo") | ||
| // user.setGroup(gb) | ||
| // userService.save(user) | ||
| // } | ||
|
|
||
| @WithMockAdmin | ||
| def 'getDisabledDynamicRegistrations'() { | ||
| given: | ||
| def dynReg = new DynamicRegistrationInfo(resourceId: 'uuid-1', enabled: false, idOfOwner: "admingroup", applicationType: 'apptype', | ||
| approved: true, contacts: 'contacts', jwks: 'jwks', logoUri: 'logouri', policyUri: 'policyuri', | ||
| redirectUris: 'redirecturis', responseTypes: 'responsetypes', scope: 'scope', subjectType: 'subjecttype', | ||
| tokenEndpointAuthMethod: 'token', tosUri: 'tosuri', grantType: GrantType.implicit) | ||
| repository.saveAndFlush(dynReg) | ||
|
|
||
| when: | ||
| List<DynamicRegistrationInfo> dris = service.getDisabledDynamicRegistrations() | ||
|
|
||
| then: | ||
| dris.size() == 1 | ||
|
|
||
| when: | ||
| dynReg = new DynamicRegistrationInfo(resourceId: 'uuid-2', enabled: true, idOfOwner: "admingroup", applicationType: 'apptype', | ||
| approved: true, contacts: 'contacts', jwks: 'jwks', logoUri: 'logouri', policyUri: 'policyuri', | ||
| redirectUris: 'redirecturis', responseTypes: 'responsetypes', scope: 'scope', subjectType: 'subjecttype', | ||
| tokenEndpointAuthMethod: 'token', tosUri: 'tosuri', grantType: GrantType.implicit) | ||
| repository.saveAndFlush(dynReg) | ||
|
|
||
| then: | ||
| service.getDisabledDynamicRegistrations().size() == 1 | ||
| } | ||
| } |