diff --git hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java index 81cf78a82c..5c2f21a913 100644 --- hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java +++ hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java @@ -57,13 +57,12 @@ import com.google.common.base.Joiner; * interface and talk to it from client side. */ @Category(LargeTests.class) -@RunWith(Parameterized.class) public class TestThriftServerCmdLine { private static final Log LOG = LogFactory.getLog(TestThriftServerCmdLine.class); - private final ImplType implType; + private ImplType implType; private boolean specifyFramed; private boolean specifyBindIP; private boolean specifyCompact; @@ -79,9 +78,8 @@ public class TestThriftServerCmdLine { private ThriftServer thriftServer; private int port; - @Parameters - public static Collection getParameters() { - Collection parameters = new ArrayList(); + @Test + public void testRunAllThriftServer() throws Exception { for (ImplType implType : ImplType.values()) { for (boolean specifyFramed : new boolean[] {false, true}) { for (boolean specifyBindIP : new boolean[] {false, true}) { @@ -89,22 +87,19 @@ public class TestThriftServerCmdLine { continue; } for (boolean specifyCompact : new boolean[] {false, true}) { - parameters.add(new Object[]{implType, specifyFramed, - specifyBindIP, specifyCompact}); + this.implType = implType; + this.specifyFramed = specifyFramed; + this.specifyBindIP = specifyBindIP; + this.specifyCompact = specifyCompact; + cmdLineException = null; + cmdLineThread = null; + thriftServer = null; + clientSideException = null; + testRunThriftServer(); } } } } - return parameters; - } - - public TestThriftServerCmdLine(ImplType implType, boolean specifyFramed, - boolean specifyBindIP, boolean specifyCompact) { - this.implType = implType; - this.specifyFramed = specifyFramed; - this.specifyBindIP = specifyBindIP; - this.specifyCompact = specifyCompact; - LOG.debug(getParametersString()); } private String getParametersString() { @@ -148,8 +143,7 @@ public class TestThriftServerCmdLine { cmdLineThread.start(); } - @Test(timeout=600000) - public void testRunThriftServer() throws Exception { + private void testRunThriftServer() throws Exception { List args = new ArrayList(); if (implType != null) { String serverTypeOption = implType.toString();