Skip to content

Commit 9e6454c

Browse files
committed
Clean up tests and add changelog entry
1 parent b3d90d6 commit 9e6454c

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"type": "feature",
3+
"category": "AWS CRT HTTP Client",
4+
"contributor": "",
5+
"description": "Release AWS CRT synchrounouse HTTP client. See [#3343](https://github.com/aws/aws-sdk-java-v2/issues/3343)"
6+
}

services/s3/src/it/java/software/amazon/awssdk/services/s3/S3IntegrationTestBase.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ public class S3IntegrationTestBase extends AwsTestBase {
4545
*/
4646
protected static S3Client s3;
4747

48-
protected static S3Client s3WithCrtHttpClient;
49-
5048
protected static S3AsyncClient s3Async;
5149

5250
/**
@@ -59,14 +57,12 @@ public static void setUp() throws Exception {
5957
Log.initLoggingToStdout(Log.LogLevel.Warn);
6058
s3 = s3ClientBuilder().build();
6159
s3Async = s3AsyncClientBuilder().build();
62-
s3WithCrtHttpClient = s3ClientBuilderWithCrtHttpClient().build();
6360
}
6461

6562
@AfterClass
6663
public static void cleanUpResources() {
6764
s3.close();
6865
s3Async.close();
69-
s3WithCrtHttpClient.close();
7066
}
7167

7268
protected static S3ClientBuilder s3ClientBuilder() {

services/s3/src/it/java/software/amazon/awssdk/services/s3/crthttpclient/S3WithCrtHttpClientsIntegrationTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import software.amazon.awssdk.core.sync.RequestBody;
3030
import software.amazon.awssdk.core.sync.ResponseTransformer;
3131
import software.amazon.awssdk.crt.CrtResource;
32+
import software.amazon.awssdk.services.s3.S3Client;
3233
import software.amazon.awssdk.services.s3.S3IntegrationTestBase;
3334
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
3435
import software.amazon.awssdk.services.s3.utils.ChecksumUtils;
@@ -40,13 +41,15 @@ public class S3WithCrtHttpClientsIntegrationTests extends S3IntegrationTestBase
4041
private static final String TEST_KEY = "2mib_file.dat";
4142
private static final int OBJ_SIZE = 2 * 1024 * 1024;
4243

44+
private static S3Client s3WithCrtHttpClient;
4345
private static RandomTempFile testFile;
4446

4547
@BeforeAll
4648
public static void setup() throws Exception {
4749
S3IntegrationTestBase.setUp();
4850
S3IntegrationTestBase.createBucket(TEST_BUCKET);
4951
testFile = new RandomTempFile(TEST_KEY, OBJ_SIZE);
52+
s3WithCrtHttpClient = s3ClientBuilderWithCrtHttpClient().build();
5053
s3WithCrtHttpClient.putObject(r -> r.bucket(TEST_BUCKET).key(TEST_KEY), RequestBody.fromFile(testFile.toPath()));
5154
}
5255

@@ -55,7 +58,6 @@ public static void teardown() throws IOException {
5558
S3IntegrationTestBase.deleteBucketAndAllContents(TEST_BUCKET);
5659
Files.delete(testFile.toPath());
5760
s3WithCrtHttpClient.close();
58-
CrtResource.logNativeResources();
5961
CrtResource.waitForNoResources();
6062
}
6163

0 commit comments

Comments
 (0)