From 45afc9b5b2f5ccdc9b99bc6a3b1d3521c1430c5b Mon Sep 17 00:00:00 2001 From: Kory Draughn Date: Sat, 2 Dec 2023 12:34:33 -0500 Subject: [PATCH] squash w/ test adjustments commit. --- .../irods/jargon/core/pub/BulkFileOperationsAOImplTest.java | 5 +++++ .../java/org/irods/jargon/core/pub/CollectionAOImplTest.java | 2 ++ .../java/org/irods/jargon/core/pub/DataObjectAOImplTest.java | 1 + .../test/java/org/irods/jargon/core/pub/QuotaAOImplTest.java | 4 ++++ 4 files changed, 12 insertions(+) diff --git a/jargon-core/src/test/java/org/irods/jargon/core/pub/BulkFileOperationsAOImplTest.java b/jargon-core/src/test/java/org/irods/jargon/core/pub/BulkFileOperationsAOImplTest.java index d5592bfae..1b1069dbf 100644 --- a/jargon-core/src/test/java/org/irods/jargon/core/pub/BulkFileOperationsAOImplTest.java +++ b/jargon-core/src/test/java/org/irods/jargon/core/pub/BulkFileOperationsAOImplTest.java @@ -16,6 +16,7 @@ import org.irods.jargon.testutils.filemanip.ScratchFileUtils; import org.junit.AfterClass; import org.junit.Assert; +import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; @@ -480,6 +481,9 @@ public void testExtractBundleWithOverwriteNoBulkWhenTargetCollectionAlreadyExist irodsFileSystem.closeAndEatExceptions(); return; } + + // Skip if iRODS 4.3.0. + Assume.assumeFalse("Test issue discovered post iRODS 4.3.0 release", props.isVersion("rods4.3.0")); IRODSFile irodsFile = null; @@ -508,6 +512,7 @@ public void testExtractBundleWithOverwriteNoBulkWhenTargetCollectionAlreadyExist BulkFileOperationsAO bulkFileOperationsAO = irodsFileSystem.getIRODSAccessObjectFactory() .getBulkFileOperationsAO(irodsAccount); + // TODO Create an issue for this if it fails in 4.3.1 too. bulkFileOperationsAO.createABundleFromIrodsFilesAndStoreInIrods(targetBunFileAbsPath, targetIrodsCollection, ""); diff --git a/jargon-core/src/test/java/org/irods/jargon/core/pub/CollectionAOImplTest.java b/jargon-core/src/test/java/org/irods/jargon/core/pub/CollectionAOImplTest.java index bc8c87632..469c5e1c9 100644 --- a/jargon-core/src/test/java/org/irods/jargon/core/pub/CollectionAOImplTest.java +++ b/jargon-core/src/test/java/org/irods/jargon/core/pub/CollectionAOImplTest.java @@ -682,6 +682,7 @@ public void testBulkAddAvuMetadataWithDuplicate() throws Exception { IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); + // Skip if iRODS 4.3.0. Assume.assumeFalse("iRODS 4.3.0 does not report an error on duplicate AVUs", accessObjectFactory.getIRODSServerProperties(irodsAccount).isVersion("rods4.3.0")); @@ -830,6 +831,7 @@ public void testAddDuplicateAvuMetadata() throws Exception { IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); + // Skip if iRODS 4.3.0. Assume.assumeFalse("iRODS 4.3.0 does not report an error on duplicate AVUs", accessObjectFactory.getIRODSServerProperties(irodsAccount).isVersion("rods4.3.0")); diff --git a/jargon-core/src/test/java/org/irods/jargon/core/pub/DataObjectAOImplTest.java b/jargon-core/src/test/java/org/irods/jargon/core/pub/DataObjectAOImplTest.java index 34620139a..a0f152621 100644 --- a/jargon-core/src/test/java/org/irods/jargon/core/pub/DataObjectAOImplTest.java +++ b/jargon-core/src/test/java/org/irods/jargon/core/pub/DataObjectAOImplTest.java @@ -2822,6 +2822,7 @@ public void testAddAVUMetadataToDataObjectTwice() throws Exception { .instanceIRODSFile(targetIrodsCollection); IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); + // Skip if iRODS 4.3.0. Assume.assumeFalse("iRODS 4.3.0 does not report an error on duplicate AVUs", accessObjectFactory.getIRODSServerProperties(irodsAccount).isVersion("rods4.3.0")); diff --git a/jargon-core/src/test/java/org/irods/jargon/core/pub/QuotaAOImplTest.java b/jargon-core/src/test/java/org/irods/jargon/core/pub/QuotaAOImplTest.java index 38b2079db..5003b29b0 100644 --- a/jargon-core/src/test/java/org/irods/jargon/core/pub/QuotaAOImplTest.java +++ b/jargon-core/src/test/java/org/irods/jargon/core/pub/QuotaAOImplTest.java @@ -63,6 +63,7 @@ public void testSetUserResourceQuotaThenListAll() throws Exception { IRODSAccount irodsAccount = testingPropertiesHelper .buildIRODSAccountFromTertiaryTestProperties(testingProperties); + // Skip if iRODS 4.3.0. Assume.assumeFalse("iRODS 4.3.0 does not support user quotas", irodsFileSystem.getIRODSAccessObjectFactory() .getIRODSServerProperties(irodsAccount).isVersion("rods4.3.0")); @@ -122,6 +123,7 @@ public void testSetUserResourceQuotaThenListUser() throws Exception { IRODSAccount irodsAccount = testingPropertiesHelper .buildIRODSAccountFromTertiaryTestProperties(testingProperties); + // Skip if iRODS 4.3.0. Assume.assumeFalse("iRODS 4.3.0 does not support user quotas", irodsFileSystem.getIRODSAccessObjectFactory() .getIRODSServerProperties(irodsAccount).isVersion("rods4.3.0")); @@ -154,6 +156,7 @@ public void testSetThenListGlobalQuotaForUser() throws Exception { IRODSAccount adminAccount = testingPropertiesHelper.buildIRODSAdminAccountFromTestProperties(testingProperties); + // Skip if iRODS 4.3.0. Assume.assumeFalse("iRODS 4.3.0 does not support user quotas", irodsFileSystem.getIRODSAccessObjectFactory() .getIRODSServerProperties(adminAccount).isVersion("rods4.3.0")); @@ -180,6 +183,7 @@ public void testSetGlobalForUserThenListAllGlobalQuota() throws Exception { IRODSAccount irodsAccount = testingPropertiesHelper .buildIRODSAccountFromSecondaryTestProperties(testingProperties); + // Skip if iRODS 4.3.0. Assume.assumeFalse("iRODS 4.3.0 does not support user quotas", irodsFileSystem.getIRODSAccessObjectFactory() .getIRODSServerProperties(adminAccount).isVersion("rods4.3.0"));