Making tests opt-out instead of opt-in and update TestVectorRunner #154
Conversation
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
WesleyRosenblum
force-pushed
the
keyringtests
branch
2 times, most recently
from
43e0bf8 to
c973367
Compare
mattsb42-aws
reviewed
Feb 6, 2020
pom.xml
Outdated
| <includes> | ||
| <include>**/AllTestsSuite.java</include> | ||
| </includes> | ||
| <excludedGroups>slow</excludedGroups> |
There was a problem hiding this comment.
"full" would seem to indicate that we're running everything. If we're not running slow tests in "full", where are we running them?
There was a problem hiding this comment.
The only test marked as slow is FrameEncryptionHandlerVeryLongTest, which takes 3 hours to run. I'm not sure under what circumstances we would want to run it, but you can always manually run it. Would it be better if I renamed this tag to something like manualInvocationOnly?
There was a problem hiding this comment.
Are we stuck with the name "full-test-suite"? Why not just "test-suite"?
There was a problem hiding this comment.
I've renamed it to test-suite. I've also renamed the tag to be "ad_hoc", as I felt it was a little confusing having a "slow" tag and also a fastTestsOnly system property.
JUnit5 doesn't support test suites yet (see junit-team/junit5#744) and the existing test suites do not support the new JUnit5 tests that are being used for keyrings. This change removes the test suites, and configures Maven to include all tests except those marked with certain JUnit tags. Additionally, this change updates the TestVectorRunner to also test Keyrings and removes the redundant XCompat tests.
WesleyRosenblum
force-pushed
the
keyringtests
branch
from
c973367 to
9c3e162
Compare
pom.xml
Outdated
| <includes> | ||
| <include>**/AllTestsSuite.java</include> | ||
| </includes> | ||
| <excludedGroups>slow</excludedGroups> |
There was a problem hiding this comment.
Are we stuck with the name "full-test-suite"? Why not just "test-suite"?
Comment on lines
147
to
148
| cachedData.putIfAbsent(plaintextUrl, readBytesFromJar(jar, plaintextUrl)); | ||
| cachedData.putIfAbsent(ciphertextURL, readBytesFromJar(jar, ciphertextURL)); |
There was a problem hiding this comment.
This always reads the data from the JAR rather than only reading it if there is a cache miss. That might be expensive as I'm not sure how the data is being cached locally by Java. You could use computeIfAbsent if you want though.
src/test/java/com/amazonaws/encryptionsdk/kms/KMSProviderBuilderIntegrationTests.java
Show resolved
Hide resolved
WesleyRosenblum
added a commit
that referenced
this pull request
Feb 12, 2020
…#151) * Incorporate Keyrings into AwsCrypto and deprecate MasterKeyProviders. * Update example code to use keyrings * Using try-with-resources for AwsCrypto streams * Splitting MKP and keyring unit tests * Making decryptData with ParsedCiphertext public * Mark KeyStoreProvider as deprecated * Reword some comments on the Basic Encryption example * Add test for compability of Keyrings with MasterKeyProviders * Create individual request types for each AwsCrypto method * Make EncryptionMaterials, DecryptionMaterials and KeyringTrace immutable * Rename KmsKeying and related classes to AwsKmsKeyring * Create builders for the standard keyrings * Create AwsKmsCmkId type to represent AWS KMS Key Ids * Add factory methods to Keyring builders * Add comment on not making a defensive copy of plaintext/ciphertext * Limit ability to create discovery AWS KMS Keyrings to explicit creation * Add withKeyring to CachingCMM builder * Fix DecryptRequestTest * Fix Junit 4 assertions in JUnit5 tests * Renaming StaticKeyring to TestKeyring * Adding convenience methods the create builders internally * Updating wording and adding more Deprecated annotations * Enable AwsKms Client Caching by default to match KmsMasterKeyProvider * Making tests opt-out instead of opt-in and update TestVectorRunner (#154) * Making tests opt-out instead of opt-in and update TestVectorRunner JUnit5 doesn't support test suites yet (see junit-team/junit5#744) and the existing test suites do not support the new JUnit5 tests that are being used for keyrings. This change removes the test suites, and configures Maven to include all tests except those marked with certain JUnit tags. Additionally, this change updates the TestVectorRunner to also test Keyrings and removes the redundant XCompat tests. * Client caching is now enabled by default in AwsKmsClientSupplier * Rename slow tag to ad_hoc and fix TestVectorRunner * Renaming StandardKeyring builder methods and other minors changes * Fixing test * Updating tests to use assertThrows * Additional example code for Keyrings (#155) * Additional example code for Keyrings * Updating wording * Remove AWS from AWS KMS keyring and make keyring lowercase
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description of changes:
JUnit5 doesn't support test suites yet (see junit-team/junit5#744) and the existing
test suites do not support the new JUnit5 tests that are being used for keyrings. This change removes the test
suites, and configures Maven to include all tests except those marked with certain JUnit tags.
Additionally, this change updates the TestVectorRunner to also test Keyrings and removes the redundant XCompat tests.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
Check any applicable: