s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1761 from omkarnix/master

Browse Source 
Fix: Allow smartSplit() to handle String of chars not just a single char
This commit is contained in:
Antonin Delpeuch 2018-10-15 18:04:53 +01:00 committed by GitHub
commit 3f6b3808c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 88 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/com/google/refine/expr/functions/strings/SmartSplit.java
View File

@ -76,7 +76,7 @@ public class SmartSplit implements Function {
if (args.length > 1) {
String sep = args[1].toString();
parser = new CSVParser(
sep.charAt(0),
sep,
CSVParser.DEFAULT_QUOTE_CHARACTER,
CSVParser.DEFAULT_ESCAPE_CHARACTER,
CSVParser.DEFAULT_STRICT_QUOTES,

88
main/tests/server/src/com/google/refine/tests/expr/functions/strings/SmartSplitTests.java
View File

@ -1,15 +1,101 @@
package com.google.refine.tests.expr.functions.strings;
import static org.junit.Assert.assertArrayEquals;
import static org.testng.Assert.assertTrue;
import java.util.Properties;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
import com.google.refine.expr.EvalError;
import com.google.refine.expr.functions.strings.SmartSplit;
import com.google.refine.grel.ControlFunctionRegistry;
import com.google.refine.grel.Function;
import com.google.refine.tests.util.TestUtils;
public class SmartSplitTests {
private static Properties bindings;
@BeforeTest
public void setUp() {
bindings = new Properties();
}
@AfterTest
public void tearDown() {
bindings = null;
}
@Test
public void testSmartSplitInvalidParams() {
assertTrue(invoke("smartSplit") instanceof EvalError);
assertTrue(invoke("smartSplit", "teststring1", 1, "teststring2", 2) instanceof EvalError);
}
@Test
public void testSmartSplitGuessComma() {
String testString = "teststring1,teststring2,teststring3,teststring4";
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
String[] actual = (String[]) invoke("smartSplit", testString);
assertArrayEquals(expected, actual);
}
@Test
public void testSmartSplitGuessTab() {
String testString = "teststring1 teststring2 teststring3 teststring4";
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
String[] actual = (String[]) invoke("smartSplit", testString);
assertArrayEquals(expected, actual);
}
@Test
public void testSmartSplitCharSepGiven() {
String testString = "teststring1#teststring2#teststring3#teststring4";
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
String[] actual = (String[]) invoke("smartSplit", testString, '#');
assertArrayEquals(expected, actual);
}
@Test
public void testSmartSplitCharSepSpace() {
String testString = "teststring1 teststring2 teststring3 teststring4";
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
String[] actual = (String[]) invoke("smartSplit", testString, ' ');
assertArrayEquals(expected, actual);
}
@Test
public void testSmartSplitStringSepGiven() {
String testString = "teststring1#@$teststring2#@$teststring3#@$teststring4";
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
String[] actual = (String[]) invoke("smartSplit", testString, "#@$");
assertArrayEquals(expected, actual);
}
/**
* Lookup a control function by name and invoke it with a variable number of
* args
*/
private static Object invoke(String name, Object... args) {
// registry uses static initializer, so no need to set it up
Function function = ControlFunctionRegistry.getFunction(name);
if (function == null) {
throw new IllegalArgumentException("Unknown function " + name);
}
if (args == null) {
return function.call(bindings, new Object[0]);
} else {
return function.call(bindings, args);
}
}
@Test
public void serializeSmartSplit() {
String json = "{\"description\":\"Returns the array of strings obtained by splitting s with separator sep. Handles quotes properly. Guesses tab or comma separator if \\\"sep\\\" is not given.\",\"params\":\"string s, optional string sep\",\"returns\":\"array\"}";
TestUtils.isSerializedTo(new SmartSplit(), json);
}
}
}