[KYUUBI #7473] Simplify assertTrue(x.equals(...)) to assertEquals

Replace assertTrue(expr.equals(literal)) with assertEquals(literal, expr)
in tests touched by the JUnit 5 migration, plus one assertTrue(x == 100)
to assertEquals(100, x). Pure cleanup, no behavior change.

Assisted-by: Claude:claude-opus-4-7

Author: wangzhigang1999

kyuubi-hive-beeline/src/test/java/org/apache/hive/beeline/TestBeeLineHistory.java

@@ -81,8 +81,8 @@ public void testHistory() throws Exception {
     beeline.dispatch("!history");
     String output = os.toString("UTF-8");
     String[] tmp = output.split("\n");
-    Assertions.assertTrue(tmp[0].equals("1     : select 1;"));
-    Assertions.assertTrue(tmp[9].equals("10    : select 10;"));
+    Assertions.assertEquals("1     : select 1;", tmp[0]);
+    Assertions.assertEquals("10    : select 10;", tmp[9]);
     beeline.close();
   }
 

kyuubi-hive-beeline/src/test/java/org/apache/hive/beeline/TestBeelineArgParsing.java

@@ -123,8 +123,8 @@ public void testSimpleArgs() throws Exception {
           "-u", "url", "-n", "name", "-p", "password", "-d", "driver", "-a", "authType"
         };
     assertEquals(0, bl.initArgs(args));
-    assertTrue(bl.connectArgs.equals("url name password driver"));
-    assertTrue(bl.getOpts().getAuthType().equals("authType"));
+    assertEquals("url name password driver", bl.connectArgs);
+    assertEquals("authType", bl.getOpts().getAuthType());
   }
 
   @Test
@@ -153,8 +153,8 @@ public void testPasswordFileArgs() throws Exception {
     bl.initArgs(args);
     System.out.println(bl.connectArgs);
     // Password file contents are trimmed of trailing whitespaces and newlines
-    assertTrue(bl.connectArgs.equals("url name mypass driver"));
-    assertTrue(bl.getOpts().getAuthType().equals("authType"));
+    assertEquals("url name mypass driver", bl.connectArgs);
+    assertEquals("authType", bl.getOpts().getAuthType());
     passFile.delete();
   }
 
@@ -165,7 +165,7 @@ public void testDuplicateArgs() throws Exception {
     String args[] =
         new String[] {"-u", "url", "-u", "url2", "-n", "name", "-p", "password", "-d", "driver"};
     assertEquals(0, bl.initArgs(args));
-    assertTrue(bl.connectArgs.equals("url name password driver"));
+    assertEquals("url name password driver", bl.connectArgs);
   }
 
   @Test
@@ -187,7 +187,7 @@ public void testQueryScripts() throws Exception {
           "select2"
         };
     assertEquals(0, bl.initArgs(args));
-    assertTrue(bl.connectArgs.equals("url name password driver"));
+    assertEquals("url name password driver", bl.connectArgs);
     assertTrue(bl.queries.contains("select1"));
     assertTrue(bl.queries.contains("select2"));
   }
@@ -220,13 +220,13 @@ public void testHiveConfAndVars() throws Exception {
           "f=fvalue"
         };
     assertEquals(0, bl.initArgs(args));
-    assertTrue(bl.connectArgs.equals("url name password driver"));
-    assertTrue(bl.getOpts().getHiveConfVariables().get("a").equals("avalue"));
-    assertTrue(bl.getOpts().getHiveConfVariables().get("b").equals("bvalue"));
-    assertTrue(bl.getOpts().getHiveVariables().get("c").equals("cvalue"));
-    assertTrue(bl.getOpts().getHiveVariables().get("d").equals("dvalue"));
-    assertTrue(bl.getOpts().getHiveConfVariables().get("e").equals("evalue"));
-    assertTrue(bl.getOpts().getHiveConfVariables().get("f").equals("fvalue"));
+    assertEquals("url name password driver", bl.connectArgs);
+    assertEquals("avalue", bl.getOpts().getHiveConfVariables().get("a"));
+    assertEquals("bvalue", bl.getOpts().getHiveConfVariables().get("b"));
+    assertEquals("cvalue", bl.getOpts().getHiveVariables().get("c"));
+    assertEquals("dvalue", bl.getOpts().getHiveVariables().get("d"));
+    assertEquals("evalue", bl.getOpts().getHiveConfVariables().get("e"));
+    assertEquals("fvalue", bl.getOpts().getHiveConfVariables().get("f"));
   }
 
   @Test
@@ -247,7 +247,7 @@ public void testBeelineOpts() throws Exception {
           "--truncateTable"
         };
     assertEquals(0, bl.initArgs(args));
-    assertTrue(bl.connectArgs.equals("url name password driver"));
+    assertEquals("url name password driver", bl.connectArgs);
     assertTrue(bl.getOpts().getAutoCommit());
     assertTrue(bl.getOpts().getVerbose());
     assertTrue(bl.getOpts().getTruncateTable());
@@ -297,8 +297,8 @@ public void testScriptFile() throws Exception {
           "-u", "url", "-n", "name", "-p", "password", "-d", "driver", "-f", "myscript"
         };
     assertEquals(0, bl.initArgs(args));
