Migrate unit tests to JUnit 5 (#247)

Author: saberduck

its/ruling/src/test/java/org/sonar/web/it/WebRulingTest.java

@@ -34,14 +34,14 @@
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.sonarsource.analyzer.commons.ProfileGenerator;
 import org.sonarqube.ws.Qualityprofiles;
 import org.sonarqube.ws.client.HttpConnector;
 import org.sonarqube.ws.client.WsClient;
 import org.sonarqube.ws.client.WsClientFactories;
 import org.sonarqube.ws.client.qualityprofiles.ActivateRuleRequest;
 import org.sonarqube.ws.client.qualityprofiles.SearchRequest;
 import org.sonarqube.ws.client.rules.CreateRequest;
+import org.sonarsource.analyzer.commons.ProfileGenerator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

pom.xml

@@ -80,6 +80,18 @@
     <jdk.min.version>11</jdk.min.version>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.10.0</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <profiles>
     <profile>
       <id>its</id>

sonar-html-plugin/pom.xml

@@ -69,9 +69,8 @@
 
     <!-- Test dependencies -->
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -91,18 +90,36 @@
       <artifactId>sonar-plugin-api-impl</artifactId>
       <version>${sonarqube.api.impl.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
         <dependency>
       <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-testing-harness</artifactId>
       <version>${sonarqube.api.impl.version}</version>
       <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+          </exclusion>
+        </exclusions>
     </dependency>
         <dependency>
       <groupId>org.sonarsource.sslr</groupId>
       <artifactId>sslr-testing-harness</artifactId>
       <version>${sslr.version}</version>
       <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+          </exclusion>
+        </exclusions>
     </dependency>
   </dependencies>
 

sonar-html-plugin/src/test/java/org/sonar/plugins/html/HtmlPluginTest.java

@@ -17,7 +17,7 @@
  */
 package org.sonar.plugins.html;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.sonar.api.Plugin;
 import org.sonar.api.SonarEdition;
 import org.sonar.api.SonarQubeSide;

sonar-html-plugin/src/test/java/org/sonar/plugins/html/analyzers/ComplexityVisitorTest.java

@@ -23,7 +23,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.sonar.api.batch.fs.internal.TestInputFileBuilder;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.plugins.html.api.HtmlConstants;

sonar-html-plugin/src/test/java/org/sonar/plugins/html/analyzers/PageCountLinesTest.java

@@ -27,8 +27,8 @@
 import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.sonar.api.batch.fs.internal.TestInputFileBuilder;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.plugins.html.api.HtmlConstants;
@@ -44,7 +44,7 @@ public class PageCountLinesTest {
   private PageLexer lexer;
   private HtmlAstScanner scanner;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     lexer = new PageLexer();
     scanner = new HtmlAstScanner(Collections.emptyList());

sonar-html-plugin/src/test/java/org/sonar/plugins/html/api/HtmlConstantsTest.java

@@ -17,13 +17,15 @@
  */
 package org.sonar.plugins.html.api;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class HtmlConstantsTest {
 
-  @Test(expected=IllegalAccessException.class)
+  @Test
   public void create() throws Exception {
-    HtmlConstants.class.newInstance();
+    assertThrows(IllegalAccessException.class, () -> HtmlConstants.class.newInstance());
   }
 
 }

sonar-html-plugin/src/test/java/org/sonar/plugins/html/checks/CheckMessagesVerifierRule.java

@@ -20,23 +20,24 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import org.junit.rules.Verifier;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
 
 /**
- * This JUnit Rule allows to automatically execute {@link CheckMessagesVerifier#noMore()}.
+ * This JUnit Extension allows to automatically execute {@link CheckMessagesVerifier#noMore()}.
  * <pre>
- * &#064;org.junit.Rule
+ * &#064;org.junit.jupiter.api.extension.RegisterExtension
  * public CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
  *
- * &#064;org.junit.Test
+ * &#064;org.junit.jupiter.api.Test;
  * public void test() {
  *   checkMessagesVerifier.verify(messages)
  *     .next().atLine(1)
  *     .next().atLine(2);
  * }
  * </pre>
  */
-public class CheckMessagesVerifierRule extends Verifier {
+public class CheckMessagesVerifierRule implements AfterEachCallback {
 
   private final List<CheckMessagesVerifier> verifiers = new ArrayList<>();
 
@@ -46,11 +47,14 @@ public CheckMessagesVerifier verify(Collection<HtmlIssue> messages) {
     return verifier;
   }
 
-  @Override
   protected void verify() {
     for (CheckMessagesVerifier verifier : verifiers) {
       verifier.noMore();
     }
   }
 
+  @Override
+  public void afterEach(ExtensionContext extensionContext) throws Exception {
+    verify();
+  }
 }

sonar-html-plugin/src/test/java/org/sonar/plugins/html/checks/attributes/IllegalAttributeCheckTest.java

@@ -17,19 +17,18 @@
  */
 package org.sonar.plugins.html.checks.attributes;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.io.File;
-
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.sonar.plugins.html.checks.CheckMessagesVerifierRule;
 import org.sonar.plugins.html.checks.TestHelper;
 import org.sonar.plugins.html.visitor.HtmlSourceCode;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class IllegalAttributeCheckTest {
 
-  @Rule
+  @RegisterExtension
   public CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
 
   @Test

sonar-html-plugin/src/test/java/org/sonar/plugins/html/checks/attributes/RequiredAttributeCheckTest.java

@@ -17,19 +17,18 @@
  */
 package org.sonar.plugins.html.checks.attributes;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.io.File;
-
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.sonar.plugins.html.checks.CheckMessagesVerifierRule;
 import org.sonar.plugins.html.checks.TestHelper;
 import org.sonar.plugins.html.visitor.HtmlSourceCode;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class RequiredAttributeCheckTest {
 
-  @Rule
+  @RegisterExtension
   public CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
 
   @Test