Skip to content

Commit

Permalink
Restore GraphDatabaseServiceCleaner.
Browse files Browse the repository at this point in the history 
Use common method to cleanup schema and data across different tests.
  • Loading branch information
@MishaDemianenko
MishaDemianenko committed Dec 5, 2016
1 parent 4d7cd30 commit 8ac706e
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 88 deletions.
16 changes: 2 additions & 14 deletions community/kernel/src/test/java/org/neo4j/graphdb/CreateAndDeleteNodesIT.java
View file
Expand Up @@ -22,6 +22,7 @@
import org.junit.Rule;
import org.junit.Test;

import org.neo4j.test.GraphDatabaseServiceCleaner;
import org.neo4j.test.rule.ImpermanentDatabaseRule;

public class CreateAndDeleteNodesIT
Expand Down Expand Up @@ -52,19 +53,6 @@ public void addingALabelUsingAValidIdentifierShouldSucceed() throws Exception
}

// When
try ( Transaction tx2 = dataBase.beginTx() )
{
for ( Relationship r : dataBase.getAllRelationships() )
{
r.delete();
}

for ( Node n : dataBase.getAllNodes() )
{
n.delete();
}

tx2.success();
}
GraphDatabaseServiceCleaner.cleanupAllRelationshipsAndNodes( dataBase );
}
}
16 changes: 2 additions & 14 deletions community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java
View file
Expand Up @@ -37,8 +37,6 @@
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.Label;
import org.neo4j.graphdb.Transaction;
import org.neo4j.graphdb.schema.ConstraintDefinition;
import org.neo4j.graphdb.schema.IndexDefinition;
import org.neo4j.helpers.collection.Iterators;
import org.neo4j.kernel.api.ReadOperations;
import org.neo4j.kernel.api.Statement;
Expand All @@ -55,6 +53,7 @@
import org.neo4j.kernel.impl.store.record.RelationshipPropertyExistenceConstraintRule;
import org.neo4j.kernel.impl.store.record.UniquePropertyConstraintRule;
import org.neo4j.storageengine.api.schema.SchemaRule;
import org.neo4j.test.GraphDatabaseServiceCleaner;
import org.neo4j.test.mockito.matcher.KernelExceptionUserMessageMatcher;
import org.neo4j.test.rule.DatabaseRule;
import org.neo4j.test.rule.ImpermanentDatabaseRule;
Expand Down Expand Up @@ -91,18 +90,7 @@ public static void initStorage() throws Exception
@Before
public void clearSchema()
{
try ( Transaction tx = db.beginTx() )
{
for ( ConstraintDefinition constraint : db.schema().getConstraints() )
{
constraint.drop();
}
for ( IndexDefinition index : db.schema().getIndexes() )
{
index.drop();
}
tx.success();
}
GraphDatabaseServiceCleaner.cleanupSchema( db );
}

@Test
Expand Down
35 changes: 1 addition & 34 deletions community/kernel/src/test/java/org/neo4j/metatest/TestImpermanentGraphDatabase.java
View file
Expand Up @@ -25,17 +25,15 @@

import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Relationship;
import org.neo4j.graphdb.RelationshipType;
import org.neo4j.graphdb.Transaction;
import org.neo4j.graphdb.schema.ConstraintDefinition;
import org.neo4j.graphdb.schema.IndexDefinition;
import org.neo4j.helpers.collection.Iterables;
import org.neo4j.test.TestGraphDatabaseFactory;

import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.neo4j.test.GraphDatabaseServiceCleaner.cleanDatabaseContent;

public class TestImpermanentGraphDatabase
{
Expand Down Expand Up @@ -95,37 +93,6 @@ public void should_remove_all_data()
assertThat( nodeCount(), is( 0L ) );
}

