bug fix after rebase (#1342)

* bug fix after rebase

* fix: fix unit failing unit test

---------

Co-authored-by: Denys Almazov <[email protected]>

Author: alirana01

bundles/com.espressif.idf.core/src/com/espressif/idf/core/bug/BugReportGenerator.java

@@ -323,16 +323,6 @@ private File getInstalledToolsInfoFile() throws IOException
 		Logger.log(environment.toString());
 		environment.put("PYTHONUNBUFFERED", "1"); //$NON-NLS-1$ //$NON-NLS-2$
 
-		environment.put("IDF_GITHUB_ASSETS", //$NON-NLS-1$
-				Platform.getPreferencesService().getString(IDFCorePlugin.PLUGIN_ID,
-						IDFCorePreferenceConstants.IDF_GITHUB_ASSETS,
-						IDFCorePreferenceConstants.IDF_GITHUB_ASSETS_DEFAULT_GLOBAL, null));
-
-		environment.put("PIP_EXTRA_INDEX_URL", //$NON-NLS-1$
-				Platform.getPreferencesService().getString(IDFCorePlugin.PLUGIN_ID,
-						IDFCorePreferenceConstants.PIP_EXTRA_INDEX_URL,
-						IDFCorePreferenceConstants.PIP_EXTRA_INDEX_URL_DEFAULT_GLOBAL, null));
-
 		if (StringUtil.isEmpty(gitExecutablePath))
 		{
 			Logger.log("Git executable path is empty. Please check GIT_PATH environment variable."); //$NON-NLS-1$

bundles/com.espressif.idf.core/src/com/espressif/idf/core/util/IDFUtil.java

@@ -909,10 +909,6 @@ public static Map<String, String> getSystemEnv()
 	{
 		Map<String, String> env = new HashMap<>(System.getenv());
 
-		String idfToolsPath = Platform.getPreferencesService().getString(IDFCorePlugin.PLUGIN_ID,
-				IDFCorePreferenceConstants.IDF_TOOLS_PATH, IDFCorePreferenceConstants.IDF_TOOLS_PATH_DEFAULT, null);
-		env.put(IDFCorePreferenceConstants.IDF_TOOLS_PATH, idfToolsPath);
-
 		// Merge Homebrew bin paths into PATH
 		// Windows may use "Path" while Unix uses "PATH"
 		String keyPath = env.containsKey("PATH") ? "PATH" : "Path"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -935,14 +931,6 @@ public static Map<String, String> getSystemEnv()
 
 		return env;
 	}
-
-	public static String getIDFToolsPathFromPreferences()
-	{
-		String idfToolsPath = Platform.getPreferencesService().getString(IDFCorePlugin.PLUGIN_ID,
-				IDFCorePreferenceConstants.IDF_TOOLS_PATH, IDFCorePreferenceConstants.IDF_TOOLS_PATH_DEFAULT, null);
-		return idfToolsPath;
-	}
-
 
 	public static void closeWelcomePage(IWorkbenchWindow activeww)
 	{

tests/com.espressif.idf.core.test/src/com/espressif/idf/core/util/test/IDFUtilTest.java

@@ -259,18 +259,21 @@ public void testGetIDFExtraPaths_WhenIDFPathIsSet_ShouldReturnExpectedPaths()
 	}
 
 	@Test
-	public void testGetIDFExtraPaths_WhenIDFPathIsEmpty_ShouldReturnEmptyString()
+	void testGetIDFExtraPaths_WhenIDFPathIsEmpty_ShouldReturnEmptyString()
 	{
-		try (MockedConstruction<IDFEnvironmentVariables> mocked = mockConstruction(IDFEnvironmentVariables.class,
-				(mock, context) -> when(mock.getEnvValue(IDFEnvironmentVariables.IDF_PATH)).thenReturn(""))) //$NON-NLS-1$
+		try (MockedStatic<IDFUtil> mockedStatic = mockStatic(IDFUtil.class, CALLS_REAL_METHODS))
 		{
+
+			mockedStatic.when(IDFUtil::getIDFPath).thenReturn(""); //$NON-NLS-1$
+
 			String result = IDFUtil.getIDFExtraPaths();
+
 			assertEquals("", result); //$NON-NLS-1$
 		}
 	}
 
 	@Test
-	public void testGetOpenOCDLocation_ShouldReturnOpenOCDScriptsLocationFromIdfEnvVar()
+	void testGetOpenOCDLocation_ShouldReturnOpenOCDScriptsLocationFromIdfEnvVar()
 	{
 		String openocdScriptsLoc = "openocd_path" + File.separator + "share" + File.separator + "openocd" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 				+ File.separator + "scripts"; //$NON-NLS-1$