devilkris
diff --git a/‎driver-core/src/test/java/com/datastax/driver/core/AggregateMetadataTest.java‎
Lines changed: 2 additions & 2 deletions b/‎driver-core/src/test/java/com/datastax/driver/core/AggregateMetadataTest.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎driver-core/src/test/java/com/datastax/driver/core/AuthenticationTest.java‎
Lines changed: 1 addition & 1 deletion b/‎driver-core/src/test/java/com/datastax/driver/core/AuthenticationTest.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎driver-core/src/test/java/com/datastax/driver/core/CCMAccess.java‎
Lines changed: 26 additions & 3 deletions b/‎driver-core/src/test/java/com/datastax/driver/core/CCMAccess.java‎
Lines changed: 26 additions & 3 deletions
@@ -185,7 +185,7 @@ public void should_parse_and_format_aggregate_with_udts() {
     @Test(groups = "short")
     @CassandraVersion("2.2.0")
     public void should_parse_and_format_aggregate_with_composite_type_literal_initcond() {
-        VersionNumber ver = VersionNumber.parse(CCMBridge.getCassandraVersion());
+        VersionNumber ver = ccm().getCassandraVersion();
         if (ver.getMajor() == 3) {
             if ((ver.getMinor() >= 1 && ver.getMinor() < 4) || (ver.getMinor() == 0 && ver.getPatch() < 4)) {
                 throw new SkipException("Requires C* 2.2.X, 3.0.4+ or 3.4.X+");
@@ -206,7 +206,7 @@ public void should_parse_and_format_aggregate_with_composite_type_literal_initco
     @Test(groups = "short")
     @CassandraVersion("3.4")
     public void should_parse_and_format_aggregate_with_composite_type_hex_initcond() {
-        VersionNumber ver = VersionNumber.parse(CCMBridge.getCassandraVersion());
+        VersionNumber ver = ccm().getCassandraVersion();
         if ((ver.getMinor() >= 1 && ver.getMinor() < 4)) {
             throw new SkipException("Requires 3.0.4+ or 3.4.X+");
         }
 
@@ -41,7 +41,7 @@ public class AuthenticationTest extends CCMTestsSupport {
     public void sleepIf12() {
         // For C* 1.2, sleep before attempting to connect as there is a small delay between
         // user being created.
-        if (ccm().getVersion().getMajor() < 2) {
+        if (ccm().getCassandraVersion().getMajor() < 2) {
             Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
         }
     }
 
@@ -32,13 +32,21 @@ enum Workload {cassandra, solr, hadoop, spark, cfs, graph}
     String getClusterName();
 
     /**
-     * Returns the Cassandra version of this CCM cluster.
+     * Returns the Cassandra version of this CCM cluster.  If {@link #getDSEVersion()} is non-null it is assumed
+     * that this value is only used for representing the compatible Cassandra version for that DSE version.
      * <p/>
-     * By default the version is equal to {@link CCMBridge#getCassandraVersion()}.
      *
      * @return The version of this CCM cluster.
      */
-    VersionNumber getVersion();
+    VersionNumber getCassandraVersion();
+
+    /**
+     * Returns the DSE version of this CCM cluster if this is a DSE cluster, otherwise null.
+     * <p/>
+     *
+     * @return The version of this CCM cluster.
+     */
+    VersionNumber getDSEVersion();
 
     /**
      * @return The config directory for this CCM cluster.
@@ -236,4 +244,19 @@ enum Workload {cassandra, solr, hadoop, spark, cfs, graph}
      */
     void waitForDown(int node);
 
+    /**
+     * @return The target protocolVersion to use when connecting to this CCM cluster.
+     * <p/>
+     * This should be based on the highest protocol version that both the cluster and driver support.
+     * <p/>
+     * For example, C* 2.0.17 should return {@link ProtocolVersion#V2} since C* supports up to V2 and the driver
+     * supports that version.
+     */
+    ProtocolVersion getProtocolVersion();
+
+    /**
+     * @param maximumAllowed The maximum protocol version to use.
+     * @return The target protocolVersion or maximumAllowed if {@link #getProtocolVersion} is greater.
+     */
+    ProtocolVersion getProtocolVersion(ProtocolVersion maximumAllowed);
 }
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public class AuthenticationTest extends CCMTestsSupport {`
`41`	`41`	`public void sleepIf12() {`
`42`	`42`	`// For C* 1.2, sleep before attempting to connect as there is a small delay between`
`43`	`43`	`// user being created.`
`44`		`- if (ccm().getVersion().getMajor() < 2) {`
	`44`	`+ if (ccm().getCassandraVersion().getMajor() < 2) {`
`45`	`45`	`Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);`
`46`	`46`	`}`
`47`	`47`	`}`