More test-suite refactoring

artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/util/SilentTestCase.java

@@ -40,7 +40,6 @@ public abstract class SilentTestCase extends Assert
    @Before
    public void setUp() throws Exception
    {
-
       origSysOut = System.out;
       origSysErr = System.err;
       sysOut = new PrintStream(new ByteArrayOutputStream());
@@ -54,6 +53,5 @@ public void tearDown() throws Exception
    {
       System.setOut(origSysOut);
       System.setErr(origSysErr);
-
    }
 }

artemis-core-client/src/test/java/org/apache/activemq/artemis/util/ConcurrentHashSetTest.java

@@ -15,19 +15,15 @@
  * limitations under the License.
  */
 package org.apache.activemq.artemis.util;
-import org.junit.Before;
-import org.junit.After;
-
-import org.junit.Test;
-
-import java.util.Iterator;
-
-import org.junit.Assert;
-
 
 import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.apache.activemq.artemis.utils.ConcurrentHashSet;
 import org.apache.activemq.artemis.utils.ConcurrentSet;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Iterator;
 
 public class ConcurrentHashSetTest extends Assert
 {
@@ -132,20 +128,10 @@ public void testIterator() throws Exception
    @Before
    public void setUp() throws Exception
    {
-
-
       set = new ConcurrentHashSet<String>();
       element = RandomUtil.randomString();
    }
 
-   @After
-   public void tearDown() throws Exception
-   {
-      set = null;
-      element = null;
-
-
-   }
    // Package protected ---------------------------------------------
 
    // Protected -----------------------------------------------------

artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesConversionTest.java

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 package org.apache.activemq.artemis.util;
+
 import org.apache.activemq.artemis.api.core.ActiveMQPropertyConversionException;
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.tests.util.RandomUtil;
 import org.apache.activemq.artemis.utils.TypedProperties;
-import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -46,21 +46,10 @@ public class TypedPropertiesConversionTest
    @Before
    public void setUp() throws Exception
    {
-
-
       key = RandomUtil.randomSimpleString();
       props = new TypedProperties();
    }
 
-   @After
-   public void tearDown() throws Exception
-   {
-      key = null;
-      props = null;
-
-
-   }
-
    @Test
    public void testBooleanProperty() throws Exception
    {

artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java

@@ -24,8 +24,6 @@
 
 import java.lang.ref.WeakReference;
 
-//import io.hawtjms.jms.JmsConnectionFactory;
-//import io.hawtjms.jms.JmsQueue;
 import org.apache.qpid.amqp_1_0.jms.impl.ConnectionFactoryImpl;
 import org.apache.qpid.amqp_1_0.jms.impl.QueueImpl;
 import org.proton.plug.test.minimalserver.DumbServer;

artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java

@@ -84,7 +84,6 @@ public void setUp() throws Exception
       AbstractJMSTest.forceGC();
       server.start("127.0.0.1", Constants.PORT, true);
       connection = createConnection();
-
    }
 
    @After

artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java

@@ -270,6 +270,8 @@ public interface Configuration
 
    Configuration addConnectorConfiguration(final String key, final TransportConfiguration info);
 
+   Configuration clearConnectorConfigurations();
+
    /**
     * Returns the broadcast groups configured for this server.
     */
@@ -324,6 +326,8 @@ public interface Configuration
     */
    Configuration setDivertConfigurations(final List<DivertConfiguration> configs);
 
+   Configuration addDivertConfiguration(final DivertConfiguration config);
+
    /**
     * Returns the cluster connections configured for this server.
     * <p/>
@@ -797,6 +801,8 @@ public interface Configuration
 
    Configuration addAddressesSetting(String key, AddressSettings addressesSetting);
 
+   Configuration clearAddressesSettings();
+
    /**
     * @param roles a list of roles per matching
     */

artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java

@@ -377,6 +377,12 @@ public ConfigurationImpl addConnectorConfiguration(final String key, final Trans
       return this;
    }
 
+   public ConfigurationImpl clearConnectorConfigurations()
+   {
+      connectorConfigs.clear();
+      return this;
+   }
+
    public GroupingHandlerConfiguration getGroupingHandlerConfiguration()
    {
       return groupingHandlerConfiguration;
@@ -1026,6 +1032,13 @@ public ConfigurationImpl addAddressesSetting(String key, AddressSettings address
       return this;
    }
 
+   @Override
+   public ConfigurationImpl clearAddressesSettings()
+   {
+      this.addressesSettings.clear();
+      return this;
+   }
+
    @Override
    public Map<String, ResourceLimitSettings> getResourceLimitSettings()
    {