Fix tests to not include multi-line configs

Author: andrewor14

bin/run-tests

@@ -173,10 +173,6 @@ for delimiter in "${delimiters[@]}"; do
     "-Dstraw=\"berry space\" -Dblue=\"berry \\\"quotes\\\"\" -Dblack=\"berry \\\\backslashes\\\\ \""
   test_parse_java_property "spark.$delimiter.10" \
     "-Dstraw=\"berry space\" -Dblue=\"berry \\\"quotes\\\"\" -Dblack=\"berry \\\\backslashes\\\\ \"" IGNORE_WHITESPACE
-  test_parse_java_property "spark.$delimiter.11" \
-    "-Dstraw=\"berry space\" -Dblue=\"berry \\\"quotes\\\"\" -Dblack=\"berry \\\\backslashes\\\\ \" -Dcherry=berry" IGNORE_WHITESPACE
-  test_parse_java_property "spark.$delimiter.12" \
-    "-Dstraw=\"berry space\" -Dblue=\"berry \\\"quotes\\\"\" -Dblack=\"berry \\\\backslashes\\\\ \" -Dcherry=berry" IGNORE_WHITESPACE
 done
 log_error
 
@@ -197,10 +193,6 @@ test_split_java_options "spark.space.9" 3 \
   "-Dstraw=berry space" "-Dblue=berry \"quotes\"" "-Dblack=berry \\backslashes\\ "
 test_split_java_options "spark.space.10" 3 \
   "-Dstraw=berry space" "-Dblue=berry \"quotes\"" "-Dblack=berry \\backslashes\\ "
-test_split_java_options "spark.space.11" 4 \
-  "-Dstraw=berry space" "-Dblue=berry \"quotes\"" "-Dblack=berry \\backslashes\\ " "-Dcherry=berry"
-test_split_java_options "spark.space.12" 4 \
-  "-Dstraw=berry space" "-Dblue=berry \"quotes\"" "-Dblack=berry \\backslashes\\ " "-Dcherry=berry"
 log_error
 
 # Test quote_java_property. Note that this relies on split_java_options to work correctly.
@@ -220,10 +212,6 @@ test_quote_java_property "spark.space.9" 3 \
   "\"-Dstraw=berry space\"" "\"-Dblue=berry \"quotes\"\"" "\"-Dblack=berry \\backslashes\\ \""
 test_quote_java_property "spark.space.10" 3 \
   "\"-Dstraw=berry space\"" "\"-Dblue=berry \"quotes\"\"" "\"-Dblack=berry \\backslashes\\ \""
-test_quote_java_property "spark.space.11" 4 \
-  "\"-Dstraw=berry space\"" "\"-Dblue=berry \"quotes\"\"" "\"-Dblack=berry \\backslashes\\ \"" "\"-Dcherry=berry\""
-test_quote_java_property "spark.space.12" 4 \
-  "\"-Dstraw=berry space\"" "\"-Dblue=berry \"quotes\"\"" "\"-Dblack=berry \\backslashes\\ \"" "\"-Dcherry=berry\""
 log_error
 
 # Final test result

bin/test.conf

@@ -18,13 +18,6 @@ spark.space.7 -Dstraw=berry -Dblue=berry -Dblack=berry
 spark.space.8 -Dstraw="berry space" -Dblue="berry" -Dblack=berry
 spark.space.9 -Dstraw="berry space" -Dblue="berry \"quotes\"" -Dblack="berry \\backslashes\\ "
 spark.space.10    -Dstraw="berry space"   -Dblue="berry \"quotes\""   -Dblack="berry \\backslashes\\ "  
-spark.space.11 \
-  -Dstraw="berry space" \
-  -Dblue="berry \"quotes\"" \
-  -Dblack="berry \\backslashes\\ " \
-  -Dcherry=berry
-spark.space.12 -Dstraw="berry space" -Dblue="berry \"quotes\"" \
-  -Dblack="berry \\backslashes\\ " -Dcherry=berry
 
 # Equal sign delimiter
 spark.equal.1=-Dstraw=berry
@@ -37,13 +30,6 @@ spark.equal.7=-Dstraw=berry -Dblue=berry -Dblack=berry
 spark.equal.8=-Dstraw="berry space" -Dblue="berry" -Dblack=berry
 spark.equal.9=-Dstraw="berry space" -Dblue="berry \"quotes\"" -Dblack="berry \\backslashes\\ "
 spark.equal.10  =  -Dstraw="berry space"   -Dblue="berry \"quotes\""   -Dblack="berry \\backslashes\\ "  
-spark.equal.11=\
-  -Dstraw="berry space" \
-  -Dblue="berry \"quotes\"" \
-  -Dblack="berry \\backslashes\\ " \
-  -Dcherry=berry
-spark.equal.12=-Dstraw="berry space" -Dblue="berry \"quotes\"" \
-  -Dblack="berry \\backslashes\\ " -Dcherry=berry
 
 # Colon delimiter
 spark.colon.1:-Dstraw=berry
@@ -56,11 +42,4 @@ spark.colon.7:-Dstraw=berry -Dblue=berry -Dblack=berry
 spark.colon.8:-Dstraw="berry space" -Dblue="berry" -Dblack=berry
 spark.colon.9:-Dstraw="berry space" -Dblue="berry \"quotes\"" -Dblack="berry \\backslashes\\ "
 spark.colon.10  :  -Dstraw="berry space"   -Dblue="berry \"quotes\""   -Dblack="berry \\backslashes\\ "  
-spark.colon.11:\
-  -Dstraw="berry space" \
-  -Dblue="berry \"quotes\"" \
-  -Dblack="berry \\backslashes\\ " \
-  -Dcherry=berry
-spark.colon.12:-Dstraw="berry space" -Dblue="berry \"quotes\"" \
-  -Dblack="berry \\backslashes\\ " -Dcherry=berry
 

bin/utils.sh

@@ -28,6 +28,7 @@
 function parse_java_property() {
   JAVA_PROPERTY_VALUE=$(\
     grep "^[[:space:]]*$1" "$PROPERTIES_FILE" | \
+    head -n 1 | \
     sed "s/^[[:space:]]*$1//g" | \
     sed "s/^[[:space:]]*[:=]\{0,1\}//g" | \
     sed "s/^[[:space:]]*//g" | \