From 003ea8352dab2b49b4734cdf7338befb4d9b9ed4 Mon Sep 17 00:00:00 2001 From: Sehrope Sarkuni Date: Tue, 29 Oct 2019 08:18:28 -0400 Subject: [PATCH] Fix test suite order (#1593) * test: Standardize on array of tests in @SuiteClasses * test: Fix sort order for test suites * docs: Add note about sorting tests to GitHub PR template --- .github/pull_request_template.md | 2 +- .../test/extensions/ExtensionsTestSuite.java | 4 +++- .../test/hostchooser/MultiHostTestSuite.java | 4 +++- .../test/jdbc2/optional/OptionalTestSuite.java | 12 +++++++----- .../org/postgresql/test/jdbc42/Jdbc42TestSuite.java | 2 +- .../org/postgresql/test/jre8/core/Jre8TestSuite.java | 4 +++- .../java/org/postgresql/test/osgi/OsgiTestSuite.java | 4 +++- .../java/org/postgresql/test/ssl/SslTestSuite.java | 2 +- .../java/org/postgresql/test/xa/XATestSuite.java | 4 +++- 9 files changed, 25 insertions(+), 13 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 4efe774b2e..fcff6cd30d 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -9,7 +9,7 @@ 1. [ ] Does your submission pass tests? 2. [ ] Does mvn checkstyle:check pass ? -3. [ ] Have you added your new test classes to an existing test suite? +3. [ ] Have you added your new test classes to an existing test suite in alphabetical order? ### Changes to Existing Features: diff --git a/pgjdbc/src/test/java/org/postgresql/test/extensions/ExtensionsTestSuite.java b/pgjdbc/src/test/java/org/postgresql/test/extensions/ExtensionsTestSuite.java index f0c5aed7c8..0da675e38d 100644 --- a/pgjdbc/src/test/java/org/postgresql/test/extensions/ExtensionsTestSuite.java +++ b/pgjdbc/src/test/java/org/postgresql/test/extensions/ExtensionsTestSuite.java @@ -12,7 +12,9 @@ * Executes all known tests for PostgreSQL extensions supported by JDBC driver */ @RunWith(Suite.class) -@Suite.SuiteClasses(HStoreTest.class) +@Suite.SuiteClasses({ + HStoreTest.class, +}) public class ExtensionsTestSuite { } diff --git a/pgjdbc/src/test/java/org/postgresql/test/hostchooser/MultiHostTestSuite.java b/pgjdbc/src/test/java/org/postgresql/test/hostchooser/MultiHostTestSuite.java index 984577e591..2f19cd40f1 100644 --- a/pgjdbc/src/test/java/org/postgresql/test/hostchooser/MultiHostTestSuite.java +++ b/pgjdbc/src/test/java/org/postgresql/test/hostchooser/MultiHostTestSuite.java @@ -12,6 +12,8 @@ * Executes multi host tests (aka master/slave connectivity selection). */ @RunWith(Suite.class) -@Suite.SuiteClasses(MultiHostsConnectionTest.class) +@Suite.SuiteClasses({ + MultiHostsConnectionTest.class, +}) public class MultiHostTestSuite { } diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/OptionalTestSuite.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/OptionalTestSuite.java index 5a43fff45e..b9ca724067 100644 --- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/OptionalTestSuite.java +++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/OptionalTestSuite.java @@ -15,13 +15,15 @@ * @author Aaron Mulder (ammulder@chariotsolutions.com) */ @RunWith(Suite.class) -@Suite.SuiteClasses({SimpleDataSourceTest.class, - SimpleDataSourceWithUrlTest.class, - SimpleDataSourceWithSetURLTest.class, +@Suite.SuiteClasses({ + BaseDataSourceFailoverUrlsTest.class, + CaseOptimiserDataSourceTest.class, ConnectionPoolTest.class, PoolingDataSourceTest.class, - CaseOptimiserDataSourceTest.class, - BaseDataSourceFailoverUrlsTest.class}) + SimpleDataSourceTest.class, + SimpleDataSourceWithSetURLTest.class, + SimpleDataSourceWithUrlTest.class, +}) public class OptionalTestSuite { } diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc42/Jdbc42TestSuite.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc42/Jdbc42TestSuite.java index f3252783c5..3d444fd015 100644 --- a/pgjdbc/src/test/java/org/postgresql/test/jdbc42/Jdbc42TestSuite.java +++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc42/Jdbc42TestSuite.java @@ -15,10 +15,10 @@ GetObject310InfinityTests.class, GetObject310Test.class, Jdbc42CallableStatementTest.class, + LargeCountJdbc42Test.class, PreparedStatementTest.class, SetObject310Test.class, SimpleJdbc42Test.class, - LargeCountJdbc42Test.class }) public class Jdbc42TestSuite { diff --git a/pgjdbc/src/test/java/org/postgresql/test/jre8/core/Jre8TestSuite.java b/pgjdbc/src/test/java/org/postgresql/test/jre8/core/Jre8TestSuite.java index 96cee6520e..6c971a0b65 100644 --- a/pgjdbc/src/test/java/org/postgresql/test/jre8/core/Jre8TestSuite.java +++ b/pgjdbc/src/test/java/org/postgresql/test/jre8/core/Jre8TestSuite.java @@ -13,6 +13,8 @@ * Twitter: @codefinger */ @RunWith(Suite.class) -@Suite.SuiteClasses({SocksProxyTest.class}) +@Suite.SuiteClasses({ + SocksProxyTest.class, +}) public class Jre8TestSuite { } diff --git a/pgjdbc/src/test/java/org/postgresql/test/osgi/OsgiTestSuite.java b/pgjdbc/src/test/java/org/postgresql/test/osgi/OsgiTestSuite.java index a7c909dc2d..7402247ea3 100644 --- a/pgjdbc/src/test/java/org/postgresql/test/osgi/OsgiTestSuite.java +++ b/pgjdbc/src/test/java/org/postgresql/test/osgi/OsgiTestSuite.java @@ -10,7 +10,9 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses({PGDataSourceFactoryTest.class}) +@SuiteClasses({ + PGDataSourceFactoryTest.class, +}) public class OsgiTestSuite { } diff --git a/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTestSuite.java b/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTestSuite.java index 47e0d7c473..95e439c45e 100644 --- a/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTestSuite.java +++ b/pgjdbc/src/test/java/org/postgresql/test/ssl/SslTestSuite.java @@ -11,9 +11,9 @@ @RunWith(Suite.class) @Suite.SuiteClasses({ CommonNameVerifierTest.class, + LazyKeyManagerTest.class, LibPQFactoryHostNameTest.class, SslTest.class, - LazyKeyManagerTest.class, }) public class SslTestSuite { } diff --git a/pgjdbc/src/test/java/org/postgresql/test/xa/XATestSuite.java b/pgjdbc/src/test/java/org/postgresql/test/xa/XATestSuite.java index 787ebc7d25..d4d4cb7a7b 100644 --- a/pgjdbc/src/test/java/org/postgresql/test/xa/XATestSuite.java +++ b/pgjdbc/src/test/java/org/postgresql/test/xa/XATestSuite.java @@ -9,6 +9,8 @@ import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses(XADataSourceTest.class) +@Suite.SuiteClasses({ + XADataSourceTest.class, +}) public class XATestSuite { }