Skip to content

fix test leak for MQTT #790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TingDaoK merged 3 commits into from
May 30, 2024
Merged

fix test leak for MQTT #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae7d9b6
fix test leak for MQTT
TingDaoK May 29, 2024
4b62d53
don't disconnect twice
TingDaoK May 29, 2024
4245fbd
remove badssl, it results in socket timeout sometime
TingDaoK May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/test/java/software/amazon/awssdk/crt/test/CustomKeyOpsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,14 +256,13 @@ public void testExtraCompleteHappy() {
null,
null,
null);
disconnect();
close();
}
catch (Exception ex) {
fail("Exception during connect: " + ex.toString());
} finally {
disconnect();
close();
}
disconnect();
close();
}

@Test
Expand Down
4 changes: 0 additions & 4 deletions src/test/java/software/amazon/awssdk/crt/test/HttpClientConnectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,6 @@ public void testHttpConnection() throws Exception {
testConnectionWithAllCiphers(new URI("https://kms-fips.us-east-1.amazonaws.com:443"), true, null);
testConnectionWithAllCiphers(new URI("https://kms.us-west-2.amazonaws.com:443"), true, null);
testConnectionWithAllCiphers(new URI("https://kms-fips.us-west-2.amazonaws.com:443"), true, null);

// BadSSL
testConnectionWithAllCiphers(new URI("https://rsa2048.badssl.com/"), true, null);
testConnectionWithAllCiphers(new URI("http://http.badssl.com/"), true, null);
}

@Test
Expand Down
14 changes: 12 additions & 2 deletions src/test/java/software/amazon/awssdk/crt/test/MqttClientConnectionFixture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import org.junit.After;

class MissingCredentialsException extends RuntimeException {
MissingCredentialsException(String message) {
Expand Down Expand Up @@ -142,6 +143,13 @@ protected void setConnectionMessageTransformer(Consumer<MqttMessage> connectionM
this.connectionMessageTransfomer = connectionMessageTransfomer;
}

@After
@Override
public void tearDown() {
close();
super.tearDown();
}

MqttClientConnectionFixture() {
}

Expand Down Expand Up @@ -386,7 +394,10 @@ void disconnect() {
}

void close() {
connection.close();
if(connection!=null) {
connection.close();
connection = null;
}
}

CompletableFuture<Integer> publish(String topic, byte[] payload, QualityOfService qos) {
Expand Down Expand Up @@ -444,4 +455,3 @@ OnConnectionClosedReturn waitForConnectClose() throws Exception {
return onConnectionClosedFuture.get(60, TimeUnit.SECONDS);
}
}