tests: rename CassnadraSkip to ScyllaOnly

Name does not reflect logic.
This annotation makes test framework to skip all non-scylla backends.

Author: dkropachev

integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/DefaultMetadataTabletMapIT.java

@@ -10,7 +10,7 @@
 import com.datastax.oss.driver.api.core.metadata.KeyspaceTableNamePair;
 import com.datastax.oss.driver.api.core.metadata.Node;
 import com.datastax.oss.driver.api.core.metadata.Tablet;
-import com.datastax.oss.driver.api.testinfra.CassandraSkip;
+import com.datastax.oss.driver.api.testinfra.ScyllaOnly;
 import com.datastax.oss.driver.api.testinfra.ScyllaRequirement;
 import com.datastax.oss.driver.api.testinfra.ccm.CustomCcmRule;
 import com.datastax.oss.driver.api.testinfra.session.SessionRule;
@@ -41,7 +41,7 @@
     minOSS = "6.0.0",
     minEnterprise = "2024.2",
     description = "Needs to support tablets")
-@CassandraSkip(description = "Tablets are ScyllaDB-only extension")
+@ScyllaOnly(description = "Tablets are ScyllaDB-only extension")
 public class DefaultMetadataTabletMapIT {
   private static final Logger LOG = LoggerFactory.getLogger(DefaultMetadataTabletMapIT.class);
   private static final CustomCcmRule CCM_RULE =

integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/TabletMapSchemaChangesIT.java

@@ -12,7 +12,7 @@
 import com.datastax.oss.driver.api.core.metadata.Node;
 import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
 import com.datastax.oss.driver.api.core.metadata.schema.TableMetadata;
-import com.datastax.oss.driver.api.testinfra.CassandraSkip;
+import com.datastax.oss.driver.api.testinfra.ScyllaOnly;
 import com.datastax.oss.driver.api.testinfra.ScyllaRequirement;
 import com.datastax.oss.driver.api.testinfra.ccm.CustomCcmRule;
 import com.datastax.oss.driver.api.testinfra.session.SessionRule;
@@ -34,7 +34,7 @@
     minOSS = "6.0.0",
     minEnterprise = "2024.2",
     description = "Needs to support tablets")
