1818import static org .assertj .core .api .Assertions .assertThat ;
1919
2020import com .datastax .driver .core .utils .CassandraVersion ;
21+ import com .datastax .driver .core .utils .ScyllaVersion ;
2122import org .testng .annotations .Test ;
2223
23- @ CassandraVersion ("4.0.0" )
2424public class StartupOptionTest extends CCMTestsSupport {
2525
2626 /**
2727 * Ensures that when connecting, the driver STARTUP message contains DRIVER_NAME and
2828 * DRIVER_VERSION configuration in its option map. This should be reflected in the
2929 * system_views.clients table.
3030 */
31+ @ CassandraVersion ("4.0.0" )
3132 @ Test (groups = "short" )
3233 public void should_send_driver_name_and_version () {
3334 ResultSet result =
@@ -38,7 +39,21 @@ public void should_send_driver_name_and_version() {
3839
3940 for (Row row : result ) {
4041 assertThat (row .getString ("driver_version" )).isEqualTo (Cluster .getDriverVersion ());
41- assertThat (row .getString ("driver_name" )).isEqualTo ("DataStax Java Driver" );
42+ assertThat (row .getString ("driver_name" )).isEqualTo ("ScyllaDB Java Driver" );
43+ }
44+ }
45+
46+ @ ScyllaVersion (minOSS = "5.2.0" , minEnterprise = "2019.1" )
47+ @ Test (groups = "short" )
48+ public void should_send_driver_name_and_version_scylla () {
49+ ResultSet result = session ().execute ("select driver_name, driver_version from system.clients" );
50+
51+ // Should be at least 2 connections (1 control connection, 1 pooled connection)
52+ assertThat (result .getAvailableWithoutFetching ()).isGreaterThanOrEqualTo (2 );
53+
54+ for (Row row : result ) {
55+ assertThat (row .getString ("driver_version" )).isEqualTo (Cluster .getDriverVersion ());
56+ assertThat (row .getString ("driver_name" )).isEqualTo ("ScyllaDB Java Driver" );
4257 }
4358 }
4459}
0 commit comments