JAVA-3069: Refactor duplicated tests with different requirements to use @BackendRequirement (#1667)

Refactor @BackendRequirement test skipping logic into new rule, BackendRequirementRule.

Author: hhughes

integration-tests/src/test/java/com/datastax/dse/driver/api/core/auth/DseGssApiAuthProviderAlternateIT.java

@@ -22,7 +22,8 @@
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
 import com.datastax.oss.driver.api.core.cql.Row;
-import com.datastax.oss.driver.api.testinfra.DseRequirement;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendRequirement;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendType;
 import com.datastax.oss.driver.api.testinfra.session.SessionUtils;
 import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
 import com.tngtech.java.junit.dataprovider.DataProvider;
@@ -32,7 +33,10 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-@DseRequirement(min = "5.0", description = "Required for DseAuthenticator")
+@BackendRequirement(
+    type = BackendType.DSE,
+    minInclusive = "5.0",
+    description = "Required for DseAuthenticator")
 @RunWith(DataProviderRunner.class)
 public class DseGssApiAuthProviderAlternateIT {
   @ClassRule public static EmbeddedAdsRule ads = new EmbeddedAdsRule(true);

integration-tests/src/test/java/com/datastax/dse/driver/api/core/auth/DseGssApiAuthProviderIT.java

@@ -24,15 +24,19 @@
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.auth.AuthenticationException;
 import com.datastax.oss.driver.api.core.cql.ResultSet;
-import com.datastax.oss.driver.api.testinfra.DseRequirement;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendRequirement;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendType;
 import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
 import java.util.List;
 import java.util.Map;
 import org.junit.Assume;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-@DseRequirement(min = "5.0", description = "Required for DseAuthenticator")
+@BackendRequirement(
+    type = BackendType.DSE,
+    minInclusive = "5.0",
+    description = "Required for DseAuthenticator")
 public class DseGssApiAuthProviderIT {
 
   @ClassRule public static EmbeddedAdsRule ads = new EmbeddedAdsRule();

integration-tests/src/test/java/com/datastax/dse/driver/api/core/auth/DsePlainTextAuthProviderIT.java

@@ -24,8 +24,9 @@
 import com.datastax.oss.driver.api.core.Version;
 import com.datastax.oss.driver.api.core.auth.AuthenticationException;
 import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
-import com.datastax.oss.driver.api.testinfra.DseRequirement;
 import com.datastax.oss.driver.api.testinfra.ccm.CustomCcmRule;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendRequirement;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendType;
 import com.datastax.oss.driver.api.testinfra.session.SessionUtils;
 import com.datastax.oss.driver.internal.core.auth.PlainTextAuthProvider;
 import com.datastax.oss.driver.shaded.guava.common.util.concurrent.Uninterruptibles;
@@ -35,7 +36,10 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 
-@DseRequirement(min = "5.0", description = "Required for DseAuthenticator")
+@BackendRequirement(
+    type = BackendType.DSE,
+    minInclusive = "5.0",
+    description = "Required for DseAuthenticator")
 public class DsePlainTextAuthProviderIT {
 
   @ClassRule

integration-tests/src/test/java/com/datastax/dse/driver/api/core/auth/DseProxyAuthenticationIT.java

@@ -27,7 +27,8 @@
 import com.datastax.oss.driver.api.core.cql.ResultSet;
 import com.datastax.oss.driver.api.core.cql.SimpleStatement;
 import com.datastax.oss.driver.api.core.servererrors.UnauthorizedException;
-import com.datastax.oss.driver.api.testinfra.DseRequirement;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendRequirement;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendType;
 import com.datastax.oss.driver.api.testinfra.session.SessionUtils;
 import com.datastax.oss.driver.internal.core.auth.PlainTextAuthProvider;
 import java.util.List;
@@ -36,7 +37,10 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 
-@DseRequirement(min = "5.1", description = "Required for DseAuthenticator with proxy")
+@BackendRequirement(
+    type = BackendType.DSE,
+    minInclusive = "5.1",
+    description = "Required for DseAuthenticator with proxy")
 public class DseProxyAuthenticationIT {
   private static String bobPrincipal;
   private static String charliePrincipal;

integration-tests/src/test/java/com/datastax/dse/driver/api/core/auth/EmbeddedAdsRule.java

@@ -18,16 +18,12 @@
 import com.datastax.dse.driver.api.core.config.DseDriverOption;
 import com.datastax.dse.driver.internal.core.auth.DseGssApiAuthProvider;
 import com.datastax.oss.driver.api.core.CqlSession;
-import com.datastax.oss.driver.api.core.Version;
 import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
-import com.datastax.oss.driver.api.testinfra.ccm.CcmBridge;
 import com.datastax.oss.driver.api.testinfra.ccm.CustomCcmRule;
-import com.datastax.oss.driver.api.testinfra.requirement.BackendType;
-import com.datastax.oss.driver.api.testinfra.requirement.VersionRequirement;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendRequirementRule;
 import com.datastax.oss.driver.api.testinfra.session.SessionUtils;
 import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
 import java.io.File;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.AssumptionViolatedException;
@@ -155,20 +151,15 @@ protected void before() {
 
   @Override
   public Statement apply(Statement base, Description description) {
-    BackendType backend = CcmBridge.DSE_ENABLEMENT ? BackendType.DSE : BackendType.CASSANDRA;
-    Version version = CcmBridge.VERSION;
-
-    Collection<VersionRequirement> requirements = VersionRequirement.fromAnnotations(description);
-
-    if (VersionRequirement.meetsAny(requirements, backend, version)) {
+    if (BackendRequirementRule.meetsDescriptionRequirements(description)) {
       return super.apply(base, description);
     } else {
       // requirements not met, throw reasoning assumption to skip test
       return new Statement() {
         @Override
         public void evaluate() {
           throw new AssumptionViolatedException(
-              VersionRequirement.buildReasonString(requirements, backend, version));
+              BackendRequirementRule.buildReasonString(description));
         }
       };
     }

integration-tests/src/test/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousPagingIT.java

@@ -30,8 +30,9 @@
 import com.datastax.oss.driver.api.core.cql.SimpleStatement;
 import com.datastax.oss.driver.api.core.cql.Statement;
 import com.datastax.oss.driver.api.core.metrics.DefaultNodeMetric;
-import com.datastax.oss.driver.api.testinfra.DseRequirement;
 import com.datastax.oss.driver.api.testinfra.ccm.CcmRule;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendRequirement;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendType;
 import com.datastax.oss.driver.api.testinfra.session.SessionRule;
 import com.datastax.oss.driver.api.testinfra.session.SessionUtils;
 import com.datastax.oss.driver.categories.ParallelizableTests;
@@ -58,8 +59,9 @@
 import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
 
-@DseRequirement(
-    min = "5.1.0",
+@BackendRequirement(
+    type = BackendType.DSE,
+    minInclusive = "5.1.0",
     description = "Continuous paging is only available from 5.1.0 onwards")
 @Category(ParallelizableTests.class)
 @RunWith(DataProviderRunner.class)

integration-tests/src/test/java/com/datastax/dse/driver/api/core/cql/continuous/reactive/ContinuousPagingReactiveIT.java

@@ -27,8 +27,9 @@
 import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
 import com.datastax.oss.driver.api.core.cql.SimpleStatement;
 import com.datastax.oss.driver.api.core.metrics.DefaultNodeMetric;
-import com.datastax.oss.driver.api.testinfra.DseRequirement;
 import com.datastax.oss.driver.api.testinfra.ccm.CcmRule;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendRequirement;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendType;
 import com.datastax.oss.driver.api.testinfra.session.SessionRule;
 import com.datastax.oss.driver.api.testinfra.session.SessionUtils;
 import com.datastax.oss.driver.categories.ParallelizableTests;
@@ -47,8 +48,9 @@
 import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
 
-@DseRequirement(
-    min = "5.1.0",
+@BackendRequirement(
+    type = BackendType.DSE,
+    minInclusive = "5.1.0",
     description = "Continuous paging is only available from 5.1.0 onwards")
 @Category(ParallelizableTests.class)
 @RunWith(DataProviderRunner.class)

integration-tests/src/test/java/com/datastax/dse/driver/api/core/data/geometry/LineStringIT.java

@@ -22,8 +22,9 @@
 import com.datastax.oss.driver.api.core.cql.Row;
 import com.datastax.oss.driver.api.core.cql.SimpleStatement;
 import com.datastax.oss.driver.api.core.uuid.Uuids;
-import com.datastax.oss.driver.api.testinfra.DseRequirement;
 import com.datastax.oss.driver.api.testinfra.ccm.CcmRule;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendRequirement;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendType;
 import com.datastax.oss.driver.api.testinfra.session.SessionRule;
 import java.util.List;
 import java.util.UUID;
@@ -34,7 +35,7 @@
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestRule;
 
-@DseRequirement(min = "5.0")
+@BackendRequirement(type = BackendType.DSE, minInclusive = "5.0")
 public class LineStringIT extends GeometryIT<LineString> {
 
   private static CcmRule ccm = CcmRule.getInstance();

integration-tests/src/test/java/com/datastax/dse/driver/api/core/data/geometry/PointIT.java

@@ -16,16 +16,17 @@
 package com.datastax.dse.driver.api.core.data.geometry;
 
 import com.datastax.oss.driver.api.core.CqlSession;
-import com.datastax.oss.driver.api.testinfra.DseRequirement;
 import com.datastax.oss.driver.api.testinfra.ccm.CcmRule;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendRequirement;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendType;
 import com.datastax.oss.driver.api.testinfra.session.SessionRule;
 import org.assertj.core.util.Lists;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestRule;
 
-@DseRequirement(min = "5.0")
+@BackendRequirement(type = BackendType.DSE, minInclusive = "5.0")
 public class PointIT extends GeometryIT<Point> {
 
   private static CcmRule ccm = CcmRule.getInstance();

integration-tests/src/test/java/com/datastax/dse/driver/api/core/data/geometry/PolygonIT.java

@@ -22,8 +22,9 @@
 import com.datastax.oss.driver.api.core.cql.Row;
 import com.datastax.oss.driver.api.core.cql.SimpleStatement;
 import com.datastax.oss.driver.api.core.uuid.Uuids;
-import com.datastax.oss.driver.api.testinfra.DseRequirement;
 import com.datastax.oss.driver.api.testinfra.ccm.CcmRule;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendRequirement;
+import com.datastax.oss.driver.api.testinfra.requirement.BackendType;
 import com.datastax.oss.driver.api.testinfra.session.SessionRule;
 import java.util.UUID;
 import org.assertj.core.util.Lists;
@@ -33,7 +34,7 @@
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestRule;
 
-@DseRequirement(min = "5.0")
+@BackendRequirement(type = BackendType.DSE, minInclusive = "5.0")
 public class PolygonIT extends GeometryIT<Polygon> {
 
   private static CcmRule ccm = CcmRule.getInstance();