-@CassandraSkip(description = "Tablets are ScyllaDB-only extension")
+@ScyllaOnly(description = "Tablets are ScyllaDB-only extension")
 // Ensures that TabletMap used by MetadataManager behaves as desired on certain events
 public class TabletMapSchemaChangesIT {
 

integration-tests/src/test/java/com/datastax/oss/driver/core/pool/AdvancedShardAwarenessIT.java

@@ -11,7 +11,7 @@
 import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
 import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
 import com.datastax.oss.driver.api.core.session.Session;
-import com.datastax.oss.driver.api.testinfra.CassandraSkip;
+import com.datastax.oss.driver.api.testinfra.ScyllaOnly;
 import com.datastax.oss.driver.api.testinfra.ccm.CustomCcmRule;
 import com.datastax.oss.driver.api.testinfra.session.SessionUtils;
 import com.datastax.oss.driver.internal.core.pool.ChannelPool;
@@ -38,7 +38,7 @@
 import org.junit.runner.RunWith;
 import org.slf4j.LoggerFactory;
 
-@CassandraSkip(description = "Advanced shard awareness relies on ScyllaDB's shard aware port")
+@ScyllaOnly(description = "Advanced shard awareness relies on ScyllaDB's shard aware port")
 @RunWith(DataProviderRunner.class)
 public class AdvancedShardAwarenessIT {
 

integration-tests/src/test/java/com/datastax/oss/driver/mapper/SelectBypassCacheIT.java

@@ -39,7 +39,7 @@
 import com.datastax.oss.driver.api.mapper.annotations.Mapper;
 import com.datastax.oss.driver.api.mapper.annotations.PartitionKey;
 import com.datastax.oss.driver.api.mapper.annotations.Select;
-import com.datastax.oss.driver.api.testinfra.CassandraSkip;
+import com.datastax.oss.driver.api.testinfra.ScyllaOnly;
 import com.datastax.oss.driver.api.testinfra.ScyllaRequirement;
 import com.datastax.oss.driver.api.testinfra.ccm.CcmRule;
 import com.datastax.oss.driver.api.testinfra.session.SessionRule;
@@ -54,7 +54,7 @@
 import org.junit.rules.TestRule;
 
 @Category(ParallelizableTests.class)
-@CassandraSkip(description = "BYPASS CACHE clause is a ScyllaDB CQL Extension")
+@ScyllaOnly(description = "BYPASS CACHE clause is a ScyllaDB CQL Extension")
 @ScyllaRequirement(
     minOSS = "3.1.0",
     minEnterprise = "2020.1.0",

integration-tests/src/test/java/com/datastax/oss/driver/mapper/UsingTimeoutIT.java

@@ -19,7 +19,7 @@
 import com.datastax.oss.driver.api.mapper.annotations.PartitionKey;
 import com.datastax.oss.driver.api.mapper.annotations.Select;
 import com.datastax.oss.driver.api.mapper.annotations.Update;
-import com.datastax.oss.driver.api.testinfra.CassandraSkip;
+import com.datastax.oss.driver.api.testinfra.ScyllaOnly;
 import com.datastax.oss.driver.api.testinfra.ScyllaRequirement;
 import com.datastax.oss.driver.api.testinfra.ccm.CcmRule;
 import com.datastax.oss.driver.api.testinfra.session.SessionRule;
@@ -32,7 +32,7 @@
 import org.junit.rules.TestRule;
 
 @Category(ParallelizableTests.class)
-@CassandraSkip(description = "USING TIMEOUT is a ScyllaDB CQL Extension")
+@ScyllaOnly(description = "USING TIMEOUT is a ScyllaDB CQL Extension")
 @ScyllaRequirement(
     minOSS = "4.4.0",
     minEnterprise = "2022.1.0",

test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/CassandraSkip.java renamed to test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ScyllaOnly.java

@@ -18,12 +18,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-/**
- * Annotation for a Class or Method that skips it for Cassandra. If the tests are run against
- * Cassandra, the test is skipped.
- */
+/** Annotation for a Class or Method that skips for non-Scylla backend. */
 @Retention(RetentionPolicy.RUNTIME)
-public @interface CassandraSkip {
+public @interface ScyllaOnly {
   /** @return The description returned if this requirement is not met. */
-  String description() default "Disabled for Cassandra.";
+  String description() default "Supported only for Scylla.";
 }

test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/BaseCcmRule.java

@@ -28,7 +28,7 @@
 import com.datastax.oss.driver.api.core.Version;
 import com.datastax.oss.driver.api.core.metadata.EndPoint;
 import com.datastax.oss.driver.api.testinfra.CassandraResourceRule;
-import com.datastax.oss.driver.api.testinfra.CassandraSkip;
+import com.datastax.oss.driver.api.testinfra.ScyllaOnly;
 import com.datastax.oss.driver.api.testinfra.ScyllaSkip;
 import com.datastax.oss.driver.api.testinfra.requirement.BackendRequirementRule;
 import com.datastax.oss.driver.api.testinfra.requirement.BackendType;
@@ -87,16 +87,17 @@ public void evaluate() {
       }
     }
 
-    CassandraSkip cassandraSkip = description.getAnnotation(CassandraSkip.class);
-    if (cassandraSkip != null) {
+    ScyllaOnly scyllaOnly = description.getAnnotation(ScyllaOnly.class);
+    if (scyllaOnly != null) {
       if (!CcmBridge.isDistributionOf(BackendType.SCYLLA)) {
         return new Statement() {
 
           @Override
           public void evaluate() {
             throw new AssumptionViolatedException(
                 String.format(
-                    "Test skipped when running with Cassandra.  Description: %s", description));
+                    "Test skipped when running against non-scylla backend.  Description: %s",
+                    description));
           }
         };
       }