ARTEMIS-1532 Enable tests which are unintentionally skipped by Surefire

These tests used to have a wrong name, so they weren't executed by
Surefire during a `mvn test` run.

After enablement, the following tests are now failing:

* org.apache.activemq.artemis.tests.integration.cluster.ha.HAAutomaticBackupSharedStoreTest
* org.apache.activemq.artemis.tests.integration.ra.OutgoingConnectionNoJTATest
* org.apache.activemq.artemis.tests.unit.core.server.group.impl.SystemPropertyOverrideTest.testSystemPropertyOverride
This commit is contained in:
Jiri Danek 2017-12-03 19:44:58 +01:00 committed by Clebert Suconic
parent f7ea0d7e70
commit aa730fdaa7
15 changed files with 26 additions and 18 deletions

View File

@ -26,9 +26,11 @@ import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.ActiveMQMessageConsumer;
import org.apache.activemq.command.ActiveMQQueue;
import org.junit.Test;
public class ConfigUsingDestinationOptions extends TestCase {
public class ConfigUsingDestinationOptionsTest extends TestCase {
@Test(timeout = 60000)
public void testValidSelectorConfig() throws JMSException {
ActiveMQQueue queue = new ActiveMQQueue("TEST.FOO?consumer.selector=test=1");
@ -46,6 +48,7 @@ public class ConfigUsingDestinationOptions extends TestCase {
assertEquals("test=1", cons.getMessageSelector());
}
@Test(timeout = 60000)
public void testInvalidSelectorConfig() throws JMSException {
ActiveMQQueue queue = new ActiveMQQueue("TEST.FOO?consumer.selector=test||1");

View File

@ -1579,6 +1579,7 @@ public class ClusteredGroupingTest extends ClusterTestBase {
}
@Test
public void testGroupingMultipleSending() throws Exception {
setupServer(0, isFileStorage(), isNetty());
setupServer(1, isFileStorage(), isNetty());

View File

@ -38,7 +38,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class FailoverTestWithDivert extends FailoverTestBase {
public class FailoverWithDivertTest extends FailoverTestBase {
private static final String DIVERT_ADDRESS = "jms.queue.testQueue";
private static final String DIVERT_FORWARD_ADDRESS = "jms.queue.divertedQueue";

View File

@ -26,7 +26,7 @@ import org.apache.activemq.artemis.tests.integration.cluster.distribution.Cluste
import org.junit.Before;
import org.junit.Test;
public class HAAutomaticBackupSharedStore extends ClusterTestBase {
public class HAAutomaticBackupSharedStoreTest extends ClusterTestBase {
@Before
public void setup() throws Exception {

View File

@ -44,7 +44,7 @@ import org.apache.activemq.artemis.tests.util.Wait;
import org.junit.Assert;
import org.junit.Test;
public class ShutdownOnCriticalIOErrorMoveNext extends ActiveMQTestBase {
public class ShutdownOnCriticalIOErrorMoveNextTest extends ActiveMQTestBase {
@Test
public void testSimplyDownAfterError() throws Exception {

View File

@ -44,7 +44,7 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class AMQPToJMSCore extends ActiveMQTestBase {
public class AMQPToJMSCoreTest extends ActiveMQTestBase {
private ActiveMQServer server;
protected String queueName = "amqTestQueue1";

View File

@ -25,12 +25,14 @@ import org.apache.activemq.artemis.api.jms.JMSFactoryType;
import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.tests.util.JMSTestBase;
import org.junit.Test;
/**
* A CloseConnectionOnGCTest
*/
public class CloseConnectionFactoryOnGCest extends JMSTestBase {
public class CloseConnectionFactoryOnGCTest extends JMSTestBase {
@Test(timeout = 60000)
public void testCloseCFOnGC() throws Exception {
final AtomicInteger valueGC = new AtomicInteger(0);

View File

@ -49,7 +49,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
public class OutgoingConnectionTestJTA extends ActiveMQRATestBase {
public class OutgoingConnectionJTATest extends ActiveMQRATestBase {
protected ActiveMQResourceAdapter resourceAdapter;
protected ActiveMQRAConnectionFactory qraConnectionFactory;

View File

@ -48,7 +48,7 @@ import javax.jms.TextMessage;
import java.util.HashSet;
import java.util.Set;
public class OutgoingConnectionTestNoJTA extends ActiveMQRATestBase {
public class OutgoingConnectionNoJTATest extends ActiveMQRATestBase {
protected ActiveMQResourceAdapter resourceAdapter;
protected ActiveMQRAConnectionFactory qraConnectionFactory;

View File

@ -34,7 +34,7 @@ import java.util.List;
import java.util.Map;
@RunWith(value = Parameterized.class)
public class StompTestPropertiesInterceptor extends StompTestBase {
public class StompPropertiesInterceptorTest extends StompTestBase {
@Parameterized.Parameters(name = "{0}")
public static Collection<Object[]> data() {
@ -44,14 +44,14 @@ public class StompTestPropertiesInterceptor extends StompTestBase {
@Override
public List<String> getIncomingInterceptors() {
List<String> stompIncomingInterceptor = new ArrayList<>();
stompIncomingInterceptor.add("org.apache.activemq.artemis.tests.integration.stomp.StompTestPropertiesInterceptor$StompFramePropertiesInterceptor");
stompIncomingInterceptor.add("org.apache.activemq.artemis.tests.integration.stomp.StompPropertiesInterceptorTest$StompFramePropertiesInterceptor");
return stompIncomingInterceptor;
}
@Override
public List<String> getOutgoingInterceptors() {
List<String> stompOutgoingInterceptor = new ArrayList<>();
stompOutgoingInterceptor.add("org.apache.activemq.artemis.tests.integration.stomp.StompTestPropertiesInterceptor$StompFramePropertiesInterceptor");
stompOutgoingInterceptor.add("org.apache.activemq.artemis.tests.integration.stomp.StompPropertiesInterceptorTest$StompFramePropertiesInterceptor");
return stompOutgoingInterceptor;
}

View File

@ -33,13 +33,13 @@ import org.apache.activemq.artemis.tests.util.Wait;
import org.junit.Assert;
import org.junit.Test;
public class StompTestWithInterceptors extends StompTestBase {
public class StompWithInterceptorsTest extends StompTestBase {
@Override
public List<String> getIncomingInterceptors() {
List<String> stompIncomingInterceptor = new ArrayList<>();
stompIncomingInterceptor.add("org.apache.activemq.artemis.tests.integration.stomp.StompTestWithInterceptors$MyIncomingStompFrameInterceptor");
stompIncomingInterceptor.add("org.apache.activemq.artemis.tests.integration.stomp.StompTestWithInterceptors$MyCoreInterceptor");
stompIncomingInterceptor.add("org.apache.activemq.artemis.tests.integration.stomp.StompWithInterceptorsTest$MyIncomingStompFrameInterceptor");
stompIncomingInterceptor.add("org.apache.activemq.artemis.tests.integration.stomp.StompWithInterceptorsTest$MyCoreInterceptor");
return stompIncomingInterceptor;
}
@ -47,7 +47,7 @@ public class StompTestWithInterceptors extends StompTestBase {
@Override
public List<String> getOutgoingInterceptors() {
List<String> stompOutgoingInterceptor = new ArrayList<>();
stompOutgoingInterceptor.add("org.apache.activemq.artemis.tests.integration.stomp.StompTestWithInterceptors$MyOutgoingStompFrameInterceptor");
stompOutgoingInterceptor.add("org.apache.activemq.artemis.tests.integration.stomp.StompWithInterceptorsTest$MyOutgoingStompFrameInterceptor");
return stompOutgoingInterceptor;
}

View File

@ -36,7 +36,7 @@ import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
@Ignore
public class StompTestWithLargeMessages extends StompTestBase {
public class StompWithLargeMessagesTest extends StompTestBase {
// Web Socket has max frame size of 64kb. Large message tests only available over TCP.
@Parameterized.Parameters(name = "{0}")

View File

@ -29,7 +29,7 @@ import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConne
import org.junit.Assert;
import org.junit.Test;
public class StompTestWithMessageID extends StompTestBase {
public class StompWithMessageIDTest extends StompTestBase {
@Override
public boolean isEnableStompMessageId() {

View File

@ -25,7 +25,7 @@ import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConne
import org.junit.Assert;
import org.junit.Test;
public class StompTestWithSecurity extends StompTestBase {
public class StompWithSecurityTest extends StompTestBase {
@Override
public boolean isSecurityEnabled() {

View File

@ -19,6 +19,7 @@ package org.apache.activemq.artemis.tests.unit.core.server.group.impl;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.junit.Test;
public class SystemPropertyOverrideTest extends ActiveMQTestBase {
// Constants -----------------------------------------------------
@ -31,6 +32,7 @@ public class SystemPropertyOverrideTest extends ActiveMQTestBase {
// Public --------------------------------------------------------
@Test
public void testSystemPropertyOverride() throws Exception {
final String groupTimeoutPropertyValue = "1234";
final String reaperPeriodPropertyValue = "5678";