Skip to content
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

Jump to bottom

ELY-2638 : Simplify test assertions in SSLAuthenticationTest #1960

Closed
wants to merge 2 commits into from
Closed

ELY-2638 : Simplify test assertions in SSLAuthenticationTest #1960

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da72ab3
ELY-2638 : Simplify test assertions in SSLAuthenticationTest
Sep 22, 2023
a468bbc
ELY-2638 : Removing asteric sign
Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 4 additions & 9 deletions tests/base/src/test/java/org/wildfly/security/ssl/SSLAuthenticationTest.java
View file
Open in desktop
Expand Up @@ -17,12 +17,7 @@
*/
package org.wildfly.security.ssl;

import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.*;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @nidhiazad , this PR looks great!

Just a total minor. I can still see this asterisk here, this will make the build fail as we are using a checkstyle plugin to avoid the asterisk imports. Please use the individual classes names when importing and update this PR

Let us know if you need any help with that ! Thank you!

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixing this

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have made the changes. Kindly review and let me know if anything needs to be done.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @nidhiazad, thanks for the updates! In general, we try to squash all the commits for a given issue into a single one. Could you do that for this PR?

Let me know if you need any assistance in doing so!

import static org.wildfly.security.ssl.test.util.CAGenerationTool.SIGNATURE_ALGORTHM;
import static org.wildfly.security.x500.X500.OID_AD_OCSP;
import static org.wildfly.security.x500.X500.OID_KP_OCSP_SIGNING;
Expand Down Expand Up @@ -863,10 +858,10 @@ private void testCommunication(SSLContext serverContext, SSLContext clientContex
}

if (oneWay) {
assertFalse(clientSocket.getSession().getProtocol().equals("TLSv1.3")); // since TLS 1.3 is not enabled by default (ELY-1917)
assertNotEquals("TLSv1.3", clientSocket.getSession().getProtocol());// since TLS 1.3 is not enabled by default (ELY-1917)
} else {
assertFalse(serverSocket.getSession().getProtocol().equals("TLSv1.3")); // since TLS 1.3 is not enabled by default
assertFalse(clientSocket.getSession().getProtocol().equals("TLSv1.3")); // since TLS 1.3 is not enabled by default
assertNotEquals("TLSv1.3", serverSocket.getSession().getProtocol()); // since TLS 1.3 is not enabled by default
assertNotEquals("TLSv1.3", clientSocket.getSession().getProtocol()); // since TLS 1.3 is not enabled by default
}
return received;
} catch (Exception e) {
Expand Down