This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 72e231e4d3 HDDS-10032. Improve assertTrue assertions in
ozone-s3gateway (#5902)
72e231e4d3 is described below
commit 72e231e4d3f8beb223fa79dfad70326737fddc5f
Author: Zhaohui Wang <[email protected]>
AuthorDate: Tue Jan 2 17:25:29 2024 +0800
HDDS-10032. Improve assertTrue assertions in ozone-s3gateway (#5902)
---
.../org/apache/hadoop/ozone/s3/TestOzoneClientProducer.java | 11 +++++------
.../apache/hadoop/ozone/s3/TestVirtualHostStyleFilter.java | 8 +++-----
.../apache/hadoop/ozone/s3/endpoint/TestEndpointBase.java | 12 +++++-------
.../org/apache/hadoop/ozone/s3/endpoint/TestObjectHead.java | 6 +++---
.../org/apache/hadoop/ozone/s3/endpoint/TestObjectPut.java | 12 ++++++------
.../apache/hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java | 4 ++--
6 files changed, 24 insertions(+), 29 deletions(-)
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 b4d1ce2374..2890083d87 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
@@ -24,9 +24,8 @@ import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
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}.
@@ -57,8 +56,8 @@ public class TestOzoneClientProducer {
producer.setOzoneConfiguration(configuration);
IOException testGetClientFailure = assertThrows(IOException.class, () ->
producer.createClient(), "testGetClientFailureWithMultipleServiceIds");
- assertTrue(testGetClientFailure.getMessage().contains(
- "More than 1 OzoneManager ServiceID"));
+ assertThat(testGetClientFailure.getMessage())
+ .contains("More than 1 OzoneManager ServiceID");
}
@Test
@@ -72,8 +71,8 @@ public class TestOzoneClientProducer {
IOException testGetClientFailure = assertThrows(IOException.class, () ->
producer.createClient(),
"testGetClientFailureWithMultipleServiceIdsAndInternalServiceId");
- assertFalse(testGetClientFailure.getMessage().contains(
- "More than 1 OzoneManager ServiceID"));
+ assertThat(testGetClientFailure.getMessage())
+ .doesNotContain("More than 1 OzoneManager ServiceID");
}
}
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 7036fac7d3..3051fb2276 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
@@ -32,7 +32,6 @@ import java.net.URI;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
@@ -187,16 +186,15 @@ public class TestVirtualHostStyleFilter {
ContainerRequest containerRequest = createContainerRequest("mybucket" +
".localhost:9878", null, "?prefix=bh", true);
virtualHostStyleFilter.filter(containerRequest);
- assertTrue(expected.toString().contains(containerRequest.getRequestUri()
- .toString()));
+ assertThat(expected.toString())
+ .contains(containerRequest.getRequestUri().toString());
containerRequest = createContainerRequest("mybucket" +
".localhost:9878", null, "?prefix=bh&type=dir", true);
virtualHostStyleFilter.filter(containerRequest);
expected = new URI("http://"; + s3HttpAddr +
"/mybucket?prefix=bh&type=dir");
- assertTrue(expected.toString().contains(containerRequest.getRequestUri()
- .toString()));
+
assertThat(expected.toString()).contains(containerRequest.getRequestUri().toString());
}
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 5c95949c2b..e8329fd16b 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
@@ -33,9 +33,8 @@ 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.assertj.core.api.Assertions.assertThat;
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;
/**
@@ -67,14 +66,13 @@ public class TestEndpointBase {
Map<String, String> filteredCustomMetadata =
endpointBase.getCustomMetadataFromHeaders(s3requestHeaders);
- assertTrue(filteredCustomMetadata.containsKey("custom-key1"));
+ assertThat(filteredCustomMetadata).containsKey("custom-key1");
assertEquals(
"custom-value1", filteredCustomMetadata.get("custom-key1"));
- assertTrue(filteredCustomMetadata.containsKey("custom-key2"));
+ assertThat(filteredCustomMetadata).containsKey("custom-key2");
assertEquals(
"custom-value2", filteredCustomMetadata.get("custom-key2"));
- assertFalse(
- filteredCustomMetadata.containsKey(OzoneConsts.GDPR_FLAG));
+
assertThat(filteredCustomMetadata).doesNotContainKey(OzoneConsts.GDPR_FLAG);
}
/**
@@ -101,7 +99,7 @@ public class TestEndpointBase {
.getCustomMetadataFromHeaders(s3requestHeaders),
"getCustomMetadataFromHeaders should fail." +
" Expected OS3Exception not thrown");
- assertTrue(e.getCode().contains("MetadataTooLarge"));
+ assertThat(e.getCode()).contains("MetadataTooLarge");
}
}
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 2f0af8087f..88a5f00e44 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,8 +37,8 @@ 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.assertj.core.api.Assertions.assertThat;
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;
@@ -100,8 +100,8 @@ public class TestObjectHead {
Response response = keyEndpoint.head(bucketName, "badKeyName");
assertEquals(404, response.getStatus());
} catch (OS3Exception ex) {
- assertTrue(ex.getCode().contains("NoSuchObject"));
- assertTrue(ex.getErrorMessage().contains("object does not exist"));
+ assertThat(ex.getCode()).contains("NoSuchObject");
+ assertThat(ex.getErrorMessage()).contains("object does not exist");
assertEquals(HTTP_NOT_FOUND, ex.getHttpCode());
}
}
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 ae0a07ed79..dcaee0921f 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
@@ -50,9 +50,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.assertj.core.api.Assertions.assertThat;
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;
@@ -255,28 +255,28 @@ public class TestObjectPut {
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"));
+ assertThat(e.getErrorMessage()).contains("This copy request is illegal");
// source bucket not found
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"));
+ assertThat(e.getCode()).contains("NoSuchBucket");
// dest bucket not found
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"));
+ assertThat(e.getCode()).contains("NoSuchBucket");
//Both source and dest bucket not found
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"));
+ assertThat(e.getCode()).contains("NoSuchBucket");
// source key not found
when(headers.getHeaderString(COPY_SOURCE_HEADER)).thenReturn(
@@ -284,7 +284,7 @@ public class TestObjectPut {
e = assertThrows(OS3Exception.class, () -> objectEndpoint.put(
"nonexistent", keyName, CONTENT.length(), 1, null, body),
"test copy object failed");
- assertTrue(e.getCode().contains("NoSuchBucket"));
+ assertThat(e.getCode()).contains("NoSuchBucket");
}
@Test
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 d5249e0d28..35821f2003 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
@@ -55,8 +55,8 @@ 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.assertj.core.api.Assertions.assertThat;
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;
@@ -544,7 +544,7 @@ public class TestS3GatewayMetrics {
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"));
+ assertThat(e.getErrorMessage()).contains("This copy request is illegal");
curMetric = metrics.getCopyObjectFailure();
assertEquals(1L, curMetric - oriMetric);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
