This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 363250e37b0ebeec2c46b016d1cef5d63a704f1a
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Wed Dec 18 04:42:23 2019 +0100
JAMES-3012 Add basic tests qualifier on more test to match previous
behaviour
---
.../rabbitmq/RabbitMQEventDeadLettersIntegrationTest.java | 2 --
.../rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java | 8 ++++----
.../integration/rabbitmq/RabbitMQUnauthorizedEndpointsTest.java | 3 +++
.../rabbitmq/RabbitMQWebAdminServerIntegrationTest.java | 3 +++
.../RabbitMQWebAdminServerTaskSerializationIntegrationTest.java | 3 +++
5 files changed, 13 insertions(+), 6 deletions(-)
diff --git
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQEventDeadLettersIntegrationTest.java
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQEventDeadLettersIntegrationTest.java
index d9990fc..e25fcc4 100644
---
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQEventDeadLettersIntegrationTest.java
+++
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQEventDeadLettersIntegrationTest.java
@@ -358,7 +358,6 @@ public class RabbitMQEventDeadLettersIntegrationTest {
.statusCode(HttpStatus.NOT_FOUND_404);
}
- @Category(BasicFeature.class)
@Test
public void
failedEventShouldBeCorrectlyProcessedByListenerAfterSuccessfulRedelivery()
throws InterruptedException {
retryEventsListener.callsPerEventBeforeSuccess(MAX_RETRIES + 1);
@@ -507,7 +506,6 @@ public class RabbitMQEventDeadLettersIntegrationTest {
.body(".", hasSize(0));
}
- @Category(BasicFeature.class)
@Test
public void
multipleFailedEventsShouldBeCorrectlyProcessedByListenerAfterSuccessfulAllRedelivery()
{
retryEventsListener.callsPerEventBeforeSuccess(MAX_RETRIES + 1);
diff --git
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
index d5aeafd..18ac7fb 100644
---
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
+++
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java
@@ -65,6 +65,7 @@ import io.restassured.RestAssured;
import io.restassured.parsing.Parser;
import io.restassured.specification.RequestSpecification;
+@Category(BasicFeature.class)
class RabbitMQReindexingWithEventDeadLettersTest {
private static final String ELASTICSEARCH_LISTENER_GROUP =
"org.apache.james.mailbox.elasticsearch.events.ElasticSearchListeningMessageSearchIndex$ElasticSearchListeningMessageSearchIndexGroup";
@@ -123,7 +124,7 @@ class RabbitMQReindexingWithEventDeadLettersTest {
@Disabled("JAMES-3011 It's already fails for a long time, but CI didn't
detect this when it's not marked as BasicFeature")
@Test
- protected void
indexationShouldBeFailingWhenElasticSearchContainerIsPaused() throws Exception {
+ void indexationShouldBeFailingWhenElasticSearchContainerIsPaused() throws
Exception {
aliceSavesADraft();
CALMLY_AWAIT.until(() -> listElasticSearchFailedEvents().size() == 1);
@@ -132,9 +133,8 @@ class RabbitMQReindexingWithEventDeadLettersTest {
assertThat(listMessageIdsForAccount(aliceAccessToken)).isEmpty();
}
- @Category(BasicFeature.class)
@Test
- protected void redeliverShouldReIndexFailedMessages() throws Exception {
+ void redeliverShouldReIndexFailedMessages() throws Exception {
aliceSavesADraft();
CALMLY_AWAIT.until(() -> listElasticSearchFailedEvents().size() == 1);
@@ -145,7 +145,7 @@ class RabbitMQReindexingWithEventDeadLettersTest {
}
@Test
- protected void redeliverShouldCleanEventDeadLetter() throws Exception {
+ void redeliverShouldCleanEventDeadLetter() throws Exception {
aliceSavesADraft();
CALMLY_AWAIT.until(() -> listElasticSearchFailedEvents().size() == 1);
diff --git
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQUnauthorizedEndpointsTest.java
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQUnauthorizedEndpointsTest.java
index a5d757b..481813c 100644
---
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQUnauthorizedEndpointsTest.java
+++
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQUnauthorizedEndpointsTest.java
@@ -21,6 +21,7 @@ package org.apache.james.webadmin.integration.rabbitmq;
import static io.restassured.RestAssured.when;
+import org.apache.james.junit.categories.BasicFeature;
import org.apache.james.webadmin.integration.UnauthorizedEndpointsTest;
import org.apache.james.webadmin.routes.AliasRoutes;
import org.apache.james.webadmin.routes.CassandraMappingsRoutes;
@@ -42,10 +43,12 @@ import org.apache.james.webadmin.routes.UserQuotaRoutes;
import org.apache.james.webadmin.routes.UserRoutes;
import org.apache.james.webadmin.vault.routes.DeletedMessagesVaultRoutes;
import org.eclipse.jetty.http.HttpStatus;
+import org.junit.experimental.categories.Category;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
+@Category(BasicFeature.class)
class RabbitMQUnauthorizedEndpointsTest extends UnauthorizedEndpointsTest {
@RegisterExtension
diff --git
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java
index a291a06..188268a 100644
---
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java
+++
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerIntegrationTest.java
@@ -31,6 +31,7 @@ import org.apache.james.CassandraRabbitMQAwsS3JmapTestRule;
import org.apache.james.DockerCassandraRule;
import org.apache.james.GuiceJamesServer;
import
org.apache.james.backends.cassandra.versions.CassandraSchemaVersionManager;
+import org.apache.james.junit.categories.BasicFeature;
import org.apache.james.webadmin.integration.WebAdminServerIntegrationTest;
import org.apache.james.webadmin.routes.AliasRoutes;
import org.apache.james.webadmin.routes.CassandraMappingsRoutes;
@@ -40,9 +41,11 @@ import org.awaitility.Duration;
import org.eclipse.jetty.http.HttpStatus;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import io.restassured.http.ContentType;
+@Category(BasicFeature.class)
public class RabbitMQWebAdminServerIntegrationTest extends
WebAdminServerIntegrationTest {
private static final String VERSION = "/cassandra/version";
diff --git
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
index 6afa076..0de9075 100644
---
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
+++
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java
@@ -44,6 +44,7 @@ import
org.apache.james.backends.cassandra.versions.CassandraSchemaVersionManage
import org.apache.james.backends.cassandra.versions.SchemaVersion;
import org.apache.james.core.Username;
import org.apache.james.core.builder.MimeMessageBuilder;
+import org.apache.james.junit.categories.BasicFeature;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.events.Event;
import org.apache.james.mailbox.events.EventDeadLetters;
@@ -81,10 +82,12 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import io.restassured.RestAssured;
import io.restassured.http.ContentType;
+@Category(BasicFeature.class)
public class RabbitMQWebAdminServerTaskSerializationIntegrationTest {
@Rule
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
