diff --git a/community/neo4j-harness/pom.xml b/community/neo4j-harness/pom.xml
index 5ecc03161863d..d0334fbbb9837 100644
--- a/community/neo4j-harness/pom.xml
+++ b/community/neo4j-harness/pom.xml
@@ -54,6 +54,17 @@
+
+
+
+ maven-failsafe-plugin
+
+ 1
+
+
+
+
+
diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/FixturesTest.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/FixturesTestIT.java
similarity index 99%
rename from community/neo4j-harness/src/test/java/org/neo4j/harness/FixturesTest.java
rename to community/neo4j-harness/src/test/java/org/neo4j/harness/FixturesTestIT.java
index b2460496a4058..67d68a155a1f9 100644
--- a/community/neo4j-harness/src/test/java/org/neo4j/harness/FixturesTest.java
+++ b/community/neo4j-harness/src/test/java/org/neo4j/harness/FixturesTestIT.java
@@ -41,7 +41,7 @@
import static org.neo4j.harness.TestServerBuilders.newInProcessBuilder;
import static org.neo4j.test.server.HTTP.RawPayload.quotedJson;
-public class FixturesTest
+public class FixturesTestIT
{
@Rule
public TestDirectory testDir = TestDirectory.testDirectory();
diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/InProcessBuilderTest.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/InProcessBuilderTestIT.java
similarity index 99%
rename from community/neo4j-harness/src/test/java/org/neo4j/harness/InProcessBuilderTest.java
rename to community/neo4j-harness/src/test/java/org/neo4j/harness/InProcessBuilderTestIT.java
index 34d0c795daf28..ed97fdcbebf7a 100644
--- a/community/neo4j-harness/src/test/java/org/neo4j/harness/InProcessBuilderTest.java
+++ b/community/neo4j-harness/src/test/java/org/neo4j/harness/InProcessBuilderTestIT.java
@@ -71,7 +71,7 @@
import static org.neo4j.harness.TestServerBuilders.newInProcessBuilder;
import static org.neo4j.helpers.collection.MapUtil.stringMap;
-public class InProcessBuilderTest
+public class InProcessBuilderTestIT
{
@Rule
public TestDirectory testDir = TestDirectory.testDirectory();
diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/JUnitRuleTest.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/JUnitRuleTestIT.java
similarity index 99%
rename from community/neo4j-harness/src/test/java/org/neo4j/harness/JUnitRuleTest.java
rename to community/neo4j-harness/src/test/java/org/neo4j/harness/JUnitRuleTestIT.java
index 2374abe1c7a03..a1e5260e586cb 100644
--- a/community/neo4j-harness/src/test/java/org/neo4j/harness/JUnitRuleTest.java
+++ b/community/neo4j-harness/src/test/java/org/neo4j/harness/JUnitRuleTestIT.java
@@ -45,7 +45,7 @@
import static org.neo4j.server.ServerTestUtils.getSharedTestTemporaryFolder;
import static org.neo4j.test.server.HTTP.RawPayload.quotedJson;
-public class JUnitRuleTest
+public class JUnitRuleTestIT
{
@Rule
public TestDirectory testDirectory = TestDirectory.testDirectory();
diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaAggregationFunctionsTest.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaAggregationFunctionsTestIT.java
similarity index 98%
rename from community/neo4j-harness/src/test/java/org/neo4j/harness/JavaAggregationFunctionsTest.java
rename to community/neo4j-harness/src/test/java/org/neo4j/harness/JavaAggregationFunctionsTestIT.java
index 7e3496f6f7344..e6a8ae4c0a079 100644
--- a/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaAggregationFunctionsTest.java
+++ b/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaAggregationFunctionsTestIT.java
@@ -33,7 +33,7 @@
import static org.junit.Assert.assertEquals;
import static org.neo4j.test.server.HTTP.RawPayload.quotedJson;
-public class JavaAggregationFunctionsTest
+public class JavaAggregationFunctionsTestIT
{
@Rule
public TestDirectory testDir = TestDirectory.testDirectory();
diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaFunctionsTest.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaFunctionsTestIT.java
similarity index 99%
rename from community/neo4j-harness/src/test/java/org/neo4j/harness/JavaFunctionsTest.java
rename to community/neo4j-harness/src/test/java/org/neo4j/harness/JavaFunctionsTestIT.java
index 4f011e8481560..2d877843d5e15 100644
--- a/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaFunctionsTest.java
+++ b/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaFunctionsTestIT.java
@@ -35,7 +35,7 @@
import static org.junit.Assert.assertThat;
import static org.neo4j.test.server.HTTP.RawPayload.quotedJson;
-public class JavaFunctionsTest
+public class JavaFunctionsTestIT
{
@Rule
public TestDirectory testDir = TestDirectory.testDirectory();
diff --git a/community/server-plugin-test/pom.xml b/community/server-plugin-test/pom.xml
index e5b4ebdc46b6f..3ae936383cb21 100644
--- a/community/server-plugin-test/pom.xml
+++ b/community/server-plugin-test/pom.xml
@@ -50,6 +50,17 @@ the relevant Commercial Agreement.
+
+
+
+ maven-failsafe-plugin
+
+ 1
+
+
+
+
+
org.neo4j.app
diff --git a/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/CloneSubgraphPluginTest.java b/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/CloneSubgraphPluginTestIT.java
similarity index 98%
rename from community/server-plugin-test/src/test/java/org/neo4j/server/plugins/CloneSubgraphPluginTest.java
rename to community/server-plugin-test/src/test/java/org/neo4j/server/plugins/CloneSubgraphPluginTestIT.java
index 0294f925777f8..cd0ed62829723 100644
--- a/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/CloneSubgraphPluginTest.java
+++ b/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/CloneSubgraphPluginTestIT.java
@@ -50,7 +50,7 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class CloneSubgraphPluginTest extends ExclusiveServerTestBase
+public class CloneSubgraphPluginTestIT extends ExclusiveServerTestBase
{
private static final RelationshipType KNOWS = RelationshipType.withName( "knows" );
private static final RelationshipType WORKED_FOR = RelationshipType.withName( "worked_for" );
diff --git a/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/ExtensionListingFunctionalTest.java b/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/ExtensionListingFunctionalTestIT.java
similarity index 97%
rename from community/server-plugin-test/src/test/java/org/neo4j/server/plugins/ExtensionListingFunctionalTest.java
rename to community/server-plugin-test/src/test/java/org/neo4j/server/plugins/ExtensionListingFunctionalTestIT.java
index 6f13654a56f9d..fca8aaa5901fa 100644
--- a/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/ExtensionListingFunctionalTest.java
+++ b/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/ExtensionListingFunctionalTestIT.java
@@ -40,7 +40,7 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
-public class ExtensionListingFunctionalTest extends SharedServerTestBase
+public class ExtensionListingFunctionalTestIT extends SharedServerTestBase
{
private static FunctionalTestHelper functionalTestHelper;
diff --git a/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/PluginFunctionalTest.java b/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/PluginFunctionalTestIT.java
similarity index 99%
rename from community/server-plugin-test/src/test/java/org/neo4j/server/plugins/PluginFunctionalTest.java
rename to community/server-plugin-test/src/test/java/org/neo4j/server/plugins/PluginFunctionalTestIT.java
index 8a13ce20f38b6..3cd03140d441e 100644
--- a/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/PluginFunctionalTest.java
+++ b/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/PluginFunctionalTestIT.java
@@ -51,7 +51,7 @@
import static org.junit.Assert.assertThat;
@SuppressWarnings( "unchecked" )
-public class PluginFunctionalTest extends SharedServerTestBase
+public class PluginFunctionalTestIT extends SharedServerTestBase
{
private static FunctionalTestHelper functionalTestHelper;
diff --git a/community/server/src/test/java/org/neo4j/server/BaseBootstrapperTest.java b/community/server/src/test/java/org/neo4j/server/BaseBootstrapperTestIT.java
similarity index 95%
rename from community/server/src/test/java/org/neo4j/server/BaseBootstrapperTest.java
rename to community/server/src/test/java/org/neo4j/server/BaseBootstrapperTestIT.java
index 3a3c4af32956e..bb0a56eb59d27 100644
--- a/community/server/src/test/java/org/neo4j/server/BaseBootstrapperTest.java
+++ b/community/server/src/test/java/org/neo4j/server/BaseBootstrapperTestIT.java
@@ -30,11 +30,8 @@
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import org.neo4j.bolt.BoltKernelExtension;
import org.neo4j.graphdb.config.Setting;
-import org.neo4j.kernel.configuration.ssl.SslPolicyConfig;
import org.neo4j.server.configuration.ConfigLoader;
-import org.neo4j.server.configuration.ServerSettings;
import org.neo4j.test.server.ExclusiveServerTestBase;
import static org.hamcrest.Matchers.equalTo;
@@ -48,7 +45,7 @@
import static org.neo4j.helpers.collection.MapUtil.stringMap;
import static org.neo4j.test.assertion.Assert.assertEventually;
-public abstract class BaseBootstrapperTest extends ExclusiveServerTestBase
+public abstract class BaseBootstrapperTestIT extends ExclusiveServerTestBase
{
@Rule
public TemporaryFolder tempDir = new TemporaryFolder();
diff --git a/community/server/src/test/java/org/neo4j/server/CommunityBootstrapperTest.java b/community/server/src/test/java/org/neo4j/server/CommunityBootstrapperTestIT.java
similarity index 92%
rename from community/server/src/test/java/org/neo4j/server/CommunityBootstrapperTest.java
rename to community/server/src/test/java/org/neo4j/server/CommunityBootstrapperTestIT.java
index 58343c73f1f37..60b217f22fd78 100644
--- a/community/server/src/test/java/org/neo4j/server/CommunityBootstrapperTest.java
+++ b/community/server/src/test/java/org/neo4j/server/CommunityBootstrapperTestIT.java
@@ -19,7 +19,7 @@
*/
package org.neo4j.server;
-public class CommunityBootstrapperTest extends BaseBootstrapperTest
+public class CommunityBootstrapperTestIT extends BaseBootstrapperTestIT
{
@Override
protected ServerBootstrapper newBootstrapper()
diff --git a/community/server/src/test/java/org/neo4j/server/NeoServerRestartTestCommunity.java b/community/server/src/test/java/org/neo4j/server/NeoServerRestartTestCommunityIT.java
similarity index 94%
rename from community/server/src/test/java/org/neo4j/server/NeoServerRestartTestCommunity.java
rename to community/server/src/test/java/org/neo4j/server/NeoServerRestartTestCommunityIT.java
index b4e784f83db45..5e5bcb10ea751 100644
--- a/community/server/src/test/java/org/neo4j/server/NeoServerRestartTestCommunity.java
+++ b/community/server/src/test/java/org/neo4j/server/NeoServerRestartTestCommunityIT.java
@@ -24,7 +24,7 @@
import org.neo4j.graphdb.factory.GraphDatabaseSettings;
import org.neo4j.server.helpers.CommunityServerBuilder;
-public class NeoServerRestartTestCommunity extends NeoServerRestartTest
+public class NeoServerRestartTestCommunityIT extends NeoServerRestartTestIT
{
protected NeoServer getNeoServer( String customPageSwapperName ) throws IOException
{
diff --git a/community/server/src/test/java/org/neo4j/server/NeoServerRestartTest.java b/community/server/src/test/java/org/neo4j/server/NeoServerRestartTestIT.java
similarity index 98%
rename from community/server/src/test/java/org/neo4j/server/NeoServerRestartTest.java
rename to community/server/src/test/java/org/neo4j/server/NeoServerRestartTestIT.java
index 4e5a4fadc6baf..e76dcf31831f8 100644
--- a/community/server/src/test/java/org/neo4j/server/NeoServerRestartTest.java
+++ b/community/server/src/test/java/org/neo4j/server/NeoServerRestartTestIT.java
@@ -34,7 +34,7 @@
import static org.junit.Assert.fail;
-public abstract class NeoServerRestartTest extends ExclusiveServerTestBase
+public abstract class NeoServerRestartTestIT extends ExclusiveServerTestBase
{
public static final String CUSTOM_SWAPPER = "CustomSwapper";
private static Semaphore semaphore;
diff --git a/community/server/src/test/java/org/neo4j/server/RedirectToBrowserTest.java b/community/server/src/test/java/org/neo4j/server/RedirectToBrowserTestIT.java
similarity index 97%
rename from community/server/src/test/java/org/neo4j/server/RedirectToBrowserTest.java
rename to community/server/src/test/java/org/neo4j/server/RedirectToBrowserTestIT.java
index 3ada208a26f97..6122e419579ef 100644
--- a/community/server/src/test/java/org/neo4j/server/RedirectToBrowserTest.java
+++ b/community/server/src/test/java/org/neo4j/server/RedirectToBrowserTestIT.java
@@ -19,15 +19,15 @@
*/
package org.neo4j.server;
-import java.io.IOException;
-import java.net.URI;
-import javax.ws.rs.core.MediaType;
-
import com.sun.jersey.api.client.Client;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import java.io.IOException;
+import java.net.URI;
+import javax.ws.rs.core.MediaType;
+
import org.neo4j.server.helpers.ServerHelper;
import org.neo4j.server.rest.JaxRsResponse;
import org.neo4j.server.rest.RestRequest;
@@ -35,7 +35,7 @@
import static org.junit.Assert.assertEquals;
-public class RedirectToBrowserTest extends ExclusiveServerTestBase
+public class RedirectToBrowserTestIT extends ExclusiveServerTestBase
{
private static NeoServer server;
diff --git a/community/server/src/test/java/org/neo4j/server/rest/CreateRelationshipTest.java b/community/server/src/test/java/org/neo4j/server/rest/CreateRelationshipTestIT.java
similarity index 98%
rename from community/server/src/test/java/org/neo4j/server/rest/CreateRelationshipTest.java
rename to community/server/src/test/java/org/neo4j/server/rest/CreateRelationshipTestIT.java
index 8620eea4ad0ff..ce9dc9e3ba4dd 100644
--- a/community/server/src/test/java/org/neo4j/server/rest/CreateRelationshipTest.java
+++ b/community/server/src/test/java/org/neo4j/server/rest/CreateRelationshipTestIT.java
@@ -19,12 +19,12 @@
*/
package org.neo4j.server.rest;
-import java.util.Map;
-import javax.ws.rs.core.MediaType;
-
import com.sun.jersey.api.client.ClientResponse.Status;
import org.junit.Test;
+import java.util.Map;
+import javax.ws.rs.core.MediaType;
+
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.RelationshipType;
import org.neo4j.graphdb.Transaction;
@@ -36,7 +36,7 @@
import static org.junit.Assert.assertTrue;
-public class CreateRelationshipTest extends AbstractRestFunctionalDocTestBase
+public class CreateRelationshipTestIT extends AbstractRestFunctionalDocTestBase
{
@Test
@Graph( "Joe knows Sara" )
diff --git a/community/server/src/test/java/org/neo4j/server/rest/transactional/TransactionTest.java b/community/server/src/test/java/org/neo4j/server/rest/transactional/TransactionTestIT.java
similarity index 99%
rename from community/server/src/test/java/org/neo4j/server/rest/transactional/TransactionTest.java
rename to community/server/src/test/java/org/neo4j/server/rest/transactional/TransactionTestIT.java
index d1ae86ed24901..8a9936c135b4c 100644
--- a/community/server/src/test/java/org/neo4j/server/rest/transactional/TransactionTest.java
+++ b/community/server/src/test/java/org/neo4j/server/rest/transactional/TransactionTestIT.java
@@ -49,7 +49,7 @@
import static org.neo4j.test.server.HTTP.GET;
import static org.neo4j.test.server.HTTP.POST;
-public class TransactionTest extends AbstractRestFunctionalTestBase
+public class TransactionTestIT extends AbstractRestFunctionalTestBase
{
@Test
@Documented( "Begin a transaction\n" +
diff --git a/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/RowFormatMetaFieldTest.java b/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/RowFormatMetaFieldTestIT.java
similarity index 98%
rename from community/server/src/test/java/org/neo4j/server/rest/transactional/integration/RowFormatMetaFieldTest.java
rename to community/server/src/test/java/org/neo4j/server/rest/transactional/integration/RowFormatMetaFieldTestIT.java
index 69201b761bb92..18eb41410f657 100644
--- a/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/RowFormatMetaFieldTest.java
+++ b/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/RowFormatMetaFieldTestIT.java
@@ -38,7 +38,7 @@
import static org.neo4j.server.rest.transactional.integration.TransactionMatchers.rowContainsMetaRelsAtIndex;
import static org.neo4j.test.server.HTTP.RawPayload.quotedJson;
-public class RowFormatMetaFieldTest extends AbstractRestFunctionalTestBase
+public class RowFormatMetaFieldTestIT extends AbstractRestFunctionalTestBase
{
private final HTTP.Builder http = HTTP.withBaseUri( "http://localhost:7474" );
diff --git a/community/server/src/test/java/org/neo4j/server/web/TestJetty9WebServer.java b/community/server/src/test/java/org/neo4j/server/web/TestJetty9WebServerIT.java
similarity index 97%
rename from community/server/src/test/java/org/neo4j/server/web/TestJetty9WebServer.java
rename to community/server/src/test/java/org/neo4j/server/web/TestJetty9WebServerIT.java
index 5f377e371aef9..19f657f768475 100644
--- a/community/server/src/test/java/org/neo4j/server/web/TestJetty9WebServer.java
+++ b/community/server/src/test/java/org/neo4j/server/web/TestJetty9WebServerIT.java
@@ -32,7 +32,7 @@
import static org.neo4j.test.rule.SuppressOutput.suppressAll;
-public class TestJetty9WebServer extends ExclusiveServerTestBase
+public class TestJetty9WebServerIT extends ExclusiveServerTestBase
{
@Rule
public SuppressOutput suppressOutput = suppressAll();
diff --git a/community/server/src/test/java/org/neo4j/server/web/WebServerDirectoryListingTest.java b/community/server/src/test/java/org/neo4j/server/web/WebServerDirectoryListingTestIT.java
similarity index 96%
rename from community/server/src/test/java/org/neo4j/server/web/WebServerDirectoryListingTest.java
rename to community/server/src/test/java/org/neo4j/server/web/WebServerDirectoryListingTestIT.java
index dcf454e41a7e6..60d701c5e80c4 100644
--- a/community/server/src/test/java/org/neo4j/server/web/WebServerDirectoryListingTest.java
+++ b/community/server/src/test/java/org/neo4j/server/web/WebServerDirectoryListingTestIT.java
@@ -29,7 +29,7 @@
import static org.junit.Assert.assertEquals;
-public class WebServerDirectoryListingTest extends ExclusiveServerTestBase
+public class WebServerDirectoryListingTestIT extends ExclusiveServerTestBase
{
private CommunityNeoServer server;
diff --git a/community/server/src/test/resources/META-INF/services/org.neo4j.io.pagecache.PageSwapperFactory b/community/server/src/test/resources/META-INF/services/org.neo4j.io.pagecache.PageSwapperFactory
index f1ab6f90b0ea7..b66f22437899e 100644
--- a/community/server/src/test/resources/META-INF/services/org.neo4j.io.pagecache.PageSwapperFactory
+++ b/community/server/src/test/resources/META-INF/services/org.neo4j.io.pagecache.PageSwapperFactory
@@ -1 +1 @@
-org.neo4j.server.NeoServerRestartTest$CustomSwapper
+org.neo4j.server.NeoServerRestartTestIT$CustomSwapper
diff --git a/community/shell/pom.xml b/community/shell/pom.xml
index a843081495c88..38e0067d69818 100644
--- a/community/shell/pom.xml
+++ b/community/shell/pom.xml
@@ -59,6 +59,12 @@ the relevant Commercial Agreement.
+
+ maven-failsafe-plugin
+
+ 1
+
+
maven-jar-plugin
diff --git a/enterprise/backup/pom.xml b/enterprise/backup/pom.xml
index 25d0786f9c55b..6bafea7c77f7b 100644
--- a/enterprise/backup/pom.xml
+++ b/enterprise/backup/pom.xml
@@ -49,6 +49,12 @@
+
+ maven-failsafe-plugin
+
+ 1
+
+
org.neo4j.build.plugins
clirr-maven-plugin
diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/TestBackup.java b/enterprise/backup/src/test/java/org/neo4j/backup/BackupIT.java
similarity index 99%
rename from enterprise/backup/src/test/java/org/neo4j/backup/TestBackup.java
rename to enterprise/backup/src/test/java/org/neo4j/backup/BackupIT.java
index c6dae7aae23eb..875ce48f43d54 100644
--- a/enterprise/backup/src/test/java/org/neo4j/backup/TestBackup.java
+++ b/enterprise/backup/src/test/java/org/neo4j/backup/BackupIT.java
@@ -86,7 +86,7 @@
import static org.neo4j.kernel.impl.MyRelTypes.TEST;
@RunWith( Parameterized.class )
-public class TestBackup
+public class BackupIT
{
private final TestDirectory testDir = TestDirectory.testDirectory();
private final DefaultFileSystemRule fileSystemRule = new DefaultFileSystemRule();
diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupTest.java b/enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupIT.java
similarity index 99%
rename from enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupTest.java
rename to enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupIT.java
index 817302a6a2e30..1add11ac89ea3 100644
--- a/enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupTest.java
+++ b/enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupIT.java
@@ -43,7 +43,7 @@
import static org.junit.Assert.assertEquals;
-public class IncrementalBackupTest
+public class IncrementalBackupIT
{
@Rule
public TestName testName = new TestName();
diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/TestConfiguration.java b/enterprise/backup/src/test/java/org/neo4j/backup/TestConfiguration.java
index f5c3aedb3e1fe..33ee8dc36e3a0 100644
--- a/enterprise/backup/src/test/java/org/neo4j/backup/TestConfiguration.java
+++ b/enterprise/backup/src/test/java/org/neo4j/backup/TestConfiguration.java
@@ -41,6 +41,7 @@ public class TestConfiguration
private static final File SOURCE_DIR = new File( "target/db" );
private static final String BACKUP_DIR = "target/full-backup";
private static final String HOST_ADDRESS = "127.0.0.1";
+ private static final int PORT = 6365;
@Before
public void before() throws Exception
@@ -52,8 +53,9 @@ public void before() throws Exception
@Test
public void testOnByDefault() throws Exception
{
- GraphDatabaseService db = new TestGraphDatabaseFactory().newEmbeddedDatabase( SOURCE_DIR );
- OnlineBackup.from( HOST_ADDRESS ).full( BACKUP_DIR );
+ GraphDatabaseService db = new TestGraphDatabaseFactory().newEmbeddedDatabaseBuilder( SOURCE_DIR )
+ .setConfig( OnlineBackupSettings.online_backup_server, "localhost:" + PORT ).newGraphDatabase();
+ OnlineBackup.from( HOST_ADDRESS, PORT ).full( BACKUP_DIR );
db.shutdown();
}
@@ -62,10 +64,11 @@ public void testOffByConfig() throws Exception
{
GraphDatabaseService db = new TestGraphDatabaseFactory().newEmbeddedDatabaseBuilder( SOURCE_DIR )
.setConfig( OnlineBackupSettings.online_backup_enabled, Settings.FALSE )
+ .setConfig( OnlineBackupSettings.online_backup_server, "localhost:" + PORT )
.newGraphDatabase();
try
{
- OnlineBackup.from( HOST_ADDRESS ).full( BACKUP_DIR );
+ OnlineBackup.from( HOST_ADDRESS, PORT ).full( BACKUP_DIR );
fail( "Shouldn't be possible" );
}
catch ( Exception e )
@@ -79,9 +82,10 @@ public void testEnableDefaultsInConfig() throws Exception
{
GraphDatabaseService db = new TestGraphDatabaseFactory().newEmbeddedDatabaseBuilder( SOURCE_DIR )
.setConfig( OnlineBackupSettings.online_backup_enabled, Settings.TRUE )
+ .setConfig( OnlineBackupSettings.online_backup_server, "localhost:" + PORT )
.newGraphDatabase();
- OnlineBackup.from( HOST_ADDRESS ).full( BACKUP_DIR );
+ OnlineBackup.from( HOST_ADDRESS, PORT ).full( BACKUP_DIR );
db.shutdown();
}
@@ -95,7 +99,7 @@ public void testEnableCustomPortInConfig() throws Exception
.newGraphDatabase();
try
{
- OnlineBackup.from( HOST_ADDRESS ).full( BACKUP_DIR );
+ OnlineBackup.from( HOST_ADDRESS, 12346 ).full( BACKUP_DIR );
fail( "Shouldn't be possible" );
}
catch ( Exception e )
diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreFilesWithRealFileSystemTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreFilesWithRealFileSystemTest.java
index 6a97185045bd4..324a459268d8f 100644
--- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreFilesWithRealFileSystemTest.java
+++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreFilesWithRealFileSystemTest.java
@@ -31,7 +31,7 @@ public class StoreFilesWithRealFileSystemTest extends StoreFilesTest
@Override
protected void createRules()
{
- testDirectory = TestDirectory.testDirectory( StoreFilesTest.class );
+ testDirectory = TestDirectory.testDirectory( StoreFilesWithRealFileSystemTest.class );
DefaultFileSystemRule defaultFileSystemRule = new DefaultFileSystemRule();
fileSystemRule = defaultFileSystemRule::get;
hiddenFileSystemRule = new EphemeralFileSystemRule();
diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java b/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdatesIT.java
similarity index 99%
rename from enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java
rename to enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdatesIT.java
index 7243538f9403d..f1312433033ec 100644
--- a/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java
+++ b/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdatesIT.java
@@ -66,7 +66,7 @@
import static org.neo4j.kernel.impl.ha.ClusterManager.masterAvailable;
import static org.neo4j.kernel.impl.ha.ClusterManager.masterSeesSlavesAsAvailable;
-public class TestPullUpdates
+public class TestPullUpdatesIT
{
private static final int PULL_INTERVAL = 100;
private static final int SHELL_PORT = 6370;
diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestBasicHaOperations.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestBasicHaOperationsIT.java
similarity index 99%
rename from enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestBasicHaOperations.java
rename to enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestBasicHaOperationsIT.java
index 704295ce87c38..5c935d1777d9a 100644
--- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestBasicHaOperations.java
+++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestBasicHaOperationsIT.java
@@ -37,7 +37,7 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class TestBasicHaOperations
+public class TestBasicHaOperationsIT
{
@ClassRule
public static LoggerRule logger = new LoggerRule( Level.OFF );
diff --git a/enterprise/kernel/pom.xml b/enterprise/kernel/pom.xml
index 4aa13fd90d750..4b88988df5d78 100644
--- a/enterprise/kernel/pom.xml
+++ b/enterprise/kernel/pom.xml
@@ -47,6 +47,12 @@
+
+ maven-failsafe-plugin
+
+ 1
+
+
net.alchim31.maven
scala-maven-plugin
diff --git a/enterprise/security/pom.xml b/enterprise/security/pom.xml
index 569255562c6c6..21a52f5c4fd1f 100644
--- a/enterprise/security/pom.xml
+++ b/enterprise/security/pom.xml
@@ -40,6 +40,17 @@
+
+
+
+ maven-failsafe-plugin
+
+ 1
+
+
+
+
+
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/BoltAuthScenariosInteractionIT.java
similarity index 90%
rename from enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltAuthScenariosInteractionTest.java
rename to enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltAuthScenariosInteractionIT.java
index 28c8d0fcf7776..c28cfc9caf918 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/BoltAuthScenariosInteractionIT.java
@@ -26,12 +26,12 @@
import org.neo4j.graphdb.mockfs.UncloseableDelegatingFileSystemAbstraction;
import org.neo4j.test.rule.fs.EphemeralFileSystemRule;
-public class BoltAuthScenariosInteractionTest extends AuthScenariosInteractionTestBase
+public class BoltAuthScenariosInteractionIT extends AuthScenariosInteractionTestBase
{
@Rule
public EphemeralFileSystemRule fileSystemRule = new EphemeralFileSystemRule();
- public BoltAuthScenariosInteractionTest()
+ public BoltAuthScenariosInteractionIT()
{
super();
IS_EMBEDDED = false;
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/BoltBuiltInProceduresInteractionIT.java
similarity index 87%
rename from enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltBuiltInProceduresInteractionTest.java
rename to enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltBuiltInProceduresInteractionIT.java
index a839ea7db3818..5c2921b8da6cd 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/BoltBuiltInProceduresInteractionIT.java
@@ -21,10 +21,10 @@
import java.util.Map;
-public class BoltBuiltInProceduresInteractionTest extends BuiltInProceduresInteractionTestBase
+public class BoltBuiltInProceduresInteractionIT extends BuiltInProceduresInteractionTestBase
{
- public BoltBuiltInProceduresInteractionTest()
+ public BoltBuiltInProceduresInteractionIT()
{
super();
IS_EMBEDDED = false;
diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltConfiguredAuthScenariosInteractionTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltConfiguredAuthScenariosInteractionIT.java
similarity index 86%
rename from enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltConfiguredAuthScenariosInteractionTest.java
rename to enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltConfiguredAuthScenariosInteractionIT.java
index 11e391538cf09..c749161fb77ad 100644
--- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltConfiguredAuthScenariosInteractionTest.java
+++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltConfiguredAuthScenariosInteractionIT.java
@@ -21,9 +21,9 @@
import java.util.Map;
-public class BoltConfiguredAuthScenariosInteractionTest extends ConfiguredAuthScenariosInteractionTestBase
+public class BoltConfiguredAuthScenariosInteractionIT extends ConfiguredAuthScenariosInteractionTestBase
{
- public BoltConfiguredAuthScenariosInteractionTest()
+ public BoltConfiguredAuthScenariosInteractionIT()
{
super();
IS_EMBEDDED = false;
diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltConfiguredProceduresTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltConfiguredProceduresIT.java
similarity index 88%
rename from enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltConfiguredProceduresTest.java
rename to enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltConfiguredProceduresIT.java
index afe5d4aa65f01..d7609366c53d1 100644
--- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltConfiguredProceduresTest.java
+++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltConfiguredProceduresIT.java
@@ -21,10 +21,10 @@
import java.util.Map;
-public class BoltConfiguredProceduresTest extends ConfiguredProceduresTestBase
+public class BoltConfiguredProceduresIT extends ConfiguredProceduresTestBase
{
- public BoltConfiguredProceduresTest()
+ public BoltConfiguredProceduresIT()
{
super();
IS_EMBEDDED = false;
diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltUserManagementProceduresInteractionTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltUserManagementProceduresInteractionIT.java
similarity index 86%
rename from enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltUserManagementProceduresInteractionTest.java
rename to enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltUserManagementProceduresInteractionIT.java
index d82c47bae42d3..82563c551f4b3 100644
--- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltUserManagementProceduresInteractionTest.java
+++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BoltUserManagementProceduresInteractionIT.java
@@ -21,10 +21,10 @@
import java.util.Map;
-public class BoltUserManagementProceduresInteractionTest extends AuthProceduresInteractionTestBase
+public class BoltUserManagementProceduresInteractionIT extends AuthProceduresInteractionTestBase
{
- public BoltUserManagementProceduresInteractionTest()
+ public BoltUserManagementProceduresInteractionIT()
{
super();
IS_EMBEDDED = false;
diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedAuthScenariosInteractionTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedAuthScenariosInteractionIT.java
similarity index 92%
rename from enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedAuthScenariosInteractionTest.java
rename to enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedAuthScenariosInteractionIT.java
index 22b59590c355a..c2e2aa617f020 100644
--- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedAuthScenariosInteractionTest.java
+++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedAuthScenariosInteractionIT.java
@@ -27,7 +27,7 @@
import org.neo4j.kernel.enterprise.api.security.EnterpriseSecurityContext;
import org.neo4j.test.rule.fs.EphemeralFileSystemRule;
-public class EmbeddedAuthScenariosInteractionTest extends AuthScenariosInteractionTestBase
+public class EmbeddedAuthScenariosInteractionIT extends AuthScenariosInteractionTestBase
{
@Rule
diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedBuiltInProceduresInteractionTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedBuiltInProceduresInteractionIT.java
similarity index 97%
rename from enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedBuiltInProceduresInteractionTest.java
rename to enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedBuiltInProceduresInteractionIT.java
index 16f657cca9c37..7f4313a2978c2 100644
--- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedBuiltInProceduresInteractionTest.java
+++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedBuiltInProceduresInteractionIT.java
@@ -41,7 +41,7 @@
import static org.junit.Assert.assertThat;
import static org.neo4j.graphdb.security.AuthorizationViolationException.PERMISSION_DENIED;
-public class EmbeddedBuiltInProceduresInteractionTest extends BuiltInProceduresInteractionTestBase
+public class EmbeddedBuiltInProceduresInteractionIT extends BuiltInProceduresInteractionTestBase
{
@Override
protected NeoInteractionLevel setUpNeoServer( Map config ) throws Throwable
diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedConfiguredAuthScenariosInteractionTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedConfiguredAuthScenariosInteractionIT.java
similarity index 91%
rename from enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedConfiguredAuthScenariosInteractionTest.java
rename to enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedConfiguredAuthScenariosInteractionIT.java
index bec7345bafbc4..2a9971968f3d0 100644
--- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedConfiguredAuthScenariosInteractionTest.java
+++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedConfiguredAuthScenariosInteractionIT.java
@@ -27,7 +27,7 @@
import org.neo4j.kernel.enterprise.api.security.EnterpriseSecurityContext;
import org.neo4j.test.rule.fs.EphemeralFileSystemRule;
-public class EmbeddedConfiguredAuthScenariosInteractionTest extends ConfiguredAuthScenariosInteractionTestBase
+public class EmbeddedConfiguredAuthScenariosInteractionIT extends ConfiguredAuthScenariosInteractionTestBase
{
@Rule
public EphemeralFileSystemRule fileSystemRule = new EphemeralFileSystemRule();
diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedConfiguredProceduresTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedConfiguredProceduresIT.java
similarity index 91%
rename from enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedConfiguredProceduresTest.java
rename to enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedConfiguredProceduresIT.java
index 2b8db740f1ba9..f43c06a76ee60 100644
--- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedConfiguredProceduresTest.java
+++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedConfiguredProceduresIT.java
@@ -23,7 +23,7 @@
import org.neo4j.kernel.enterprise.api.security.EnterpriseSecurityContext;
-public class EmbeddedConfiguredProceduresTest extends ConfiguredProceduresTestBase
+public class EmbeddedConfiguredProceduresIT extends ConfiguredProceduresTestBase
{
@Override
diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedUserManagementProceduresInteractionTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedUserManagementProceduresInteractionIT.java
similarity index 99%
rename from enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedUserManagementProceduresInteractionTest.java
rename to enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedUserManagementProceduresInteractionIT.java
index b4c32d20598b0..826fc9e08cfd9 100644
--- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedUserManagementProceduresInteractionTest.java
+++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedUserManagementProceduresInteractionIT.java
@@ -27,7 +27,7 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
-public class EmbeddedUserManagementProceduresInteractionTest extends AuthProceduresInteractionTestBase
+public class EmbeddedUserManagementProceduresInteractionIT extends AuthProceduresInteractionTestBase
{
@Override
protected NeoInteractionLevel setUpNeoServer( Map config )
diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseBootstrapperTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseBootstrapperTestIT.java
similarity index 98%
rename from enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseBootstrapperTest.java
rename to enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseBootstrapperTestIT.java
index a991ccd3e8b8b..3315d938216ee 100644
--- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseBootstrapperTest.java
+++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseBootstrapperTestIT.java
@@ -32,7 +32,7 @@
import org.neo4j.kernel.GraphDatabaseDependencies;
import org.neo4j.kernel.configuration.Config;
import org.neo4j.logging.LogProvider;
-import org.neo4j.server.BaseBootstrapperTest;
+import org.neo4j.server.BaseBootstrapperTestIT;
import org.neo4j.server.NeoServer;
import org.neo4j.server.ServerBootstrapper;
import org.neo4j.server.ServerTestUtils;
@@ -53,7 +53,7 @@
import static org.neo4j.server.ServerTestUtils.getRelativePath;
import static org.neo4j.test.assertion.Assert.assertEventually;
-public class EnterpriseBootstrapperTest extends BaseBootstrapperTest
+public class EnterpriseBootstrapperTestIT extends BaseBootstrapperTestIT
{
private TemporaryFolder folder = new TemporaryFolder();
private CleanupRule cleanupRule = new CleanupRule();
diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/NeoServerRestartTestEnterprise.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/NeoServerRestartTestEnterpriseIT.java
similarity index 91%
rename from enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/NeoServerRestartTestEnterprise.java
rename to enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/NeoServerRestartTestEnterpriseIT.java
index d1e93dfb22950..56baba63bad26 100644
--- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/NeoServerRestartTestEnterprise.java
+++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/NeoServerRestartTestEnterpriseIT.java
@@ -23,11 +23,11 @@
import org.neo4j.graphdb.factory.GraphDatabaseSettings;
import org.neo4j.server.NeoServer;
-import org.neo4j.server.NeoServerRestartTest;
+import org.neo4j.server.NeoServerRestartTestIT;
import org.neo4j.server.enterprise.helpers.EnterpriseServerBuilder;
import org.neo4j.server.helpers.CommunityServerBuilder;
-public class NeoServerRestartTestEnterprise extends NeoServerRestartTest
+public class NeoServerRestartTestEnterpriseIT extends NeoServerRestartTestIT
{
protected NeoServer getNeoServer( String customPageSwapperName ) throws IOException
{
diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTAuthScenariosInteractionTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTAuthScenariosInteractionIT.java
similarity index 90%
rename from enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTAuthScenariosInteractionTest.java
rename to enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTAuthScenariosInteractionIT.java
index 6bafec042d9c9..20ad8adda8fcf 100644
--- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTAuthScenariosInteractionTest.java
+++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTAuthScenariosInteractionIT.java
@@ -29,12 +29,12 @@
import static org.neo4j.test.rule.SuppressOutput.suppressAll;
-public class CypherRESTAuthScenariosInteractionTest extends AuthScenariosInteractionTestBase
+public class CypherRESTAuthScenariosInteractionIT extends AuthScenariosInteractionTestBase
{
@Rule
public SuppressOutput suppressOutput = suppressAll();
- public CypherRESTAuthScenariosInteractionTest()
+ public CypherRESTAuthScenariosInteractionIT()
{
super();
CHANGE_PWD_ERR_MSG = "User is required to change their password.";
diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTBuiltInProceduresInteractionTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTBuiltInProceduresInteractionIT.java
similarity index 90%
rename from enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTBuiltInProceduresInteractionTest.java
rename to enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTBuiltInProceduresInteractionIT.java
index b4c07ff1be4a7..8d9c27433810d 100644
--- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTBuiltInProceduresInteractionTest.java
+++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTBuiltInProceduresInteractionIT.java
@@ -29,12 +29,12 @@
import static org.neo4j.test.rule.SuppressOutput.suppressAll;
-public class CypherRESTBuiltInProceduresInteractionTest extends BuiltInProceduresInteractionTestBase
+public class CypherRESTBuiltInProceduresInteractionIT extends BuiltInProceduresInteractionTestBase
{
@Rule
public SuppressOutput suppressOutput = suppressAll();
- public CypherRESTBuiltInProceduresInteractionTest()
+ public CypherRESTBuiltInProceduresInteractionIT()
{
super();
CHANGE_PWD_ERR_MSG = "User is required to change their password.";
diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTConfiguredProceduresTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTConfiguredProceduresIT.java
similarity index 91%
rename from enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTConfiguredProceduresTest.java
rename to enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTConfiguredProceduresIT.java
index 7909e181d92aa..ca14304a64d90 100644
--- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTConfiguredProceduresTest.java
+++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTConfiguredProceduresIT.java
@@ -29,12 +29,12 @@
import static org.neo4j.test.rule.SuppressOutput.suppressAll;
-public class CypherRESTConfiguredProceduresTest extends ConfiguredProceduresTestBase
+public class CypherRESTConfiguredProceduresIT extends ConfiguredProceduresTestBase
{
@Rule
public SuppressOutput suppressOutput = suppressAll();
- public CypherRESTConfiguredProceduresTest()
+ public CypherRESTConfiguredProceduresIT()
{
super();
CHANGE_PWD_ERR_MSG = "User is required to change their password.";
diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTUserManagementProceduresInteractionTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTUserManagementProceduresInteractionIT.java
similarity index 89%
rename from enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTUserManagementProceduresInteractionTest.java
rename to enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTUserManagementProceduresInteractionIT.java
index db6fc8c86edc0..7b7a03099b080 100644
--- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTUserManagementProceduresInteractionTest.java
+++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/CypherRESTUserManagementProceduresInteractionIT.java
@@ -29,12 +29,12 @@
import static org.neo4j.test.rule.SuppressOutput.suppressAll;
-public class CypherRESTUserManagementProceduresInteractionTest extends AuthProceduresInteractionTestBase
+public class CypherRESTUserManagementProceduresInteractionIT extends AuthProceduresInteractionTestBase
{
@Rule
public SuppressOutput suppressOutput = suppressAll();
- public CypherRESTUserManagementProceduresInteractionTest()
+ public CypherRESTUserManagementProceduresInteractionIT()
{
super();
CHANGE_PWD_ERR_MSG = "User is required to change their password.";
diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTAuthScenariosInteractionTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTAuthScenariosInteractionIT.java
similarity index 91%
rename from enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTAuthScenariosInteractionTest.java
rename to enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTAuthScenariosInteractionIT.java
index 4051c0aaeb73f..0d948ac07978d 100644
--- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTAuthScenariosInteractionTest.java
+++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTAuthScenariosInteractionIT.java
@@ -29,12 +29,12 @@
import static org.neo4j.test.rule.SuppressOutput.suppressAll;
-public class RESTAuthScenariosInteractionTest extends AuthScenariosInteractionTestBase
+public class RESTAuthScenariosInteractionIT extends AuthScenariosInteractionTestBase
{
@Rule
public SuppressOutput suppressOutput = suppressAll();
- public RESTAuthScenariosInteractionTest()
+ public RESTAuthScenariosInteractionIT()
{
super();
CHANGE_PWD_ERR_MSG = "User is required to change their password.";
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/RESTBuiltInProceduresInteractionIT.java
similarity index 90%
rename from enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTBuiltInProceduresInteractionTest.java
rename to enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTBuiltInProceduresInteractionIT.java
index c99a362f4adbf..63a98379f96cc 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/RESTBuiltInProceduresInteractionIT.java
@@ -29,12 +29,12 @@
import static org.neo4j.test.rule.SuppressOutput.suppressAll;
-public class RESTBuiltInProceduresInteractionTest extends BuiltInProceduresInteractionTestBase
+public class RESTBuiltInProceduresInteractionIT extends BuiltInProceduresInteractionTestBase
{
@Rule
public SuppressOutput suppressOutput = suppressAll();
- public RESTBuiltInProceduresInteractionTest()
+ public RESTBuiltInProceduresInteractionIT()
{
super();
CHANGE_PWD_ERR_MSG = "User is required to change their password.";
diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTConfiguredProceduresTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTConfiguredProceduresIT.java
similarity index 92%
rename from enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTConfiguredProceduresTest.java
rename to enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTConfiguredProceduresIT.java
index 13dc84cb0ea9a..993f236844379 100644
--- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTConfiguredProceduresTest.java
+++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTConfiguredProceduresIT.java
@@ -29,12 +29,12 @@
import static org.neo4j.test.rule.SuppressOutput.suppressAll;
-public class RESTConfiguredProceduresTest extends ConfiguredProceduresTestBase
+public class RESTConfiguredProceduresIT extends ConfiguredProceduresTestBase
{
@Rule
public SuppressOutput suppressOutput = suppressAll();
- public RESTConfiguredProceduresTest()
+ public RESTConfiguredProceduresIT()
{
super();
CHANGE_PWD_ERR_MSG = "User is required to change their password.";
diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTUserManagementProceduresInteractionTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTUserManagementProceduresInteractionIT.java
similarity index 90%
rename from enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTUserManagementProceduresInteractionTest.java
rename to enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTUserManagementProceduresInteractionIT.java
index 9ca9d000a6424..4e47ad87b470a 100644
--- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTUserManagementProceduresInteractionTest.java
+++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTUserManagementProceduresInteractionIT.java
@@ -29,12 +29,12 @@
import static org.neo4j.test.rule.SuppressOutput.suppressAll;
-public class RESTUserManagementProceduresInteractionTest extends AuthProceduresInteractionTestBase
+public class RESTUserManagementProceduresInteractionIT extends AuthProceduresInteractionTestBase
{
@Rule
public SuppressOutput suppressOutput = suppressAll();
- public RESTUserManagementProceduresInteractionTest()
+ public RESTUserManagementProceduresInteractionIT()
{
super();
CHANGE_PWD_ERR_MSG = "User is required to change their password.";