JAVA-3099: Fix failing integration tests (#1701)

should_extract_hosts_using_native_transport_address_port_ssl_from_peers
- use testng style ignore

should_function_with_snappy_compression
- skip for cassandra 4.0.0 and greater (not supported)

should_handle_failing_or_missing_contact_points
- use V4 protocol to avoid initial retry with default V5

should_ignore_and_warn_peers_with_null_entries_by_default
- encode expected "missing native_transport_*" strings when not using v2-style peers

should_init_policy_with_up_contact_points
- since adding SNI support for astra, only contact points will have state INIT

should_throw_proper_read_timeout_exception
- update expected error message string

should_throw_exception_when_frame_exceeds_configured_max
- use V4 protocol for cassandra 4.0+

OPPTokenIntegrationTest/OPPTokenVnodeIntegrationTest
- not applicable for cassandra 4.0+

MailboxServiceSnappyIT
- not applicable for cassandra 4.0+

osgi/BundleOptions
- add missing dependencies for recent library upgrades

override org.ops4j.pax.url.mvn.repositories in osgi tests because https is now required by maven central

Author: hhughes

driver-core/src/test/java/com/datastax/driver/core/CCMTestsSupport.java

@@ -56,6 +56,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
@@ -1137,4 +1138,13 @@ private static <T> T instantiate(Class<? extends T> clazz)
       return (T) constructor.newInstance(enclosingInstance);
     }
   }
+
+  protected void skipTestWithCassandraVersionOrHigher(String version, String testKind) {
+    if (CCMBridge.getGlobalCassandraVersion().compareTo(VersionNumber.parse(version)) >= 0) {
+      throw new SkipException(
+          String.format(
+              "%s tests not applicable to cassandra version >= %s (configured: %s)",
+              testKind, version, CCMBridge.getGlobalCassandraVersion()));
+    }
+  }
 }

driver-core/src/test/java/com/datastax/driver/core/ClusterInitTest.java

@@ -107,6 +107,8 @@ public void should_handle_failing_or_missing_contact_points() throws UnknownHost
       cluster =
           Cluster.builder()
               .withPort(scassandra.getBinaryPort())
