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

Fix #3330: argument checking in phonetic GREL function (#3345)

Browse Source 
* Fix for issue #3330 phonetic-function

* Update main/src/com/google/refine/expr/functions/strings/Phonetic.java

Co-authored-by: Antonin Delpeuch <antonin@delpeuch.eu>

* Corrected Intendation

Corrected intendation as suggested.

* Added tests to check invalid parameters

* Added tests to check invalid parameters

Co-authored-by: Antonin Delpeuch <antonin@delpeuch.eu>
This commit is contained in:
rachittiwari8562 2020-11-22 13:53:06 +05:30 committed by GitHub
parent fa90da2a27
commit 990540ce10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/com/google/refine/expr/functions/strings/Phonetic.java
View File

@ -72,7 +72,10 @@ public class Phonetic implements Function {
return new EvalError(ControlFunctionRegistry.getFunctionName(this) return new EvalError(ControlFunctionRegistry.getFunctionName(this)
+ " expects a string for the second argument"); + " expects a string for the second argument");
} }
} } else {
return new EvalError(ControlFunctionRegistry.getFunctionName(this)
+ " expects a string for the second argument, the phonetic encoding to use.");
}
} }
if (args.length < 3) { if (args.length < 3) {
if ("doublemetaphone".equalsIgnoreCase(encoding)) { if ("doublemetaphone".equalsIgnoreCase(encoding)) {

16
main/tests/server/src/com/google/refine/expr/functions/strings/PhoneticTests.java
View File

@ -25,16 +25,26 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/ ******************************************************************************/
package com.google.refine.expr.functions.strings; package com.google.refine.expr.functions.strings;
import org.testng.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.refine.RefineTest;
import com.google.refine.util.TestUtils; import com.google.refine.util.TestUtils;
import com.google.refine.expr.EvalError;
public class PhoneticTests { public class PhoneticTests extends RefineTest {
@Test @Test
public void serializePhonetic() { public void serializePhonetic() {
String json = "{\"description\":\"Returns the a phonetic encoding of s (optionally indicating which encoding to use')\",\"params\":\"string s, string encoding (optional, defaults to 'metaphone3')\",\"returns\":\"string\"}"; String json = "{\"description\":\"Returns the a phonetic encoding of s (optionally indicating which encoding to use')\",\"params\":\"string s, string encoding (optional, defaults to 'metaphone3')\",\"returns\":\"string\"}";
TestUtils.isSerializedTo(new Phonetic(), json); TestUtils.isSerializedTo(new Phonetic(), json);
} }
@Test
public void testtoPhoneticInvalidParams() {
Assert.assertTrue(invoke("phonetic") instanceof EvalError); //if no arguments are provided
Assert.assertTrue(invoke("phonetic",(Object[])null) instanceof EvalError); //if first argument(value) is null
Assert.assertTrue(invoke("phonetic","one",(Object[])null) instanceof EvalError); //if second argument(encoding type) is null
Assert.assertTrue(invoke("phonetic","one","other") instanceof EvalError); //if second argument(encoding type) is not a valid encoding type
Assert.assertTrue(invoke("phonetic","one","metaphone3","three") instanceof EvalError); //if more than 2 arguments are provided
}
} }