SHIBUI-2024

slight refactoring (test cleanup)
TIER · Aug 18, 2021 · d941498 · d941498
1 parent b68c821
commit d941498
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 100 deletions.
diff --git a/...y/edu/internet2/tier/shibboleth/admin/ui/security/repository/GroupsRepositoryTests.groovy b/...y/edu/internet2/tier/shibboleth/admin/ui/security/repository/GroupsRepositoryTests.groovy
@@ -1,23 +1,24 @@
 package edu.internet2.tier.shibboleth.admin.ui.security.repository
 
-import javax.persistence.EntityManager
-import javax.transaction.Transactional
-
+import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration
+import edu.internet2.tier.shibboleth.admin.ui.security.model.Group
+import edu.internet2.tier.shibboleth.admin.ui.security.model.Ownership
+import edu.internet2.tier.shibboleth.admin.ui.security.model.listener.GroupUpdatedEntityListener
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.domain.EntityScan
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
+import org.springframework.boot.test.context.TestConfiguration
 import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Profile
+import org.springframework.dao.DataIntegrityViolationException
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories
 import org.springframework.test.annotation.Rollback
 import org.springframework.test.context.ActiveProfiles
 import org.springframework.test.context.ContextConfiguration
-
-import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration
-import edu.internet2.tier.shibboleth.admin.ui.security.model.Group
-import edu.internet2.tier.shibboleth.admin.ui.security.model.Ownership
-import edu.internet2.tier.shibboleth.admin.ui.security.model.listener.GroupUpdatedEntityListener
 import spock.lang.Specification
 
