Update tests with dependencies

wttech · Oct 29, 2024 · 1966e63 · 1966e63
1 parent 4b3ea13
commit 1966e63
Show file tree

Hide file tree

Showing 51 changed files with 335 additions and 389 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
 
     strategy:
       matrix:
-        java-version: [ 11, 17 ]
+        java-version: [ 11 ]
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/test-instalation.yml b/.github/workflows/test-instalation.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 11
           distribution: 'adopt'
           cache: maven
       - run: mvn clean package
@@ -57,4 +57,4 @@ jobs:
           sonarqube-base-image: ${{ matrix.sonarqube-image }}
           aem-rules-binary: ${{ steps.get-executable-name.outputs.aem_rules_jar_name }}
           docker-hub-login: ${{ secrets.DOCKER_HUB_USERNAME }}
-          docker-hub-token: ${{ secrets.DOCKER_HUB_TOKEN }}
+          docker-hub-token: ${{ secrets.DOCKER_HUB_TOKEN }}
diff --git a/local-docker-image/conf/sonar.properties b/local-docker-image/conf/sonar.properties
@@ -446,4 +446,4 @@
 # We don't collect source code or IP addresses. And we don't share the data with anyone else.
 #sonar.telemetry.enable=true
 
-sonar.web.javaAdditionalOpts=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
+sonar.web.javaAdditionalOpts=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:8000
diff --git a/local-docker-image/docker-compose.yml b/local-docker-image/docker-compose.yml
@@ -27,7 +27,7 @@ services:
       context: .
     ports:
       - "9000:9000"
-      - "5005:5005"
+      - "8000:8000"
     restart: unless-stopped
     volumes:
       - ./extensions/plugins:/opt/sonarqube/extensions/plugins:ro

diff --git a/pom.xml b/pom.xml
@@ -112,7 +112,7 @@
         <sonar.testingHarnessVersion>10.7.0.96327</sonar.testingHarnessVersion>
         <sonar.javaCheksTestkitVersion>7.30.1.34514</sonar.javaCheksTestkitVersion>
         <jdk.min.version>11</jdk.min.version>
-        <sonar.sources>src/main/java,src/main/js</sonar.sources>
+        <sonar.sources>src/main/java</sonar.sources>
         <coveralls.repo.token>4rVf3NGV0jyQ3EGrc8L86oEDoHWm6MgDD</coveralls.repo.token>
         <tagName>v${project.version}</tagName>
     </properties>
@@ -215,40 +215,34 @@
             <version>${sonar.testingHarnessVersion}</version>
         </dependency>
         <dependency>
-            <artifactId>junit</artifactId>
-            <groupId>junit</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <groupId>org.junit.jupiter</groupId>
             <scope>test</scope>
-            <version>4.13.2</version>
+            <version>5.11.3</version>
+        </dependency>
+        <dependency>
+            <artifactId>junit-jupiter-params</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <scope>test</scope>
+            <version>5.11.3</version>
         </dependency>
         <dependency>
             <artifactId>mockito-core</artifactId>
             <groupId>org.mockito</groupId>
             <scope>test</scope>
-            <version>5.12.0</version>
+            <version>5.14.2</version>
         </dependency>
         <dependency>
             <artifactId>assertj-core</artifactId>
             <groupId>org.assertj</groupId>
             <scope>test</scope>
-            <version>3.26.0</version>
-        </dependency>
-        <dependency>
-            <artifactId>fest-assert</artifactId>
-            <groupId>org.easytesting</groupId>
-            <scope>test</scope>
-            <version>1.4</version>
-        </dependency>
-        <dependency>
-            <artifactId>hamcrest-all</artifactId>
-            <groupId>org.hamcrest</groupId>
-            <scope>test</scope>
-            <version>1.3</version>
+            <version>3.26.3</version>
         </dependency>
         <dependency>
             <artifactId>guava</artifactId>
             <groupId>com.google.guava</groupId>
             <scope>test</scope>
-            <version>32.0.0-jre</version>
+            <version>33.3.1-jre</version>
         </dependency>
         <dependency>
             <artifactId>sonar-plugin-api-impl</artifactId>
@@ -272,8 +266,9 @@
             <artifactId>logback-classic</artifactId>
             <groupId>ch.qos.logback</groupId>
             <scope>test</scope>
-            <version>1.2.13</version>
+            <version>1.5.12</version>
         </dependency>
+        <!-- aem dependencies-->
         <dependency>
             <artifactId>aem-api</artifactId>
             <groupId>com.adobe.aem</groupId>

diff --git a/src/main/java/com/vml/aemrules/htl/lex/ElementTokenizer.java b/src/main/java/com/vml/aemrules/htl/lex/ElementTokenizer.java
@@ -255,4 +255,4 @@ public boolean match(int character) {
         }
     }
 
