Skip to content

Commit 9e85d3d

Browse files
committed
Consistently rename tests to unit tests/integration test
1 parent c5a5b3b commit 9e85d3d

File tree

141 files changed

+539
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+539
-125
lines changed

pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,6 @@
339339
</excludes>
340340
<includes>
341341
<include>**/*Tests.java</include>
342-
<include>**/*Test.java</include>
343342
</includes>
344343
<systemPropertyVariables>
345344
<io.netty.leakDetectionLevel>paranoid</io.netty.leakDetectionLevel>

src/test/java/io/r2dbc/postgresql/AbstractCodecIntegrationTests.java

+6
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@
6565
import static io.r2dbc.postgresql.util.TestByteBufAllocator.TEST;
6666
import static org.assertj.core.api.Assertions.assertThat;
6767

68+
/**
69+
* Integrations tests for our built-in codecs. Executed typicall in text and binary mode.
70+
*
71+
* @see CodecBinaryFormatIntegrationTests
72+
* @see CodecTextFormatIntegrationTests
73+
*/
6874
abstract class AbstractCodecIntegrationTests extends AbstractIntegrationTests {
6975

7076
@Override

src/test/java/io/r2dbc/postgresql/BoundedStatementCacheTest.java src/test/java/io/r2dbc/postgresql/BoundedStatementCacheUnitTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@
4141
import static org.assertj.core.api.Assertions.assertThat;
4242
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
4343

44-
final class BoundedStatementCacheTest {
44+
/**
45+
* Unit tests for {@link BoundedStatementCache}.
46+
*/
47+
final class BoundedStatementCacheUnitTests {
4548

4649
@Test
4750
void constructorInvalidLimit() {

src/test/java/io/r2dbc/postgresql/CodecBinaryFormatIntegrationTests.java

+5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616

1717
package io.r2dbc.postgresql;
1818

19+
import io.r2dbc.postgresql.codec.DefaultCodecs;
20+
21+
/**
22+
* Integration tests for {@link DefaultCodecs} executed using binary encoding.
23+
*/
1924
final class CodecBinaryFormatIntegrationTests extends AbstractCodecIntegrationTests {
2025

2126
@Override

src/test/java/io/r2dbc/postgresql/CodecExtensionIntegrationTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@
3535

3636
import static org.assertj.core.api.Assertions.assertThat;
3737

38-
public class CodecExtensionIntegrationTests extends AbstractIntegrationTests {
38+
/**
39+
* Integration tests for {@link CodecRegistrar}.
40+
*/
41+
final class CodecExtensionIntegrationTests extends AbstractIntegrationTests {
3942

4043
@BeforeEach
4144
void setUp() {

src/test/java/io/r2dbc/postgresql/CodecTextFormatIntegrationTests.java

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
package io.r2dbc.postgresql;
1818

19+
/**
20+
* Integration tests for {@link DefaultCodecs} executed using text encoding.
21+
*/
1922
final class CodecTextFormatIntegrationTests extends AbstractCodecIntegrationTests {
2023

2124
}

src/test/java/io/r2dbc/postgresql/DefaultPortalNameSupplierTest.java src/test/java/io/r2dbc/postgresql/DefaultPortalNameSupplierUnitTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020

2121
import static org.assertj.core.api.Assertions.assertThat;
2222

23-
final class DefaultPortalNameSupplierTest {
23+
/**
24+
* Unit tests for {@link DefaultPortalNameSupplier}.
25+
*/
26+
final class DefaultPortalNameSupplierUnitTests {
2427

2528
@Test
2629
void test() {

src/test/java/io/r2dbc/postgresql/DisabledStatementCacheTest.java src/test/java/io/r2dbc/postgresql/DisabledStatementCacheUnitTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@
3636
import static io.r2dbc.postgresql.util.TestByteBufAllocator.TEST;
3737
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
3838

39-
class DisabledStatementCacheTest {
39+
/**
40+
* Unit tests for {@link DisabledStatementCache}.
41+
*/
42+
final class DisabledStatementCacheUnitTests {
4043

4144
@Test
4245
void constructorNoClient() {

src/test/java/io/r2dbc/postgresql/ExceptionFactoryTest.java src/test/java/io/r2dbc/postgresql/ExceptionFactoryUnitTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@
3535
import static org.mockito.Mockito.times;
3636
import static org.mockito.Mockito.verify;
3737

38-
final class ExceptionFactoryTest {
38+
/**
39+
* Unit tests for {@link ExceptionFactory}.
40+
*/
41+
final class ExceptionFactoryUnitTests {
3942

4043
@Test
4144
void isCreatingAuthenticationException() {

src/test/java/io/r2dbc/postgresql/ExtendedQueryPostgresqlStatementTest.java src/test/java/io/r2dbc/postgresql/ExtendedQueryPostgresqlStatementUnitTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@
5656
import static org.mockito.ArgumentMatchers.any;
5757
import static org.mockito.Mockito.when;
5858

59-
final class ExtendedQueryPostgresqlStatementTest {
59+
/**
60+
* Unit tests for {@link ExtendedQueryPostgresqlStatement}.
61+
*/
62+
final class ExtendedQueryPostgresqlStatementUnitTests {
6063

6164
private final Parameter parameter = new Parameter(FORMAT_BINARY, INT4.getObjectId(), Flux.just(TEST.buffer(4).writeInt(100)));
6265

src/test/java/io/r2dbc/postgresql/FetchSizeIntegrationTests.java src/test/java/io/r2dbc/postgresql/FetchSizeIntegrationIntegrationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/**
2424
* Integration tests for {@link Statement#fetchSize(int)}.
2525
*/
26-
final class FetchSizeIntegrationTests extends AbstractIntegrationTests {
26+
final class FetchSizeIntegrationIntegrationTests extends AbstractIntegrationTests {
2727

2828
@Override
2929
protected void customize(PostgresqlConnectionConfiguration.Builder builder) {

src/test/java/io/r2dbc/postgresql/IndefiniteStatementCacheTest.java src/test/java/io/r2dbc/postgresql/IndefiniteStatementCacheUnitTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@
3636
import static io.r2dbc.postgresql.util.TestByteBufAllocator.TEST;
3737
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
3838

39-
final class IndefiniteStatementCacheTest {
39+
/**
40+
* Unit tests for {@link IndefiniteStatementCache}.
41+
*/
42+
final class IndefiniteStatementCacheUnitTests {
4043

4144
@Test
4245
void constructorNoClient() {

src/test/java/io/r2dbc/postgresql/JsonIntegrationTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@
2525
import org.springframework.jdbc.core.JdbcOperations;
2626
import reactor.test.StepVerifier;
2727

28-
class JsonIntegrationTests {
28+
/**
29+
* Integration tests for {@link Json}.
30+
*/
31+
final class JsonIntegrationTests {
2932

3033
@RegisterExtension
3134
static final PostgresqlServerExtension SERVER = new PostgresqlServerExtension();

src/test/java/io/r2dbc/postgresql/client/PgBouncerIntegrationTests.java src/test/java/io/r2dbc/postgresql/PgBouncerIntegrationTests.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2020 the original author or authors.
2+
* Copyright 2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.r2dbc.postgresql.client;
17+
package io.r2dbc.postgresql;
1818

1919
import io.r2dbc.postgresql.PostgresqlConnectionConfiguration;
2020
import io.r2dbc.postgresql.PostgresqlConnectionFactory;
@@ -29,6 +29,9 @@
2929
import reactor.core.publisher.Flux;
3030
import reactor.test.StepVerifier;
3131

32+
/**
33+
* Integration tests for {@link PostgresqlConnectionFactory} through PG Bouncer.
34+
*/
3235
final class PgBouncerIntegrationTests {
3336

3437
@RegisterExtension

src/test/java/io/r2dbc/postgresql/PostgresCancelIntegrationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* Integration tests for cancellation.
3535
*/
3636
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
37-
class PostgresCancelIntegrationTests extends AbstractIntegrationTests {
37+
final class PostgresCancelIntegrationTests extends AbstractIntegrationTests {
3838

3939
static final int NUMBER_REPETITIONS = 300;
4040

src/test/java/io/r2dbc/postgresql/PostgresNotificationIntegrationTests.java

+3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232

3333
import static org.assertj.core.api.Assertions.assertThat;
3434

35+
/**
36+
* Integration tests for {@link Notification} through {@link PostgresqlConnection#getNotifications()}.
37+
*/
3538
final class PostgresNotificationIntegrationTests extends AbstractIntegrationTests {
3639

3740
@Test

src/test/java/io/r2dbc/postgresql/PostgresqlAuthenticationFailureIntegrationTests.java

+3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
import static io.r2dbc.spi.ConnectionFactoryOptions.USER;
3535
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
3636

37+
/**
38+
* Integration tests for authentication failures.
39+
*/
3740
final class PostgresqlAuthenticationFailureIntegrationTests {
3841

3942
@RegisterExtension

src/test/java/io/r2dbc/postgresql/PostgresqlBatchTest.java src/test/java/io/r2dbc/postgresql/PostgresqlBatchUnitTests.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import io.r2dbc.postgresql.message.backend.EmptyQueryResponse;
2323
import io.r2dbc.postgresql.message.backend.ErrorResponse;
2424
import io.r2dbc.postgresql.message.frontend.Query;
25+
import io.r2dbc.spi.Batch;
2526
import io.r2dbc.spi.R2dbcNonTransientResourceException;
2627
import org.junit.jupiter.api.Test;
2728
import reactor.test.StepVerifier;
@@ -30,7 +31,10 @@
3031

3132
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
3233

33-
final class PostgresqlBatchTest {
34+
/**
35+
* Unit tests for {@link Batch}.
36+
*/
37+
final class PostgresqlBatchUnitTests {
3438

3539
@Test
3640
void add() {

src/test/java/io/r2dbc/postgresql/PostgresqlColumnMetadataTest.java src/test/java/io/r2dbc/postgresql/PostgresqlColumnMetadataUnitTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
import static io.r2dbc.postgresql.message.Format.FORMAT_TEXT;
2424
import static org.assertj.core.api.Assertions.assertThat;
2525

26-
final class PostgresqlColumnMetadataTest {
26+
/**
27+
* Unit tests for {@link PostgresqlColumnMetadata}.
28+
*/
29+
final class PostgresqlColumnMetadataUnitTests {
2730

2831
@Test
2932
void toColumnMetadata() {

src/test/java/io/r2dbc/postgresql/PostgresqlConnectionConfigurationTest.java src/test/java/io/r2dbc/postgresql/PostgresqlConnectionConfigurationUnitTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
import static org.assertj.core.api.Assertions.assertThat;
2727
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
2828

29-
final class PostgresqlConnectionConfigurationTest {
29+
/**
30+
* Unit tests for {@link PostgresqlConnectionConfiguration}.
31+
*/
32+
final class PostgresqlConnectionConfigurationUnitTests {
3033

3134
@Test
3235
void builderNoApplicationName() {

src/test/java/io/r2dbc/postgresql/PostgresqlConnectionFactoryMetadataTest.java src/test/java/io/r2dbc/postgresql/PostgresqlConnectionFactoryMetadataUnitTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020

2121
import static org.assertj.core.api.Assertions.assertThat;
2222

23-
final class PostgresqlConnectionFactoryMetadataTest {
23+
/**
24+
* Unit tests for {@link PostgresqlConnectionFactoryMetadata}.
25+
*/
26+
final class PostgresqlConnectionFactoryMetadataUnitTests {
2427

2528
@Test
2629
void name() {

src/test/java/io/r2dbc/postgresql/PostgresqlConnectionFactoryProviderTest.java src/test/java/io/r2dbc/postgresql/PostgresqlConnectionFactoryProviderUnitTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@
4747
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
4848
import static org.assertj.core.api.Assertions.assertThatThrownBy;
4949

50-
final class PostgresqlConnectionFactoryProviderTest {
50+
/**
51+
* Unit tests for {@link PostgresqlConnectionFactoryProvider}.
52+
*/
53+
final class PostgresqlConnectionFactoryProviderUnitTests {
5154

5255
private final PostgresqlConnectionFactoryProvider provider = new PostgresqlConnectionFactoryProvider();
5356

src/test/java/io/r2dbc/postgresql/PostgresqlConnectionFactoryTest.java src/test/java/io/r2dbc/postgresql/PostgresqlConnectionFactoryUnitTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@
4040
import static org.assertj.core.api.Assertions.assertThat;
4141
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
4242

43-
final class PostgresqlConnectionFactoryTest {
43+
/**
44+
* Unit tests for {@link PostgresqlConnectionFactory}.
45+
*/
46+
final class PostgresqlConnectionFactoryUnitTests {
4447

4548
@Test
4649
void constructorNoClientFactory() {

src/test/java/io/r2dbc/postgresql/PostgresqlConnectionRuntimeOptionsIntegrationTests.java

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
import java.util.HashMap;
99
import java.util.Map;
1010

11+
/**
12+
* Integration tests for {@link PostgresqlConnection} connection options.
13+
*/
1114
final class PostgresqlConnectionRuntimeOptionsIntegrationTests {
1215

1316
@RegisterExtension

src/test/java/io/r2dbc/postgresql/PostgresqlConnectionTest.java src/test/java/io/r2dbc/postgresql/PostgresqlConnectionUnitTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@
4141
import static org.mockito.Mockito.RETURNS_SMART_NULLS;
4242
import static org.mockito.Mockito.mock;
4343

44-
final class PostgresqlConnectionTest {
44+
/**
45+
* Unit tests for {@link PostgresqlConnection}.
46+
*/
47+
final class PostgresqlConnectionUnitTests {
4548

4649
private final StatementCache statementCache = mock(StatementCache.class, RETURNS_SMART_NULLS);
4750

src/test/java/io/r2dbc/postgresql/PostgresqlResultTest.java src/test/java/io/r2dbc/postgresql/PostgresqlResultUnitTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626

2727
import java.util.Collections;
2828

29-
final class PostgresqlResultTest {
29+
/**
30+
* Unit tests for {@link PostgresqlResult}.
31+
*/
32+
final class PostgresqlResultUnitTests {
3033

3134
@Test
3235
void toResultCommandComplete() {

src/test/java/io/r2dbc/postgresql/PostgresqlRowMetadataTest.java src/test/java/io/r2dbc/postgresql/PostgresqlRowMetadataUnitTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@
3131
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
3232
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
3333

34-
final class PostgresqlRowMetadataTest {
34+
/**
35+
* Unit tests for {@link PostgresqlRowMetadata}.
36+
*/
37+
final class PostgresqlRowMetadataUnitTests {
3538

3639
private final List<PostgresqlColumnMetadata> columnMetadatas = Arrays.asList(
3740
new PostgresqlColumnMetadata(MockCodecs.empty(), "test-name-2", 400, (short) 300),

src/test/java/io/r2dbc/postgresql/PostgresqlRowTest.java src/test/java/io/r2dbc/postgresql/PostgresqlRowUnitTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@
3333
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
3434
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
3535

36-
final class PostgresqlRowTest {
36+
/**
37+
* Unit tests for {@link PostgresqlRow}.
38+
*/
39+
final class PostgresqlRowUnitTests {
3740

3841
private final List<RowDescription.Field> columns = Arrays.asList(
3942
new RowDescription.Field((short) 100, 200, 300, (short) 400, FORMAT_BINARY, "test-name-1", 500),

src/test/java/io/r2dbc/postgresql/PostgresqlStatementErrorsIntegrationTests.java

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package io.r2dbc.postgresql;
1818

19+
import io.r2dbc.postgresql.api.PostgresqlStatement;
1920
import io.r2dbc.spi.R2dbcDataIntegrityViolationException;
2021
import io.r2dbc.spi.Result;
2122
import org.junit.jupiter.api.AfterEach;
@@ -24,6 +25,9 @@
2425
import reactor.core.publisher.Flux;
2526
import reactor.test.StepVerifier;
2627

28+
/**
29+
* Integration tests for various error cases using {@link PostgresqlStatement}.
30+
*/
2731
final class PostgresqlStatementErrorsIntegrationTests extends AbstractIntegrationTests {
2832

2933
@BeforeEach

src/test/java/io/r2dbc/postgresql/PostgresqlTestKit.java

+3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
import static io.r2dbc.spi.ConnectionFactoryOptions.PORT;
3333
import static io.r2dbc.spi.ConnectionFactoryOptions.USER;
3434

35+
/**
36+
* R2DBC TCK implementation.
37+
*/
3538
final class PostgresqlTestKit implements TestKit<String> {
3639

3740
@RegisterExtension

src/test/java/io/r2dbc/postgresql/SimpleQueryPostgresqlStatementTest.java src/test/java/io/r2dbc/postgresql/SimpleQueryPostgresqlStatementUnitTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@
5353
import static org.mockito.ArgumentMatchers.any;
5454
import static org.mockito.Mockito.when;
5555

56-
final class SimpleQueryPostgresqlStatementTest {
56+
/**
57+
* Unit tests for {@link SimpleQueryPostgresqlStatement}.
58+
*/
59+
final class SimpleQueryPostgresqlStatementUnitTests {
5760

5861
@Test
5962
void bind() {

src/test/java/io/r2dbc/postgresql/authentication/PasswordAuthenticationHandlerTest.java src/test/java/io/r2dbc/postgresql/authentication/PasswordAuthenticationHandlerUnitTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
import static org.assertj.core.api.Assertions.assertThat;
2727
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
2828

29-
final class PasswordAuthenticationHandlerTest {
29+
/**
30+
* Unit tests for {@link PasswordAuthenticationHandler}.
31+
*/
32+
final class PasswordAuthenticationHandlerUnitTests {
3033

3134
@Test
3235
void constructorNoPassword() {

0 commit comments

Comments
 (0)