+import javax.transaction.Transactional
+
 /**
  * Tests to validate the repo and model for groups
  * @author chasegawa
@@ -26,7 +27,7 @@ import spock.lang.Specification
 @ContextConfiguration(classes=[InternationalizationConfiguration, LocalConfig])
 @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"])
 @EntityScan("edu.internet2.tier.shibboleth.admin.ui")
-@ActiveProfiles("test")
+@ActiveProfiles(["test","gr-tests"])
 class GroupsRepositoryTests extends Specification {
     @Autowired
     GroupsRepository groupsRepo
@@ -95,8 +96,8 @@ class GroupsRepositoryTests extends Specification {
             it.resourceId = "g1"
             it
         }
-        def Group savedGroup = groupsRepo.saveAndFlush(group)
-        def Collection all = ownershipRepository.findAllByOwner(savedGroup)
+        Group savedGroup = groupsRepo.saveAndFlush(group)
+        Collection all = ownershipRepository.findAllByOwner(savedGroup)
 
         then:
         all.size() == 3
@@ -131,7 +132,7 @@ class GroupsRepositoryTests extends Specification {
         def gList = groupsRepo.findAll()
         gList.size() == 1
         def groupFromDb = gList.get(0).asType(Group)
-        groupFromDb.equals(group) == true
+        groupFromDb.equals(group)
 
         // fetch checks
         groupsRepo.findByResourceId("not an id") == null
@@ -158,7 +159,7 @@ class GroupsRepositoryTests extends Specification {
 
         then:
         // Missing non-nullable field (name) should thrown error
-        final def exception = thrown(org.springframework.dao.DataIntegrityViolationException)
+        final def exception = thrown(DataIntegrityViolationException)
     }
 
     @Rollback
@@ -212,13 +213,14 @@ class GroupsRepositoryTests extends Specification {
         groupsRepo.findAll().size() == 0
 
         when:
-        def nothingThere = groupsRepo.findByResourceId(null);
+        def nothingThere = groupsRepo.findByResourceId(null)
 
         then:
         nothingThere == null
     }
 
-    @org.springframework.boot.test.context.TestConfiguration
+    @TestConfiguration
+    @Profile("gr-tests")
     static class LocalConfig {
         @Bean
         GroupUpdatedEntityListener groupUpdatedEntityListener(OwnershipRepository repo) {

diff --git a/...du/internet2/tier/shibboleth/admin/ui/security/repository/OwnershipRepositoryTests.groovy b/...du/internet2/tier/shibboleth/admin/ui/security/repository/OwnershipRepositoryTests.groovy
@@ -83,7 +83,7 @@ class OwnershipRepositoryTests extends Specification {
     @Rollback
     def "test clearUsersGroups"() {
         when: "remove entries where the user is the owned object of a group"
-        repo.clearUsersGroups("aaa");
+        repo.clearUsersGroups("aaa")
         def result = repo.findAllGroupsForUser("aaa")
 
         then:
@@ -102,7 +102,7 @@ class OwnershipRepositoryTests extends Specification {
         }
 
         when: "remove entries where the user is the owned object of groups"
-        repo.clearUsersGroups("ccc");
+        repo.clearUsersGroups("ccc")
         result = repo.findAllGroupsForUser("ccc")
 
         then:
@@ -113,9 +113,8 @@ class OwnershipRepositoryTests extends Specification {
     def "test deleteEntriesForOwnedObject"() {
         when: "remove entries where the user is the owned object of a group"
         repo.deleteEntriesForOwnedObject(new Ownable() {
-                public String getObjectId() { return "aaa"  }
-
-                public OwnableType getOwnableType() { OwnableType.USER }
+                String getObjectId() { return "aaa"  }
+                OwnableType getOwnableType() { OwnableType.USER }
             })
         def result = repo.findAllGroupsForUser("aaa")
 
@@ -136,10 +135,9 @@ class OwnershipRepositoryTests extends Specification {
 
         when: "remove entries where the user is the owned object of groups"
         repo.deleteEntriesForOwnedObject(new Ownable() {
-                public String getObjectId() { return "ccc"  }
-
-                public OwnableType getOwnableType() { OwnableType.USER }
-            });
+                String getObjectId() { return "ccc"  }
+                OwnableType getOwnableType() { OwnableType.USER }
+            })
         result = repo.findAllGroupsForUser("ccc")
 
         then:
@@ -153,9 +151,8 @@ class OwnershipRepositoryTests extends Specification {
         userIds.add("bbb")
         userIds.add("ccc")
         def result = repo.findUsersByOwner(new Owner() {
-            public String getOwnerId() { return "g1" }
-
-            public OwnerType getOwnerType() { OwnerType.GROUP }
+            String getOwnerId() { return "g1" }
+            OwnerType getOwnerType() { OwnerType.GROUP }
         })
 
         then:
@@ -167,9 +164,8 @@ class OwnershipRepositoryTests extends Specification {
 
         when:
         result = repo.findUsersByOwner(new Owner() {
-            public String getOwnerId() { return "aaa" }
-
-            public OwnerType getOwnerType() { return OwnerType.USER }
+            String getOwnerId() { return "aaa" }
+            OwnerType getOwnerType() { return OwnerType.USER }
         })
 
         then:
@@ -196,8 +192,8 @@ class OwnershipRepositoryTests extends Specification {
         groupIds.add("g1")
         groupIds.add("g2")
         def result = repo.findOwnableObjectOwners(new Ownable() {
-            public String getObjectId() { return "ccc" }
-            public OwnableType getOwnableType() { return OwnableType.USER }
+            String getObjectId() { return "ccc" }
+            OwnableType getOwnableType() { return OwnableType.USER }
         })
 
         then:
@@ -242,9 +238,8 @@ class OwnershipRepositoryTests extends Specification {
         userIds.add("bbb")
         userIds.add("ccc")
         def result = repo.findAllByOwner(new Owner() {
-            public String getOwnerId() { return "g1" }
-
-            public OwnerType getOwnerType() { return OwnerType.GROUP }
+            String getOwnerId() { return "g1" }
+            OwnerType getOwnerType() { return OwnerType.GROUP }
         })
 
         then: 
@@ -256,9 +251,8 @@ class OwnershipRepositoryTests extends Specification {
 
         when: "Find all items owned by user aaa"
         result = repo.findAllByOwner(new Owner() {
-            public String getOwnerId() { return "aaa" }
-
-            public OwnerType getOwnerType() { return OwnerType.USER }
+            String getOwnerId() { return "aaa" }
+            OwnerType getOwnerType() { return OwnerType.USER }
         })
 
         then:

diff --git a/...t/groovy/edu/internet2/tier/shibboleth/admin/ui/security/service/GroupServiceTests.groovy b/...t/groovy/edu/internet2/tier/shibboleth/admin/ui/security/service/GroupServiceTests.groovy
@@ -34,7 +34,7 @@ import spock.lang.Specification
 @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"])
 @EntityScan("edu.internet2.tier.shibboleth.admin.ui")
 @DirtiesContext
-@ActiveProfiles(["local"])
+@ActiveProfiles(["gs-test"])
 class GroupServiceTests extends Specification {
     @Autowired
     GroupServiceForTesting groupService
@@ -126,7 +126,7 @@ class GroupServiceTests extends Specification {
     }
 
     @TestConfiguration
-    @Profile("local")
+    @Profile("gs-test")
     static class LocalConfig {
         @Bean
         GroupServiceForTesting groupServiceForTesting(GroupsRepository repo, OwnershipRepository ownershipRepository) {