Restructure relevant JMAP calendar tests to cover CalDavEventAttendanceRepository #1554
+646
−42
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…a dockerized openpaas setup successfully
- It would ping the servers occasionally resulting in verbose logs, making it hard to know which logs are triggered by tests and which were triggered by healthcheck
chibenwa
reviewed
Feb 19, 2025
Comment on lines
+102
to
+106
| <dependency> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>tmail-openpaas</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> |
There was a problem hiding this comment.
In a normal world this dependency is not needed
chibenwa
reviewed
Feb 19, 2025
| import com.linagora.tmail.module.LinagoraTestJMAPServerModule; | ||
|
|
||
|
|
||
| public class DavMemoryLinagoraCalendarEventAcceptMethodTest implements |
There was a problem hiding this comment.
The entire point of a module chooser is to easily turn on/off modules without the kind of ceremony in this class.
chibenwa
reviewed
Feb 19, 2025
Comment on lines
+130
to
+163
| private static Module provideDavConfiguration() { | ||
| return new AbstractModule() { | ||
| @Provides | ||
| @Singleton | ||
| public DavConfiguration provideDavConfiguration() { | ||
| return new DavConfiguration( | ||
| new UsernamePasswordCredentials("admin", "secret123"), | ||
| Throwing.supplier(() -> URI.create("http://%s:80".formatted(dockerOpenPaasExtension.getDavServerIpAddress()))).sneakyThrow().get(), | ||
| Optional.empty(), | ||
| Optional.empty()); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| private static Module provideEventAttendanceRepository() { | ||
| return new AbstractModule() { | ||
| @Provides | ||
| public EventAttendanceRepository provideCalDavEventAttendanceRepository(DavClient davClient, | ||
| SessionProvider sessionProvider, MessageId.Factory messageIdFactory, | ||
| MessageIdManager messageIdManager, | ||
| DavUserProvider davUserProvider) { | ||
| return new CalDavEventAttendanceRepository(davClient, sessionProvider, messageIdFactory, messageIdManager, davUserProvider); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| private static Module provideDavUserProvider() { | ||
| return new AbstractModule() { | ||
| @Provides | ||
| public DavUserProvider provideDavUserProvider(OpenPaasRestClient openPaasClient) { | ||
| return new OpenPaasDavUserProvider(openPaasClient); | ||
| } | ||
| }; | ||
| } |
There was a problem hiding this comment.
Please have proper guice modules defined, and use a module chooser
chibenwa
reviewed
Feb 19, 2025
| @@ -0,0 +1,179 @@ | |||
| <?xml version="1.0"?> | |||
There was a problem hiding this comment.
Why we need a custom mailet container when OpenPaaS?
Is it really needed?
chibenwa
reviewed
Feb 19, 2025
| return calendarData.getValue() | ||
| .lines() | ||
| .map(String::trim) | ||
| .filter(Predicate.not(String::isBlank)) | ||
| .collect(Collectors.joining("\n")); | ||
| return calendarData.getValue(); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #1545