Skip to content

Commit 171a7e7

Browse files
authored
Rename tests end with BoltKitTest to the BoltKitIT (#760)
The BoltKitTests depends on the TeamCity environment with the new test environment be running to not be skipped, so it should be moved to the integration tests phase avoiding being always skipped during the unit tests phase. Rename it to `BoltKitIT` does this job.
1 parent b62033c commit 171a7e7

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

driver/src/test/java/org/neo4j/driver/integration/RoutingDriverBoltKitTest.java renamed to driver/src/test/java/org/neo4j/driver/integration/RoutingDriverBoltKitIT.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import java.util.concurrent.TimeUnit;
3737
import java.util.concurrent.atomic.AtomicBoolean;
3838
import java.util.concurrent.atomic.AtomicInteger;
39-
import java.util.function.Function;
4039

4140
import org.neo4j.driver.AccessMode;
4241
import org.neo4j.driver.AuthToken;
@@ -92,7 +91,7 @@
9291
import static org.neo4j.driver.util.StubServer.insecureBuilder;
9392
import static org.neo4j.driver.util.TestUtil.asOrderedSet;
9493

95-
class RoutingDriverBoltKitTest
94+
class RoutingDriverBoltKitIT
9695
{
9796
private static StubServerController stubController;
9897

@@ -568,7 +567,7 @@ void shouldHandleLeaderSwitchAndRetryWhenWritingInTxFunction() throws IOExceptio
568567
catch ( InterruptedException ex )
569568
{
570569
}
571-
return tx.run( "MATCH (n) RETURN n.name" ).list( RoutingDriverBoltKitTest::extractNameField );
570+
return tx.run( "MATCH (n) RETURN n.name" ).list( RoutingDriverBoltKitIT::extractNameField );
572571
} );
573572
}
574573

@@ -604,7 +603,7 @@ void shouldHandleLeaderSwitchAndRetryWhenWritingInTxFunctionAsync() throws IOExc
604603
}
605604
return tx.runAsync( "MATCH (n) RETURN n.name" );
606605
} )
607-
.thenComposeAsync( cursor -> cursor.listAsync( RoutingDriverBoltKitTest::extractNameField ) ) ) );
606+
.thenComposeAsync( cursor -> cursor.listAsync( RoutingDriverBoltKitIT::extractNameField ) ) ) );
608607

609608
assertEquals( asList( "Foo", "Bar" ), names );
610609

@@ -639,7 +638,7 @@ void shouldHandleLeaderSwitchAndRetryWhenWritingInTxFunctionRX() throws IOExcept
639638
{
640639
RxResult result = tx.run( "RETURN 1" );
641640
return Flux.from( result.records() ).limitRate( 100 ).thenMany( tx.run( "MATCH (n) RETURN n.name" ).records() ).limitRate( 100 ).map(
642-
RoutingDriverBoltKitTest::extractNameField );
641+
RoutingDriverBoltKitIT::extractNameField );
643642
} ), RxSession::close );
644643

645644
StepVerifier.create( fluxOfNames ).expectNext( "Foo", "Bar" ).verifyComplete();
@@ -1255,7 +1254,7 @@ void shouldUseResolverDuringRediscoveryWhenExistingRoutersFail() throws Exceptio
12551254
assertEquals( asList( "Alice", "Bob", "Eve" ), names1 );
12561255

12571256
// run second query with retries, it should rediscover using 9042 returned by the resolver and read from 9005
1258-
List<String> names2 = session.readTransaction( tx -> tx.run( "MATCH (n) RETURN n.name" ).list( RoutingDriverBoltKitTest::extractNameField ) );
1257+
List<String> names2 = session.readTransaction( tx -> tx.run( "MATCH (n) RETURN n.name" ).list( RoutingDriverBoltKitIT::extractNameField ) );
12591258
assertEquals( asList( "Bob", "Alice", "Tina" ), names2 );
12601259
}
12611260
}

driver/src/test/java/org/neo4j/driver/integration/RoutingDriverMultidatabaseBoltKitTest.java renamed to driver/src/test/java/org/neo4j/driver/integration/RoutingDriverMultidatabaseBoltKitIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.neo4j.driver.Session;
3535
import org.neo4j.driver.exceptions.FatalDiscoveryException;
3636
import org.neo4j.driver.exceptions.ServiceUnavailableException;
37-
import org.neo4j.driver.integration.RoutingDriverBoltKitTest.PortBasedServerAddressComparator;
37+
import org.neo4j.driver.integration.RoutingDriverBoltKitIT.PortBasedServerAddressComparator;
3838
import org.neo4j.driver.Bookmark;
3939
import org.neo4j.driver.net.ServerAddress;
4040
import org.neo4j.driver.net.ServerAddressResolver;
@@ -51,7 +51,7 @@
5151
import static org.neo4j.driver.util.StubServer.INSECURE_CONFIG;
5252
import static org.neo4j.driver.util.StubServer.insecureBuilder;
5353

54-
class RoutingDriverMultidatabaseBoltKitTest
54+
class RoutingDriverMultidatabaseBoltKitIT
5555
{
5656
@Test
5757
void shouldDiscoverForDatabase() throws IOException, InterruptedException, StubServer.ForceKilled

driver/src/test/java/org/neo4j/driver/internal/DirectDriverBoltKitTest.java renamed to driver/src/test/java/org/neo4j/driver/internal/DirectDriverBoltKitIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
import static org.neo4j.driver.util.TestUtil.asOrderedSet;
8383
import static org.neo4j.driver.util.TestUtil.await;
8484

85-
class DirectDriverBoltKitTest
85+
class DirectDriverBoltKitIT
8686
{
8787
private static StubServerController stubController;
8888

0 commit comments

Comments
 (0)