[kudu] 02/02: [java] use KuduTestHarness in TestNegotiation

[adar]

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

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

commit 6bf82d40f8799ddc110fc83f479b72a45c3a0c49
Author: Alexey Serbin <ale...@apache.org>
AuthorDate: Fri Mar 13 20:42:20 2020 -0700

    [java] use KuduTestHarness in TestNegotiation
    
    Change-Id: I44712ffe05bc0de21f8610abfad0c59549f91999
    Reviewed-on: http://gerrit.cloudera.org:8080/15434
    Tested-by: Alexey Serbin <aser...@cloudera.com>
    Reviewed-by: Adar Dembo <a...@cloudera.com>
---
 .../org/apache/kudu/client/TestNegotiation.java    | 38 ++++++++++------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git 
a/java/kudu-client/src/test/java/org/apache/kudu/client/TestNegotiation.java 
b/java/kudu-client/src/test/java/org/apache/kudu/client/TestNegotiation.java
index 54c9d9a..f0b35c7 100644
--- a/java/kudu-client/src/test/java/org/apache/kudu/client/TestNegotiation.java
+++ b/java/kudu-client/src/test/java/org/apache/kudu/client/TestNegotiation.java
@@ -25,14 +25,20 @@ import org.junit.Rule;
 import org.junit.Test;
 
 import org.apache.kudu.test.CapturingLogAppender;
+import org.apache.kudu.test.KuduTestHarness;
+import org.apache.kudu.test.KuduTestHarness.MasterServerConfig;
 import org.apache.kudu.test.cluster.FakeDNS;
-import org.apache.kudu.test.cluster.MiniKuduCluster;
-import org.apache.kudu.test.junit.RetryRule;
+import org.apache.kudu.test.cluster.MiniKuduCluster.MiniKuduClusterBuilder;
 
 public class TestNegotiation {
+  private static final MiniKuduClusterBuilder clusterBuilder =
+      new MiniKuduClusterBuilder()
+          .numMasterServers(1)
+          .numTabletServers(0)
+          .enableKerberos();
 
   @Rule
-  public RetryRule retryRule = new RetryRule();
+  public KuduTestHarness harness = new KuduTestHarness(clusterBuilder);
 
   /**
    * Test that a non-Kerberized client will use SASL PLAIN to connect to a
@@ -40,29 +46,19 @@ public class TestNegotiation {
    * KUDU-2121.
    */
   @Test
+  @MasterServerConfig(flags = {
+      "--rpc-authentication=optional",
+      "--rpc-trace-negotiation",
+      "--user-acl=*" })
   public void testSaslPlainFallback() throws Exception {
     FakeDNS.getInstance().install();
-    MiniKuduCluster.MiniKuduClusterBuilder clusterBuilder =
-        new MiniKuduCluster.MiniKuduClusterBuilder();
-
-    clusterBuilder.numMasterServers(1)
-                  .numTabletServers(0)
-                  .enableKerberos()
-                  .addMasterServerFlag("--rpc-authentication=optional")
-                  .addMasterServerFlag("--rpc-trace-negotiation")
-                  .addMasterServerFlag("--user-acl=*");
 
     CapturingLogAppender cla = new CapturingLogAppender();
-    try (MiniKuduCluster cluster = clusterBuilder.build()) {
-      cluster.kdestroy();
-      try (Closeable c = cla.attach();
-           KuduClient client =
-               new 
KuduClient.KuduClientBuilder(cluster.getMasterAddressesAsString()).build()
-      ) {
-        assertTrue(client.getTablesList().getTablesList().isEmpty());
-      }
+    harness.kdestroy();
+    harness.resetClients();
+    try (Closeable c = cla.attach()) {
+      
assertTrue(harness.getClient().getTablesList().getTablesList().isEmpty());
     }
-
     assertTrue(cla.getAppendedText(),
                cla.getAppendedText().contains("Client requested to use 
mechanism: PLAIN"));
   }