private static void cleanDatabaseContent( GraphDatabaseService db )
{
try ( Transaction tx = db.beginTx() )
{
for ( ConstraintDefinition constraint : db.schema().getConstraints() )
{
constraint.drop();
}

for ( IndexDefinition index : db.schema().getIndexes() )
{
index.drop();
}
tx.success();
}

try ( Transaction tx = db.beginTx() )
{
for ( Relationship relationship : db.getAllRelationships() )
{
relationship.delete();
}

for ( Node node : db.getAllNodes() )
{
node.delete();
}
tx.success();
}
}

private long nodeCount()
{
Transaction transaction = db.beginTx();
Expand Down
75 changes: 75 additions & 0 deletions community/kernel/src/test/java/org/neo4j/test/GraphDatabaseServiceCleaner.java
View file
@@ -0,0 +1,75 @@
/*
* Copyright (c) 2002-2016 "Neo Technology,"
* Network Engine for Objects in Lund AB [http://neotechnology.com]
*
* This file is part of Neo4j.
*
* Neo4j is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.neo4j.test;

import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Relationship;
import org.neo4j.graphdb.Transaction;
import org.neo4j.graphdb.schema.ConstraintDefinition;
import org.neo4j.graphdb.schema.IndexDefinition;

public class GraphDatabaseServiceCleaner
{
private GraphDatabaseServiceCleaner()
{
throw new UnsupportedOperationException();
}

public static void cleanDatabaseContent( GraphDatabaseService db )
{
cleanupSchema( db );
cleanupAllRelationshipsAndNodes( db );
}

public static void cleanupSchema( GraphDatabaseService db )
{
try ( Transaction tx = db.beginTx() )
{
for ( ConstraintDefinition constraint : db.schema().getConstraints() )
{
constraint.drop();
}

for ( IndexDefinition index : db.schema().getIndexes() )
{
index.drop();
}
tx.success();
}
}

public static void cleanupAllRelationshipsAndNodes( GraphDatabaseService db )
{
try ( Transaction tx = db.beginTx() )
{
for ( Relationship relationship : db.getAllRelationships() )
{
relationship.delete();
}

for ( Node node : db.getAllNodes() )
{
node.delete();
}
tx.success();
}
}
}
28 changes: 2 additions & 26 deletions enterprise/ha/src/test/java/org/neo4j/kernel/ha/PropertyConstraintsStressIT.java
View file
Expand Up @@ -43,11 +43,10 @@
import org.neo4j.graphdb.Transaction;
import org.neo4j.graphdb.TransactionFailureException;
import org.neo4j.graphdb.TransientTransactionFailureException;
import org.neo4j.graphdb.schema.ConstraintDefinition;
import org.neo4j.graphdb.schema.IndexDefinition;
import org.neo4j.helpers.Exceptions;
import org.neo4j.kernel.api.exceptions.schema.ConstraintVerificationFailedKernelException;
import org.neo4j.kernel.impl.ha.ClusterManager;
import org.neo4j.test.GraphDatabaseServiceCleaner;
import org.neo4j.test.OtherThreadExecutor.WorkerCommand;
import org.neo4j.test.RepeatRule;
import org.neo4j.test.ha.ClusterRule;
Expand Down Expand Up @@ -120,30 +119,7 @@ public void setup() throws Exception
private void clearData() throws InterruptedException
{
HighlyAvailableGraphDatabase db = cluster.getMaster();
try ( Transaction tx = db.beginTx() )
{
for ( ConstraintDefinition constraint : db.schema().getConstraints() )
{
constraint.drop();
}
for ( IndexDefinition index : db.schema().getIndexes() )
{
index.drop();
}
tx.success();
}
try ( Transaction tx = db.beginTx() )
{
for ( Relationship relationship : db.getAllRelationships() )
{
relationship.delete();
}
for ( Node node : db.getAllNodes() )
{
node.delete();
}
tx.success();
}
GraphDatabaseServiceCleaner.cleanDatabaseContent( db );
cluster.sync();
}

Expand Down

0 comments on commit 8ac706e

Please sign in to comment.