From 5269994b0f788c4a4acd372260191abca7f3f0bd Mon Sep 17 00:00:00 2001 From: MishaDemianenko Date: Wed, 8 Nov 2017 14:04:13 +0100 Subject: [PATCH] Double time for ExplicitIndexTest, cleanup deprecated things --- .../spi/v2_3/TransactionBoundQueryContext.scala | 2 +- .../java/org/neo4j/cypher/DeleteNodeStressIT.java | 2 +- .../neo4j/cypher/DeleteRelationshipStressIT.java | 6 +++--- .../neo4j/graphdb/GraphDatabaseShutdownTest.java | 2 +- .../kernel/impl/core/RelationshipProxyTest.java | 5 ++--- .../kernel/impl/core/TestLoopRelationships.java | 4 ++-- .../dbstructure/GraphDbStructureGuideTest.java | 4 ++-- .../java/org/neo4j/index/ExplicitIndexTest.java | 3 +-- .../index/impl/lucene/explicit/RecoveryTest.java | 3 +-- .../java/org/neo4j/index/ExplicitIndexTest.java | 2 +- .../javascript/TestWhiteListJavaWrapper.java | 4 ++-- .../org/neo4j/backup/IncrementalBackupIT.java | 7 +++---- .../java/org/neo4j/kernel/api/ConstraintHaIT.java | 15 +++++++-------- .../test/java/org/neo4j/kernel/ha/DeletionIT.java | 2 +- 14 files changed, 28 insertions(+), 33 deletions(-) diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala index c9a894678e419..04d6b3cd8fc1e 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala @@ -571,7 +571,7 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper) PathExpanderBuilder.allTypes(toGraphDb(dir)) case TypeAndDirectionExpander(_, _, typDirs) => typDirs.foldLeft(PathExpanderBuilder.empty()) { - case (acc, (typ, dir)) => acc.add(DynamicRelationshipType.withName(typ), toGraphDb(dir)) + case (acc, (typ, dir)) => acc.add(RelationshipType.withName(typ), toGraphDb(dir)) } } diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/DeleteNodeStressIT.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/DeleteNodeStressIT.java index 453fef7819bdc..6707f6e6141f4 100644 --- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/DeleteNodeStressIT.java +++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/DeleteNodeStressIT.java @@ -36,7 +36,7 @@ import org.neo4j.test.rule.ImpermanentDatabaseRule; import static org.junit.Assert.assertFalse; -import static org.neo4j.graphdb.DynamicLabel.label; +import static org.neo4j.graphdb.Label.label; public class DeleteNodeStressIT { diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/DeleteRelationshipStressIT.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/DeleteRelationshipStressIT.java index 3d48d9a27035b..4958e9a0ce72c 100644 --- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/DeleteRelationshipStressIT.java +++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/DeleteRelationshipStressIT.java @@ -31,15 +31,15 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.neo4j.graphdb.DynamicRelationshipType; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; +import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.Result; import org.neo4j.graphdb.Transaction; import org.neo4j.test.rule.ImpermanentDatabaseRule; import static org.junit.Assert.assertFalse; -import static org.neo4j.graphdb.DynamicLabel.label; +import static org.neo4j.graphdb.Label.label; public class DeleteRelationshipStressIT { @@ -64,7 +64,7 @@ public void setup() if ( prev != null ) { - Relationship rel = prev.createRelationshipTo( node, DynamicRelationshipType.withName( "T" ) ); + Relationship rel = prev.createRelationshipTo( node, RelationshipType.withName( "T" ) ); rel.setProperty( "prop", i + j ); } prev = node; diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseShutdownTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseShutdownTest.java index 1fd53564dbdff..f53529b384db0 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseShutdownTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseShutdownTest.java @@ -39,7 +39,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static org.neo4j.graphdb.DynamicLabel.label; +import static org.neo4j.graphdb.Label.label; import static org.neo4j.helpers.Exceptions.rootCause; public class GraphDatabaseShutdownTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/RelationshipProxyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/RelationshipProxyTest.java index 26bb38e2799bf..56e15f5fa8b82 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/RelationshipProxyTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/RelationshipProxyTest.java @@ -23,7 +23,6 @@ import org.apache.commons.lang3.RandomUtils; import org.junit.Test; -import org.neo4j.graphdb.DynamicLabel; import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.PropertyContainer; @@ -124,7 +123,7 @@ public void shouldPrintCypherEsqueRelationshipToString() throws Exception @Test public void createDropRelationshipLongStringProperty() { - Label markerLabel = DynamicLabel.label( "marker" ); + Label markerLabel = Label.label( "marker" ); String testPropertyKey = "testProperty"; String propertyValue = RandomStringUtils.randomAscii( 255 ); @@ -162,7 +161,7 @@ public void createDropRelationshipLongStringProperty() @Test public void createDropRelationshipLongArrayProperty() { - Label markerLabel = DynamicLabel.label( "marker" ); + Label markerLabel = Label.label( "marker" ); String testPropertyKey = "testProperty"; byte[] propertyValue = RandomUtils.nextBytes( 1024 ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestLoopRelationships.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestLoopRelationships.java index bee381a01310d..baa9adcbc1c04 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestLoopRelationships.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestLoopRelationships.java @@ -29,11 +29,11 @@ import org.neo4j.graphdb.ConstraintViolationException; import org.neo4j.graphdb.Direction; -import org.neo4j.graphdb.DynamicRelationshipType; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.NotFoundException; import org.neo4j.graphdb.Relationship; +import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.PrefetchingIterator; import org.neo4j.kernel.impl.AbstractNeo4jTestCase; @@ -204,7 +204,7 @@ public void cannotDeleteNodeWithLoopStillAttached() throws Exception try ( Transaction tx = db.beginTx() ) { node = db.createNode(); - node.createRelationshipTo( node, DynamicRelationshipType.withName( "MAYOR_OF" ) ); + node.createRelationshipTo( node, RelationshipType.withName( "MAYOR_OF" ) ); tx.success(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuideTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuideTest.java index 1f874a06142b4..1a5d7f7b1f5a8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuideTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuideTest.java @@ -43,8 +43,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.neo4j.graphdb.DynamicLabel.label; -import static org.neo4j.graphdb.DynamicRelationshipType.withName; +import static org.neo4j.graphdb.Label.label; +import static org.neo4j.graphdb.RelationshipType.withName; import static org.neo4j.kernel.api.ReadOperations.ANY_LABEL; import static org.neo4j.kernel.api.ReadOperations.ANY_RELATIONSHIP_TYPE; diff --git a/community/lucene-index/src/test/java/org/neo4j/index/ExplicitIndexTest.java b/community/lucene-index/src/test/java/org/neo4j/index/ExplicitIndexTest.java index b2e57701862de..cb15d1cb44cd9 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/ExplicitIndexTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/ExplicitIndexTest.java @@ -23,7 +23,6 @@ import org.junit.Test; import org.junit.rules.ExpectedException; -import org.neo4j.graphdb.DynamicRelationshipType; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; @@ -43,7 +42,7 @@ public class ExplicitIndexTest { - private static final RelationshipType TYPE = DynamicRelationshipType.withName( "TYPE" ); + private static final RelationshipType TYPE = RelationshipType.withName( "TYPE" ); @Rule public final DatabaseRule db = new ImpermanentDatabaseRule(); diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/RecoveryTest.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/RecoveryTest.java index b59e8c5c1c293..992e2013c206c 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/RecoveryTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/RecoveryTest.java @@ -25,7 +25,6 @@ import java.io.File; import java.io.IOException; -import org.neo4j.graphdb.DynamicRelationshipType; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.PropertyContainer; import org.neo4j.graphdb.Relationship; @@ -80,7 +79,7 @@ public void shouldNotAcceptValuesWithNullToString() throws Exception { Node node = db.createNode(); Node otherNode = db.createNode(); - Relationship rel = node.createRelationshipTo( otherNode, DynamicRelationshipType.withName( "recovery" ) ); + Relationship rel = node.createRelationshipTo( otherNode, RelationshipType.withName( "recovery" ) ); Index nodeIndex = db.index().forNodes( "node-index" ); RelationshipIndex relationshipIndex = db.index().forRelationships( "rel-index" ); diff --git a/community/neo4j/src/test/java/org/neo4j/index/ExplicitIndexTest.java b/community/neo4j/src/test/java/org/neo4j/index/ExplicitIndexTest.java index 355d63208d0e4..84364e80425de 100644 --- a/community/neo4j/src/test/java/org/neo4j/index/ExplicitIndexTest.java +++ b/community/neo4j/src/test/java/org/neo4j/index/ExplicitIndexTest.java @@ -38,7 +38,7 @@ public class ExplicitIndexTest { - private static final long TEST_TIMEOUT = 40_000; + private static final long TEST_TIMEOUT = 80_000; @Rule public TestDirectory directory = TestDirectory.testDirectory(); diff --git a/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestWhiteListJavaWrapper.java b/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestWhiteListJavaWrapper.java index 658ba44b59587..b4426b34c8d76 100644 --- a/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestWhiteListJavaWrapper.java +++ b/community/server/src/test/java/org/neo4j/server/scripting/javascript/TestWhiteListJavaWrapper.java @@ -30,7 +30,7 @@ import java.util.HashSet; import java.util.Set; -import org.neo4j.graphdb.DynamicRelationshipType; +import org.neo4j.graphdb.RelationshipType; import org.neo4j.server.scripting.UserScriptClassWhiteList; import static org.hamcrest.Matchers.instanceOf; @@ -117,7 +117,7 @@ public void shouldAllowAccessToWhiteListedClassMembers() throws Exception Scriptable scope = cx.initStandardObjects(); // When - Object wrapped = wrapper.wrap( cx, scope, DynamicRelationshipType.withName( "blah" ), null ); + Object wrapped = wrapper.wrap( cx, scope, RelationshipType.withName( "blah" ), null ); // Then assertThat( wrapped, is( instanceOf( NativeJavaObject.class ) ) ); diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupIT.java b/enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupIT.java index 6e1c73316b5d4..41b8e9ff809c0 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupIT.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/IncrementalBackupIT.java @@ -28,7 +28,6 @@ import java.io.File; import org.neo4j.graphdb.Direction; -import org.neo4j.graphdb.DynamicRelationshipType; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; @@ -37,8 +36,8 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.configuration.Settings; -import org.neo4j.ports.allocation.PortAuthority; import org.neo4j.kernel.impl.enterprise.configuration.OnlineBackupSettings; +import org.neo4j.ports.allocation.PortAuthority; import org.neo4j.test.DbRepresentation; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.SuppressOutput; @@ -187,8 +186,8 @@ private DbRepresentation createTransactiongWithWeirdRelationshipGroupRecord( Fil db = startGraphDatabase( path ); int i = 0; Node node; - DynamicRelationshipType typeToDelete = DynamicRelationshipType.withName( "A" ); - DynamicRelationshipType theOtherType = DynamicRelationshipType.withName( "B" ); + RelationshipType typeToDelete = RelationshipType.withName( "A" ); + RelationshipType theOtherType = RelationshipType.withName( "B" ); int defaultDenseNodeThreshold = Integer.parseInt( GraphDatabaseSettings.dense_node_threshold.getDefaultValue() ); diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/api/ConstraintHaIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/api/ConstraintHaIT.java index 2176d3963cb8b..46121fd5f41a2 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/api/ConstraintHaIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/api/ConstraintHaIT.java @@ -27,9 +27,8 @@ import java.io.File; -import org.neo4j.graphdb.DynamicLabel; -import org.neo4j.graphdb.DynamicRelationshipType; import org.neo4j.graphdb.GraphDatabaseService; +import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.QueryExecutionException; import org.neo4j.graphdb.Relationship; @@ -57,8 +56,8 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static org.neo4j.graphdb.DynamicLabel.label; -import static org.neo4j.graphdb.DynamicRelationshipType.withName; +import static org.neo4j.graphdb.Label.label; +import static org.neo4j.graphdb.RelationshipType.withName; import static org.neo4j.helpers.collection.Iterables.count; import static org.neo4j.helpers.collection.Iterables.single; import static org.neo4j.io.fs.FileUtils.deleteRecursively; @@ -82,7 +81,7 @@ protected void createConstraint( GraphDatabaseService db, String type, String va @Override protected ConstraintDefinition getConstraint( GraphDatabaseService db, String type, String value ) { - return Iterables.singleOrNull( db.schema().getConstraints( DynamicLabel.label( type ) ) ); + return Iterables.singleOrNull( db.schema().getConstraints( label( type ) ) ); } @Override @@ -127,7 +126,7 @@ protected void createConstraint( GraphDatabaseService db, String type, String va @Override protected ConstraintDefinition getConstraint( GraphDatabaseService db, String type, String value ) { - return Iterables.singleOrNull( db.schema().getConstraints( DynamicRelationshipType.withName( type ) ) ); + return Iterables.singleOrNull( db.schema().getConstraints( withName( type ) ) ); } @Override @@ -176,13 +175,13 @@ protected void createConstraint( GraphDatabaseService db, String type, String va @Override protected ConstraintDefinition getConstraint( GraphDatabaseService db, String type, String value ) { - return Iterables.singleOrNull( db.schema().getConstraints( DynamicLabel.label( type ) ) ); + return Iterables.singleOrNull( db.schema().getConstraints( Label.label( type ) ) ); } @Override protected IndexDefinition getIndex( GraphDatabaseService db, String type, String value ) { - return Iterables.singleOrNull( db.schema().getIndexes( DynamicLabel.label( type ) ) ); + return Iterables.singleOrNull( db.schema().getIndexes( Label.label( type ) ) ); } @Override diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/DeletionIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/DeletionIT.java index 4c564392f52db..78ccaf24eea23 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/DeletionIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/DeletionIT.java @@ -28,7 +28,7 @@ import org.neo4j.test.ha.ClusterRule; import static org.junit.Assert.assertNotNull; -import static org.neo4j.graphdb.DynamicRelationshipType.withName; +import static org.neo4j.graphdb.RelationshipType.withName; import static org.neo4j.kernel.impl.ha.ClusterManager.clusterOfSize; /**