Revert - Move all tests under src/test directory - closes apache/incubator-pirk#70
diff --git a/pom.xml b/pom.xml
index 5a68e32..ff2eb3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -451,6 +451,7 @@
<version>3.0.1</version>
<configuration>
<excludes>
+ <exclude>org/apache/pirk/benchmark/**</exclude>
<exclude>*/openjdk/**</exclude>
<exclude>generated-sources/**</exclude>
</excludes>
@@ -463,6 +464,7 @@
<version>3.0.1</version>
<configuration>
<excludes>
+ <exclude>org/apache/pirk/benchmark/**</exclude>
<exclude>*/openjdk/**</exclude>
<exclude>generated-sources/**</exclude>
</excludes>
diff --git a/src/test/java/org/apache/pirk/test/benchmark/BenchmarkDriver.java b/src/main/java/org/apache/pirk/benchmark/BenchmarkDriver.java
similarity index 96%
rename from src/test/java/org/apache/pirk/test/benchmark/BenchmarkDriver.java
rename to src/main/java/org/apache/pirk/benchmark/BenchmarkDriver.java
index e71c487..a24d0da 100644
--- a/src/test/java/org/apache/pirk/test/benchmark/BenchmarkDriver.java
+++ b/src/main/java/org/apache/pirk/benchmark/BenchmarkDriver.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.pirk.test.benchmark;
+package org.apache.pirk.benchmark;
import java.io.IOException;
diff --git a/src/test/java/org/apache/pirk/test/benchmark/PaillierBenchmark.java b/src/main/java/org/apache/pirk/benchmark/PaillierBenchmark.java
similarity index 98%
rename from src/test/java/org/apache/pirk/test/benchmark/PaillierBenchmark.java
rename to src/main/java/org/apache/pirk/benchmark/PaillierBenchmark.java
index 15533b5..95f850d 100644
--- a/src/test/java/org/apache/pirk/test/benchmark/PaillierBenchmark.java
+++ b/src/main/java/org/apache/pirk/benchmark/PaillierBenchmark.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.pirk.test.benchmark;
+package org.apache.pirk.benchmark;
import java.math.BigInteger;
diff --git a/src/test/java/org/apache/pirk/test/distributed/DistributedTestCLI.java b/src/main/java/org/apache/pirk/test/distributed/DistributedTestCLI.java
similarity index 100%
rename from src/test/java/org/apache/pirk/test/distributed/DistributedTestCLI.java
rename to src/main/java/org/apache/pirk/test/distributed/DistributedTestCLI.java
diff --git a/src/test/java/org/apache/pirk/test/distributed/DistributedTestDriver.java b/src/main/java/org/apache/pirk/test/distributed/DistributedTestDriver.java
similarity index 100%
rename from src/test/java/org/apache/pirk/test/distributed/DistributedTestDriver.java
rename to src/main/java/org/apache/pirk/test/distributed/DistributedTestDriver.java
diff --git a/src/test/java/org/apache/pirk/test/distributed/testsuite/DistTestSuite.java b/src/main/java/org/apache/pirk/test/distributed/testsuite/DistTestSuite.java
similarity index 100%
rename from src/test/java/org/apache/pirk/test/distributed/testsuite/DistTestSuite.java
rename to src/main/java/org/apache/pirk/test/distributed/testsuite/DistTestSuite.java
diff --git a/src/test/java/org/apache/pirk/test/utils/BaseTests.java b/src/main/java/org/apache/pirk/test/utils/BaseTests.java
similarity index 100%
rename from src/test/java/org/apache/pirk/test/utils/BaseTests.java
rename to src/main/java/org/apache/pirk/test/utils/BaseTests.java
diff --git a/src/test/java/org/apache/pirk/test/utils/Inputs.java b/src/main/java/org/apache/pirk/test/utils/Inputs.java
similarity index 100%
rename from src/test/java/org/apache/pirk/test/utils/Inputs.java
rename to src/main/java/org/apache/pirk/test/utils/Inputs.java
diff --git a/src/test/java/org/apache/pirk/test/utils/StandaloneQuery.java b/src/main/java/org/apache/pirk/test/utils/StandaloneQuery.java
similarity index 100%
rename from src/test/java/org/apache/pirk/test/utils/StandaloneQuery.java
rename to src/main/java/org/apache/pirk/test/utils/StandaloneQuery.java
diff --git a/src/test/java/org/apache/pirk/test/utils/TestUtils.java b/src/main/java/org/apache/pirk/test/utils/TestUtils.java
similarity index 100%
rename from src/test/java/org/apache/pirk/test/utils/TestUtils.java
rename to src/main/java/org/apache/pirk/test/utils/TestUtils.java
diff --git a/src/test/java/org/apache/pirk/test/general/ISO8601DateParserTest.java b/src/test/java/org/apache/pirk/general/ISO8601DateParserTest.java
similarity index 97%
rename from src/test/java/org/apache/pirk/test/general/ISO8601DateParserTest.java
rename to src/test/java/org/apache/pirk/general/ISO8601DateParserTest.java
index 9821db3..786f289 100644
--- a/src/test/java/org/apache/pirk/test/general/ISO8601DateParserTest.java
+++ b/src/test/java/org/apache/pirk/general/ISO8601DateParserTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pirk.test.general;
+package org.apache.pirk.general;
import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/apache/pirk/test/general/KeyedHashTest.java b/src/test/java/org/apache/pirk/general/KeyedHashTest.java
similarity index 98%
rename from src/test/java/org/apache/pirk/test/general/KeyedHashTest.java
rename to src/test/java/org/apache/pirk/general/KeyedHashTest.java
index e53cebf..676609f 100644
--- a/src/test/java/org/apache/pirk/test/general/KeyedHashTest.java
+++ b/src/test/java/org/apache/pirk/general/KeyedHashTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pirk.test.general;
+package org.apache.pirk.general;
import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/apache/pirk/test/general/PaillierTest.java b/src/test/java/org/apache/pirk/general/PaillierTest.java
similarity index 99%
rename from src/test/java/org/apache/pirk/test/general/PaillierTest.java
rename to src/test/java/org/apache/pirk/general/PaillierTest.java
index 6aa1396..14347fa 100644
--- a/src/test/java/org/apache/pirk/test/general/PaillierTest.java
+++ b/src/test/java/org/apache/pirk/general/PaillierTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pirk.test.general;
+package org.apache.pirk.general;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
diff --git a/src/test/java/org/apache/pirk/test/general/PartitionUtilsTest.java b/src/test/java/org/apache/pirk/general/PartitionUtilsTest.java
similarity index 99%
rename from src/test/java/org/apache/pirk/test/general/PartitionUtilsTest.java
rename to src/test/java/org/apache/pirk/general/PartitionUtilsTest.java
index c1022ad..6f779cd 100644
--- a/src/test/java/org/apache/pirk/test/general/PartitionUtilsTest.java
+++ b/src/test/java/org/apache/pirk/general/PartitionUtilsTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pirk.test.general;
+package org.apache.pirk.general;
import org.apache.pirk.schema.data.partitioner.IPDataPartitioner;
import org.apache.pirk.schema.data.partitioner.ISO8601DatePartitioner;
diff --git a/src/test/java/org/apache/pirk/test/general/QueryParserUtilsTest.java b/src/test/java/org/apache/pirk/general/QueryParserUtilsTest.java
similarity index 99%
rename from src/test/java/org/apache/pirk/test/general/QueryParserUtilsTest.java
rename to src/test/java/org/apache/pirk/general/QueryParserUtilsTest.java
index b3db140..9ac2522 100644
--- a/src/test/java/org/apache/pirk/test/general/QueryParserUtilsTest.java
+++ b/src/test/java/org/apache/pirk/general/QueryParserUtilsTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pirk.test.general;
+package org.apache.pirk.general;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/org/apache/pirk/test/schema/data/LoadDataSchemaTest.java b/src/test/java/org/apache/pirk/schema/data/LoadDataSchemaTest.java
similarity index 97%
rename from src/test/java/org/apache/pirk/test/schema/data/LoadDataSchemaTest.java
rename to src/test/java/org/apache/pirk/schema/data/LoadDataSchemaTest.java
index 9f52af3..3aa500b 100644
--- a/src/test/java/org/apache/pirk/test/schema/data/LoadDataSchemaTest.java
+++ b/src/test/java/org/apache/pirk/schema/data/LoadDataSchemaTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pirk.test.schema.data;
+package org.apache.pirk.schema.data;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -32,9 +32,6 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.apache.pirk.schema.data.DataSchema;
-import org.apache.pirk.schema.data.DataSchemaLoader;
-import org.apache.pirk.schema.data.DataSchemaRegistry;
import org.apache.pirk.schema.data.partitioner.IPDataPartitioner;
import org.apache.pirk.schema.data.partitioner.PrimitiveTypePartitioner;
import org.apache.pirk.test.utils.TestUtils;
diff --git a/src/test/java/org/apache/pirk/test/schema/query/LoadQuerySchemaTest.java b/src/test/java/org/apache/pirk/schema/query/LoadQuerySchemaTest.java
similarity index 98%
rename from src/test/java/org/apache/pirk/test/schema/query/LoadQuerySchemaTest.java
rename to src/test/java/org/apache/pirk/schema/query/LoadQuerySchemaTest.java
index ee683b2..55cb0a9 100644
--- a/src/test/java/org/apache/pirk/test/schema/query/LoadQuerySchemaTest.java
+++ b/src/test/java/org/apache/pirk/schema/query/LoadQuerySchemaTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pirk.test.schema.query;
+package org.apache.pirk.schema.query;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -37,9 +37,6 @@
import org.apache.pirk.schema.data.DataSchemaLoader;
import org.apache.pirk.schema.data.partitioner.IPDataPartitioner;
import org.apache.pirk.schema.data.partitioner.PrimitiveTypePartitioner;
-import org.apache.pirk.schema.query.QuerySchema;
-import org.apache.pirk.schema.query.QuerySchemaLoader;
-import org.apache.pirk.schema.query.QuerySchemaRegistry;
import org.apache.pirk.schema.query.filter.StopListFilter;
import org.apache.pirk.test.utils.Inputs;
import org.apache.pirk.test.utils.TestUtils;
diff --git a/src/test/java/org/apache/pirk/test/serialization/SerializationTest.java b/src/test/java/org/apache/pirk/serialization/SerializationTest.java
similarity index 94%
rename from src/test/java/org/apache/pirk/test/serialization/SerializationTest.java
rename to src/test/java/org/apache/pirk/serialization/SerializationTest.java
index 57fe559..8689d43 100644
--- a/src/test/java/org/apache/pirk/test/serialization/SerializationTest.java
+++ b/src/test/java/org/apache/pirk/serialization/SerializationTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pirk.test.serialization;
+package org.apache.pirk.serialization;
import java.io.File;
import java.io.FileInputStream;
@@ -25,9 +25,6 @@
import java.util.Objects;
import java.util.Random;
-import org.apache.pirk.serialization.JavaSerializer;
-import org.apache.pirk.serialization.JsonSerializer;
-import org.apache.pirk.serialization.Storable;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Rule;
diff --git a/src/test/java/org/apache/pirk/test/wideskies/standalone/StandaloneTest.java b/src/test/java/org/apache/pirk/wideskies/standalone/StandaloneTest.java
similarity index 98%
rename from src/test/java/org/apache/pirk/test/wideskies/standalone/StandaloneTest.java
rename to src/test/java/org/apache/pirk/wideskies/standalone/StandaloneTest.java
index 5175470..06c2bff 100644
--- a/src/test/java/org/apache/pirk/test/wideskies/standalone/StandaloneTest.java
+++ b/src/test/java/org/apache/pirk/wideskies/standalone/StandaloneTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pirk.test.wideskies.standalone;
+package org.apache.pirk.wideskies.standalone;
import java.util.ArrayList;
