Fix DiagnosticsIT

adutra · adutra · commit 69ecc6e16be0 · 2020-04-23T16:20:44.000+02:00
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/DiagnosticsIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/DiagnosticsIT.java
@@ -53,7 +53,7 @@
 public class DiagnosticsIT {
 
   private static final SimulacronRule SIMULACRON_RULE =
-      new SimulacronRule(ClusterSpec.builder().withNodes(3, 3));
+      new SimulacronRule(ClusterSpec.builder().withNodes(3));
 
   private static final SessionRule<CqlSession> SESSION_RULE =
       SessionRule.builder(SIMULACRON_RULE)
@@ -86,7 +86,7 @@ public void should_generate_diagnostic_for_simple_strategy() {
     assertThat(maybeKs).isPresent();
     TokenRingDiagnostic diagnostic =
         metadata.generateTokenRingDiagnostic(
-            maybeKs.get().getName(), ConsistencyLevel.QUORUM, null);
+            maybeKs.get().getName(), ConsistencyLevel.QUORUM, "dc1");
     assertThat(diagnostic.getStatus()).isEqualTo(Status.AVAILABLE);
     assertThat(diagnostic.getDetails())
         .isEqualTo(
@@ -95,7 +95,7 @@ public void should_generate_diagnostic_for_simple_strategy() {
                 .put("keyspace", "ks_simple")
                 .put("replication", maybeKs.get().getReplication())
                 .put("consistencyLevel", QUORUM)
-                .put("availableRanges", 6)
+                .put("availableRanges", 3)
                 .put("unavailableRanges", 0)
                 .build());
   }
@@ -108,16 +108,17 @@ public void should_generate_diagnostic_for_network_topology_strategy() {
     assertThat(maybeKs).isPresent();
     TokenRingDiagnostic diagnostic =
         metadata.generateTokenRingDiagnostic(
-            maybeKs.get().getName(), ConsistencyLevel.EACH_QUORUM, null);
+            maybeKs.get().getName(), ConsistencyLevel.LOCAL_QUORUM, "dc1");
     assertThat(diagnostic.getStatus()).isEqualTo(Status.AVAILABLE);
     assertThat(diagnostic.getDetails())
         .isEqualTo(
             ImmutableMap.<String, Object>builder()
                 .put("status", Status.AVAILABLE)
                 .put("keyspace", "ks_nts")
+                .put("datacenter", "dc1")
                 .put("replication", maybeKs.get().getReplication())
-                .put("consistencyLevel", ConsistencyLevel.EACH_QUORUM)
-                .put("availableRanges", 6)
+                .put("consistencyLevel", ConsistencyLevel.LOCAL_QUORUM)
+                .put("availableRanges", 3)
                 .put("unavailableRanges", 0)
                 .build());
   }
@@ -140,9 +141,7 @@ private static void primeKeyspaces(BoundCluster simulacron) {
                     "class",
                     DefaultReplicationStrategyFactory.NETWORK_TOPOLOGY_STRATEGY,
                     "dc1",
-                    "3",
-                    "dc2",
-                    "1")));
+                    "3")));
     Query whenSelectAllKeyspaces = new Query("SELECT * FROM system_schema.keyspaces");
     SuccessResult thenReturnAllKeyspaces = new SuccessResult(allKeyspacesRows, KEYSPACE_COLUMNS);
     RequestPrime primeAllKeyspaces =
