Merge pull request #2134 from OpenRefine/issue-2133-test-packages

Clean up test classes and packages

extensions/wikidata/tests/src/org/openrefine/wikidata/commands/CommandTest.java

@@ -37,9 +37,9 @@ import org.openrefine.wikidata.testing.TestingData;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 
+import com.google.refine.RefineTest;
 import com.google.refine.commands.Command;
 import com.google.refine.model.Project;
-import com.google.refine.tests.RefineTest;
 
 public abstract class CommandTest extends RefineTest {
 

extensions/wikidata/tests/src/org/openrefine/wikidata/commands/LoginCommandTest.java

@@ -1,6 +1,6 @@
 package org.openrefine.wikidata.commands;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
 

extensions/wikidata/tests/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommandTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.commands;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.mockito.Mockito.when;
 import static org.openrefine.wikidata.testing.TestingData.jsonFromFile;
 

extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommandTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.commands;
 
-import static org.junit.Assert.assertTrue;
+import static org.testng.Assert.assertTrue;
 import static org.mockito.Mockito.when;
 import static org.openrefine.wikidata.testing.TestingData.jsonFromFile;
 

extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SchemaCommandTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.commands;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;

extensions/wikidata/tests/src/org/openrefine/wikidata/editing/EditBatchProcessorTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.editing;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -51,7 +51,7 @@ import org.wikidata.wdtk.wikibaseapi.WikibaseDataEditor;
 import org.wikidata.wdtk.wikibaseapi.WikibaseDataFetcher;
 import org.wikidata.wdtk.wikibaseapi.apierrors.MediaWikiApiErrorException;
 
-import com.google.refine.tests.RefineTest;
+import com.google.refine.RefineTest;
 
 public class EditBatchProcessorTest extends RefineTest {
 

extensions/wikidata/tests/src/org/openrefine/wikidata/editing/NewItemLibraryTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.editing;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
 import java.util.Collections;
@@ -33,11 +33,11 @@ import org.openrefine.wikidata.testing.TestingData;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import com.google.refine.RefineTest;
 import com.google.refine.model.Cell;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
 import com.google.refine.model.recon.StandardReconConfig;
-import com.google.refine.tests.RefineTest;
 
 public class NewItemLibraryTest extends RefineTest {
 

extensions/wikidata/tests/src/org/openrefine/wikidata/editing/ReconEntityRewriterTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.editing;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.ItemUpdate;

extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QSValuePrinterTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.exporters;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.math.BigDecimal;
 

extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QuickStatementsExporterTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.exporters;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
 import java.io.StringWriter;
@@ -44,9 +44,9 @@ import org.wikidata.wdtk.datamodel.interfaces.SnakGroup;
 import org.wikidata.wdtk.datamodel.interfaces.Statement;
 import org.wikidata.wdtk.datamodel.interfaces.StatementRank;
 
+import com.google.refine.RefineTest;
 import com.google.refine.browsing.Engine;
 import com.google.refine.model.Project;
-import com.google.refine.tests.RefineTest;
 
 public class QuickStatementsExporterTest extends RefineTest {
 

extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/SchemaExporterTest.java

@@ -6,10 +6,10 @@ import java.util.Properties;
 
 import org.testng.annotations.Test;
 
+import com.google.refine.RefineTest;
 import com.google.refine.browsing.Engine;
 import com.google.refine.model.Project;
-import com.google.refine.tests.RefineTest;
+import com.google.refine.util.TestUtils;
-import com.google.refine.tests.util.TestUtils;
 
 public class SchemaExporterTest extends RefineTest {
 	

extensions/wikidata/tests/src/org/openrefine/wikidata/operations/OperationTest.java

@@ -35,14 +35,14 @@ import java.util.Properties;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import com.google.refine.RefineTest;
 import com.google.refine.history.Change;
 import com.google.refine.model.AbstractOperation;
 import com.google.refine.model.Project;
 import com.google.refine.operations.OperationRegistry;
-import com.google.refine.tests.RefineTest;
-import com.google.refine.tests.util.TestUtils;
 import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.Pool;
+import com.google.refine.util.TestUtils;
 
 import edu.mit.simile.butterfly.ButterflyModule;
 

extensions/wikidata/tests/src/org/openrefine/wikidata/operations/PerformWikibaseEditsOperationTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.operations;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.io.LineNumberReader;
 

extensions/wikidata/tests/src/org/openrefine/wikidata/operations/SaveWikibaseSchemaOperationTest.java

@@ -23,8 +23,8 @@
  ******************************************************************************/
 package org.openrefine.wikidata.operations;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.testng.Assert.assertNull;
 
 import java.io.LineNumberReader;
 

extensions/wikidata/tests/src/org/openrefine/wikidata/qa/QAWarningStoreTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.qa;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import org.openrefine.wikidata.testing.JacksonSerializationTest;
 import org.testng.annotations.BeforeMethod;

extensions/wikidata/tests/src/org/openrefine/wikidata/qa/QAWarningTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.qa;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import org.openrefine.wikidata.testing.JacksonSerializationTest;
 import org.testng.annotations.Test;

extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ScrutinizerTest.java

@@ -23,8 +23,8 @@
  ******************************************************************************/
 package org.openrefine.wikidata.qa.scrutinizers;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.testng.Assert.assertTrue;
 
 import java.util.Arrays;
 import java.util.Set;

extensions/wikidata/tests/src/org/openrefine/wikidata/schema/ExpressionContextTest.java

@@ -23,14 +23,14 @@
  ******************************************************************************/
 package org.openrefine.wikidata.schema;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.testng.Assert.assertNull;
 
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import com.google.refine.RefineTest;
 import com.google.refine.model.Project;
-import com.google.refine.tests.RefineTest;
 
 public class ExpressionContextTest extends RefineTest {
 

extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbExpressionTest.java

@@ -32,12 +32,12 @@ import org.openrefine.wikidata.testing.TestingData;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 
+import com.google.refine.RefineTest;
 import com.google.refine.model.Cell;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
 import com.google.refine.model.Row;
-import com.google.refine.tests.RefineTest;
 
 public class WbExpressionTest<T> extends RefineTest {
 

extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLanguageConstantTest.java

@@ -23,8 +23,8 @@
  ******************************************************************************/
 package org.openrefine.wikidata.schema;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.testng.Assert.assertNull;
 
 import org.openrefine.wikidata.testing.JacksonSerializationTest;
 import org.testng.annotations.Test;

extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLocationConstantTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.schema;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.text.ParseException;
 

extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbNameDescExprTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.schema;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.util.Collections;
 

extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbQuantityExprTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.schema;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.math.BigDecimal;
 

extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStatementExprTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.schema;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
 import java.util.Arrays;

extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WikibaseSchemaTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.schema;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -47,11 +47,11 @@ import org.wikidata.wdtk.datamodel.interfaces.StatementRank;
 import org.wikidata.wdtk.datamodel.interfaces.StringValue;
 import org.wikidata.wdtk.datamodel.interfaces.TimeValue;
 
+import com.google.refine.RefineTest;
 import com.google.refine.browsing.Engine;
 import com.google.refine.browsing.EngineConfig;
 import com.google.refine.model.Project;
-import com.google.refine.tests.RefineTest;
+import com.google.refine.util.TestUtils;
-import com.google.refine.tests.util.TestUtils;
 
 public class WikibaseSchemaTest extends RefineTest {
 

extensions/wikidata/tests/src/org/openrefine/wikidata/schema/entityvalues/ReconEntityIdValueTest.java

@@ -23,10 +23,10 @@
  ******************************************************************************/
 package org.openrefine.wikidata.schema.entityvalues;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.testng.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
+import static org.testng.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.testng.Assert.assertTrue;
 
 import java.util.Collections;
 

extensions/wikidata/tests/src/org/openrefine/wikidata/testing/JacksonSerializationTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.testing;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
 
@@ -31,8 +31,8 @@ import org.testng.Assert;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.refine.tests.util.TestUtils;
 import com.google.refine.util.ParsingUtilities;
+import com.google.refine.util.TestUtils;
 
 public class JacksonSerializationTest {
 

extensions/wikidata/tests/src/org/openrefine/wikidata/updates/ItemUpdateTest.java

@@ -23,10 +23,10 @@
  ******************************************************************************/
 package org.openrefine.wikidata.updates;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.testng.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
+import static org.testng.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.testng.Assert.assertTrue;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -49,7 +49,7 @@ import org.wikidata.wdtk.datamodel.interfaces.Statement;
 import org.wikidata.wdtk.datamodel.interfaces.StatementGroup;
 import org.wikidata.wdtk.datamodel.interfaces.StatementRank;
 
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class ItemUpdateTest {
 

extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/PointerExtractorTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.updates.scheduler;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.math.BigDecimal;
 import java.util.Collections;

extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/QuickStatementsUpdateSchedulerTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.updates.scheduler;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.util.Arrays;
 import java.util.List;

extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/UpdateSchedulerTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.updates.scheduler;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.util.Arrays;
 import java.util.Collections;

extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/WikibaseAPIUpdateSchedulerTest.java

@@ -23,7 +23,7 @@
  ******************************************************************************/
 package org.openrefine.wikidata.updates.scheduler;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.util.Arrays;
 import java.util.List;

main/pom.xml

@@ -458,24 +458,6 @@
       <version>2.23.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-      <version>1.7.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito2</artifactId>
-      <version>1.7.1</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>javax.xml.bind</groupId>
       <artifactId>jaxb-api</artifactId>

main/tests/server/conf/tests.xml

@@ -34,7 +34,7 @@
       </run>
     </groups>
     <packages>
-      <package name="com.google.refine.tests.*"/>
+      <package name="com.google.refine.*"/>
     </packages>
   </test>
 </suite>

main/tests/server/src/com/google/refine/HistoryEntryManagerStub.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.tests;
+package com.google.refine;
 
 import java.io.File;
 import java.io.Writer;

main/tests/server/src/com/google/refine/ProjectManagerStub.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.tests;
+package com.google.refine;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -44,7 +44,7 @@ import com.google.refine.history.HistoryEntryManager;
 import com.google.refine.model.Project;
 
 /**
- * Stub used to make protected methods public for testing
+ * Stub used to avoid saves and stub HistoryEntryManager
  *
  */
 public class ProjectManagerStub extends ProjectManager {

main/tests/server/src/com/google/refine/ProjectManagerTests.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.tests;
+package com.google.refine;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -53,8 +53,8 @@ import org.testng.annotations.Test;
 
 import com.google.refine.ProjectMetadata;
 import com.google.refine.model.Project;
+import com.google.refine.model.ProjectStub;
 import com.google.refine.process.ProcessManager;
-import com.google.refine.tests.model.ProjectStub;
 
 public class ProjectManagerTests extends RefineTest {
     ProjectManagerStub pm;

main/tests/server/src/com/google/refine/RefineServletStub.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.tests;
+package com.google.refine;
 
 import java.io.File;
 import java.io.IOException;

main/tests/server/src/com/google/refine/RefineServletTests.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.tests;
+package com.google.refine;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;

main/tests/server/src/com/google/refine/RefineTest.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.tests;
+package com.google.refine;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -68,7 +68,7 @@ import com.google.refine.model.Column;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 import edu.mit.simile.butterfly.ButterflyModule;
 

main/tests/server/src/com/google/refine/browsing/DecoratedValueTests.java

@@ -24,14 +24,14 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.browsing;
+package com.google.refine.browsing;
 
 import java.time.OffsetDateTime;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.browsing.DecoratedValue;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class DecoratedValueTests {
     @Test

main/tests/server/src/com/google/refine/browsing/EngineConfigTests.java

@@ -24,14 +24,14 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.browsing.facets;
+package com.google.refine.browsing;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import com.google.refine.browsing.Engine.Mode;
+import com.google.refine.util.TestUtils;
 import com.google.refine.browsing.EngineConfig;
-import com.google.refine.tests.util.TestUtils;
 
 public class EngineConfigTests {
     

main/tests/server/src/com/google/refine/browsing/EngineTests.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.browsing;
+package com.google.refine.browsing;
 
 import static org.mockito.Mockito.mock;
 
@@ -32,7 +32,7 @@ import org.testng.annotations.Test;
 
 import com.google.refine.browsing.Engine;
 import com.google.refine.model.Project;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 
 public class EngineTests {

main/tests/server/src/com/google/refine/browsing/facets/ListFacetTests.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.browsing.facets;
+package com.google.refine.browsing.facets;
 
 import java.io.IOException;
 
@@ -32,13 +32,13 @@ import org.testng.annotations.Test;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
+import com.google.refine.RefineTest;
 import com.google.refine.browsing.Engine;
 import com.google.refine.browsing.facets.Facet;
 import com.google.refine.browsing.facets.ListFacet.ListFacetConfig;
 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;
+import com.google.refine.util.TestUtils;
 
 public class ListFacetTests extends RefineTest {
     

main/tests/server/src/com/google/refine/browsing/facets/NominalFacetChoiceTests.java

@@ -24,13 +24,13 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.browsing.facets;
+package com.google.refine.browsing.facets;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.browsing.DecoratedValue;
 import com.google.refine.browsing.facets.NominalFacetChoice;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class NominalFacetChoiceTests {
     @Test

main/tests/server/src/com/google/refine/browsing/facets/RangeFacetTests.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.browsing.facets;
+package com.google.refine.browsing.facets;
 
 import java.io.IOException;
 
@@ -32,14 +32,14 @@ import org.testng.annotations.Test;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
+import com.google.refine.RefineTest;
 import com.google.refine.browsing.Engine;
 import com.google.refine.browsing.facets.RangeFacet;
 import com.google.refine.browsing.facets.RangeFacet.RangeFacetConfig;
 import com.google.refine.model.Cell;
 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;
+import com.google.refine.util.TestUtils;
 
 public class RangeFacetTests extends RefineTest {
     public static String configJson = "{\n" + 

main/tests/server/src/com/google/refine/browsing/facets/ScatterplotFacetTests.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.browsing.facets;
+package com.google.refine.browsing.facets;
 
 import java.io.IOException;
 
@@ -32,14 +32,14 @@ import org.testng.annotations.Test;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
+import com.google.refine.RefineTest;
 import com.google.refine.browsing.Engine;
 import com.google.refine.browsing.facets.ScatterplotFacet;
 import com.google.refine.browsing.facets.ScatterplotFacet.ScatterplotFacetConfig;
 import com.google.refine.model.Cell;
 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;
+import com.google.refine.util.TestUtils;
 
 public class ScatterplotFacetTests extends RefineTest {
     public static String configJson = "{\n" + 

main/tests/server/src/com/google/refine/browsing/facets/TextSearchFacetTests.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.tests.browsing.facets;
+package com.google.refine.browsing.facets;
 
 import java.io.IOException;
 
@@ -45,12 +45,12 @@ import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
+import com.google.refine.RefineTest;
 import com.google.refine.browsing.RowFilter;
 import com.google.refine.browsing.facets.TextSearchFacet;
 import com.google.refine.browsing.facets.TextSearchFacet.TextSearchFacetConfig;
-import com.google.refine.tests.RefineTest;
-import com.google.refine.tests.util.TestUtils;
 import com.google.refine.util.ParsingUtilities;
+import com.google.refine.util.TestUtils;
 
 
 public class TextSearchFacetTests extends RefineTest {

main/tests/server/src/com/google/refine/browsing/facets/TimeRangeFacetTests.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.browsing.facets;
+package com.google.refine.browsing.facets;
 
 import java.io.IOException;
 import java.time.OffsetDateTime;
@@ -33,14 +33,14 @@ import org.testng.annotations.Test;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
+import com.google.refine.RefineTest;
 import com.google.refine.browsing.Engine;
 import com.google.refine.browsing.facets.TimeRangeFacet;
 import com.google.refine.browsing.facets.TimeRangeFacet.TimeRangeFacetConfig;
 import com.google.refine.model.Cell;
 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;
+import com.google.refine.util.TestUtils;
 
 
 public class TimeRangeFacetTests extends RefineTest {

main/tests/server/src/com/google/refine/browsing/util/ExpressionNominalValueGrouperTests.java

@@ -28,7 +28,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.tests.browsing.util;
+package com.google.refine.browsing.util;
 
 import java.io.IOException;
 import java.time.OffsetDateTime;
@@ -42,6 +42,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import com.google.refine.RefineTest;
 import com.google.refine.browsing.util.ExpressionNominalValueGrouper;
 import com.google.refine.expr.Evaluable;
 import com.google.refine.expr.MetaParser;
@@ -49,7 +50,6 @@ import com.google.refine.model.Cell;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.tests.RefineTest;
 
 
 public class ExpressionNominalValueGrouperTests extends RefineTest {

main/tests/server/src/com/google/refine/clustering/binning/BinningClustererTests.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.clustering;
+package com.google.refine.clustering.binning;
 
 import java.io.IOException;
 
@@ -32,13 +32,13 @@ import org.testng.annotations.Test;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
+import com.google.refine.RefineTest;
 import com.google.refine.browsing.Engine;
 import com.google.refine.clustering.binning.BinningClusterer;
 import com.google.refine.clustering.binning.BinningClusterer.BinningClustererConfig;
 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;
+import com.google.refine.util.TestUtils;
 
 public class BinningClustererTests extends RefineTest {
     

main/tests/server/src/com/google/refine/clustering/binning/KeyerTests.java

@@ -29,7 +29,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package com.google.refine.tests.clustering.binning;
+package com.google.refine.clustering.binning;
 
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
@@ -38,10 +38,10 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import com.google.refine.RefineTest;
 import com.google.refine.clustering.binning.FingerprintKeyer;
 import com.google.refine.clustering.binning.Keyer;
 import com.google.refine.clustering.binning.NGramFingerprintKeyer;
-import com.google.refine.tests.RefineTest;
 
 
 public class KeyerTests extends RefineTest {

main/tests/server/src/com/google/refine/clustering/knn/kNNClustererTests.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.clustering;
+package com.google.refine.clustering.knn;
 
 import java.io.IOException;
 
@@ -32,13 +32,13 @@ import org.testng.annotations.Test;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
+import com.google.refine.RefineTest;
 import com.google.refine.browsing.Engine;
 import com.google.refine.clustering.knn.kNNClusterer;
 import com.google.refine.clustering.knn.kNNClusterer.kNNClustererConfig;
 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;
+import com.google.refine.util.TestUtils;
 
 public class kNNClustererTests extends RefineTest {
     

main/tests/server/src/com/google/refine/commands/CommandStub.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.tests.commands;
+package com.google.refine.commands;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;

main/tests/server/src/com/google/refine/commands/CommandTests.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.tests.commands;
+package com.google.refine.commands;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -49,11 +49,11 @@ import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 import com.google.refine.ProjectManager;
+import com.google.refine.RefineTest;
 import com.google.refine.browsing.Engine;
 import com.google.refine.browsing.Engine.Mode;
 import com.google.refine.browsing.EngineConfig;
 import com.google.refine.model.Project;
-import com.google.refine.tests.RefineTest;
 
 public class CommandTests extends RefineTest {
 

main/tests/server/src/com/google/refine/commands/browsing/GetClusteringFunctionsAndDistancesCommandTest.java

@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
 
-package com.google.refine.tests.commands.browsing;
+package com.google.refine.commands.browsing;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

main/tests/server/src/com/google/refine/commands/expr/ExpressionCommandTestBase.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.commands.expr;
+package com.google.refine.commands.expr;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -44,7 +44,7 @@ import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.google.refine.commands.Command;
 import com.google.refine.io.FileProjectManager;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class ExpressionCommandTestBase {
     protected HttpServletRequest request = null;

main/tests/server/src/com/google/refine/commands/expr/GetExpressionHistoryCommandTests.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.commands.expr;
+package com.google.refine.commands.expr;
 
 import java.io.IOException;
 

main/tests/server/src/com/google/refine/commands/expr/GetExpressionLanguageInfoCommandTests.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.commands.expr;
+package com.google.refine.commands.expr;
 
 import java.io.IOException;
 
@@ -35,8 +35,8 @@ import org.testng.annotations.Test;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.refine.commands.expr.GetExpressionLanguageInfoCommand;
-import com.google.refine.tests.util.TestUtils;
 import com.google.refine.util.ParsingUtilities;
+import com.google.refine.util.TestUtils;
 
 public class GetExpressionLanguageInfoCommandTests extends ExpressionCommandTestBase {
 

main/tests/server/src/com/google/refine/commands/expr/GetStarredExpressionsCommandTests.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.commands.expr;
+package com.google.refine.commands.expr;
 
 import java.io.IOException;
 

main/tests/server/src/com/google/refine/commands/expr/PreviewExpressionCommandTests.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.commands.expr;
+package com.google.refine.commands.expr;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -40,11 +40,11 @@ import javax.servlet.http.HttpServletResponse;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import com.google.refine.RefineTest;
 import com.google.refine.commands.Command;
 import com.google.refine.commands.expr.PreviewExpressionCommand;
 import com.google.refine.model.Project;
-import com.google.refine.tests.RefineTest;
+import com.google.refine.util.TestUtils;
-import com.google.refine.tests.util.TestUtils;
 
 public class PreviewExpressionCommandTests extends RefineTest {
     protected Project project = null;

main/tests/server/src/com/google/refine/commands/expr/ToggleStarredExpressionCommandTests.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.commands.expr;
+package com.google.refine.commands.expr;
 
 import static org.mockito.Mockito.when;
 

main/tests/server/src/com/google/refine/commands/project/SetProjectMetadataCommandTests.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.tests.commands.project;
+package com.google.refine.commands.project;
 
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.mock;
@@ -57,9 +57,9 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.refine.ProjectManager;
 import com.google.refine.ProjectMetadata;
+import com.google.refine.RefineTest;
 import com.google.refine.commands.project.SetProjectMetadataCommand;
 import com.google.refine.model.Project;
-import com.google.refine.tests.RefineTest;
 import com.google.refine.util.ParsingUtilities;
 
 public class SetProjectMetadataCommandTests extends RefineTest {

main/tests/server/src/com/google/refine/commands/recon/ReconJudgeOneCellCommandTest.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.commands.recon;
+package com.google.refine.commands.recon;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -42,6 +42,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import com.google.refine.ProjectManager;
+import com.google.refine.RefineTest;
 import com.google.refine.commands.Command;
 import com.google.refine.commands.recon.ReconJudgeOneCellCommand;
 import com.google.refine.model.Cell;
@@ -50,7 +51,6 @@ import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
 import com.google.refine.model.recon.ReconConfig;
 import com.google.refine.model.recon.StandardReconConfig;
-import com.google.refine.tests.RefineTest;
 
 public class ReconJudgeOneCellCommandTest extends RefineTest {
         

main/tests/server/src/com/google/refine/commands/row/GetRowsCommandTest.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.commands.row;
+package com.google.refine.commands.row;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -40,11 +40,11 @@ import javax.servlet.http.HttpServletResponse;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import com.google.refine.RefineTest;
 import com.google.refine.commands.Command;
 import com.google.refine.commands.row.GetRowsCommand;
 import com.google.refine.model.Project;
-import com.google.refine.tests.RefineTest;
+import com.google.refine.util.TestUtils;
-import com.google.refine.tests.util.TestUtils;
 
 public class GetRowsCommandTest extends RefineTest {
     

main/tests/server/src/com/google/refine/commands/util/CancelProcessesCommandTests.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.tests.commands.util;
+package com.google.refine.commands.util;
 
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.mock;
@@ -55,11 +55,11 @@ import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 import com.google.refine.ProjectManager;
+import com.google.refine.RefineTest;
 import com.google.refine.commands.history.CancelProcessesCommand;
 import com.google.refine.model.Project;
 import com.google.refine.process.ProcessManager;
-import com.google.refine.tests.RefineTest;
+import com.google.refine.util.TestUtils;
-import com.google.refine.tests.util.TestUtils;
 
 public class CancelProcessesCommandTests extends RefineTest {
 

main/tests/server/src/com/google/refine/exporters/CsvExporterTests.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.tests.exporters;
+package com.google.refine.exporters;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -49,6 +49,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import com.google.refine.RefineTest;
 import com.google.refine.browsing.Engine;
 import com.google.refine.exporters.CsvExporter;
 import com.google.refine.model.Cell;
@@ -56,7 +57,6 @@ import com.google.refine.model.Column;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.tests.RefineTest;
 
 public class CsvExporterTests extends RefineTest {
 

main/tests/server/src/com/google/refine/exporters/HtmlExporterTests.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.tests.exporters;
+package com.google.refine.exporters;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -50,7 +50,9 @@ import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 import com.google.refine.ProjectManager;
+import com.google.refine.ProjectManagerStub;
 import com.google.refine.ProjectMetadata;
+import com.google.refine.RefineTest;
 import com.google.refine.browsing.Engine;
 import com.google.refine.exporters.HtmlTableExporter;
 import com.google.refine.exporters.WriterExporter;
@@ -59,8 +61,6 @@ import com.google.refine.model.Column;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.tests.ProjectManagerStub;
-import com.google.refine.tests.RefineTest;
 
 public class HtmlExporterTests extends RefineTest {
 

main/tests/server/src/com/google/refine/exporters/TemplatingExporterTests.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.tests.exporters;
+package com.google.refine.exporters;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -48,7 +48,9 @@ import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 import com.google.refine.ProjectManager;
+import com.google.refine.ProjectManagerStub;
 import com.google.refine.ProjectMetadata;
+import com.google.refine.RefineTest;
 import com.google.refine.browsing.Engine;
 import com.google.refine.exporters.TemplatingExporter;
 import com.google.refine.exporters.WriterExporter;
@@ -57,8 +59,6 @@ import com.google.refine.model.Column;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.tests.ProjectManagerStub;
-import com.google.refine.tests.RefineTest;
 
 public class TemplatingExporterTests extends RefineTest {
 

main/tests/server/src/com/google/refine/exporters/TsvExporterTests.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.tests.exporters;
+package com.google.refine.exporters;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -49,6 +49,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import com.google.refine.RefineTest;
 import com.google.refine.browsing.Engine;
 import com.google.refine.exporters.CsvExporter;
 import com.google.refine.model.Cell;
@@ -56,7 +57,6 @@ import com.google.refine.model.Column;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.tests.RefineTest;
 
 public class TsvExporterTests extends RefineTest {
 

main/tests/server/src/com/google/refine/exporters/XlsExporterTests.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.tests.exporters;
+package com.google.refine.exporters;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -51,7 +51,9 @@ import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 import com.google.refine.ProjectManager;
+import com.google.refine.ProjectManagerStub;
 import com.google.refine.ProjectMetadata;
+import com.google.refine.RefineTest;
 import com.google.refine.browsing.Engine;
 import com.google.refine.exporters.StreamExporter;
 import com.google.refine.exporters.XlsExporter;
@@ -60,8 +62,6 @@ import com.google.refine.model.Column;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.tests.ProjectManagerStub;
-import com.google.refine.tests.RefineTest;
 
 public class XlsExporterTests extends RefineTest {
 

main/tests/server/src/com/google/refine/exporters/XlsxExporterTests.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.tests.exporters;
+package com.google.refine.exporters;
 
 import java.io.ByteArrayInputStream;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -54,7 +54,9 @@ import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 import com.google.refine.ProjectManager;
+import com.google.refine.ProjectManagerStub;
 import com.google.refine.ProjectMetadata;
+import com.google.refine.RefineTest;
 import com.google.refine.browsing.Engine;
 import com.google.refine.exporters.StreamExporter;
 import com.google.refine.exporters.XlsExporter;
@@ -63,8 +65,6 @@ import com.google.refine.model.Column;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.tests.ProjectManagerStub;
-import com.google.refine.tests.RefineTest;
 
 public class XlsxExporterTests extends RefineTest {
 

main/tests/server/src/com/google/refine/exporters/sql/SqlExporterTests.java

@@ -31,9 +31,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.tests.exporters.sql;
+package com.google.refine.exporters.sql;
 
-import static org.junit.Assert.assertNotEquals;
+import static org.testng.Assert.assertNotEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -56,7 +56,9 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.refine.ProjectManager;
+import com.google.refine.ProjectManagerStub;
 import com.google.refine.ProjectMetadata;
+import com.google.refine.RefineTest;
 import com.google.refine.browsing.Engine;
 import com.google.refine.exporters.sql.SqlCreateBuilder;
 import com.google.refine.exporters.sql.SqlData;
@@ -67,8 +69,6 @@ import com.google.refine.model.Column;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.tests.ProjectManagerStub;
-import com.google.refine.tests.RefineTest;
 import com.google.refine.util.ParsingUtilities;
 
 

main/tests/server/src/com/google/refine/expr/EvalErrorTests.java

@@ -24,12 +24,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr;
+package com.google.refine.expr;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.expr.EvalError;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class EvalErrorTests {
     @Test

main/tests/server/src/com/google/refine/expr/ExpressionUtilsTests.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
  
-package com.google.refine.tests.expr.functions;
+package com.google.refine.expr;
 
 
 import org.slf4j.LoggerFactory;
@@ -39,8 +39,8 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import com.google.refine.RefineTest;
 import com.google.refine.expr.ExpressionUtils;
-import com.google.refine.tests.RefineTest;
 
 
 public class ExpressionUtilsTests extends RefineTest {

main/tests/server/src/com/google/refine/expr/functions/CoalesceTests.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  */
 
-package com.google.refine.tests.expr.functions;
+package com.google.refine.expr.functions;
 
 import java.util.Properties;
 
@@ -42,12 +42,12 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import com.google.refine.RefineTest;
 import com.google.refine.expr.EvalError;
 import com.google.refine.expr.functions.Coalesce;
 import com.google.refine.grel.ControlFunctionRegistry;
 import com.google.refine.grel.Function;
-import com.google.refine.tests.RefineTest;
+import com.google.refine.util.TestUtils;
-import com.google.refine.tests.util.TestUtils;
 
 
 public class CoalesceTests extends RefineTest {

main/tests/server/src/com/google/refine/expr/functions/CrossTests.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions;
+package com.google.refine.expr.functions;
 
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
@@ -37,23 +37,22 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.google.refine.ProjectManager;
+import com.google.refine.RefineTest;
 import com.google.refine.expr.EvalError;
 import com.google.refine.expr.HasFieldsListImpl;
-import com.google.refine.expr.WrappedRow;
 import com.google.refine.expr.WrappedCell;
+import com.google.refine.expr.WrappedRow;
 import com.google.refine.grel.ControlFunctionRegistry;
 import com.google.refine.grel.Function;
+import com.google.refine.model.Cell;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.model.Cell;
+import com.google.refine.util.TestUtils;
-import com.google.refine.tests.RefineTest;
-import com.google.refine.util.GetProjectIDException;
 
 /**
  * Test cases for cross function.
  */
-public class CrossFunctionTests extends RefineTest {
+public class CrossTests extends RefineTest {
     static Properties bindings;
     private static OffsetDateTime dateTimeValue = OffsetDateTime.parse("2017-05-12T05:45:00+00:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME);
     
@@ -232,4 +231,11 @@ public class CrossFunctionTests extends RefineTest {
             return function.call(bindings,args);
         }
     }
+    
+    @Test
+    public void serializeCross() {
+        String json = "{\"description\":\"join with another project by column\",\"params\":\"cell c or string value, string projectName, string columnName\",\"returns\":\"array\"}";
+        TestUtils.isSerializedTo(new Cross(), json);
     }
+}
+

main/tests/server/src/com/google/refine/expr/functions/FacetCountTests.java

@@ -24,12 +24,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions;
+package com.google.refine.expr.functions;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.expr.functions.FacetCount;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class FacetCountTests {
     @Test

main/tests/server/src/com/google/refine/expr/functions/GetTests.java

@@ -24,12 +24,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions;
+package com.google.refine.expr.functions;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.expr.functions.Get;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class GetTests {
     @Test

main/tests/server/src/com/google/refine/expr/functions/HasFieldTests.java

@@ -24,12 +24,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions;
+package com.google.refine.expr.functions;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.expr.functions.HasField;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class HasFieldTests {
     @Test

main/tests/server/src/com/google/refine/expr/functions/JsonizeTests.java

@@ -24,12 +24,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions;
+package com.google.refine.expr.functions;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.expr.functions.Jsonize;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class JsonizeTests {
     @Test

main/tests/server/src/com/google/refine/expr/functions/LengthTests.java

@@ -24,12 +24,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions;
+package com.google.refine.expr.functions;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.expr.functions.Length;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class LengthTests {
     @Test

main/tests/server/src/com/google/refine/expr/functions/SliceTests.java

@@ -24,12 +24,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions;
+package com.google.refine.expr.functions;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.expr.functions.Slice;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class SliceTests {
     @Test

main/tests/server/src/com/google/refine/expr/functions/ToDateTests.java

@@ -24,12 +24,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions;
+package com.google.refine.expr.functions;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.expr.functions.ToDate;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class ToDateTests {
     @Test

main/tests/server/src/com/google/refine/expr/functions/ToNumberTests.java

@@ -24,12 +24,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions;
+package com.google.refine.expr.functions;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.expr.functions.ToNumber;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class ToNumberTests {
     @Test

main/tests/server/src/com/google/refine/expr/functions/ToStringTests.java

@@ -24,12 +24,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions;
+package com.google.refine.expr.functions;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.expr.functions.ToString;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class ToStringTests {
     @Test

main/tests/server/src/com/google/refine/expr/functions/TypeTests.java

@@ -24,12 +24,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions;
+package com.google.refine.expr.functions;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.expr.functions.Type;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class TypeTests {
     @Test

main/tests/server/src/com/google/refine/expr/functions/arrays/InArrayTests.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions.arrays;
+package com.google.refine.expr.functions.arrays;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.Arrays;
@@ -37,13 +37,12 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
-
+import com.google.refine.RefineTest;
 import com.google.refine.expr.EvalError;
 import com.google.refine.expr.functions.arrays.InArray;
 import com.google.refine.grel.ControlFunctionRegistry;
 import com.google.refine.grel.Function;
-import com.google.refine.tests.RefineTest;
+import com.google.refine.util.TestUtils;
-import com.google.refine.tests.util.TestUtils;
 
 public class InArrayTests extends RefineTest {
     

main/tests/server/src/com/google/refine/expr/functions/arrays/JoinTests.java

@@ -24,12 +24,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions.arrays;
+package com.google.refine.expr.functions.arrays;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.expr.functions.arrays.Join;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class JoinTests {
     @Test

main/tests/server/src/com/google/refine/expr/functions/arrays/ReverseTests.java

@@ -24,12 +24,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions.arrays;
+package com.google.refine.expr.functions.arrays;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.expr.functions.arrays.Reverse;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class ReverseTests {
     @Test

main/tests/server/src/com/google/refine/expr/functions/arrays/SortTests.java

@@ -24,12 +24,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions.arrays;
+package com.google.refine.expr.functions.arrays;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.expr.functions.arrays.Sort;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class SortTests {
     @Test

main/tests/server/src/com/google/refine/expr/functions/arrays/UniquesTests.java

@@ -24,12 +24,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions.arrays;
+package com.google.refine.expr.functions.arrays;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.expr.functions.arrays.Uniques;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class UniquesTests {
     @Test

main/tests/server/src/com/google/refine/expr/functions/booleans/AndTests.java

@@ -24,12 +24,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions.booleans;
+package com.google.refine.expr.functions.booleans;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.expr.functions.booleans.And;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class AndTests {
     @Test

main/tests/server/src/com/google/refine/expr/functions/booleans/BooleanTests.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  */
 
-package com.google.refine.tests.expr.functions.booleans;
+package com.google.refine.expr.functions.booleans;
 
 import java.io.IOException;
 import java.util.Properties;
@@ -43,6 +43,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import com.google.refine.RefineTest;
 import com.google.refine.expr.EvalError;
 import com.google.refine.grel.ControlFunctionRegistry;
 import com.google.refine.grel.Function;
@@ -50,7 +51,6 @@ import com.google.refine.model.Cell;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.tests.RefineTest;
 
 
 public class BooleanTests extends RefineTest {

main/tests/server/src/com/google/refine/expr/functions/booleans/NotTests.java

@@ -24,12 +24,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions.booleans;
+package com.google.refine.expr.functions.booleans;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.expr.functions.booleans.Not;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class NotTests {
     @Test

main/tests/server/src/com/google/refine/expr/functions/booleans/OrTests.java

@@ -24,12 +24,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions.booleans;
+package com.google.refine.expr.functions.booleans;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.expr.functions.booleans.Or;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class OrTests {
     @Test

main/tests/server/src/com/google/refine/expr/functions/booleans/XorTests.java

@@ -24,12 +24,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions.booleans;
+package com.google.refine.expr.functions.booleans;
 
 import org.testng.annotations.Test;
 
 import com.google.refine.expr.functions.booleans.Xor;
-import com.google.refine.tests.util.TestUtils;
+import com.google.refine.util.TestUtils;
 
 public class XorTests {
     @Test

main/tests/server/src/com/google/refine/expr/functions/date/DatePartTests.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions.date;
+package com.google.refine.expr.functions.date;
 
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
@@ -40,11 +40,11 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import com.google.refine.RefineTest;
 import com.google.refine.expr.functions.date.DatePart;
 import com.google.refine.grel.ControlFunctionRegistry;
 import com.google.refine.grel.Function;
-import com.google.refine.tests.RefineTest;
+import com.google.refine.util.TestUtils;
-import com.google.refine.tests.util.TestUtils;
 
 
 public class DatePartTests extends RefineTest {

main/tests/server/src/com/google/refine/expr/functions/date/IncTests.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions.date;
+package com.google.refine.expr.functions.date;
 
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
@@ -38,12 +38,12 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import com.google.refine.RefineTest;
 import com.google.refine.expr.EvalError;
 import com.google.refine.expr.functions.date.Inc;
 import com.google.refine.grel.ControlFunctionRegistry;
 import com.google.refine.grel.Function;
-import com.google.refine.tests.RefineTest;
+import com.google.refine.util.TestUtils;
-import com.google.refine.tests.util.TestUtils;
 
 
 public class IncTests extends RefineTest {

main/tests/server/src/com/google/refine/expr/functions/date/NowTests.java

@@ -24,7 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.tests.expr.functions.date;
+package com.google.refine.expr.functions.date;
 
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
@@ -37,11 +37,11 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import com.google.refine.RefineTest;
 import com.google.refine.expr.functions.date.Now;
 import com.google.refine.grel.ControlFunctionRegistry;
 import com.google.refine.grel.Function;
-import com.google.refine.tests.RefineTest;
+import com.google.refine.util.TestUtils;
-import com.google.refine.tests.util.TestUtils;
 
 
 public class NowTests extends RefineTest {