Skip to content

Commit

Permalink
[SHIBUI-1029]
Browse files Browse the repository at this point in the history
Unit test fixes.
  • Loading branch information
Bill Smith committed Jan 22, 2019
1 parent c39e573 commit f6c2a69
Showing 1 changed file with 8 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor
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.User
import edu.internet2.tier.shibboleth.admin.ui.security.repository.RoleRepository
import edu.internet2.tier.shibboleth.admin.ui.security.repository.UserRepository
import edu.internet2.tier.shibboleth.admin.ui.security.service.UserService
import edu.internet2.tier.shibboleth.admin.ui.service.JPAEntityDescriptorServiceImpl
import edu.internet2.tier.shibboleth.admin.ui.service.JPAEntityServiceImpl
import edu.internet2.tier.shibboleth.admin.ui.util.RandomGenerator
Expand Down Expand Up @@ -67,19 +69,19 @@ class EntityDescriptorControllerTests extends Specification {
Authentication authentication = Mock()
SecurityContext securityContext = Mock()
UserRepository userRepository = Mock()
RoleRepository roleRepository = Mock()

def setup() {
generator = new TestObjectGenerator()
randomGenerator = new RandomGenerator()
mapper = new ObjectMapper()
service = new JPAEntityDescriptorServiceImpl(openSamlObjects, new JPAEntityServiceImpl(openSamlObjects))

controller = new EntityDescriptorController(
entityDescriptorRepository: entityDescriptorRepository,
openSamlObjects: openSamlObjects,
entityDescriptorService: service,
userRepository: userRepository
)
controller = new EntityDescriptorController(userRepository, roleRepository, new UserService(roleRepository, userRepository))
controller.entityDescriptorRepository = entityDescriptorRepository
controller.openSamlObjects = openSamlObjects
controller.entityDescriptorService = service

controller.restTemplate = mockRestTemplate
mockMvc = MockMvcBuilders.standaloneSetup(controller).build()

Expand Down

0 comments on commit f6c2a69

Please sign in to comment.