This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 205fe29 Test fix: returned map contains java[Exec].{workingDir|environment} properties. new db2f651 Merge pull request #3233 from sdedic/sdedic/fix-javatoken-test 205fe29 is described below commit 205fe292784a5bb19b06e29945a55786314a0b86 Author: Svata Dedic <svatopluk.de...@oracle.com> AuthorDate: Mon Oct 11 12:38:19 2021 +0200 Test fix: returned map contains java[Exec].{workingDir|environment} properties. --- .../gradle/java/execute/JavaExecTokenProviderTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/java/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/execute/JavaExecTokenProviderTest.java b/java/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/execute/JavaExecTokenProviderTest.java index 197924c..95b0a12 100644 --- a/java/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/execute/JavaExecTokenProviderTest.java +++ b/java/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/execute/JavaExecTokenProviderTest.java @@ -128,7 +128,7 @@ public class JavaExecTokenProviderTest extends NbTestCase { build(); Map<String, String> map = jetp.createReplacements(ActionProvider.COMMAND_RUN, Lookups.singleton(params)); - assertEquals(4, map.size()); + assertEquals(8, map.size()); assertParamList(map.get("java.jvmArgs"), TWO_PROPS); assertListInValue(map.get("javaExec.jvmArgs"), TWO_PROPS); @@ -142,7 +142,7 @@ public class JavaExecTokenProviderTest extends NbTestCase { build(); Map<String, String> map = jetp.createReplacements(ActionProvider.COMMAND_RUN, Lookups.singleton(params)); - assertEquals(4, map.size()); + assertEquals(8, map.size()); assertParamList(map.get("java.jvmArgs"), THREE_PROPS); assertListInValue(map.get("javaExec.jvmArgs"), THREE_PROPS); @@ -156,7 +156,7 @@ public class JavaExecTokenProviderTest extends NbTestCase { build(); Map<String, String> map = jetp.createReplacements(ActionProvider.COMMAND_RUN, Lookups.singleton(params)); - assertEquals(4, map.size()); + assertEquals(8, map.size()); assertArgs(map.get("javaExec.args"), TWO_PROPS); assertParamList(map.get("java.args"), TWO_PROPS); @@ -170,7 +170,7 @@ public class JavaExecTokenProviderTest extends NbTestCase { build(); Map<String, String> map = jetp.createReplacements(ActionProvider.COMMAND_RUN, Lookups.singleton(params)); - assertEquals(4, map.size()); + assertEquals(8, map.size()); assertArgs(map.get("javaExec.args"), THREE_PROPS); assertParamList(map.get("java.args"), THREE_PROPS); @@ -186,7 +186,7 @@ public class JavaExecTokenProviderTest extends NbTestCase { build(); Map<String, String> map = jetp.createReplacements(ActionProvider.COMMAND_RUN, Lookups.singleton(params)); - assertEquals(6, map.size()); + assertEquals(8, map.size()); assertParamList(map.get("java.workingDir"), wd); assertParamList(map.get("javaExec.workingDir"), "-PrunWorkingDir=\"" + wd + "\""); @@ -203,7 +203,7 @@ public class JavaExecTokenProviderTest extends NbTestCase { build(); Map<String, String> map = jetp.createReplacements(ActionProvider.COMMAND_RUN, Lookups.singleton(params)); - assertEquals(6, map.size()); + assertEquals(8, map.size()); assertParamList(map.get("java.environment"), new String[]{"TestVar1=Env Value 1", "!TestVar2"}); assertParamList(map.get("javaExec.environment"), "-PrunEnvironment=\"TestVar1=Env Value 1\" !TestVar2"); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists