From ae61368796b8987f4aa1bad95d082da3dfb3df47 Mon Sep 17 00:00:00 2001
From: Antonin Delpeuch <antonin@delpeuch.eu>
Date: Mon, 22 Oct 2018 09:47:57 +0100
Subject: [PATCH] Jackson deserialization for TextSearchFacetConfig

---
 .../browsing/facets/TextSearchFacetTests.java | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/main/tests/server/src/com/google/refine/tests/browsing/facets/TextSearchFacetTests.java b/main/tests/server/src/com/google/refine/tests/browsing/facets/TextSearchFacetTests.java
index 870c5f36e..5d8903bc8 100644
--- a/main/tests/server/src/com/google/refine/tests/browsing/facets/TextSearchFacetTests.java
+++ b/main/tests/server/src/com/google/refine/tests/browsing/facets/TextSearchFacetTests.java
@@ -36,13 +36,15 @@ package com.google.refine.tests.browsing.facets;
 import java.io.IOException;
 
 import org.json.JSONException;
-import org.json.JSONObject;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+
 import com.google.refine.browsing.RowFilter;
 import com.google.refine.browsing.facets.TextSearchFacet;
 import com.google.refine.browsing.facets.TextSearchFacet.TextSearchFacetConfig;
@@ -50,6 +52,7 @@ import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.tests.RefineTest;
 import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.ParsingUtilities;
 
 
 public class TextSearchFacetTests extends RefineTest {
@@ -89,10 +92,9 @@ public class TextSearchFacetTests extends RefineTest {
             + "Abc\n");
     }
     
-    private void configureFilter(String filter) {
+    private void configureFilter(String filter) throws JsonParseException, JsonMappingException, IOException {
         //Add the facet to the project and create a row filter
-        textfilterconfig = new TextSearchFacetConfig();
-        textfilterconfig.initializeFromJSON(new JSONObject(filter));
+        textfilterconfig = ParsingUtilities.mapper.readValue(filter, TextSearchFacetConfig.class);
         textfilter = textfilterconfig.apply(project);
         rowfilter = textfilter.getRowFilter(project);
     }
@@ -194,16 +196,14 @@ public class TextSearchFacetTests extends RefineTest {
     }
     
     @Test
-    public void serializeTextSearchFacetConfig() {
-        TextSearchFacetConfig config = new TextSearchFacetConfig();
-        config.initializeFromJSON(new JSONObject(sensitiveConfigJson));
+    public void serializeTextSearchFacetConfig() throws JsonParseException, JsonMappingException, IOException {
+        TextSearchFacetConfig config = ParsingUtilities.mapper.readValue(sensitiveConfigJson, TextSearchFacetConfig.class);
         TestUtils.isSerializedTo(config, sensitiveConfigJson);
     }
     
     @Test
-    public void serializeTextSearchFacet() {
-        TextSearchFacetConfig config = new TextSearchFacetConfig();
-        config.initializeFromJSON(new JSONObject(sensitiveConfigJson));
+    public void serializeTextSearchFacet() throws JsonParseException, JsonMappingException, IOException {
+        TextSearchFacetConfig config = ParsingUtilities.mapper.readValue(sensitiveConfigJson, TextSearchFacetConfig.class);
         TextSearchFacet facet = config.apply(project);
         TestUtils.isSerializedTo(facet, sensitiveFacetJson);
     }