Adding a few simple tests to verify the newly added connection properties#1
Closed
ulvii wants to merge 2 commits intosehrope:custom-trust-managerfrom
Closed
Adding a few simple tests to verify the newly added connection properties#1ulvii wants to merge 2 commits intosehrope:custom-trust-managerfrom
ulvii wants to merge 2 commits intosehrope:custom-trust-managerfrom
Conversation
Adds two new connection properties that can be used to specify a custom TrustManager implementation: trustManagerClass - Class name of the custom TrustManager trustManagerConstructorArg - Optional argument to pass to the constructor constructor of the custom TrustManager. If encryption is enabled and the trustManagerClass property is specified, it will be retrieved via Class.forName(...). If the optional property trustManagerConstructorArg is specified, then a constructor will be retrieved via getDeclaredConstructors(String.class). The TrustManager will then be instantiated by specified the optional argument as a parameter. If the optional property trustManagerConstructorArg is not specfied, then the default no argument constructor of the class will be retrieved and instantiated.
Codecov Report
@@ Coverage Diff @@
## custom-trust-manager #1 +/- ##
==========================================================
+ Coverage 33.76% 33.76% +<.01%
+ Complexity 1520 1518 -2
==========================================================
Files 101 101
Lines 23625 23625
Branches 3881 3881
==========================================================
+ Hits 7976 7978 +2
+ Misses 14080 14078 -2
Partials 1569 1569
Continue to review full report at Codecov.
|
sehrope
reviewed
Aug 31, 2017
Owner
sehrope
left a comment
There was a problem hiding this comment.
Very nice. Couple minor edits (newlines at EOF), missing resource cleanup, and replacing dynamic class name with static .class references.
| return null; | ||
| } | ||
|
|
||
| } No newline at end of file |
| public X509Certificate[] getAcceptedIssuers() { | ||
| return new X509Certificate[0]; | ||
| } | ||
| } No newline at end of file |
| public X509Certificate[] getAcceptedIssuers() { | ||
| return new X509Certificate[0]; | ||
| } | ||
| } No newline at end of file |
| */ | ||
| @Test | ||
| public void testWithPermissiveX509TrustManager() throws Exception { | ||
| String url = connectionString + ";trustManagerClass=" + this.getClass().getPackage().getName() + ".PermissiveTrustManager" + ";encrypt=true;"; |
Owner
There was a problem hiding this comment.
There's no need for generating the class name from the package plus a string. You can directly reference the class and call getName(), i.e. TrustManagerWithConstructorArg.class.getName(). That way it'll be strongly typed and catch name changes to the dummy trust manager classes.
| public void testWithTrustManagerConstructorArg() throws Exception { | ||
| String url = connectionString + ";trustManagerClass=" + this.getClass().getPackage().getName() + ".TrustManagerWithConstructorArg" | ||
| + ";trustManagerConstructorArg=dummyString;" + ";encrypt=true;"; | ||
| SQLServerConnection con = (SQLServerConnection) DriverManager.getConnection(url); |
Owner
There was a problem hiding this comment.
Connection should be closed. Easiest would be to wrap in a try-with-resources and have the assert within the try block.
| String url = connectionString + ";trustManagerClass=" + this.getClass().getPackage().getName() + ".InvalidTrustManager" | ||
| + ";encrypt=true;"; | ||
| SQLServerConnection con = (SQLServerConnection) DriverManager.getConnection(url); | ||
| assertTrue(con == null); |
Owner
There was a problem hiding this comment.
Rather than an assert that the connection is null I'd assert.fail(...) here. That line should never be reached if (correctly) an exception is thrown.
Author
5f4100e to
bb481c1
Compare
sehrope
pushed a commit
that referenced
this pull request
Mar 21, 2018
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.