+              // scassandra supports max V4 protocol
+              .withProtocolVersion(ProtocolVersion.V4)
               .addContactPoints(
                   ipOfNode(1),
                   failingHosts.get(0).address,

driver-core/src/test/java/com/datastax/driver/core/ControlConnectionTest.java

@@ -52,7 +52,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.log4j.Level;
-import org.junit.Ignore;
 import org.scassandra.http.client.PrimingClient;
 import org.scassandra.http.client.PrimingRequest;
 import org.scassandra.http.client.Result;
@@ -335,11 +334,17 @@ static void run_with_null_peer_info(String columns, boolean expectPeer2, boolean
       cluster.init();
 
       InetAddress node2Address = scassandraCluster.address(2).getAddress();
+      String invalidValues =
+          withPeersV2
+              ? columnData
+              : String.format(
+                  "missing native_transport_address, missing native_transport_port, missing native_transport_port_ssl, %s",
+                  columnData);
       String expectedError =
           String.format(
               "Found invalid row in system.peers: [peer=%s, %s]. "
                   + "This is likely a gossip or snitch issue, this host will be ignored.",
-              node2Address, columnData);
+              node2Address, invalidValues);
       String log = logs.get();
       // then: A peer with a null rack should not show up in host metadata, unless allowed via
       // system property.
@@ -614,9 +619,8 @@ public void should_extract_hosts_using_native_transport_address_port_from_peers(
    * be selected if the Cluster is created with SSL support (i.e. if {@link
    * Cluster.Builder#withSSL()} is used).
    */
-  @Test(groups = "short")
+  @Test(groups = "short", enabled = false /* Requires SSL support in scassandra */)
   @CCMConfig(createCcm = false)
-  @Ignore("Requires SSL support in scassandra")
   public void should_extract_hosts_using_native_transport_address_port_ssl_from_peers()
       throws UnknownHostException {
 

driver-core/src/test/java/com/datastax/driver/core/DirectCompressionTest.java

@@ -29,6 +29,7 @@ public class DirectCompressionTest extends CompressionTest {
    */
   @Test(groups = "short")
   public void should_function_with_snappy_compression() throws Exception {
+    skipTestWithCassandraVersionOrHigher("4.0.0", "snappy");
     compressionTest(ProtocolOptions.Compression.SNAPPY);
   }
 

driver-core/src/test/java/com/datastax/driver/core/FrameLengthTest.java

@@ -26,6 +26,7 @@
 import com.datastax.driver.core.querybuilder.Insert;
 import com.datastax.driver.core.schemabuilder.Create;
 import com.datastax.driver.core.schemabuilder.SchemaBuilder;
+import com.datastax.driver.core.utils.CassandraVersion;
 import java.nio.ByteBuffer;
 import java.util.Collection;
 import java.util.Random;
@@ -105,22 +106,42 @@ public void onTestContextInitialized() {
    */
   @Test(groups = "isolated")
   public void should_throw_exception_when_frame_exceeds_configured_max() {
+    skipTestWithCassandraVersionOrHigher("4.0.0", "frame-size exceeding with default-protocol");
+    run_frame_size_exceeding_queries(session());
+  }
+
+  /**
+   * With cassandra 4.0.0+, V5 protocol is default which breaks requests into segments. Force V4
+   * protocol to allow us to test frame-size limitation code.
+   */
+  @CassandraVersion("4.0.0")
+  @Test(groups = "isolated")
+  public void should_throw_exception_when_frame_exceeds_configured_max_v4_protocol_cassandra4() {
+    Cluster cluster =
+        register(createClusterBuilder().withProtocolVersion(ProtocolVersion.V4).build());
+    Session session = register(cluster.connect());
+    useKeyspace(session, keyspace);
+
+    run_frame_size_exceeding_queries(session);
+  }
+
+  private void run_frame_size_exceeding_queries(Session session) {
     try {
-      session().execute(select().from(tableName).where(eq("k", 0)));
+      session.execute(select().from(tableName).where(eq("k", 0)));
       fail("Exception expected");
     } catch (FrameTooLongException ftle) {
       // Expected.
     }
 
     // Both hosts should remain up.
-    Collection<Host> hosts = session().getState().getConnectedHosts();
+    Collection<Host> hosts = session.getState().getConnectedHosts();
     assertThat(hosts).hasSize(2).extractingResultOf("isUp").containsOnly(true);
 
     // Should be able to make a query that is less than the max frame size.
     // Execute multiple time to exercise all hosts.
     for (int i = 0; i < 10; i++) {
       ResultSet result =
-          session().execute(select().from(tableName).where(eq("k", 0)).and(eq("c", 0)));
+          session.execute(select().from(tableName).where(eq("k", 0)).and(eq("c", 0)));
       assertThat(result.getAvailableWithoutFetching()).isEqualTo(1);
     }
   }

driver-core/src/test/java/com/datastax/driver/core/HeapCompressionTest.java

@@ -37,6 +37,7 @@ public void beforeTestClass() throws Exception {
    */
   @Test(groups = "isolated")
   public void should_function_with_snappy_compression() throws Exception {
+    skipTestWithCassandraVersionOrHigher("4.0.0", "snappy");
     compressionTest(ProtocolOptions.Compression.SNAPPY);
   }
 

driver-core/src/test/java/com/datastax/driver/core/LoadBalancingPolicyBootstrapTest.java

@@ -57,10 +57,13 @@ public void should_init_policy_with_up_contact_points() throws Exception {
     try {
       cluster.init();
 
+      // To support astra, only hosts in Metadata#getContactPoints are passed to init()
+      // TestUtils#configureClusterBuilder only uses the first host as the contact point
+      // Remaining hosts are learned after connection via onAdd()
       assertThat(policy.history)
           .containsOnly(
               entry(INIT, TestUtils.findHost(cluster, 1)),
-              entry(INIT, TestUtils.findHost(cluster, 2)));
+              entry(ADD, TestUtils.findHost(cluster, 2)));
     } finally {
       cluster.close();
     }

driver-core/src/test/java/com/datastax/driver/core/OPPTokenIntegrationTest.java

@@ -28,4 +28,10 @@ public OPPTokenIntegrationTest() {
   protected Token.Factory tokenFactory() {
     return OPPToken.FACTORY;
   }
+
+  @Override
+  public void beforeTestClass(Object testInstance) throws Exception {
+    skipTestWithCassandraVersionOrHigher("4.0.0", "ByteOrderedPartitioner");
+    super.beforeTestClass(testInstance);
+  }
 }

driver-core/src/test/java/com/datastax/driver/core/OPPTokenVnodeIntegrationTest.java

@@ -26,4 +26,10 @@ public OPPTokenVnodeIntegrationTest() {
   protected Token.Factory tokenFactory() {
     return Token.OPPToken.FACTORY;
   }
+
+  @Override
+  public void beforeTestClass(Object testInstance) throws Exception {
+    skipTestWithCassandraVersionOrHigher("4.0.0", "ByteOrderedPartitioner");
+    super.beforeTestClass(testInstance);
+  }
 }

driver-core/src/test/java/com/datastax/driver/core/exceptions/ExceptionsScassandraTest.java

@@ -78,7 +78,7 @@ public void should_throw_proper_read_timeout_exception() {
     } catch (ReadTimeoutException e) {
       assertThat(e.getMessage())
           .isEqualTo(
-              "Cassandra timeout during read query at consistency LOCAL_ONE (1 responses were required but only 0 replica responded)");
+              "Cassandra timeout during read query at consistency LOCAL_ONE (1 responses were required but only 0 replica responded). In case this was generated during read repair, the consistency level is not representative of the actual consistency.");
       assertThat(e.getConsistencyLevel()).isEqualTo(LOCAL_ONE);
       assertThat(e.getReceivedAcknowledgements()).isEqualTo(0);
       assertThat(e.getRequiredAcknowledgements()).isEqualTo(1);