You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by do...@apache.org on 2021/01/09 21:43:59 UTC
[orc] branch master updated: ORC-721: Use 'org.junit.Assert`
instead of deprecated `junit.framework.Assert`
This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/master by this push:
new 6b7e584 ORC-721: Use 'org.junit.Assert` instead of deprecated `junit.framework.Assert`
6b7e584 is described below
commit 6b7e584b8caffbbe70166c158129e9d8d21b99df
Author: William Hyun <wi...@gmail.com>
AuthorDate: Sat Jan 9 13:01:05 2021 -0800
ORC-721: Use 'org.junit.Assert` instead of deprecated `junit.framework.Assert`
Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
java/core/src/test/org/apache/orc/TestCorruptTypes.java | 4 ++--
java/core/src/test/org/apache/orc/TestNewIntegerEncoding.java | 2 +-
java/core/src/test/org/apache/orc/TestOrcDSTNoTimezone.java | 4 ++--
java/core/src/test/org/apache/orc/TestOrcNoTimezone.java | 4 ++--
java/core/src/test/org/apache/orc/TestOrcNullOptimization.java | 2 +-
java/core/src/test/org/apache/orc/TestOrcTimestampPPD.java | 2 +-
java/core/src/test/org/apache/orc/TestOrcTimezone1.java | 4 ++--
java/core/src/test/org/apache/orc/TestOrcTimezone2.java | 2 +-
java/core/src/test/org/apache/orc/TestOrcTimezone3.java | 2 +-
java/core/src/test/org/apache/orc/TestOrcTimezone4.java | 2 +-
java/core/src/test/org/apache/orc/TestOrcTimezonePPD.java | 2 +-
java/core/src/test/org/apache/orc/impl/TestCryptoUtils.java | 2 +-
java/core/src/test/org/apache/orc/impl/TestMemoryManager.java | 2 +-
.../src/test/org/apache/orc/impl/TestPredicatePushDownBounds.java | 2 +-
java/core/src/test/org/apache/orc/impl/TestStringRedBlackTree.java | 2 +-
java/shims/src/test/org/apache/orc/impl/TestHadoopShimsPre2_7.java | 2 +-
java/tools/src/test/org/apache/orc/impl/TestHadoopKeyProvider.java | 2 +-
.../src/test/org/apache/orc/tools/json/TestJsonSchemaFinder.java | 2 +-
18 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/java/core/src/test/org/apache/orc/TestCorruptTypes.java b/java/core/src/test/org/apache/orc/TestCorruptTypes.java
index 8808a08..0864c89 100644
--- a/java/core/src/test/org/apache/orc/TestCorruptTypes.java
+++ b/java/core/src/test/org/apache/orc/TestCorruptTypes.java
@@ -22,8 +22,8 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
public class TestCorruptTypes {
diff --git a/java/core/src/test/org/apache/orc/TestNewIntegerEncoding.java b/java/core/src/test/org/apache/orc/TestNewIntegerEncoding.java
index 2fe058f..a670e0e 100644
--- a/java/core/src/test/org/apache/orc/TestNewIntegerEncoding.java
+++ b/java/core/src/test/org/apache/orc/TestNewIntegerEncoding.java
@@ -17,7 +17,7 @@
*/
package org.apache.orc;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import java.io.File;
import java.sql.Timestamp;
diff --git a/java/core/src/test/org/apache/orc/TestOrcDSTNoTimezone.java b/java/core/src/test/org/apache/orc/TestOrcDSTNoTimezone.java
index e390fe1..5921aae 100644
--- a/java/core/src/test/org/apache/orc/TestOrcDSTNoTimezone.java
+++ b/java/core/src/test/org/apache/orc/TestOrcDSTNoTimezone.java
@@ -34,8 +34,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
/**
diff --git a/java/core/src/test/org/apache/orc/TestOrcNoTimezone.java b/java/core/src/test/org/apache/orc/TestOrcNoTimezone.java
index 337bd9f..a9d5c0b 100644
--- a/java/core/src/test/org/apache/orc/TestOrcNoTimezone.java
+++ b/java/core/src/test/org/apache/orc/TestOrcNoTimezone.java
@@ -34,8 +34,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
/**
diff --git a/java/core/src/test/org/apache/orc/TestOrcNullOptimization.java b/java/core/src/test/org/apache/orc/TestOrcNullOptimization.java
index 02e601f..bb5cc75 100644
--- a/java/core/src/test/org/apache/orc/TestOrcNullOptimization.java
+++ b/java/core/src/test/org/apache/orc/TestOrcNullOptimization.java
@@ -17,7 +17,7 @@
*/
package org.apache.orc;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.apache.orc.TestVectorOrcFile.assertEmptyStats;
import static org.junit.Assert.assertArrayEquals;
diff --git a/java/core/src/test/org/apache/orc/TestOrcTimestampPPD.java b/java/core/src/test/org/apache/orc/TestOrcTimestampPPD.java
index e39ff5a..1c853c2 100644
--- a/java/core/src/test/org/apache/orc/TestOrcTimestampPPD.java
+++ b/java/core/src/test/org/apache/orc/TestOrcTimestampPPD.java
@@ -40,7 +40,7 @@ import java.sql.Timestamp;
import java.util.List;
import java.util.TimeZone;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class TestOrcTimestampPPD {
Path workDir =
diff --git a/java/core/src/test/org/apache/orc/TestOrcTimezone1.java b/java/core/src/test/org/apache/orc/TestOrcTimezone1.java
index 4fc8653..283b09a 100644
--- a/java/core/src/test/org/apache/orc/TestOrcTimezone1.java
+++ b/java/core/src/test/org/apache/orc/TestOrcTimezone1.java
@@ -17,7 +17,7 @@
*/
package org.apache.orc;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import java.io.File;
import java.sql.Timestamp;
@@ -26,7 +26,7 @@ import java.util.Collection;
import java.util.List;
import java.util.TimeZone;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
diff --git a/java/core/src/test/org/apache/orc/TestOrcTimezone2.java b/java/core/src/test/org/apache/orc/TestOrcTimezone2.java
index 4a02855..32fc838 100644
--- a/java/core/src/test/org/apache/orc/TestOrcTimezone2.java
+++ b/java/core/src/test/org/apache/orc/TestOrcTimezone2.java
@@ -17,7 +17,7 @@
*/
package org.apache.orc;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import java.io.File;
import java.sql.Timestamp;
diff --git a/java/core/src/test/org/apache/orc/TestOrcTimezone3.java b/java/core/src/test/org/apache/orc/TestOrcTimezone3.java
index ba0a8c8..513e92e 100644
--- a/java/core/src/test/org/apache/orc/TestOrcTimezone3.java
+++ b/java/core/src/test/org/apache/orc/TestOrcTimezone3.java
@@ -17,7 +17,7 @@
*/
package org.apache.orc;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import java.io.File;
import java.sql.Timestamp;
diff --git a/java/core/src/test/org/apache/orc/TestOrcTimezone4.java b/java/core/src/test/org/apache/orc/TestOrcTimezone4.java
index ee1cfac..167759e 100644
--- a/java/core/src/test/org/apache/orc/TestOrcTimezone4.java
+++ b/java/core/src/test/org/apache/orc/TestOrcTimezone4.java
@@ -35,7 +35,7 @@ import java.text.SimpleDateFormat;
import java.util.List;
import java.util.TimeZone;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
/**
*
diff --git a/java/core/src/test/org/apache/orc/TestOrcTimezonePPD.java b/java/core/src/test/org/apache/orc/TestOrcTimezonePPD.java
index c0b7d44..ec23b4c 100644
--- a/java/core/src/test/org/apache/orc/TestOrcTimezonePPD.java
+++ b/java/core/src/test/org/apache/orc/TestOrcTimezonePPD.java
@@ -15,7 +15,7 @@
*/
package org.apache.orc;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import java.io.File;
import java.sql.Timestamp;
diff --git a/java/core/src/test/org/apache/orc/impl/TestCryptoUtils.java b/java/core/src/test/org/apache/orc/impl/TestCryptoUtils.java
index 2811bbf..5f32079 100644
--- a/java/core/src/test/org/apache/orc/impl/TestCryptoUtils.java
+++ b/java/core/src/test/org/apache/orc/impl/TestCryptoUtils.java
@@ -31,7 +31,7 @@ import java.security.Key;
import java.util.List;
import java.util.Random;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class TestCryptoUtils {
diff --git a/java/core/src/test/org/apache/orc/impl/TestMemoryManager.java b/java/core/src/test/org/apache/orc/impl/TestMemoryManager.java
index 3a891e3..0828001 100644
--- a/java/core/src/test/org/apache/orc/impl/TestMemoryManager.java
+++ b/java/core/src/test/org/apache/orc/impl/TestMemoryManager.java
@@ -28,7 +28,7 @@ import org.mockito.Mockito;
import java.lang.management.ManagementFactory;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
diff --git a/java/core/src/test/org/apache/orc/impl/TestPredicatePushDownBounds.java b/java/core/src/test/org/apache/orc/impl/TestPredicatePushDownBounds.java
index 56f4194..3e7c476 100644
--- a/java/core/src/test/org/apache/orc/impl/TestPredicatePushDownBounds.java
+++ b/java/core/src/test/org/apache/orc/impl/TestPredicatePushDownBounds.java
@@ -31,7 +31,7 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.apache.orc.impl.TestRecordReaderImpl.createPredicateLeaf;
public class TestPredicatePushDownBounds {
diff --git a/java/core/src/test/org/apache/orc/impl/TestStringRedBlackTree.java b/java/core/src/test/org/apache/orc/impl/TestStringRedBlackTree.java
index bc61dcf..1e2c8fa 100644
--- a/java/core/src/test/org/apache/orc/impl/TestStringRedBlackTree.java
+++ b/java/core/src/test/org/apache/orc/impl/TestStringRedBlackTree.java
@@ -18,7 +18,7 @@
package org.apache.orc.impl;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
diff --git a/java/shims/src/test/org/apache/orc/impl/TestHadoopShimsPre2_7.java b/java/shims/src/test/org/apache/orc/impl/TestHadoopShimsPre2_7.java
index eeb19e8..c440522 100644
--- a/java/shims/src/test/org/apache/orc/impl/TestHadoopShimsPre2_7.java
+++ b/java/shims/src/test/org/apache/orc/impl/TestHadoopShimsPre2_7.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import java.sql.Date;
import java.util.HashMap;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class TestHadoopShimsPre2_7 {
diff --git a/java/tools/src/test/org/apache/orc/impl/TestHadoopKeyProvider.java b/java/tools/src/test/org/apache/orc/impl/TestHadoopKeyProvider.java
index d3cbf60..00b67d6 100644
--- a/java/tools/src/test/org/apache/orc/impl/TestHadoopKeyProvider.java
+++ b/java/tools/src/test/org/apache/orc/impl/TestHadoopKeyProvider.java
@@ -26,7 +26,7 @@ import java.security.Key;
import java.util.List;
import java.util.Random;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class TestHadoopKeyProvider {
diff --git a/java/tools/src/test/org/apache/orc/tools/json/TestJsonSchemaFinder.java b/java/tools/src/test/org/apache/orc/tools/json/TestJsonSchemaFinder.java
index 6e54881..e125888 100644
--- a/java/tools/src/test/org/apache/orc/tools/json/TestJsonSchemaFinder.java
+++ b/java/tools/src/test/org/apache/orc/tools/json/TestJsonSchemaFinder.java
@@ -25,7 +25,7 @@ import com.google.gson.JsonPrimitive;
import com.google.gson.internal.LazilyParsedNumber;
import org.junit.Test;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class TestJsonSchemaFinder {