[hive] branch master updated: HIVE-26392 Move StringableMap tests into a dedicated test class (#3741) (Zoltan Ratkai reviewed by Laszlo Bodor, Zsolt Miskolczi)

[ab...@apache.org]

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

abstractdog pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new fe38eeb5346 HIVE-26392 Move StringableMap tests into a dedicated test class (#3741) (Zoltan Ratkai reviewed by Laszlo Bodor, Zsolt Miskolczi)
fe38eeb5346 is described below

commit fe38eeb53464a8fc3f17ac12366a738c704b8026
Author: zratkai <11...@users.noreply.github.com>
AuthorDate: Wed Dec 7 09:50:54 2022 +0100

    HIVE-26392 Move StringableMap tests into a dedicated test class (#3741) (Zoltan Ratkai reviewed by Laszlo Bodor, Zsolt Miskolczi)
---
 .../hive/ql/txn/compactor/TestStringableList.java  | 54 +++++++++++++++++++
 .../hadoop/hive/ql/txn/compactor/TestWorker.java   | 63 ----------------------
 .../hive/metastore/utils/TestStringableMap.java    | 63 ++++++++++++++++++++++
 3 files changed, 117 insertions(+), 63 deletions(-)

diff --git a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestStringableList.java b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestStringableList.java
new file mode 100644
index 00000000000..c6695107eda
--- /dev/null
+++ b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestStringableList.java
@@ -0,0 +1,54 @@
+/*
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.hadoop.hive.ql.txn.compactor;
+
+import org.apache.hadoop.fs.Path;
+import org.junit.Assert;
+import org.junit.Test;
+
+
+
+public class TestStringableList {
+
+  @Test
+  public void stringableList() throws Exception {
+    // Empty list case
+    CompactorMR.StringableList ls = new CompactorMR.StringableList();
+    String s = ls.toString();
+    Assert.assertEquals("0:", s);
+    ls = new CompactorMR.StringableList(s);
+    Assert.assertEquals(0, ls.size());
+
+    ls = new CompactorMR.StringableList();
+    ls.add(new Path("/tmp"));
+    ls.add(new Path("/usr"));
+    s = ls.toString();
+    Assert.assertTrue("Expected 2:4:/tmp4:/usr or 2:4:/usr4:/tmp, got " + s,
+        "2:4:/tmp4:/usr".equals(s) || "2:4:/usr4:/tmp".equals(s));
+    ls = new CompactorMR.StringableList(s);
+    Assert.assertEquals(2, ls.size());
+    boolean sawTmp = false, sawUsr = false;
+    for (Path p : ls) {
+      if ("/tmp".equals(p.toString())) sawTmp = true;
+      else if ("/usr".equals(p.toString())) sawUsr = true;
+      else Assert.fail("Unexpected path " + p.toString());
+    }
+    Assert.assertTrue(sawTmp);
+    Assert.assertTrue(sawUsr);
+  }
+}
\ No newline at end of file
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestWorker.java b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestWorker.java
index cf7e32d716c..1b964648029 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestWorker.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestWorker.java
@@ -40,7 +40,6 @@ import org.apache.hadoop.hive.metastore.api.TxnInfo;
 import org.apache.hadoop.hive.metastore.api.TxnState;
 import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants;
 import org.apache.hadoop.hive.metastore.txn.TxnStore;
-import org.apache.hadoop.hive.metastore.utils.StringableMap;
 import org.apache.hadoop.hive.ql.io.AcidUtils;
 import org.junit.After;
 import org.junit.Assert;
@@ -93,68 +92,6 @@ public class TestWorker extends CompactorTest {
     // survival test.
     startWorker();
   }
-
-  @Test
-  public void stringableMap() throws Exception {
-    // Empty map case
-    StringableMap m = new StringableMap(new HashMap<String, String>());
-    String s = m.toString();
-    Assert.assertEquals("0:", s);
-    m = new StringableMap(s);
-    Assert.assertEquals(0, m.size());
-
-    Map<String, String> base = new HashMap<String, String>();
-    base.put("mary", "poppins");
-    base.put("bert", null);
-    base.put(null, "banks");
-    m = new StringableMap(base);
-    s = m.toString();
-    m = new StringableMap(s);
-    Assert.assertEquals(3, m.size());
-    Map<String, Boolean> saw = new HashMap<String, Boolean>(3);
-    saw.put("mary", false);
-    saw.put("bert", false);
-    saw.put(null, false);
-    for (Map.Entry<String, String> e : m.entrySet()) {
-      saw.put(e.getKey(), true);
-      if ("mary".equals(e.getKey())) Assert.assertEquals("poppins", e.getValue());
-      else if ("bert".equals(e.getKey())) Assert.assertNull(e.getValue());
-      else if (null == e.getKey()) Assert.assertEquals("banks", e.getValue());
-      else Assert.fail("Unexpected value " + e.getKey());
-    }
-    Assert.assertEquals(3, saw.size());
-    Assert.assertTrue(saw.get("mary"));
-    Assert.assertTrue(saw.get("bert"));
-    Assert.assertTrue(saw.get(null));
-   }
-
-  @Test
-  public void stringableList() throws Exception {
-    // Empty list case
-    CompactorMR.StringableList ls = new CompactorMR.StringableList();
-    String s = ls.toString();
-    Assert.assertEquals("0:", s);
-    ls = new CompactorMR.StringableList(s);
-    Assert.assertEquals(0, ls.size());
-
-    ls = new CompactorMR.StringableList();
-    ls.add(new Path("/tmp"));
-    ls.add(new Path("/usr"));
-    s = ls.toString();
-    Assert.assertTrue("Expected 2:4:/tmp4:/usr or 2:4:/usr4:/tmp, got " + s,
-        "2:4:/tmp4:/usr".equals(s) || "2:4:/usr4:/tmp".equals(s));
-    ls = new CompactorMR.StringableList(s);
-    Assert.assertEquals(2, ls.size());
-    boolean sawTmp = false, sawUsr = false;
-    for (Path p : ls) {
-      if ("/tmp".equals(p.toString())) sawTmp = true;
-      else if ("/usr".equals(p.toString())) sawUsr = true;
-      else Assert.fail("Unexpected path " + p.toString());
-    }
-    Assert.assertTrue(sawTmp);
-    Assert.assertTrue(sawUsr);
-  }
-
   @Test
   public void inputSplit() throws Exception {
     String basename = "/warehouse/foo/base_1";
diff --git a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestStringableMap.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestStringableMap.java
new file mode 100644
index 00000000000..fdbef48deff
--- /dev/null
+++ b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestStringableMap.java
@@ -0,0 +1,63 @@
+/*
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.hadoop.hive.metastore.utils;
+
+import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Category(MetastoreUnitTest.class)
+public class TestStringableMap {
+    @Test
+    public void stringableMap() throws Exception {
+        // Empty map case
+        StringableMap m = new StringableMap(new HashMap<String, String>());
+        String s = m.toString();
+        Assert.assertEquals("0:", s);
+        m = new StringableMap(s);
+        Assert.assertEquals(0, m.size());
+
+        Map<String, String> base = new HashMap<String, String>();
+        base.put("mary", "poppins");
+        base.put("bert", null);
+        base.put(null, "banks");
+        m = new StringableMap(base);
+        s = m.toString();
+        m = new StringableMap(s);
+        Assert.assertEquals(3, m.size());
+        Map<String, Boolean> saw = new HashMap<String, Boolean>(3);
+        saw.put("mary", false);
+        saw.put("bert", false);
+        saw.put(null, false);
+        for (Map.Entry<String, String> e : m.entrySet()) {
+            saw.put(e.getKey(), true);
+            if ("mary".equals(e.getKey())) Assert.assertEquals("poppins", e.getValue());
+            else if ("bert".equals(e.getKey())) Assert.assertNull(e.getValue());
+            else if (null == e.getKey()) Assert.assertEquals("banks", e.getValue());
+            else Assert.fail("Unexpected value " + e.getKey());
+        }
+        Assert.assertEquals(3, saw.size());
+        Assert.assertTrue(saw.get("mary"));
+        Assert.assertTrue(saw.get("bert"));
+        Assert.assertTrue(saw.get(null));
+    }
+}
\ No newline at end of file