Reverted some refactoring in security procedures tests

neo4j · Sep 12, 2016 · d9b33e0 · d9b33e0
1 parent eaefb0e
commit d9b33e0
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 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
@@ -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/...ty/src/test/java/org/neo4j/server/security/enterprise/auth/AuthProceduresLoggingTest.java b/...ty/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/...est/java/org/neo4j/server/security/enterprise/auth/BoltAuthProceduresInteractionTest.java b/...est/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<BoltInteraction.BoltSubject>
 {
-    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<BoltInteraction.BoltSubject> setUpNeoServer( Map<Setting<?>, String> config ) throws Throwable
     {

diff --git a/...test/java/org/neo4j/server/security/enterprise/auth/BoltAuthScenariosInteractionTest.java b/...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<BoltInteraction.BoltSubject>
 {
-    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<BoltInteraction.BoltSubject> setUpNeoServer( Map<Setting<?>, String> config ) throws Throwable
     {

diff --git a/.../java/org/neo4j/server/security/enterprise/auth/BoltBuiltInProceduresInteractionTest.java b/.../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<BoltInteraction.BoltSubject>
 {
-    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<BoltInteraction.BoltSubject> setUpNeoServer() throws Throwable
+    public NeoInteractionLevel<BoltInteraction.BoltSubject> setUpNeoServer( Map<Setting<?>, String> config ) throws
+            Throwable
     {
-        return new BoltInteraction( server );
+        return new BoltInteraction( config );
     }
 }
diff --git a/...ise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltInteraction.java b/...ise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltInteraction.java
@@ -74,8 +74,7 @@ public class BoltInteraction implements NeoInteractionLevel<BoltInteraction.Bolt
     protected final Factory<TransportConnection> connectionFactory = SocketConnection::new;
     private final Neo4jWithSocket server;
     private Map<String,BoltSubject> subjects = new HashMap<>();
-    private FileSystemAbstraction _fileSystem;
-
+    private FileSystemAbstraction fileSystem;
     EnterpriseAuthManager authManager;
 
     BoltInteraction( Map<Setting<?>, String> config ) throws IOException
@@ -89,7 +88,7 @@ public class BoltInteraction implements NeoInteractionLevel<BoltInteraction.Bolt
                     settings.putAll( config );
                 } );
         server.restartDatabase( r -> {} );
-        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/...java/org/neo4j/server/security/enterprise/auth/EmbeddedAuthProceduresInteractionTest.java b/...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<EnterpriseAuthSubject>
 {
     @Override
-    protected NeoInteractionLevel<EnterpriseAuthSubject> setUpNeoServer() throws Throwable
+    protected NeoInteractionLevel<EnterpriseAuthSubject> setUpNeoServer( Map<Setting<?>, String> config )
+            throws Throwable
     {
-        return new EmbeddedInteraction();
+        return new EmbeddedInteraction( config );
     }
 }
diff --git a/...security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedInteraction.java b/...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/...security/src/test/java/org/neo4j/server/security/enterprise/auth/NeoInteractionLevel.java b/...security/src/test/java/org/neo4j/server/security/enterprise/auth/NeoInteractionLevel.java
@@ -39,11 +39,6 @@ public interface NeoInteractionLevel<S>
 
     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/...se/src/test/java/org/neo4j/server/rest/security/RESTBuiltInProceduresInteractionTest.java b/...se/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<RESTSubject> setUpNeoServer() throws Throwable
+    public NeoInteractionLevel<RESTSubject> setUpNeoServer( Map<Setting<?>, String> config ) throws Throwable
     {
-        return new RESTInteraction();
+        return new RESTInteraction( config );
     }
 }