Updated test cypherWithProfileWithMemory to include details column an…

…d fixed imports
neo4j · May 11, 2020 · 01719f1 · 01719f1
1 parent 4c66ff3
commit 01719f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/...src/integration-test/java/org/neo4j/shell/commands/CypherShellVerboseIntegrationTest.java b/...src/integration-test/java/org/neo4j/shell/commands/CypherShellVerboseIntegrationTest.java
@@ -16,7 +16,6 @@
 import org.neo4j.shell.prettyprint.TablePlanFormatter;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
@@ -207,7 +206,7 @@ public void cypherWithOrder() throws CommandException {
     public void cypherWithQueryDetails() throws CommandException {
         // given
         String serverVersion = shell.getServerVersion();
-        assumeTrue((minorVersion(serverVersion) > 0 && majorVersion(serverVersion) == 4) || majorVersion(serverVersion) > 4);
+        assumeThat( version(serverVersion), greaterThanOrEqualTo(version("4.1")));
 
         //when
         shell.execute("EXPLAIN MATCH (n) with n.age AS age RETURN age");
@@ -223,7 +222,7 @@ public void cypherWithQueryDetails() throws CommandException {
     public void cypherWithoutQueryDetails() throws CommandException {
         // given
         String serverVersion = shell.getServerVersion();
-        assumeTrue((minorVersion(serverVersion) == 0 && majorVersion(serverVersion) == 4) || majorVersion(serverVersion) < 4);
+        assumeThat( version(serverVersion), not(greaterThanOrEqualTo(version("4.1"))));
 
         //when
         shell.execute("EXPLAIN MATCH (n) with n.age AS age RETURN age");
@@ -264,7 +263,7 @@ public void cypherWithProfileWithMemory() throws CommandException {
         //then
         String actual = linePrinter.output();
         assertThat(actual, containsString("| Plan      | Statement   | Version      | Planner | Runtime       | Time | DbHits | Rows | Memory (Bytes) |")); // First table
-        assertThat(actual, containsString("| Operator        | Estimated Rows | Rows | DB Hits | Cache H/M | Memory (Bytes) | Identifiers |")); // Second table
+        assertThat(actual, containsString("| Operator        | Details            | Estimated Rows | Rows | DB Hits | Cache H/M | Memory (Bytes) |")); // Second table
     }
 
     @Test

diff --git a/cypher-shell/src/main/java/org/neo4j/shell/prettyprint/TablePlanFormatter.java b/cypher-shell/src/main/java/org/neo4j/shell/prettyprint/TablePlanFormatter.java
@@ -38,7 +38,7 @@ public class TablePlanFormatter {
     private static final String TIME = "Time (ms)";
     private static final String ORDER = "Ordered by";
     private static final String MEMORY = "Memory (Bytes)";
-    private static final String IDENTIFIERS = "Identifiers";
+    public static final String IDENTIFIERS = "Identifiers";
     private static final String OTHER = "Other";
     public static final String DETAILS = "Details";
     private static final String SEPARATOR = ", ";