This is an automated email from the ASF dual-hosted git repository.
hemant pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 4d8e252a8f HDDS-9499. Migrate tests in ozone-s3gateway to JUnit5
(#5616)
4d8e252a8f is described below
commit 4d8e252a8fa6fd8be2712dfa48bc0e9a743cb298
Author: Raju Balpande <[email protected]>
AuthorDate: Wed Nov 22 23:01:42 2023 +0530
HDDS-9499. Migrate tests in ozone-s3gateway to JUnit5 (#5616)
---
hadoop-ozone/s3gateway/pom.xml | 6 +-
.../ozone/protocolPB/TestGrpcOmTransport.java | 21 +--
.../hadoop/ozone/s3/TestAuthorizationFilter.java | 31 ++--
.../ozone/s3/TestEmptyContentTypeFilter.java | 18 +-
.../hadoop/ozone/s3/TestOzoneClientProducer.java | 59 +++----
.../hadoop/ozone/s3/TestS3GatewayAuditLog.java | 12 +-
.../ozone/s3/TestSignedChunksInputStream.java | 20 +--
.../ozone/s3/TestVirtualHostStyleFilter.java | 24 +--
.../s3/commontypes/TestObjectKeyNameAdapter.java | 17 +-
.../s3/endpoint/TestAbortMultipartUpload.java | 7 +-
.../hadoop/ozone/s3/endpoint/TestBucketAcl.java | 40 ++---
.../hadoop/ozone/s3/endpoint/TestBucketDelete.java | 11 +-
.../hadoop/ozone/s3/endpoint/TestBucketHead.java | 22 ++-
.../hadoop/ozone/s3/endpoint/TestBucketList.java | 150 ++++++++--------
.../hadoop/ozone/s3/endpoint/TestBucketPut.java | 35 ++--
.../ozone/s3/endpoint/TestBucketResponse.java | 2 +-
...CompleteMultipartUploadRequestUnmarshaller.java | 11 +-
.../hadoop/ozone/s3/endpoint/TestEndpointBase.java | 29 +--
.../s3/endpoint/TestInitiateMultipartUpload.java | 8 +-
.../hadoop/ozone/s3/endpoint/TestListParts.java | 21 +--
.../TestMultiDeleteRequestUnmarshaller.java | 9 +-
.../s3/endpoint/TestMultipartUploadComplete.java | 13 +-
.../s3/endpoint/TestMultipartUploadWithCopy.java | 27 ++-
.../hadoop/ozone/s3/endpoint/TestObjectDelete.java | 8 +-
.../ozone/s3/endpoint/TestObjectEndpoint.java | 14 +-
.../hadoop/ozone/s3/endpoint/TestObjectGet.java | 55 +++---
.../hadoop/ozone/s3/endpoint/TestObjectHead.java | 30 ++--
.../ozone/s3/endpoint/TestObjectMultiDelete.java | 16 +-
.../hadoop/ozone/s3/endpoint/TestObjectPut.java | 130 ++++++--------
.../hadoop/ozone/s3/endpoint/TestPartUpload.java | 19 +-
.../s3/endpoint/TestPartUploadWithStream.java | 17 +-
.../ozone/s3/endpoint/TestPermissionCheck.java | 134 +++++---------
.../hadoop/ozone/s3/endpoint/TestRootList.java | 9 +-
.../ozone/s3/endpoint/TestUploadWithStream.java | 10 +-
.../ozone/s3/exception/TestOS3Exceptions.java | 7 +-
.../ozone/s3/metrics/TestS3GatewayMetrics.java | 195 ++++++++-------------
.../signature/TestAuthorizationV2HeaderParser.java | 29 ++-
.../signature/TestAuthorizationV4HeaderParser.java | 32 ++--
.../signature/TestAuthorizationV4QueryParser.java | 9 +-
.../s3/signature/TestStringToSignProducer.java | 14 +-
.../hadoop/ozone/s3/util/TestContinueToken.java | 12 +-
.../hadoop/ozone/s3/util/TestRFC1123Util.java | 6 +-
.../ozone/s3/util/TestRangeHeaderParserUtil.java | 4 +-
.../apache/hadoop/ozone/s3/util/TestS3Utils.java | 28 +--
44 files changed, 607 insertions(+), 764 deletions(-)
diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml
index d7e619ee35..1e1cf59005 100644
--- a/hadoop-ozone/s3gateway/pom.xml
+++ b/hadoop-ozone/s3gateway/pom.xml
@@ -28,6 +28,7 @@
<properties>
<file.encoding>UTF-8</file.encoding>
<downloadSources>true</downloadSources>
+ <allow.junit4>false</allow.junit4>
</properties>
<dependencies>
@@ -153,11 +154,6 @@
<artifactId>hdds-docs</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/protocolPB/TestGrpcOmTransport.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/protocolPB/TestGrpcOmTransport.java
index 9674cc3e45..d0fae92009 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/protocolPB/TestGrpcOmTransport.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/protocolPB/TestGrpcOmTransport.java
@@ -28,30 +28,27 @@ import org.apache.hadoop.ozone.om.protocolPB.OmTransport;
import org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory;
import org.apache.hadoop.ozone.om.protocolPB.OzoneManagerProtocolPB;
import org.apache.hadoop.security.UserGroupInformation;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_TRANSPORT_CLASS;
/**
* Tests for GrpcOmTransport.
*/
+@Timeout(3000)
public class TestGrpcOmTransport {
private static final Logger LOG =
LoggerFactory.getLogger(TestGrpcOmTransport.class);
private static OzoneConfiguration conf;
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(Timeout.seconds(3000));
- @BeforeClass
+ @BeforeAll
public static void setUp() {
conf = new OzoneConfiguration();
RPC.setProtocolEngine(OzoneConfiguration.of(conf),
@@ -69,7 +66,7 @@ public class TestGrpcOmTransport {
UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
OmTransport omTransport = OmTransportFactory.create(conf, ugi,
omServiceId);
omTransport.close();
- Assert.assertEquals(GrpcOmTransport.class.getSimpleName(),
+ assertEquals(GrpcOmTransport.class.getSimpleName(),
omTransport.getClass().getSimpleName());
}
@@ -85,7 +82,7 @@ public class TestGrpcOmTransport {
// OmTransport should be Hadoop Rpc and
// fail equality GrpcOmTransport equality test
omTransport.close();
- Assert.assertNotEquals(GrpcOmTransport.class.getSimpleName(),
+ assertNotEquals(GrpcOmTransport.class.getSimpleName(),
omTransport.getClass().getSimpleName());
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestAuthorizationFilter.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestAuthorizationFilter.java
index 3bf3dcdd7b..0096f865f9 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestAuthorizationFilter.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestAuthorizationFilter.java
@@ -47,10 +47,11 @@ import static
org.apache.hadoop.ozone.s3.signature.SignatureProcessor.CONTENT_TY
import static
org.apache.hadoop.ozone.s3.signature.SignatureProcessor.HOST_HEADER;
import static
org.apache.hadoop.ozone.s3.signature.StringToSignProducer.X_AMAZ_DATE;
import static
org.apache.hadoop.ozone.s3.signature.StringToSignProducer.X_AMZ_CONTENT_SHA256;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.params.provider.Arguments.arguments;
-import org.junit.Assert;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
@@ -155,14 +156,14 @@ public class TestAuthorizationFilter {
authHeader.startsWith("AWS ")) {
// Empty auth header and unsupported AWS signature
// should fail with Invalid Request.
- Assert.assertEquals(HTTP_FORBIDDEN, ex.getResponse().getStatus());
- Assert.assertEquals(expectedErrorMsg,
+ assertEquals(HTTP_FORBIDDEN, ex.getResponse().getStatus());
+ assertEquals(expectedErrorMsg,
ex.getMessage());
} else {
// Other requests have stale timestamp and
// should fail with Malformed Authorization Header.
- Assert.assertEquals(HTTP_BAD_REQUEST, ex.getResponse().getStatus());
- Assert.assertEquals(expectedErrorMsg,
+ assertEquals(HTTP_BAD_REQUEST, ex.getResponse().getStatus());
+ assertEquals(expectedErrorMsg,
ex.getMessage());
}
@@ -256,11 +257,9 @@ public class TestAuthorizationFilter {
authorizationFilter.filter(context);
if (path.startsWith("/secret")) {
- Assert.assertNull(
- authorizationFilter.getSignatureInfo().getUnfilteredURI());
+ assertNull(authorizationFilter.getSignatureInfo().getUnfilteredURI());
- Assert.assertNull(
- authorizationFilter.getSignatureInfo().getStringToSign());
+ assertNull(authorizationFilter.getSignatureInfo().getStringToSign());
} else {
String canonicalRequest = method + "\n"
+ path + "\n"
@@ -280,13 +279,13 @@ public class TestAuthorizationFilter {
+ CURDATE + "/us-east-1/s3/aws4_request\n"
+ Hex.encode(md.digest()).toLowerCase();
- Assert.assertEquals("Unfiltered URI is not preserved",
- path,
- authorizationFilter.getSignatureInfo().getUnfilteredURI());
+ assertEquals(path,
+ authorizationFilter.getSignatureInfo().getUnfilteredURI(),
+ "Unfiltered URI is not preserved");
- Assert.assertEquals("String to sign is invalid",
- expectedStrToSign,
- authorizationFilter.getSignatureInfo().getStringToSign());
+ assertEquals(expectedStrToSign,
+ authorizationFilter.getSignatureInfo().getStringToSign(),
+ "String to sign is invalid");
}
} catch (Exception ex) {
fail("Unexpected exception: " + ex);
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestEmptyContentTypeFilter.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestEmptyContentTypeFilter.java
index 1788bd5759..e7dd4934bf 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestEmptyContentTypeFilter.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestEmptyContentTypeFilter.java
@@ -20,9 +20,11 @@ package org.apache.hadoop.ozone.s3;
import java.util.Vector;
import org.apache.hadoop.ozone.s3.EmptyContentTypeFilter.EnumerationWrapper;
+import org.junit.jupiter.api.Test;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests for {@link EmptyContentTypeFilter}.
@@ -40,11 +42,11 @@ public class TestEmptyContentTypeFilter {
final EnumerationWrapper enumerationWrapper =
new EnumerationWrapper(values.elements());
- Assert.assertTrue(enumerationWrapper.hasMoreElements());
- Assert.assertEquals("1", enumerationWrapper.nextElement());
- Assert.assertTrue(enumerationWrapper.hasMoreElements());
- Assert.assertEquals("2", enumerationWrapper.nextElement());
- Assert.assertFalse(enumerationWrapper.hasMoreElements());
+ assertTrue(enumerationWrapper.hasMoreElements());
+ assertEquals("1", enumerationWrapper.nextElement());
+ assertTrue(enumerationWrapper.hasMoreElements());
+ assertEquals("2", enumerationWrapper.nextElement());
+ assertFalse(enumerationWrapper.hasMoreElements());
}
@Test
@@ -55,7 +57,7 @@ public class TestEmptyContentTypeFilter {
final EnumerationWrapper enumerationWrapper =
new EnumerationWrapper(values.elements());
- Assert.assertFalse(enumerationWrapper.hasMoreElements());
+ assertFalse(enumerationWrapper.hasMoreElements());
}
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestOzoneClientProducer.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestOzoneClientProducer.java
index ed7a8be944..b4d1ce2374 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestOzoneClientProducer.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestOzoneClientProducer.java
@@ -22,11 +22,11 @@ import java.io.IOException;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.om.OMConfigKeys;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.fail;
-
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
/**
* Test class for @{@link OzoneClientProducer}.
@@ -46,45 +46,34 @@ public class TestOzoneClientProducer {
@Test
public void testGetClientFailure() {
- try {
- producer.createClient();
- fail("testGetClientFailure");
- } catch (Exception ex) {
- Assert.assertTrue(ex instanceof IOException);
- }
+ assertThrows(IOException.class, () -> producer.createClient(),
+ "testGetClientFailure");
}
@Test
public void testGetClientFailureWithMultipleServiceIds() {
- try {
- OzoneConfiguration configuration = new OzoneConfiguration();
- configuration.set(OMConfigKeys.OZONE_OM_SERVICE_IDS_KEY,
"ozone1,ozone2");
- producer.setOzoneConfiguration(configuration);
- producer.createClient();
- fail("testGetClientFailureWithMultipleServiceIds");
- } catch (Exception ex) {
- Assert.assertTrue(ex instanceof IOException);
- Assert.assertTrue(ex.getMessage().contains(
- "More than 1 OzoneManager ServiceID"));
- }
+ OzoneConfiguration configuration = new OzoneConfiguration();
+ configuration.set(OMConfigKeys.OZONE_OM_SERVICE_IDS_KEY, "ozone1,ozone2");
+ producer.setOzoneConfiguration(configuration);
+ IOException testGetClientFailure = assertThrows(IOException.class, () ->
+ producer.createClient(), "testGetClientFailureWithMultipleServiceIds");
+ assertTrue(testGetClientFailure.getMessage().contains(
+ "More than 1 OzoneManager ServiceID"));
}
@Test
public void testGetClientFailureWithMultipleServiceIdsAndInternalServiceId()
{
- try {
- OzoneConfiguration configuration = new OzoneConfiguration();
- configuration.set(OMConfigKeys.OZONE_OM_INTERNAL_SERVICE_ID, "ozone1");
- configuration.set(OMConfigKeys.OZONE_OM_SERVICE_IDS_KEY,
"ozone1,ozone2");
- producer.setOzoneConfiguration(configuration);
- producer.createClient();
- fail("testGetClientFailureWithMultipleServiceIdsAndInternalServiceId");
- } catch (Exception ex) {
- Assert.assertTrue(ex instanceof IOException);
- // Still test will fail, as config is not complete. But it should pass
- // the service id check.
- Assert.assertFalse(ex.getMessage().contains(
- "More than 1 OzoneManager ServiceID"));
- }
+ OzoneConfiguration configuration = new OzoneConfiguration();
+ configuration.set(OMConfigKeys.OZONE_OM_INTERNAL_SERVICE_ID, "ozone1");
+ configuration.set(OMConfigKeys.OZONE_OM_SERVICE_IDS_KEY, "ozone1,ozone2");
+ producer.setOzoneConfiguration(configuration);
+ // Still test will fail, as config is not complete. But it should pass
+ // the service id check.
+ IOException testGetClientFailure = assertThrows(IOException.class, () ->
+ producer.createClient(),
+ "testGetClientFailureWithMultipleServiceIdsAndInternalServiceId");
+ assertFalse(testGetClientFailure.getMessage().contains(
+ "More than 1 OzoneManager ServiceID"));
}
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestS3GatewayAuditLog.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestS3GatewayAuditLog.java
index 708d1ff974..0b73e04502 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestS3GatewayAuditLog.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestS3GatewayAuditLog.java
@@ -33,9 +33,9 @@ import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.s3.endpoint.BucketEndpoint;
import org.apache.hadoop.ozone.s3.endpoint.ObjectEndpoint;
import org.apache.hadoop.ozone.s3.endpoint.RootEndpoint;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,7 +46,7 @@ import java.util.List;
import java.util.Map;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Tests for S3Gateway Audit Log.
@@ -70,7 +70,7 @@ public class TestS3GatewayAuditLog {
private OzoneBucket bucket;
private Map<String, String> parametersMap = new HashMap<>();
- @Before
+ @BeforeEach
public void setup() throws Exception {
parametersMap.clear();
@@ -100,7 +100,7 @@ public class TestS3GatewayAuditLog {
}
- @AfterClass
+ @AfterAll
public static void tearDown() {
File file = new File("audit.log");
if (FileUtils.deleteQuietly(file)) {
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestSignedChunksInputStream.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestSignedChunksInputStream.java
index bfe80b4795..12ec0850ae 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestSignedChunksInputStream.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestSignedChunksInputStream.java
@@ -22,9 +22,9 @@ import java.io.IOException;
import java.io.InputStream;
import org.apache.commons.io.IOUtils;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static java.nio.charset.StandardCharsets.UTF_8;
/**
@@ -38,14 +38,14 @@ public class TestSignedChunksInputStream {
+
"=23abb2bd920ddeeaac78a63ed808bc59fa6e7d3ef0e356474b82cdc2f8c93c40");
String result = IOUtils.toString(is, UTF_8);
- Assert.assertEquals("", result);
+ assertEquals("", result);
is = fileContent("0;chunk-signature"
+
"=23abb2bd920ddeeaac78a63ed808bc59fa6e7d3ef0e356474b82cdc2f8c93c40\r"
+ "\n");
result = IOUtils.toString(is, UTF_8);
- Assert.assertEquals("", result);
+ assertEquals("", result);
}
@Test
@@ -56,7 +56,7 @@ public class TestSignedChunksInputStream {
"=23abb2bd920ddeeaac78a63ed808bc59fa6e7d3ef0e356474b82cdc2f8c93c40\r"
+ "\n1234567890\r\n");
String result = IOUtils.toString(is, UTF_8);
- Assert.assertEquals("1234567890", result);
+ assertEquals("1234567890", result);
//test read(byte[],int,int)
is = fileContent("0A;chunk-signature"
@@ -65,7 +65,7 @@ public class TestSignedChunksInputStream {
+ "\n1234567890\r\n");
byte[] bytes = new byte[10];
IOUtils.read(is, bytes, 0, 10);
- Assert.assertEquals("1234567890",
+ assertEquals("1234567890",
new String(bytes, UTF_8));
}
@@ -77,7 +77,7 @@ public class TestSignedChunksInputStream {
"=23abb2bd920ddeeaac78a63ed808bc59fa6e7d3ef0e356474b82cdc2f8c93c40\r"
+ "\n1234567890");
String result = IOUtils.toString(is, UTF_8);
- Assert.assertEquals("1234567890", result);
+ assertEquals("1234567890", result);
//test read(byte[],int,int)
is = fileContent("0A;chunk-signature"
@@ -86,7 +86,7 @@ public class TestSignedChunksInputStream {
+ "\n1234567890");
byte[] bytes = new byte[10];
IOUtils.read(is, bytes, 0, 10);
- Assert.assertEquals("1234567890",
+ assertEquals("1234567890",
new String(bytes, UTF_8));
}
@@ -98,7 +98,7 @@ public class TestSignedChunksInputStream {
+ "05;chunk-signature=signature\r\n"
+ "abcde\r\n");
String result = IOUtils.toString(is, UTF_8);
- Assert.assertEquals("1234567890abcde", result);
+ assertEquals("1234567890abcde", result);
//test read(byte[],int,int)
is = fileContent("0a;chunk-signature=signature\r\n"
@@ -107,7 +107,7 @@ public class TestSignedChunksInputStream {
+ "abcde\r\n");
byte[] bytes = new byte[15];
IOUtils.read(is, bytes, 0, 15);
- Assert.assertEquals("1234567890abcde",
+ assertEquals("1234567890abcde",
new String(bytes, UTF_8));
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestVirtualHostStyleFilter.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestVirtualHostStyleFilter.java
index 81b8e0c503..81f492c3e4 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestVirtualHostStyleFilter.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestVirtualHostStyleFilter.java
@@ -22,17 +22,17 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.ozone.test.GenericTestUtils;
import org.glassfish.jersey.internal.PropertiesDelegate;
import org.glassfish.jersey.server.ContainerRequest;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.SecurityContext;
import java.net.URI;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* This class test virtual host style mapping conversion to path style.
@@ -42,7 +42,7 @@ public class TestVirtualHostStyleFilter {
private OzoneConfiguration conf;
private String s3HttpAddr;
- @Before
+ @BeforeEach
public void setup() {
conf = new OzoneConfiguration();
s3HttpAddr = "localhost:9878";
@@ -106,7 +106,7 @@ public class TestVirtualHostStyleFilter {
".localhost:9878", "/myfile", null, true);
virtualHostStyleFilter.filter(containerRequest);
URI expected = new URI("http://"; + s3HttpAddr + "/mybucket/myfile");
- Assert.assertEquals(expected, containerRequest.getRequestUri());
+ assertEquals(expected, containerRequest.getRequestUri());
}
@Test
@@ -121,7 +121,7 @@ public class TestVirtualHostStyleFilter {
virtualHostStyleFilter.filter(containerRequest);
URI expected = new URI("http://"; + s3HttpAddr +
"/mybucket/myfile");
- Assert.assertEquals(expected, containerRequest.getRequestUri());
+ assertEquals(expected, containerRequest.getRequestUri());
}
@@ -137,14 +137,14 @@ public class TestVirtualHostStyleFilter {
null, true);
virtualHostStyleFilter.filter(containerRequest);
URI expected = new URI("http://"; + s3HttpAddr + "/secret/generate");
- Assert.assertEquals(expected, containerRequest.getRequestUri());
+ assertEquals(expected, containerRequest.getRequestUri());
containerRequest = createContainerRequest("mybucket" +
".localhost:9878", "/secret/revoke",
null, true);
virtualHostStyleFilter.filter(containerRequest);
expected = new URI("http://"; + s3HttpAddr + "/secret/revoke");
- Assert.assertEquals(expected, containerRequest.getRequestUri());
+ assertEquals(expected, containerRequest.getRequestUri());
}
@@ -159,7 +159,7 @@ public class TestVirtualHostStyleFilter {
".localhost:9878", null, null, true);
virtualHostStyleFilter.filter(containerRequest);
URI expected = new URI("http://"; + s3HttpAddr + "/mybucket");
- Assert.assertEquals(expected, containerRequest.getRequestUri());
+ assertEquals(expected, containerRequest.getRequestUri());
}
@@ -173,7 +173,7 @@ public class TestVirtualHostStyleFilter {
".localhost:9878", "/key1", null, true);
virtualHostStyleFilter.filter(containerRequest);
URI expected = new URI("http://"; + s3HttpAddr + "/mybucket/key1");
- Assert.assertEquals(expected, containerRequest.getRequestUri());
+ assertEquals(expected, containerRequest.getRequestUri());
}
@Test
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/commontypes/TestObjectKeyNameAdapter.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/commontypes/TestObjectKeyNameAdapter.java
index 5a24a69f07..2c13aa259a 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/commontypes/TestObjectKeyNameAdapter.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/commontypes/TestObjectKeyNameAdapter.java
@@ -20,10 +20,9 @@
package org.apache.hadoop.ozone.s3.commontypes;
import static org.apache.hadoop.ozone.s3.util.S3Consts.ENCODING_TYPE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Assert;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
import javax.xml.bind.annotation.adapters.XmlAdapter;
/**
* Testing on object key name serialization.
@@ -31,18 +30,18 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
public class TestObjectKeyNameAdapter {
@Test
public void testEncodeResult() throws Exception {
- Assert.assertEquals("abc/", getAdapter()
+ assertEquals("abc/", getAdapter()
.marshal(EncodingTypeObject.createNullable("abc/", ENCODING_TYPE)));
- Assert.assertEquals("a+b+c/", getAdapter()
+ assertEquals("a+b+c/", getAdapter()
.marshal(EncodingTypeObject.createNullable("a b c/", ENCODING_TYPE)));
- Assert.assertEquals("a%2Bb%2Bc/", getAdapter()
+ assertEquals("a%2Bb%2Bc/", getAdapter()
.marshal(EncodingTypeObject.createNullable("a+b+c/", ENCODING_TYPE)));
- Assert.assertEquals("abc/", getAdapter()
+ assertEquals("abc/", getAdapter()
.marshal(EncodingTypeObject.createNullable("abc/", null)));
- Assert.assertEquals("a b c/", getAdapter()
+ assertEquals("a b c/", getAdapter()
.marshal(EncodingTypeObject.createNullable("a b c/", null)));
- Assert.assertEquals("a+b+c/", getAdapter()
+ assertEquals("a+b+c/", getAdapter()
.marshal(EncodingTypeObject.createNullable("a+b+c/", null)));
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestAbortMultipartUpload.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestAbortMultipartUpload.java
index 268adca063..7b9a2e177e 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestAbortMultipartUpload.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestAbortMultipartUpload.java
@@ -25,16 +25,15 @@ import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneClientStub;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
import org.apache.hadoop.ozone.s3.exception.S3ErrorTable;
-import org.junit.Test;
import org.mockito.Mockito;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
-
+import org.junit.jupiter.api.Test;
import static org.apache.hadoop.ozone.s3.util.S3Consts.STORAGE_CLASS_HEADER;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.when;
/**
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketAcl.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketAcl.java
index 9907cf4689..8b9cb09c2d 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketAcl.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketAcl.java
@@ -26,10 +26,10 @@ import org.apache.hadoop.ozone.client.OzoneClientStub;
import org.apache.hadoop.ozone.client.OzoneVolume;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import javax.servlet.http.HttpServletRequest;
@@ -43,7 +43,8 @@ import java.util.Map;
import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
import static java.net.HttpURLConnection.HTTP_NOT_IMPLEMENTED;
import static java.net.HttpURLConnection.HTTP_OK;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.when;
/**
@@ -60,7 +61,7 @@ public class TestBucketAcl {
private BucketEndpoint bucketEndpoint;
private static final String ACL_MARKER = "acl";
- @Before
+ @BeforeEach
public void setup() throws IOException {
client = new OzoneClientStub();
client.getObjectStore().createS3Bucket(BUCKET_NAME);
@@ -74,7 +75,7 @@ public class TestBucketAcl {
bucketEndpoint.setClient(client);
}
- @After
+ @AfterEach
public void clean() throws IOException {
if (client != null) {
client.close();
@@ -96,12 +97,9 @@ public class TestBucketAcl {
when(headers.getHeaderString(S3Acl.GRANT_READ))
.thenReturn(S3Acl.ACLIdentityType.GROUP.getHeaderType() + "=root");
when(parameterMap.containsKey(ACL_MARKER)).thenReturn(true);
- try {
- bucketEndpoint.put(BUCKET_NAME, ACL_MARKER, headers, null);
- } catch (Exception e) {
- Assert.assertTrue(e instanceof OS3Exception &&
- ((OS3Exception) e).getHttpCode() == HTTP_NOT_IMPLEMENTED);
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () ->
+ bucketEndpoint.put(BUCKET_NAME, ACL_MARKER, headers, null));
+ assertEquals(e.getHttpCode(), HTTP_NOT_IMPLEMENTED);
}
@Test
@@ -231,12 +229,13 @@ public class TestBucketAcl {
volume.getAcls().get(0).getAclList().get(0));
}
- @Test(expected = OS3Exception.class)
- public void testAclInBodyWithGroupUser() throws Exception {
+ @Test
+ public void testAclInBodyWithGroupUser() {
InputStream inputBody = TestBucketAcl.class.getClassLoader()
.getResourceAsStream("groupAccessControlList.xml");
when(parameterMap.containsKey(ACL_MARKER)).thenReturn(true);
- bucketEndpoint.put(BUCKET_NAME, ACL_MARKER, headers, inputBody);
+ assertThrows(OS3Exception.class, () -> bucketEndpoint.put(
+ BUCKET_NAME, ACL_MARKER, headers, inputBody));
}
@Test
@@ -256,11 +255,8 @@ public class TestBucketAcl {
when(parameterMap.containsKey(ACL_MARKER)).thenReturn(true);
when(headers.getHeaderString(S3Acl.GRANT_READ))
.thenReturn(S3Acl.ACLIdentityType.USER.getHeaderType() + "=root");
- try {
- bucketEndpoint.getAcl("bucket-not-exist");
- } catch (Exception e) {
- Assert.assertTrue(e instanceof OS3Exception &&
- ((OS3Exception)e).getHttpCode() == HTTP_NOT_FOUND);
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () ->
+ bucketEndpoint.getAcl("bucket-not-exist"));
+ assertEquals(e.getHttpCode(), HTTP_NOT_FOUND);
}
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketDelete.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketDelete.java
index 1df9583d72..cd5639b78c 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketDelete.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketDelete.java
@@ -31,10 +31,11 @@ import org.apache.hadoop.ozone.s3.exception.OS3Exception;
import org.apache.hadoop.ozone.s3.exception.S3ErrorTable;
import org.apache.http.HttpStatus;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* This class tests delete bucket functionality.
@@ -46,7 +47,7 @@ public class TestBucketDelete {
private ObjectStore objectStoreStub;
private BucketEndpoint bucketEndpoint;
- @Before
+ @BeforeEach
public void setup() throws Exception {
//Create client stub and object store stub.
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketHead.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketHead.java
index 18b4b2c7f8..2445a54060 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketHead.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketHead.java
@@ -25,14 +25,14 @@ import javax.ws.rs.core.Response;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneClientStub;
-
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
-import org.junit.Assert;
import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
-import static org.junit.Assert.assertEquals;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* This class test HeadBucket functionality.
@@ -43,7 +43,7 @@ public class TestBucketHead {
private OzoneClient clientStub;
private BucketEndpoint bucketEndpoint;
- @Before
+ @BeforeEach
public void setup() throws Exception {
clientStub = new OzoneClientStub();
clientStub.getObjectStore().createS3Bucket(bucketName);
@@ -63,11 +63,9 @@ public class TestBucketHead {
@Test
public void testHeadFail() throws Exception {
- try {
- bucketEndpoint.head("unknownbucket");
- } catch (OS3Exception ex) {
- Assert.assertEquals(HTTP_NOT_FOUND, ex.getHttpCode());
- Assert.assertEquals("NoSuchBucket", ex.getCode());
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () ->
+ bucketEndpoint.head("unknownbucket"));
+ assertEquals(HTTP_NOT_FOUND, e.getHttpCode());
+ assertEquals("NoSuchBucket", e.getCode());
}
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketList.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketList.java
index e011c1d597..9a36a40601 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketList.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketList.java
@@ -28,11 +28,15 @@ import
org.apache.hadoop.ozone.s3.commontypes.EncodingTypeObject;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
import org.apache.hadoop.ozone.s3.exception.S3ErrorTable;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
import static org.apache.hadoop.ozone.s3.util.S3Consts.ENCODING_TYPE;
-import static org.junit.Assert.fail;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Testing basic object list browsing.
@@ -55,12 +59,12 @@ public class TestBucketList {
null, null, null, null, null)
.getEntity();
- Assert.assertEquals(1, getBucketResponse.getCommonPrefixes().size());
- Assert.assertEquals("dir1/",
+ assertEquals(1, getBucketResponse.getCommonPrefixes().size());
+ assertEquals("dir1/",
getBucketResponse.getCommonPrefixes().get(0).getPrefix().getName());
- Assert.assertEquals(1, getBucketResponse.getContents().size());
- Assert.assertEquals("file1",
+ assertEquals(1, getBucketResponse.getContents().size());
+ assertEquals("file1",
getBucketResponse.getContents().get(0).getKey().getName());
}
@@ -78,11 +82,11 @@ public class TestBucketList {
(ListObjectResponse) getBucket.get("b1", "/", null, null, 100,
"dir1", null, null, null, null, null).getEntity();
- Assert.assertEquals(1, getBucketResponse.getCommonPrefixes().size());
- Assert.assertEquals("dir1/",
+ assertEquals(1, getBucketResponse.getCommonPrefixes().size());
+ assertEquals("dir1/",
getBucketResponse.getCommonPrefixes().get(0).getPrefix().getName());
- Assert.assertEquals(0, getBucketResponse.getContents().size());
+ assertEquals(0, getBucketResponse.getContents().size());
}
@@ -103,12 +107,12 @@ public class TestBucketList {
null, null, null, null)
.getEntity();
- Assert.assertEquals(1, getBucketResponse.getCommonPrefixes().size());
- Assert.assertEquals("dir1/dir2/",
+ assertEquals(1, getBucketResponse.getCommonPrefixes().size());
+ assertEquals("dir1/dir2/",
getBucketResponse.getCommonPrefixes().get(0).getPrefix().getName());
- Assert.assertEquals(1, getBucketResponse.getContents().size());
- Assert.assertEquals("dir1/file2",
+ assertEquals(1, getBucketResponse.getContents().size());
+ assertEquals("dir1/file2",
getBucketResponse.getContents().get(0).getKey().getName());
}
@@ -129,7 +133,7 @@ public class TestBucketList {
(ListObjectResponse) getBucket.get("b1", "/", null, null, 100,
"dir1", null, null, null, null, null).getEntity();
- Assert.assertEquals(3, getBucketResponse.getCommonPrefixes().size());
+ assertEquals(3, getBucketResponse.getCommonPrefixes().size());
}
@@ -148,8 +152,8 @@ public class TestBucketList {
(ListObjectResponse) getBucket.get("b1", "/", null, null, 100,
"", null, null, null, null, null).getEntity();
- Assert.assertEquals(3, getBucketResponse.getCommonPrefixes().size());
- Assert.assertEquals("file2", getBucketResponse.getContents().get(0)
+ assertEquals(3, getBucketResponse.getCommonPrefixes().size());
+ assertEquals("file2", getBucketResponse.getContents().get(0)
.getKey().getName());
}
@@ -169,7 +173,7 @@ public class TestBucketList {
(ListObjectResponse) getBucket.get("b1", "/", null, null, 100,
"dir1bh",
null, "dir1/dir2/file2", null, null, null).getEntity();
- Assert.assertEquals(2, getBucketResponse.getCommonPrefixes().size());
+ assertEquals(2, getBucketResponse.getCommonPrefixes().size());
}
@@ -189,15 +193,15 @@ public class TestBucketList {
(ListObjectResponse) getBucket.get("b1", "", null, null, 100, "dir1/",
null, null, null, null, null).getEntity();
- Assert.assertEquals(0, getBucketResponse.getCommonPrefixes().size());
- Assert.assertEquals(4, getBucketResponse.getContents().size());
- Assert.assertEquals("dir1/",
+ assertEquals(0, getBucketResponse.getCommonPrefixes().size());
+ assertEquals(4, getBucketResponse.getContents().size());
+ assertEquals("dir1/",
getBucketResponse.getContents().get(0).getKey().getName());
- Assert.assertEquals("dir1/dir2/",
+ assertEquals("dir1/dir2/",
getBucketResponse.getContents().get(1).getKey().getName());
- Assert.assertEquals("dir1/dir2/file1",
+ assertEquals("dir1/dir2/file1",
getBucketResponse.getContents().get(2).getKey().getName());
- Assert.assertEquals("dir1/dir2/file2",
+ assertEquals("dir1/dir2/file2",
getBucketResponse.getContents().get(3).getKey().getName());
}
@@ -221,16 +225,16 @@ public class TestBucketList {
(ListObjectResponse) getBucket.get("b1", null, null, null, maxKeys,
"", null, null, null, null, null).getEntity();
- Assert.assertTrue(getBucketResponse.isTruncated());
- Assert.assertEquals(2, getBucketResponse.getContents().size());
+ assertTrue(getBucketResponse.isTruncated());
+ assertEquals(2, getBucketResponse.getContents().size());
// 2nd time
String continueToken = getBucketResponse.getNextToken();
getBucketResponse =
(ListObjectResponse) getBucket.get("b1", null, null, null, maxKeys,
"", continueToken, null, null, null, null).getEntity();
- Assert.assertTrue(getBucketResponse.isTruncated());
- Assert.assertEquals(2, getBucketResponse.getContents().size());
+ assertTrue(getBucketResponse.isTruncated());
+ assertEquals(2, getBucketResponse.getContents().size());
continueToken = getBucketResponse.getNextToken();
@@ -240,8 +244,8 @@ public class TestBucketList {
(ListObjectResponse) getBucket.get("b1", null, null, null, maxKeys,
"", continueToken, null, null, null, null).getEntity();
- Assert.assertFalse(getBucketResponse.isTruncated());
- Assert.assertEquals(1, getBucketResponse.getContents().size());
+ assertFalse(getBucketResponse.isTruncated());
+ assertEquals(1, getBucketResponse.getContents().size());
}
@@ -272,22 +276,22 @@ public class TestBucketList {
(ListObjectResponse) getBucket.get("b1", "/", null, null, maxKeys,
"test/", null, null, null, null, null).getEntity();
- Assert.assertEquals(0, getBucketResponse.getContents().size());
- Assert.assertEquals(2, getBucketResponse.getCommonPrefixes().size());
- Assert.assertEquals("test/dir1/",
+ assertEquals(0, getBucketResponse.getContents().size());
+ assertEquals(2, getBucketResponse.getCommonPrefixes().size());
+ assertEquals("test/dir1/",
getBucketResponse.getCommonPrefixes().get(0).getPrefix().getName());
- Assert.assertEquals("test/dir2/",
+ assertEquals("test/dir2/",
getBucketResponse.getCommonPrefixes().get(1).getPrefix().getName());
getBucketResponse =
(ListObjectResponse) getBucket.get("b1", "/", null, null, maxKeys,
"test/", getBucketResponse.getNextToken(), null, null, null,
null).getEntity();
- Assert.assertEquals(1, getBucketResponse.getContents().size());
- Assert.assertEquals(1, getBucketResponse.getCommonPrefixes().size());
- Assert.assertEquals("test/dir3/",
+ assertEquals(1, getBucketResponse.getContents().size());
+ assertEquals(1, getBucketResponse.getCommonPrefixes().size());
+ assertEquals("test/dir3/",
getBucketResponse.getCommonPrefixes().get(0).getPrefix().getName());
- Assert.assertEquals("test/file8",
+ assertEquals("test/file8",
getBucketResponse.getContents().get(0).getKey().getName());
}
@@ -315,16 +319,16 @@ public class TestBucketList {
(ListObjectResponse) getBucket.get("b1", "/", null, null, maxKeys,
"dir", null, null, null, null, null).getEntity();
- Assert.assertTrue(getBucketResponse.isTruncated());
- Assert.assertEquals(2, getBucketResponse.getCommonPrefixes().size());
+ assertTrue(getBucketResponse.isTruncated());
+ assertEquals(2, getBucketResponse.getCommonPrefixes().size());
// 2nd time
String continueToken = getBucketResponse.getNextToken();
getBucketResponse =
(ListObjectResponse) getBucket.get("b1", "/", null, null, maxKeys,
"dir", continueToken, null, null, null, null).getEntity();
- Assert.assertTrue(getBucketResponse.isTruncated());
- Assert.assertEquals(2, getBucketResponse.getCommonPrefixes().size());
+ assertTrue(getBucketResponse.isTruncated());
+ assertEquals(2, getBucketResponse.getCommonPrefixes().size());
//3rd time
continueToken = getBucketResponse.getNextToken();
@@ -332,8 +336,8 @@ public class TestBucketList {
(ListObjectResponse) getBucket.get("b1", "/", null, null, maxKeys,
"dir", continueToken, null, null, null, null).getEntity();
- Assert.assertFalse(getBucketResponse.isTruncated());
- Assert.assertEquals(1, getBucketResponse.getCommonPrefixes().size());
+ assertFalse(getBucketResponse.isTruncated());
+ assertEquals(1, getBucketResponse.getCommonPrefixes().size());
}
@@ -348,15 +352,11 @@ public class TestBucketList {
getBucket.setClient(ozoneClient);
- try {
- getBucket.get("b1", "/", null, null, 2, "dir", "random", null,
- null, null, null).getEntity();
- fail("listWithContinuationTokenFail");
- } catch (OS3Exception ex) {
- Assert.assertEquals("random", ex.getResource());
- Assert.assertEquals("Invalid Argument", ex.getErrorMessage());
- }
-
+ OS3Exception e = assertThrows(OS3Exception.class, () -> getBucket.get("b1",
+ "/", null, null, 2, "dir", "random", null, null, null, null)
+ .getEntity(), "listWithContinuationTokenFail");
+ assertEquals("random", e.getResource());
+ assertEquals("Invalid Argument", e.getErrorMessage());
}
@@ -374,8 +374,8 @@ public class TestBucketList {
(ListObjectResponse) getBucket.get("b1", null, null, null, 1000,
null, null, null, null, null, null).getEntity();
- Assert.assertFalse(getBucketResponse.isTruncated());
- Assert.assertEquals(5, getBucketResponse.getContents().size());
+ assertFalse(getBucketResponse.isTruncated());
+ assertEquals(5, getBucketResponse.getContents().size());
//As our list output is sorted, after seeking to startAfter, we shall
// have 4 keys.
@@ -385,15 +385,15 @@ public class TestBucketList {
(ListObjectResponse) getBucket.get("b1", null, null, null,
1000, null, null, startAfter, null, null, null).getEntity();
- Assert.assertFalse(getBucketResponse.isTruncated());
- Assert.assertEquals(4, getBucketResponse.getContents().size());
+ assertFalse(getBucketResponse.isTruncated());
+ assertEquals(4, getBucketResponse.getContents().size());
getBucketResponse =
(ListObjectResponse) getBucket.get("b1", null, null, null,
1000, null, null, "random", null, null, null).getEntity();
- Assert.assertFalse(getBucketResponse.isTruncated());
- Assert.assertEquals(0, getBucketResponse.getContents().size());
+ assertFalse(getBucketResponse.isTruncated());
+ assertEquals(0, getBucketResponse.getContents().size());
}
@@ -445,11 +445,11 @@ public class TestBucketList {
assertEncodingTypeObject(prefix, encodingType, response.getPrefix());
assertEncodingTypeObject(startAfter, encodingType,
response.getStartAfter());
- Assert.assertNotNull(response.getCommonPrefixes());
- Assert.assertNotNull(response.getContents());
+ assertNotNull(response.getCommonPrefixes());
+ assertNotNull(response.getContents());
assertEncodingTypeObject(prefix + delimiter, encodingType,
response.getCommonPrefixes().get(0).getPrefix());
- Assert.assertEquals(encodingType,
+ assertEquals(encodingType,
response.getContents().get(0).getKey().getEncodingType());
response = (ListObjectResponse) getBucket.get(
@@ -462,37 +462,31 @@ public class TestBucketList {
assertEncodingTypeObject(delimiter, null, response.getDelimiter());
assertEncodingTypeObject(prefix, null, response.getPrefix());
assertEncodingTypeObject(startAfter, null, response.getStartAfter());
- Assert.assertNotNull(response.getCommonPrefixes());
- Assert.assertNotNull(response.getContents());
+ assertNotNull(response.getCommonPrefixes());
+ assertNotNull(response.getContents());
assertEncodingTypeObject(prefix + delimiter, null,
response.getCommonPrefixes().get(0).getPrefix());
-
Assert.assertNull(response.getContents().get(0).getKey().getEncodingType());
+ assertNull(response.getContents().get(0).getKey().getEncodingType());
}
@Test
- public void testEncodingTypeException() throws IOException, OS3Exception {
+ public void testEncodingTypeException() throws IOException {
BucketEndpoint getBucket = new BucketEndpoint();
OzoneClient client = new OzoneClientStub();
client.getObjectStore().createS3Bucket("b1");
getBucket.setClient(client);
- try {
- ListObjectResponse response = (ListObjectResponse) getBucket.get(
- "b1", null, "unSupportType", null, 1000, null,
- null, null, null, null, null).getEntity();
- Assert.fail();
- } catch (Exception e) {
- Assert.assertTrue(e instanceof OS3Exception);
- Assert.assertEquals(S3ErrorTable.INVALID_ARGUMENT.getCode(),
- ((OS3Exception) e).getCode());
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () -> getBucket.get(
+ "b1", null, "unSupportType", null, 1000, null,
+ null, null, null, null, null).getEntity());
+ assertEquals(S3ErrorTable.INVALID_ARGUMENT.getCode(), e.getCode());
}
private void assertEncodingTypeObject(
String exceptName, String exceptEncodingType, EncodingTypeObject object)
{
- Assert.assertEquals(exceptName, object.getName());
- Assert.assertEquals(exceptEncodingType, object.getEncodingType());
+ assertEquals(exceptName, object.getName());
+ assertEquals(exceptEncodingType, object.getEncodingType());
}
private OzoneClient createClientWithKeys(String... keys) throws IOException {
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketPut.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketPut.java
index 8d09da98ab..17c83aa44b 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketPut.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketPut.java
@@ -33,11 +33,12 @@ import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
import static
org.apache.hadoop.ozone.s3.exception.S3ErrorTable.BUCKET_ALREADY_EXISTS;
import static
org.apache.hadoop.ozone.s3.exception.S3ErrorTable.MALFORMED_HEADER;
import static
org.apache.hadoop.ozone.s3.signature.SignatureProcessor.DATE_FORMATTER;
-import org.junit.Assert;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* This class test Create Bucket functionality.
@@ -48,7 +49,7 @@ public class TestBucketPut {
private OzoneClient clientStub;
private BucketEndpoint bucketEndpoint;
- @Before
+ @BeforeEach
public void setup() throws Exception {
//Create client stub and object store stub.
@@ -61,12 +62,11 @@ public class TestBucketPut {
@Test
public void testBucketFailWithAuthHeaderMissing() throws Exception {
-
try {
bucketEndpoint.put(bucketName, null, null, null);
} catch (OS3Exception ex) {
- Assert.assertEquals(HTTP_NOT_FOUND, ex.getHttpCode());
- Assert.assertEquals(MALFORMED_HEADER.getCode(), ex.getCode());
+ assertEquals(HTTP_NOT_FOUND, ex.getHttpCode());
+ assertEquals(MALFORMED_HEADER.getCode(), ex.getCode());
}
}
@@ -75,13 +75,12 @@ public class TestBucketPut {
Response response = bucketEndpoint.put(bucketName, null, null, null);
assertEquals(200, response.getStatus());
assertNotNull(response.getLocation());
- try {
- // Create-bucket on an existing bucket fails
- bucketEndpoint.put(bucketName, null, null, null);
- } catch (OS3Exception ex) {
- Assert.assertEquals(HTTP_CONFLICT, ex.getHttpCode());
- Assert.assertEquals(BUCKET_ALREADY_EXISTS.getCode(), ex.getCode());
- }
+
+ // Create-bucket on an existing bucket fails
+ OS3Exception e = assertThrows(OS3Exception.class, () -> bucketEndpoint.put(
+ bucketName, null, null, null));
+ assertEquals(HTTP_CONFLICT, e.getHttpCode());
+ assertEquals(BUCKET_ALREADY_EXISTS.getCode(), e.getCode());
}
@Test
@@ -89,8 +88,8 @@ public class TestBucketPut {
try {
bucketEndpoint.put(bucketName, null, null, null);
} catch (OS3Exception ex) {
- Assert.assertEquals(HTTP_NOT_FOUND, ex.getHttpCode());
- Assert.assertEquals(MALFORMED_HEADER.getCode(), ex.getCode());
+ assertEquals(HTTP_NOT_FOUND, ex.getHttpCode());
+ assertEquals(MALFORMED_HEADER.getCode(), ex.getCode());
}
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketResponse.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketResponse.java
index 4576332c97..a24279e4d7 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketResponse.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketResponse.java
@@ -22,7 +22,7 @@ package org.apache.hadoop.ozone.s3.endpoint;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Testing JAXB serialization.
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestCompleteMultipartUploadRequestUnmarshaller.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestCompleteMultipartUploadRequestUnmarshaller.java
index 4a44a035c9..ab87f9c98e 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestCompleteMultipartUploadRequestUnmarshaller.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestCompleteMultipartUploadRequestUnmarshaller.java
@@ -18,15 +18,14 @@
package org.apache.hadoop.ozone.s3.endpoint;
-import org.junit.Assert;
-import org.junit.Test;
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.List;
import java.util.UUID;
+import org.junit.jupiter.api.Test;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Class tests Unmarshall logic of {@link CompleteMultipartUploadRequest}.
@@ -76,13 +75,13 @@ public class TestCompleteMultipartUploadRequestUnmarshaller
{
}
private void checkContent(CompleteMultipartUploadRequest request) {
- Assert.assertEquals(2, request.getPartList().size());
+ assertEquals(2, request.getPartList().size());
List<CompleteMultipartUploadRequest.Part> parts =
request.getPartList();
- Assert.assertEquals(part1, parts.get(0).geteTag());
- Assert.assertEquals(part2, parts.get(1).geteTag());
+ assertEquals(part1, parts.get(0).geteTag());
+ assertEquals(part2, parts.get(1).geteTag());
}
private CompleteMultipartUploadRequest unmarshall(
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestEndpointBase.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestEndpointBase.java
index ebfe6f83db..5c95949c2b 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestEndpointBase.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestEndpointBase.java
@@ -24,16 +24,19 @@ package org.apache.hadoop.ozone.s3.endpoint;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
-import org.junit.Assert;
-import org.junit.Test;
import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap;
import java.nio.charset.StandardCharsets;
import java.util.Map;
+import org.junit.jupiter.api.Test;
import static
org.apache.hadoop.ozone.s3.util.S3Consts.CUSTOM_METADATA_HEADER_PREFIX;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Test methods of the EndpointBase.
@@ -64,13 +67,13 @@ public class TestEndpointBase {
Map<String, String> filteredCustomMetadata =
endpointBase.getCustomMetadataFromHeaders(s3requestHeaders);
- Assert.assertTrue(filteredCustomMetadata.containsKey("custom-key1"));
- Assert.assertEquals(
+ assertTrue(filteredCustomMetadata.containsKey("custom-key1"));
+ assertEquals(
"custom-value1", filteredCustomMetadata.get("custom-key1"));
- Assert.assertTrue(filteredCustomMetadata.containsKey("custom-key2"));
- Assert.assertEquals(
+ assertTrue(filteredCustomMetadata.containsKey("custom-key2"));
+ assertEquals(
"custom-value2", filteredCustomMetadata.get("custom-key2"));
- Assert.assertFalse(
+ assertFalse(
filteredCustomMetadata.containsKey(OzoneConsts.GDPR_FLAG));
}
@@ -94,13 +97,11 @@ public class TestEndpointBase {
public void init() { }
};
- try {
- endpointBase.getCustomMetadataFromHeaders(s3requestHeaders);
- Assert.fail("getCustomMetadataFromHeaders should fail. " +
- "Expected OS3Exception not thrown");
- } catch (OS3Exception ex) {
- Assert.assertTrue(ex.getCode().contains("MetadataTooLarge"));
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () -> endpointBase
+ .getCustomMetadataFromHeaders(s3requestHeaders),
+ "getCustomMetadataFromHeaders should fail." +
+ " Expected OS3Exception not thrown");
+ assertTrue(e.getCode().contains("MetadataTooLarge"));
}
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestInitiateMultipartUpload.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestInitiateMultipartUpload.java
index 8bd0b84d77..c212ff66e4 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestInitiateMultipartUpload.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestInitiateMultipartUpload.java
@@ -26,17 +26,17 @@ import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneClientStub;
import org.jetbrains.annotations.NotNull;
-import org.junit.Test;
import org.mockito.Mockito;
+import org.junit.jupiter.api.Test;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import static org.apache.hadoop.ozone.s3.util.S3Consts.STORAGE_CLASS_HEADER;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.when;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* This class tests Initiate Multipart Upload request.
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestListParts.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestListParts.java
index 9b37024d33..35d713e4c4 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestListParts.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestListParts.java
@@ -24,9 +24,8 @@ import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneClientStub;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
import org.apache.hadoop.ozone.s3.exception.S3ErrorTable;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import javax.ws.rs.core.HttpHeaders;
@@ -36,9 +35,11 @@ import java.io.ByteArrayInputStream;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.hadoop.ozone.s3.util.S3Consts.STORAGE_CLASS_HEADER;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.when;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* This class test list parts request.
@@ -49,7 +50,7 @@ public class TestListParts {
private static final ObjectEndpoint REST = new ObjectEndpoint();
private static String uploadID;
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
OzoneClient client = new OzoneClientStub();
@@ -99,7 +100,7 @@ public class TestListParts {
ListPartsResponse listPartsResponse =
(ListPartsResponse) response.getEntity();
- Assert.assertFalse(listPartsResponse.getTruncated());
+ assertFalse(listPartsResponse.getTruncated());
assertEquals(3, listPartsResponse.getPartList().size());
}
@@ -111,7 +112,7 @@ public class TestListParts {
ListPartsResponse listPartsResponse =
(ListPartsResponse) response.getEntity();
- Assert.assertTrue(listPartsResponse.getTruncated());
+ assertTrue(listPartsResponse.getTruncated());
assertEquals(2, listPartsResponse.getPartList().size());
// Continue
@@ -119,7 +120,7 @@ public class TestListParts {
Integer.toString(listPartsResponse.getNextPartNumberMarker()));
listPartsResponse = (ListPartsResponse) response.getEntity();
- Assert.assertFalse(listPartsResponse.getTruncated());
+ assertFalse(listPartsResponse.getTruncated());
assertEquals(1, listPartsResponse.getPartList().size());
}
@@ -130,7 +131,7 @@ public class TestListParts {
REST.get(OzoneConsts.S3_BUCKET, OzoneConsts.KEY, 0,
uploadID, 2, "0");
} catch (OS3Exception ex) {
- Assert.assertEquals(S3ErrorTable.NO_SUCH_UPLOAD.getErrorMessage(),
+ assertEquals(S3ErrorTable.NO_SUCH_UPLOAD.getErrorMessage(),
ex.getErrorMessage());
}
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultiDeleteRequestUnmarshaller.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultiDeleteRequestUnmarshaller.java
index 0543c45ddd..6bb2e0b171 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultiDeleteRequestUnmarshaller.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultiDeleteRequestUnmarshaller.java
@@ -21,11 +21,10 @@ package org.apache.hadoop.ozone.s3.endpoint;
import java.io.ByteArrayInputStream;
import java.io.IOException;
-
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
import static java.nio.charset.StandardCharsets.UTF_8;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Test custom marshalling of MultiDeleteRequest.
@@ -48,7 +47,7 @@ public class TestMultiDeleteRequestUnmarshaller {
unmarshall(inputBody);
//THEN
- Assert.assertEquals(3, multiDeleteRequest.getObjects().size());
+ assertEquals(3, multiDeleteRequest.getObjects().size());
}
@Test
@@ -66,7 +65,7 @@ public class TestMultiDeleteRequestUnmarshaller {
unmarshall(inputBody);
//THEN
- Assert.assertEquals(3, multiDeleteRequest.getObjects().size());
+ assertEquals(3, multiDeleteRequest.getObjects().size());
}
private MultiDeleteRequest unmarshall(ByteArrayInputStream inputBody)
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultipartUploadComplete.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultipartUploadComplete.java
index f6e70ff8bf..5bbbe9f2bc 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultipartUploadComplete.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultipartUploadComplete.java
@@ -26,8 +26,8 @@ import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneClientStub;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
import org.apache.hadoop.ozone.s3.exception.S3ErrorTable;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import javax.ws.rs.core.HttpHeaders;
@@ -38,14 +38,13 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-
import org.apache.hadoop.ozone.s3.endpoint.CompleteMultipartUploadRequest.Part;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.hadoop.ozone.s3.util.S3Consts.STORAGE_CLASS_HEADER;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.when;
/**
@@ -57,7 +56,7 @@ public class TestMultipartUploadComplete {
private static final ObjectEndpoint REST = new ObjectEndpoint();
private static final OzoneClient CLIENT = new OzoneClientStub();
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
CLIENT.getObjectStore().createS3Bucket(OzoneConsts.S3_BUCKET);
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultipartUploadWithCopy.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultipartUploadWithCopy.java
index 7186ceb557..7b32fa421f 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultipartUploadWithCopy.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultipartUploadWithCopy.java
@@ -43,6 +43,11 @@ import org.apache.hadoop.ozone.client.OzoneClientStub;
import org.apache.hadoop.ozone.client.OzoneMultipartUploadPartListParts;
import org.apache.hadoop.ozone.s3.endpoint.CompleteMultipartUploadRequest.Part;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
+import org.apache.hadoop.ozone.s3.exception.S3ErrorTable;
+import org.apache.hadoop.ozone.web.utils.OzoneUtils;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.hadoop.ozone.s3.util.S3Consts.COPY_SOURCE_HEADER;
@@ -50,18 +55,10 @@ import static
org.apache.hadoop.ozone.s3.util.S3Consts.COPY_SOURCE_HEADER_RANGE;
import static
org.apache.hadoop.ozone.s3.util.S3Consts.COPY_SOURCE_IF_MODIFIED_SINCE;
import static
org.apache.hadoop.ozone.s3.util.S3Consts.COPY_SOURCE_IF_UNMODIFIED_SINCE;
import static org.apache.hadoop.ozone.s3.util.S3Consts.STORAGE_CLASS_HEADER;
-
-import org.apache.hadoop.ozone.s3.exception.S3ErrorTable;
-import org.apache.hadoop.ozone.web.utils.OzoneUtils;
-import org.junit.Assert;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import static org.junit.Assert.fail;
import static org.mockito.Mockito.when;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Class to test Multipart upload where parts are created with copy header.
@@ -83,7 +80,7 @@ public class TestMultipartUploadWithCopy {
private static final String UNPARSABLE_TIME_STR = "Unparsable time string";
private static final String ERROR_CODE =
S3ErrorTable.PRECOND_FAILED.getCode();
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
CLIENT.getObjectStore().createS3Bucket(OzoneConsts.S3_BUCKET);
@@ -171,7 +168,7 @@ public class TestMultipartUploadWithCopy {
try (InputStream is = bucket.readKey(KEY)) {
String keyContent = new Scanner(is, UTF_8.name())
.useDelimiter("\\A").next();
- Assert.assertEquals(
+ assertEquals(
content + EXISTING_KEY_CONTENT + EXISTING_KEY_CONTENT.substring(0,
4),
keyContent);
}
@@ -404,8 +401,8 @@ public class TestMultipartUploadWithCopy {
OzoneMultipartUploadPartListParts parts =
CLIENT.getObjectStore().getS3Bucket(OzoneConsts.S3_BUCKET)
.listParts(KEY, uploadID, 0, 100);
- Assert.assertEquals(1, parts.getPartInfoList().size());
- Assert.assertEquals(4, parts.getPartInfoList().get(0).getSize());
+ assertEquals(1, parts.getPartInfoList().size());
+ assertEquals(4, parts.getPartInfoList().get(0).getSize());
}
private void completeMultipartUpload(String key,
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectDelete.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectDelete.java
index 2eb78f4d82..4deac33291 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectDelete.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectDelete.java
@@ -27,8 +27,8 @@ import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneClientStub;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
/**
* Test delete object.
@@ -54,7 +54,7 @@ public class TestObjectDelete {
rest.delete("b1", "key1", null);
//THEN
- Assert.assertFalse("Bucket Should not contain any key after delete",
- bucket.listKeys("").hasNext());
+ Assertions.assertFalse(bucket.listKeys("").hasNext(),
+ "Bucket Should not contain any key after delete");
}
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectEndpoint.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectEndpoint.java
index f784dd0cbc..eb700c570d 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectEndpoint.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectEndpoint.java
@@ -20,10 +20,10 @@
package org.apache.hadoop.ozone.s3.endpoint;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
-
+import org.junit.jupiter.api.Test;
import org.apache.commons.lang3.tuple.Pair;
-import org.junit.Assert;
-import org.junit.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Test static utility methods of the ObjectEndpoint.
@@ -35,9 +35,9 @@ public class TestObjectEndpoint {
Pair<String, String> bucketKey =
ObjectEndpoint.parseSourceHeader("bucket1/key1");
- Assert.assertEquals("bucket1", bucketKey.getLeft());
+ assertEquals("bucket1", bucketKey.getLeft());
- Assert.assertEquals("key1", bucketKey.getRight());
+ assertEquals("key1", bucketKey.getRight());
}
@Test
@@ -45,9 +45,9 @@ public class TestObjectEndpoint {
Pair<String, String> bucketKey =
ObjectEndpoint.parseSourceHeader("/bucket1/key1");
- Assert.assertEquals("bucket1", bucketKey.getLeft());
+ assertEquals("bucket1", bucketKey.getLeft());
- Assert.assertEquals("key1", bucketKey.getRight());
+ assertEquals("key1", bucketKey.getRight());
}
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectGet.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectGet.java
index 0ab94522c6..10e24d5e28 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectGet.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectGet.java
@@ -37,10 +37,8 @@ import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
import org.apache.commons.io.IOUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import static java.nio.charset.StandardCharsets.UTF_8;
@@ -48,6 +46,8 @@ import static
org.apache.hadoop.ozone.s3.S3GatewayConfigKeys.OZONE_S3G_FSO_DIREC
import static org.apache.hadoop.ozone.s3.exception.S3ErrorTable.NO_SUCH_KEY;
import static org.apache.hadoop.ozone.s3.util.S3Consts.RANGE_HEADER;
import static org.mockito.Mockito.doReturn;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Test get object.
@@ -74,7 +74,7 @@ public class TestObjectGet {
private OzoneClient client;
private ContainerRequestContext context;
- @Before
+ @BeforeEach
public void init() throws IOException {
//GIVEN
client = new OzoneClientStub();
@@ -110,8 +110,8 @@ public class TestObjectGet {
String keyContent =
IOUtils.toString(ozoneInputStream, UTF_8);
- Assert.assertEquals(CONTENT, keyContent);
- Assert.assertEquals("" + keyContent.length(),
+ assertEquals(CONTENT, keyContent);
+ assertEquals("" + keyContent.length(),
response.getHeaderString("Content-Length"));
DateTimeFormatter.RFC_1123_DATE_TIME
@@ -125,17 +125,17 @@ public class TestObjectGet {
Response response = rest.get("b1", "key1", 0, null, 0, null);
- Assert.assertEquals(CONTENT_TYPE1,
+ assertEquals(CONTENT_TYPE1,
response.getHeaderString("Content-Type"));
- Assert.assertEquals(CONTENT_LANGUAGE1,
+ assertEquals(CONTENT_LANGUAGE1,
response.getHeaderString("Content-Language"));
- Assert.assertEquals(EXPIRES1,
+ assertEquals(EXPIRES1,
response.getHeaderString("Expires"));
- Assert.assertEquals(CACHE_CONTROL1,
+ assertEquals(CACHE_CONTROL1,
response.getHeaderString("Cache-Control"));
- Assert.assertEquals(CONTENT_DISPOSITION1,
+ assertEquals(CONTENT_DISPOSITION1,
response.getHeaderString("Content-Disposition"));
- Assert.assertEquals(CONTENT_ENCODING1,
+ assertEquals(CONTENT_ENCODING1,
response.getHeaderString("Content-Encoding"));
}
@@ -158,17 +158,17 @@ public class TestObjectGet {
.thenReturn(queryParameter);
Response response = rest.get("b1", "key1", 0, null, 0, null);
- Assert.assertEquals(CONTENT_TYPE2,
+ assertEquals(CONTENT_TYPE2,
response.getHeaderString("Content-Type"));
- Assert.assertEquals(CONTENT_LANGUAGE2,
+ assertEquals(CONTENT_LANGUAGE2,
response.getHeaderString("Content-Language"));
- Assert.assertEquals(EXPIRES2,
+ assertEquals(EXPIRES2,
response.getHeaderString("Expires"));
- Assert.assertEquals(CACHE_CONTROL2,
+ assertEquals(CACHE_CONTROL2,
response.getHeaderString("Cache-Control"));
- Assert.assertEquals(CONTENT_DISPOSITION2,
+ assertEquals(CONTENT_DISPOSITION2,
response.getHeaderString("Content-Disposition"));
- Assert.assertEquals(CONTENT_ENCODING2,
+ assertEquals(CONTENT_ENCODING2,
response.getHeaderString("Content-Encoding"));
}
@@ -178,15 +178,15 @@ public class TestObjectGet {
Mockito.when(headers.getHeaderString(RANGE_HEADER)).thenReturn("bytes=0-0");
response = rest.get("b1", "key1", 0, null, 0, null);
- Assert.assertEquals("1", response.getHeaderString("Content-Length"));
- Assert.assertEquals(String.format("bytes 0-0/%s", CONTENT.length()),
+ assertEquals("1", response.getHeaderString("Content-Length"));
+ assertEquals(String.format("bytes 0-0/%s", CONTENT.length()),
response.getHeaderString("Content-Range"));
Mockito.when(headers.getHeaderString(RANGE_HEADER)).thenReturn("bytes=0-");
response = rest.get("b1", "key1", 0, null, 0, null);
- Assert.assertEquals(String.valueOf(CONTENT.length()),
+ assertEquals(String.valueOf(CONTENT.length()),
response.getHeaderString("Content-Length"));
- Assert.assertEquals(
+ assertEquals(
String.format("bytes 0-%s/%s", CONTENT.length() - 1, CONTENT.length()),
response.getHeaderString("Content-Range"));
}
@@ -195,7 +195,7 @@ public class TestObjectGet {
public void getStatusCode() throws IOException, OS3Exception {
Response response;
response = rest.get("b1", "key1", 0, null, 0, null);
- Assert.assertEquals(response.getStatus(),
+ assertEquals(response.getStatus(),
Response.Status.OK.getStatusCode());
// https://www.rfc-editor.org/rfc/rfc7233#section-4.1
@@ -203,7 +203,7 @@ public class TestObjectGet {
// successfully fulfilling a range request for the target resource
Mockito.when(headers.getHeaderString(RANGE_HEADER)).thenReturn("bytes=0-1");
response = rest.get("b1", "key1", 0, null, 0, null);
- Assert.assertEquals(response.getStatus(),
+ assertEquals(response.getStatus(),
Response.Status.PARTIAL_CONTENT.getStatusCode());
}
@@ -235,12 +235,11 @@ public class TestObjectGet {
bucket.createDirectory(keyPath);
// WHEN
- final OS3Exception ex =
- Assertions.assertThrows(OS3Exception.class,
+ final OS3Exception ex = assertThrows(OS3Exception.class,
() -> rest.get(bucketName, keyPath, 0, null, 0, null));
// THEN
- Assertions.assertEquals(NO_SUCH_KEY.getCode(), ex.getCode());
+ assertEquals(NO_SUCH_KEY.getCode(), ex.getCode());
bucket.deleteKey(keyPath);
}
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectHead.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectHead.java
index 2e463e3d4a..2f0af8087f 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectHead.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectHead.java
@@ -37,13 +37,13 @@ import org.apache.hadoop.ozone.s3.exception.OS3Exception;
import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
import static java.nio.charset.StandardCharsets.UTF_8;
import static
org.apache.hadoop.ozone.s3.S3GatewayConfigKeys.OZONE_S3G_FSO_DIRECTORY_CREATION_ENABLED;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.http.HttpStatus;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test head object.
@@ -53,7 +53,7 @@ public class TestObjectHead {
private ObjectEndpoint keyEndpoint;
private OzoneBucket bucket;
- @Before
+ @BeforeEach
public void setup() throws IOException {
//Create client stub and object store stub.
OzoneClient clientStub = new OzoneClientStub();
@@ -84,8 +84,8 @@ public class TestObjectHead {
Response response = keyEndpoint.head(bucketName, "key1");
//THEN
- Assert.assertEquals(200, response.getStatus());
- Assert.assertEquals(value.getBytes(UTF_8).length,
+ assertEquals(200, response.getStatus());
+ assertEquals(value.getBytes(UTF_8).length,
Long.parseLong(response.getHeaderString("Content-Length")));
DateTimeFormatter.RFC_1123_DATE_TIME
@@ -98,11 +98,11 @@ public class TestObjectHead {
//Head an object that doesn't exist.
try {
Response response = keyEndpoint.head(bucketName, "badKeyName");
- Assert.assertEquals(404, response.getStatus());
+ assertEquals(404, response.getStatus());
} catch (OS3Exception ex) {
- Assert.assertTrue(ex.getCode().contains("NoSuchObject"));
- Assert.assertTrue(ex.getErrorMessage().contains("object does not
exist"));
- Assert.assertEquals(HTTP_NOT_FOUND, ex.getHttpCode());
+ assertTrue(ex.getCode().contains("NoSuchObject"));
+ assertTrue(ex.getErrorMessage().contains("object does not exist"));
+ assertEquals(HTTP_NOT_FOUND, ex.getHttpCode());
}
}
@@ -126,7 +126,7 @@ public class TestObjectHead {
final Response response = keyEndpoint.head(bucketName, keyPath);
// THEN
- Assertions.assertEquals(HttpStatus.SC_OK, response.getStatus());
+ assertEquals(HttpStatus.SC_OK, response.getStatus());
bucket.deleteKey(keyPath);
}
@@ -144,7 +144,7 @@ public class TestObjectHead {
final Response response = keyEndpoint.head(bucketName, keyPath);
// THEN
- Assertions.assertEquals(HttpStatus.SC_NOT_FOUND, response.getStatus());
+ assertEquals(HttpStatus.SC_NOT_FOUND, response.getStatus());
bucket.deleteKey(keyPath);
}
@@ -162,7 +162,7 @@ public class TestObjectHead {
final Response response = keyEndpoint.head(bucketName, keyPath);
// THEN
- Assertions.assertEquals(HttpStatus.SC_OK, response.getStatus());
+ assertEquals(HttpStatus.SC_OK, response.getStatus());
bucket.deleteKey(keyPath);
}
@@ -186,7 +186,7 @@ public class TestObjectHead {
final Response response = keyEndpoint.head(bucketName, keyPath + "/");
// THEN
- Assertions.assertEquals(HttpStatus.SC_NOT_FOUND, response.getStatus());
+ assertEquals(HttpStatus.SC_NOT_FOUND, response.getStatus());
bucket.deleteKey(keyPath);
}
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectMultiDelete.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectMultiDelete.java
index b6089c8bd3..413b3afb27 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectMultiDelete.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectMultiDelete.java
@@ -33,10 +33,10 @@ import
org.apache.hadoop.ozone.s3.endpoint.MultiDeleteRequest.DeleteObject;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
import com.google.common.collect.Sets;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.Collections.singleton;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Test object multi delete.
@@ -69,9 +69,9 @@ public class TestObjectMultiDelete {
expectedResult.add("key3");
//THEN
- Assert.assertEquals(expectedResult, keysAtTheEnd);
- Assert.assertEquals(3, response.getDeletedObjects().size());
- Assert.assertEquals(0, response.getErrors().size());
+ assertEquals(expectedResult, keysAtTheEnd);
+ assertEquals(3, response.getDeletedObjects().size());
+ assertEquals(0, response.getErrors().size());
}
@Test
@@ -98,9 +98,9 @@ public class TestObjectMultiDelete {
.collect(Collectors.toSet());
//THEN
- Assert.assertEquals(singleton("key3"), keysAtTheEnd);
- Assert.assertEquals(0, response.getDeletedObjects().size());
- Assert.assertEquals(0, response.getErrors().size());
+ assertEquals(singleton("key3"), keysAtTheEnd);
+ assertEquals(0, response.getDeletedObjects().size());
+ assertEquals(0, response.getErrors().size());
}
private OzoneBucket initTestData(OzoneClient client) throws IOException {
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectPut.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectPut.java
index 4c1fd9a7aa..f1da08013a 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectPut.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectPut.java
@@ -42,10 +42,8 @@ import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
import org.apache.hadoop.ozone.s3.exception.S3ErrorTable;
import org.apache.http.HttpStatus;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import static java.nio.charset.StandardCharsets.UTF_8;
@@ -53,8 +51,9 @@ import static
org.apache.hadoop.ozone.s3.util.S3Consts.DECODED_CONTENT_LENGTH_HE
import static org.apache.hadoop.ozone.s3.util.S3Consts.COPY_SOURCE_HEADER;
import static org.apache.hadoop.ozone.s3.util.S3Consts.STORAGE_CLASS_HEADER;
import static org.apache.hadoop.ozone.s3.util.S3Utils.urlEncode;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doThrow;
@@ -74,7 +73,7 @@ public class TestObjectPut {
private OzoneClient clientStub;
private ObjectEndpoint objectEndpoint;
- @Before
+ @BeforeEach
public void setup() throws IOException {
//Create client stub and object store stub.
clientStub = new OzoneClientStub();
@@ -109,8 +108,8 @@ public class TestObjectPut {
String keyContent =
IOUtils.toString(ozoneInputStream, UTF_8);
- Assert.assertEquals(200, response.getStatus());
- Assert.assertEquals(CONTENT, keyContent);
+ assertEquals(200, response.getStatus());
+ assertEquals(CONTENT, keyContent);
}
@Test
@@ -128,7 +127,7 @@ public class TestObjectPut {
Response response = objectEndpoint.put(bucketName, keyName, CONTENT
.length(), 1, null, body);
- Assert.assertEquals(ecReplicationConfig,
+ assertEquals(ecReplicationConfig,
clientStub.getObjectStore().getS3Bucket(bucketName).getKey(keyName)
.getReplicationConfig());
OzoneInputStream ozoneInputStream =
@@ -137,8 +136,8 @@ public class TestObjectPut {
String keyContent =
IOUtils.toString(ozoneInputStream, UTF_8);
- Assert.assertEquals(200, response.getStatus());
- Assert.assertEquals(CONTENT, keyContent);
+ assertEquals(200, response.getStatus());
+ assertEquals(CONTENT, keyContent);
}
@Test
@@ -153,7 +152,7 @@ public class TestObjectPut {
long dataSize = CONTENT.length();
objectEndpoint.put(bucketName, keyName, dataSize, 0, null, body);
- Assert.assertEquals(dataSize, getKeyDataSize(keyName));
+ assertEquals(dataSize, getKeyDataSize(keyName));
}
@Test
@@ -174,7 +173,7 @@ public class TestObjectPut {
.thenReturn("15");
objectEndpoint.put(bucketName, keyName, chunkedContent.length(), 0, null,
new ByteArrayInputStream(chunkedContent.getBytes(UTF_8)));
- Assert.assertEquals(15, getKeyDataSize(keyName));
+ assertEquals(15, getKeyDataSize(keyName));
}
private long getKeyDataSize(String key) throws IOException {
@@ -209,8 +208,8 @@ public class TestObjectPut {
.readKey(keyName);
String keyContent = IOUtils.toString(ozoneInputStream, UTF_8);
- Assert.assertEquals(200, response.getStatus());
- Assert.assertEquals("1234567890abcde", keyContent);
+ assertEquals(200, response.getStatus());
+ assertEquals("1234567890abcde", keyContent);
}
@Test
@@ -231,8 +230,8 @@ public class TestObjectPut {
String keyContent = IOUtils.toString(ozoneInputStream, UTF_8);
- Assert.assertEquals(200, response.getStatus());
- Assert.assertEquals(CONTENT, keyContent);
+ assertEquals(200, response.getStatus());
+ assertEquals(CONTENT, keyContent);
// Add copy header, and then call put
@@ -248,60 +247,43 @@ public class TestObjectPut {
keyContent = IOUtils.toString(ozoneInputStream, UTF_8);
- Assert.assertEquals(200, response.getStatus());
- Assert.assertEquals(CONTENT, keyContent);
+ assertEquals(200, response.getStatus());
+ assertEquals(CONTENT, keyContent);
// source and dest same
- try {
- objectEndpoint.put(bucketName, keyName, CONTENT.length(), 1, null, body);
- fail("test copy object failed");
- } catch (OS3Exception ex) {
- Assert.assertTrue(ex.getErrorMessage().contains("This copy request is " +
- "illegal"));
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () -> objectEndpoint.put(
+ bucketName, keyName, CONTENT.length(), 1, null, body),
+ "test copy object failed");
+ assertTrue(e.getErrorMessage().contains("This copy request is illegal"));
// source bucket not found
- try {
- when(headers.getHeaderString(COPY_SOURCE_HEADER)).thenReturn(
- nonexist + "/" + urlEncode(keyName));
- objectEndpoint.put(destBucket, destkey, CONTENT.length(), 1, null,
- body);
- fail("test copy object failed");
- } catch (OS3Exception ex) {
- Assert.assertTrue(ex.getCode().contains("NoSuchBucket"));
- }
+ when(headers.getHeaderString(COPY_SOURCE_HEADER)).thenReturn(
+ nonexist + "/" + urlEncode(keyName));
+ e = assertThrows(OS3Exception.class, () -> objectEndpoint.put(destBucket,
+ destkey, CONTENT.length(), 1, null, body), "test copy object failed");
+ assertTrue(e.getCode().contains("NoSuchBucket"));
// dest bucket not found
- try {
- when(headers.getHeaderString(COPY_SOURCE_HEADER)).thenReturn(
- bucketName + "/" + urlEncode(keyName));
- objectEndpoint.put(nonexist, destkey, CONTENT.length(), 1, null, body);
- fail("test copy object failed");
- } catch (OS3Exception ex) {
- Assert.assertTrue(ex.getCode().contains("NoSuchBucket"));
- }
+ when(headers.getHeaderString(COPY_SOURCE_HEADER)).thenReturn(
+ bucketName + "/" + urlEncode(keyName));
+ e = assertThrows(OS3Exception.class, () -> objectEndpoint.put(nonexist,
+ destkey, CONTENT.length(), 1, null, body), "test copy object failed");
+ assertTrue(e.getCode().contains("NoSuchBucket"));
//Both source and dest bucket not found
- try {
- when(headers.getHeaderString(COPY_SOURCE_HEADER)).thenReturn(
- nonexist + "/" + urlEncode(keyName));
- objectEndpoint.put(nonexist, destkey, CONTENT.length(), 1, null, body);
- fail("test copy object failed");
- } catch (OS3Exception ex) {
- Assert.assertTrue(ex.getCode().contains("NoSuchBucket"));
- }
+ when(headers.getHeaderString(COPY_SOURCE_HEADER)).thenReturn(
+ nonexist + "/" + urlEncode(keyName));
+ e = assertThrows(OS3Exception.class, () -> objectEndpoint.put(nonexist,
+ destkey, CONTENT.length(), 1, null, body), "test copy object failed");
+ assertTrue(e.getCode().contains("NoSuchBucket"));
// source key not found
- try {
- when(headers.getHeaderString(COPY_SOURCE_HEADER)).thenReturn(
- bucketName + "/" + urlEncode(nonexist));
- objectEndpoint.put("nonexistent", keyName, CONTENT.length(), 1,
- null, body);
- fail("test copy object failed");
- } catch (OS3Exception ex) {
- Assert.assertTrue(ex.getCode().contains("NoSuchBucket"));
- }
-
+ when(headers.getHeaderString(COPY_SOURCE_HEADER)).thenReturn(
+ bucketName + "/" + urlEncode(nonexist));
+ e = assertThrows(OS3Exception.class, () -> objectEndpoint.put(
+ "nonexistent", keyName, CONTENT.length(), 1, null, body),
+ "test copy object failed");
+ assertTrue(e.getCode().contains("NoSuchBucket"));
}
@Test
@@ -313,15 +295,11 @@ public class TestObjectPut {
keyName = "sourceKey";
when(headers.getHeaderString(STORAGE_CLASS_HEADER)).thenReturn("random");
- try {
- objectEndpoint.put(bucketName, keyName,
- CONTENT.length(), 1, null, body);
- fail("testInvalidStorageType");
- } catch (OS3Exception ex) {
- assertEquals(S3ErrorTable.INVALID_ARGUMENT.getErrorMessage(),
- ex.getErrorMessage());
- assertEquals("random", ex.getResource());
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () -> objectEndpoint.put(
+ bucketName, keyName, CONTENT.length(), 1, null, body));
+ assertEquals(S3ErrorTable.INVALID_ARGUMENT.getErrorMessage(),
+ e.getErrorMessage());
+ assertEquals("random", e.getResource());
}
@Test
@@ -341,7 +319,7 @@ public class TestObjectPut {
//default type is set
- Assert.assertEquals(ReplicationType.RATIS, key.getReplicationType());
+ assertEquals(ReplicationType.RATIS, key.getReplicationType());
}
@Test
@@ -375,7 +353,7 @@ public class TestObjectPut {
partNumber, uploadId, body);
// THEN
- Assertions.assertEquals(HttpStatus.SC_OK, response.getStatus());
+ assertEquals(HttpStatus.SC_OK, response.getStatus());
Mockito.verify(protocol).createDirectory(any(), eq(bucketName), eq(path));
}
@@ -411,11 +389,11 @@ public class TestObjectPut {
.createDirectory(any(), any(), any());
// THEN
- final OS3Exception exception = Assertions.assertThrows(OS3Exception.class,
+ final OS3Exception exception = assertThrows(OS3Exception.class,
() -> objEndpoint
.put(bucketName, path, length, partNumber, uploadId, body));
- Assertions.assertEquals("Conflict", exception.getCode());
- Assertions.assertEquals(409, exception.getHttpCode());
+ assertEquals("Conflict", exception.getCode());
+ assertEquals(409, exception.getHttpCode());
Mockito.verify(protocol, times(1)).createDirectory(any(), any(), any());
}
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestPartUpload.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestPartUpload.java
index 6ba1b557ec..ca9a85180f 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestPartUpload.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestPartUpload.java
@@ -26,9 +26,8 @@ import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneClientStub;
import org.apache.hadoop.ozone.client.OzoneMultipartUploadPartListParts;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import javax.ws.rs.core.HttpHeaders;
@@ -42,10 +41,10 @@ import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
import static java.nio.charset.StandardCharsets.UTF_8;
import static
org.apache.hadoop.ozone.s3.util.S3Consts.DECODED_CONTENT_LENGTH_HEADER;
import static org.apache.hadoop.ozone.s3.util.S3Consts.STORAGE_CLASS_HEADER;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.when;
/**
@@ -56,7 +55,7 @@ public class TestPartUpload {
private static final ObjectEndpoint REST = new ObjectEndpoint();
private static OzoneClient client;
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
client = new OzoneClientStub();
@@ -202,8 +201,8 @@ public class TestPartUpload {
OzoneMultipartUploadPartListParts parts =
client.getObjectStore().getS3Bucket(OzoneConsts.S3_BUCKET)
.listParts(key, uploadID, 0, 100);
- Assert.assertEquals(1, parts.getPartInfoList().size());
- Assert.assertEquals(contentLength,
+ assertEquals(1, parts.getPartInfoList().size());
+ assertEquals(contentLength,
parts.getPartInfoList().get(0).getSize());
}
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestPartUploadWithStream.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestPartUploadWithStream.java
index 17ae963e11..317be7f8f6 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestPartUploadWithStream.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestPartUploadWithStream.java
@@ -25,8 +25,9 @@ import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneClientStub;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
-import org.junit.BeforeClass;
-import org.junit.Test;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import javax.ws.rs.core.HttpHeaders;
@@ -36,11 +37,11 @@ import java.io.ByteArrayInputStream;
import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.hadoop.ozone.s3.util.S3Consts.STORAGE_CLASS_HEADER;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.when;
/**
@@ -53,7 +54,7 @@ public class TestPartUploadWithStream {
private static final String S3BUCKET = "streampartb1";
private static final String S3KEY = "testkey";
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
OzoneClient client = new OzoneClientStub();
client.getObjectStore().createS3Bucket(S3BUCKET);
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestPermissionCheck.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestPermissionCheck.java
index 51b44998f0..cd9b3882f7 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestPermissionCheck.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestPermissionCheck.java
@@ -28,9 +28,8 @@ import org.apache.hadoop.ozone.client.OzoneVolume;
import org.apache.hadoop.ozone.client.protocol.ClientProtocol;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import javax.servlet.http.HttpServletRequest;
@@ -50,6 +49,9 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.when;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Test operation permission check result.
@@ -66,7 +68,7 @@ public class TestPermissionCheck {
private OMException exception;
private HttpHeaders headers;
- @Before
+ @BeforeEach
public void setup() {
conf = new OzoneConfiguration();
conf.set(OzoneConfigKeys.OZONE_S3_VOLUME_NAME,
@@ -93,14 +95,8 @@ public class TestPermissionCheck {
doThrow(exception).when(objectStore).getS3Volume();
RootEndpoint rootEndpoint = new RootEndpoint();
rootEndpoint.setClient(client);
-
- try {
- rootEndpoint.get();
- Assert.fail("Should fail");
- } catch (Exception e) {
- Assert.assertTrue(e instanceof OS3Exception);
- Assert.assertTrue(((OS3Exception) e).getHttpCode() == HTTP_FORBIDDEN);
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () ->
rootEndpoint.get());
+ assertEquals(HTTP_FORBIDDEN, e.getHttpCode());
}
/**
@@ -111,14 +107,9 @@ public class TestPermissionCheck {
doThrow(exception).when(objectStore).getS3Bucket(anyString());
BucketEndpoint bucketEndpoint = new BucketEndpoint();
bucketEndpoint.setClient(client);
-
- try {
- bucketEndpoint.head("bucketName");
- Assert.fail("Should fail");
- } catch (Exception e) {
- Assert.assertTrue(e instanceof OS3Exception);
- Assert.assertTrue(((OS3Exception) e).getHttpCode() == HTTP_FORBIDDEN);
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () ->
+ bucketEndpoint.head("bucketName"));
+ assertEquals(HTTP_FORBIDDEN, e.getHttpCode());
}
@Test
@@ -127,14 +118,9 @@ public class TestPermissionCheck {
doThrow(exception).when(objectStore).createS3Bucket(anyString());
BucketEndpoint bucketEndpoint = new BucketEndpoint();
bucketEndpoint.setClient(client);
-
- try {
- bucketEndpoint.put("bucketName", null, null, null);
- Assert.fail("Should fail");
- } catch (Exception e) {
- Assert.assertTrue(e instanceof OS3Exception);
- Assert.assertTrue(((OS3Exception) e).getHttpCode() == HTTP_FORBIDDEN);
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () ->
+ bucketEndpoint.put("bucketName", null, null, null));
+ assertEquals(HTTP_FORBIDDEN, e.getHttpCode());
}
@Test
@@ -143,13 +129,9 @@ public class TestPermissionCheck {
BucketEndpoint bucketEndpoint = new BucketEndpoint();
bucketEndpoint.setClient(client);
- try {
- bucketEndpoint.delete("bucketName");
- Assert.fail("Should fail");
- } catch (Exception e) {
- Assert.assertTrue(e instanceof OS3Exception);
- Assert.assertTrue(((OS3Exception) e).getHttpCode() == HTTP_FORBIDDEN);
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () ->
+ bucketEndpoint.delete("bucketName"));
+ assertEquals(HTTP_FORBIDDEN, e.getHttpCode());
}
@Test
public void testListMultiUpload() throws IOException {
@@ -158,13 +140,9 @@ public class TestPermissionCheck {
BucketEndpoint bucketEndpoint = new BucketEndpoint();
bucketEndpoint.setClient(client);
- try {
- bucketEndpoint.listMultipartUploads("bucketName", "prefix");
- Assert.fail("Should fail");
- } catch (Exception e) {
- Assert.assertTrue(e instanceof OS3Exception);
- Assert.assertTrue(((OS3Exception) e).getHttpCode() == HTTP_FORBIDDEN);
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () ->
+ bucketEndpoint.listMultipartUploads("bucketName", "prefix"));
+ assertEquals(HTTP_FORBIDDEN, e.getHttpCode());
}
@Test
@@ -176,14 +154,10 @@ public class TestPermissionCheck {
BucketEndpoint bucketEndpoint = new BucketEndpoint();
bucketEndpoint.setClient(client);
- try {
- bucketEndpoint.get("bucketName", null, null, null, 1000,
- null, null, null, null, null, null);
- Assert.fail("Should fail");
- } catch (Exception e) {
- Assert.assertTrue(e instanceof OS3Exception);
- Assert.assertTrue(((OS3Exception) e).getHttpCode() == HTTP_FORBIDDEN);
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () -> bucketEndpoint.get(
+ "bucketName", null, null, null, 1000,
+ null, null, null, null, null, null));
+ assertEquals(HTTP_FORBIDDEN, e.getHttpCode());
}
@Test
@@ -201,8 +175,8 @@ public class TestPermissionCheck {
MultiDeleteResponse response =
bucketEndpoint.multiDelete("BucketName", "keyName", request);
- Assert.assertTrue(response.getErrors().size() == 1);
- Assert.assertTrue(
+ assertEquals(1, response.getErrors().size());
+ assertTrue(
response.getErrors().get(0).getCode().equals("PermissionDenied"));
}
@@ -221,13 +195,10 @@ public class TestPermissionCheck {
.thenReturn(S3Acl.ACLIdentityType.USER.getHeaderType() + "=root");
BucketEndpoint bucketEndpoint = new BucketEndpoint();
bucketEndpoint.setClient(client);
- try {
- bucketEndpoint.get("bucketName", null, null, null, 1000,
- null, null, null, null, "acl", null);
- Assert.fail("Expected OS3Exception with FORBIDDEN http code.");
- } catch (OS3Exception e) {
- Assert.assertEquals(HTTP_FORBIDDEN, e.getHttpCode());
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () -> bucketEndpoint.get(
+ "bucketName", null, null, null, 1000, null, null, null, null, "acl",
+ null), "Expected OS3Exception with FORBIDDEN http code.");
+ assertEquals(HTTP_FORBIDDEN, e.getHttpCode());
}
@Test
@@ -248,7 +219,7 @@ public class TestPermissionCheck {
try {
bucketEndpoint.put("bucketName", "acl", headers, null);
} catch (Exception e) {
- Assert.assertTrue(e instanceof OS3Exception &&
+ assertTrue(e instanceof OS3Exception &&
((OS3Exception)e).getHttpCode() == HTTP_FORBIDDEN);
}
}
@@ -266,14 +237,9 @@ public class TestPermissionCheck {
objectEndpoint.setHeaders(headers);
objectEndpoint.setOzoneConfiguration(conf);
- try {
- objectEndpoint.get("bucketName", "keyPath", 0, null, 1000, "marker");
- Assert.fail("Should fail");
- } catch (Exception e) {
- e.printStackTrace();
- Assert.assertTrue(e instanceof OS3Exception);
- Assert.assertTrue(((OS3Exception) e).getHttpCode() == HTTP_FORBIDDEN);
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () -> objectEndpoint.get(
+ "bucketName", "keyPath", 0, null, 1000, "marker"));
+ assertEquals(HTTP_FORBIDDEN, e.getHttpCode());
}
@Test
@@ -287,14 +253,10 @@ public class TestPermissionCheck {
objectEndpoint.setHeaders(headers);
objectEndpoint.setOzoneConfiguration(conf);
- try {
- objectEndpoint.put("bucketName", "keyPath", 1024, 0, null,
- new ByteArrayInputStream(new byte[]{}));
- Assert.fail("Should fail");
- } catch (Exception e) {
- Assert.assertTrue(e instanceof OS3Exception);
- Assert.assertTrue(((OS3Exception) e).getHttpCode() == HTTP_FORBIDDEN);
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () -> objectEndpoint.put(
+ "bucketName", "keyPath", 1024, 0, null,
+ new ByteArrayInputStream(new byte[]{})));
+ assertEquals(HTTP_FORBIDDEN, e.getHttpCode());
}
@Test
@@ -307,13 +269,9 @@ public class TestPermissionCheck {
objectEndpoint.setHeaders(headers);
objectEndpoint.setOzoneConfiguration(conf);
- try {
- objectEndpoint.delete("bucketName", "keyPath", null);
- Assert.fail("Should fail");
- } catch (Exception e) {
- Assert.assertTrue(e instanceof OS3Exception);
- Assert.assertTrue(((OS3Exception) e).getHttpCode() == HTTP_FORBIDDEN);
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () ->
+ objectEndpoint.delete("bucketName", "keyPath", null));
+ assertEquals(HTTP_FORBIDDEN, e.getHttpCode());
}
@Test
@@ -325,12 +283,8 @@ public class TestPermissionCheck {
objectEndpoint.setHeaders(headers);
objectEndpoint.setOzoneConfiguration(conf);
- try {
- objectEndpoint.initializeMultipartUpload("bucketName", "keyPath");
- Assert.fail("Should fail");
- } catch (Exception e) {
- Assert.assertTrue(e instanceof OS3Exception);
- Assert.assertTrue(((OS3Exception) e).getHttpCode() == HTTP_FORBIDDEN);
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () ->
+ objectEndpoint.initializeMultipartUpload("bucketName", "keyPath"));
+ assertEquals(HTTP_FORBIDDEN, e.getHttpCode());
}
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestRootList.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestRootList.java
index f5e4a06157..312ada4f2b 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestRootList.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestRootList.java
@@ -23,9 +23,10 @@ package org.apache.hadoop.ozone.s3.endpoint;
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneClientStub;
-import static org.junit.Assert.assertEquals;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* This class test HeadBucket functionality.
@@ -35,7 +36,7 @@ public class TestRootList {
private OzoneClient clientStub;
private RootEndpoint rootEndpoint;
- @Before
+ @BeforeEach
public void setup() throws Exception {
//Create client stub and object store stub.
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestUploadWithStream.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestUploadWithStream.java
index d96cd7bdd6..73f45f2566 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestUploadWithStream.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestUploadWithStream.java
@@ -29,8 +29,8 @@ import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.client.OzoneBucket;
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneClientStub;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import javax.ws.rs.container.ContainerRequestContext;
@@ -47,8 +47,8 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_FS_DATASTREAM_AUTO_THRESHOLD;
import static org.apache.hadoop.ozone.s3.util.S3Consts.COPY_SOURCE_HEADER;
import static org.apache.hadoop.ozone.s3.util.S3Consts.STORAGE_CLASS_HEADER;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.when;
/**
@@ -72,7 +72,7 @@ public class TestUploadWithStream {
when(HEADERS.getHeaderString(STORAGE_CLASS_HEADER)).thenReturn("STANDARD");
}
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
client = new OzoneClientStub();
client.getObjectStore().createS3Bucket(S3BUCKET);
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/exception/TestOS3Exceptions.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/exception/TestOS3Exceptions.java
index e2653a52e9..05e0ee8a6e 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/exception/TestOS3Exceptions.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/exception/TestOS3Exceptions.java
@@ -18,9 +18,10 @@
package org.apache.hadoop.ozone.s3.exception;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.hadoop.ozone.web.utils.OzoneUtils;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* This class tests OS3Exception class.
@@ -45,6 +46,6 @@ public class TestOS3Exceptions {
String expected = String.format(formatString, ex.getCode(),
ex.getErrorMessage(), ex.getResource(),
ex.getRequestId());
- Assert.assertEquals(expected, val);
+ assertEquals(expected, val);
}
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java
index 3596f74c47..4fc5869889 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java
@@ -34,9 +34,8 @@ import org.apache.hadoop.ozone.s3.exception.OS3Exception;
import org.apache.hadoop.ozone.s3.exception.S3ErrorTable;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import javax.ws.rs.container.ContainerRequestContext;
@@ -57,8 +56,11 @@ import static
org.apache.hadoop.ozone.s3.exception.S3ErrorTable.BUCKET_ALREADY_E
import static org.apache.hadoop.ozone.s3.util.S3Consts.COPY_SOURCE_HEADER;
import static org.apache.hadoop.ozone.s3.util.S3Consts.STORAGE_CLASS_HEADER;
import static org.apache.hadoop.ozone.s3.util.S3Utils.urlEncode;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.mockito.Mockito.when;
/**
@@ -80,7 +82,7 @@ public class TestS3GatewayMetrics {
private ContainerRequestContext context;
- @Before
+ @BeforeEach
public void setup() throws Exception {
clientStub = new OzoneClientStub();
clientStub.getObjectStore().createS3Bucket(bucketName);
@@ -154,19 +156,13 @@ public class TestS3GatewayMetrics {
public void testGetBucketFailure() throws Exception {
long oriMetric = metrics.getGetBucketFailure();
- try {
- // Searching for a bucket that does not exist
- bucketEndpoint.get("newBucket", null,
- null, null, 1000, null,
- null, "random", null,
- null, null);
- fail();
- } catch (OS3Exception ex) {
- assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getCode(), ex.getCode());
- assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getErrorMessage(),
- ex.getErrorMessage());
- }
-
+ // Searching for a bucket that does not exist
+ OS3Exception e = assertThrows(OS3Exception.class, () -> bucketEndpoint.get(
+ "newBucket", null, null, null, 1000, null, null, "random", null,
+ null, null));
+ assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getCode(), e.getCode());
+ assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getErrorMessage(),
+ e.getErrorMessage());
long curMetric = metrics.getGetBucketFailure();
assertEquals(1L, curMetric - oriMetric);
}
@@ -175,35 +171,23 @@ public class TestS3GatewayMetrics {
public void testCreateBucketSuccess() throws Exception {
long oriMetric = metrics.getCreateBucketSuccess();
-
- try {
- bucketEndpoint.put("newBucket", null, null, null);
-
- long curMetric = metrics.getCreateBucketSuccess();
- assertEquals(1L, curMetric - oriMetric);
-
- } catch (OS3Exception ex) {
- fail(); // Should not throw error for new bucket
- }
-
+ assertDoesNotThrow(() -> bucketEndpoint.put("newBucket", null, null,
null));
+ long curMetric = metrics.getCreateBucketSuccess();
+ assertEquals(1L, curMetric - oriMetric);
}
@Test
public void testCreateBucketFailure() throws Exception {
long oriMetric = metrics.getCreateBucketFailure();
- try {
- // Creating an error by trying to create a bucket that already exists
- bucketEndpoint.put(bucketName, null, null, null);
- fail();
-
- } catch (OS3Exception ex) {
- Assert.assertEquals(HTTP_CONFLICT, ex.getHttpCode());
- Assert.assertEquals(BUCKET_ALREADY_EXISTS.getCode(), ex.getCode());
+ // Creating an error by trying to create a bucket that already exists
+ OS3Exception e = assertThrows(OS3Exception.class, () -> bucketEndpoint.put(
+ bucketName, null, null, null));
+ assertEquals(HTTP_CONFLICT, e.getHttpCode());
+ assertEquals(BUCKET_ALREADY_EXISTS.getCode(), e.getCode());
- long curMetric = metrics.getCreateBucketFailure();
- assertEquals(1L, curMetric - oriMetric);
- }
+ long curMetric = metrics.getCreateBucketFailure();
+ assertEquals(1L, curMetric - oriMetric);
}
@Test
@@ -220,15 +204,13 @@ public class TestS3GatewayMetrics {
public void testDeleteBucketFailure() throws Exception {
long oriMetric = metrics.getDeleteBucketFailure();
bucketEndpoint.delete(bucketName);
- try {
- // Deleting a bucket that does not exist will result in delete failure
- bucketEndpoint.delete(bucketName);
- fail();
- } catch (OS3Exception ex) {
- assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getCode(), ex.getCode());
- assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getErrorMessage(),
- ex.getErrorMessage());
- }
+
+ // Deleting a bucket that does not exist will result in delete failure
+ OS3Exception e = assertThrows(OS3Exception.class, () ->
+ bucketEndpoint.delete(bucketName));
+ assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getCode(), e.getCode());
+ assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getErrorMessage(),
+ e.getErrorMessage());
long curMetric = metrics.getDeleteBucketFailure();
assertEquals(1L, curMetric - oriMetric);
@@ -250,17 +232,14 @@ public class TestS3GatewayMetrics {
@Test
public void testGetAclFailure() throws Exception {
long oriMetric = metrics.getGetAclFailure();
- try {
- // Failing the getACL endpoint by applying ACL on a non-Existent Bucket
- bucketEndpoint.get("random_bucket", null,
- null, null, 0, null,
- null, null, null, "acl", null);
- fail();
- } catch (OS3Exception ex) {
- assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getCode(), ex.getCode());
- assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getErrorMessage(),
- ex.getErrorMessage());
- }
+
+ // Failing the getACL endpoint by applying ACL on a non-Existent Bucket
+ OS3Exception e = assertThrows(OS3Exception.class, () -> bucketEndpoint.get(
+ "random_bucket", null, null, null, 0, null,
+ null, null, null, "acl", null));
+ assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getCode(), e.getCode());
+ assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getErrorMessage(),
+ e.getErrorMessage());
long curMetric = metrics.getGetAclFailure();
assertEquals(1L, curMetric - oriMetric);
}
@@ -346,13 +325,9 @@ public class TestS3GatewayMetrics {
long oriMetric = metrics.getCreateKeyFailure();
// Create the file in a bucket that does not exist
- try {
- keyEndpoint.put("unknownBucket", keyName, CONTENT
- .length(), 1, null, null);
- fail();
- } catch (OS3Exception ex) {
- assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getCode(), ex.getCode());
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () -> keyEndpoint.put(
+ "unknownBucket", keyName, CONTENT.length(), 1, null, null));
+ assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getCode(), e.getCode());
long curMetric = metrics.getCreateKeyFailure();
assertEquals(1L, curMetric - oriMetric);
}
@@ -371,12 +346,9 @@ public class TestS3GatewayMetrics {
@Test
public void testDeleteKeyFailure() throws Exception {
long oriMetric = metrics.getDeleteKeyFailure();
- try {
- keyEndpoint.delete("unknownBucket", keyName, null);
- fail();
- } catch (OS3Exception ex) {
- assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getCode(), ex.getCode());
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () -> keyEndpoint.delete(
+ "unknownBucket", keyName, null));
+ assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getCode(), e.getCode());
long curMetric = metrics.getDeleteKeyFailure();
assertEquals(1L, curMetric - oriMetric);
}
@@ -402,14 +374,11 @@ public class TestS3GatewayMetrics {
@Test
public void testGetKeyFailure() throws Exception {
long oriMetric = metrics.getGetKeyFailure();
+
// Fetching a non-existent key
- try {
- keyEndpoint.get(bucketName, "unknownKey", 0, null, 0,
- null);
- fail();
- } catch (OS3Exception ex) {
- assertEquals(S3ErrorTable.NO_SUCH_KEY.getCode(), ex.getCode());
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () -> keyEndpoint.get(
+ bucketName, "unknownKey", 0, null, 0, null));
+ assertEquals(S3ErrorTable.NO_SUCH_KEY.getCode(), e.getCode());
long curMetric = metrics.getGetKeyFailure();
assertEquals(1L, curMetric - oriMetric);
}
@@ -426,12 +395,9 @@ public class TestS3GatewayMetrics {
@Test
public void testInitMultiPartUploadFailure() throws Exception {
long oriMetric = metrics.getInitMultiPartUploadFailure();
- try {
- keyEndpoint.initializeMultipartUpload("unknownBucket", keyName);
- fail();
- } catch (OS3Exception ex) {
- assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getCode(), ex.getCode());
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () -> keyEndpoint
+ .initializeMultipartUpload("unknownBucket", keyName));
+ assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getCode(), e.getCode());
long curMetric = metrics.getInitMultiPartUploadFailure();
assertEquals(1L, curMetric - oriMetric);
}
@@ -456,12 +422,9 @@ public class TestS3GatewayMetrics {
long oriMetric = metrics.getAbortMultiPartUploadFailure();
// Fail the Abort Method by providing wrong uploadID
- try {
- keyEndpoint.delete(bucketName, keyName, "wrongId");
- fail();
- } catch (OS3Exception ex) {
- assertEquals(S3ErrorTable.NO_SUCH_UPLOAD.getCode(), ex.getCode());
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () -> keyEndpoint.delete(
+ bucketName, keyName, "wrongId"));
+ assertEquals(S3ErrorTable.NO_SUCH_UPLOAD.getCode(), e.getCode());
long curMetric = metrics.getAbortMultiPartUploadFailure();
assertEquals(1L, curMetric - oriMetric);
}
@@ -489,13 +452,10 @@ public class TestS3GatewayMetrics {
long oriMetric = metrics.getCompleteMultiPartUploadFailure();
CompleteMultipartUploadRequest completeMultipartUploadRequestNew = new
CompleteMultipartUploadRequest();
- try {
- keyEndpoint.completeMultipartUpload(bucketName, "key2",
- "random", completeMultipartUploadRequestNew);
- fail();
- } catch (OS3Exception ex) {
- assertEquals(S3ErrorTable.NO_SUCH_UPLOAD.getCode(), ex.getCode());
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () -> keyEndpoint
+ .completeMultipartUpload(bucketName, "key2", "random",
+ completeMultipartUploadRequestNew));
+ assertEquals(S3ErrorTable.NO_SUCH_UPLOAD.getCode(), e.getCode());
long curMetric = metrics.getCompleteMultiPartUploadFailure();
assertEquals(1L, curMetric - oriMetric);
}
@@ -518,12 +478,9 @@ public class TestS3GatewayMetrics {
@Test
public void testCreateMultipartKeyFailure() throws Exception {
long oriMetric = metrics.getCreateMultipartKeyFailure();
- try {
- keyEndpoint.put(bucketName, keyName, CONTENT.length(),
- 1, "randomId", null);
- } catch (OS3Exception ex) {
- assertEquals(S3ErrorTable.NO_SUCH_UPLOAD.getCode(), ex.getCode());
- }
+ OS3Exception e = assertThrows(OS3Exception.class, () -> keyEndpoint.put(
+ bucketName, keyName, CONTENT.length(), 1, "randomId", null));
+ assertEquals(S3ErrorTable.NO_SUCH_UPLOAD.getCode(), e.getCode());
long curMetric = metrics.getCreateMultipartKeyFailure();
assertEquals(1L, curMetric - oriMetric);
}
@@ -546,14 +503,10 @@ public class TestS3GatewayMetrics {
public void testListPartsFailure() throws Exception {
long oriMetric = metrics.getListPartsFailure();
- try {
- // Listing out the parts by providing the uploadID after aborting
- keyEndpoint.get(bucketName, keyName, 0,
- "wrong_id", 3, null);
- fail();
- } catch (OS3Exception ex) {
- assertEquals(S3ErrorTable.NO_SUCH_UPLOAD.getCode(), ex.getCode());
- }
+ // Listing out the parts by providing the uploadID after aborting
+ OS3Exception e = assertThrows(OS3Exception.class, () -> keyEndpoint.get(
+ bucketName, keyName, 0, "wrong_id", 3, null));
+ assertEquals(S3ErrorTable.NO_SUCH_UPLOAD.getCode(), e.getCode());
long curMetric = metrics.getListPartsFailure();
assertEquals(1L, curMetric - oriMetric);
}
@@ -567,7 +520,6 @@ public class TestS3GatewayMetrics {
// Create bucket
clientStub.getObjectStore().createS3Bucket(destBucket);
-
// Test for Success of CopyObjectSuccess Metric
long oriMetric = metrics.getCopyObjectSuccess();
ByteArrayInputStream body =
@@ -588,14 +540,11 @@ public class TestS3GatewayMetrics {
// Test for Failure of CopyObjectFailure Metric
oriMetric = metrics.getCopyObjectFailure();
// source and dest same
- try {
- when(headers.getHeaderString(STORAGE_CLASS_HEADER)).thenReturn("");
- keyEndpoint.put(bucketName, keyName, CONTENT.length(), 1, null, body);
- fail("Test for CopyObjectMetric failed");
- } catch (OS3Exception ex) {
- Assert.assertTrue(ex.getErrorMessage().contains("This copy request is " +
- "illegal"));
- }
+ when(headers.getHeaderString(STORAGE_CLASS_HEADER)).thenReturn("");
+ OS3Exception e = assertThrows(OS3Exception.class, () -> keyEndpoint.put(
+ bucketName, keyName, CONTENT.length(), 1, null, body),
+ "Test for CopyObjectMetric failed");
+ assertTrue(e.getErrorMessage().contains("This copy request is illegal"));
curMetric = metrics.getCopyObjectFailure();
assertEquals(1L, curMetric - oriMetric);
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/signature/TestAuthorizationV2HeaderParser.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/signature/TestAuthorizationV2HeaderParser.java
index c2533f5536..8d1e9f8602 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/signature/TestAuthorizationV2HeaderParser.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/signature/TestAuthorizationV2HeaderParser.java
@@ -18,12 +18,11 @@
package org.apache.hadoop.ozone.s3.signature;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* This class tests Authorization header format v2.
@@ -43,31 +42,31 @@ public class TestAuthorizationV2HeaderParser {
public void testIncorrectHeader1() throws MalformedResourceException {
String auth = "AAA accessKey:signature";
AuthorizationV2HeaderParser v2 = new AuthorizationV2HeaderParser(auth);
- Assert.assertNull(v2.parseSignature());
+ assertNull(v2.parseSignature());
}
- @Test(expected = MalformedResourceException.class)
+ @Test
public void testIncorrectHeader2() throws MalformedResourceException {
String auth = "AWS :accessKey";
AuthorizationV2HeaderParser v2 = new AuthorizationV2HeaderParser(auth);
- Assert.assertNull(v2.parseSignature());
- fail("testIncorrectHeader");
+ assertThrows(MalformedResourceException.class, () -> v2.parseSignature(),
+ "testIncorrectHeader");
}
- @Test(expected = MalformedResourceException.class)
+ @Test
public void testIncorrectHeader3() throws MalformedResourceException {
String auth = "AWS :signature";
AuthorizationV2HeaderParser v2 = new AuthorizationV2HeaderParser(auth);
- Assert.assertNull(v2.parseSignature());
- fail("testIncorrectHeader");
+ assertThrows(MalformedResourceException.class, () -> v2.parseSignature(),
+ "testIncorrectHeader");
}
- @Test(expected = MalformedResourceException.class)
+ @Test
public void testIncorrectHeader4() throws MalformedResourceException {
String auth = "AWS accessKey:";
AuthorizationV2HeaderParser v2 = new AuthorizationV2HeaderParser(auth);
- Assert.assertNull(v2.parseSignature());
- fail("testIncorrectHeader");
+ assertThrows(MalformedResourceException.class, () -> v2.parseSignature(),
+ "testIncorrectHeader");
}
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/signature/TestAuthorizationV4HeaderParser.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/signature/TestAuthorizationV4HeaderParser.java
index 83f3c2fd48..b9803c5454 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/signature/TestAuthorizationV4HeaderParser.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/signature/TestAuthorizationV4HeaderParser.java
@@ -19,17 +19,14 @@
package org.apache.hadoop.ozone.s3.signature;
import java.time.LocalDate;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static java.time.temporal.ChronoUnit.DAYS;
import static
org.apache.hadoop.ozone.s3.signature.SignatureProcessor.DATE_FORMATTER;
-
-import org.junit.Assert;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
-
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* This class tests Authorization header format v2.
@@ -41,7 +38,7 @@ public class TestAuthorizationV4HeaderParser {
private String curDate;
- @Before
+ @BeforeEach
public void setup() {
LocalDate now = LocalDate.now();
curDate = DATE_FORMATTER.format(now);
@@ -63,26 +60,25 @@ public class TestAuthorizationV4HeaderParser {
signatureInfo.getSignature());
}
- @Test(expected = MalformedResourceException.class)
- public void testV4HeaderMissingParts() throws MalformedResourceException {
+ @Test
+ public void testV4HeaderMissingParts() {
String auth = "AWS4-HMAC-SHA256 " +
"Credential=ozone/" + curDate + "/us-east-1/s3/aws4_request, " +
"SignedHeaders=host;range;x-amz-date,";
AuthorizationV4HeaderParser v4 =
new AuthorizationV4HeaderParser(auth, SAMPLE_DATE);
- v4.parseSignature();
+ assertThrows(MalformedResourceException.class, () -> v4.parseSignature());
}
- @Test(expected = MalformedResourceException.class)
- public void testV4HeaderInvalidCredential()
- throws MalformedResourceException {
+ @Test
+ public void testV4HeaderInvalidCredential() {
String auth = "AWS4-HMAC-SHA256 " +
"Credential=" + curDate + "/us-east-1/s3/aws4_request, " +
"SignedHeaders=host;range;x-amz-date, " +
"Signature=fe5f80f77d5fa3beca038a248ff027";
AuthorizationV4HeaderParser v4 =
new AuthorizationV4HeaderParser(auth, SAMPLE_DATE);
- v4.parseSignature();
+ assertThrows(MalformedResourceException.class, () -> v4.parseSignature());
}
@Test
@@ -350,7 +346,7 @@ public class TestAuthorizationV4HeaderParser {
+ "SignedHeaders=host;x-amz-content-sha256;x-amz-date,"
+ "Signature"
+ "=fe5f80f77d5fa3beca038a248ff027";
- Assert.assertNull(new AuthorizationV4HeaderParser(auth2, SAMPLE_DATE)
+ assertNull(new AuthorizationV4HeaderParser(auth2, SAMPLE_DATE)
.parseSignature());
String auth3 =
@@ -359,7 +355,7 @@ public class TestAuthorizationV4HeaderParser {
+ "SignedHeaders=host;x-amz-content-sha256;x-amz-date,"
+ "Signature"
+ "=fe5f80f77d5fa3beca038a248ff027";
- Assert.assertNull(new AuthorizationV4HeaderParser(auth3, SAMPLE_DATE)
+ assertNull(new AuthorizationV4HeaderParser(auth3, SAMPLE_DATE)
.parseSignature());
// Invalid algorithm
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/signature/TestAuthorizationV4QueryParser.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/signature/TestAuthorizationV4QueryParser.java
index 181e962e5c..d377abc1bd 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/signature/TestAuthorizationV4QueryParser.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/signature/TestAuthorizationV4QueryParser.java
@@ -26,11 +26,10 @@ import java.util.Map;
import org.apache.kerby.util.Hex;
import
org.apache.hadoop.ozone.s3.signature.AWSSignatureProcessor.LowerCaseKeyStringMap;
+import org.junit.jupiter.api.Test;
-import org.junit.Assert;
-import org.junit.Test;
-
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Tests for {@link AuthorizationV4QueryParser}.
@@ -296,7 +295,7 @@ public class TestAuthorizationV4QueryParser {
MessageDigest md = MessageDigest.getInstance("SHA-256");
md.update(canonicalRequest.getBytes(StandardCharsets.UTF_8));
- Assert.assertEquals("AWS4-HMAC-SHA256\n"
+ assertEquals("AWS4-HMAC-SHA256\n"
+ DATETIME + "\n"
+ "20130524/us-east-1/s3/aws4_request\n"
+ Hex.encode(md.digest()).toLowerCase(),
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/signature/TestStringToSignProducer.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/signature/TestStringToSignProducer.java
index 14aa649476..40256cff96 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/signature/TestStringToSignProducer.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/signature/TestStringToSignProducer.java
@@ -35,13 +35,13 @@ import org.apache.hadoop.ozone.s3.exception.OS3Exception;
import
org.apache.hadoop.ozone.s3.signature.AWSSignatureProcessor.LowerCaseKeyStringMap;
import org.apache.kerby.util.Hex;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.mockito.Mockito;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static
org.apache.hadoop.ozone.s3.exception.S3ErrorTable.S3_AUTHINFO_CREATION_ERROR;
import static
org.apache.hadoop.ozone.s3.signature.SignatureProcessor.DATE_FORMATTER;
import static org.junit.jupiter.params.provider.Arguments.arguments;
@@ -110,13 +110,11 @@ public class TestStringToSignProducer {
MessageDigest md = MessageDigest.getInstance("SHA-256");
md.update(canonicalRequest.getBytes(StandardCharsets.UTF_8));
- Assert.assertEquals(
- "String to sign is invalid",
- "AWS4-HMAC-SHA256\n"
+ assertEquals("AWS4-HMAC-SHA256\n"
+ DATETIME + "\n"
+ "20181009/us-east-1/s3/aws4_request\n"
+ Hex.encode(md.digest()).toLowerCase(),
- signatureBase);
+ signatureBase, "String to sign is invalid");
}
private ContainerRequestContext setupContext(
@@ -210,7 +208,7 @@ public class TestStringToSignProducer {
actualResult = e.getCode();
}
- Assert.assertEquals(expectedResult, actualResult);
+ assertEquals(expectedResult, actualResult);
}
private static Stream<Arguments> testValidateCanonicalHeadersInput() {
@@ -269,6 +267,6 @@ public class TestStringToSignProducer {
actualResult = e.getCode();
}
- Assert.assertEquals(expectedResult, actualResult);
+ assertEquals(expectedResult, actualResult);
}
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/util/TestContinueToken.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/util/TestContinueToken.java
index 6c96a6371a..d286798276 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/util/TestContinueToken.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/util/TestContinueToken.java
@@ -18,9 +18,9 @@
package org.apache.hadoop.ozone.s3.util;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
+import org.junit.jupiter.api.Test;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Test encode/decode of the continue token.
@@ -34,7 +34,7 @@ public class TestContinueToken {
ContinueToken parsedToken =
ContinueToken.decodeFromString(ct.encodeToString());
- Assert.assertEquals(ct, parsedToken);
+ assertEquals(ct, parsedToken);
}
@Test
@@ -44,7 +44,7 @@ public class TestContinueToken {
ContinueToken parsedToken =
ContinueToken.decodeFromString(ct.encodeToString());
- Assert.assertEquals(ct, parsedToken);
+ assertEquals(ct, parsedToken);
}
@Test
@@ -54,7 +54,7 @@ public class TestContinueToken {
ContinueToken parsedToken =
ContinueToken.decodeFromString(ct.encodeToString());
- Assert.assertEquals(ct, parsedToken);
+ assertEquals(ct, parsedToken);
}
@Test
@@ -64,7 +64,7 @@ public class TestContinueToken {
ContinueToken parsedToken =
ContinueToken.decodeFromString(ct.encodeToString());
- Assert.assertEquals(ct, parsedToken);
+ assertEquals(ct, parsedToken);
}
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/util/TestRFC1123Util.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/util/TestRFC1123Util.java
index 18e83664c3..7fd87339a1 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/util/TestRFC1123Util.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/util/TestRFC1123Util.java
@@ -19,9 +19,9 @@
package org.apache.hadoop.ozone.s3.util;
import java.time.temporal.TemporalAccessor;
+import org.junit.jupiter.api.Test;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Test for RFC1123 util.
@@ -38,7 +38,7 @@ public class TestRFC1123Util {
String formatted = RFC1123Util.FORMAT.format(date);
//two digits day
- Assert.assertEquals("Mon, 05 Nov 2018 15:04:05 GMT", formatted);
+ assertEquals("Mon, 05 Nov 2018 15:04:05 GMT", formatted);
}
}
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/util/TestRangeHeaderParserUtil.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/util/TestRangeHeaderParserUtil.java
index 439b8b0f87..3e9a289c76 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/util/TestRangeHeaderParserUtil.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/util/TestRangeHeaderParserUtil.java
@@ -18,9 +18,9 @@
package org.apache.hadoop.ozone.s3.util;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Test class to test RangeHeaderParserUtil.
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/util/TestS3Utils.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/util/TestS3Utils.java
index 6b8c9fc9d0..3c6f45b53d 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/util/TestS3Utils.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/util/TestS3Utils.java
@@ -22,8 +22,11 @@ import org.apache.hadoop.hdds.client.RatisReplicationConfig;
import org.apache.hadoop.hdds.client.ReplicationConfig;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Tests the S3Utils APIs.
@@ -43,7 +46,7 @@ public class TestS3Utils {
.resolveS3ClientSideReplicationConfig(S3StorageType.STANDARD.name(),
null, ecReplicationConfig);
// Bucket default is EC.
- Assert.assertEquals(ecReplicationConfig, replicationConfig);
+ assertEquals(ecReplicationConfig, replicationConfig);
}
/**
@@ -56,7 +59,7 @@ public class TestS3Utils {
.resolveS3ClientSideReplicationConfig(S3StorageType.STANDARD.name(),
null, null);
// Passed replication is 3 - Ozone mapped replication is ratis THREE
- Assert.assertEquals(ratis3ReplicationConfig, replicationConfig);
+ assertEquals(ratis3ReplicationConfig, replicationConfig);
}
/**
@@ -70,7 +73,7 @@ public class TestS3Utils {
S3Utils.resolveS3ClientSideReplicationConfig("", null, null);
// client configured value also null.
// This API caller should leave the decision to server.
- Assert.assertNull(replicationConfig);
+ assertNull(replicationConfig);
}
/**
@@ -84,7 +87,7 @@ public class TestS3Utils {
.resolveS3ClientSideReplicationConfig(null, null,
ratis3ReplicationConfig);
// Configured client config also null.
- Assert.assertNull(replicationConfig);
+ assertNull(replicationConfig);
}
/**
@@ -99,7 +102,7 @@ public class TestS3Utils {
S3StorageType.REDUCED_REDUNDANCY.name(), null,
ratis3ReplicationConfig);
// Passed value is replication one - Ozone mapped value is ratis ONE
- Assert.assertEquals(ratis1ReplicationConfig, replicationConfig);
+ assertEquals(ratis1ReplicationConfig, replicationConfig);
}
/**
@@ -113,7 +116,7 @@ public class TestS3Utils {
.resolveS3ClientSideReplicationConfig(S3StorageType.STANDARD.name(),
ratis3ReplicationConfig, ecReplicationConfig);
// Bucket default is EC
- Assert.assertEquals(ecReplicationConfig, replicationConfig);
+ assertEquals(ecReplicationConfig, replicationConfig);
}
/**
@@ -127,17 +130,18 @@ public class TestS3Utils {
.resolveS3ClientSideReplicationConfig(null, ratis3ReplicationConfig,
ratis1ReplicationConfig);
// Configured value is ratis THREE
- Assert.assertEquals(ratis3ReplicationConfig, replicationConfig);
+ assertEquals(ratis3ReplicationConfig, replicationConfig);
}
/**
* When bucket default is non-EC and client side passed value also not valid
* but configured value is valid, we would just return configured value.
*/
- @Test(expected = OS3Exception.class)
+ @Test
public void testResolveRepConfWhenUserPassedIsInvalid() throws OS3Exception {
- S3Utils.resolveS3ClientSideReplicationConfig("INVALID",
- ratis3ReplicationConfig, ratis1ReplicationConfig);
+ assertThrows(OS3Exception.class, () -> S3Utils.
+ resolveS3ClientSideReplicationConfig(
+ "INVALID", ratis3ReplicationConfig, ratis1ReplicationConfig));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
