Making tests opt-out instead of opt-in and update TestVectorRunner

JUnit5 doesn't support test suites yet
(see junit-team/junit-framework#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.

Author: WesleyRosenblum

pom.xml

@@ -54,7 +54,7 @@
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
+            <artifactId>junit-jupiter</artifactId>
             <version>5.5.2</version>
             <scope>test</scope>
         </dependency>
@@ -208,30 +208,50 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>2.22.0</version>
                         <configuration>
-                            <includes>
-                                <include>**/AllTestsSuite.java</include>
-                            </includes>
+                            <excludedGroups>slow</excludedGroups>
                         </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
 
+        <!-- This test profile is intended to assist in rapid development; it filters out some of the slower,
+             more exhaustive tests in the overall test suite to allow for a rapid edit-test cycle. -->
         <profile>
             <id>fast-tests-only</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>2.22.0</version>
                         <configuration>
-                            <includes>
-                                <include>**/FastTestsOnlySuite.java</include>
-                            </includes>
+                            <excludedGroups>slow, integration</excludedGroups>
+                            <systemPropertyVariables>
+                                <fastTestsOnly>true</fastTestsOnly>
+                            </systemPropertyVariables>
+                            <!-- Require that this fast suite completes relatively quickly. If you're seeing
+                            this timeout get hit, it's time to pare down tests some more. As a general rule of
+                            thumb, we should avoid any single test taking more than 10s, and try to keep the
+                            number of such slow tests to a minimum. -->
+                            <forkedProcessTimeoutInSeconds>120</forkedProcessTimeoutInSeconds>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!-- This test profile will run only the integration tests. -->
+        <profile>
+            <id>integration</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>2.22.0</version>
+                        <configuration>
+                            <groups>integration</groups>
                         </configuration>
                     </plugin>
                 </plugins>

src/test/java/com/amazonaws/crypto/examples/BasicEncryptionExampleTest.java

@@ -13,10 +13,13 @@
 
 package com.amazonaws.crypto.examples;
 
+import com.amazonaws.encryptionsdk.TestUtils;
 import com.amazonaws.encryptionsdk.kms.AwsKmsCmkId;
 import com.amazonaws.encryptionsdk.kms.KMSTestFixtures;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
+@Tag(TestUtils.TAG_INTEGRATION)
 class BasicEncryptionExampleTest {
 
     @Test

src/test/java/com/amazonaws/crypto/examples/EscrowedEncryptExampleTest.java

@@ -13,12 +13,15 @@
 
 package com.amazonaws.crypto.examples;
 
+import com.amazonaws.encryptionsdk.TestUtils;
 import com.amazonaws.encryptionsdk.kms.AwsKmsCmkId;
 import com.amazonaws.encryptionsdk.kms.KMSTestFixtures;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 import java.security.GeneralSecurityException;
 
+@Tag(TestUtils.TAG_INTEGRATION)
 class EscrowedEncryptExampleTest {
 
     @Test

src/test/java/com/amazonaws/encryptionsdk/AllTestsSuite.java

@@ -13,9 +13,9 @@
 
 package com.amazonaws.encryptionsdk;
 
-import static com.amazonaws.encryptionsdk.FastTestsOnlySuite.isFastTestSuiteActive;
 import static com.amazonaws.encryptionsdk.TestUtils.assertNullChecks;
 import static com.amazonaws.encryptionsdk.TestUtils.assertThrows;
+import static com.amazonaws.encryptionsdk.TestUtils.isFastTestsOnly;
 import static java.util.Collections.singletonMap;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -203,7 +203,7 @@ public void encryptDecrypt() {
                 for (int j = 0; j < bytesToTest.length; j++) {
                     final int byteSize = bytesToTest[j];
 
-                    if (byteSize > 500_000 && isFastTestSuiteActive()) {
+                    if (byteSize > 500_000 && isFastTestsOnly()) {
                         continue;
                     }
 
@@ -232,7 +232,7 @@ public void encryptDecryptWithBadSignature() {
                 for (int j = 0; j < bytesToTest.length; j++) {
                     final int byteSize = bytesToTest[j];
 
-                    if (byteSize > 500_000 && isFastTestSuiteActive()) {
+                    if (byteSize > 500_000 && isFastTestsOnly()) {
                         continue;
                     }
 
@@ -258,7 +258,7 @@ public void encryptDecryptWithParsedCiphertext() {
                 for (int j = 0; j < bytesToTest.length; j++) {
                     final int byteSize = bytesToTest[j];
 
-                    if (byteSize > 500_000 && isFastTestSuiteActive()) {
+                    if (byteSize > 500_000 && isFastTestsOnly()) {
                         continue;
                     }
 
@@ -467,7 +467,7 @@ public void estimateCiphertextSize() {
                 for (int j = 0; j < bytesToTest.length; j++) {
                     final int byteSize = bytesToTest[j];
 
-                    if (byteSize > 500_000 && isFastTestSuiteActive()) {
+                    if (byteSize > 500_000 && isFastTestsOnly()) {
                         continue;
                     }
 

src/test/java/com/amazonaws/encryptionsdk/AwsCryptoTest.java

@@ -15,6 +15,7 @@
 
 import static com.amazonaws.encryptionsdk.TestUtils.assertThrows;
 import static com.amazonaws.encryptionsdk.TestUtils.insecureRandomBytes;
+import static com.amazonaws.encryptionsdk.TestUtils.isFastTestsOnly;
 import static com.amazonaws.encryptionsdk.internal.TestIOUtils.getSha256Hash;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -163,7 +164,7 @@ public static Collection<Object[]> encryptDecryptParams() {
                 // Our bytesToTest and readLenVals arrays tend to have the bigger numbers towards the end - we'll chop off
                 // the last few as they take the longest and don't really add that much more coverage.
                 int skipLastNSizes;
-                if (!FastTestsOnlySuite.isFastTestSuiteActive()) {
+                if (!isFastTestsOnly()) {
                     skipLastNSizes = 0;
                 } else if (firstAlgorithm) {
                     // We'll run more tests for the first algorithm in the list - but not go quite so far as running the

src/test/java/com/amazonaws/encryptionsdk/CryptoInputStreamTest.java

@@ -14,9 +14,9 @@
 package com.amazonaws.encryptionsdk;
 
 import static com.amazonaws.encryptionsdk.AwsCrypto.getDefaultFrameSize;
-import static com.amazonaws.encryptionsdk.FastTestsOnlySuite.isFastTestSuiteActive;
 import static com.amazonaws.encryptionsdk.TestUtils.assertThrows;
 import static com.amazonaws.encryptionsdk.TestUtils.insecureRandomBytes;
+import static com.amazonaws.encryptionsdk.TestUtils.isFastTestsOnly;
 import static com.amazonaws.encryptionsdk.TestUtils.toByteArray;
 import static com.amazonaws.encryptionsdk.internal.TestIOUtils.getSha256Hash;
 import static org.junit.Assert.assertArrayEquals;
@@ -163,7 +163,7 @@ public static Collection<Object[]> encryptDecryptParams() {
                     int[] bytesToTest = { 0, 1, frameSize - 1, frameSize, frameSize + 1, (int) (frameSize * 1.5),
                                           frameSize * 2, 1000000 };
 
-                    if (isFastTestSuiteActive()) {
+                    if (isFastTestsOnly()) {
                         // Exclude the last two sizes, as they're the slowest
                         bytesToTest = Arrays.copyOfRange(bytesToTest, 0, bytesToTest.length - 2);
                     }
@@ -173,7 +173,7 @@ public static Collection<Object[]> encryptDecryptParams() {
                         final int byteSize = bytesToTest[j];
                         int[] readLenVals = { byteSize - 1, byteSize, byteSize + 1, byteSize * 2, 1000000 };
 
-                        if (isFastTestSuiteActive()) {
+                        if (isFastTestsOnly()) {
                             // Only test one read() call buffer length in the fast tests. This greatly cuts down on
                             // the combinatorial explosion of test cases here.
                             readLenVals = Arrays.copyOfRange(readLenVals, 0, 1);