[DICE-UNC#448] Adjust tests for iRODS 4.3.2.

korydraughn · May 21, 2024 · f80c430 · f80c430
1 parent 9b48aaa
commit f80c430
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/jargon-core/src/test/java/org/irods/jargon/core/pub/UserGroupAOImplTest.java b/jargon-core/src/test/java/org/irods/jargon/core/pub/UserGroupAOImplTest.java
@@ -11,6 +11,7 @@
 import org.irods.jargon.core.exception.DuplicateDataException;
 import org.irods.jargon.core.exception.InvalidGroupException;
 import org.irods.jargon.core.exception.InvalidUserException;
+import org.irods.jargon.core.exception.JargonException;
 import org.irods.jargon.core.protovalues.UserTypeEnum;
 import org.irods.jargon.core.pub.domain.User;
 import org.irods.jargon.core.pub.domain.UserGroup;
@@ -765,8 +766,16 @@ public final void testRemoveUserFromGroupUserNotInGroup() throws Exception {
 		userGroupAO.removeUserGroup(userGroup);
 		userGroupAO.addUserGroup(userGroup);
 
-		userGroupAO.removeUserFromGroup(testUserGroup,
-				testingProperties.getProperty(TestingPropertiesHelper.IRODS_SECONDARY_USER_KEY), null);
+		if (accessObjectFactory.getIRODSServerProperties(irodsAccount).isAtLeastIrods432()) {
+			JargonException thrown = Assert.assertThrows(JargonException.class,
+					() -> userGroupAO.removeUserFromGroup(testUserGroup,
+							testingProperties.getProperty(TestingPropertiesHelper.IRODS_SECONDARY_USER_KEY), null));
+			Assert.assertEquals(thrown.getUnderlyingIRODSExceptionCode(), -1830000); // USER_NOT_IN_GROUP
+		}
+		else {
+			userGroupAO.removeUserFromGroup(testUserGroup,
+					testingProperties.getProperty(TestingPropertiesHelper.IRODS_SECONDARY_USER_KEY), null);
+		}
 	}
 
 	/**