diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/CommandTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/CommandTest.java index 5475f75ac..df0265ae8 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/CommandTest.java +++ b/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 { diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/LoginCommandTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/LoginCommandTest.java index 8699ef3a4..36ca6c4bd 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/LoginCommandTest.java +++ b/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; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommandTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommandTest.java index 483b9519a..fc0d0d664 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommandTest.java +++ b/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; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommandTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommandTest.java index 365bb1796..cd981382b 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommandTest.java +++ b/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; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SchemaCommandTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SchemaCommandTest.java index 84e541d00..8af1528cd 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SchemaCommandTest.java +++ b/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; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/EditBatchProcessorTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/EditBatchProcessorTest.java index 94fa52c3e..5bcaf5a87 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/EditBatchProcessorTest.java +++ b/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 { diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/NewItemLibraryTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/NewItemLibraryTest.java index 2a4ae71e4..7cb9d8222 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/NewItemLibraryTest.java +++ b/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 { diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/ReconEntityRewriterTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/ReconEntityRewriterTest.java index 1b1e90266..66c8956eb 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/ReconEntityRewriterTest.java +++ b/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; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QSValuePrinterTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QSValuePrinterTest.java index 77fd15136..8612391f2 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QSValuePrinterTest.java +++ b/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; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QuickStatementsExporterTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QuickStatementsExporterTest.java index 800dfb816..0b4968327 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QuickStatementsExporterTest.java +++ b/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 { diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/SchemaExporterTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/SchemaExporterTest.java index ff875b914..fe535b183 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/SchemaExporterTest.java +++ b/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.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class SchemaExporterTest extends RefineTest { diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/OperationTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/OperationTest.java index 6662ce0aa..ca9f773e7 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/OperationTest.java +++ b/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; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/PerformWikibaseEditsOperationTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/PerformWikibaseEditsOperationTest.java index 7a0e10ab0..c66851fa7 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/PerformWikibaseEditsOperationTest.java +++ b/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; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/SaveWikibaseSchemaOperationTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/SaveWikibaseSchemaOperationTest.java index 8008cb282..13a291c28 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/SaveWikibaseSchemaOperationTest.java +++ b/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.junit.Assert.assertNull; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; import java.io.LineNumberReader; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/QAWarningStoreTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/QAWarningStoreTest.java index 39388e539..9306ca3f6 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/QAWarningStoreTest.java +++ b/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; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/QAWarningTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/QAWarningTest.java index eaa12e24c..4ab900164 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/QAWarningTest.java +++ b/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; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ScrutinizerTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ScrutinizerTest.java index 2978bd02c..346ffadd5 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ScrutinizerTest.java +++ b/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.junit.Assert.assertTrue; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; import java.util.Arrays; import java.util.Set; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/ExpressionContextTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/ExpressionContextTest.java index de05e3480..98486812b 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/ExpressionContextTest.java +++ b/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.junit.Assert.assertNull; +import static org.testng.Assert.assertEquals; +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 { diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbExpressionTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbExpressionTest.java index 99b015951..97e69a9ce 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbExpressionTest.java +++ b/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 extends RefineTest { diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLanguageConstantTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLanguageConstantTest.java index 7248bbb31..07071c352 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLanguageConstantTest.java +++ b/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.junit.Assert.assertNull; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; import org.openrefine.wikidata.testing.JacksonSerializationTest; import org.testng.annotations.Test; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLocationConstantTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLocationConstantTest.java index a53b8b9e3..640e1a95e 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLocationConstantTest.java +++ b/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; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbNameDescExprTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbNameDescExprTest.java index ef72d5c6e..51ed2ab27 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbNameDescExprTest.java +++ b/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; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbQuantityExprTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbQuantityExprTest.java index 97676504c..ae7ca5d37 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbQuantityExprTest.java +++ b/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; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStatementExprTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStatementExprTest.java index 7f9a1491c..17ee758b5 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStatementExprTest.java +++ b/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; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WikibaseSchemaTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WikibaseSchemaTest.java index f342e4c73..f5965c338 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WikibaseSchemaTest.java +++ b/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.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class WikibaseSchemaTest extends RefineTest { diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/entityvalues/ReconEntityIdValueTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/entityvalues/ReconEntityIdValueTest.java index d8cfddad6..f0805c423 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/entityvalues/ReconEntityIdValueTest.java +++ b/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.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotEquals; +import static org.testng.Assert.assertTrue; import java.util.Collections; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/JacksonSerializationTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/JacksonSerializationTest.java index b8d41e788..72fc70933 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/JacksonSerializationTest.java +++ b/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 { diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/ItemUpdateTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/ItemUpdateTest.java index 2aef6295c..2ec78301b 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/ItemUpdateTest.java +++ b/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.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotEquals; +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 { diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/PointerExtractorTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/PointerExtractorTest.java index 5671c173e..b13c83c73 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/PointerExtractorTest.java +++ b/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; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/QuickStatementsUpdateSchedulerTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/QuickStatementsUpdateSchedulerTest.java index 8b72a66af..e96a02847 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/QuickStatementsUpdateSchedulerTest.java +++ b/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; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/UpdateSchedulerTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/UpdateSchedulerTest.java index 5c68f1374..decbdba48 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/UpdateSchedulerTest.java +++ b/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; diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/WikibaseAPIUpdateSchedulerTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/WikibaseAPIUpdateSchedulerTest.java index d9fec8c72..3a44fc82f 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/WikibaseAPIUpdateSchedulerTest.java +++ b/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; diff --git a/main/pom.xml b/main/pom.xml index 0406a1325..2b0b7d90f 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -458,24 +458,6 @@ 2.23.4 test - - junit - junit - 4.12 - test - - - org.powermock - powermock-module-junit4 - 1.7.1 - test - - - org.powermock - powermock-api-mockito2 - 1.7.1 - test - javax.xml.bind jaxb-api diff --git a/main/tests/server/conf/tests.xml b/main/tests/server/conf/tests.xml index 4874cfd11..dfe3ec0d3 100644 --- a/main/tests/server/conf/tests.xml +++ b/main/tests/server/conf/tests.xml @@ -34,7 +34,7 @@ - + diff --git a/main/tests/server/src/com/google/refine/tests/HistoryEntryManagerStub.java b/main/tests/server/src/com/google/refine/HistoryEntryManagerStub.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/HistoryEntryManagerStub.java rename to main/tests/server/src/com/google/refine/HistoryEntryManagerStub.java index 0ec2e6c68..65bb5acc0 100644 --- a/main/tests/server/src/com/google/refine/tests/HistoryEntryManagerStub.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/ProjectManagerStub.java b/main/tests/server/src/com/google/refine/ProjectManagerStub.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/ProjectManagerStub.java rename to main/tests/server/src/com/google/refine/ProjectManagerStub.java index 4c3ee3e86..9c111d568 100644 --- a/main/tests/server/src/com/google/refine/tests/ProjectManagerStub.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/ProjectManagerTests.java b/main/tests/server/src/com/google/refine/ProjectManagerTests.java similarity index 99% rename from main/tests/server/src/com/google/refine/tests/ProjectManagerTests.java rename to main/tests/server/src/com/google/refine/ProjectManagerTests.java index 0f356f7e5..a5d539646 100644 --- a/main/tests/server/src/com/google/refine/tests/ProjectManagerTests.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/RefineServletStub.java b/main/tests/server/src/com/google/refine/RefineServletStub.java similarity index 99% rename from main/tests/server/src/com/google/refine/tests/RefineServletStub.java rename to main/tests/server/src/com/google/refine/RefineServletStub.java index b4e7b8516..1049616bf 100644 --- a/main/tests/server/src/com/google/refine/tests/RefineServletStub.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/RefineServletTests.java b/main/tests/server/src/com/google/refine/RefineServletTests.java similarity index 99% rename from main/tests/server/src/com/google/refine/tests/RefineServletTests.java rename to main/tests/server/src/com/google/refine/RefineServletTests.java index 5b1362c6c..6eba1997e 100644 --- a/main/tests/server/src/com/google/refine/tests/RefineServletTests.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/RefineTest.java b/main/tests/server/src/com/google/refine/RefineTest.java similarity index 99% rename from main/tests/server/src/com/google/refine/tests/RefineTest.java rename to main/tests/server/src/com/google/refine/RefineTest.java index 4cb5192ee..95610a354 100644 --- a/main/tests/server/src/com/google/refine/tests/RefineTest.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/browsing/DecoratedValueTests.java b/main/tests/server/src/com/google/refine/browsing/DecoratedValueTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/browsing/DecoratedValueTests.java rename to main/tests/server/src/com/google/refine/browsing/DecoratedValueTests.java index dde03447d..b6bf06d23 100644 --- a/main/tests/server/src/com/google/refine/tests/browsing/DecoratedValueTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/browsing/facets/EngineConfigTests.java b/main/tests/server/src/com/google/refine/browsing/EngineConfigTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/browsing/facets/EngineConfigTests.java rename to main/tests/server/src/com/google/refine/browsing/EngineConfigTests.java index 9c53f6d51..57cb2a18c 100644 --- a/main/tests/server/src/com/google/refine/tests/browsing/facets/EngineConfigTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/browsing/EngineTests.java b/main/tests/server/src/com/google/refine/browsing/EngineTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/browsing/EngineTests.java rename to main/tests/server/src/com/google/refine/browsing/EngineTests.java index 76f58522c..179932dbe 100644 --- a/main/tests/server/src/com/google/refine/tests/browsing/EngineTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/browsing/facets/ListFacetTests.java b/main/tests/server/src/com/google/refine/browsing/facets/ListFacetTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/browsing/facets/ListFacetTests.java rename to main/tests/server/src/com/google/refine/browsing/facets/ListFacetTests.java index fac4465e7..adc61ddf7 100644 --- a/main/tests/server/src/com/google/refine/tests/browsing/facets/ListFacetTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/browsing/facets/NominalFacetChoiceTests.java b/main/tests/server/src/com/google/refine/browsing/facets/NominalFacetChoiceTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/browsing/facets/NominalFacetChoiceTests.java rename to main/tests/server/src/com/google/refine/browsing/facets/NominalFacetChoiceTests.java index cdc6472f6..2d7fd5b63 100644 --- a/main/tests/server/src/com/google/refine/tests/browsing/facets/NominalFacetChoiceTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/browsing/facets/RangeFacetTests.java b/main/tests/server/src/com/google/refine/browsing/facets/RangeFacetTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/browsing/facets/RangeFacetTests.java rename to main/tests/server/src/com/google/refine/browsing/facets/RangeFacetTests.java index e9e3d94fe..465daf065 100644 --- a/main/tests/server/src/com/google/refine/tests/browsing/facets/RangeFacetTests.java +++ b/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" + diff --git a/main/tests/server/src/com/google/refine/tests/browsing/facets/ScatterplotFacetTests.java b/main/tests/server/src/com/google/refine/browsing/facets/ScatterplotFacetTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/browsing/facets/ScatterplotFacetTests.java rename to main/tests/server/src/com/google/refine/browsing/facets/ScatterplotFacetTests.java index 19836ebf0..2b2de40ba 100644 --- a/main/tests/server/src/com/google/refine/tests/browsing/facets/ScatterplotFacetTests.java +++ b/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" + diff --git a/main/tests/server/src/com/google/refine/tests/browsing/facets/TextSearchFacetTests.java b/main/tests/server/src/com/google/refine/browsing/facets/TextSearchFacetTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/browsing/facets/TextSearchFacetTests.java rename to main/tests/server/src/com/google/refine/browsing/facets/TextSearchFacetTests.java index 1bfd814ec..f2181707e 100644 --- a/main/tests/server/src/com/google/refine/tests/browsing/facets/TextSearchFacetTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/browsing/facets/TimeRangeFacetTests.java b/main/tests/server/src/com/google/refine/browsing/facets/TimeRangeFacetTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/browsing/facets/TimeRangeFacetTests.java rename to main/tests/server/src/com/google/refine/browsing/facets/TimeRangeFacetTests.java index 6d2f93dcf..3137011e3 100644 --- a/main/tests/server/src/com/google/refine/tests/browsing/facets/TimeRangeFacetTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/browsing/util/ExpressionNominalValueGrouperTests.java b/main/tests/server/src/com/google/refine/browsing/util/ExpressionNominalValueGrouperTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/browsing/util/ExpressionNominalValueGrouperTests.java rename to main/tests/server/src/com/google/refine/browsing/util/ExpressionNominalValueGrouperTests.java index 2fd380f19..b9d37bef8 100644 --- a/main/tests/server/src/com/google/refine/tests/browsing/util/ExpressionNominalValueGrouperTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/clustering/BinningClustererTests.java b/main/tests/server/src/com/google/refine/clustering/binning/BinningClustererTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/clustering/BinningClustererTests.java rename to main/tests/server/src/com/google/refine/clustering/binning/BinningClustererTests.java index 5d2767a00..6a4c3f916 100644 --- a/main/tests/server/src/com/google/refine/tests/clustering/BinningClustererTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/clustering/binning/KeyerTests.java b/main/tests/server/src/com/google/refine/clustering/binning/KeyerTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/clustering/binning/KeyerTests.java rename to main/tests/server/src/com/google/refine/clustering/binning/KeyerTests.java index 12604439b..77d6cf48e 100644 --- a/main/tests/server/src/com/google/refine/tests/clustering/binning/KeyerTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/clustering/kNNClustererTests.java b/main/tests/server/src/com/google/refine/clustering/knn/kNNClustererTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/clustering/kNNClustererTests.java rename to main/tests/server/src/com/google/refine/clustering/knn/kNNClustererTests.java index 9cedb0ab2..743d03f0a 100644 --- a/main/tests/server/src/com/google/refine/tests/clustering/kNNClustererTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/commands/CommandStub.java b/main/tests/server/src/com/google/refine/commands/CommandStub.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/commands/CommandStub.java rename to main/tests/server/src/com/google/refine/commands/CommandStub.java index f30531ddd..8a1009204 100644 --- a/main/tests/server/src/com/google/refine/tests/commands/CommandStub.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/commands/CommandTests.java b/main/tests/server/src/com/google/refine/commands/CommandTests.java similarity index 99% rename from main/tests/server/src/com/google/refine/tests/commands/CommandTests.java rename to main/tests/server/src/com/google/refine/commands/CommandTests.java index 8cea786be..9e6b825a0 100644 --- a/main/tests/server/src/com/google/refine/tests/commands/CommandTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/commands/browsing/GetClusteringFunctionsAndDistancesCommandTest.java b/main/tests/server/src/com/google/refine/commands/browsing/GetClusteringFunctionsAndDistancesCommandTest.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/commands/browsing/GetClusteringFunctionsAndDistancesCommandTest.java rename to main/tests/server/src/com/google/refine/commands/browsing/GetClusteringFunctionsAndDistancesCommandTest.java index 9faa5bf05..257ebcfc2 100644 --- a/main/tests/server/src/com/google/refine/tests/commands/browsing/GetClusteringFunctionsAndDistancesCommandTest.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/commands/expr/ExpressionCommandTestBase.java b/main/tests/server/src/com/google/refine/commands/expr/ExpressionCommandTestBase.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/commands/expr/ExpressionCommandTestBase.java rename to main/tests/server/src/com/google/refine/commands/expr/ExpressionCommandTestBase.java index a8bfb0617..8093431fb 100644 --- a/main/tests/server/src/com/google/refine/tests/commands/expr/ExpressionCommandTestBase.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/commands/expr/GetExpressionHistoryCommandTests.java b/main/tests/server/src/com/google/refine/commands/expr/GetExpressionHistoryCommandTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/commands/expr/GetExpressionHistoryCommandTests.java rename to main/tests/server/src/com/google/refine/commands/expr/GetExpressionHistoryCommandTests.java index ecc6ed1ce..b7b6fb0d1 100644 --- a/main/tests/server/src/com/google/refine/tests/commands/expr/GetExpressionHistoryCommandTests.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/commands/expr/GetExpressionLanguageInfoCommandTests.java b/main/tests/server/src/com/google/refine/commands/expr/GetExpressionLanguageInfoCommandTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/commands/expr/GetExpressionLanguageInfoCommandTests.java rename to main/tests/server/src/com/google/refine/commands/expr/GetExpressionLanguageInfoCommandTests.java index 64dfc8ef1..bf4688efe 100644 --- a/main/tests/server/src/com/google/refine/tests/commands/expr/GetExpressionLanguageInfoCommandTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/commands/expr/GetStarredExpressionsCommandTests.java b/main/tests/server/src/com/google/refine/commands/expr/GetStarredExpressionsCommandTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/commands/expr/GetStarredExpressionsCommandTests.java rename to main/tests/server/src/com/google/refine/commands/expr/GetStarredExpressionsCommandTests.java index 3137ffd6c..9ebb0ebeb 100644 --- a/main/tests/server/src/com/google/refine/tests/commands/expr/GetStarredExpressionsCommandTests.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/commands/expr/PreviewExpressionCommandTests.java b/main/tests/server/src/com/google/refine/commands/expr/PreviewExpressionCommandTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/commands/expr/PreviewExpressionCommandTests.java rename to main/tests/server/src/com/google/refine/commands/expr/PreviewExpressionCommandTests.java index 834c028da..9581ab07a 100644 --- a/main/tests/server/src/com/google/refine/tests/commands/expr/PreviewExpressionCommandTests.java +++ b/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.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class PreviewExpressionCommandTests extends RefineTest { protected Project project = null; diff --git a/main/tests/server/src/com/google/refine/tests/commands/expr/ToggleStarredExpressionCommandTests.java b/main/tests/server/src/com/google/refine/commands/expr/ToggleStarredExpressionCommandTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/commands/expr/ToggleStarredExpressionCommandTests.java rename to main/tests/server/src/com/google/refine/commands/expr/ToggleStarredExpressionCommandTests.java index ffb6200aa..2b8376db4 100644 --- a/main/tests/server/src/com/google/refine/tests/commands/expr/ToggleStarredExpressionCommandTests.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/commands/project/SetProjectMetadataCommandTests.java b/main/tests/server/src/com/google/refine/commands/project/SetProjectMetadataCommandTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/commands/project/SetProjectMetadataCommandTests.java rename to main/tests/server/src/com/google/refine/commands/project/SetProjectMetadataCommandTests.java index c88ad23b8..3771bd05a 100644 --- a/main/tests/server/src/com/google/refine/tests/commands/project/SetProjectMetadataCommandTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/commands/recon/ReconJudgeOneCellCommandTest.java b/main/tests/server/src/com/google/refine/commands/recon/ReconJudgeOneCellCommandTest.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/commands/recon/ReconJudgeOneCellCommandTest.java rename to main/tests/server/src/com/google/refine/commands/recon/ReconJudgeOneCellCommandTest.java index 775b819fa..3dc741b6b 100644 --- a/main/tests/server/src/com/google/refine/tests/commands/recon/ReconJudgeOneCellCommandTest.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/commands/row/GetRowsCommandTest.java b/main/tests/server/src/com/google/refine/commands/row/GetRowsCommandTest.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/commands/row/GetRowsCommandTest.java rename to main/tests/server/src/com/google/refine/commands/row/GetRowsCommandTest.java index 72bed2064..b211d4796 100644 --- a/main/tests/server/src/com/google/refine/tests/commands/row/GetRowsCommandTest.java +++ b/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.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class GetRowsCommandTest extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/commands/util/CancelProcessesCommandTests.java b/main/tests/server/src/com/google/refine/commands/util/CancelProcessesCommandTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/commands/util/CancelProcessesCommandTests.java rename to main/tests/server/src/com/google/refine/commands/util/CancelProcessesCommandTests.java index 45d5356ab..03cd8c70c 100644 --- a/main/tests/server/src/com/google/refine/tests/commands/util/CancelProcessesCommandTests.java +++ b/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.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class CancelProcessesCommandTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/exporters/CsvExporterTests.java b/main/tests/server/src/com/google/refine/exporters/CsvExporterTests.java similarity index 99% rename from main/tests/server/src/com/google/refine/tests/exporters/CsvExporterTests.java rename to main/tests/server/src/com/google/refine/exporters/CsvExporterTests.java index 2319e1668..e8ca2b772 100644 --- a/main/tests/server/src/com/google/refine/tests/exporters/CsvExporterTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/exporters/HtmlExporterTests.java b/main/tests/server/src/com/google/refine/exporters/HtmlExporterTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/exporters/HtmlExporterTests.java rename to main/tests/server/src/com/google/refine/exporters/HtmlExporterTests.java index 4c49d075d..0b3eb5ac8 100644 --- a/main/tests/server/src/com/google/refine/tests/exporters/HtmlExporterTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/exporters/TemplatingExporterTests.java b/main/tests/server/src/com/google/refine/exporters/TemplatingExporterTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/exporters/TemplatingExporterTests.java rename to main/tests/server/src/com/google/refine/exporters/TemplatingExporterTests.java index d9830a067..768264c59 100644 --- a/main/tests/server/src/com/google/refine/tests/exporters/TemplatingExporterTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/exporters/TsvExporterTests.java b/main/tests/server/src/com/google/refine/exporters/TsvExporterTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/exporters/TsvExporterTests.java rename to main/tests/server/src/com/google/refine/exporters/TsvExporterTests.java index c084c1c14..7a81be605 100644 --- a/main/tests/server/src/com/google/refine/tests/exporters/TsvExporterTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/exporters/XlsExporterTests.java b/main/tests/server/src/com/google/refine/exporters/XlsExporterTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/exporters/XlsExporterTests.java rename to main/tests/server/src/com/google/refine/exporters/XlsExporterTests.java index 53060e916..221ce30a3 100644 --- a/main/tests/server/src/com/google/refine/tests/exporters/XlsExporterTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/exporters/XlsxExporterTests.java b/main/tests/server/src/com/google/refine/exporters/XlsxExporterTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/exporters/XlsxExporterTests.java rename to main/tests/server/src/com/google/refine/exporters/XlsxExporterTests.java index af265f947..b8a260ef2 100644 --- a/main/tests/server/src/com/google/refine/tests/exporters/XlsxExporterTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/exporters/sql/SqlExporterTests.java b/main/tests/server/src/com/google/refine/exporters/sql/SqlExporterTests.java similarity index 99% rename from main/tests/server/src/com/google/refine/tests/exporters/sql/SqlExporterTests.java rename to main/tests/server/src/com/google/refine/exporters/sql/SqlExporterTests.java index 9f722d8c5..01cd32755 100644 --- a/main/tests/server/src/com/google/refine/tests/exporters/sql/SqlExporterTests.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/expr/EvalErrorTests.java b/main/tests/server/src/com/google/refine/expr/EvalErrorTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/EvalErrorTests.java rename to main/tests/server/src/com/google/refine/expr/EvalErrorTests.java index 7c3bc7ade..05b9c5493 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/EvalErrorTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/ExpressionUtilsTests.java b/main/tests/server/src/com/google/refine/expr/ExpressionUtilsTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/expr/functions/ExpressionUtilsTests.java rename to main/tests/server/src/com/google/refine/expr/ExpressionUtilsTests.java index 9f371cb12..b6c9e609d 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/ExpressionUtilsTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/CoalesceTests.java b/main/tests/server/src/com/google/refine/expr/functions/CoalesceTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/expr/functions/CoalesceTests.java rename to main/tests/server/src/com/google/refine/expr/functions/CoalesceTests.java index c84bd9d13..04893f12e 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/CoalesceTests.java +++ b/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.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class CoalesceTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/CrossFunctionTests.java b/main/tests/server/src/com/google/refine/expr/functions/CrossTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/CrossFunctionTests.java rename to main/tests/server/src/com/google/refine/expr/functions/CrossTests.java index bae1f6b0f..528822166 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/CrossFunctionTests.java +++ b/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.tests.RefineTest; -import com.google.refine.util.GetProjectIDException; +import com.google.refine.util.TestUtils; /** * 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); + } } + diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/FacetCountTests.java b/main/tests/server/src/com/google/refine/expr/functions/FacetCountTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/FacetCountTests.java rename to main/tests/server/src/com/google/refine/expr/functions/FacetCountTests.java index ba8b10461..e3ac35e0c 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/FacetCountTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/GetTests.java b/main/tests/server/src/com/google/refine/expr/functions/GetTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/GetTests.java rename to main/tests/server/src/com/google/refine/expr/functions/GetTests.java index d265242c9..9ee0fc850 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/GetTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/HasFieldTests.java b/main/tests/server/src/com/google/refine/expr/functions/HasFieldTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/HasFieldTests.java rename to main/tests/server/src/com/google/refine/expr/functions/HasFieldTests.java index 610199508..99f4292cd 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/HasFieldTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/JsonizeTests.java b/main/tests/server/src/com/google/refine/expr/functions/JsonizeTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/JsonizeTests.java rename to main/tests/server/src/com/google/refine/expr/functions/JsonizeTests.java index 264fcf962..bf5dc700e 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/JsonizeTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/LengthTests.java b/main/tests/server/src/com/google/refine/expr/functions/LengthTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/LengthTests.java rename to main/tests/server/src/com/google/refine/expr/functions/LengthTests.java index c6c65e497..74addbbc3 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/LengthTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/SliceTests.java b/main/tests/server/src/com/google/refine/expr/functions/SliceTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/SliceTests.java rename to main/tests/server/src/com/google/refine/expr/functions/SliceTests.java index 4ae6d0cd0..f47c06ad5 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/SliceTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/ToDateTests.java b/main/tests/server/src/com/google/refine/expr/functions/ToDateTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/ToDateTests.java rename to main/tests/server/src/com/google/refine/expr/functions/ToDateTests.java index ab931e9d9..8a9622a78 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/ToDateTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/ToNumberTests.java b/main/tests/server/src/com/google/refine/expr/functions/ToNumberTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/ToNumberTests.java rename to main/tests/server/src/com/google/refine/expr/functions/ToNumberTests.java index 94de11206..e94ba1dd9 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/ToNumberTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/ToStringTests.java b/main/tests/server/src/com/google/refine/expr/functions/ToStringTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/ToStringTests.java rename to main/tests/server/src/com/google/refine/expr/functions/ToStringTests.java index 5e0f62973..7a4111bb8 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/ToStringTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/TypeTests.java b/main/tests/server/src/com/google/refine/expr/functions/TypeTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/TypeTests.java rename to main/tests/server/src/com/google/refine/expr/functions/TypeTests.java index dbcc2b7ba..d007b577c 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/TypeTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/arrays/InArrayTests.java b/main/tests/server/src/com/google/refine/expr/functions/arrays/InArrayTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/expr/functions/arrays/InArrayTests.java rename to main/tests/server/src/com/google/refine/expr/functions/arrays/InArrayTests.java index 32f8314f8..5d3e0dcea 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/arrays/InArrayTests.java +++ b/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.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class InArrayTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/arrays/JoinTests.java b/main/tests/server/src/com/google/refine/expr/functions/arrays/JoinTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/arrays/JoinTests.java rename to main/tests/server/src/com/google/refine/expr/functions/arrays/JoinTests.java index 35a44c1ab..18d7eb100 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/arrays/JoinTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/arrays/ReverseTests.java b/main/tests/server/src/com/google/refine/expr/functions/arrays/ReverseTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/arrays/ReverseTests.java rename to main/tests/server/src/com/google/refine/expr/functions/arrays/ReverseTests.java index 889322af5..9d2a3449a 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/arrays/ReverseTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/arrays/SortTests.java b/main/tests/server/src/com/google/refine/expr/functions/arrays/SortTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/arrays/SortTests.java rename to main/tests/server/src/com/google/refine/expr/functions/arrays/SortTests.java index 3f9835b2f..b9a3b3067 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/arrays/SortTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/arrays/UniquesTests.java b/main/tests/server/src/com/google/refine/expr/functions/arrays/UniquesTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/arrays/UniquesTests.java rename to main/tests/server/src/com/google/refine/expr/functions/arrays/UniquesTests.java index 57b435def..5ef2567dc 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/arrays/UniquesTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/booleans/AndTests.java b/main/tests/server/src/com/google/refine/expr/functions/booleans/AndTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/booleans/AndTests.java rename to main/tests/server/src/com/google/refine/expr/functions/booleans/AndTests.java index 20b812526..4ddb31c97 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/booleans/AndTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/booleans/BooleanTests.java b/main/tests/server/src/com/google/refine/expr/functions/booleans/BooleanTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/expr/functions/booleans/BooleanTests.java rename to main/tests/server/src/com/google/refine/expr/functions/booleans/BooleanTests.java index 7862688c7..0aecb1e05 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/booleans/BooleanTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/booleans/NotTests.java b/main/tests/server/src/com/google/refine/expr/functions/booleans/NotTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/booleans/NotTests.java rename to main/tests/server/src/com/google/refine/expr/functions/booleans/NotTests.java index 72cd738f6..188edd7cc 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/booleans/NotTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/booleans/OrTests.java b/main/tests/server/src/com/google/refine/expr/functions/booleans/OrTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/booleans/OrTests.java rename to main/tests/server/src/com/google/refine/expr/functions/booleans/OrTests.java index 19b402c17..a1e4a2ee1 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/booleans/OrTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/booleans/XorTests.java b/main/tests/server/src/com/google/refine/expr/functions/booleans/XorTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/booleans/XorTests.java rename to main/tests/server/src/com/google/refine/expr/functions/booleans/XorTests.java index 6ace0fa04..f58982162 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/booleans/XorTests.java +++ b/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 diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/date/DatePartTests.java b/main/tests/server/src/com/google/refine/expr/functions/date/DatePartTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/expr/functions/date/DatePartTests.java rename to main/tests/server/src/com/google/refine/expr/functions/date/DatePartTests.java index 4233d3d5a..d480c38c3 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/date/DatePartTests.java +++ b/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.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class DatePartTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/date/IncTests.java b/main/tests/server/src/com/google/refine/expr/functions/date/IncTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/expr/functions/date/IncTests.java rename to main/tests/server/src/com/google/refine/expr/functions/date/IncTests.java index 51484de48..a9e9a8525 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/date/IncTests.java +++ b/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.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class IncTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/date/NowTests.java b/main/tests/server/src/com/google/refine/expr/functions/date/NowTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/expr/functions/date/NowTests.java rename to main/tests/server/src/com/google/refine/expr/functions/date/NowTests.java index 6fcc755ac..45ad6218a 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/date/NowTests.java +++ b/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.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class NowTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/html/InnerHtmlTests.java b/main/tests/server/src/com/google/refine/expr/functions/html/InnerHtmlTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/html/InnerHtmlTests.java rename to main/tests/server/src/com/google/refine/expr/functions/html/InnerHtmlTests.java index 482652daf..7396b0ed4 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/html/InnerHtmlTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/html/InnerHtmlTests.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.html; +package com.google.refine.expr.functions.html; import org.testng.annotations.Test; import com.google.refine.expr.functions.html.InnerHtml; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class InnerHtmlTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/html/ParseHtmlTests.java b/main/tests/server/src/com/google/refine/expr/functions/html/ParseHtmlTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/expr/functions/html/ParseHtmlTests.java rename to main/tests/server/src/com/google/refine/expr/functions/html/ParseHtmlTests.java index 7cc77ec07..7c5294f66 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/html/ParseHtmlTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/html/ParseHtmlTests.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.html; +package com.google.refine.expr.functions.html; import org.jsoup.Jsoup; import org.testng.annotations.Test; @@ -37,12 +37,12 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest; +import com.google.refine.RefineTest; import com.google.refine.expr.EvalError; import com.google.refine.expr.functions.html.ParseHtml; import com.google.refine.grel.ControlFunctionRegistry; import com.google.refine.grel.Function; -import com.google.refine.tests.RefineTest; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ParseHtmlTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/ACosTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/ACosTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/ACosTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/ACosTests.java index f0efaa02a..cc21967af 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/ACosTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/ACosTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.ACos; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ACosTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/ASinTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/ASinTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/ASinTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/ASinTests.java index 3de306741..65e39c948 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/ASinTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/ASinTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.ASin; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ASinTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/ATan2Tests.java b/main/tests/server/src/com/google/refine/expr/functions/math/ATan2Tests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/ATan2Tests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/ATan2Tests.java index e6ee3c7f2..d51cd7ac0 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/ATan2Tests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/ATan2Tests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.ATan2; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ATan2Tests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/ATanTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/ATanTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/ATanTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/ATanTests.java index d2ae86fbf..f837750b4 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/ATanTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/ATanTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.ATan; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ATanTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/AbsTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/AbsTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/AbsTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/AbsTests.java index 660aa6371..139704a4b 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/AbsTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/AbsTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Abs; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class AbsTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/CeilTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/CeilTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/CeilTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/CeilTests.java index 6519c1744..8018bdad6 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/CeilTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/CeilTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Ceil; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class CeilTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/CombinTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/CombinTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/CombinTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/CombinTests.java index e3eea4f77..faff49abe 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/CombinTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/CombinTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Combin; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class CombinTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/CosTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/CosTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/CosTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/CosTests.java index 76445e137..5399d5c24 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/CosTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/CosTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Cos; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class CosTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/CoshTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/CoshTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/CoshTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/CoshTests.java index 67195f24e..f0eb2a59b 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/CoshTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/CoshTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Cosh; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class CoshTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/DegreesTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/DegreesTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/DegreesTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/DegreesTests.java index 62e119939..cb3566de5 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/DegreesTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/DegreesTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Degrees; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class DegreesTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/EvenTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/EvenTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/EvenTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/EvenTests.java index a745d5e97..c37d83bc4 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/EvenTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/EvenTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Even; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class EvenTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/ExpTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/ExpTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/ExpTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/ExpTests.java index 4859339ac..49bff32aa 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/ExpTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/ExpTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Exp; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ExpTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/FactNTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/FactNTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/FactNTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/FactNTests.java index 8e66b99b3..dfc978c0a 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/FactNTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/FactNTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.FactN; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class FactNTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/FactTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/FactTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/FactTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/FactTests.java index dd067591a..2bda56195 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/FactTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/FactTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Fact; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class FactTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/FloorTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/FloorTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/FloorTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/FloorTests.java index b0a9749b6..cb40b4908 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/FloorTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/FloorTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Floor; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class FloorTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/GreatestCommonDenominatorTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/GreatestCommonDenominatorTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/GreatestCommonDenominatorTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/GreatestCommonDenominatorTests.java index 2592c1c65..cba5f3ea6 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/GreatestCommonDenominatorTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/GreatestCommonDenominatorTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.GreatestCommonDenominator; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class GreatestCommonDenominatorTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/LeastCommonMultipleTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/LeastCommonMultipleTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/LeastCommonMultipleTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/LeastCommonMultipleTests.java index 75da5a626..b8c68842d 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/LeastCommonMultipleTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/LeastCommonMultipleTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.LeastCommonMultiple; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class LeastCommonMultipleTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/LnTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/LnTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/LnTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/LnTests.java index db181c130..6b04f27f4 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/LnTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/LnTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Ln; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class LnTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/LogTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/LogTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/LogTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/LogTests.java index ac4a007f2..90d42d404 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/LogTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/LogTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Log; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class LogTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/MaxTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/MaxTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/MaxTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/MaxTests.java index 54bac6815..07a9cec15 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/MaxTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/MaxTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Max; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class MaxTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/MinTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/MinTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/MinTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/MinTests.java index 99035807b..344b3bca0 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/MinTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/MinTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Min; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class MinTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/ModTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/ModTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/ModTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/ModTests.java index 08e249ad4..5c4118d96 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/ModTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/ModTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Mod; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ModTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/MultinomialTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/MultinomialTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/MultinomialTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/MultinomialTests.java index ee59736af..454dad36e 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/MultinomialTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/MultinomialTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Multinomial; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class MultinomialTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/OddTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/OddTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/OddTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/OddTests.java index d8dca3d2c..2202454d7 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/OddTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/OddTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Odd; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class OddTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/PowTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/PowTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/PowTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/PowTests.java index 7fb151ea6..78b53724f 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/PowTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/PowTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Pow; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class PowTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/QuotientTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/QuotientTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/QuotientTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/QuotientTests.java index 19d166f1c..91c7ede2e 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/QuotientTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/QuotientTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Quotient; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class QuotientTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/RadiansTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/RadiansTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/RadiansTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/RadiansTests.java index 1690016d8..6176c7344 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/RadiansTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/RadiansTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Radians; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class RadiansTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/RandomNumberTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/RandomNumberTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/RandomNumberTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/RandomNumberTests.java index 8c67f0995..287611984 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/RandomNumberTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/RandomNumberTests.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.math; +package com.google.refine.expr.functions.math; import java.util.Properties; @@ -34,12 +34,12 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.RandomNumber; +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.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class RandomNumberTests extends RefineTest { static Properties bindings; diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/RoundTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/RoundTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/RoundTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/RoundTests.java index 81398c0a1..ce2a5e83e 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/RoundTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/RoundTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Round; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class RoundTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/SinTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/SinTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/SinTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/SinTests.java index 8e704e782..adb836578 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/SinTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/SinTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Sin; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class SinTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/SinhTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/SinhTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/SinhTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/SinhTests.java index 63d7f039e..e60ede850 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/SinhTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/SinhTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Sinh; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class SinhTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/SumTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/SumTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/SumTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/SumTests.java index 0bff016ca..16f26d411 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/SumTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/SumTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Sum; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class SumTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/TanTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/TanTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/TanTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/TanTests.java index 5ce5ecf27..44bf54c92 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/TanTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/TanTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Tan; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class TanTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/math/TanhTests.java b/main/tests/server/src/com/google/refine/expr/functions/math/TanhTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/math/TanhTests.java rename to main/tests/server/src/com/google/refine/expr/functions/math/TanhTests.java index 0e7019abb..3c622afda 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/math/TanhTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/math/TanhTests.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.math; +package com.google.refine.expr.functions.math; import org.testng.annotations.Test; import com.google.refine.expr.functions.math.Tanh; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class TanhTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ChompTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/ChompTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/ChompTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/ChompTests.java index ae6638699..ea1d47248 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ChompTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/ChompTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.Chomp; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ChompTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/ContainsFunctionTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/ContainsTests.java similarity index 86% rename from main/tests/server/src/com/google/refine/tests/expr/functions/ContainsFunctionTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/ContainsTests.java index 2e953dceb..ea70f882a 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/ContainsFunctionTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/ContainsTests.java @@ -24,7 +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.strings; + +import org.testng.annotations.Test; + +import com.google.refine.expr.functions.strings.Contains; +import com.google.refine.util.TestUtils; import java.util.Properties; import java.util.regex.Pattern; @@ -37,15 +42,16 @@ import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; import com.google.refine.RefineServlet; +import com.google.refine.RefineServletStub; +import com.google.refine.RefineTest; import com.google.refine.grel.ControlFunctionRegistry; import com.google.refine.grel.Function; -import com.google.refine.tests.RefineServletStub; -import com.google.refine.tests.RefineTest; /** * Test cases for find function. */ -public class ContainsFunctionTests extends RefineTest { +public class ContainsTests extends RefineTest { + static Properties bindings; @Override @@ -98,4 +104,11 @@ public class ContainsFunctionTests extends RefineTest { return function.call(bindings,args); } } + + @Test + public void serializeContains() { + String json = "{\"description\":\"Returns whether s contains frag\",\"params\":\"string s, string frag\",\"returns\":\"boolean\"}"; + TestUtils.isSerializedTo(new Contains(), json); + } } + diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/DiffTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/DiffTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/DiffTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/DiffTests.java index d572db4ed..37c5971ff 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/DiffTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/DiffTests.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.strings; +package com.google.refine.expr.functions.strings; 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.strings.Diff; import com.google.refine.grel.ControlFunctionRegistry; import com.google.refine.grel.Function; -import com.google.refine.tests.RefineTest; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class DiffTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/EndsWithTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/EndsWithTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/EndsWithTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/EndsWithTests.java index df8e41900..a8e55b11c 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/EndsWithTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/EndsWithTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.EndsWith; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class EndsWithTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/EscapeTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/EscapeTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/EscapeTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/EscapeTests.java index 31f26bfff..1a5ec4231 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/EscapeTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/EscapeTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.Escape; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class EscapeTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/FindTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/FindTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/FindTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/FindTests.java index 16eeba143..530fffa25 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/FindTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/FindTests.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.strings; +package com.google.refine.expr.functions.strings; import java.util.Properties; import java.util.regex.Pattern; @@ -37,12 +37,12 @@ import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; import com.google.refine.RefineServlet; +import com.google.refine.RefineServletStub; +import com.google.refine.RefineTest; import com.google.refine.expr.functions.strings.Find; import com.google.refine.grel.ControlFunctionRegistry; import com.google.refine.grel.Function; -import com.google.refine.tests.RefineServletStub; -import com.google.refine.tests.RefineTest; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; /** * Test cases for find function. diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/FingerprintTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/FingerprintTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/FingerprintTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/FingerprintTests.java index e1a542450..8fdd2aeed 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/FingerprintTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/FingerprintTests.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.expr.functions.strings; +package com.google.refine.expr.functions.strings; import java.util.Properties; @@ -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.strings.Fingerprint; import com.google.refine.grel.ControlFunctionRegistry; import com.google.refine.grel.Function; -import com.google.refine.tests.RefineTest; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class FingerprintTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/IndexOfTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/IndexOfTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/IndexOfTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/IndexOfTests.java index c83df2183..e430d63ad 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/IndexOfTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/IndexOfTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.IndexOf; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class IndexOfTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/LastIndexOfTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/LastIndexOfTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/LastIndexOfTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/LastIndexOfTests.java index 9f1f1e521..ce4afab09 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/LastIndexOfTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/LastIndexOfTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.LastIndexOf; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class LastIndexOfTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/MD5Tests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/MD5Tests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/MD5Tests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/MD5Tests.java index 87b42d61d..0cb549b63 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/MD5Tests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/MD5Tests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.MD5; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class MD5Tests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/MatchTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/MatchTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/MatchTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/MatchTests.java index 3ca6c773a..482211175 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/MatchTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/MatchTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.Match; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class MatchTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/NGramFingerprintTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/NGramFingerprintTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/NGramFingerprintTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/NGramFingerprintTests.java index d3f8b8fd0..5aca5981c 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/NGramFingerprintTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/NGramFingerprintTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.NGramFingerprint; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class NGramFingerprintTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/NGramTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/NGramTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/NGramTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/NGramTests.java index e9f201983..8d9d31230 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/NGramTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/NGramTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.NGram; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class NGramTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ParseJsonTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/ParseJsonTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/ParseJsonTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/ParseJsonTests.java index 9a88d7699..f33d80626 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ParseJsonTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/ParseJsonTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.ParseJson; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ParseJsonTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/PartitionTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/PartitionTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/PartitionTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/PartitionTests.java index 6c189a26a..ee1e54845 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/PartitionTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/PartitionTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.Partition; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class PartitionTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/PhoneticTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/PhoneticTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/PhoneticTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/PhoneticTests.java index 94a964725..ed2e946c2 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/PhoneticTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/PhoneticTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.Phonetic; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class PhoneticTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/RPartitionTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/RPartitionTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/RPartitionTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/RPartitionTests.java index cf4d01756..ce9342182 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/RPartitionTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/RPartitionTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.RPartition; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class RPartitionTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/RangeTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/RangeTests.java similarity index 99% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/RangeTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/RangeTests.java index 0f6acc47e..7f770ce3a 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/RangeTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/RangeTests.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.strings; +package com.google.refine.expr.functions.strings; import java.util.Properties; @@ -35,12 +35,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.strings.Range; import com.google.refine.grel.ControlFunctionRegistry; import com.google.refine.grel.Function; -import com.google.refine.tests.RefineTest; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; /** * Tests for the range function. diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ReinterpretTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/ReinterpretTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/ReinterpretTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/ReinterpretTests.java index e50a1e3f8..7208430b0 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ReinterpretTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/ReinterpretTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.Reinterpret; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ReinterpretTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ReplaceCharsTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/ReplaceCharsTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/ReplaceCharsTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/ReplaceCharsTests.java index 1ce2f7a6f..7a516182a 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ReplaceCharsTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/ReplaceCharsTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.ReplaceChars; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ReplaceCharsTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ReplaceTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/ReplaceTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/ReplaceTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/ReplaceTests.java index d0f52784b..6df43eb3c 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ReplaceTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/ReplaceTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.Replace; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ReplaceTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/SHA1Tests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/SHA1Tests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/SHA1Tests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/SHA1Tests.java index 3226c12fe..a6e900a50 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/SHA1Tests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/SHA1Tests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.SHA1; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class SHA1Tests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/SmartSplitTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/SmartSplitTests.java similarity index 91% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/SmartSplitTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/SmartSplitTests.java index dc311ced5..077b7955d 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/SmartSplitTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/SmartSplitTests.java @@ -24,9 +24,9 @@ * 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.strings; +package com.google.refine.expr.functions.strings; -import static org.junit.Assert.assertArrayEquals; +import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import java.util.Properties; @@ -36,10 +36,9 @@ import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; import com.google.refine.expr.EvalError; -import com.google.refine.expr.functions.strings.SmartSplit; import com.google.refine.grel.ControlFunctionRegistry; import com.google.refine.grel.Function; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class SmartSplitTests { @@ -66,7 +65,7 @@ public class SmartSplitTests { String testString = "teststring1,teststring2,teststring3,teststring4"; String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" }; String[] actual = (String[]) invoke("smartSplit", testString); - assertArrayEquals(expected, actual); + assertEquals(expected, actual); } @Test @@ -74,7 +73,7 @@ public class SmartSplitTests { String testString = "teststring1 teststring2 teststring3 teststring4"; String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" }; String[] actual = (String[]) invoke("smartSplit", testString); - assertArrayEquals(expected, actual); + assertEquals(expected, actual); } @Test @@ -82,7 +81,7 @@ public class SmartSplitTests { String testString = "teststring1#teststring2#teststring3#teststring4"; String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" }; String[] actual = (String[]) invoke("smartSplit", testString, '#'); - assertArrayEquals(expected, actual); + assertEquals(expected, actual); } @Test @@ -90,7 +89,7 @@ public class SmartSplitTests { String testString = "teststring1 teststring2 teststring3 teststring4"; String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" }; String[] actual = (String[]) invoke("smartSplit", testString, ' '); - assertArrayEquals(expected, actual); + assertEquals(expected, actual); } @Test @@ -98,7 +97,7 @@ public class SmartSplitTests { String testString = "teststring1#@$teststring2#@$teststring3#@$teststring4"; String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" }; String[] actual = (String[]) invoke("smartSplit", testString, "#@$"); - assertArrayEquals(expected, actual); + assertEquals(expected, actual); } /** diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/SplitByCharTypeTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/SplitByCharTypeTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/SplitByCharTypeTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/SplitByCharTypeTests.java index 2d5cf8891..096a8a4fc 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/SplitByCharTypeTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/SplitByCharTypeTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.SplitByCharType; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class SplitByCharTypeTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/SplitByLengthsTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/SplitByLengthsTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/SplitByLengthsTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/SplitByLengthsTests.java index c144093a4..b5e57c342 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/SplitByLengthsTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/SplitByLengthsTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.SplitByLengths; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class SplitByLengthsTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/SplitTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/SplitTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/SplitTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/SplitTests.java index bfd494011..61222615c 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/SplitTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/SplitTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.Split; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class SplitTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/StartsWithTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/StartsWithTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/StartsWithTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/StartsWithTests.java index c35205eeb..8b565d382 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/StartsWithTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/StartsWithTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.StartsWith; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class StartsWithTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/StringCaseTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/StringCaseTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/StringCaseTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/StringCaseTests.java index 041880f97..743115f6c 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/StringCaseTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/StringCaseTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.expr.functions.strings; +package com.google.refine.expr.functions.strings; import java.util.Properties; @@ -42,10 +42,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.expr.EvalError; import com.google.refine.grel.ControlFunctionRegistry; import com.google.refine.grel.Function; -import com.google.refine.tests.RefineTest; /** diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ToFromConversionTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/ToFromConversionTests.java similarity index 99% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/ToFromConversionTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/ToFromConversionTests.java index 1ca563373..b2af50b7a 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ToFromConversionTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/ToFromConversionTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.expr.functions.strings; +package com.google.refine.expr.functions.strings; import java.time.OffsetDateTime; import java.util.Properties; @@ -44,12 +44,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.util.CalendarParser; import com.google.refine.expr.util.CalendarParserException; import com.google.refine.grel.ControlFunctionRegistry; import com.google.refine.grel.Function; -import com.google.refine.tests.RefineTest; import com.google.refine.util.ParsingUtilities; diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ToLowercaseTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/ToLowercaseTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/ToLowercaseTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/ToLowercaseTests.java index 01ebdbf4c..01e3b803f 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ToLowercaseTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/ToLowercaseTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.ToLowercase; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ToLowercaseTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ToTitlecaseTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/ToTitlecaseTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/ToTitlecaseTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/ToTitlecaseTests.java index b61b41eba..cc8ddd0c3 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ToTitlecaseTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/ToTitlecaseTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.ToTitlecase; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ToTitlecaseTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ToUppercaseTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/ToUppercaseTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/ToUppercaseTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/ToUppercaseTests.java index d85a625c1..b92672d73 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ToUppercaseTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/ToUppercaseTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.ToUppercase; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ToUppercaseTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/TrimTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/TrimTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/TrimTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/TrimTests.java index 65e0e5a75..54bfb47ed 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/TrimTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/TrimTests.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.strings; +package com.google.refine.expr.functions.strings; import java.util.Properties; @@ -35,12 +35,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.strings.Trim; import com.google.refine.grel.ControlFunctionRegistry; import com.google.refine.grel.Function; -import com.google.refine.tests.RefineTest; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class TrimTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/UnescapeTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/UnescapeTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/UnescapeTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/UnescapeTests.java index e4d0e6b00..79e869d50 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/UnescapeTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/UnescapeTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.Unescape; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class UnescapeTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/UnicodeTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/UnicodeTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/UnicodeTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/UnicodeTests.java index fccb7b0ec..fca0b5be7 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/UnicodeTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/UnicodeTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.Unicode; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class UnicodeTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/UnicodeTypeTests.java b/main/tests/server/src/com/google/refine/expr/functions/strings/UnicodeTypeTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/strings/UnicodeTypeTests.java rename to main/tests/server/src/com/google/refine/expr/functions/strings/UnicodeTypeTests.java index d66a1b408..dedde5726 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/UnicodeTypeTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/strings/UnicodeTypeTests.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.strings; +package com.google.refine.expr.functions.strings; import org.testng.annotations.Test; import com.google.refine.expr.functions.strings.UnicodeType; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class UnicodeTypeTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/xml/InnerXmlTests.java b/main/tests/server/src/com/google/refine/expr/functions/xml/InnerXmlTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/xml/InnerXmlTests.java rename to main/tests/server/src/com/google/refine/expr/functions/xml/InnerXmlTests.java index 1df0c2f63..06fcec51b 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/xml/InnerXmlTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/xml/InnerXmlTests.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.xml; +package com.google.refine.expr.functions.xml; import org.testng.annotations.Test; import com.google.refine.expr.functions.xml.InnerXml; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class InnerXmlTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/xml/OwnTextTests.java b/main/tests/server/src/com/google/refine/expr/functions/xml/OwnTextTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/xml/OwnTextTests.java rename to main/tests/server/src/com/google/refine/expr/functions/xml/OwnTextTests.java index d93870958..65fa19892 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/xml/OwnTextTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/xml/OwnTextTests.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.xml; +package com.google.refine.expr.functions.xml; import org.testng.annotations.Test; import com.google.refine.expr.functions.xml.OwnText; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class OwnTextTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/xml/ParseXmlTests.java b/main/tests/server/src/com/google/refine/expr/functions/xml/ParseXmlTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/expr/functions/xml/ParseXmlTests.java rename to main/tests/server/src/com/google/refine/expr/functions/xml/ParseXmlTests.java index e2dab7d9d..189e41804 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/xml/ParseXmlTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/xml/ParseXmlTests.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.xml; +package com.google.refine.expr.functions.xml; import org.jsoup.parser.Parser; import org.jsoup.Jsoup; @@ -38,12 +38,12 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest; +import com.google.refine.RefineTest; import com.google.refine.expr.EvalError; import com.google.refine.expr.functions.xml.ParseXml; import com.google.refine.grel.ControlFunctionRegistry; import com.google.refine.grel.Function; -import com.google.refine.tests.RefineTest; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ParseXmlTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/xml/SelectXmlTests.java b/main/tests/server/src/com/google/refine/expr/functions/xml/SelectXmlTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/xml/SelectXmlTests.java rename to main/tests/server/src/com/google/refine/expr/functions/xml/SelectXmlTests.java index 4a71935c3..9f23851b3 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/xml/SelectXmlTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/xml/SelectXmlTests.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.xml; +package com.google.refine.expr.functions.xml; import org.testng.annotations.Test; import com.google.refine.expr.functions.xml.SelectXml; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class SelectXmlTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/xml/xmlAttrTests.java b/main/tests/server/src/com/google/refine/expr/functions/xml/xmlAttrTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/xml/xmlAttrTests.java rename to main/tests/server/src/com/google/refine/expr/functions/xml/xmlAttrTests.java index d0c5404f9..a339a9b3f 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/xml/xmlAttrTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/xml/xmlAttrTests.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.xml; +package com.google.refine.expr.functions.xml; import org.testng.annotations.Test; import com.google.refine.expr.functions.xml.XmlAttr; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class xmlAttrTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/xml/xmlTextTests.java b/main/tests/server/src/com/google/refine/expr/functions/xml/xmlTextTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/functions/xml/xmlTextTests.java rename to main/tests/server/src/com/google/refine/expr/functions/xml/xmlTextTests.java index c44168985..478a34c93 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/xml/xmlTextTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/xml/xmlTextTests.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.xml; +package com.google.refine.expr.functions.xml; import org.testng.annotations.Test; import com.google.refine.expr.functions.xml.XmlText; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class xmlTextTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/util/JsonValueConverterTests.java b/main/tests/server/src/com/google/refine/expr/util/JsonValueConverterTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/expr/util/JsonValueConverterTests.java rename to main/tests/server/src/com/google/refine/expr/util/JsonValueConverterTests.java index 7675b4c19..fff4e2d09 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/util/JsonValueConverterTests.java +++ b/main/tests/server/src/com/google/refine/expr/util/JsonValueConverterTests.java @@ -24,17 +24,15 @@ * 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.util; +package com.google.refine.expr.util; import static org.testng.Assert.assertEquals; import java.io.IOException; -import java.util.Arrays; import org.testng.annotations.Test; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.google.refine.expr.util.JsonValueConverter; import com.google.refine.util.ParsingUtilities; public class JsonValueConverterTests { diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/FunctionTests.java b/main/tests/server/src/com/google/refine/grel/FunctionTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/expr/functions/FunctionTests.java rename to main/tests/server/src/com/google/refine/grel/FunctionTests.java index eb842a07b..dfb987d5a 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/FunctionTests.java +++ b/main/tests/server/src/com/google/refine/grel/FunctionTests.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.grel; 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.browsing.Engine; import com.google.refine.expr.EvalError; import com.google.refine.grel.ControlFunctionRegistry; @@ -51,7 +52,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 FunctionTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/grel/GrelTests.java b/main/tests/server/src/com/google/refine/grel/GrelTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/grel/GrelTests.java rename to main/tests/server/src/com/google/refine/grel/GrelTests.java index 9cb69544c..e332075aa 100644 --- a/main/tests/server/src/com/google/refine/tests/grel/GrelTests.java +++ b/main/tests/server/src/com/google/refine/grel/GrelTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.grel; +package com.google.refine.grel; import java.util.Properties; @@ -42,13 +42,13 @@ 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.Evaluable; import com.google.refine.expr.ExpressionUtils; import com.google.refine.expr.MetaParser; import com.google.refine.expr.ParsingException; import com.google.refine.model.Project; -import com.google.refine.tests.RefineTest; public class GrelTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/grel/ast/LiteralExprTest.java b/main/tests/server/src/com/google/refine/grel/ast/LiteralExprTest.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/grel/ast/LiteralExprTest.java rename to main/tests/server/src/com/google/refine/grel/ast/LiteralExprTest.java index 0266ade76..e182c899e 100644 --- a/main/tests/server/src/com/google/refine/tests/grel/ast/LiteralExprTest.java +++ b/main/tests/server/src/com/google/refine/grel/ast/LiteralExprTest.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.grel.ast; +package com.google.refine.grel.ast; import static org.testng.Assert.assertEquals; diff --git a/main/tests/server/src/com/google/refine/tests/grel/controls/FilterTests.java b/main/tests/server/src/com/google/refine/grel/controls/FilterTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/grel/controls/FilterTests.java rename to main/tests/server/src/com/google/refine/grel/controls/FilterTests.java index f11c3c8b2..297366654 100644 --- a/main/tests/server/src/com/google/refine/tests/grel/controls/FilterTests.java +++ b/main/tests/server/src/com/google/refine/grel/controls/FilterTests.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.grel.controls; +package com.google.refine.grel.controls; import org.testng.annotations.Test; import com.google.refine.grel.controls.Filter; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class FilterTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/grel/controls/ForEachIndexTests.java b/main/tests/server/src/com/google/refine/grel/controls/ForEachIndexTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/grel/controls/ForEachIndexTests.java rename to main/tests/server/src/com/google/refine/grel/controls/ForEachIndexTests.java index aa760c2d7..ece39d091 100644 --- a/main/tests/server/src/com/google/refine/tests/grel/controls/ForEachIndexTests.java +++ b/main/tests/server/src/com/google/refine/grel/controls/ForEachIndexTests.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.grel.controls; +package com.google.refine.grel.controls; import org.testng.annotations.Test; import com.google.refine.grel.controls.ForEachIndex; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ForEachIndexTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/grel/controls/ForEachTests.java b/main/tests/server/src/com/google/refine/grel/controls/ForEachTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/grel/controls/ForEachTests.java rename to main/tests/server/src/com/google/refine/grel/controls/ForEachTests.java index 438275d2d..939976ad8 100644 --- a/main/tests/server/src/com/google/refine/tests/grel/controls/ForEachTests.java +++ b/main/tests/server/src/com/google/refine/grel/controls/ForEachTests.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.grel.controls; +package com.google.refine.grel.controls; import org.testng.annotations.Test; import com.google.refine.grel.controls.ForEach; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ForEachTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/grel/controls/ForNonBlankTests.java b/main/tests/server/src/com/google/refine/grel/controls/ForNonBlankTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/grel/controls/ForNonBlankTests.java rename to main/tests/server/src/com/google/refine/grel/controls/ForNonBlankTests.java index 991b7c5f6..f71397335 100644 --- a/main/tests/server/src/com/google/refine/tests/grel/controls/ForNonBlankTests.java +++ b/main/tests/server/src/com/google/refine/grel/controls/ForNonBlankTests.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.grel.controls; +package com.google.refine.grel.controls; import org.testng.annotations.Test; import com.google.refine.grel.controls.ForNonBlank; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ForNonBlankTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/grel/controls/ForRangeTests.java b/main/tests/server/src/com/google/refine/grel/controls/ForRangeTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/grel/controls/ForRangeTests.java rename to main/tests/server/src/com/google/refine/grel/controls/ForRangeTests.java index 074b242a2..33f1d67ac 100644 --- a/main/tests/server/src/com/google/refine/tests/grel/controls/ForRangeTests.java +++ b/main/tests/server/src/com/google/refine/grel/controls/ForRangeTests.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.grel.controls; +package com.google.refine.grel.controls; import org.testng.annotations.Test; import com.google.refine.grel.controls.ForRange; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ForRangeTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/grel/controls/IfTests.java b/main/tests/server/src/com/google/refine/grel/controls/IfTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/grel/controls/IfTests.java rename to main/tests/server/src/com/google/refine/grel/controls/IfTests.java index 0a06c43ce..76bc10a90 100644 --- a/main/tests/server/src/com/google/refine/tests/grel/controls/IfTests.java +++ b/main/tests/server/src/com/google/refine/grel/controls/IfTests.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.grel.controls; +package com.google.refine.grel.controls; import org.testng.annotations.Test; import com.google.refine.grel.controls.If; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class IfTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/grel/controls/IsBlankTests.java b/main/tests/server/src/com/google/refine/grel/controls/IsBlankTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/grel/controls/IsBlankTests.java rename to main/tests/server/src/com/google/refine/grel/controls/IsBlankTests.java index ec9f8d287..c0089404d 100644 --- a/main/tests/server/src/com/google/refine/tests/grel/controls/IsBlankTests.java +++ b/main/tests/server/src/com/google/refine/grel/controls/IsBlankTests.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.grel.controls; +package com.google.refine.grel.controls; import org.testng.annotations.Test; import com.google.refine.grel.controls.IsBlank; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class IsBlankTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/grel/controls/IsEmptyStringTests.java b/main/tests/server/src/com/google/refine/grel/controls/IsEmptyStringTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/grel/controls/IsEmptyStringTests.java rename to main/tests/server/src/com/google/refine/grel/controls/IsEmptyStringTests.java index ae336e07e..97436d694 100644 --- a/main/tests/server/src/com/google/refine/tests/grel/controls/IsEmptyStringTests.java +++ b/main/tests/server/src/com/google/refine/grel/controls/IsEmptyStringTests.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.grel.controls; +package com.google.refine.grel.controls; import org.testng.annotations.Test; import com.google.refine.grel.controls.IsEmptyString; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class IsEmptyStringTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/grel/controls/IsErrorTests.java b/main/tests/server/src/com/google/refine/grel/controls/IsErrorTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/grel/controls/IsErrorTests.java rename to main/tests/server/src/com/google/refine/grel/controls/IsErrorTests.java index d07e8a1ef..15c5da63c 100644 --- a/main/tests/server/src/com/google/refine/tests/grel/controls/IsErrorTests.java +++ b/main/tests/server/src/com/google/refine/grel/controls/IsErrorTests.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.grel.controls; +package com.google.refine.grel.controls; import org.testng.annotations.Test; import com.google.refine.grel.controls.IsError; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class IsErrorTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/grel/controls/IsNonBlankTests.java b/main/tests/server/src/com/google/refine/grel/controls/IsNonBlankTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/grel/controls/IsNonBlankTests.java rename to main/tests/server/src/com/google/refine/grel/controls/IsNonBlankTests.java index a16932e82..e0a820c46 100644 --- a/main/tests/server/src/com/google/refine/tests/grel/controls/IsNonBlankTests.java +++ b/main/tests/server/src/com/google/refine/grel/controls/IsNonBlankTests.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.grel.controls; +package com.google.refine.grel.controls; import org.testng.annotations.Test; import com.google.refine.grel.controls.IsNonBlank; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class IsNonBlankTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/grel/controls/IsNotNullTests.java b/main/tests/server/src/com/google/refine/grel/controls/IsNotNullTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/grel/controls/IsNotNullTests.java rename to main/tests/server/src/com/google/refine/grel/controls/IsNotNullTests.java index bd29a2017..3c24031c5 100644 --- a/main/tests/server/src/com/google/refine/tests/grel/controls/IsNotNullTests.java +++ b/main/tests/server/src/com/google/refine/grel/controls/IsNotNullTests.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.grel.controls; +package com.google.refine.grel.controls; import org.testng.annotations.Test; import com.google.refine.grel.controls.IsNotNull; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class IsNotNullTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/grel/controls/IsNullTests.java b/main/tests/server/src/com/google/refine/grel/controls/IsNullTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/grel/controls/IsNullTests.java rename to main/tests/server/src/com/google/refine/grel/controls/IsNullTests.java index f29c52d30..059be4fbd 100644 --- a/main/tests/server/src/com/google/refine/tests/grel/controls/IsNullTests.java +++ b/main/tests/server/src/com/google/refine/grel/controls/IsNullTests.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.grel.controls; +package com.google.refine.grel.controls; import org.testng.annotations.Test; import com.google.refine.grel.controls.IsNull; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class IsNullTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/grel/controls/IsNumericTests.java b/main/tests/server/src/com/google/refine/grel/controls/IsNumericTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/grel/controls/IsNumericTests.java rename to main/tests/server/src/com/google/refine/grel/controls/IsNumericTests.java index 717dabbd1..b1236d658 100644 --- a/main/tests/server/src/com/google/refine/tests/grel/controls/IsNumericTests.java +++ b/main/tests/server/src/com/google/refine/grel/controls/IsNumericTests.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.grel.controls; +package com.google.refine.grel.controls; import org.testng.annotations.Test; import com.google.refine.grel.controls.IsNumeric; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class IsNumericTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/grel/controls/WithTests.java b/main/tests/server/src/com/google/refine/grel/controls/WithTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/grel/controls/WithTests.java rename to main/tests/server/src/com/google/refine/grel/controls/WithTests.java index 18e01ab7d..4baf60825 100644 --- a/main/tests/server/src/com/google/refine/tests/grel/controls/WithTests.java +++ b/main/tests/server/src/com/google/refine/grel/controls/WithTests.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.grel.controls; +package com.google.refine.grel.controls; import org.testng.annotations.Test; import com.google.refine.grel.controls.With; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class WithTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/history/FileHistoryEntryManagerTests.java b/main/tests/server/src/com/google/refine/history/FileHistoryEntryManagerTests.java similarity index 90% rename from main/tests/server/src/com/google/refine/tests/history/FileHistoryEntryManagerTests.java rename to main/tests/server/src/com/google/refine/history/FileHistoryEntryManagerTests.java index d43dfcfde..f08523388 100644 --- a/main/tests/server/src/com/google/refine/tests/history/FileHistoryEntryManagerTests.java +++ b/main/tests/server/src/com/google/refine/history/FileHistoryEntryManagerTests.java @@ -1,4 +1,4 @@ -package com.google.refine.tests.history; +package com.google.refine.history; import static org.mockito.Mockito.mock; @@ -9,13 +9,13 @@ import java.util.Properties; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.history.HistoryEntry; import com.google.refine.io.FileHistoryEntryManager; import com.google.refine.model.Project; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.column.ColumnAdditionOperation; -import com.google.refine.tests.RefineTest; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class FileHistoryEntryManagerTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/history/HistoryEntryTests.java b/main/tests/server/src/com/google/refine/history/HistoryEntryTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/history/HistoryEntryTests.java rename to main/tests/server/src/com/google/refine/history/HistoryEntryTests.java index 1a4cedcb9..131208f4b 100644 --- a/main/tests/server/src/com/google/refine/tests/history/HistoryEntryTests.java +++ b/main/tests/server/src/com/google/refine/history/HistoryEntryTests.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.history; +package com.google.refine.history; import static org.mockito.Mockito.mock; @@ -34,12 +34,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.history.HistoryEntry; import com.google.refine.model.Project; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.column.ColumnAdditionOperation; -import com.google.refine.tests.RefineTest; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class HistoryEntryTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/history/HistoryTests.java b/main/tests/server/src/com/google/refine/history/HistoryTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/history/HistoryTests.java rename to main/tests/server/src/com/google/refine/history/HistoryTests.java index 7a79b7530..18acdb0df 100644 --- a/main/tests/server/src/com/google/refine/tests/history/HistoryTests.java +++ b/main/tests/server/src/com/google/refine/history/HistoryTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.history; +package com.google.refine.history; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -49,12 +49,12 @@ import org.testng.annotations.Test; import com.google.refine.ProjectManager; import com.google.refine.history.Change; import com.google.refine.ProjectMetadata; +import com.google.refine.RefineTest; import com.google.refine.history.History; import com.google.refine.history.HistoryEntry; import com.google.refine.history.HistoryEntryManager; import com.google.refine.model.Project; -import com.google.refine.tests.RefineTest; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class HistoryTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/importers/ExcelImporterTests.java b/main/tests/server/src/com/google/refine/importers/ExcelImporterTests.java similarity index 99% rename from main/tests/server/src/com/google/refine/tests/importers/ExcelImporterTests.java rename to main/tests/server/src/com/google/refine/importers/ExcelImporterTests.java index bb5f5a81b..db297728c 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/ExcelImporterTests.java +++ b/main/tests/server/src/com/google/refine/importers/ExcelImporterTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.importers; +package com.google.refine.importers; import static org.mockito.Mockito.times; diff --git a/main/tests/server/src/com/google/refine/tests/importers/FixedWidthImporterTests.java b/main/tests/server/src/com/google/refine/importers/FixedWidthImporterTests.java similarity index 99% rename from main/tests/server/src/com/google/refine/tests/importers/FixedWidthImporterTests.java rename to main/tests/server/src/com/google/refine/importers/FixedWidthImporterTests.java index 1e8e556fa..91997abc0 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/FixedWidthImporterTests.java +++ b/main/tests/server/src/com/google/refine/importers/FixedWidthImporterTests.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.importers; +package com.google.refine.importers; import java.io.StringReader; diff --git a/main/tests/server/src/com/google/refine/tests/importers/ImporterTest.java b/main/tests/server/src/com/google/refine/importers/ImporterTest.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/importers/ImporterTest.java rename to main/tests/server/src/com/google/refine/importers/ImporterTest.java index cdeb77b36..832aedd06 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/ImporterTest.java +++ b/main/tests/server/src/com/google/refine/importers/ImporterTest.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.importers; +package com.google.refine.importers; import static org.mockito.Mockito.when; @@ -40,6 +40,8 @@ import org.mockito.Mockito; import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.refine.ProjectMetadata; import com.google.refine.RefineServlet; +import com.google.refine.RefineServletStub; +import com.google.refine.RefineTest; import com.google.refine.importers.ImportingParserBase; import com.google.refine.importers.tree.ImportColumnGroup; import com.google.refine.importers.tree.TreeImportingParserBase; @@ -47,8 +49,6 @@ import com.google.refine.importers.tree.XmlImportUtilities; import com.google.refine.importing.ImportingJob; import com.google.refine.importing.ImportingManager; import com.google.refine.model.Project; -import com.google.refine.tests.RefineServletStub; -import com.google.refine.tests.RefineTest; import com.google.refine.util.ParsingUtilities; public abstract class ImporterTest extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/importers/ImporterUtilitiesTests.java b/main/tests/server/src/com/google/refine/importers/ImporterUtilitiesTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/importers/ImporterUtilitiesTests.java rename to main/tests/server/src/com/google/refine/importers/ImporterUtilitiesTests.java index 8958ac9f8..a48262aea 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/ImporterUtilitiesTests.java +++ b/main/tests/server/src/com/google/refine/importers/ImporterUtilitiesTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.importers; +package com.google.refine.importers; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -47,11 +47,11 @@ import org.testng.Assert; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.importers.ImporterUtilities; import com.google.refine.model.Cell; import com.google.refine.model.Project; import com.google.refine.model.Row; -import com.google.refine.tests.RefineTest; public class ImporterUtilitiesTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/importers/JsonImporterTests.java b/main/tests/server/src/com/google/refine/importers/JsonImporterTests.java similarity index 99% rename from main/tests/server/src/com/google/refine/tests/importers/JsonImporterTests.java rename to main/tests/server/src/com/google/refine/importers/JsonImporterTests.java index 6942235ba..6c1c3004f 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/JsonImporterTests.java +++ b/main/tests/server/src/com/google/refine/importers/JsonImporterTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.importers; +package com.google.refine.importers; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/main/tests/server/src/com/google/refine/tests/importers/RdfTripleImporterTests.java b/main/tests/server/src/com/google/refine/importers/RdfTripleImporterTests.java similarity index 99% rename from main/tests/server/src/com/google/refine/tests/importers/RdfTripleImporterTests.java rename to main/tests/server/src/com/google/refine/importers/RdfTripleImporterTests.java index 2fbc4235e..455dcc3ed 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/RdfTripleImporterTests.java +++ b/main/tests/server/src/com/google/refine/importers/RdfTripleImporterTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.importers; +package com.google.refine.importers; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/main/tests/server/src/com/google/refine/tests/importers/TsvCsvImporterTests.java b/main/tests/server/src/com/google/refine/importers/TsvCsvImporterTests.java similarity index 99% rename from main/tests/server/src/com/google/refine/tests/importers/TsvCsvImporterTests.java rename to main/tests/server/src/com/google/refine/importers/TsvCsvImporterTests.java index 98107678d..4f4d7e9e4 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/TsvCsvImporterTests.java +++ b/main/tests/server/src/com/google/refine/importers/TsvCsvImporterTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.importers; +package com.google.refine.importers; import java.io.StringReader; diff --git a/main/tests/server/src/com/google/refine/tests/importers/WikitextImporterTests.java b/main/tests/server/src/com/google/refine/importers/WikitextImporterTests.java similarity index 99% rename from main/tests/server/src/com/google/refine/tests/importers/WikitextImporterTests.java rename to main/tests/server/src/com/google/refine/importers/WikitextImporterTests.java index a9120820a..2eb768726 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/WikitextImporterTests.java +++ b/main/tests/server/src/com/google/refine/importers/WikitextImporterTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.importers; +package com.google.refine.importers; import java.io.StringReader; diff --git a/main/tests/server/src/com/google/refine/tests/importers/XmlImportUtilitiesStub.java b/main/tests/server/src/com/google/refine/importers/XmlImportUtilitiesStub.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/importers/XmlImportUtilitiesStub.java rename to main/tests/server/src/com/google/refine/importers/XmlImportUtilitiesStub.java index 5962597a9..85d648023 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/XmlImportUtilitiesStub.java +++ b/main/tests/server/src/com/google/refine/importers/XmlImportUtilitiesStub.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.importers; +package com.google.refine.importers; import java.io.Serializable; import java.util.List; diff --git a/main/tests/server/src/com/google/refine/tests/importers/XmlImportUtilitiesTests.java b/main/tests/server/src/com/google/refine/importers/XmlImportUtilitiesTests.java similarity index 99% rename from main/tests/server/src/com/google/refine/tests/importers/XmlImportUtilitiesTests.java rename to main/tests/server/src/com/google/refine/importers/XmlImportUtilitiesTests.java index 9d161f371..941c7b7f8 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/XmlImportUtilitiesTests.java +++ b/main/tests/server/src/com/google/refine/importers/XmlImportUtilitiesTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.importers; +package com.google.refine.importers; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -48,6 +48,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.importers.JsonImporter; import com.google.refine.importers.JsonImporter.JSONTreeReader; import com.google.refine.importers.XmlImporter.XmlParser; @@ -59,7 +60,6 @@ import com.google.refine.importers.tree.TreeReader; import com.google.refine.importers.tree.TreeReaderException; import com.google.refine.model.Project; import com.google.refine.model.Row; -import com.google.refine.tests.RefineTest; public class XmlImportUtilitiesTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/importers/XmlImporterTests.java b/main/tests/server/src/com/google/refine/importers/XmlImporterTests.java similarity index 99% rename from main/tests/server/src/com/google/refine/tests/importers/XmlImporterTests.java rename to main/tests/server/src/com/google/refine/importers/XmlImporterTests.java index d31717054..63bb20828 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/XmlImporterTests.java +++ b/main/tests/server/src/com/google/refine/importers/XmlImporterTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.importers; +package com.google.refine.importers; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/main/tests/server/src/com/google/refine/tests/importers/excel95.xls b/main/tests/server/src/com/google/refine/importers/excel95.xls similarity index 100% rename from main/tests/server/src/com/google/refine/tests/importers/excel95.xls rename to main/tests/server/src/com/google/refine/importers/excel95.xls diff --git a/main/tests/server/src/com/google/refine/tests/importing/ImportingUtilitiesTests.java b/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/importing/ImportingUtilitiesTests.java rename to main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java index 026e1bb59..b0b725f81 100644 --- a/main/tests/server/src/com/google/refine/tests/importing/ImportingUtilitiesTests.java +++ b/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.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.importing; +package com.google.refine.importing; import java.io.File; import java.io.IOException; @@ -37,13 +37,13 @@ import org.testng.annotations.Test; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.refine.ProjectMetadata; +import com.google.refine.importers.ImporterTest; import com.google.refine.importers.tree.TreeImportingParserBase; import com.google.refine.importing.ImportingJob; import com.google.refine.importing.ImportingUtilities; -import com.google.refine.tests.importers.ImporterTest; -import com.google.refine.tests.util.TestUtils; import com.google.refine.util.JSONUtilities; import com.google.refine.util.ParsingUtilities; +import com.google.refine.util.TestUtils; public class ImportingUtilitiesTests extends ImporterTest { diff --git a/main/tests/server/src/com/google/refine/tests/io/FileProjectManagerTests.java b/main/tests/server/src/com/google/refine/io/FileProjectManagerTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/io/FileProjectManagerTests.java rename to main/tests/server/src/com/google/refine/io/FileProjectManagerTests.java index 641c7a486..582f5938b 100644 --- a/main/tests/server/src/com/google/refine/tests/io/FileProjectManagerTests.java +++ b/main/tests/server/src/com/google/refine/io/FileProjectManagerTests.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.io; +package com.google.refine.io; import static org.mockito.Mockito.mock; @@ -35,7 +35,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import com.google.refine.io.FileProjectManager; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; import com.google.refine.ProjectMetadata; public class FileProjectManagerTests { diff --git a/main/tests/server/src/com/google/refine/tests/io/ProjectMetadataTests.java b/main/tests/server/src/com/google/refine/io/ProjectMetadataTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/io/ProjectMetadataTests.java rename to main/tests/server/src/com/google/refine/io/ProjectMetadataTests.java index 79568c8a7..f3ce9f6be 100644 --- a/main/tests/server/src/com/google/refine/tests/io/ProjectMetadataTests.java +++ b/main/tests/server/src/com/google/refine/io/ProjectMetadataTests.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.io; +package com.google.refine.io; import java.io.IOException; import java.io.InputStream; @@ -33,8 +33,9 @@ import java.util.TimeZone; import org.apache.commons.io.IOUtils; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; -import com.google.refine.tests.util.TestUtils; + import com.google.refine.util.ParsingUtilities; +import com.google.refine.util.TestUtils; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; import com.google.refine.ProjectMetadata; diff --git a/main/tests/server/src/com/google/refine/tests/model/CacheTests.java b/main/tests/server/src/com/google/refine/model/CacheTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/model/CacheTests.java rename to main/tests/server/src/com/google/refine/model/CacheTests.java index b4d5b3cb7..7e11492c7 100644 --- a/main/tests/server/src/com/google/refine/tests/model/CacheTests.java +++ b/main/tests/server/src/com/google/refine/model/CacheTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.model; +package com.google.refine.model; import java.io.IOException; import java.util.Properties; @@ -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.Engine; import com.google.refine.browsing.EngineConfig; import com.google.refine.browsing.RowVisitor; @@ -53,7 +54,6 @@ import com.google.refine.model.Project; import com.google.refine.model.Row; import com.google.refine.operations.EngineDependentOperation; import com.google.refine.operations.row.RowRemovalOperation; -import com.google.refine.tests.RefineTest; public class CacheTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/model/CellTests.java b/main/tests/server/src/com/google/refine/model/CellTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/model/CellTests.java rename to main/tests/server/src/com/google/refine/model/CellTests.java index 94391d1bb..f7e1279ca 100644 --- a/main/tests/server/src/com/google/refine/tests/model/CellTests.java +++ b/main/tests/server/src/com/google/refine/model/CellTests.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.model; +package com.google.refine.model; import java.time.format.DateTimeFormatter; import java.time.LocalDateTime; import java.time.OffsetDateTime; -import static org.junit.Assert.assertNull; +import static org.testng.Assert.assertNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -38,8 +38,8 @@ import org.testng.annotations.Test; import com.google.refine.model.Cell; import com.google.refine.model.Recon; -import com.google.refine.tests.util.TestUtils; import com.google.refine.util.Pool; +import com.google.refine.util.TestUtils; public class CellTests { diff --git a/main/tests/server/src/com/google/refine/tests/model/ColumnGroupTests.java b/main/tests/server/src/com/google/refine/model/ColumnGroupTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/model/ColumnGroupTests.java rename to main/tests/server/src/com/google/refine/model/ColumnGroupTests.java index 3044c19a5..2814f3e18 100644 --- a/main/tests/server/src/com/google/refine/tests/model/ColumnGroupTests.java +++ b/main/tests/server/src/com/google/refine/model/ColumnGroupTests.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.model; +package com.google.refine.model; import org.testng.annotations.Test; import com.google.refine.model.ColumnGroup; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ColumnGroupTests { diff --git a/main/tests/server/src/com/google/refine/tests/model/ColumnModelTests.java b/main/tests/server/src/com/google/refine/model/ColumnModelTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/model/ColumnModelTests.java rename to main/tests/server/src/com/google/refine/model/ColumnModelTests.java index 0bc4df691..15e91d9bc 100644 --- a/main/tests/server/src/com/google/refine/tests/model/ColumnModelTests.java +++ b/main/tests/server/src/com/google/refine/model/ColumnModelTests.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.model; +package com.google.refine.model; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.model.ColumnModel; import com.google.refine.model.Project; -import com.google.refine.tests.RefineTest; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ColumnModelTests extends RefineTest { @Test diff --git a/main/tests/server/src/com/google/refine/tests/model/ColumnTests.java b/main/tests/server/src/com/google/refine/model/ColumnTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/model/ColumnTests.java rename to main/tests/server/src/com/google/refine/model/ColumnTests.java index 0f7835486..4d2dab0f9 100644 --- a/main/tests/server/src/com/google/refine/tests/model/ColumnTests.java +++ b/main/tests/server/src/com/google/refine/model/ColumnTests.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.model; +package com.google.refine.model; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -34,7 +34,7 @@ import org.testng.annotations.Test; import com.google.refine.model.Column; import com.google.refine.model.recon.ReconConfig; import com.google.refine.model.recon.StandardReconConfig; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; import edu.mit.simile.butterfly.ButterflyModule; diff --git a/main/tests/server/src/com/google/refine/tests/model/ProjectStub.java b/main/tests/server/src/com/google/refine/model/ProjectStub.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/model/ProjectStub.java rename to main/tests/server/src/com/google/refine/model/ProjectStub.java index d5a499403..4fc7149ac 100644 --- a/main/tests/server/src/com/google/refine/tests/model/ProjectStub.java +++ b/main/tests/server/src/com/google/refine/model/ProjectStub.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.model; +package com.google.refine.model; import com.google.refine.model.Project; diff --git a/main/tests/server/src/com/google/refine/tests/model/ReconCandidateTests.java b/main/tests/server/src/com/google/refine/model/ReconCandidateTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/model/ReconCandidateTests.java rename to main/tests/server/src/com/google/refine/model/ReconCandidateTests.java index e9d33a7ff..11af1f436 100644 --- a/main/tests/server/src/com/google/refine/tests/model/ReconCandidateTests.java +++ b/main/tests/server/src/com/google/refine/model/ReconCandidateTests.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.model; +package com.google.refine.model; import org.testng.annotations.Test; import com.google.refine.model.ReconCandidate; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ReconCandidateTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/model/ReconStatsTests.java b/main/tests/server/src/com/google/refine/model/ReconStatsTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/model/ReconStatsTests.java rename to main/tests/server/src/com/google/refine/model/ReconStatsTests.java index 5a5cd92c2..3b1813047 100644 --- a/main/tests/server/src/com/google/refine/tests/model/ReconStatsTests.java +++ b/main/tests/server/src/com/google/refine/model/ReconStatsTests.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.model; +package com.google.refine.model; import org.testng.annotations.Test; import com.google.refine.model.ReconStats; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ReconStatsTests { diff --git a/main/tests/server/src/com/google/refine/tests/model/ReconTests.java b/main/tests/server/src/com/google/refine/model/ReconTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/model/ReconTests.java rename to main/tests/server/src/com/google/refine/model/ReconTests.java index 9fa4d2af5..8a362a83b 100644 --- a/main/tests/server/src/com/google/refine/tests/model/ReconTests.java +++ b/main/tests/server/src/com/google/refine/model/ReconTests.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.model; +package com.google.refine.model; import org.testng.annotations.Test; import com.google.refine.model.Recon; import com.google.refine.model.Recon.Judgment; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ReconTests { diff --git a/main/tests/server/src/com/google/refine/tests/model/ReconTypeTest.java b/main/tests/server/src/com/google/refine/model/ReconTypeTest.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/model/ReconTypeTest.java rename to main/tests/server/src/com/google/refine/model/ReconTypeTest.java index c4320831a..8cad9af08 100644 --- a/main/tests/server/src/com/google/refine/tests/model/ReconTypeTest.java +++ b/main/tests/server/src/com/google/refine/model/ReconTypeTest.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.model; +package com.google.refine.model; import java.io.IOException; @@ -32,7 +32,7 @@ import org.testng.Assert; import org.testng.annotations.Test; import com.google.refine.model.ReconType; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ReconTypeTest { @Test diff --git a/main/tests/server/src/com/google/refine/tests/model/RecordModelTests.java b/main/tests/server/src/com/google/refine/model/RecordModelTests.java similarity index 93% rename from main/tests/server/src/com/google/refine/tests/model/RecordModelTests.java rename to main/tests/server/src/com/google/refine/model/RecordModelTests.java index 9066ce519..7d5fa78d6 100644 --- a/main/tests/server/src/com/google/refine/tests/model/RecordModelTests.java +++ b/main/tests/server/src/com/google/refine/model/RecordModelTests.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.model; +package com.google.refine.model; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.model.Project; -import com.google.refine.tests.RefineTest; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class RecordModelTests extends RefineTest { @Test diff --git a/main/tests/server/src/com/google/refine/tests/model/RowTests.java b/main/tests/server/src/com/google/refine/model/RowTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/model/RowTests.java rename to main/tests/server/src/com/google/refine/model/RowTests.java index 4108ccfc8..a2591a77d 100644 --- a/main/tests/server/src/com/google/refine/tests/model/RowTests.java +++ b/main/tests/server/src/com/google/refine/model/RowTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.model; +package com.google.refine.model; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -46,13 +46,13 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest; 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.Row; -import com.google.refine.tests.RefineTest; -import com.google.refine.tests.util.TestUtils; import com.google.refine.util.Pool; +import com.google.refine.util.TestUtils; public class RowTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/model/changes/DataExtensionChangeTest.java b/main/tests/server/src/com/google/refine/model/changes/DataExtensionChangeTest.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/model/changes/DataExtensionChangeTest.java rename to main/tests/server/src/com/google/refine/model/changes/DataExtensionChangeTest.java index fee150fc9..02dbdeabb 100644 --- a/main/tests/server/src/com/google/refine/tests/model/changes/DataExtensionChangeTest.java +++ b/main/tests/server/src/com/google/refine/model/changes/DataExtensionChangeTest.java @@ -24,9 +24,9 @@ * 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.model.changes; +package com.google.refine.model.changes; -import static org.junit.Assert.assertEquals; +import static org.testng.Assert.assertEquals; import java.io.IOException; import java.io.InputStream; @@ -38,11 +38,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.history.Change; import com.google.refine.model.ModelException; import com.google.refine.model.Project; import com.google.refine.model.changes.DataExtensionChange; -import com.google.refine.tests.RefineTest; import com.google.refine.util.Pool; diff --git a/main/tests/server/src/com/google/refine/tests/model/changes/MassChangeTests.java b/main/tests/server/src/com/google/refine/model/changes/MassChangeTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/model/changes/MassChangeTests.java rename to main/tests/server/src/com/google/refine/model/changes/MassChangeTests.java index cd5d85104..ba67faa08 100644 --- a/main/tests/server/src/com/google/refine/tests/model/changes/MassChangeTests.java +++ b/main/tests/server/src/com/google/refine/model/changes/MassChangeTests.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.model.changes; +package com.google.refine.model.changes; import static org.testng.AssertJUnit.assertTrue; @@ -37,13 +37,13 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.history.Change; import com.google.refine.model.ModelException; import com.google.refine.model.Project; import com.google.refine.model.changes.CellAtRow; import com.google.refine.model.changes.ColumnAdditionChange; import com.google.refine.model.changes.MassChange; -import com.google.refine.tests.RefineTest; public class MassChangeTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/model/recon/StandardReconConfigTests.java b/main/tests/server/src/com/google/refine/model/recon/StandardReconConfigTests.java similarity index 99% rename from main/tests/server/src/com/google/refine/tests/model/recon/StandardReconConfigTests.java rename to main/tests/server/src/com/google/refine/model/recon/StandardReconConfigTests.java index 7d8862ec2..07779581d 100644 --- a/main/tests/server/src/com/google/refine/tests/model/recon/StandardReconConfigTests.java +++ b/main/tests/server/src/com/google/refine/model/recon/StandardReconConfigTests.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.model.recon; +package com.google.refine.model.recon; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -43,6 +43,7 @@ import org.testng.annotations.Test; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.node.ArrayNode; +import com.google.refine.RefineTest; import com.google.refine.model.Project; import com.google.refine.model.Recon; import com.google.refine.model.Row; @@ -53,9 +54,8 @@ import com.google.refine.model.recon.StandardReconConfig.ColumnDetail; import com.google.refine.model.recon.StandardReconConfig.ReconResult; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.recon.ReconOperation; -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 StandardReconConfigTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/cell/BlankDownTests.java b/main/tests/server/src/com/google/refine/operations/cell/BlankDownTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/operations/cell/BlankDownTests.java rename to main/tests/server/src/com/google/refine/operations/cell/BlankDownTests.java index 1ba40944a..9ea49a413 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/cell/BlankDownTests.java +++ b/main/tests/server/src/com/google/refine/operations/cell/BlankDownTests.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.operations.cell; +package com.google.refine.operations.cell; import java.util.ArrayList; import java.util.List; @@ -37,6 +37,7 @@ import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; import com.google.refine.ProjectManager; +import com.google.refine.RefineTest; import com.google.refine.browsing.EngineConfig; import com.google.refine.model.AbstractOperation; import com.google.refine.model.Column; @@ -46,9 +47,8 @@ import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.cell.BlankDownOperation; import com.google.refine.operations.cell.FillDownOperation; import com.google.refine.process.Process; -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 BlankDownTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/cell/FillDownTests.java b/main/tests/server/src/com/google/refine/operations/cell/FillDownTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/operations/cell/FillDownTests.java rename to main/tests/server/src/com/google/refine/operations/cell/FillDownTests.java index f0df023ef..095557a8c 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/cell/FillDownTests.java +++ b/main/tests/server/src/com/google/refine/operations/cell/FillDownTests.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.operations.cell; +package com.google.refine.operations.cell; import java.util.ArrayList; import java.util.List; @@ -37,6 +37,7 @@ import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; import com.google.refine.ProjectManager; +import com.google.refine.RefineTest; import com.google.refine.browsing.EngineConfig; import com.google.refine.model.AbstractOperation; import com.google.refine.model.Column; @@ -45,9 +46,8 @@ import com.google.refine.model.Row; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.cell.FillDownOperation; import com.google.refine.process.Process; -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 FillDownTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/cell/JoinMultiValuedCellsTests.java b/main/tests/server/src/com/google/refine/operations/cell/JoinMultiValuedCellsTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/operations/cell/JoinMultiValuedCellsTests.java rename to main/tests/server/src/com/google/refine/operations/cell/JoinMultiValuedCellsTests.java index 878d9a754..214fe1bb1 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/cell/JoinMultiValuedCellsTests.java +++ b/main/tests/server/src/com/google/refine/operations/cell/JoinMultiValuedCellsTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.operations.cell; +package com.google.refine.operations.cell; import java.util.Properties; @@ -42,14 +42,14 @@ import org.testng.annotations.BeforeSuite; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.model.AbstractOperation; import com.google.refine.model.Project; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.cell.MultiValuedCellJoinOperation; import com.google.refine.process.Process; -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 JoinMultiValuedCellsTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/cell/KeyValueColumnizeTests.java b/main/tests/server/src/com/google/refine/operations/cell/KeyValueColumnizeTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/operations/cell/KeyValueColumnizeTests.java rename to main/tests/server/src/com/google/refine/operations/cell/KeyValueColumnizeTests.java index 7f1dd3054..e74945746 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/cell/KeyValueColumnizeTests.java +++ b/main/tests/server/src/com/google/refine/operations/cell/KeyValueColumnizeTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.operations.cell; +package com.google.refine.operations.cell; import static org.mockito.Mockito.mock; @@ -53,6 +53,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.refine.ProjectManager; import com.google.refine.ProjectMetadata; import com.google.refine.RefineServlet; +import com.google.refine.RefineServletStub; +import com.google.refine.RefineTest; import com.google.refine.importers.SeparatorBasedImporter; import com.google.refine.importing.ImportingJob; import com.google.refine.importing.ImportingManager; @@ -63,10 +65,8 @@ import com.google.refine.model.Project; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.cell.KeyValueColumnizeOperation; import com.google.refine.process.Process; -import com.google.refine.tests.RefineServletStub; -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 KeyValueColumnizeTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/cell/MassOperationTests.java b/main/tests/server/src/com/google/refine/operations/cell/MassOperationTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/operations/cell/MassOperationTests.java rename to main/tests/server/src/com/google/refine/operations/cell/MassOperationTests.java index 8f8a13520..830ffd22f 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/cell/MassOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/cell/MassOperationTests.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.operations.cell; +package com.google.refine.operations.cell; import java.util.List; @@ -33,12 +33,12 @@ import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; import com.fasterxml.jackson.core.type.TypeReference; +import com.google.refine.RefineTest; import com.google.refine.operations.OperationRegistry; 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.tests.util.TestUtils; import com.google.refine.util.ParsingUtilities; +import com.google.refine.util.TestUtils; public class MassOperationTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/cell/SplitMultiValuedCellsTests.java b/main/tests/server/src/com/google/refine/operations/cell/SplitMultiValuedCellsTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/operations/cell/SplitMultiValuedCellsTests.java rename to main/tests/server/src/com/google/refine/operations/cell/SplitMultiValuedCellsTests.java index 2e047e9e6..8d2f23d15 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/cell/SplitMultiValuedCellsTests.java +++ b/main/tests/server/src/com/google/refine/operations/cell/SplitMultiValuedCellsTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.operations.cell; +package com.google.refine.operations.cell; import java.util.Properties; @@ -42,14 +42,14 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.model.AbstractOperation; import com.google.refine.model.Project; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.cell.MultiValuedCellSplitOperation; import com.google.refine.process.Process; -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 SplitMultiValuedCellsTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/cell/TransposeTests.java b/main/tests/server/src/com/google/refine/operations/cell/TransposeTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/operations/cell/TransposeTests.java rename to main/tests/server/src/com/google/refine/operations/cell/TransposeTests.java index 14917e5e0..9f3fc072f 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/cell/TransposeTests.java +++ b/main/tests/server/src/com/google/refine/operations/cell/TransposeTests.java @@ -31,17 +31,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.operations.cell; +package com.google.refine.operations.cell; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.cell.TransposeRowsIntoColumnsOperation; -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 TransposeTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/column/ColumnAdditionByFetchingURLsOperationTests.java b/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperationTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/operations/column/ColumnAdditionByFetchingURLsOperationTests.java rename to main/tests/server/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperationTests.java index f81007f6e..0338e57c0 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/column/ColumnAdditionByFetchingURLsOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperationTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.operations.column; +package com.google.refine.operations.column; import java.io.IOException; import java.net.InetAddress; @@ -46,6 +46,7 @@ import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; import com.fasterxml.jackson.databind.node.ObjectNode; +import com.google.refine.RefineTest; import com.google.refine.browsing.EngineConfig; import com.google.refine.expr.ExpressionUtils; import com.google.refine.model.AbstractOperation; @@ -60,9 +61,8 @@ import com.google.refine.operations.column.ColumnAdditionByFetchingURLsOperation import com.google.refine.operations.column.ColumnAdditionByFetchingURLsOperation.HttpHeader; import com.google.refine.process.Process; import com.google.refine.process.ProcessManager; -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 ColumnAdditionByFetchingURLsOperationTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/column/ColumnAdditionOperationTests.java b/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionOperationTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/operations/column/ColumnAdditionOperationTests.java rename to main/tests/server/src/com/google/refine/operations/column/ColumnAdditionOperationTests.java index 74cfd8993..d3845ca7e 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/column/ColumnAdditionOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionOperationTests.java @@ -24,16 +24,16 @@ * 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.operations.column; +package com.google.refine.operations.column; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.column.ColumnAdditionOperation; -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 ColumnAdditionOperationTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/column/ColumnMoveOperationTests.java b/main/tests/server/src/com/google/refine/operations/column/ColumnMoveOperationTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/operations/column/ColumnMoveOperationTests.java rename to main/tests/server/src/com/google/refine/operations/column/ColumnMoveOperationTests.java index ce220b892..4d9072044 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/column/ColumnMoveOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/column/ColumnMoveOperationTests.java @@ -24,16 +24,16 @@ * 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.operations.column; +package com.google.refine.operations.column; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.column.ColumnMoveOperation; -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 ColumnMoveOperationTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/column/ColumnRemovalOperationTests.java b/main/tests/server/src/com/google/refine/operations/column/ColumnRemovalOperationTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/operations/column/ColumnRemovalOperationTests.java rename to main/tests/server/src/com/google/refine/operations/column/ColumnRemovalOperationTests.java index 5eb5dcdaa..41f971a9c 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/column/ColumnRemovalOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/column/ColumnRemovalOperationTests.java @@ -24,16 +24,16 @@ * 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.operations.column; +package com.google.refine.operations.column; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.column.ColumnRemovalOperation; -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 ColumnRemovalOperationTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/column/ColumnRenameOperationTests.java b/main/tests/server/src/com/google/refine/operations/column/ColumnRenameOperationTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/operations/column/ColumnRenameOperationTests.java rename to main/tests/server/src/com/google/refine/operations/column/ColumnRenameOperationTests.java index 51066a2db..f613062d0 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/column/ColumnRenameOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/column/ColumnRenameOperationTests.java @@ -24,17 +24,17 @@ * 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.operations.column; +package com.google.refine.operations.column; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.model.AbstractOperation; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.column.ColumnRenameOperation; -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 ColumnRenameOperationTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/column/ColumnReorderOperationTests.java b/main/tests/server/src/com/google/refine/operations/column/ColumnReorderOperationTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/operations/column/ColumnReorderOperationTests.java rename to main/tests/server/src/com/google/refine/operations/column/ColumnReorderOperationTests.java index 97c1afeaf..77c6ca440 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/column/ColumnReorderOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/column/ColumnReorderOperationTests.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.operations.column; +package com.google.refine.operations.column; import java.util.Arrays; import java.util.Properties; @@ -34,13 +34,13 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.model.AbstractOperation; import com.google.refine.model.Project; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.column.ColumnReorderOperation; import com.google.refine.process.Process; -import com.google.refine.tests.RefineTest; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class ColumnReorderOperationTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/column/ColumnSplitOperationTests.java b/main/tests/server/src/com/google/refine/operations/column/ColumnSplitOperationTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/operations/column/ColumnSplitOperationTests.java rename to main/tests/server/src/com/google/refine/operations/column/ColumnSplitOperationTests.java index 5ce3ca9c5..28b2e0f7c 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/column/ColumnSplitOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/column/ColumnSplitOperationTests.java @@ -24,16 +24,16 @@ * 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.operations.column; +package com.google.refine.operations.column; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.column.ColumnSplitOperation; -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 ColumnSplitOperationTests extends RefineTest { @BeforeSuite diff --git a/main/tests/server/src/com/google/refine/tests/operations/recon/ExtendDataOperationTests.java b/main/tests/server/src/com/google/refine/operations/recon/ExtendDataOperationTests.java similarity index 99% rename from main/tests/server/src/com/google/refine/tests/operations/recon/ExtendDataOperationTests.java rename to main/tests/server/src/com/google/refine/operations/recon/ExtendDataOperationTests.java index a90c27651..95fd0836a 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/recon/ExtendDataOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/recon/ExtendDataOperationTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.operations.recon; +package com.google.refine.operations.recon; import static org.mockito.Mockito.mock; @@ -50,6 +50,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.browsing.EngineConfig; import com.google.refine.model.Cell; @@ -65,9 +66,8 @@ import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.recon.ExtendDataOperation; import com.google.refine.process.Process; import com.google.refine.process.ProcessManager; -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 ExtendDataOperationTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconClearSimilarCellsOperationTests.java b/main/tests/server/src/com/google/refine/operations/recon/ReconClearSimilarCellsOperationTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/operations/recon/ReconClearSimilarCellsOperationTests.java rename to main/tests/server/src/com/google/refine/operations/recon/ReconClearSimilarCellsOperationTests.java index 45ca890c7..aca949344 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconClearSimilarCellsOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/recon/ReconClearSimilarCellsOperationTests.java @@ -24,15 +24,15 @@ * 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.operations.recon; +package com.google.refine.operations.recon; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.recon.ReconClearSimilarCellsOperation; -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 ReconClearSimilarCellsOperationTests extends RefineTest { @BeforeSuite diff --git a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconCopyAcrossColumnsOperationTests.java b/main/tests/server/src/com/google/refine/operations/recon/ReconCopyAcrossColumnsOperationTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/operations/recon/ReconCopyAcrossColumnsOperationTests.java rename to main/tests/server/src/com/google/refine/operations/recon/ReconCopyAcrossColumnsOperationTests.java index 73693fe7e..33a73fa81 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconCopyAcrossColumnsOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/recon/ReconCopyAcrossColumnsOperationTests.java @@ -24,15 +24,15 @@ * 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.operations.recon; +package com.google.refine.operations.recon; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.recon.ReconCopyAcrossColumnsOperation; -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 ReconCopyAcrossColumnsOperationTests extends RefineTest { @BeforeSuite diff --git a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconDiscardJudgmentsOperationTests.java b/main/tests/server/src/com/google/refine/operations/recon/ReconDiscardJudgmentsOperationTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/operations/recon/ReconDiscardJudgmentsOperationTests.java rename to main/tests/server/src/com/google/refine/operations/recon/ReconDiscardJudgmentsOperationTests.java index 61a40f3e8..6c733fc97 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconDiscardJudgmentsOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/recon/ReconDiscardJudgmentsOperationTests.java @@ -24,15 +24,15 @@ * 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.operations.recon; +package com.google.refine.operations.recon; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.recon.ReconDiscardJudgmentsOperation; -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 ReconDiscardJudgmentsOperationTests extends RefineTest { @BeforeSuite diff --git a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconJudgeSimilarCellsOperationTests.java b/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperationTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/operations/recon/ReconJudgeSimilarCellsOperationTests.java rename to main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperationTests.java index 0d3847ba7..411c406d1 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconJudgeSimilarCellsOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperationTests.java @@ -24,15 +24,15 @@ * 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.operations.recon; +package com.google.refine.operations.recon; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.recon.ReconJudgeSimilarCellsOperation; -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 ReconJudgeSimilarCellsOperationTests extends RefineTest { @BeforeSuite diff --git a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconJudgeSimilarCellsTests.java b/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/operations/recon/ReconJudgeSimilarCellsTests.java rename to main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsTests.java index c281ff4a2..959e30a11 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconJudgeSimilarCellsTests.java +++ b/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsTests.java @@ -24,10 +24,10 @@ * 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.operations.recon; +package com.google.refine.operations.recon; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; import java.io.IOException; import java.util.Collections; @@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.browsing.EngineConfig; import com.google.refine.model.AbstractOperation; import com.google.refine.model.Cell; @@ -48,9 +49,8 @@ import com.google.refine.model.recon.StandardReconConfig; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.recon.ReconJudgeSimilarCellsOperation; import com.google.refine.process.Process; -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 ReconJudgeSimilarCellsTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconMarkNewTopicsOperationTests.java b/main/tests/server/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperationTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/operations/recon/ReconMarkNewTopicsOperationTests.java rename to main/tests/server/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperationTests.java index 1b8b39c79..582900c77 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconMarkNewTopicsOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperationTests.java @@ -24,15 +24,15 @@ * 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.operations.recon; +package com.google.refine.operations.recon; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.recon.ReconMarkNewTopicsOperation; -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 ReconMarkNewTopicsOperationTests extends RefineTest { @BeforeSuite diff --git a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconMatchBestCandidatesOperationTests.java b/main/tests/server/src/com/google/refine/operations/recon/ReconMatchBestCandidatesOperationTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/operations/recon/ReconMatchBestCandidatesOperationTests.java rename to main/tests/server/src/com/google/refine/operations/recon/ReconMatchBestCandidatesOperationTests.java index 93eaab7bf..3b5798b9d 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconMatchBestCandidatesOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/recon/ReconMatchBestCandidatesOperationTests.java @@ -24,15 +24,15 @@ * 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.operations.recon; +package com.google.refine.operations.recon; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.recon.ReconMatchBestCandidatesOperation; -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 ReconMatchBestCandidatesOperationTests extends RefineTest { @BeforeSuite diff --git a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconMatchSpecificTopicOperationTests.java b/main/tests/server/src/com/google/refine/operations/recon/ReconMatchSpecificTopicOperationTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/operations/recon/ReconMatchSpecificTopicOperationTests.java rename to main/tests/server/src/com/google/refine/operations/recon/ReconMatchSpecificTopicOperationTests.java index c5e85718a..2db14b5da 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconMatchSpecificTopicOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/recon/ReconMatchSpecificTopicOperationTests.java @@ -24,15 +24,15 @@ * 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.operations.recon; +package com.google.refine.operations.recon; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.recon.ReconMatchSpecificTopicOperation; -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 ReconMatchSpecificTopicOperationTests extends RefineTest { @BeforeSuite diff --git a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconOperationTests.java b/main/tests/server/src/com/google/refine/operations/recon/ReconOperationTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/operations/recon/ReconOperationTests.java rename to main/tests/server/src/com/google/refine/operations/recon/ReconOperationTests.java index af4e642fa..b57ea2d10 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/recon/ReconOperationTests.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.operations.recon; +package com.google.refine.operations.recon; import static org.mockito.Mockito.mock; @@ -33,14 +33,14 @@ import java.util.Properties; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.model.Project; import com.google.refine.model.recon.ReconConfig; import com.google.refine.model.recon.StandardReconConfig; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.recon.ReconOperation; -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 ReconOperationTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconUseValuesAsIdsOperationTests.java b/main/tests/server/src/com/google/refine/operations/recon/ReconUseValuesAsIdsOperationTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/operations/recon/ReconUseValuesAsIdsOperationTests.java rename to main/tests/server/src/com/google/refine/operations/recon/ReconUseValuesAsIdsOperationTests.java index 757d734a6..435063f9f 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/recon/ReconUseValuesAsIdsOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/recon/ReconUseValuesAsIdsOperationTests.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.operations.recon; +package com.google.refine.operations.recon; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; @@ -34,13 +34,13 @@ import java.util.Properties; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.model.Project; import com.google.refine.model.recon.StandardReconConfig; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.recon.ReconUseValuesAsIdentifiersOperation; -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 ReconUseValuesAsIdsOperationTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/row/DenormalizeOperationTests.java b/main/tests/server/src/com/google/refine/operations/row/DenormalizeOperationTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/operations/row/DenormalizeOperationTests.java rename to main/tests/server/src/com/google/refine/operations/row/DenormalizeOperationTests.java index 8eca563c5..b1448e691 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/row/DenormalizeOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/row/DenormalizeOperationTests.java @@ -24,15 +24,15 @@ * 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.operations.row; +package com.google.refine.operations.row; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.row.DenormalizeOperation; -import com.google.refine.tests.RefineTest; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class DenormalizeOperationTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/row/RowFlagOperationTests.java b/main/tests/server/src/com/google/refine/operations/row/RowFlagOperationTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/operations/row/RowFlagOperationTests.java rename to main/tests/server/src/com/google/refine/operations/row/RowFlagOperationTests.java index 2f526a7e2..9e567e938 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/row/RowFlagOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/row/RowFlagOperationTests.java @@ -24,16 +24,16 @@ * 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.operations.row; +package com.google.refine.operations.row; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.row.RowFlagOperation; -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 RowFlagOperationTests extends RefineTest { @BeforeSuite diff --git a/main/tests/server/src/com/google/refine/tests/operations/row/RowRemovalOperationTests.java b/main/tests/server/src/com/google/refine/operations/row/RowRemovalOperationTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/operations/row/RowRemovalOperationTests.java rename to main/tests/server/src/com/google/refine/operations/row/RowRemovalOperationTests.java index c655dbbf1..3a2eb4f50 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/row/RowRemovalOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/row/RowRemovalOperationTests.java @@ -24,18 +24,18 @@ * 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.operations.row; +package com.google.refine.operations.row; import java.io.IOException; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.row.RowRemovalOperation; -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 RowRemovalOperationTests extends RefineTest { @BeforeSuite diff --git a/main/tests/server/src/com/google/refine/tests/operations/row/RowReorderOperationTests.java b/main/tests/server/src/com/google/refine/operations/row/RowReorderOperationTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/operations/row/RowReorderOperationTests.java rename to main/tests/server/src/com/google/refine/operations/row/RowReorderOperationTests.java index 018313c97..94a4c0cc2 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/row/RowReorderOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/row/RowReorderOperationTests.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.operations.row; +package com.google.refine.operations.row; import java.util.Properties; @@ -35,6 +35,7 @@ import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; import com.google.refine.ProjectManager; +import com.google.refine.RefineTest; import com.google.refine.browsing.Engine.Mode; import com.google.refine.model.AbstractOperation; import com.google.refine.model.Cell; @@ -43,9 +44,8 @@ import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.row.RowReorderOperation; import com.google.refine.process.Process; import com.google.refine.sorting.SortingConfig; -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 RowReorderOperationTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/operations/row/RowStarOperationTests.java b/main/tests/server/src/com/google/refine/operations/row/RowStarOperationTests.java similarity index 94% rename from main/tests/server/src/com/google/refine/tests/operations/row/RowStarOperationTests.java rename to main/tests/server/src/com/google/refine/operations/row/RowStarOperationTests.java index 9265efb40..a3a321768 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/row/RowStarOperationTests.java +++ b/main/tests/server/src/com/google/refine/operations/row/RowStarOperationTests.java @@ -24,16 +24,16 @@ * 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.operations.row; +package com.google.refine.operations.row; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.google.refine.RefineTest; import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.row.RowStarOperation; -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 RowStarOperationTests extends RefineTest { @BeforeSuite diff --git a/main/tests/server/src/com/google/refine/tests/preference/PreferenceStoreTests.java b/main/tests/server/src/com/google/refine/preference/PreferenceStoreTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/preference/PreferenceStoreTests.java rename to main/tests/server/src/com/google/refine/preference/PreferenceStoreTests.java index 441da7d22..9eb25916f 100644 --- a/main/tests/server/src/com/google/refine/tests/preference/PreferenceStoreTests.java +++ b/main/tests/server/src/com/google/refine/preference/PreferenceStoreTests.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.preference; +package com.google.refine.preference; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -36,8 +36,8 @@ import org.testng.annotations.Test; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; import com.google.refine.preference.PreferenceStore; -import com.google.refine.tests.util.TestUtils; import com.google.refine.util.ParsingUtilities; +import com.google.refine.util.TestUtils; public class PreferenceStoreTests { public static String json = "{" diff --git a/main/tests/server/src/com/google/refine/tests/preference/TopListTests.java b/main/tests/server/src/com/google/refine/preference/TopListTests.java similarity index 97% rename from main/tests/server/src/com/google/refine/tests/preference/TopListTests.java rename to main/tests/server/src/com/google/refine/preference/TopListTests.java index ba441d8b2..05e8a11a5 100644 --- a/main/tests/server/src/com/google/refine/tests/preference/TopListTests.java +++ b/main/tests/server/src/com/google/refine/preference/TopListTests.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.preference; +package com.google.refine.preference; import java.io.IOException; import java.util.Collections; @@ -35,8 +35,8 @@ import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; import com.google.refine.preference.PreferenceValue; import com.google.refine.preference.TopList; -import com.google.refine.tests.util.TestUtils; import com.google.refine.util.ParsingUtilities; +import com.google.refine.util.TestUtils; public class TopListTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/process/HistoryProcessTests.java b/main/tests/server/src/com/google/refine/process/HistoryProcessTests.java similarity index 95% rename from main/tests/server/src/com/google/refine/tests/process/HistoryProcessTests.java rename to main/tests/server/src/com/google/refine/process/HistoryProcessTests.java index a333b56f4..6def43732 100644 --- a/main/tests/server/src/com/google/refine/tests/process/HistoryProcessTests.java +++ b/main/tests/server/src/com/google/refine/process/HistoryProcessTests.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.process; +package com.google.refine.process; import static org.mockito.Mockito.mock; @@ -37,9 +37,9 @@ import com.google.refine.history.HistoryEntry; import com.google.refine.history.HistoryProcess; import com.google.refine.model.AbstractOperation; import com.google.refine.model.Project; +import com.google.refine.util.TestUtils; import com.google.refine.ProjectMetadata; -import com.google.refine.tests.RefineTest; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.RefineTest; public class HistoryProcessTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/process/LongRunningProcessTests.java b/main/tests/server/src/com/google/refine/process/LongRunningProcessTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/process/LongRunningProcessTests.java rename to main/tests/server/src/com/google/refine/process/LongRunningProcessTests.java index e2454da7c..2afc04c0b 100644 --- a/main/tests/server/src/com/google/refine/tests/process/LongRunningProcessTests.java +++ b/main/tests/server/src/com/google/refine/process/LongRunningProcessTests.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.process; +package com.google.refine.process; import org.testng.annotations.Test; import com.google.refine.process.LongRunningProcess; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class LongRunningProcessTests { diff --git a/main/tests/server/src/com/google/refine/tests/process/ProcessManagerTests.java b/main/tests/server/src/com/google/refine/process/ProcessManagerTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/process/ProcessManagerTests.java rename to main/tests/server/src/com/google/refine/process/ProcessManagerTests.java index cd8abbace..4e396429b 100644 --- a/main/tests/server/src/com/google/refine/tests/process/ProcessManagerTests.java +++ b/main/tests/server/src/com/google/refine/process/ProcessManagerTests.java @@ -24,15 +24,15 @@ * 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.process; +package com.google.refine.process; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import com.google.refine.process.Process; import com.google.refine.process.ProcessManager; -import com.google.refine.tests.util.TestUtils; import com.google.refine.util.ParsingUtilities; +import com.google.refine.util.TestUtils; public class ProcessManagerTests { diff --git a/main/tests/server/src/com/google/refine/tests/process/QuickHistoryEntryProcessTests.java b/main/tests/server/src/com/google/refine/process/QuickHistoryEntryProcessTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/process/QuickHistoryEntryProcessTests.java rename to main/tests/server/src/com/google/refine/process/QuickHistoryEntryProcessTests.java index 335163bdf..d98ca21f2 100644 --- a/main/tests/server/src/com/google/refine/tests/process/QuickHistoryEntryProcessTests.java +++ b/main/tests/server/src/com/google/refine/process/QuickHistoryEntryProcessTests.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.process; +package com.google.refine.process; import static org.mockito.Mockito.mock; @@ -34,7 +34,7 @@ import com.google.refine.history.HistoryEntry; import com.google.refine.model.Project; import com.google.refine.process.Process; import com.google.refine.process.QuickHistoryEntryProcess; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class QuickHistoryEntryProcessTests { public static class QuickHistoryEntryProcessStub extends QuickHistoryEntryProcess { diff --git a/main/tests/server/src/com/google/refine/tests/sorting/BooleanCriterionTest.java b/main/tests/server/src/com/google/refine/sorting/BooleanCriterionTest.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/sorting/BooleanCriterionTest.java rename to main/tests/server/src/com/google/refine/sorting/BooleanCriterionTest.java index be36737d3..81b06616c 100644 --- a/main/tests/server/src/com/google/refine/tests/sorting/BooleanCriterionTest.java +++ b/main/tests/server/src/com/google/refine/sorting/BooleanCriterionTest.java @@ -24,15 +24,15 @@ * 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.sorting; +package com.google.refine.sorting; import java.io.IOException; import org.testng.annotations.Test; import com.google.refine.sorting.Criterion; -import com.google.refine.tests.util.TestUtils; import com.google.refine.util.ParsingUtilities; +import com.google.refine.util.TestUtils; public class BooleanCriterionTest { @Test diff --git a/main/tests/server/src/com/google/refine/tests/sorting/DateCriterionTest.java b/main/tests/server/src/com/google/refine/sorting/DateCriterionTest.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/sorting/DateCriterionTest.java rename to main/tests/server/src/com/google/refine/sorting/DateCriterionTest.java index 801139e73..af654e88b 100644 --- a/main/tests/server/src/com/google/refine/tests/sorting/DateCriterionTest.java +++ b/main/tests/server/src/com/google/refine/sorting/DateCriterionTest.java @@ -24,15 +24,15 @@ * 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.sorting; +package com.google.refine.sorting; import java.io.IOException; import org.testng.annotations.Test; import com.google.refine.sorting.Criterion; -import com.google.refine.tests.util.TestUtils; import com.google.refine.util.ParsingUtilities; +import com.google.refine.util.TestUtils; public class DateCriterionTest { @Test diff --git a/main/tests/server/src/com/google/refine/tests/sorting/NumberCriterionTest.java b/main/tests/server/src/com/google/refine/sorting/NumberCriterionTest.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/sorting/NumberCriterionTest.java rename to main/tests/server/src/com/google/refine/sorting/NumberCriterionTest.java index 4dd70e4e7..0420ec11a 100644 --- a/main/tests/server/src/com/google/refine/tests/sorting/NumberCriterionTest.java +++ b/main/tests/server/src/com/google/refine/sorting/NumberCriterionTest.java @@ -24,15 +24,15 @@ * 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.sorting; +package com.google.refine.sorting; import java.io.IOException; import org.testng.annotations.Test; import com.google.refine.sorting.Criterion; -import com.google.refine.tests.util.TestUtils; import com.google.refine.util.ParsingUtilities; +import com.google.refine.util.TestUtils; public class NumberCriterionTest { @Test diff --git a/main/tests/server/src/com/google/refine/tests/sorting/SortingConfigTests.java b/main/tests/server/src/com/google/refine/sorting/SortingConfigTests.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/sorting/SortingConfigTests.java rename to main/tests/server/src/com/google/refine/sorting/SortingConfigTests.java index 1bbd0c4d7..9edc6fbb1 100644 --- a/main/tests/server/src/com/google/refine/tests/sorting/SortingConfigTests.java +++ b/main/tests/server/src/com/google/refine/sorting/SortingConfigTests.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.sorting; +package com.google.refine.sorting; import java.io.IOException; import org.testng.annotations.Test; import com.google.refine.sorting.SortingConfig; -import com.google.refine.tests.util.TestUtils; +import com.google.refine.util.TestUtils; public class SortingConfigTests { @Test diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/CrossTests.java b/main/tests/server/src/com/google/refine/tests/expr/functions/CrossTests.java deleted file mode 100644 index 634967b23..000000000 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/CrossTests.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2018, OpenRefine contributors - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * 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; - -import org.testng.annotations.Test; - -import com.google.refine.expr.functions.Cross; -import com.google.refine.tests.util.TestUtils; - -public class CrossTests { - @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); - } -} - diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ContainsTests.java b/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ContainsTests.java deleted file mode 100644 index 3821af662..000000000 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/ContainsTests.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2018, OpenRefine contributors - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * 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.strings; - -import org.testng.annotations.Test; - -import com.google.refine.expr.functions.strings.Contains; -import com.google.refine.tests.util.TestUtils; - -public class ContainsTests { - @Test - public void serializeContains() { - String json = "{\"description\":\"Returns whether s contains frag\",\"params\":\"string s, string frag\",\"returns\":\"boolean\"}"; - TestUtils.isSerializedTo(new Contains(), json); - } -} - diff --git a/main/tests/server/src/com/google/refine/tests/util/ParsingUtilitiesTests.java b/main/tests/server/src/com/google/refine/util/ParsingUtilitiesTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/util/ParsingUtilitiesTests.java rename to main/tests/server/src/com/google/refine/util/ParsingUtilitiesTests.java index 609513b8a..ba51f43c4 100644 --- a/main/tests/server/src/com/google/refine/tests/util/ParsingUtilitiesTests.java +++ b/main/tests/server/src/com/google/refine/util/ParsingUtilitiesTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.util; +package com.google.refine.util; import java.time.OffsetDateTime; import java.time.format.DateTimeFormatter; @@ -45,7 +45,7 @@ import org.testng.Assert; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; -import com.google.refine.tests.RefineTest; +import com.google.refine.RefineTest; import com.google.refine.util.ParsingUtilities; public class ParsingUtilitiesTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/util/PatternSyntaxExceptionParserTests.java b/main/tests/server/src/com/google/refine/util/PatternSyntaxExceptionParserTests.java similarity index 98% rename from main/tests/server/src/com/google/refine/tests/util/PatternSyntaxExceptionParserTests.java rename to main/tests/server/src/com/google/refine/util/PatternSyntaxExceptionParserTests.java index b87e32e40..39db09adf 100644 --- a/main/tests/server/src/com/google/refine/tests/util/PatternSyntaxExceptionParserTests.java +++ b/main/tests/server/src/com/google/refine/util/PatternSyntaxExceptionParserTests.java @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.google.refine.tests.util; +package com.google.refine.util; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; @@ -41,7 +41,7 @@ import org.testng.Assert; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; -import com.google.refine.tests.RefineTest; +import com.google.refine.RefineTest; import com.google.refine.util.PatternSyntaxExceptionParser; public class PatternSyntaxExceptionParserTests extends RefineTest { diff --git a/main/tests/server/src/com/google/refine/tests/util/TestUtils.java b/main/tests/server/src/com/google/refine/util/TestUtils.java similarity index 96% rename from main/tests/server/src/com/google/refine/tests/util/TestUtils.java rename to main/tests/server/src/com/google/refine/util/TestUtils.java index 77bf2b266..8b5993adb 100644 --- a/main/tests/server/src/com/google/refine/tests/util/TestUtils.java +++ b/main/tests/server/src/com/google/refine/util/TestUtils.java @@ -24,10 +24,10 @@ * 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.util; +package com.google.refine.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; import java.io.File; import java.io.IOException; @@ -35,7 +35,6 @@ import java.io.LineNumberReader; import java.io.StringReader; import java.io.StringWriter; -import com.fasterxml.jackson.core.JsonFactory.Feature; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -46,7 +45,6 @@ import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; import com.fasterxml.jackson.databind.SerializationFeature; -import com.google.refine.util.ParsingUtilities; public class TestUtils { @@ -86,7 +84,7 @@ public class TestUtils { if (!jsonA.equals(jsonB)) { jsonDiff(expected, actual); } - assertEquals(jsonA, jsonB); + assertTrue(jsonA.equals(jsonB)); } catch(Exception e) { fail("\""+expected+"\" and \""+actual+"\" are not equal as JSON strings."); }