From ad07c212a7d80a339d747afa0fc056fe71a3482f Mon Sep 17 00:00:00 2001 From: Pontus Melke Date: Sat, 2 Sep 2017 15:30:14 +0200 Subject: [PATCH] Fixed failing test after forward merge --- .../auth/ConfiguredProceduresTestBase.java | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ConfiguredProceduresTestBase.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ConfiguredProceduresTestBase.java index 1bd12b5df923f..79f99ddcde1a0 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ConfiguredProceduresTestBase.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ConfiguredProceduresTestBase.java @@ -317,19 +317,21 @@ public void shouldGiveNiceMessageAtFailWhenTryingToKill() throws Throwable configuredSetup( stringMap( GraphDatabaseSettings.kill_query_verbose.name(), "true" ) ); String query = "CALL dbms.killQuery('query-9999999999')"; - Map expected = new HashMap<>(); - expected.put( "queryId", "query-9999999999" ); - expected.put( "username", "n/a" ); - expected.put( "message", "No Query found with this id" ); + Map expected = new HashMap<>(); + expected.put( "queryId", valueOf( "query-9999999999" ) ); + expected.put( "username", valueOf( "n/a" ) ); + expected.put( "message", valueOf( "No Query found with this id" ) ); assertSuccess( adminSubject, query, r -> Assert.assertThat( r.next(), equalTo( expected ) ) ); } @Test public void shouldNotGiveNiceMessageAtFailWhenTryingToKillWhenConfigured() throws Throwable { - super.setUp(); + configuredSetup( stringMap( GraphDatabaseSettings.kill_query_verbose.name(), "false" ) ); String query = "CALL dbms.killQuery('query-9999999999')"; - assertSuccess( adminSubject, query, r -> Assert.assertThat( r.hasNext(), is( false ) ) ); + assertSuccess( adminSubject, query, r -> + + Assert.assertThat( r.hasNext(), is( false ) ) ); } @Test @@ -340,15 +342,15 @@ public void shouldGiveNiceMessageAtFailWhenTryingToKillMoreThenOne() throws Thro String query = "CALL dbms.killQueries(['query-9999999999', 'query-9999999989'])"; //Expect - Set> expected = new HashSet<>(); - Map firstResultExpected = new HashMap<>(); - firstResultExpected.put( "queryId", "query-9999999989" ); - firstResultExpected.put( "username", "n/a" ); - firstResultExpected.put( "message", "No Query found with this id" ); - Map secoundResultExpected = new HashMap<>(); - secoundResultExpected.put( "queryId", "query-9999999999" ); - secoundResultExpected.put( "username", "n/a" ); - secoundResultExpected.put( "message", "No Query found with this id" ); + Set> expected = new HashSet<>(); + Map firstResultExpected = new HashMap<>(); + firstResultExpected.put( "queryId", valueOf( "query-9999999989" ) ); + firstResultExpected.put( "username", valueOf( "n/a" ) ); + firstResultExpected.put( "message", valueOf( "No Query found with this id" ) ); + Map secoundResultExpected = new HashMap<>(); + secoundResultExpected.put( "queryId", valueOf( "query-9999999999" ) ); + secoundResultExpected.put( "username", valueOf( "n/a" ) ); + secoundResultExpected.put( "message", valueOf( "No Query found with this id" ) ); expected.add( firstResultExpected ); expected.add( secoundResultExpected );