Other/CodeMigration-bugfixes(AST-131175)

.classpath

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitignore

@@ -4,4 +4,5 @@
 /.metadata/
 .idea/
 .vs/
-.vscode/
+*.jar
+!checkmarx-ast-eclipse-plugin/lib/*.jar

.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -13,4 +13,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=17

.vscode/.checkmarxIgnored

@@ -0,0 +1 @@
+{}

META-INF/MANIFEST.MF

@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: checkmarx-eclipse-plugin
+Bundle-SymbolicName: checkmarx-eclipse-plugin
+Bundle-Version: 1.0.0.qualifier
+Require-Bundle:
+ org.slf4j.api,
+ org.apache.commons.lang3,
+ org.eclipse.mylyn.commons.ui
+Bundle-RequiredExecutionEnvironment: JavaSE-17
+Automatic-Module-Name: checkmarx.eclipse.plugin

build.properties

@@ -0,0 +1 @@
+bin.includes = META-INF/

checkmarx-ast-eclipse-plugin-tests/.classpath

@@ -1,15 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/test/java">
+	<classpathentry kind="src" output="target/classes" path="src/test/java">
 		<attributes>
-			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/jmockit-1.19.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/mockito-core-1.10.19.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/mockito-core-5.14.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/objenesis-2.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/junit-4.13.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/junit-jupiter-5.11.4.jar"/>
+	<classpathentry kind="lib" path="lib/objenesis-3.3.jar"/>
+	<classpathentry kind="lib" path="lib/powermock-api-mockito2-2.0.7.jar"/>
+	<classpathentry kind="lib" path="lib/powermock-core-2.0.9.jar"/>
+	<classpathentry kind="lib" path="lib/powermock-api-support-1.4.9.jar"/>
+	<classpathentry kind="lib" path="lib/powermock-module-junit4-2.0.9.jar"/>
+	<classpathentry kind="lib" path="lib/powermock-module-junit4-common-2.0.9.jar"/>
+	<classpathentry kind="lib" path="lib/powermock-module-junit4-rule-2.0.9.jar"/>
+	<classpathentry kind="lib" path="lib/powermock-reflect-2.0.9.jar"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

checkmarx-ast-eclipse-plugin-tests/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=17

checkmarx-ast-eclipse-plugin-tests/META-INF/MANIFEST.MF

@@ -1,10 +1,16 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: checkmarx-ast-eclipse-plugin-tests
+Bundle-Name: Checkmarx AST Eclipse Tests
 Bundle-SymbolicName: com.checkmarx.ast.eclipse.tests
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.eclipse.swtbot.go
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ClassPath: ., lib/jmockit-1.19.jar, lib/mockito-core-1.10.19.jar, lib/objenesis-2.2.jar, lib/junit-4.13.2.jar
-Fragment-Host: com.checkmarx.eclipse.plugin;bundle-version=0.0.0
-
+Fragment-Host: com.checkmarx.eclipse.plugin;bundle-version="1.0.0"
+Require-Bundle: 
+ org.eclipse.swtbot.swt.finder,
+ org.eclipse.swtbot.eclipse.finder,
+ org.eclipse.swtbot.junit5_x,
+ org.eclipse.swt,
+ org.eclipse.jdt.junit5.runtime,
+ junit-jupiter-api
+Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-ClassPath: .,lib/mockito-core-5.14.2.jar,lib/powermock-core-*.jar
+Automatic-Module-Name: com.checkmarx.ast.eclipse.tests

checkmarx-ast-eclipse-plugin-tests/build.properties

@@ -2,4 +2,4 @@ source.. = src/test/java
 output.. = target/classes/
 bin.includes = META-INF/,\
                target/,\
-               build.properties
+               build.properties

checkmarx-ast-eclipse-plugin-tests/pom.xml

@@ -1,44 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.checkmarx.ast.eclipse.tests</groupId>
-    <artifactId>com.checkmarx.ast.eclipse.tests</artifactId>
-    <description>Checkmarx Eclipse Plugin Integration Tests Project</description>
-    <packaging>eclipse-test-plugin</packaging>
-    <parent>
-        <groupId>com.checkmarx.ast.eclipse</groupId>
-        <artifactId>checkmarx-eclipse-plugin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>5.6.0</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-surefire-plugin</artifactId>
-                <version>${tycho.version}</version>
-                <configuration>
-                    <includes>
-                        <include>${test.includes}</include>
-                    </includes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<properties>
+		<test.includes>**/Test*.java,**/*Test.java,**/*Tests.java,**/*TestCase.java</test.includes>
+	</properties>
+	<groupId>com.checkmarx.ast.eclipse.tests</groupId>
+	<artifactId>com.checkmarx.ast.eclipse.tests</artifactId>
+	<description>Checkmarx Eclipse Plugin Integration Tests Project</description>
+	<packaging>eclipse-test-plugin</packaging>
+	<parent>
+		<groupId>com.checkmarx.ast.eclipse</groupId>
+		<artifactId>checkmarx-eclipse-plugin</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<useUIHarness>true</useUIHarness>
+					<useUIThread>false</useUIThread>
+					<providerHint>junit5</providerHint>
+					<failIfNoTests>true</failIfNoTests>
+					<includes>
+						<include>${test.includes}</include>
+					</includes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>

checkmarx-ast-eclipse-plugin-tests/src/test/java/checkmarx/ast/eclipse/plugin/tests/integration/AuthenticatorIntegrationTest.java

@@ -1,36 +1,47 @@
 package checkmarx.ast.eclipse.plugin.tests.integration;
 
-import static org.junit.Assert.*;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.checkmarx.eclipse.runner.Authenticator;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.io.File;
 
 public class AuthenticatorIntegrationTest extends BaseIntegrationTest {
 
     private static final Logger logger = LoggerFactory.getLogger(AuthenticatorIntegrationTest.class);
+
+    @Mock
+    private Authenticator authenticator; 
 
     @Test
     public void testSuccessfulAuthentication() {
+    	 authenticator = new Authenticator(LoggerFactory.getLogger(Authenticator.class)); 
         System.out.println("\n=== Starting Authentication Test ===");
         System.out.println("Current directory: " + new File(".").getAbsolutePath());
         System.out.println("API Key available: " + (VALID_API_KEY != null));
-        String result = authenticator.doAuthentication(VALID_API_KEY, "");
-        System.out.println("Authentication result: " + result);
-        assertNotNull("Authentication result should not be null", result);
-        assertFalse("Authentication result should not contain error", result.toLowerCase().contains("error"));
-        System.out.println("=== Authentication Test Completed ===\n");
-    }
+		String result = authenticator.doAuthentication(VALID_API_KEY, "");
+		System.out.println("Authentication result: " + result);
+		assertNotNull("Authentication result should not be null", result);
+		assertFalse(result.toLowerCase().contains("error"), "Authentication result should not contain error");
+		System.out.println("=== Authentication Test Completed ===\n");
+	}
 
     @Test
-    public void testInvalidApiKeyAuthentication() {
-        System.out.println("\n=== Starting Invalid API Key Test ===");
-        String invalidApiKey = "invalid-api-key";
-        String result = authenticator.doAuthentication(invalidApiKey, "");
-        System.out.println("Authentication result with invalid API key: " + result);
-        assertNotNull("Result should not be null for invalid API key", result);
-        assertTrue("Result should contain error for invalid API key", result.toLowerCase().contains("error"));
-        System.out.println("=== Invalid API Key Test Completed ===\n");
+	public void testInvalidApiKeyAuthentication() {
+    	 authenticator = new Authenticator(LoggerFactory.getLogger(Authenticator.class)); 
+		System.out.println("\n=== Starting Invalid API Key Test ===");
+		String invalidApiKey = "invalid-api-key";
+		String result = authenticator.doAuthentication(invalidApiKey, "");
+		System.out.println("Authentication result with invalid API key: " + result);
+		assertNotNull("Result should not be null for invalid API key", result);
+		assertTrue(result.toLowerCase().contains("error"), "Result should contain error for invalid API key");
+		System.out.println("=== Invalid API Key Test Completed ===\n");
     }
 }

checkmarx-ast-eclipse-plugin-tests/src/test/java/checkmarx/ast/eclipse/plugin/tests/integration/BaseIntegrationTest.java

@@ -1,9 +1,12 @@
 package checkmarx.ast.eclipse.plugin.tests.integration;
 
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+// DELETE these Mockito imports - not needed
+// import org.mockito.Mock;
+// import org.mockito.Mockito;
+// import org.mockito.MockitoAnnotations;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,39 +17,37 @@
 import checkmarx.ast.eclipse.plugin.tests.common.Environment;
 
 public abstract class BaseIntegrationTest {
-    
+
     private static final Logger logger = LoggerFactory.getLogger(BaseIntegrationTest.class);
-    
+
     protected static final String VALID_SCAN_ID = Environment.SCAN_ID;
     protected static final String INVALID_SCAN_ID = "invalid-scan-id";
     protected static final String VALID_API_KEY = Environment.API_KEY;
-    
-    @Mock
-    protected Logger mockLogger;
-    
+
+    // DELETE @Mock - not initialized
+    // protected Logger mockLogger;
+
     protected Authenticator authenticator;
     protected CxWrapper cxWrapper;
     protected static boolean initialized = false;
-
-    @Before
-    public void setUp() throws Exception {
-        logger.info("Setting up test: {}", this.getClass().getSimpleName());
-        logger.info("API Key available: {}", VALID_API_KEY != null);
-        MockitoAnnotations.initMocks(this);
-        authenticator = new Authenticator(mockLogger);
-
-        if (!initialized) {
-            initializeCxWrapper();
-            initialized = true;
-        }
+
+    @BeforeEach
+    void setUp() {
+        // Nothing needed
+    }
+
+    @AfterEach
+    void tearDown() {
+        // Nothing needed
     }
 
     protected void initializeCxWrapper() throws Exception {
         logger.info("Initializing CxWrapper");
         CxConfig config = CxConfig.builder()
                 .apiKey(VALID_API_KEY)
                 .build();
-        cxWrapper = new CxWrapper(config, mockLogger);
+        // FIX: Use real logger, not mock
+        cxWrapper = new CxWrapper(config, logger);  // ← Changed mockLogger to logger
         logger.info("CxWrapper initialized successfully");
     }
 
@@ -55,7 +56,8 @@ protected void reinitializeCxWrapper(String apiKey) throws Exception {
         CxConfig config = CxConfig.builder()
                 .apiKey(apiKey)
                 .build();
-        cxWrapper = new CxWrapper(config, mockLogger);
+        // FIX: Use real logger
+        cxWrapper = new CxWrapper(config, logger);  // ← Changed mockLogger to logger
         logger.info("CxWrapper reinitialized successfully");
     }
-}
+}