DBZ-4272 Skip connector test using annotations

shichao-an · Nov 30, 2021 · 5e40e1c · 5e40e1c
1 parent 358eb03
commit 5e40e1c
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 5 deletions.
diff --git a/debezium-core/src/test/java/io/debezium/junit/SkipTestRule.java b/debezium-core/src/test/java/io/debezium/junit/SkipTestRule.java
@@ -132,6 +132,24 @@ public Statement apply(Statement base,
             }
         }
 
+        final SkipWhenConnectorUnderTest connectorUnderTestAnnotation = hasAnnotation(description, SkipWhenConnectorUnderTest.class);
+        if (connectorUnderTestAnnotation != null) {
+            boolean isConnectorUnderTest;
+
+            switch (connectorUnderTestAnnotation.check()) {
+                case EQUAL:
+                    isConnectorUnderTest = connectorUnderTestAnnotation.value().isEqualTo(description.getClassName());
+                    break;
+                default:
+                    isConnectorUnderTest = false;
+                    break;
+            }
+
+            if (isConnectorUnderTest) {
+                return emptyStatement("Connector under test " + connectorUnderTestAnnotation.value(), description);
+            }
+        }
+
         // First check if multiple database version skips are specified.
         SkipWhenDatabaseVersions skipWhenDatabaseVersions = hasAnnotation(description, SkipWhenDatabaseVersions.class);
         if (skipWhenDatabaseVersions != null) {

diff --git a/debezium-core/src/test/java/io/debezium/junit/SkipWhenConnectorUnderTest.java b/debezium-core/src/test/java/io/debezium/junit/SkipWhenConnectorUnderTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright Debezium Authors.
+ *
+ * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package io.debezium.junit;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marker annotation used together with the {@link SkipTestRule} JUnit rule, that allows tests to be skipped
+ * based on the current connector under test
+ *
+ * @author Jiri Pechanec
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.TYPE })
+public @interface SkipWhenConnectorUnderTest {
+
+    Connector value();
+
+    EqualityCheck check();
+
+    String description() default "";
+
+    public enum Connector {
+        SQL_SERVER {
+
+            @Override
+            boolean isEqualTo(String packageName) {
+                return packageName != null && packageName.startsWith("io.debezium.connector.sqlserver");
+            }
+        };
+
+        abstract boolean isEqualTo(String packageName);
+    }
+}
diff --git a/...ava/io/debezium/pipeline/source/snapshot/incremental/AbstractIncrementalSnapshotTest.java b/...ava/io/debezium/pipeline/source/snapshot/incremental/AbstractIncrementalSnapshotTest.java
@@ -32,6 +32,9 @@
 import io.debezium.embedded.AbstractConnectorTest;
 import io.debezium.engine.DebeziumEngine;
 import io.debezium.jdbc.JdbcConnection;
+import io.debezium.junit.EqualityCheck;
+import io.debezium.junit.SkipWhenConnectorUnderTest;
+import io.debezium.junit.SkipWhenConnectorUnderTest.Connector;
 import io.debezium.util.Testing;
 
 public abstract class AbstractIncrementalSnapshotTest<T extends SourceConnector> extends AbstractConnectorTest {
@@ -415,11 +418,9 @@ public void snapshotOnlyWithRestart() throws Exception {
 
     @Test
     @FixFor("DBZ-4272")
-    public void snapshotProceededBySchemaChange() throws Exception {
-        // Disabled due to DBZ-4350
-        if (this.getClass().getName().contains("sqlserver")) {
-            return;
-        }
+    // Disabled due to DBZ-4350
+    @SkipWhenConnectorUnderTest(check = EqualityCheck.EQUAL, value = Connector.SQL_SERVER)
+    public void snapshotPreceededBySchemaChange() throws Exception {
         Testing.Print.enable();
 
         populateTable();