test: remove SlowTests from tests that are fast

Previously the tests were slow in CI, however that has been resolved in 82dbbe4 (avoid modifying global sendBufferSize and receiveBufferSize)
pgjdbc · Jun 7, 2022 · 28c4da1 · 28c4da1
1 parent 69818fb
commit 28c4da1
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 34 deletions.
diff --git a/pgjdbc/src/test/java/org/postgresql/core/AsciiStringInternerTest.java b/pgjdbc/src/test/java/org/postgresql/core/AsciiStringInternerTest.java
@@ -10,10 +10,7 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-import org.postgresql.test.SlowTests;
-
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -102,7 +99,6 @@ public void testToString() throws Exception {
   }
 
   @Test
-  @Category(SlowTests.class)
   public void testGarbageCleaning() throws Exception {
     final byte[] bytes = new byte[100000];
     for (int i = 0; i < 100000; ++i) {

diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DatabaseEncodingTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DatabaseEncodingTest.java
@@ -9,14 +9,12 @@
 import static org.junit.Assert.assertTrue;
 
 import org.postgresql.core.Encoding;
-import org.postgresql.test.SlowTests;
 import org.postgresql.test.TestUtil;
 
 import org.junit.After;
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -68,7 +66,6 @@ private static String dumpString(String s) {
   }
 
   @Test
-  @Category(SlowTests.class)
   public void testEncoding() throws Exception {
     String databaseEncoding = TestUtil.queryForString(con, "SELECT getdatabaseencoding()");
     Assume.assumeTrue("Database encoding must be UTF8", databaseEncoding.equals("UTF8"));

diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/StatementTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/StatementTest.java
@@ -15,7 +15,6 @@
 import org.postgresql.PGProperty;
 import org.postgresql.core.ServerVersion;
 import org.postgresql.jdbc.PgStatement;
-import org.postgresql.test.SlowTests;
 import org.postgresql.test.TestUtil;
 import org.postgresql.test.util.StrangeProxyServer;
 import org.postgresql.util.PSQLState;
@@ -25,7 +24,6 @@
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -697,7 +695,6 @@ public void testExecuteUpdateFailsOnMultiStatementSelect() throws SQLException {
   }
 
   @Test
-  @Category(SlowTests.class)
   public void testSetQueryTimeout() throws SQLException {
     Statement stmt = con.createStatement();
     long start = 0;
@@ -720,7 +717,6 @@ public void testSetQueryTimeout() throws SQLException {
   }
 
   @Test
-  @Category(SlowTests.class)
   public void testLongQueryTimeout() throws SQLException {
     Statement stmt = con.createStatement();
     stmt.setQueryTimeout(Integer.MAX_VALUE);
@@ -736,7 +732,6 @@ public void testLongQueryTimeout() throws SQLException {
    * one does not. The timeout of the first query should not impact the second one.
    */
   @Test
-  @Category(SlowTests.class)
   public void testShortQueryTimeout() throws SQLException {
     assumeLongTest();
 
@@ -863,7 +858,6 @@ public void testMultipleCancels() throws Exception {
   }
 
   @Test(timeout = 30000)
-  @Category(SlowTests.class)
   public void testCancelQueryWithBrokenNetwork() throws SQLException, IOException, InterruptedException {
     // check that stmt.cancel() doesn't hang forever if the network is broken
 

diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc4/BinaryStreamTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc4/BinaryStreamTest.java
@@ -5,13 +5,11 @@
 
 package org.postgresql.test.jdbc4;
 
-import org.postgresql.test.SlowTests;
 import org.postgresql.test.TestUtil;
 import org.postgresql.test.jdbc2.BaseTest4;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import java.io.ByteArrayInputStream;
 import java.nio.ByteBuffer;
@@ -115,15 +113,13 @@ public void testKnownLength10Kb() throws Exception {
   }
 
   @Test
-  @Category(SlowTests.class)
   public void testKnownLength100Kb() throws Exception {
     byte[] data = getTestData(100 * 1024);
     insertStreamKownLength(data);
     validateContent(data);
   }
 
   @Test
-  @Category(SlowTests.class)
   public void testKnownLength200Kb() throws Exception {
     byte[] data = getTestData(200 * 1024);
     insertStreamKownLength(data);
@@ -152,15 +148,13 @@ public void testUnknownLength10Kb() throws Exception {
   }
 
   @Test
-  @Category(SlowTests.class)
   public void testUnknownLength100Kb() throws Exception {
     byte[] data = getTestData(100 * 1024);
     insertStreamUnkownLength(data);
     validateContent(data);
   }
 
   @Test
-  @Category(SlowTests.class)
   public void testUnknownLength200Kb() throws Exception {
     byte[] data = getTestData(200 * 1024);
     insertStreamUnkownLength(data);

diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc4/CharacterStreamTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc4/CharacterStreamTest.java
@@ -5,13 +5,11 @@
 
 package org.postgresql.test.jdbc4;
 
-import org.postgresql.test.SlowTests;
 import org.postgresql.test.TestUtil;
 import org.postgresql.test.jdbc2.BaseTest4;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import java.io.Reader;
 import java.io.StringReader;
@@ -181,47 +179,41 @@ public void testUnknownLength10Kb() throws Exception {
   }
 
   @Test
-  @Category(SlowTests.class)
   public void testKnownIntLength100Kb() throws Exception {
     String data = getTestData(100 * 1024);
     insertStreamKnownIntLength(data);
     validateContent(data);
   }
 
   @Test(expected = SQLFeatureNotSupportedException.class)
-  @Category(SlowTests.class)
   public void testKnownLongLength100Kb() throws Exception {
     String data = getTestData(100 * 1024);
     insertStreamKnownLongLength(data);
     validateContent(data);
   }
 
   @Test
-  @Category(SlowTests.class)
   public void testUnknownLength100Kb() throws Exception {
     String data = getTestData(100 * 1024);
     insertStreamUnknownLength(data);
     validateContent(data);
   }
 
   @Test
-  @Category(SlowTests.class)
   public void testKnownIntLength200Kb() throws Exception {
     String data = getTestData(200 * 1024);
     insertStreamKnownIntLength(data);
     validateContent(data);
   }
 
   @Test(expected = SQLFeatureNotSupportedException.class)
-  @Category(SlowTests.class)
   public void testKnownLongLength200Kb() throws Exception {
     String data = getTestData(200 * 1024);
     insertStreamKnownLongLength(data);
     validateContent(data);
   }
 
   @Test
-  @Category(SlowTests.class)
   public void testUnknownLength200Kb() throws Exception {
     String data = getTestData(200 * 1024);
     insertStreamUnknownLength(data);

diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc4/DatabaseMetaDataTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc4/DatabaseMetaDataTest.java
@@ -15,14 +15,12 @@
 import static org.junit.Assert.assertTrue;
 
 import org.postgresql.core.ServerVersion;
-import org.postgresql.test.SlowTests;
 import org.postgresql.test.TestUtil;
 
 import org.junit.After;
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -211,7 +209,6 @@ public void testGetProceduresInSchemaForProcedures() throws SQLException {
   }
 
   @Test
-  @Category(SlowTests.class)
   public void testGetFunctionsWithBlankPatterns() throws SQLException {
     int minFuncCount = 1000;
     DatabaseMetaData dbmd = conn.getMetaData();

diff --git a/pgjdbc/src/test/java/org/postgresql/test/util/ByteStreamWriterTest.java b/pgjdbc/src/test/java/org/postgresql/test/util/ByteStreamWriterTest.java
@@ -10,14 +10,12 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import org.postgresql.test.SlowTests;
 import org.postgresql.test.TestUtil;
 import org.postgresql.test.jdbc2.BaseTest4;
 import org.postgresql.util.ByteBufferByteStreamWriter;
 import org.postgresql.util.ByteStreamWriter;
 
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -105,15 +103,13 @@ public void testLength10Kb() throws Exception {
   }
 
   @Test
-  @Category(SlowTests.class)
   public void testLength100Kb() throws Exception {
     ByteBuffer testData = testData(100 * 1024);
     insertStream(testData);
     validateContent(testData);
   }
 
   @Test
-  @Category(SlowTests.class)
   public void testLength200Kb() throws Exception {
     ByteBuffer testData = testData(200 * 1024);
     insertStream(testData);