Repository: asterixdb Updated Branches: refs/heads/master 31589f960 -> 276ffc960
[ASTERIXDB-1280][TEST] JUnit cleanup - user model changes: no - storage format changes: no - interface changes: no Change-Id: I2a57643682d45097ae5ac4adc1fe97fbb3111385 Reviewed-on: https://asterix-gerrit.ics.uci.edu/2461 Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Contrib: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Michael Blow <mb...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/276ffc96 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/276ffc96 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/276ffc96 Branch: refs/heads/master Commit: 276ffc9600eb3563e441644496527099b0075580 Parents: 31589f9 Author: Till Westmann <ti...@apache.org> Authored: Wed Mar 7 15:00:20 2018 -0800 Committer: Till Westmann <ti...@apache.org> Committed: Thu Mar 8 14:47:31 2018 -0800 ---------------------------------------------------------------------- .../tests/pushruntime/PushRuntimeTest.java | 3 +-- .../AbstractNormalizedKeyComputerFactoryTest.java | 3 +-- .../ByteArrayNormalizedKeyComputerFactoryTest.java | 9 ++++----- .../buffermanager/FrameFreeSlotBiggestFirstTest.java | 15 +++++++-------- .../dataflow/std/test/util/SelectionTreeTest.java | 6 ++---- .../hyracks/tests/rewriting/ErrorReportingTest.java | 3 +-- .../apache/hyracks/hdfs/dataflow/DataflowTest.java | 2 +- .../apache/hyracks/hdfs/scheduler/SchedulerTest.java | 2 +- .../apache/hyracks/hdfs2/dataflow/DataflowTest.java | 2 +- .../hyracks/hdfs2/scheduler/SchedulerTest.java | 2 +- .../java/org/apache/hyracks/ipc/tests/IPCTest.java | 6 ++---- .../java/org/apache/hyracks/net/tests/NetTest.java | 3 +-- .../org/apache/hyracks/test/server/NCServiceIT.java | 2 +- .../am/lsm/btree/LSMBTreeFilterMergeTestDriver.java | 3 +-- .../ondisk/FixedSizeFrameTupleTest.java | 3 +-- .../invertedindex/tokenizers/WordTokenizerTest.java | 3 +-- 16 files changed, 27 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/276ffc96/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/pushruntime/PushRuntimeTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/pushruntime/PushRuntimeTest.java b/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/pushruntime/PushRuntimeTest.java index a7621ec..d4944af 100644 --- a/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/pushruntime/PushRuntimeTest.java +++ b/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/pushruntime/PushRuntimeTest.java @@ -93,11 +93,10 @@ import org.apache.hyracks.dataflow.std.group.preclustered.PreclusteredGroupOpera import org.apache.hyracks.dataflow.std.misc.ReplicateOperatorDescriptor; import org.apache.hyracks.dataflow.std.sort.InMemorySortOperatorDescriptor; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import junit.framework.Assert; - public class PushRuntimeTest { private static final String SEPARATOR = System.getProperty("file.separator"); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/276ffc96/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/test/java/org/apache/hyracks/dataflow/common/data/normalizers/AbstractNormalizedKeyComputerFactoryTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/test/java/org/apache/hyracks/dataflow/common/data/normalizers/AbstractNormalizedKeyComputerFactoryTest.java b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/test/java/org/apache/hyracks/dataflow/common/data/normalizers/AbstractNormalizedKeyComputerFactoryTest.java index 2107574..c6e2940 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/test/java/org/apache/hyracks/dataflow/common/data/normalizers/AbstractNormalizedKeyComputerFactoryTest.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/test/java/org/apache/hyracks/dataflow/common/data/normalizers/AbstractNormalizedKeyComputerFactoryTest.java @@ -21,10 +21,9 @@ package org.apache.hyracks.dataflow.common.data.normalizers; import org.apache.hyracks.data.std.api.IPointable; import org.apache.hyracks.dataflow.common.utils.NormalizedKeyUtils; +import org.junit.Assert; import org.junit.Test; -import junit.framework.Assert; - public abstract class AbstractNormalizedKeyComputerFactoryTest { @Test http://git-wip-us.apache.org/repos/asf/asterixdb/blob/276ffc96/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/test/java/org/apache/hyracks/dataflow/common/data/normalizers/ByteArrayNormalizedKeyComputerFactoryTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/test/java/org/apache/hyracks/dataflow/common/data/normalizers/ByteArrayNormalizedKeyComputerFactoryTest.java b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/test/java/org/apache/hyracks/dataflow/common/data/normalizers/ByteArrayNormalizedKeyComputerFactoryTest.java index 675bf36..e02e5d8 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/test/java/org/apache/hyracks/dataflow/common/data/normalizers/ByteArrayNormalizedKeyComputerFactoryTest.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/test/java/org/apache/hyracks/dataflow/common/data/normalizers/ByteArrayNormalizedKeyComputerFactoryTest.java @@ -19,12 +19,11 @@ package org.apache.hyracks.dataflow.common.data.normalizers; -import static junit.framework.Assert.*; - import java.util.Random; import org.apache.hyracks.api.dataflow.value.INormalizedKeyComputer; import org.apache.hyracks.data.std.primitive.ByteArrayPointable; +import org.junit.Assert; import org.junit.Test; public class ByteArrayNormalizedKeyComputerFactoryTest { @@ -57,9 +56,9 @@ public class ByteArrayNormalizedKeyComputerFactoryTest { computer.normalize(pointable1.getByteArray(), pointable1.getStartOffset(), pointable1.getLength(), key1, 0); computer.normalize(pointable2.getByteArray(), pointable2.getStartOffset(), pointable2.getLength(), key2, 0); if (key1[0] < key2[0]) { - assertTrue(pointable1.compareTo(pointable2) < 0); + Assert.assertTrue(pointable1.compareTo(pointable2) < 0); } else if (key1[0] > key2[0]) { - assertTrue(pointable1.compareTo(pointable2) > 0); + Assert.assertTrue(pointable1.compareTo(pointable2) > 0); } } @@ -80,7 +79,7 @@ public class ByteArrayNormalizedKeyComputerFactoryTest { computer.normalize(ptr1.getByteArray(), ptr1.getStartOffset(), ptr1.getLength(), key1, 0); computer.normalize(ptr2.getByteArray(), ptr2.getStartOffset(), ptr2.getLength(), key2, 0); - assertTrue(key1[0] < key2[0]); + Assert.assertTrue(key1[0] < key2[0]); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/276ffc96/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/FrameFreeSlotBiggestFirstTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/FrameFreeSlotBiggestFirstTest.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/FrameFreeSlotBiggestFirstTest.java index 88a54bd..0deaad1 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/FrameFreeSlotBiggestFirstTest.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/FrameFreeSlotBiggestFirstTest.java @@ -19,8 +19,7 @@ package org.apache.hyracks.dataflow.std.buffermanager; -import static junit.framework.Assert.assertEquals; - +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -40,26 +39,26 @@ public class FrameFreeSlotBiggestFirstTest { for (int i = 0; i < size; i++) { policy.pushNewFrame(i, i); - assertEquals(i, policy.popBestFit(i)); + Assert.assertEquals(i, policy.popBestFit(i)); } - assertEquals(-1, policy.popBestFit(0)); + Assert.assertEquals(-1, policy.popBestFit(0)); for (int i = 0; i < size; i++) { policy.pushNewFrame(i, i); } for (int i = 0; i < size; i++) { - assertEquals(size - i - 1, policy.popBestFit(0)); + Assert.assertEquals(size - i - 1, policy.popBestFit(0)); } for (int i = 0; i < size; i++) { policy.pushNewFrame(i, i); } for (int i = 0; i < size / 2; i++) { - assertEquals(size - i - 1, policy.popBestFit(size / 2)); + Assert.assertEquals(size - i - 1, policy.popBestFit(size / 2)); } - assertEquals(-1, policy.popBestFit(size / 2)); + Assert.assertEquals(-1, policy.popBestFit(size / 2)); for (int i = 0; i < size / 2; i++) { - assertEquals(size / 2 - i - 1, policy.popBestFit(0)); + Assert.assertEquals(size / 2 - i - 1, policy.popBestFit(0)); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/276ffc96/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/test/util/SelectionTreeTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/test/util/SelectionTreeTest.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/test/util/SelectionTreeTest.java index 213f573..9ecb243 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/test/util/SelectionTreeTest.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/test/util/SelectionTreeTest.java @@ -18,12 +18,10 @@ */ package org.apache.hyracks.dataflow.std.test.util; -import junit.framework.Assert; - -import org.junit.Test; - import org.apache.hyracks.dataflow.std.util.SelectionTree; import org.apache.hyracks.dataflow.std.util.SelectionTree.Entry; +import org.junit.Assert; +import org.junit.Test; public class SelectionTreeTest { @Test http://git-wip-us.apache.org/repos/asf/asterixdb/blob/276ffc96/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/rewriting/ErrorReportingTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/rewriting/ErrorReportingTest.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/rewriting/ErrorReportingTest.java index 4d3215d..b68d1f1 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/rewriting/ErrorReportingTest.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/rewriting/ErrorReportingTest.java @@ -37,10 +37,9 @@ import org.apache.hyracks.dataflow.std.base.AbstractSingleActivityOperatorDescri import org.apache.hyracks.dataflow.std.base.AbstractUnaryOutputSourceOperatorNodePushable; import org.apache.hyracks.dataflow.std.connectors.OneToOneConnectorDescriptor; import org.apache.hyracks.tests.integration.AbstractIntegrationTest; +import org.junit.Assert; import org.junit.Test; -import junit.framework.Assert; - public class ErrorReportingTest extends AbstractIntegrationTest { static final String EXPECTED_ERROR_MESSAGE = "expected failure"; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/276ffc96/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/dataflow/DataflowTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/dataflow/DataflowTest.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/dataflow/DataflowTest.java index b8351f3..8f96bab 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/dataflow/DataflowTest.java +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/dataflow/DataflowTest.java @@ -56,8 +56,8 @@ import org.apache.hyracks.hdfs.scheduler.Scheduler; import org.apache.hyracks.hdfs.utils.HyracksUtils; import org.apache.hyracks.test.support.TestUtils; import org.apache.hyracks.util.file.FileUtil; +import org.junit.Assert; -import junit.framework.Assert; import junit.framework.TestCase; /** http://git-wip-us.apache.org/repos/asf/asterixdb/blob/276ffc96/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/scheduler/SchedulerTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/scheduler/SchedulerTest.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/scheduler/SchedulerTest.java index b735833..0a7418a 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/scheduler/SchedulerTest.java +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/scheduler/SchedulerTest.java @@ -32,10 +32,10 @@ import org.apache.hyracks.api.comm.NetworkAddress; import org.apache.hyracks.api.topology.ClusterTopology; import org.apache.hyracks.api.topology.TopologyDefinitionParser; import org.apache.hyracks.test.support.TestUtils; +import org.junit.Assert; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import junit.framework.Assert; import junit.framework.TestCase; @SuppressWarnings("deprecation") http://git-wip-us.apache.org/repos/asf/asterixdb/blob/276ffc96/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/dataflow/DataflowTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/dataflow/DataflowTest.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/dataflow/DataflowTest.java index 8be6d69..02c0a20 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/dataflow/DataflowTest.java +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/dataflow/DataflowTest.java @@ -21,7 +21,6 @@ package org.apache.hyracks.hdfs2.dataflow; import java.util.List; -import junit.framework.Assert; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.MiniDFSCluster; @@ -54,6 +53,7 @@ import org.apache.hyracks.hdfs.lib.TextKeyValueParserFactory; import org.apache.hyracks.hdfs.lib.TextTupleWriterFactory; import org.apache.hyracks.hdfs.utils.HyracksUtils; import org.apache.hyracks.hdfs2.scheduler.Scheduler; +import org.junit.Assert; /** * Test the org.apache.hyracks.hdfs2.dataflow package, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/276ffc96/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/scheduler/SchedulerTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/scheduler/SchedulerTest.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/scheduler/SchedulerTest.java index 8223071..31f4751 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/scheduler/SchedulerTest.java +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/scheduler/SchedulerTest.java @@ -28,8 +28,8 @@ import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.lib.input.FileSplit; import org.apache.hyracks.api.client.NodeControllerInfo; import org.apache.hyracks.test.support.TestUtils; +import org.junit.Assert; -import junit.framework.Assert; import junit.framework.TestCase; /** http://git-wip-us.apache.org/repos/asf/asterixdb/blob/276ffc96/hyracks-fullstack/hyracks/hyracks-ipc/src/test/java/org/apache/hyracks/ipc/tests/IPCTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-ipc/src/test/java/org/apache/hyracks/ipc/tests/IPCTest.java b/hyracks-fullstack/hyracks/hyracks-ipc/src/test/java/org/apache/hyracks/ipc/tests/IPCTest.java index 1a075d5..cca3abe 100644 --- a/hyracks-fullstack/hyracks/hyracks-ipc/src/test/java/org/apache/hyracks/ipc/tests/IPCTest.java +++ b/hyracks-fullstack/hyracks/hyracks-ipc/src/test/java/org/apache/hyracks/ipc/tests/IPCTest.java @@ -23,16 +23,14 @@ import java.net.InetSocketAddress; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import junit.framework.Assert; - -import org.junit.Test; - import org.apache.hyracks.ipc.api.IIPCHandle; import org.apache.hyracks.ipc.api.IIPCI; import org.apache.hyracks.ipc.api.RPCInterface; import org.apache.hyracks.ipc.exceptions.IPCException; import org.apache.hyracks.ipc.impl.IPCSystem; import org.apache.hyracks.ipc.impl.JavaSerializationBasedPayloadSerializerDeserializer; +import org.junit.Assert; +import org.junit.Test; public class IPCTest { @Test http://git-wip-us.apache.org/repos/asf/asterixdb/blob/276ffc96/hyracks-fullstack/hyracks/hyracks-net/src/test/java/org/apache/hyracks/net/tests/NetTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-net/src/test/java/org/apache/hyracks/net/tests/NetTest.java b/hyracks-fullstack/hyracks/hyracks-net/src/test/java/org/apache/hyracks/net/tests/NetTest.java index ab018db..8f582ba 100644 --- a/hyracks-fullstack/hyracks/hyracks-net/src/test/java/org/apache/hyracks/net/tests/NetTest.java +++ b/hyracks-fullstack/hyracks/hyracks-net/src/test/java/org/apache/hyracks/net/tests/NetTest.java @@ -32,10 +32,9 @@ import org.apache.hyracks.net.protocols.muxdemux.FullFrameChannelInterfaceFactor import org.apache.hyracks.net.protocols.muxdemux.IChannelOpenListener; import org.apache.hyracks.net.protocols.muxdemux.MultiplexedConnection; import org.apache.hyracks.net.protocols.muxdemux.MuxDemux; +import org.junit.Assert; import org.junit.Test; -import junit.framework.Assert; - public class NetTest { @Test public void test() throws Exception { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/276ffc96/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java b/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java index de32991..4983ba1 100644 --- a/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java +++ b/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java @@ -34,13 +34,13 @@ import org.apache.hyracks.util.file.FileUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; -import junit.framework.Assert; public class NCServiceIT { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/276ffc96/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeFilterMergeTestDriver.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeFilterMergeTestDriver.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeFilterMergeTestDriver.java index 63b4f98..815c8bc 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeFilterMergeTestDriver.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeFilterMergeTestDriver.java @@ -43,8 +43,7 @@ import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent; import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor; import org.apache.hyracks.storage.am.lsm.common.impls.BlockingIOOperationCallbackWrapper; import org.apache.hyracks.storage.am.lsm.common.impls.StubIOOperationCallback; - -import junit.framework.Assert; +import org.junit.Assert; /** * This test is the LSMBTreeMergeTest but using a filter, and at each step of the filter's lifecycle its value is http://git-wip-us.apache.org/repos/asf/asterixdb/blob/276ffc96/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/FixedSizeFrameTupleTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/FixedSizeFrameTupleTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/FixedSizeFrameTupleTest.java index 445ae9b..c0a4e75 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/FixedSizeFrameTupleTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/FixedSizeFrameTupleTest.java @@ -25,10 +25,9 @@ import java.util.Random; import org.apache.hyracks.api.dataflow.value.ITypeTraits; import org.apache.hyracks.data.std.primitive.IntegerPointable; +import org.junit.Assert; import org.junit.Test; -import junit.framework.Assert; - public class FixedSizeFrameTupleTest { private static int FRAME_SIZE = 4096; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/276ffc96/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/WordTokenizerTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/WordTokenizerTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/WordTokenizerTest.java index 11a0b02..bdf5164 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/WordTokenizerTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/WordTokenizerTest.java @@ -29,11 +29,10 @@ import java.util.HashMap; import org.apache.hyracks.data.std.util.GrowableArray; import org.apache.hyracks.util.string.UTF8StringReader; import org.apache.hyracks.util.string.UTF8StringUtil; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import junit.framework.Assert; - public class WordTokenizerTest { private String text = "Hello World, I would like to inform you of the importance of Foo Bar. Yes, Foo Bar. Jürgen.";