Skip to content

HADOOP-18866. Refactor @Test(expected) with assertThrows #5982

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

Closed
wants to merge 1 commit into from
Closed

HADOOP-18866. Refactor @Test(expected) with assertThrows #5982

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
59 changes: 36 additions & 23 deletions ...on-project/hadoop-common/src/test/java/org/apache/hadoop/security/ssl/TestSSLFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;

import org.apache.hadoop.conf.Configuration;
Expand Down Expand Up @@ -152,18 +153,20 @@ public void testSslConfClassPathFirst() throws Exception {
assertNotEquals(conf, sslConfLoaded);
}

@Test(expected = IllegalStateException.class)
@Test
public void clientMode() throws Exception {
Configuration conf = createConfiguration(false, true);
SSLFactory sslFactory = new SSLFactory(SSLFactory.Mode.CLIENT, conf);
try {
sslFactory.init();
Assert.assertNotNull(sslFactory.createSSLSocketFactory());
Assert.assertNotNull(sslFactory.getHostnameVerifier());
sslFactory.createSSLServerSocketFactory();
} finally {
sslFactory.destroy();
}
assertThrows(IllegalStateException.class, () -> {
try {
sslFactory.init();
Assert.assertNotNull(sslFactory.createSSLSocketFactory());
Assert.assertNotNull(sslFactory.getHostnameVerifier());
sslFactory.createSSLServerSocketFactory();
} finally {
sslFactory.destroy();
}
});
}

private void serverMode(boolean clientCert, boolean socket) throws Exception {
Expand All @@ -184,24 +187,32 @@ private void serverMode(boolean clientCert, boolean socket) throws Exception {
}


@Test(expected = IllegalStateException.class)
@Test
public void serverModeWithoutClientCertsSocket() throws Exception {
serverMode(false, true);
assertThrows(IllegalStateException.class, () -> {
serverMode(false, true);
});
}

@Test(expected = IllegalStateException.class)
@Test
public void serverModeWithClientCertsSocket() throws Exception {
serverMode(true, true);
assertThrows(IllegalStateException.class, () -> {
serverMode(true, true);
});
}

@Test(expected = IllegalStateException.class)
@Test
public void serverModeWithoutClientCertsVerifier() throws Exception {
serverMode(false, false);
assertThrows(IllegalStateException.class, () -> {
serverMode(false, false);
});
}

@Test(expected = IllegalStateException.class)
@Test
public void serverModeWithClientCertsVerifier() throws Exception {
serverMode(true, false);
assertThrows(IllegalStateException.class, () -> {
serverMode(true, false);
});
}

private void runDelegatedTasks(SSLEngineResult result, SSLEngine engine)
Expand Down Expand Up @@ -357,16 +368,18 @@ public void validHostnameVerifier() throws Exception {
sslFactory.destroy();
}

@Test(expected = GeneralSecurityException.class)
@Test
public void invalidHostnameVerifier() throws Exception {
Configuration conf = createConfiguration(false, true);
conf.set(SSLFactory.SSL_HOSTNAME_VERIFIER_KEY, "foo");
SSLFactory sslFactory = new SSLFactory(SSLFactory.Mode.CLIENT, conf);
try {
sslFactory.init();
} finally {
sslFactory.destroy();
}
assertThrows(GeneralSecurityException.class, () -> {
try {
sslFactory.init();
} finally {
sslFactory.destroy();
}
});
}

@Test
Expand Down