Skip to content

Use assertDoesNotThrow for double-close assertions in AbstractCipherStreamTest #524

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

Open
siddiqueirshad wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use assertDoesNotThrow for double-close assertions in AbstractCipherStreamTest #524

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 3 additions & 10 deletions src/test/java/org/apache/commons/crypto/stream/AbstractCipherStreamTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.commons.crypto.stream;

import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
Expand Down Expand Up @@ -334,11 +335,7 @@ protected void doExceptionTest(final String cipherClass, final ByteArrayOutputSt
assertEquals(ex.getMessage(), "Stream closed");

// Test closing a closed stream.
try {
closedIn.close(); // Don't throw exception on double-close.
} catch (final IOException ioEx) {
fail("Should not throw exception closing a closed stream.");
}
assertDoesNotThrow(closedIn::close, "Should not throw exception closing a closed stream.");

// Test checking a closed stream.
final OutputStream out = newCryptoOutputStream(transformation, props, baos, key, new IvParameterSpec(iv), withChannel);
Expand All @@ -347,11 +344,7 @@ protected void doExceptionTest(final String cipherClass, final ByteArrayOutputSt
assertThrows(IOException.class, ((CryptoOutputStream) out)::checkStream);

// Test closing a closed stream.
try {
out.close(); // Don't throw exception.
} catch (final IOException ioEx) {
fail("Should not throw exception closing a closed stream.");
}
assertDoesNotThrow(out::close, "Should not throw exception closing a closed stream.");

// Test checkStreamCipher
try (CryptoCipher cipher = getCipher(cipherClass)) {
Expand Down