This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch bugfix/reset-azure-system-property-after-test in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit bf78f6b8d1f7b1c2c489cd538a9d2dd0258eebf1 Author: Konrad Windszus <[email protected]> AuthorDate: Sun Feb 16 19:43:20 2025 +0100 OAK-8413 Reset property "segment.azure.v12.enabled" after test --- .../azure/AzureSegmentStoreServiceTest.java | 50 +++++++++++++--------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentStoreServiceTest.java b/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentStoreServiceTest.java index fb82fefd6a..8cd8c44006 100644 --- a/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentStoreServiceTest.java +++ b/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentStoreServiceTest.java @@ -16,38 +16,43 @@ */ package org.apache.jackrabbit.oak.segment.azure; -import com.azure.storage.blob.BlobContainerClient; -import com.azure.storage.blob.models.BlobItem; -import com.azure.storage.blob.models.BlobStorageException; -import com.azure.storage.blob.sas.BlobSasPermission; -import com.azure.storage.blob.sas.BlobServiceSasSignatureValues; +import static java.util.stream.Collectors.toSet; +import static org.apache.jackrabbit.oak.segment.azure.AzureUtilities.AZURE_ACCOUNT_NAME; +import static org.apache.jackrabbit.oak.segment.azure.AzureUtilities.AZURE_CLIENT_ID; +import static org.apache.jackrabbit.oak.segment.azure.AzureUtilities.AZURE_CLIENT_SECRET; +import static org.apache.jackrabbit.oak.segment.azure.AzureUtilities.AZURE_TENANT_ID; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; +import static org.junit.Assume.assumeNotNull; + +import java.io.ByteArrayInputStream; +import java.time.Duration; +import java.time.Instant; +import java.time.OffsetDateTime; +import java.util.HashMap; +import java.util.Set; +import java.util.stream.Stream; +import java.util.stream.StreamSupport; import org.apache.jackrabbit.oak.segment.azure.util.Environment; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence; import org.apache.sling.testing.mock.osgi.junit.OsgiContext; import org.jetbrains.annotations.NotNull; +import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.osgi.util.converter.Converters; -import java.util.stream.Stream; -import java.io.ByteArrayInputStream; -import java.time.Duration; -import java.time.Instant; -import java.time.OffsetDateTime; -import java.util.HashMap; -import java.util.Set; -import java.util.stream.StreamSupport; -import static java.util.stream.Collectors.toSet; -import static org.apache.jackrabbit.oak.segment.azure.AzureUtilities.*; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import static org.junit.Assume.assumeNotNull; +import com.azure.storage.blob.BlobContainerClient; +import com.azure.storage.blob.models.BlobItem; +import com.azure.storage.blob.models.BlobStorageException; +import com.azure.storage.blob.sas.BlobSasPermission; +import com.azure.storage.blob.sas.BlobServiceSasSignatureValues; public class AzureSegmentStoreServiceTest { private static final Environment ENVIRONMENT = new Environment(); @@ -88,6 +93,11 @@ public class AzureSegmentStoreServiceTest { } } + @AfterClass + public static void tearDownClass() { + System.clearProperty("segment.azure.v12.enabled"); + } + @Test public void connectWithSharedAccessSignatureURL_readOnly() throws Exception { String sasToken = container.generateSas(policy(READ_ONLY), null);