-}
+}
diff --git a/src/main/java/com/vml/aemrules/java/checks/ModifiableValueMapUsageCheck.java b/src/main/java/com/vml/aemrules/java/checks/ModifiableValueMapUsageCheck.java
@@ -98,7 +98,7 @@ private void visitMethodWithMVM(IdentifierTree modifiableValueMapUsageIdentifier
         int argumentNumber = ((Arguments) usageOfMVM).indexOf(modifiableValueMapUsageIdentifier);
         MethodInvocationTree methodInvocationWithMVM = (MethodInvocationTree) usageOfMVM.parent();
         if (methodInvocationWithMVM != null) {
-            MethodTree methodWithMVM = (MethodTree) methodInvocationWithMVM.methodSymbol().declaration();
+            MethodTree methodWithMVM = methodInvocationWithMVM.methodSymbol().declaration();
             if (methodWithMVM != null && methodWithMVM.is(Tree.Kind.METHOD)) {
                 MethodWithMVMVisitor methodWithMVMVisitor = new MethodWithMVMVisitor(this, argumentNumber);
                 methodWithMVM.accept(methodWithMVMVisitor);
@@ -128,4 +128,4 @@ public void visitMethod(MethodTree tree) {
         }
 
     }
-}
+}
diff --git a/...in/java/com/vml/aemrules/java/checks/resourceresolver/close/FindRRDeclarationVisitor.java b/...in/java/com/vml/aemrules/java/checks/resourceresolver/close/FindRRDeclarationVisitor.java
@@ -112,7 +112,7 @@ public void visitReturnStatement(ReturnStatementTree tree) {
             IdentifierTree identifier = (IdentifierTree) tree.expression();
             Tree declaration = identifier.symbol().declaration();
             if (resourceResolvers.contains(declaration)) {
-                resourceResolvers.remove(declaration);
+            resourceResolvers.remove(declaration);
             }
         }
         super.visitReturnStatement(tree);

diff --git a/src/main/java/com/vml/aemrules/java/checks/visitors/FindSessionDeclarationVisitor.java b/src/main/java/com/vml/aemrules/java/checks/visitors/FindSessionDeclarationVisitor.java
@@ -112,7 +112,7 @@ public void visitReturnStatement(ReturnStatementTree tree) {
             IdentifierTree identifier = (IdentifierTree) tree.expression();
             Tree declaration = getDeclaration(identifier);
             if (sessions.contains(declaration)) {
-                sessions.remove(declaration);
+            sessions.remove(declaration);
             }
         }
         super.visitReturnStatement(tree);
@@ -188,4 +188,4 @@ public Tree getDeclarationOfReturnedVariable() {
 
     }
 
-}
+}
diff --git a/src/main/java/com/vml/aemrules/utils/Throwables.java b/src/main/java/com/vml/aemrules/utils/Throwables.java
@@ -36,7 +36,7 @@ public static Throwable getRootCause(Throwable throwable) {
 
     public static RuntimeException propagate(Throwable throwable) {
         throwIfUnchecked(throwable);
-        throw new RuntimeException(throwable);
+        throw new AemRulesTestRuntimeException(throwable);
     }
 
     public static void throwIfUnchecked(Throwable throwable) {
@@ -47,4 +47,10 @@ public static void throwIfUnchecked(Throwable throwable) {
             throw (Error) throwable;
         }
     }
+
+    private static class AemRulesTestRuntimeException extends RuntimeException {
+        public AemRulesTestRuntimeException(Throwable throwable) {
+            super(throwable);
+        }
+    }
 }
