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 09c61f22aeef8f0f02d799badd5538bf1347d7fb
Author: Tran Tien Duc <dt...@linagora.com>
AuthorDate: Mon Dec 16 19:43:10 2019 +0700
JAMES-3012 BasicFeature tagging in webadmin integration tests
---
.../distributed-webadmin-integration-test/pom.xml | 15 +++++++++++++++
.../webadmin/integration/ForwardIntegrationTest.java | 3 +++
.../webadmin/integration/JwtFilterIntegrationTest.java | 3 +++
.../vault/DeletedMessageVaultIntegrationTest.java | 13 ++++++++-----
4 files changed, 29 insertions(+), 5 deletions(-)
diff --git
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml
index 8c2b542..619c86b 100644
---
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml
+++
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml
@@ -91,4 +91,19 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Xms512m -Xmx1024m</argLine>
+ <reuseForks>true</reuseForks>
+ <!-- Fail tests longer than 2 hours, prevent form random
locking tests -->
+
<forkedProcessTimeoutInSeconds>7200</forkedProcessTimeoutInSeconds>
+ <groups
combine.self="override">org.apache.james.junit.categories.BasicFeature</groups>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git
a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/ForwardIntegrationTest.java
b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/ForwardIntegrationTest.java
index 3b8e236..15e6683 100644
---
a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/ForwardIntegrationTest.java
+++
b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/ForwardIntegrationTest.java
@@ -45,6 +45,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.james.GuiceJamesServer;
import org.apache.james.jmap.AccessToken;
import org.apache.james.jmap.draft.JmapGuiceProbe;
+import org.apache.james.junit.categories.BasicFeature;
import org.apache.james.probe.DataProbe;
import org.apache.james.util.Port;
import org.apache.james.utils.DataProbeImpl;
@@ -56,6 +57,7 @@ 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.specification.RequestSpecification;
@@ -97,6 +99,7 @@ public abstract class ForwardIntegrationTest {
jmapServer.stop();
}
+ @Category(BasicFeature.class)
@Test
public void messageShouldBeForwardedWhenDefinedInRESTAPI() {
webAdminApi.put(String.format("/address/forwards/%s/targets/%s",
ALICE.asString(), BOB.asString()));
diff --git
a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java
b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java
index 709124e..5b1d1d1 100644
---
a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java
+++
b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java
@@ -26,6 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.Optional;
import org.apache.james.GuiceJamesServer;
+import org.apache.james.junit.categories.BasicFeature;
import org.apache.james.jwt.JwtConfiguration;
import org.apache.james.util.ClassLoaderUtils;
import org.apache.james.utils.DataProbeImpl;
@@ -36,6 +37,7 @@ import org.eclipse.jetty.http.HttpStatus;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import io.restassured.RestAssured;
@@ -78,6 +80,7 @@ public abstract class JwtFilterIntegrationTest {
protected abstract GuiceJamesServer createJamesServer(JwtConfiguration
jwtConfiguration) throws Exception;
+ @Category(BasicFeature.class)
@Test
public void jwtAuthenticationShouldWork() throws Exception {
given()
diff --git
a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/vault/DeletedMessageVaultIntegrationTest.java
b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/vault/DeletedMessageVaultIntegrationTest.java
index cd9c8aa..3299aaa 100644
---
a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/vault/DeletedMessageVaultIntegrationTest.java
+++
b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/vault/DeletedMessageVaultIntegrationTest.java
@@ -54,6 +54,7 @@ import org.apache.james.core.Username;
import org.apache.james.filesystem.api.FileSystem;
import org.apache.james.jmap.AccessToken;
import org.apache.james.jmap.draft.JmapGuiceProbe;
+import org.apache.james.junit.categories.BasicFeature;
import org.apache.james.mailbox.DefaultMailboxes;
import org.apache.james.mailbox.Role;
import org.apache.james.mailbox.backup.ZipAssert;
@@ -76,6 +77,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import com.google.common.base.Strings;
@@ -167,7 +169,7 @@ public abstract class DeletedMessageVaultIntegrationTest {
jmapServer.stop();
}
-
+ @Category(BasicFeature.class)
@Test
public void vaultEndpointShouldRestoreJmapDeletedEmail() {
bartSendMessageToHomer();
@@ -191,6 +193,7 @@ public abstract class DeletedMessageVaultIntegrationTest {
.body(ARGUMENTS + ".list.subject", hasItem(SUBJECT));
}
+ @Category(BasicFeature.class)
@Test
public void vaultEndpointShouldRestoreImapDeletedEmail() throws Exception {
bartSendMessageToHomer();
@@ -219,7 +222,7 @@ public abstract class DeletedMessageVaultIntegrationTest {
.body(ARGUMENTS + ".list.subject", hasItem(SUBJECT));
}
-
+ @Category(BasicFeature.class)
@Test
public void vaultEndpointShouldRestoreImapDeletedMailbox() throws
Exception {
bartSendMessageToHomer();
@@ -463,7 +466,7 @@ public abstract class DeletedMessageVaultIntegrationTest {
.body(ARGUMENTS + ".list.subject", hasItem(SUBJECT));
}
-
+ @Category(BasicFeature.class)
@Test
public void
vaultExportShouldExportZipContainsVaultMessagesToShareeWhenJmapDeleteMessage()
throws Exception {
bartSendMessageToHomer();
@@ -481,7 +484,7 @@ public abstract class DeletedMessageVaultIntegrationTest {
}
}
-
+ @Category(BasicFeature.class)
@Test
public void
vaultExportShouldExportZipContainsVaultMessagesToShareeWhenImapDeleteMessage()
throws Exception {
bartSendMessageToHomer();
@@ -504,7 +507,7 @@ public abstract class DeletedMessageVaultIntegrationTest {
}
}
-
+ @Category(BasicFeature.class)
@Test
public void
vaultExportShouldExportZipContainsVaultMessagesToShareeWhenImapDeletedMailbox()
throws Exception {
bartSendMessageToHomer();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
