@@ -82,38 +82,24 @@ class InterpreterStringExpressionTest
8282 evaluateExpression(""" "a" != null """ ) should returnResult(true )
8383 }
8484
85- it should " return not escaped characters" in {
86-
87- evaluateExpression(""" "Hello\nWorld" """ ) should returnResult(" Hello\n World" )
88- evaluateExpression(" x " , Map (" x" -> " Hello\n World" )) should returnResult(" Hello\n World" )
89-
90- evaluateExpression(""" "Hello\rWorld" """ ) should returnResult(" Hello\r World" )
91- evaluateExpression(" x " , Map (" x" -> " Hello\r World" )) should returnResult(" Hello\r World" )
92-
93- evaluateExpression(""" "Hello\'World" """ ) should returnResult(" Hello\' World" )
94- evaluateExpression(" x " , Map (" x" -> " Hello\' World" )) should returnResult(" Hello\' World" )
95-
96- evaluateExpression(""" "Hello\tWorld" """ ) should returnResult(" Hello\t World" )
97- evaluateExpression(" x " , Map (" x" -> " Hello\t World" )) should returnResult(" Hello\t World" )
98-
99- evaluateExpression(""" "Hello\"World" """ ) should returnResult(" Hello\" World" )
100- evaluateExpression(" x " , Map (" x" -> " Hello\" World" )) should returnResult(" Hello\" World" )
101- }
102-
10385 private val escapeSequences = Table (
104- (" Character" , " Display name" ),
105- ('\n ' , " \\ n" ),
106- ('\r ' , " \\ r" ),
107- ('\t ' , " \\ t" ),
108- ('\b ' , " \\ b" ),
109- ('\f ' , " \\ f" ),
110- ('\' ' , " \' " ),
111- ('\\ ' , " \\ " )
86+ (" Character" , " Expected" , " Display name" ),
87+ ('\n ' , '\n ' , " new line" ),
88+ ('\r ' , '\r ' , " carriage return" ),
89+ ('\t ' , '\t ' , " tab" ),
90+ ('\b ' , '\b ' , " backspace" ),
91+ ('\f ' , '\f ' , " form feed" ),
92+ ('\' ' , '\' ' , " single quote" ),
93+ (" \\\" " , '"' , " double quote" ),
94+ (" \\\\ " , '\\ ' , " backslash" )
11295 )
11396
11497 it should " contains an escape sequence" in {
115- forEvery(escapeSequences) { (character, _) =>
116- evaluateExpression(s " \" a $character b \" " ) should returnResult(s " a $character b " )
98+ forEvery(escapeSequences) { (character, expected, _) =>
99+ val expectedString = s " a $expected b "
100+
101+ evaluateExpression(s " \" a $character b \" " ) should returnResult(expectedString)
102+ evaluateExpression(" char" , Map (" char" -> expectedString)) should returnResult(expectedString)
117103 }
118104 }
119105
0 commit comments