Refactor CaReconcilerTest to improve readability #11343
Merged
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.
Type of change
Select the type of your PR
Description
Refactor the CaReconcilerTest class to improve readability.
This existing class is hard to follow since there are so many assertThat calls and many variables with similar names like clientsCaCertData, clientsCaKeyData, clusterCaCertData, clusterCaKeyData.
This PR pulls out the common asserts that check the certificate files and key files are all present and not null.
It also removes some variables that are only used once, again to improve readability.
Finally it removes the checks that compare the Ca truststore file as a whole. These checks are only passing
because in the Ca class in some cases we reuse the data directly, rather than instantiating a new hashmap.
The tests don't need to check the whether it is the exact same file, and in
testExpiredCertsGetRemovedAuto
weactually wouldn't expect the file to be the same.
Since there are already checks that the correct cert is present in the truststore, the asserts that compare the whole file can be removed.
Checklist
Please go through this checklist and make sure all applicable tasks have been done