-    assertTrue(bl.connectArgs.equals("url name password driver"));
-    assertTrue(bl.getOpts().getScriptFile().equals("myscript"));
+    assertEquals("url name password driver", bl.connectArgs);
+    assertEquals("myscript", bl.getOpts().getScriptFile());
   }
 
   /** Test beeline with -f and -e simultaneously */
@@ -408,7 +408,7 @@ public void testPropertyFile() throws Exception {
     TestBeeline bl = new TestBeeline();
     String args[] = new String[] {"--property-file", "props"};
     assertEquals(0, bl.initArgs(args));
-    assertTrue(bl.properties.get(0).equals("props"));
+    assertEquals("props", bl.properties.get(0));
     bl.close();
   }
 
@@ -418,7 +418,7 @@ public void testMaxHistoryRows() throws Exception {
     TestBeeline bl = new TestBeeline();
     String args[] = new String[] {"--maxHistoryRows=100"};
     assertEquals(0, bl.initArgs(args));
-    assertTrue(bl.getOpts().getMaxHistoryRows() == 100);
+    assertEquals(100, bl.getOpts().getMaxHistoryRows());
     bl.close();
   }
 }

kyuubi-hive-beeline/src/test/java/org/apache/hive/beeline/hs2connection/TestUserHS2ConnectionFileParser.java

@@ -62,23 +62,23 @@ public void cleanUp() {
   public void testParseNoAuthentication() throws BeelineHS2ConnectionFileParseException {
     String url = getParsedUrlFromConfigFile("test-hs2-connection-config-noauth.xml");
     String expectedUrl = "jdbc:hive2://localhost:10000/default;user=hive";
-    Assertions.assertTrue(expectedUrl.equals(url), "Expected " + expectedUrl + " got " + url);
+    Assertions.assertEquals(expectedUrl, url, "Expected " + expectedUrl + " got " + url);
   }
 
   @Test
   public void testParseZookeeper() throws BeelineHS2ConnectionFileParseException {
     String url = getParsedUrlFromConfigFile("test-hs2-connection-zookeeper-config.xml");
     String expectedUrl =
         "jdbc:hive2://zk-node-1:10000,zk-node-2:10001,zk-node-3:10004/default;serviceDiscoveryMode=zookeeper;zooKeeperNamespace=hiveserver2";
-    Assertions.assertTrue(expectedUrl.equals(url), "Expected " + expectedUrl + " got " + url);
+    Assertions.assertEquals(expectedUrl, url, "Expected " + expectedUrl + " got " + url);
   }
 
   @Test
   public void testParseWithKerberosNoSSL() throws BeelineHS2ConnectionFileParseException {
     String url = getParsedUrlFromConfigFile("test-hs2-conn-conf-kerberos-nossl.xml");
     String expectedUrl =
         "jdbc:hive2://localhost:10000/default;principal=hive/dummy-hostname@domain.com;ssl=false";
-    Assertions.assertTrue(expectedUrl.equals(url), "Expected " + expectedUrl + " got " + url);
+    Assertions.assertEquals(expectedUrl, url, "Expected " + expectedUrl + " got " + url);
   }
 
   @Test
@@ -87,7 +87,7 @@ public void testParseWithKerberosSSL() throws BeelineHS2ConnectionFileParseExcep
     String expectedUrl =
         "jdbc:hive2://localhost:10000/default;principal=hive/dummy-hostname@domain.com;ssl=true;"
             + "sslTrustStore=test/truststore;trustStorePassword=testTruststorePassword";
-    Assertions.assertTrue(expectedUrl.equals(url), "Expected " + expectedUrl + " got " + url);
+    Assertions.assertEquals(expectedUrl, url, "Expected " + expectedUrl + " got " + url);
   }
 
   @Test
@@ -96,15 +96,15 @@ public void testParseWithSSLAndHttpMode() throws BeelineHS2ConnectionFileParseEx
     String expectedUrl =
         "jdbc:hive2://localhost:10000/default;httpPath=testHTTPPath;principal=hive/dummy-hostname@domain.com;"
             + "ssl=true;sslTrustStore=test/truststore;transportMode=http;trustStorePassword=testTruststorePassword";
-    Assertions.assertTrue(expectedUrl.equals(url), "Expected " + expectedUrl + " got " + url);
+    Assertions.assertEquals(expectedUrl, url, "Expected " + expectedUrl + " got " + url);
   }
 
   @Test
   public void testUrlWithHiveConfValues() throws Exception {
     String url = getParsedUrlFromConfigFile("test-hs2-connection-conf-list.xml");
     String expectedUrl =
         "jdbc:hive2://localhost:10000/default;user=hive?hive.cli.print.current.db=false#testVarName1=value1";
-    Assertions.assertTrue(expectedUrl.equals(url), "Expected " + expectedUrl + " got " + url);
+    Assertions.assertEquals(expectedUrl, url, "Expected " + expectedUrl + " got " + url);
   }
 
   @Test
@@ -113,7 +113,7 @@ public void testUrlWithMultipleHiveConfValues() throws Exception {
     String expectedUrl =
         "jdbc:hive2://localhost:10000/default;user=hive?hive.cli.print.current.db=true;"
             + "hive.cli.print.header=true#testVarName1=value1;testVarName2=value2";
-    Assertions.assertTrue(expectedUrl.equals(url), "Expected " + expectedUrl + " got " + url);
+    Assertions.assertEquals(expectedUrl, url, "Expected " + expectedUrl + " got " + url);
   }
 
   /*