From b99d30455517b1c17d48d1d9eff566f0c28fdf93 Mon Sep 17 00:00:00 2001
From: Ken Finnigan <ken@kenfinnigan.me>
Date: Wed, 30 Oct 2019 14:38:44 -0400
Subject: [PATCH] Fix MP Config TCK tests as part of #4516

---
 .../configuration/ExpandingConfigSource.java  |  2 +-
 .../deployment/ErroneousConfigTest.java       |  2 +-
 tcks/microprofile-config/pom.xml              | 11 ++--
 tcks/microprofile-config/tck-suite.xml        | 50 -------------------
 4 files changed, 10 insertions(+), 55 deletions(-)
 delete mode 100644 tcks/microprofile-config/tck-suite.xml

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ExpandingConfigSource.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ExpandingConfigSource.java
index b588d32854f49..aefcc7dfb77e3 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ExpandingConfigSource.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ExpandingConfigSource.java
@@ -72,7 +72,7 @@ public static String expandValue(String value, Cache cache) {
         if (value == null)
             return null;
         final Expression compiled = cache.exprCache.computeIfAbsent(value,
-                str -> Expression.compile(str, Expression.Flag.LENIENT_SYNTAX));
+                str -> Expression.compile(str, Expression.Flag.LENIENT_SYNTAX, Expression.Flag.NO_TRIM));
         return compiled.evaluate(ConfigExpander.INSTANCE);
     }
 
diff --git a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/ErroneousConfigTest.java b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/ErroneousConfigTest.java
index b3c749035a97f..a0ce42d541ba4 100644
--- a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/ErroneousConfigTest.java
+++ b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/ErroneousConfigTest.java
@@ -16,7 +16,7 @@ public class ErroneousConfigTest {
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setExpectedException(ConfigurationError.class)
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addAsResource(new StringAsset("quarkus.swagger-ui.path=/   \n"), "application.properties"));
+                    .addAsResource(new StringAsset("quarkus.swagger-ui.path=/\n"), "application.properties"));
 
     @Test
     public void shouldNotStartApplicationIfSwaggerPathIsASlash() {
diff --git a/tcks/microprofile-config/pom.xml b/tcks/microprofile-config/pom.xml
index 5e9072bd42542..fee196fe3730a 100644
--- a/tcks/microprofile-config/pom.xml
+++ b/tcks/microprofile-config/pom.xml
@@ -18,9 +18,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <suiteXmlFiles>
-                        <suiteXmlFile>tck-suite.xml</suiteXmlFile>
-                    </suiteXmlFiles>
                     <!-- These env variables are required for org.eclipse.microprofile.config.tck.CDIPropertyNameMatchingTest -->
                     <environmentVariables>
                         <my_int_property>45</my_int_property>
@@ -38,6 +35,14 @@
                     <dependenciesToScan>
                         <dependency>org.eclipse.microprofile.config:microprofile-config-tck</dependency>
                     </dependenciesToScan>
+                    <reuseForks>false</reuseForks>
+                    <excludes>
+                        <!-- TCK and spec dispute: https://github.com/eclipse/microprofile-config/pull/407 -->
+                        <exclude>org.eclipse.microprofile.config.tck.EmptyValuesTest</exclude>
+                        <!-- "testEnvironmentConfigSource" fails because of the above TCK/spec dispute -->
+                        <!-- "testInjectedConfigSerializable" fails because not all ConfigSource, Converters, etc are serializable -->
+                        <exclude>org.eclipse.microprofile.config.tck.ConfigProviderTest</exclude>
+                    </excludes>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/tcks/microprofile-config/tck-suite.xml b/tcks/microprofile-config/tck-suite.xml
deleted file mode 100644
index c235643512885..0000000000000
--- a/tcks/microprofile-config/tck-suite.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<suite name="microprofile-config-TCK" verbose="2"
-    configfailurepolicy="continue">
-
-    <test name="microprofile-config 1.2 TCK">
-        <packages>
-            <package
-                name="org.eclipse.microprofile.config.tck.*">
-            </package>
-        </packages>
-
-        <classes>
-            <!-- Custom converters -->
-            <class
-                name="org.eclipse.microprofile.config.tck.ArrayConverterTest">
-                <methods>
-                    <exclude name=".*" />
-                </methods>
-            </class>
-            <class
-                name="org.eclipse.microprofile.config.tck.ConfigProviderTest">
-                <methods>
-                    <!-- io.quarkus.runtime.configuration.ExpandingConfigSource 
-                        is not serializable -->
-                    <exclude
-                        name="testInjectedConfigSerializable" />
-                    <!-- expected [clean test] but found [ clean test] -->
-                    <exclude name="testPropertyConfigSource" />
-                </methods>
-            </class>
-            <!-- TCK and spec dispute: https://github.com/eclipse/microprofile-config/pull/407 -->
-            <class name="org.eclipse.microprofile.config.tck.ConfigProviderTest">
-                <methods>
-                    <!-- The property MAVEN_CMD_LINE_ARGS did not have the
-                        expected value. expected [clean test] but found [ clean test] -->
-                    <exclude name="testEnvironmentConfigSource"/>
-                </methods>
-            </class>
-            <class name="org.eclipse.microprofile.config.tck.EmptyValuesTest">
-                <methods>
-                    <exclude name="testEmptyStringPropertyFromConfigFile"/>
-                    <exclude name="testEmptyStringProgrammaticLookup"/>
-                    <exclude name="testEmptyStringValues"/>
-                </methods>
-            </class>
-
-        </classes>
-    </test>
-
-</suite>
\ No newline at end of file