[incubator-pinot] branch cleanup-junit-imports-20210104 updated (69100fa -> eeabeda)

[ap...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

apucher pushed a change to branch cleanup-junit-imports-20210104
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git.


 discard 69100fa  remove junit imports
     new eeabeda  remove junit imports

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (69100fa)
            \
             N -- N -- N   refs/heads/cleanup-junit-imports-20210104 (eeabeda)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/pinot/broker/pruner/SegmentZKMetadataPrunerTest.java   | 2 +-
 .../src/test/java/org/apache/pinot/core/plan/CombinePlanNodeTest.java | 2 +-
 .../apache/pinot/core/query/pruner/ColumnValueSegmentPrunerTest.java  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org

[incubator-pinot] 01/01: remove junit imports

[ap...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

apucher pushed a commit to branch cleanup-junit-imports-20210104
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git

commit eeabeda7f6abb1ab57c07cfd2ae4e9ae82668f8a
Author: Alexander Pucher <al...@alexpucher.com>
AuthorDate: Mon Jan 4 15:05:08 2021 -0800

    remove junit imports
---
 .../org/apache/pinot/broker/pruner/SegmentZKMetadataPrunerTest.java   | 2 +-
 .../org/apache/pinot/controller/api/SegmentCompletionUtilsTest.java   | 2 +-
 .../pinot/controller/helix/core/util/SegmentDeletionManagerTest.java  | 3 +--
 .../src/test/java/org/apache/pinot/core/plan/CombinePlanNodeTest.java | 2 +-
 .../apache/pinot/core/query/pruner/ColumnValueSegmentPrunerTest.java  | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pinot-broker/src/test/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPrunerTest.java b/pinot-broker/src/test/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPrunerTest.java
index e345033..29decea 100644
--- a/pinot-broker/src/test/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPrunerTest.java
+++ b/pinot-broker/src/test/java/org/apache/pinot/broker/pruner/SegmentZKMetadataPrunerTest.java
@@ -21,13 +21,13 @@ package org.apache.pinot.broker.pruner;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import junit.framework.Assert;
 import org.apache.pinot.common.metadata.segment.ColumnPartitionMetadata;
 import org.apache.pinot.common.metadata.segment.OfflineSegmentZKMetadata;
 import org.apache.pinot.common.metadata.segment.SegmentPartitionMetadata;
 import org.apache.pinot.common.metadata.segment.SegmentZKMetadata;
 import org.apache.pinot.common.request.BrokerRequest;
 import org.apache.pinot.pql.parsers.Pql2Compiler;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/SegmentCompletionUtilsTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/SegmentCompletionUtilsTest.java
index 6e651cc..11cb8ba 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/SegmentCompletionUtilsTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/SegmentCompletionUtilsTest.java
@@ -18,8 +18,8 @@
  */
 package org.apache.pinot.controller.api;
 
-import junit.framework.Assert;
 import org.apache.pinot.controller.util.SegmentCompletionUtils;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/SegmentDeletionManagerTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/SegmentDeletionManagerTest.java
index 5fa2517..e85a9b7 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/SegmentDeletionManagerTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/core/util/SegmentDeletionManagerTest.java
@@ -46,12 +46,11 @@ import org.apache.pinot.spi.filesystem.PinotFSFactory;
 import org.joda.time.DateTime;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import com.google.common.io.Files;
 
-import junit.framework.Assert;
-
 
 public class SegmentDeletionManagerTest {
   final static String tableName = "table";
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/plan/CombinePlanNodeTest.java b/pinot-core/src/test/java/org/apache/pinot/core/plan/CombinePlanNodeTest.java
index 2cf4758..06cd6b3 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/plan/CombinePlanNodeTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/plan/CombinePlanNodeTest.java
@@ -26,11 +26,11 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import junit.framework.Assert;
 import org.apache.pinot.common.utils.CommonConstants.Server;
 import org.apache.pinot.core.plan.maker.InstancePlanMakerImplV2;
 import org.apache.pinot.core.query.request.context.QueryContext;
 import org.apache.pinot.core.query.request.context.utils.QueryContextConverterUtils;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/query/pruner/ColumnValueSegmentPrunerTest.java b/pinot-core/src/test/java/org/apache/pinot/core/query/pruner/ColumnValueSegmentPrunerTest.java
index 85cebb1..cd2a159 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/query/pruner/ColumnValueSegmentPrunerTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/query/pruner/ColumnValueSegmentPrunerTest.java
@@ -28,8 +28,8 @@ import org.apache.pinot.core.query.request.context.utils.QueryContextConverterUt
 import org.apache.pinot.spi.data.FieldSpec.DataType;
 import org.testng.annotations.Test;
 
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org