Prefer AssertJ assertions over TestNG, JUnit

trinodb · Jun 7, 2024 · 52ec815 · 52ec815
1 parent 3796872
commit 52ec815
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/plugin/trino-base-jdbc/pom.xml b/plugin/trino-base-jdbc/pom.xml
@@ -283,22 +283,6 @@
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr4-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <configuration>
-                    <rules combine.children="append">
-                        <RestrictImports>
-                            <reason>Use AssertJ assertions instead of TestNG</reason>
-                            <bannedImports>
-                                <bannedImport>org.testng.Assert.*</bannedImport>
-                                <bannedImport>org.testng.AssertJUnit.*</bannedImport>
-                                <bannedImport>org.testng.asserts.**</bannedImport>
-                            </bannedImports>
-                        </RestrictImports>
-                    </rules>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -2390,6 +2390,15 @@
                                     <include>org.yaml:snakeyaml:2.+</include>
                                 </includes>
                             </bannedDependencies>
+                            <RestrictImports>
+                                <reason>Prefer org.assertj.core.api.Assertions over:</reason>
+                                <bannedImports>
+                                    <bannedImport>org.junit.jupiter.api.Assertions.*</bannedImport>
+                                    <bannedImport>org.testng.Assert.*</bannedImport>
+                                    <bannedImport>org.testng.AssertJUnit.*</bannedImport>
+                                    <bannedImport>org.testng.asserts.**</bannedImport>
+                                </bannedImports>
+                            </RestrictImports>
                             <RestrictImports>
                                 <bannedImports>
                                     <bannedImport>com.google.api.client.util.Preconditions</bannedImport>