Fix (#9) Weird behavior with some characters appearing string arguments

fusepoolP3 · Sep 26, 2016 · d0728d9 · d0728d9
1 parent 6e76928
commit d0728d9
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 1 deletion.
diff --git a/engines/engines-core/src/test/java/eu/spaziodati/batchrefine/java/BatchRefineBase.java b/engines/engines-core/src/test/java/eu/spaziodati/batchrefine/java/BatchRefineBase.java
@@ -29,6 +29,7 @@ public static enum CallType {
     @Parameterized.Parameters(name = "{index}: {1}")
     public static Collection<?> parameters() {
         return Arrays.asList(new Object[][]{
+                {"smallab","simple-transform", "csv", CallType.sync},
                 {"osterie", "mass-edit", "csv", CallType.sync},
                 {"osterie", "column-addition", "csv", CallType.sync},
                 {"osterie", "column-removal", "csv", CallType.sync},

diff --git a/engines/engines-core/src/test/resources/inputs/smallab.csv b/engines/engines-core/src/test/resources/inputs/smallab.csv
@@ -0,0 +1,4 @@
+"col1","col2"
+"Á","Á"
+"B","B"
+"Č","Č"
diff --git a/engines/engines-core/src/test/resources/outputs/smallab_simple-transform.csv b/engines/engines-core/src/test/resources/outputs/smallab_simple-transform.csv
@@ -0,0 +1,4 @@
+col1,col1_new,col2,col2_new
+Á,A,Á,Á
+B,B,B,B
+Č,Č,Č,C
diff --git a/engines/engines-core/src/test/resources/transforms/smallab-simple-transform.json b/engines/engines-core/src/test/resources/transforms/smallab-simple-transform.json
@@ -0,0 +1,68 @@
+[
+  {
+    "op": "core/column-addition",
+    "description": "Create column col1_new at index 1 based on column col1 using expression grel:value",
+    "engineConfig": {
+      "mode": "row-based",
+      "facets": []
+    },
+    "newColumnName": "col1_new",
+    "columnInsertIndex": 1,
+    "baseColumnName": "col1",
+    "expression": "grel:value",
+    "onError": "set-to-blank"
+  },
+  {
+    "op": "core/column-addition",
+    "description": "Create column col2_new at index 3 based on column col2 using expression grel:value",
+    "engineConfig": {
+      "mode": "row-based",
+      "facets": []
+    },
+    "newColumnName": "col2_new",
+    "columnInsertIndex": 3,
+    "baseColumnName": "col2",
+    "expression": "grel:value",
+    "onError": "set-to-blank"
+  },
+  {
+    "op": "core/mass-edit",
+    "description": "Mass edit cells in column col1_new",
+    "engineConfig": {
+      "mode": "row-based",
+      "facets": []
+    },
+    "columnName": "col1_new",
+    "expression": "value",
+    "edits": [
+      {
+        "fromBlank": false,
+        "fromError": false,
+        "from": [
+          "Á"
+        ],
+        "to": "A"
+      }
+    ]
+  },
+  {
+    "op": "core/mass-edit",
+    "description": "Mass edit cells in column col2_new",
+    "engineConfig": {
+      "mode": "row-based",
+      "facets": []
+    },
+    "columnName": "col2_new",
+    "expression": "value",
+    "edits": [
+      {
+        "fromBlank": false,
+        "fromError": false,
+        "from": [
+          "Č"
+        ],
+        "to": "C"
+      }
+    ]
+  }
+]
diff --git a/engines/engines-http/src/main/java/eu/spaziodati/batchrefine/core/http/RefineHTTPClient.java b/engines/engines-http/src/main/java/eu/spaziodati/batchrefine/core/http/RefineHTTPClient.java
@@ -211,7 +211,7 @@ private boolean applyOperations(String handle, JSONArray transform)
             pairs.add(new BasicNameValuePair("operations", transform.toString()));
 
             response = doPost("/command/core/apply-operations",
-                    new UrlEncodedFormEntity(pairs));
+                    new UrlEncodedFormEntity(pairs, "UTF-8"));
 
             JSONObject content = decode(response);
             if (content == null) {