SHIBUI-1740

Fix for broken tests
TIER · Jul 6, 2021 · bbe62ab · bbe62ab
1 parent 525f7c6
commit bbe62ab
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/.../tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy b/.../tier/shibboleth/admin/ui/service/envers/EnversEntityDescriptorVersionServiceTests.groovy
@@ -6,6 +6,7 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.Internationalization
 import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration
 import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration
 import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor
+import edu.internet2.tier.shibboleth.admin.ui.exception.EntityNotFoundException
 import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository
 import edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport
 import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService
@@ -108,15 +109,20 @@ class EnversEntityDescriptorVersionServiceTests extends Specification {
         v2EdRepresentation.id == ed.resourceId
     }
 
-    def "versioning service returns null for non existent version number"() {
+    def "versioning service throws EntityNotFoundException for non existent version number"() {
         when: 'Initial version'
         EntityDescriptor ed = new EntityDescriptor(entityID: 'ed', serviceProviderName: 'SP1', createdBy: 'anonymousUser')
         ed = edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTestsSupport.doInExplicitTransaction(txMgr) {
             entityDescriptorRepository.save(ed)
         }
-        def edRepresentation = entityDescriptorVersionService.findSpecificVersionOfEntityDescriptor(ed.resourceId, '1000')
-
+
         then:
-        !edRepresentation
+        try { 
+            def edRepresentation = entityDescriptorVersionService.findSpecificVersionOfEntityDescriptor(ed.resourceId, '1000')
+            1 == 2
+        }
+        catch (EntityNotFoundException expected) {
+            1 == 1
+        }
     }
 }
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/Role.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/Role.java
@@ -42,7 +42,7 @@ public Role(String name, int rank) {
     private String name;
 
     @Column(name = "ROLE_RANK")
-    private int rank;
+    private int rank; // 0=ADMIN, additional ranks are higher
 
     //Ignore properties annotation here is to prevent stack overflow recursive error during JSON serialization
     @JsonIgnoreProperties("roles")

diff --git a/...n/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java b/...n/java/edu/internet2/tier/shibboleth/admin/ui/service/EntityDescriptorVersionService.java
@@ -14,5 +14,5 @@ public interface EntityDescriptorVersionService {
 
     List<Version> findVersionsForEntityDescriptor(String resourceId) throws EntityNotFoundException;
 
-    EntityDescriptorRepresentation findSpecificVersionOfEntityDescriptor(String resourceId, String versionId);
+    EntityDescriptorRepresentation findSpecificVersionOfEntityDescriptor(String resourceId, String versionId) throws EntityNotFoundException;
 }
diff --git a/.../edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java b/.../edu/internet2/tier/shibboleth/admin/ui/service/EnversEntityDescriptorVersionService.java
@@ -32,8 +32,11 @@ public List<Version> findVersionsForEntityDescriptor(String resourceId) throws E
     }
 
     @Override
-    public EntityDescriptorRepresentation findSpecificVersionOfEntityDescriptor(String resourceId, String versionId) {
+    public EntityDescriptorRepresentation findSpecificVersionOfEntityDescriptor(String resourceId, String versionId) throws EntityNotFoundException {
         Object edObject = enversVersionServiceSupport.findSpecificVersionOfPersistentEntity(resourceId, versionId, EntityDescriptor.class);
-        return edObject == null ? null : entityDescriptorService.createRepresentationFromDescriptor((EntityDescriptor) edObject);
+        if (edObject == null) { 
+            throw new EntityNotFoundException("Unable to find specific version requested - version: " + versionId);
+        }
+        return entityDescriptorService.createRepresentationFromDescriptor((EntityDescriptor) edObject);
     }
 }