Skip to content

Commit d27f4f3

Browse files
committed
Rename abstract stress test class
We use packaged test runner on TeamCity that runs tests for the given classpath. This runner treats "*Test" and "*IT" as tests. That is why previous name was problematic. Runner tried to instantiate and abstract class and failed.
1 parent 6a155f2 commit d27f4f3

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

driver/src/test/java/org/neo4j/driver/v1/stress/AbstractStressIT.java renamed to driver/src/test/java/org/neo4j/driver/v1/stress/AbstractStressTestBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
import static org.junit.Assert.assertThat;
6363
import static org.junit.Assume.assumeTrue;
6464

65-
public abstract class AbstractStressIT<C extends AbstractContext>
65+
public abstract class AbstractStressTestBase<C extends AbstractContext>
6666
{
6767
private static final int THREAD_COUNT = Integer.getInteger( "threadCount", 8 );
6868
private static final int ASYNC_BATCH_SIZE = Integer.getInteger( "asyncBatchSize", 10 );

driver/src/test/java/org/neo4j/driver/v1/stress/AsyncWriteQuery.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929

3030
public class AsyncWriteQuery<C extends AbstractContext> extends AbstractAsyncQuery<C>
3131
{
32-
private AbstractStressIT<C> abstractStressIT;
32+
private AbstractStressTestBase<C> stressTest;
3333

34-
public AsyncWriteQuery( AbstractStressIT<C> abstractStressIT, Driver driver, boolean useBookmark )
34+
public AsyncWriteQuery( AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark )
3535
{
3636
super( driver, useBookmark );
37-
this.abstractStressIT = abstractStressIT;
37+
this.stressTest = stressTest;
3838
}
3939

4040
@Override
@@ -59,7 +59,7 @@ private void handleError( Throwable error, C context )
5959
{
6060
if ( error != null )
6161
{
62-
if ( !abstractStressIT.handleWriteFailure( error, context ) )
62+
if ( !stressTest.handleWriteFailure( error, context ) )
6363
{
6464
throw new RuntimeException( error );
6565
}

driver/src/test/java/org/neo4j/driver/v1/stress/AsyncWriteQueryInTx.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929

3030
public class AsyncWriteQueryInTx<C extends AbstractContext> extends AbstractAsyncQuery<C>
3131
{
32-
private AbstractStressIT<C> abstractStressIT;
32+
private AbstractStressTestBase<C> stressTest;
3333

34-
public AsyncWriteQueryInTx( AbstractStressIT<C> abstractStressIT, Driver driver, boolean useBookmark )
34+
public AsyncWriteQueryInTx( AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark )
3535
{
3636
super( driver, useBookmark );
37-
this.abstractStressIT = abstractStressIT;
37+
this.stressTest = stressTest;
3838
}
3939

4040
@Override
@@ -62,7 +62,7 @@ private void handleError( Throwable error, C context )
6262
{
6363
if ( error != null )
6464
{
65-
if ( !abstractStressIT.handleWriteFailure( error, context ) )
65+
if ( !stressTest.handleWriteFailure( error, context ) )
6666
{
6767
throw new RuntimeException( error );
6868
}

driver/src/test/java/org/neo4j/driver/v1/stress/BlockingWriteQuery.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727

2828
public class BlockingWriteQuery<C extends AbstractContext> extends AbstractBlockingQuery<C>
2929
{
30-
private AbstractStressIT<C> abstractStressIT;
30+
private AbstractStressTestBase<C> stressTest;
3131

32-
public BlockingWriteQuery( AbstractStressIT<C> abstractStressIT, Driver driver, boolean useBookmark )
32+
public BlockingWriteQuery( AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark )
3333
{
3434
super( driver, useBookmark );
35-
this.abstractStressIT = abstractStressIT;
35+
this.stressTest = stressTest;
3636
}
3737

3838
@Override
@@ -46,7 +46,7 @@ public void execute( C context )
4646
}
4747
catch ( Throwable error )
4848
{
49-
if ( !abstractStressIT.handleWriteFailure( error, context ) )
49+
if ( !stressTest.handleWriteFailure( error, context ) )
5050
{
5151
throw error;
5252
}

driver/src/test/java/org/neo4j/driver/v1/stress/BlockingWriteQueryInTx.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828

2929
public class BlockingWriteQueryInTx<C extends AbstractContext> extends AbstractBlockingQuery<C>
3030
{
31-
private AbstractStressIT<C> abstractStressIT;
31+
private AbstractStressTestBase<C> stressTest;
3232

33-
public BlockingWriteQueryInTx( AbstractStressIT<C> abstractStressIT, Driver driver, boolean useBookmark )
33+
public BlockingWriteQueryInTx( AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark )
3434
{
3535
super( driver, useBookmark );
36-
this.abstractStressIT = abstractStressIT;
36+
this.stressTest = stressTest;
3737
}
3838

3939
@Override
@@ -53,7 +53,7 @@ public void execute( C context )
5353
}
5454
catch ( Throwable error )
5555
{
56-
if ( !abstractStressIT.handleWriteFailure( error, context ) )
56+
if ( !stressTest.handleWriteFailure( error, context ) )
5757
{
5858
throw error;
5959
}

driver/src/test/java/org/neo4j/driver/v1/stress/CausalClusteringStressIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import static org.junit.Assert.assertThat;
5050
import static org.neo4j.driver.v1.util.cc.ClusterMember.SIMPLE_SCHEME;
5151

52-
public class CausalClusteringStressIT extends AbstractStressIT<CausalClusteringStressIT.Context>
52+
public class CausalClusteringStressIT extends AbstractStressTestBase<CausalClusteringStressIT.Context>
5353
{
5454
@Rule
5555
public final LocalOrRemoteClusterRule clusterRule = new LocalOrRemoteClusterRule();

driver/src/test/java/org/neo4j/driver/v1/stress/SingleInstanceStressIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import static org.junit.Assert.assertEquals;
3434
import static org.junit.Assert.assertThat;
3535

36-
public class SingleInstanceStressIT extends AbstractStressIT<SingleInstanceStressIT.Context>
36+
public class SingleInstanceStressIT extends AbstractStressTestBase<SingleInstanceStressIT.Context>
3737
{
3838
@Rule
3939
public final TestNeo4j neo4j = new TestNeo4j();

0 commit comments

Comments
 (0)