Parse system-properties as a config object to avoid extraneous quot…

…es around keys
gradle · Apr 1, 2020 · d1e7681 · d1e7681
1 parent 667f401
commit d1e7681
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/org/gradle/profiler/ConfigUtil.java b/src/main/java/org/gradle/profiler/ConfigUtil.java
@@ -14,7 +14,7 @@ public class ConfigUtil {
 	public static Map<String, String> map(Config config, String key, Map<String, String> defaultValues) {
 		if (config.hasPath(key)) {
 			Map<String, String> props = new LinkedHashMap<>();
-			for (Map.Entry<String, ConfigValue> entry : config.getConfig(key).entrySet()) {
+			for (Map.Entry<String, ConfigValue> entry : config.getObject(key).entrySet()) {
 				props.put(entry.getKey(), entry.getValue().unwrapped().toString());
 			}
 			return props;

diff --git a/src/test/groovy/org/gradle/profiler/ProfilerIntegrationTest.groovy b/src/test/groovy/org/gradle/profiler/ProfilerIntegrationTest.groovy
@@ -777,14 +777,14 @@ a {
     versions = "$minimalSupportedGradleVersion"
     tasks = assemble
     system-properties {
-        org.gradle.test = "value-1"
+        "org.gradle.test" = "value-1"
     }
 }
 b {
     versions = "$minimalSupportedGradleVersion"
     tasks = assemble
     system-properties {
-        org.gradle.test = "value-2"
+        "org.gradle.test" = "value-2"
     }
 }
 """

diff --git a/src/test/groovy/org/gradle/profiler/ScenarioLoaderTest.groovy b/src/test/groovy/org/gradle/profiler/ScenarioLoaderTest.groovy
@@ -158,8 +158,8 @@ class ScenarioLoaderTest extends Specification {
         expect:
         def instantExecution = scenarios[0] as GradleScenarioDefinition
         instantExecution.systemProperties == [
-            '"org.gradle.unsafe.instant-execution"': "true",
-            '"org.gradle.unsafe.instant-execution.fail-on-problems"': "false"
+            "org.gradle.unsafe.instant-execution": "true",
+            "org.gradle.unsafe.instant-execution.fail-on-problems": "false"
         ]
     }