JAMES-4025 Update JMAP server test cases after remove jmap draft
diff --git a/server/apps/memory-app/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java b/server/apps/memory-app/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java
index 34fc8b6..1f90555 100644
--- a/server/apps/memory-app/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java
+++ b/server/apps/memory-app/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java
@@ -20,17 +20,12 @@
package org.apache.james;
import static org.apache.james.data.UsersRepositoryModuleChooser.Implementation.DEFAULT;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import org.apache.james.jmap.draft.JMAPConfigurationStartUpCheck;
-import org.apache.james.jmap.draft.JMAPDraftConfiguration;
import org.apache.james.jmap.draft.JmapJamesServerContract;
import org.apache.james.modules.TestJMAPServerModule;
import org.apache.james.modules.protocols.ImapGuiceProbe;
import org.apache.james.modules.protocols.SmtpGuiceProbe;
import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
class MemoryJmapJamesServerTest {
@@ -61,57 +56,4 @@
@RegisterExtension
JamesServerExtension jamesServerExtension = extensionBuilder().build();
}
-
- @Nested
- class JamesServerJmapConfigurationTest {
-
- @Nested
- class BadAliasKeyStore {
-
- @RegisterExtension
- JamesServerExtension jamesServerExtension = extensionBuilder()
- .disableAutoStart()
- .overrideServerModule(binder -> binder.bind(JMAPDraftConfiguration.class)
- .toInstance(TestJMAPServerModule
- .jmapDraftConfigurationBuilder()
- .keystore("badAliasKeystore")
- .secret("password")
- .build()))
- .build();
-
- @Test
- void jamesShouldNotStartWhenBadAliasKeyStore(GuiceJamesServer server) {
- assertThatThrownBy(server::start)
- .isInstanceOfSatisfying(
- StartUpChecksPerformer.StartUpChecksException.class,
- ex -> assertThat(ex.badCheckNames())
- .containsOnly(JMAPConfigurationStartUpCheck.CHECK_NAME))
- .hasMessageContaining("Alias 'james' keystore can't be found");
- }
- }
-
- @Nested
- class BadSecretKeyStore {
-
- @RegisterExtension
- JamesServerExtension jamesServerExtension = extensionBuilder()
- .disableAutoStart()
- .overrideServerModule(binder -> binder.bind(JMAPDraftConfiguration.class)
- .toInstance(TestJMAPServerModule
- .jmapDraftConfigurationBuilder()
- .secret("WrongSecret")
- .build()))
- .build();
-
- @Test
- void jamesShouldNotStartWhenBadSecret(GuiceJamesServer server) {
- assertThatThrownBy(server::start)
- .isInstanceOfSatisfying(
- StartUpChecksPerformer.StartUpChecksException.class,
- ex -> assertThat(ex.badCheckNames())
- .containsOnly(JMAPConfigurationStartUpCheck.CHECK_NAME))
- .hasMessageContaining("Keystore was tampered with, or password was incorrect");
- }
- }
- }
}
diff --git a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JmapJamesServerContract.java b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JmapJamesServerContract.java
index 064078b..5a9a2d0 100644
--- a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JmapJamesServerContract.java
+++ b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JmapJamesServerContract.java
@@ -37,20 +37,20 @@
String JAMES_SERVER_HOST = "127.0.0.1";
@Test
- default void connectJMAPServerShouldRespondBadRequest(GuiceJamesServer server) {
+ default void connectJMAPServerShouldFailWhenUnAuthenticatedRequest(GuiceJamesServer server) {
RestAssured.requestSpecification = requestSpec(server);
given()
.body("{\"badAttributeName\": \"value\"}")
.when()
- .post("/authentication")
+ .post("/jmap")
.then()
- .statusCode(400);
+ .statusCode(401);
}
static RequestSpecification requestSpec(GuiceJamesServer server) {
return new RequestSpecBuilder()
.setContentType(ContentType.JSON)
- .setAccept(ContentType.JSON)
+ .setAccept("application/json; jmapVersion=rfc-8621")
.setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
.setPort(server.getProbe(JmapGuiceProbe.class).getJmapPort().getValue())
.build();
