Create DisabledIfServerGreater annotation for disabling tests for newer server versions (#3937)

davecramer · web-flow · commit c7b512d13820 · 2026-02-11T07:18:16.000-05:00
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/PreparedStatementTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/PreparedStatementTest.java
@@ -23,6 +23,7 @@
 import org.postgresql.jdbc.PgStatement;
 import org.postgresql.jdbc.PreferQueryMode;
 import org.postgresql.test.TestUtil;
+import org.postgresql.test.annotations.DisabledIfServerVersionGreater;
 import org.postgresql.test.util.BrokenInputStream;
 import org.postgresql.util.GT;
 import org.postgresql.util.PSQLState;
@@ -466,11 +467,11 @@ public void testSetNull() throws SQLException {
 
   }
 
+  @DisabledIfServerVersionGreater("19")
   @Test
   public void testSingleQuotes() throws SQLException {
     // This test is only relevant for PostgreSQL 18 and below
     // as of 4576208 in postgres non-standard strings now throw an error.
-    assumeMinimumServerVersion(ServerVersion.v18);
 
     String[] testStrings = new String[]{
       "bare ? question mark",
diff --git a/testkit/src/main/java/org/postgresql/test/annotations/DisabledIfServerVersionGreater.java b/testkit/src/main/java/org/postgresql/test/annotations/DisabledIfServerVersionGreater.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2026, PostgreSQL Global Development Group
+ * See the LICENSE file in the project root for more information.
+ */
+
+package org.postgresql.test.annotations;
+
+import org.postgresql.test.impl.ServerVersionGreaterCondition;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Disables test if the current server version is greater than specified version.
+ * @see org.junit.jupiter.api.Disabled
+ */
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(ServerVersionGreaterCondition.class)
+public @interface DisabledIfServerVersionGreater {
+  /**
+   * @return not null sever version in form x.y.z like 9.4, 9.5.3, etc.
+   * @see org.postgresql.core.ServerVersion
+   */
+  String value();
+}
diff --git a/testkit/src/main/java/org/postgresql/test/impl/ServerVersionGreaterCondition.java b/testkit/src/main/java/org/postgresql/test/impl/ServerVersionGreaterCondition.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2026, PostgreSQL Global Development Group
+ * See the LICENSE file in the project root for more information.
+ */
+
+package org.postgresql.test.impl;
+
+import org.postgresql.core.ServerVersion;
+import org.postgresql.core.Version;
+import org.postgresql.test.TestUtil;
+import org.postgresql.test.annotations.DisabledIfServerVersionGreater;
+
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.platform.commons.support.AnnotationSupport;
+
+import java.lang.reflect.AnnotatedElement;
+import java.sql.Connection;
+
+public class ServerVersionGreaterCondition implements ExecutionCondition {
+  private static final ConditionEvaluationResult ENABLED = ConditionEvaluationResult.enabled(
+      "@DisabledIfServerVersionGreater is not present");
+
+  @Override
+  public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+    return context.getElement()
+            .flatMap(element ->
+                AnnotationSupport.findAnnotation(element, DisabledIfServerVersionGreater.class)
+                            .map(annotation -> ServerVersionGreaterCondition.toResult(element, annotation))
+            ).orElse(ENABLED);
+  }
+
+  private static ConditionEvaluationResult toResult(AnnotatedElement element,
+      DisabledIfServerVersionGreater annotation) {
+    Version maxVersion = ServerVersion.from(annotation.value());
+    if (maxVersion.getVersionNum() <= 0) {
+      throw new IllegalArgumentException(
+          "Server version " + annotation.value() + " not valid for "
+              + element);
+    }
+
+    try (Connection con = TestUtil.openDB()) {
+      String dbVersionNumber = con.getMetaData().getDatabaseProductVersion();
+      Version actualVersion = ServerVersion.from(dbVersionNumber);
+      if (actualVersion.getVersionNum() >= maxVersion.getVersionNum()) {
+        return ConditionEvaluationResult.disabled(
+            "Test requires version <= " + maxVersion
+                + ", but the server version is " + actualVersion);
+      }
+      return ConditionEvaluationResult.enabled(
+          "Test requires version <= " + maxVersion
+              + ", and the server version is " + actualVersion);
+    } catch (Exception e) {
+      throw new IllegalStateException("Not available open connection", e);
+    }
+  }
+}