diff --git a/src/main/java/com/vml/aemrules/version/Version.java b/src/main/java/com/vml/aemrules/version/Version.java
@@ -27,7 +27,7 @@
 
 public class Version {
 
-    private static final Pattern VERSION_PATTERN = Pattern.compile("(?<major>[0-9]+)\\.(?<minor>[0-9])");
+    private static final Pattern VERSION_PATTERN = Pattern.compile("(?<major>\\d+)\\.(?<minor>\\d)");
 
     private final int major;
 

diff --git a/src/test/java/com/vml/aemrules/AemRulesSonarPluginTest.java b/src/test/java/com/vml/aemrules/AemRulesSonarPluginTest.java
@@ -19,7 +19,7 @@
  */
 package com.vml.aemrules;
 
-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;
@@ -28,10 +28,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class AemRulesSonarPluginTest {
+class AemRulesSonarPluginTest {
 
     @Test
-    public void webPluginTester() {
+    void webPluginTester() {
         Plugin.Context context = new Plugin.Context(SonarRuntimeImpl.forSonarQube(Version.create(6, 7), SonarQubeSide.SERVER, SonarEdition.COMMUNITY));
 
         new AemRulesSonarPlugin().define(context);

diff --git a/src/test/java/com/vml/aemrules/htl/HtlProfileTest.java b/src/test/java/com/vml/aemrules/htl/HtlProfileTest.java
@@ -19,9 +19,8 @@
  */
 package com.vml.aemrules.htl;
 
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.BuiltInActiveRule;
 import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.BuiltInQualityProfile;
 import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.Context;
@@ -32,23 +31,23 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
-public class HtlProfileTest {
+class HtlProfileTest {
 
     private HtlProfile profile;
 
     private Context context;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         profile = new HtlProfile();
         this.context = new Context();
 
     }
 
     @Test
-    public void sanity() {
+    void sanity() {
         profile.define(context);
         Map<String, BuiltInActiveRule> activeRules = getActiveRulesByRuleKey(context);
 
@@ -57,7 +56,7 @@ public void sanity() {
     }
 
     @Test
-    public void rulesLoaded() {
+    void rulesLoaded() {
         profile.define(context);
         Map<String, BuiltInActiveRule> activeRules = getActiveRulesByRuleKey(context);
 

diff --git a/src/test/java/com/vml/aemrules/htl/HtlSensorTest.java b/src/test/java/com/vml/aemrules/htl/HtlSensorTest.java
@@ -21,8 +21,8 @@
 
 import com.vml.aemrules.htl.checks.HtlAttributesShouldBeAtTheEndCheck;
 import com.vml.aemrules.htl.rules.HtlRulesDefinition;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.sonar.api.SonarEdition;
 import org.sonar.api.SonarQubeSide;
@@ -59,16 +59,16 @@
 import static org.mockito.Mockito.when;
 
 
-public class HtlSensorTest {
+class HtlSensorTest {
 
     private static final File TEST_DIR = new File("src/test/resources/sensor");
 
     private HtlSensor sensor;
 
     private SensorContextTester tester;
 
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         SonarRuntime sonarRuntime = SonarRuntimeImpl.forSonarQube(Version.create(8, 9), SonarQubeSide.SERVER, SonarEdition.COMMUNITY);
         RulesDefinition rulesDefinition = new HtlRulesDefinition(sonarRuntime);
         RulesDefinition.Context context = new RulesDefinition.Context();
@@ -105,7 +105,7 @@ private FileLinesContextFactory getMockedFileLinesContextFactory() {
     }
 
     @Test
-    public void checkIncorrectFile_issuesFound() throws Exception {
+    void checkIncorrectFile_issuesFound() throws Exception {
         DefaultInputFile inputFile = createInputFile(TEST_DIR, "test.html");
         tester.fileSystem().add(inputFile);
         sensor.execute(tester);
@@ -119,7 +119,7 @@ public void checkIncorrectFile_issuesFound() throws Exception {
     }
 
     @Test
-    public void checkCancellation_noIssueFound() throws Exception {
+    void checkCancellation_noIssueFound() throws Exception {
         DefaultInputFile inputFile = createInputFile(TEST_DIR, "test.html");
         tester.fileSystem().add(inputFile);
         tester.setCancelled(true);
@@ -128,7 +128,7 @@ public void checkCancellation_noIssueFound() throws Exception {
     }
 
     @Test
-    public void sonarlintCheck() throws Exception {
+    void sonarlintCheck() throws Exception {
         DefaultInputFile inputFile = createInputFile(TEST_DIR, "test.html");
         tester.fileSystem().add(inputFile);
         sensor.execute(tester);
@@ -139,31 +139,31 @@ public void sonarlintCheck() throws Exception {
     }
 
     @Test
-    public void checkFileWithError_analysisErrorFound() throws Exception {
+    void checkFileWithError_analysisErrorFound() throws Exception {
         DefaultInputFile inputFile = createInputFile(TEST_DIR, "error.html");
         tester.fileSystem().add(inputFile);
         sensor.execute(tester);
         assertThat(tester.allAnalysisErrors()).isNotEmpty();
     }
 
     @Test
-    public void checkExpressionWithinHtmlComment_noErrorsFound() throws Exception {
+    void checkExpressionWithinHtmlComment_noErrorsFound() throws Exception {
         DefaultInputFile inputFile = createInputFile(TEST_DIR, "comment.html");
         tester.fileSystem().add(inputFile);
         sensor.execute(tester);
         assertThat(tester.allAnalysisErrors()).isNotEmpty();
     }
 
     @Test
-    public void checkNestedTags_noErrorsFound() throws IOException {
+    void checkNestedTags_noErrorsFound() throws IOException {
         DefaultInputFile inputFile = createInputFile(TEST_DIR, "nestedTags.html");
         tester.fileSystem().add(inputFile);
         sensor.execute(tester);
         assertThat(tester.allAnalysisErrors()).isEmpty();
     }
 
     @Test
-    public void checkDescriptorConfiguration() {
+    void checkDescriptorConfiguration() {
         DefaultSensorDescriptor descriptor = new DefaultSensorDescriptor();
         sensor.describe(descriptor);
         assertThat(descriptor.name()).isEqualTo("HTL");

diff --git a/src/test/java/com/vml/aemrules/htl/HtlTest.java b/src/test/java/com/vml/aemrules/htl/HtlTest.java
@@ -19,15 +19,15 @@
  */
 package com.vml.aemrules.htl;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 
-public class HtlTest {
+class HtlTest {
 
     @Test
-    public void shouldReturnEmptyArrayOfDefaultFileSuffixes() {
+    void shouldReturnEmptyArrayOfDefaultFileSuffixes() {
         Htl htl = new Htl();
         assertThat(htl.getFileSuffixes()).isEmpty();
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -255,4 +255,4 @@ public boolean match(int character) { @@
             }
         }
-    }
+    }