rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-15 12:29:26 +01:00
Code Issues Releases Activity

Fixed bug in StringReplacer

Browse Source
This commit is contained in:
Cristian Maglie 2013-07-19 16:08:36 +02:00
parent c32c3517a5
commit f8ec9418d1
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/processing/app/helpers/StringReplacer.java
View File

@ -57,8 +57,10 @@ public class StringReplacer {
for (String i : src.split(" ")) { for (String i : src.split(" ")) {
if (escapingChar == null) { if (escapingChar == null) {
// If the first char is not an escape char.. // If the first char is not an escape char..
String first = i.substring(0, 1); String first = null;
if (!quoteChars.contains(first)) { if (i.length() > 0)
first = i.substring(0, 1);
if (first == null || !quoteChars.contains(first)) {
if (i.trim().length() != 0 || acceptEmptyArguments) if (i.trim().length() != 0 || acceptEmptyArguments)
res.add(i); res.add(i);
continue; continue;

29
app/test/processing/app/helpers/StringReplacerTest.java Normal file
View File

@ -0,0 +1,29 @@
package processing.app.helpers;
import static org.junit.Assert.assertArrayEquals;
import org.junit.Test;
public class StringReplacerTest {
@Test
public void quotingCheck() throws Exception {
String in = "a\"bc ab'c 'abc abc' ";
in += "\"abc abc\" '\"abc abc\"' ";
in += "\"'abc abc'\"";
String[] res = StringReplacer.quotedSplit(in, "\"'", false);
assertArrayEquals(res, new String[] { "a\"bc", "ab'c", "abc abc",
"abc abc", "\"abc abc\"", "'abc abc'" });
}
@Test
public void quotingCheckWithEmptyStringsAccepted() throws Exception {
String in = "a\"bc ab'c 'abc abc' ";
in += "\"abc abc\" '\"abc abc\"' ";
in += "\"'abc abc'\"";
String[] res = StringReplacer.quotedSplit(in, "\"'", true);
assertArrayEquals(res, new String[] { "a\"bc", "ab'c", "", "", "abc abc",
"abc abc", "\"abc abc\"", "'abc abc'" });
}
}