You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2021/05/11 05:25:17 UTC
[datasketches-memory] 01/04: Initial move of all test classes to
memory.test.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch noSplitPackage
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
commit 67abafc4e62390cd3a753b9c9acb3bde909a804d
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Tue May 4 16:03:24 2021 -0700
Initial move of all test classes to memory.test.
Lots of errors.
---
.../{ => test}/AllocateDirectMapMemoryTest.java | 4 +++-
.../memory/{ => test}/AllocateDirectMemoryTest.java | 8 +++++++-
.../AllocateDirectWritableMapMemoryTest.java | 9 ++++++++-
.../memory/{ => test}/BaseBufferTest.java | 6 +++++-
.../memory/{ => test}/BaseStateTest.java | 9 ++++++++-
.../datasketches/memory/{ => test}/Buffer2Test.java | 7 ++++++-
.../memory/{ => test}/BufferBoundaryCheckTest.java | 3 ++-
.../memory/{ => test}/BufferInvariantsTest.java | 6 +++++-
.../memory/{ => test}/BufferReadWriteSafetyTest.java | 6 +++++-
.../datasketches/memory/{ => test}/BufferTest.java | 7 ++++++-
.../memory/{ => test}/CommonBufferTest.java | 5 ++++-
.../memory/{ => test}/CommonMemoryTest.java | 4 +++-
.../memory/{ => test}/CopyMemoryOverlapTest.java | 5 ++++-
.../memory/{ => test}/CopyMemoryTest.java | 5 ++++-
.../{ => test}/ExampleMemoryRequestServerTest.java | 5 ++++-
.../memory/{ => test}/IgnoredArrayOverflowTest.java | 4 +++-
.../memory/{ => test}/IsValidUtf8TestUtil.java | 2 +-
.../datasketches/memory/{ => test}/LeafImplTest.java | 7 ++++++-
.../memory/{ => test}/MemoryBoundaryCheckTest.java | 4 +++-
.../memory/{ => test}/MemoryReadWriteSafetyTest.java | 6 +++++-
.../datasketches/memory/{ => test}/MemoryTest.java | 8 +++++++-
.../memory/{ => test}/MemoryWriteToTest.java | 6 +++++-
.../datasketches/memory/{ => test}/NioBitsTest.java | 3 ++-
.../{ => test}/NonNativeWritableBufferImplTest.java | 5 ++++-
.../{ => test}/NonNativeWritableMemoryImplTest.java | 4 +++-
.../memory/{ => test}/SpecificLeafTest.java | 8 +++++++-
.../memory/{ => test}/UnsafeUtilTest.java | 5 ++++-
.../datasketches/memory/{ => test}/Utf8Test.java | 7 ++++++-
.../datasketches/memory/{ => test}/UtilTest.java | 6 +++++-
.../memory/{ => test}/WritableBufferImplTest.java | 10 +++++++++-
.../memory/{ => test}/WritableDirectCopyTest.java | 5 ++++-
.../memory/{ => test}/WritableMemoryImplTest.java | 10 +++++++++-
.../memory/{ => test}/WritableMemoryTest.java | 6 +++++-
.../memory/{ => test}/XxHash64LoopingTest.java | 3 ++-
.../datasketches/memory/{ => test}/XxHash64Test.java | 5 ++++-
.../memory/{ => test}/ZeroCapacityTest.java | 4 +++-
.../datasketches/memory/test/package-info.java | 20 ++++++++++++++++++++
37 files changed, 191 insertions(+), 36 deletions(-)
diff --git a/src/test/java/org/apache/datasketches/memory/AllocateDirectMapMemoryTest.java b/src/test/java/org/apache/datasketches/memory/test/AllocateDirectMapMemoryTest.java
similarity index 97%
rename from src/test/java/org/apache/datasketches/memory/AllocateDirectMapMemoryTest.java
rename to src/test/java/org/apache/datasketches/memory/test/AllocateDirectMapMemoryTest.java
index c3e2bb6..c5fae90 100644
--- a/src/test/java/org/apache/datasketches/memory/AllocateDirectMapMemoryTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/AllocateDirectMapMemoryTest.java
@@ -21,7 +21,7 @@
* Note: Lincoln's Gettysburg Address is in the public domain. See LICENSE.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.apache.datasketches.memory.Util.*;
import static org.testng.Assert.assertEquals;
@@ -32,6 +32,8 @@ import static org.testng.Assert.fail;
import java.io.File;
import java.nio.ByteOrder;
+import org.apache.datasketches.memory.MapHandle;
+import org.apache.datasketches.memory.Memory;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/memory/AllocateDirectMemoryTest.java b/src/test/java/org/apache/datasketches/memory/test/AllocateDirectMemoryTest.java
similarity index 90%
rename from src/test/java/org/apache/datasketches/memory/AllocateDirectMemoryTest.java
rename to src/test/java/org/apache/datasketches/memory/test/AllocateDirectMemoryTest.java
index dcd76da..877ee5c 100644
--- a/src/test/java/org/apache/datasketches/memory/AllocateDirectMemoryTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/AllocateDirectMemoryTest.java
@@ -17,13 +17,19 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.fail;
+import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.BaseWritableMemoryImpl;
+import org.apache.datasketches.memory.MemoryRequestServer;
+import org.apache.datasketches.memory.WritableDirectHandle;
+import org.apache.datasketches.memory.WritableHandle;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.AfterClass;
import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/memory/AllocateDirectWritableMapMemoryTest.java b/src/test/java/org/apache/datasketches/memory/test/AllocateDirectWritableMapMemoryTest.java
similarity index 95%
rename from src/test/java/org/apache/datasketches/memory/AllocateDirectWritableMapMemoryTest.java
rename to src/test/java/org/apache/datasketches/memory/test/AllocateDirectWritableMapMemoryTest.java
index bdf361f..dd56842 100644
--- a/src/test/java/org/apache/datasketches/memory/AllocateDirectWritableMapMemoryTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/AllocateDirectWritableMapMemoryTest.java
@@ -21,7 +21,7 @@
* Note: Lincoln's Gettysburg Address is in the public domain. See LICENSE.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.datasketches.memory.AllocateDirectMap.isFileReadOnly;
@@ -37,6 +37,13 @@ import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.nio.ByteOrder;
+import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.MapHandle;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.ReadOnlyException;
+import org.apache.datasketches.memory.WritableHandle;
+import org.apache.datasketches.memory.WritableMapHandle;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/memory/BaseBufferTest.java b/src/test/java/org/apache/datasketches/memory/test/BaseBufferTest.java
similarity index 90%
rename from src/test/java/org/apache/datasketches/memory/BaseBufferTest.java
rename to src/test/java/org/apache/datasketches/memory/test/BaseBufferTest.java
index de41755..ed02c79 100644
--- a/src/test/java/org/apache/datasketches/memory/BaseBufferTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/BaseBufferTest.java
@@ -17,10 +17,14 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.testng.Assert.fail;
+import org.apache.datasketches.memory.Buffer;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.WritableHandle;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
/**
diff --git a/src/test/java/org/apache/datasketches/memory/BaseStateTest.java b/src/test/java/org/apache/datasketches/memory/test/BaseStateTest.java
similarity index 89%
rename from src/test/java/org/apache/datasketches/memory/BaseStateTest.java
rename to src/test/java/org/apache/datasketches/memory/test/BaseStateTest.java
index 4f6ae7b..2151b05 100644
--- a/src/test/java/org/apache/datasketches/memory/BaseStateTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/BaseStateTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE;
import static org.testng.Assert.assertEquals;
@@ -27,6 +27,13 @@ import static org.testng.Assert.fail;
import java.nio.ByteOrder;
+import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Buffer;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.Prim;
+import org.apache.datasketches.memory.StepBoolean;
+import org.apache.datasketches.memory.WritableBuffer;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
diff --git a/src/test/java/org/apache/datasketches/memory/Buffer2Test.java b/src/test/java/org/apache/datasketches/memory/test/Buffer2Test.java
similarity index 97%
rename from src/test/java/org/apache/datasketches/memory/Buffer2Test.java
rename to src/test/java/org/apache/datasketches/memory/test/Buffer2Test.java
index f7683b9..cf984b8 100644
--- a/src/test/java/org/apache/datasketches/memory/Buffer2Test.java
+++ b/src/test/java/org/apache/datasketches/memory/test/Buffer2Test.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
@@ -26,6 +26,11 @@ import static org.testng.Assert.assertTrue;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
+import org.apache.datasketches.memory.Buffer;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.ReadOnlyException;
+import org.apache.datasketches.memory.WritableBuffer;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
diff --git a/src/test/java/org/apache/datasketches/memory/BufferBoundaryCheckTest.java b/src/test/java/org/apache/datasketches/memory/test/BufferBoundaryCheckTest.java
similarity index 98%
rename from src/test/java/org/apache/datasketches/memory/BufferBoundaryCheckTest.java
rename to src/test/java/org/apache/datasketches/memory/test/BufferBoundaryCheckTest.java
index cbdf531..03d428d 100644
--- a/src/test/java/org/apache/datasketches/memory/BufferBoundaryCheckTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/BufferBoundaryCheckTest.java
@@ -17,8 +17,9 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
diff --git a/src/test/java/org/apache/datasketches/memory/BufferInvariantsTest.java b/src/test/java/org/apache/datasketches/memory/test/BufferInvariantsTest.java
similarity index 97%
rename from src/test/java/org/apache/datasketches/memory/BufferInvariantsTest.java
rename to src/test/java/org/apache/datasketches/memory/test/BufferInvariantsTest.java
index 33ce960..aa4754e 100644
--- a/src/test/java/org/apache/datasketches/memory/BufferInvariantsTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/BufferInvariantsTest.java
@@ -17,13 +17,17 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.fail;
import java.nio.ByteBuffer;
+import org.apache.datasketches.memory.Buffer;
+import org.apache.datasketches.memory.WritableBuffer;
+import org.apache.datasketches.memory.WritableHandle;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
/**
diff --git a/src/test/java/org/apache/datasketches/memory/BufferReadWriteSafetyTest.java b/src/test/java/org/apache/datasketches/memory/test/BufferReadWriteSafetyTest.java
similarity index 94%
rename from src/test/java/org/apache/datasketches/memory/BufferReadWriteSafetyTest.java
rename to src/test/java/org/apache/datasketches/memory/test/BufferReadWriteSafetyTest.java
index 9877867..91e0465 100644
--- a/src/test/java/org/apache/datasketches/memory/BufferReadWriteSafetyTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/BufferReadWriteSafetyTest.java
@@ -17,10 +17,14 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import java.nio.ByteBuffer;
+import org.apache.datasketches.memory.Buffer;
+import org.apache.datasketches.memory.ReadOnlyException;
+import org.apache.datasketches.memory.WritableBuffer;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
diff --git a/src/test/java/org/apache/datasketches/memory/BufferTest.java b/src/test/java/org/apache/datasketches/memory/test/BufferTest.java
similarity index 96%
rename from src/test/java/org/apache/datasketches/memory/BufferTest.java
rename to src/test/java/org/apache/datasketches/memory/test/BufferTest.java
index fc05660..b825659 100644
--- a/src/test/java/org/apache/datasketches/memory/BufferTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/BufferTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.testng.Assert.assertEquals;
@@ -25,6 +25,11 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.List;
+import org.apache.datasketches.memory.Buffer;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.WritableBuffer;
+import org.apache.datasketches.memory.WritableHandle;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
import org.testng.collections.Lists;
diff --git a/src/test/java/org/apache/datasketches/memory/CommonBufferTest.java b/src/test/java/org/apache/datasketches/memory/test/CommonBufferTest.java
similarity index 98%
rename from src/test/java/org/apache/datasketches/memory/CommonBufferTest.java
rename to src/test/java/org/apache/datasketches/memory/test/CommonBufferTest.java
index d3e1ed3..1b7308d 100644
--- a/src/test/java/org/apache/datasketches/memory/CommonBufferTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/CommonBufferTest.java
@@ -17,10 +17,13 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.testng.Assert.assertEquals;
+import org.apache.datasketches.memory.WritableBuffer;
+import org.apache.datasketches.memory.WritableHandle;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
diff --git a/src/test/java/org/apache/datasketches/memory/CommonMemoryTest.java b/src/test/java/org/apache/datasketches/memory/test/CommonMemoryTest.java
similarity index 98%
rename from src/test/java/org/apache/datasketches/memory/CommonMemoryTest.java
rename to src/test/java/org/apache/datasketches/memory/test/CommonMemoryTest.java
index 9997f5e..41f2b2f 100644
--- a/src/test/java/org/apache/datasketches/memory/CommonMemoryTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/CommonMemoryTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.apache.datasketches.memory.Util.isAllBitsClear;
import static org.apache.datasketches.memory.Util.isAllBitsSet;
@@ -27,6 +27,8 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
+import org.apache.datasketches.memory.WritableHandle;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
diff --git a/src/test/java/org/apache/datasketches/memory/CopyMemoryOverlapTest.java b/src/test/java/org/apache/datasketches/memory/test/CopyMemoryOverlapTest.java
similarity index 96%
rename from src/test/java/org/apache/datasketches/memory/CopyMemoryOverlapTest.java
rename to src/test/java/org/apache/datasketches/memory/test/CopyMemoryOverlapTest.java
index 765ed7b..0f2f027 100644
--- a/src/test/java/org/apache/datasketches/memory/CopyMemoryOverlapTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/CopyMemoryOverlapTest.java
@@ -17,10 +17,13 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.testng.Assert.assertEquals;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.WritableHandle;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
/**
diff --git a/src/test/java/org/apache/datasketches/memory/CopyMemoryTest.java b/src/test/java/org/apache/datasketches/memory/test/CopyMemoryTest.java
similarity index 96%
rename from src/test/java/org/apache/datasketches/memory/CopyMemoryTest.java
rename to src/test/java/org/apache/datasketches/memory/test/CopyMemoryTest.java
index 690dcb2..b0552b3 100644
--- a/src/test/java/org/apache/datasketches/memory/CopyMemoryTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/CopyMemoryTest.java
@@ -17,13 +17,16 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.apache.datasketches.memory.CompareAndCopy.UNSAFE_COPY_THRESHOLD_BYTES;
import static org.testng.Assert.assertEquals;
import java.util.concurrent.ThreadLocalRandom;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.WritableHandle;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/memory/ExampleMemoryRequestServerTest.java b/src/test/java/org/apache/datasketches/memory/test/ExampleMemoryRequestServerTest.java
similarity index 96%
rename from src/test/java/org/apache/datasketches/memory/ExampleMemoryRequestServerTest.java
rename to src/test/java/org/apache/datasketches/memory/test/ExampleMemoryRequestServerTest.java
index f30ccab..3934c0e 100644
--- a/src/test/java/org/apache/datasketches/memory/ExampleMemoryRequestServerTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/ExampleMemoryRequestServerTest.java
@@ -17,12 +17,15 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.testng.Assert.assertFalse;
import java.util.IdentityHashMap;
+import org.apache.datasketches.memory.MemoryRequestServer;
+import org.apache.datasketches.memory.WritableHandle;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
/**
diff --git a/src/test/java/org/apache/datasketches/memory/IgnoredArrayOverflowTest.java b/src/test/java/org/apache/datasketches/memory/test/IgnoredArrayOverflowTest.java
similarity index 95%
rename from src/test/java/org/apache/datasketches/memory/IgnoredArrayOverflowTest.java
rename to src/test/java/org/apache/datasketches/memory/test/IgnoredArrayOverflowTest.java
index 487b279..2344beb 100644
--- a/src/test/java/org/apache/datasketches/memory/IgnoredArrayOverflowTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/IgnoredArrayOverflowTest.java
@@ -17,8 +17,10 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
+import org.apache.datasketches.memory.WritableHandle;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Ignore;
diff --git a/src/test/java/org/apache/datasketches/memory/IsValidUtf8TestUtil.java b/src/test/java/org/apache/datasketches/memory/test/IsValidUtf8TestUtil.java
similarity index 98%
rename from src/test/java/org/apache/datasketches/memory/IsValidUtf8TestUtil.java
rename to src/test/java/org/apache/datasketches/memory/test/IsValidUtf8TestUtil.java
index aae21aa..0e08200 100644
--- a/src/test/java/org/apache/datasketches/memory/IsValidUtf8TestUtil.java
+++ b/src/test/java/org/apache/datasketches/memory/test/IsValidUtf8TestUtil.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
/**
* Stripped down version of
diff --git a/src/test/java/org/apache/datasketches/memory/LeafImplTest.java b/src/test/java/org/apache/datasketches/memory/test/LeafImplTest.java
similarity index 97%
rename from src/test/java/org/apache/datasketches/memory/LeafImplTest.java
rename to src/test/java/org/apache/datasketches/memory/test/LeafImplTest.java
index 696a95d..ce69bb8 100644
--- a/src/test/java/org/apache/datasketches/memory/LeafImplTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/LeafImplTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
@@ -30,6 +30,11 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
+import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.WritableBuffer;
+import org.apache.datasketches.memory.WritableDirectHandle;
+import org.apache.datasketches.memory.WritableMapHandle;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
/**
diff --git a/src/test/java/org/apache/datasketches/memory/MemoryBoundaryCheckTest.java b/src/test/java/org/apache/datasketches/memory/test/MemoryBoundaryCheckTest.java
similarity index 97%
rename from src/test/java/org/apache/datasketches/memory/MemoryBoundaryCheckTest.java
rename to src/test/java/org/apache/datasketches/memory/test/MemoryBoundaryCheckTest.java
index c8e0457..c45387f 100644
--- a/src/test/java/org/apache/datasketches/memory/MemoryBoundaryCheckTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/MemoryBoundaryCheckTest.java
@@ -17,8 +17,10 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
+import org.apache.datasketches.memory.WritableBuffer;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
diff --git a/src/test/java/org/apache/datasketches/memory/MemoryReadWriteSafetyTest.java b/src/test/java/org/apache/datasketches/memory/test/MemoryReadWriteSafetyTest.java
similarity index 96%
rename from src/test/java/org/apache/datasketches/memory/MemoryReadWriteSafetyTest.java
rename to src/test/java/org/apache/datasketches/memory/test/MemoryReadWriteSafetyTest.java
index 19aab85..443bb7f 100644
--- a/src/test/java/org/apache/datasketches/memory/MemoryReadWriteSafetyTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/MemoryReadWriteSafetyTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import java.io.File;
import java.io.IOException;
@@ -25,6 +25,10 @@ import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
+import org.apache.datasketches.memory.MapHandle;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.ReadOnlyException;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
diff --git a/src/test/java/org/apache/datasketches/memory/MemoryTest.java b/src/test/java/org/apache/datasketches/memory/test/MemoryTest.java
similarity index 97%
rename from src/test/java/org/apache/datasketches/memory/MemoryTest.java
rename to src/test/java/org/apache/datasketches/memory/test/MemoryTest.java
index d70e6fd..0022dfd 100644
--- a/src/test/java/org/apache/datasketches/memory/MemoryTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/MemoryTest.java
@@ -21,7 +21,7 @@
* Note: Lincoln's Gettysburg Address is in the public domain. See LICENSE.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.apache.datasketches.memory.Util.*;
import static org.testng.Assert.assertEquals;
@@ -35,6 +35,12 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.List;
+import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.MapHandle;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.WritableDirectHandle;
+import org.apache.datasketches.memory.WritableHandle;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/memory/MemoryWriteToTest.java b/src/test/java/org/apache/datasketches/memory/test/MemoryWriteToTest.java
similarity index 93%
rename from src/test/java/org/apache/datasketches/memory/MemoryWriteToTest.java
rename to src/test/java/org/apache/datasketches/memory/test/MemoryWriteToTest.java
index cd713d6..fdfe3eb 100644
--- a/src/test/java/org/apache/datasketches/memory/MemoryWriteToTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/MemoryWriteToTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -25,6 +25,10 @@ import java.nio.channels.Channels;
import java.nio.channels.WritableByteChannel;
import java.util.concurrent.ThreadLocalRandom;
+import org.apache.datasketches.memory.CompareAndCopy;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.WritableHandle;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/memory/NioBitsTest.java b/src/test/java/org/apache/datasketches/memory/test/NioBitsTest.java
similarity index 96%
rename from src/test/java/org/apache/datasketches/memory/NioBitsTest.java
rename to src/test/java/org/apache/datasketches/memory/test/NioBitsTest.java
index 4e08487..b5e56e1 100644
--- a/src/test/java/org/apache/datasketches/memory/NioBitsTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/NioBitsTest.java
@@ -17,10 +17,11 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.testng.Assert.assertEquals;
+import org.apache.datasketches.memory.NioBits;
import org.testng.annotations.Test;
/**
diff --git a/src/test/java/org/apache/datasketches/memory/NonNativeWritableBufferImplTest.java b/src/test/java/org/apache/datasketches/memory/test/NonNativeWritableBufferImplTest.java
similarity index 97%
rename from src/test/java/org/apache/datasketches/memory/NonNativeWritableBufferImplTest.java
rename to src/test/java/org/apache/datasketches/memory/test/NonNativeWritableBufferImplTest.java
index 9b48f7d..8830c23 100644
--- a/src/test/java/org/apache/datasketches/memory/NonNativeWritableBufferImplTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/NonNativeWritableBufferImplTest.java
@@ -17,12 +17,15 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.testng.Assert.assertEquals;
import java.nio.ByteOrder;
+import org.apache.datasketches.memory.Buffer;
+import org.apache.datasketches.memory.WritableBuffer;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
/**
diff --git a/src/test/java/org/apache/datasketches/memory/NonNativeWritableMemoryImplTest.java b/src/test/java/org/apache/datasketches/memory/test/NonNativeWritableMemoryImplTest.java
similarity index 97%
rename from src/test/java/org/apache/datasketches/memory/NonNativeWritableMemoryImplTest.java
rename to src/test/java/org/apache/datasketches/memory/test/NonNativeWritableMemoryImplTest.java
index 22263a8..dab4eb1 100644
--- a/src/test/java/org/apache/datasketches/memory/NonNativeWritableMemoryImplTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/NonNativeWritableMemoryImplTest.java
@@ -17,12 +17,14 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.testng.Assert.assertEquals;
import java.nio.ByteOrder;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
/**
diff --git a/src/test/java/org/apache/datasketches/memory/SpecificLeafTest.java b/src/test/java/org/apache/datasketches/memory/test/SpecificLeafTest.java
similarity index 94%
rename from src/test/java/org/apache/datasketches/memory/SpecificLeafTest.java
rename to src/test/java/org/apache/datasketches/memory/test/SpecificLeafTest.java
index 04136b8..893fc22 100644
--- a/src/test/java/org/apache/datasketches/memory/SpecificLeafTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/SpecificLeafTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.apache.datasketches.memory.BaseState.DUPLICATE;
import static org.apache.datasketches.memory.BaseState.REGION;
@@ -28,6 +28,12 @@ import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
+import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Buffer;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.WritableDirectHandle;
+import org.apache.datasketches.memory.WritableMapHandle;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
/**
diff --git a/src/test/java/org/apache/datasketches/memory/UnsafeUtilTest.java b/src/test/java/org/apache/datasketches/memory/test/UnsafeUtilTest.java
similarity index 96%
rename from src/test/java/org/apache/datasketches/memory/UnsafeUtilTest.java
rename to src/test/java/org/apache/datasketches/memory/test/UnsafeUtilTest.java
index 0ac9463..615211a 100644
--- a/src/test/java/org/apache/datasketches/memory/UnsafeUtilTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/UnsafeUtilTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
@@ -26,6 +26,9 @@ import static org.testng.Assert.fail;
import java.util.ArrayList;
import java.util.List;
+import org.apache.datasketches.memory.Ints;
+import org.apache.datasketches.memory.JDK7Compatible;
+import org.apache.datasketches.memory.UnsafeUtil;
import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/memory/Utf8Test.java b/src/test/java/org/apache/datasketches/memory/test/Utf8Test.java
similarity index 98%
rename from src/test/java/org/apache/datasketches/memory/Utf8Test.java
rename to src/test/java/org/apache/datasketches/memory/test/Utf8Test.java
index 3f66508..d7ad5c7 100644
--- a/src/test/java/org/apache/datasketches/memory/Utf8Test.java
+++ b/src/test/java/org/apache/datasketches/memory/test/Utf8Test.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.testng.Assert.assertEquals;
@@ -31,6 +31,11 @@ import java.util.List;
import org.testng.annotations.Test;
import com.google.protobuf.ByteString;
+
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.Utf8CodingException;
+import org.apache.datasketches.memory.Util;
+import org.apache.datasketches.memory.WritableMemory;
import org.apache.datasketches.memory.Util.RandomCodePoints;
/**
diff --git a/src/test/java/org/apache/datasketches/memory/UtilTest.java b/src/test/java/org/apache/datasketches/memory/test/UtilTest.java
similarity index 95%
rename from src/test/java/org/apache/datasketches/memory/UtilTest.java
rename to src/test/java/org/apache/datasketches/memory/test/UtilTest.java
index d174ffa..f665b07 100644
--- a/src/test/java/org/apache/datasketches/memory/UtilTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/UtilTest.java
@@ -21,7 +21,7 @@
* Note: Lincoln's Gettysburg Address is in the public domain. See LICENSE.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.apache.datasketches.memory.Util.characterPad;
import static org.apache.datasketches.memory.Util.getResourceFile;
@@ -42,6 +42,10 @@ import java.nio.file.attribute.PosixFileAttributeView;
import java.nio.file.attribute.PosixFileAttributes;
import java.nio.file.attribute.PosixFilePermissions;
+import org.apache.datasketches.memory.UnsafeUtil;
+import org.apache.datasketches.memory.Util;
+import org.apache.datasketches.memory.WritableMemory;
+import org.apache.datasketches.memory.Util.RandomCodePoints;
import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
diff --git a/src/test/java/org/apache/datasketches/memory/WritableBufferImplTest.java b/src/test/java/org/apache/datasketches/memory/test/WritableBufferImplTest.java
similarity index 97%
rename from src/test/java/org/apache/datasketches/memory/WritableBufferImplTest.java
rename to src/test/java/org/apache/datasketches/memory/test/WritableBufferImplTest.java
index 38206e1..7188be7 100644
--- a/src/test/java/org/apache/datasketches/memory/WritableBufferImplTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/WritableBufferImplTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
@@ -26,6 +26,14 @@ import static org.testng.Assert.assertTrue;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
+import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Buffer;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.ReadOnlyException;
+import org.apache.datasketches.memory.UnsafeUtil;
+import org.apache.datasketches.memory.WritableBuffer;
+import org.apache.datasketches.memory.WritableHandle;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/memory/WritableDirectCopyTest.java b/src/test/java/org/apache/datasketches/memory/test/WritableDirectCopyTest.java
similarity index 97%
rename from src/test/java/org/apache/datasketches/memory/WritableDirectCopyTest.java
rename to src/test/java/org/apache/datasketches/memory/test/WritableDirectCopyTest.java
index 911895b..4907e5a 100644
--- a/src/test/java/org/apache/datasketches/memory/WritableDirectCopyTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/WritableDirectCopyTest.java
@@ -17,11 +17,14 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.fail;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.WritableHandle;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
/**
diff --git a/src/test/java/org/apache/datasketches/memory/WritableMemoryImplTest.java b/src/test/java/org/apache/datasketches/memory/test/WritableMemoryImplTest.java
similarity index 97%
rename from src/test/java/org/apache/datasketches/memory/WritableMemoryImplTest.java
rename to src/test/java/org/apache/datasketches/memory/test/WritableMemoryImplTest.java
index 34a7587..c08eb5c 100644
--- a/src/test/java/org/apache/datasketches/memory/WritableMemoryImplTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/WritableMemoryImplTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
@@ -27,6 +27,14 @@ import static org.testng.Assert.fail;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
+import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Buffer;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.ReadOnlyException;
+import org.apache.datasketches.memory.UnsafeUtil;
+import org.apache.datasketches.memory.WritableBuffer;
+import org.apache.datasketches.memory.WritableHandle;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
diff --git a/src/test/java/org/apache/datasketches/memory/WritableMemoryTest.java b/src/test/java/org/apache/datasketches/memory/test/WritableMemoryTest.java
similarity index 96%
rename from src/test/java/org/apache/datasketches/memory/WritableMemoryTest.java
rename to src/test/java/org/apache/datasketches/memory/test/WritableMemoryTest.java
index 287f314..906d216 100644
--- a/src/test/java/org/apache/datasketches/memory/WritableMemoryTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/WritableMemoryTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.apache.datasketches.memory.CompareAndCopy.UNSAFE_COPY_THRESHOLD_BYTES;
import static org.testng.Assert.assertEquals;
@@ -28,6 +28,10 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.concurrent.ThreadLocalRandom;
+import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.WritableBuffer;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
diff --git a/src/test/java/org/apache/datasketches/memory/XxHash64LoopingTest.java b/src/test/java/org/apache/datasketches/memory/test/XxHash64LoopingTest.java
similarity index 99%
rename from src/test/java/org/apache/datasketches/memory/XxHash64LoopingTest.java
rename to src/test/java/org/apache/datasketches/memory/test/XxHash64LoopingTest.java
index 802624b..e1df579 100644
--- a/src/test/java/org/apache/datasketches/memory/XxHash64LoopingTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/XxHash64LoopingTest.java
@@ -17,10 +17,11 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.testng.Assert.assertEquals;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
/**
diff --git a/src/test/java/org/apache/datasketches/memory/XxHash64Test.java b/src/test/java/org/apache/datasketches/memory/test/XxHash64Test.java
similarity index 96%
rename from src/test/java/org/apache/datasketches/memory/XxHash64Test.java
rename to src/test/java/org/apache/datasketches/memory/test/XxHash64Test.java
index 8cd49c8..e88d410 100644
--- a/src/test/java/org/apache/datasketches/memory/XxHash64Test.java
+++ b/src/test/java/org/apache/datasketches/memory/test/XxHash64Test.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.apache.datasketches.memory.XxHash64.hashBooleans;
import static org.apache.datasketches.memory.XxHash64.hashBytes;
@@ -33,6 +33,9 @@ import static org.testng.Assert.assertTrue;
import java.util.Random;
import java.util.concurrent.ThreadLocalRandom;
+import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
import net.openhft.hashing.LongHashFunction;
diff --git a/src/test/java/org/apache/datasketches/memory/ZeroCapacityTest.java b/src/test/java/org/apache/datasketches/memory/test/ZeroCapacityTest.java
similarity index 92%
rename from src/test/java/org/apache/datasketches/memory/ZeroCapacityTest.java
rename to src/test/java/org/apache/datasketches/memory/test/ZeroCapacityTest.java
index 2389b91..1c2c7b7 100644
--- a/src/test/java/org/apache/datasketches/memory/ZeroCapacityTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/ZeroCapacityTest.java
@@ -17,12 +17,14 @@
* under the License.
*/
-package org.apache.datasketches.memory;
+package org.apache.datasketches.memory.test;
import static org.testng.Assert.assertEquals;
import java.nio.ByteBuffer;
+import org.apache.datasketches.memory.Memory;
+import org.apache.datasketches.memory.WritableMemory;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/memory/test/package-info.java b/src/test/java/org/apache/datasketches/memory/test/package-info.java
new file mode 100644
index 0000000..be97bb8
--- /dev/null
+++ b/src/test/java/org/apache/datasketches/memory/test/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.datasketches.memory.test;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org