From d9b33e0aa6d00371db5d8c1bc84113b8f34e6077 Mon Sep 17 00:00:00 2001 From: fickludd Date: Thu, 8 Sep 2016 08:48:09 +0200 Subject: [PATCH] Reverted some refactoring in security procedures tests --- .../kernel/impl/factory/DataSourceModule.java | 3 +-- .../auth/AuthProceduresLoggingTest.java | 2 +- .../BoltAuthProceduresInteractionTest.java | 15 +----------- .../BoltAuthScenariosInteractionTest.java | 15 +----------- .../BoltBuiltInProceduresInteractionTest.java | 23 ++++++------------- .../enterprise/auth/BoltInteraction.java | 7 +++--- ...EmbeddedAuthProceduresInteractionTest.java | 8 +++++-- .../enterprise/auth/EmbeddedInteraction.java | 1 - .../enterprise/auth/NeoInteractionLevel.java | 5 ---- .../RESTBuiltInProceduresInteractionTest.java | 7 ++++-- 10 files changed, 25 insertions(+), 61 deletions(-) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/DataSourceModule.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/DataSourceModule.java index ab230471e02cb..62478f68fe3cc 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/DataSourceModule.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/DataSourceModule.java @@ -404,6 +404,7 @@ private Procedures setupProcedures( PlatformModule platform, EditionModule editi procedures.registerComponent( DependencyResolver.class, ( ctx ) -> platform.dependencies ); procedures.registerComponent( KernelTransaction.class, ( ctx ) -> ctx.get( KERNEL_TRANSACTION ) ); procedures.registerComponent( GraphDatabaseAPI.class, ( ctx ) -> platform.graphDatabaseFacade ); + procedures.registerComponent( AuthSubject.class, ctx -> ctx.get( AUTH_SUBJECT ) ); // Edition procedures try @@ -417,8 +418,6 @@ private Procedures setupProcedures( PlatformModule platform, EditionModule editi } // Security procedures - procedures.registerComponent( AuthSubject.class, ctx -> ctx.get( AUTH_SUBJECT ) ); - for ( ProceduresProvider candidate : Service.load( ProceduresProvider.class ) ) { candidate.registerProcedures( procedures ); diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/AuthProceduresLoggingTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/AuthProceduresLoggingTest.java index 79bb3ee912080..d916123af06c3 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/AuthProceduresLoggingTest.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/AuthProceduresLoggingTest.java @@ -621,7 +621,7 @@ private AssertableLogProvider.LogMatcher error( String message, String... argume return inLog( this.getClass() ).error( message, arguments ); } - private static class TestAuthSubject extends EnterpriseAuthSubject + private static class TestAuthSubject extends StandardEnterpriseAuthSubject { private final String name; private final boolean isAdmin; diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltAuthProceduresInteractionTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltAuthProceduresInteractionTest.java index 27bba1ec98de5..a9463173271a5 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltAuthProceduresInteractionTest.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltAuthProceduresInteractionTest.java @@ -20,24 +20,16 @@ package org.neo4j.server.security.enterprise.auth; import org.junit.Rule; -import org.junit.rules.RuleChain; import java.util.Map; -import org.neo4j.bolt.v1.transport.integration.Neo4jWithSocket; import org.neo4j.graphdb.config.Setting; -import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.test.TestEnterpriseGraphDatabaseFactory; -import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.SuppressOutput; public class BoltAuthProceduresInteractionTest extends AuthProceduresInteractionTestBase { - private Neo4jWithSocket server = new Neo4jWithSocket( getTestGraphDatabaseFactory(), - settings -> settings.put( GraphDatabaseSettings.auth_enabled, "true" ) ); - @Rule - public final RuleChain ruleChain = RuleChain.outerRule( SuppressOutput.suppressAll() ).around( server ); + public SuppressOutput suppressOutput = SuppressOutput.suppressAll(); public BoltAuthProceduresInteractionTest() { @@ -46,11 +38,6 @@ public BoltAuthProceduresInteractionTest() IS_BOLT = true; } - private TestGraphDatabaseFactory getTestGraphDatabaseFactory() - { - return new TestEnterpriseGraphDatabaseFactory(); - } - @Override public NeoInteractionLevel setUpNeoServer( Map, String> config ) throws Throwable { diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltAuthScenariosInteractionTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltAuthScenariosInteractionTest.java index b637fe71a8f76..1c184d440dfb5 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltAuthScenariosInteractionTest.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltAuthScenariosInteractionTest.java @@ -20,24 +20,16 @@ package org.neo4j.server.security.enterprise.auth; import org.junit.Rule; -import org.junit.rules.RuleChain; import java.util.Map; -import org.neo4j.bolt.v1.transport.integration.Neo4jWithSocket; import org.neo4j.graphdb.config.Setting; -import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.test.TestEnterpriseGraphDatabaseFactory; -import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.SuppressOutput; public class BoltAuthScenariosInteractionTest extends AuthScenariosInteractionTestBase { - private Neo4jWithSocket server = new Neo4jWithSocket( getTestGraphDatabaseFactory(), - settings -> settings.put( GraphDatabaseSettings.auth_enabled, "true" ) ); - @Rule - public final RuleChain ruleChain = RuleChain.outerRule( SuppressOutput.suppressAll() ).around( server ); + public SuppressOutput suppressOutput = SuppressOutput.suppressAll(); public BoltAuthScenariosInteractionTest() { @@ -46,11 +38,6 @@ public BoltAuthScenariosInteractionTest() IS_BOLT = true; } - private TestGraphDatabaseFactory getTestGraphDatabaseFactory() - { - return new TestEnterpriseGraphDatabaseFactory(); - } - @Override public NeoInteractionLevel setUpNeoServer( Map, String> config ) throws Throwable { diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltBuiltInProceduresInteractionTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltBuiltInProceduresInteractionTest.java index 2b7d2ba8c36c0..465a9a5b15309 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltBuiltInProceduresInteractionTest.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltBuiltInProceduresInteractionTest.java @@ -20,21 +20,16 @@ package org.neo4j.server.security.enterprise.auth; import org.junit.Rule; -import org.junit.rules.RuleChain; -import org.neo4j.bolt.v1.transport.integration.Neo4jWithSocket; -import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.test.TestEnterpriseGraphDatabaseFactory; -import org.neo4j.test.TestGraphDatabaseFactory; +import java.util.Map; + +import org.neo4j.graphdb.config.Setting; import org.neo4j.test.rule.SuppressOutput; public class BoltBuiltInProceduresInteractionTest extends BuiltInProceduresInteractionTestBase { - private Neo4jWithSocket server = new Neo4jWithSocket( getTestGraphDatabaseFactory(), - settings -> settings.put( GraphDatabaseSettings.auth_enabled, "true" ) ); - @Rule - public final RuleChain ruleChain = RuleChain.outerRule( SuppressOutput.suppressAll() ).around( server ); + public SuppressOutput suppressOutput = SuppressOutput.suppressAll(); public BoltBuiltInProceduresInteractionTest() { @@ -43,14 +38,10 @@ public BoltBuiltInProceduresInteractionTest() IS_BOLT = true; } - private TestGraphDatabaseFactory getTestGraphDatabaseFactory() - { - return new TestEnterpriseGraphDatabaseFactory(); - } - @Override - public NeoInteractionLevel setUpNeoServer() throws Throwable + public NeoInteractionLevel setUpNeoServer( Map, String> config ) throws + Throwable { - return new BoltInteraction( server ); + return new BoltInteraction( config ); } } diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltInteraction.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltInteraction.java index 78c021ad3d810..652ea1c175ec0 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltInteraction.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltInteraction.java @@ -74,8 +74,7 @@ public class BoltInteraction implements NeoInteractionLevel connectionFactory = SocketConnection::new; private final Neo4jWithSocket server; private Map subjects = new HashMap<>(); - private FileSystemAbstraction _fileSystem; - + private FileSystemAbstraction fileSystem; EnterpriseAuthManager authManager; BoltInteraction( Map, String> config ) throws IOException @@ -89,7 +88,7 @@ public class BoltInteraction implements NeoInteractionLevel {} ); - this._fileSystem = factory.getFileSystem(); + this.fileSystem = factory.getFileSystem(); GraphDatabaseFacade db = (GraphDatabaseFacade) server.graphDatabaseService(); authManager = db.getDependencyResolver().resolveDependency( EnterpriseAuthManager.class ); } @@ -109,7 +108,7 @@ public GraphDatabaseFacade getLocalGraph() @Override public FileSystemAbstraction fileSystem() { - return _fileSystem; + return fileSystem; } @Override diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedAuthProceduresInteractionTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedAuthProceduresInteractionTest.java index d64875885b122..4b33b9c14e339 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedAuthProceduresInteractionTest.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedAuthProceduresInteractionTest.java @@ -19,13 +19,17 @@ */ package org.neo4j.server.security.enterprise.auth; +import java.util.Map; + +import org.neo4j.graphdb.config.Setting; import org.neo4j.kernel.enterprise.api.security.EnterpriseAuthSubject; public class EmbeddedAuthProceduresInteractionTest extends AuthProceduresInteractionTestBase { @Override - protected NeoInteractionLevel setUpNeoServer() throws Throwable + protected NeoInteractionLevel setUpNeoServer( Map, String> config ) + throws Throwable { - return new EmbeddedInteraction(); + return new EmbeddedInteraction( config ); } } diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedInteraction.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedInteraction.java index c749728a2998b..b11a88918d842 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedInteraction.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedInteraction.java @@ -25,7 +25,6 @@ import org.neo4j.bolt.BoltKernelExtension; import org.neo4j.graphdb.ResourceIterator; -import org.neo4j.graphdb.Result; import org.neo4j.graphdb.config.Setting; import org.neo4j.graphdb.factory.GraphDatabaseBuilder; import org.neo4j.graphdb.factory.GraphDatabaseSettings; diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/NeoInteractionLevel.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/NeoInteractionLevel.java index c157646b025c5..158ec467034a2 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/NeoInteractionLevel.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/NeoInteractionLevel.java @@ -39,11 +39,6 @@ public interface NeoInteractionLevel FileSystemAbstraction fileSystem(); - default InternalTransaction beginLocalTransactionAsUser( S subject ) throws Throwable - { - return beginLocalTransactionAsUser( subject, KernelTransaction.Type.explicit ); - } - InternalTransaction beginLocalTransactionAsUser( S subject, KernelTransaction.Type txType ) throws Throwable; /* diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTBuiltInProceduresInteractionTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTBuiltInProceduresInteractionTest.java index 1a4f29cd1e7c3..d1b5d226ae0b2 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTBuiltInProceduresInteractionTest.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTBuiltInProceduresInteractionTest.java @@ -21,6 +21,9 @@ import org.junit.Rule; +import java.util.Map; + +import org.neo4j.graphdb.config.Setting; import org.neo4j.server.security.enterprise.auth.BuiltInProceduresInteractionTestBase; import org.neo4j.server.security.enterprise.auth.NeoInteractionLevel; import org.neo4j.test.rule.SuppressOutput; @@ -41,8 +44,8 @@ public RESTBuiltInProceduresInteractionTest() } @Override - public NeoInteractionLevel setUpNeoServer() throws Throwable + public NeoInteractionLevel setUpNeoServer( Map, String> config ) throws Throwable { - return new RESTInteraction(); + return new RESTInteraction( config ); } }