QPID-8350: Move getTestName() to BrokerAdminUsingTestBase
diff --git a/systests/qpid-systests-http-management/src/main/java/org/apache/qpid/tests/http/HttpTestBase.java b/systests/qpid-systests-http-management/src/main/java/org/apache/qpid/tests/http/HttpTestBase.java
index 04f37ea..f1ecd4c 100644
--- a/systests/qpid-systests-http-management/src/main/java/org/apache/qpid/tests/http/HttpTestBase.java
+++ b/systests/qpid-systests-http-management/src/main/java/org/apache/qpid/tests/http/HttpTestBase.java
@@ -30,8 +30,6 @@
import org.junit.After;
import org.junit.Before;
-import org.junit.Rule;
-import org.junit.rules.TestName;
import org.apache.qpid.server.model.Protocol;
import org.apache.qpid.systests.ConnectionBuilder;
@@ -44,9 +42,6 @@
{
public static final String DEFAULT_BROKER_CONFIG = "classpath:config-http-management-tests.json";
- @Rule
- public final TestName _testName = new TestName();
-
private HttpTestHelper _helper;
private JmsProvider _jmsProvider;
@@ -72,12 +67,12 @@
protected String getVirtualHost()
{
- return getClass().getSimpleName() + "_" + _testName.getMethodName();
+ return getClass().getSimpleName() + "_" + getTestName();
}
protected String getVirtualHostNode()
{
- return getClass().getSimpleName() + "_" + _testName.getMethodName();
+ return getClass().getSimpleName() + "_" + getTestName();
}
public HttpTestHelper getHelper()
@@ -102,7 +97,7 @@
private HttpRequestConfig getHttpRequestConfig() throws Exception
{
- HttpRequestConfig config = getClass().getMethod(_testName.getMethodName(), new Class[]{}).getAnnotation(HttpRequestConfig.class);
+ HttpRequestConfig config = getClass().getMethod(getTestName(), new Class[]{}).getAnnotation(HttpRequestConfig.class);
if (config == null)
{
config = getClass().getAnnotation(HttpRequestConfig.class);
@@ -121,9 +116,4 @@
return Utils.getProtocol();
}
- protected String getTestName()
- {
- return _testName.getMethodName();
- }
-
}
diff --git a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/JmsTestBase.java b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/JmsTestBase.java
index c264b6b..2c77f58 100644
--- a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/JmsTestBase.java
+++ b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/JmsTestBase.java
@@ -41,8 +41,6 @@
import javax.naming.NamingException;
import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.rules.TestName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,9 +56,6 @@
private static JmsProvider _jmsProvider;
private static AmqpManagementFacade _managementFacade;
- @Rule
- public final TestName _testName = new TestName();
-
@BeforeClass
public static void setUpTestBase()
{
@@ -128,12 +123,7 @@
protected String getVirtualHostName()
{
- return getClass().getSimpleName() + "_" + _testName.getMethodName();
- }
-
- protected String getTestName()
- {
- return _testName.getMethodName();
+ return getClass().getSimpleName() + "_" + getTestName();
}
protected Queue getQueue(String queueName) throws Exception
diff --git a/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/BrokerAdminUsingTestBase.java b/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/BrokerAdminUsingTestBase.java
index 73149af..852b732 100644
--- a/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/BrokerAdminUsingTestBase.java
+++ b/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/BrokerAdminUsingTestBase.java
@@ -20,6 +20,8 @@
package org.apache.qpid.tests.utils;
+import org.junit.Rule;
+import org.junit.rules.TestName;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -28,6 +30,8 @@
public abstract class BrokerAdminUsingTestBase
{
private static final Logger LOGGER = LoggerFactory.getLogger(BrokerAdminUsingTestBase.class);
+ @Rule
+ public final TestName _testName = new TestName();
private BrokerAdmin _brokerAdmin;
@@ -40,4 +44,9 @@
{
return _brokerAdmin;
}
+
+ protected String getTestName()
+ {
+ return _testName.getMethodName();
+ }
}
