Fix unrelated new test failures

because of removing deprecated features in Neo4j.

Author: sherfert

cypher-shell/src/integration-test/java/org/neo4j/shell/commands/CypherShellPlainIntegrationTest.java

@@ -41,7 +41,7 @@ public void tearDown() throws Exception {
     public void periodicCommitWorks() throws CommandException {
         shell.execute("USING PERIODIC COMMIT\n" +
                 "LOAD CSV FROM 'https://neo4j.com/docs/cypher-refcard/3.2/csv/artists.csv' AS line\n" +
-                "CREATE (:Artist {name: line[1], year: toInt(line[2])});");
+                "CREATE (:Artist {name: line[1], year: toInteger(line[2])});");
         linePrinter.clear();
 
         shell.execute("MATCH (a:Artist) WHERE a.name = 'Europe' RETURN a.name");

cypher-shell/src/integration-test/java/org/neo4j/shell/commands/CypherShellVerboseIntegrationTest.java

@@ -163,10 +163,10 @@ public void paramsAndListVariables() throws EvaluationException, CommandExceptio
         Object paramValue = shell.getParameterMap().setParameter("bob", String.valueOf(randomLong));
         assertEquals(randomLong, paramValue);
 
-        shell.execute("RETURN { bob }, $string");
+        shell.execute("RETURN $bob, $string");
 
         String result = linePrinter.output();
-        assertThat(result, containsString("| { bob }"));
+        assertThat(result, containsString("| $bob"));
         assertThat(result, containsString("| " + randomLong + " | " + stringInput + " |"));
         assertEquals(randomLong, shell.getParameterMap().allParameterValues().get( "bob"));
         assertEquals("randomString", shell.getParameterMap().allParameterValues().get( "string"));
@@ -180,10 +180,10 @@ public void paramsAndListVariablesWithSpecialCharacters() throws EvaluationExcep
         Object paramValue = shell.getParameterMap().setParameter("`bob`", String.valueOf(randomLong));
         assertEquals(randomLong, paramValue);
 
-        shell.execute("RETURN { `bob` }");
+        shell.execute("RETURN $`bob`");
 
         String result = linePrinter.output();
-        assertThat(result, containsString("| { `bob` }"));
+        assertThat(result, containsString("| $`bob`"));
         assertThat(result, containsString("\n| " + randomLong+ " |\n"));
         assertEquals(randomLong, shell.getParameterMap().allParameterValues().get("bob"));
     }