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

Merge pull request #1642 from ostephens/mass-edit-fix

Browse Source 
Mass edit fix for blanks, numbers and booleans
This commit is contained in:
Jacky 2018-06-20 22:00:34 -04:00 committed by GitHub
commit f3dbc18214
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 90 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/com/google/refine/operations/cell/MassEditOperation.java
View File

@ -121,13 +121,13 @@ public class MassEditOperation extends EngineDependentMassCellOperation {
from = new ArrayList<String>(fromCount);
for (int j = 0; j < fromCount; j++) {
from.add(fromA.getString(j));
from.add(fromA.get(j).toString());
}
} else {
from = new ArrayList<String>();
}
boolean fromBlank = editO.has("fromBlank") && editO.getBoolean("fromBlank");
boolean fromBlank = (editO.has("fromBlank") && editO.getBoolean("fromBlank") || from.get(0).length() == 0 && from.size() == 1);
boolean fromError = editO.has("fromError") && editO.getBoolean("fromError");
Serializable to = (Serializable) editO.get("to");

88
main/tests/server/src/com/google/refine/tests/operations/cell/MassOperationTests.java Normal file
View File

@ -0,0 +1,88 @@
package com.google.refine.tests.operations.cell;
import java.util.List;
import org.testng.Assert;
import org.testng.annotations.Test;
import com.google.refine.operations.cell.MassEditOperation;
import com.google.refine.operations.cell.MassEditOperation.Edit;
import com.google.refine.tests.RefineTest;
import com.google.refine.util.ParsingUtilities;
public class MassOperationTests extends RefineTest {
private List<Edit> editList;
private String editsString;
@Test
public void testReconstructEditString() throws Exception {
editsString = "[{\"from\":[\"String\"],\"to\":\"newString\",\"type\":\"text\"}]";
editList = MassEditOperation.reconstructEdits(ParsingUtilities.evaluateJsonStringToArray(editsString));
Assert.assertEquals(editList.get(0).from.size(), 1);
Assert.assertEquals(editList.get(0).from.get(0), "String");
Assert.assertEquals(editList.get(0).to,"newString" );
Assert.assertFalse(editList.get(0).fromBlank);
Assert.assertFalse(editList.get(0).fromError);
}
@Test
public void testReconstructEditMultiString() throws Exception {
editsString = "[{\"from\":[\"String1\",\"String2\"],\"to\":\"newString\",\"type\":\"text\"}]";
editList = MassEditOperation.reconstructEdits(ParsingUtilities.evaluateJsonStringToArray(editsString));
Assert.assertEquals(editList.get(0).from.size(), 2);
Assert.assertEquals(editList.get(0).from.get(0), "String1");
Assert.assertEquals(editList.get(0).from.get(1), "String2");
Assert.assertEquals(editList.get(0).to,"newString" );
Assert.assertFalse(editList.get(0).fromBlank);
Assert.assertFalse(editList.get(0).fromError);
}
@Test
public void testReconstructEditBoolean() throws Exception {
editsString = "[{\"from\":[true],\"to\":\"newString\",\"type\":\"text\"}]";
editList = MassEditOperation.reconstructEdits(ParsingUtilities.evaluateJsonStringToArray(editsString));
Assert.assertEquals(editList.get(0).from.size(), 1);
Assert.assertEquals(editList.get(0).from.get(0), "true");
Assert.assertEquals(editList.get(0).to,"newString" );
Assert.assertFalse(editList.get(0).fromBlank);
Assert.assertFalse(editList.get(0).fromError);
}
@Test
public void testReconstructEditNumber() throws Exception {
editsString = "[{\"from\":[1],\"to\":\"newString\",\"type\":\"text\"}]";
editList = MassEditOperation.reconstructEdits(ParsingUtilities.evaluateJsonStringToArray(editsString));
Assert.assertEquals(editList.get(0).from.size(), 1);
Assert.assertEquals(editList.get(0).from.get(0), "1");
Assert.assertEquals(editList.get(0).to,"newString" );
Assert.assertFalse(editList.get(0).fromBlank);
Assert.assertFalse(editList.get(0).fromError);
}
@Test
public void testReconstructEditEmpty() throws Exception {
editsString = "[{\"from\":[\"\"],\"to\":\"newString\",\"type\":\"text\"}]";
editList = MassEditOperation.reconstructEdits(ParsingUtilities.evaluateJsonStringToArray(editsString));
Assert.assertEquals(editList.get(0).from.size(), 1);
Assert.assertEquals(editList.get(0).from.get(0), "");
Assert.assertEquals(editList.get(0).to,"newString" );
Assert.assertTrue(editList.get(0).fromBlank);
Assert.assertFalse(editList.get(0).fromError);
}
//Not yet testing for mass edit from OR Error
//Not yet testing for mass edit from OR Date
}