From c6926efae70f4804cd46d67db71af074148ed7f3 Mon Sep 17 00:00:00 2001 From: Denys Almazov Date: Fri, 12 May 2023 13:54:54 +0300 Subject: [PATCH] remove System dependency from test --- tests/com.espressif.idf.core.test/META-INF/MANIFEST.MF | 2 +- .../idf/core/unittest/ExecutableFinderTest.java | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/com.espressif.idf.core.test/META-INF/MANIFEST.MF b/tests/com.espressif.idf.core.test/META-INF/MANIFEST.MF index cb290450f..51e22f76a 100644 --- a/tests/com.espressif.idf.core.test/META-INF/MANIFEST.MF +++ b/tests/com.espressif.idf.core.test/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: Espressif Systems Automatic-Module-Name: com.espressif.idf.core.test Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: com.espressif.idf.core;bundle-version="1.0.1", - org.junit.jupiter.api + junit-jupiter-api Bundle-ClassPath: ., lib/jmock-2.12.0.jar, lib/commons-collections4-4.4.jar, diff --git a/tests/com.espressif.idf.core.test/src/com/espressif/idf/core/unittest/ExecutableFinderTest.java b/tests/com.espressif.idf.core.test/src/com/espressif/idf/core/unittest/ExecutableFinderTest.java index beac955c3..b0a7ea8a3 100644 --- a/tests/com.espressif.idf.core.test/src/com/espressif/idf/core/unittest/ExecutableFinderTest.java +++ b/tests/com.espressif.idf.core.test/src/com/espressif/idf/core/unittest/ExecutableFinderTest.java @@ -42,7 +42,6 @@ class ExecutableFinderTest private static final String FOUNDABLE_TEXT_FILE_STRING = "foundableTxt"; //$NON-NLS-1$ private static final String NON_FOUNDABLE_EXE_FILE_STRING = "non_foundableExe"; //$NON-NLS-1$ private static final String NON_FOUNDABLE_TEXT_FILE_STRING = "non_foundableTxt"; //$NON-NLS-1$ - private static final String PATHEXT = "PATHEXT"; //$NON-NLS-1$ private static class TestableSystemExecutableFinderWindows extends SystemExecutableFinder { @@ -97,33 +96,37 @@ public String getPathEnv() @Override public String getEnvExecutables() { - return System.getenv(PATHEXT); + return EXE_STRING; } }; emptyPathSystemWrapper = new SystemWrapper() { + @Override public String getPathEnv() { return null; } + @Override public String getEnvExecutables() { - return System.getenv(PATHEXT); + return EXE_STRING; } }; emptyPathExtSystemWrapper = new SystemWrapper() { + @Override public String getPathEnv() { return foundableTempDir.toString(); } + @Override public String getEnvExecutables() { return null;