JAMES-2186 UserStepdefs: stop using protected
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/42b48071 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/42b48071 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/42b48071 Branch: refs/heads/master Commit: 42b480716fb5eabca7f18264fe96db69e2ed76f0 Parents: d5ce773 Author: Luc DUZAN <[email protected]> Authored: Thu Oct 19 16:37:10 2017 +0700 Committer: Matthieu Baechler <[email protected]> Committed: Mon Oct 23 13:50:39 2017 +0200 ---------------------------------------------------------------------- .../jmap/methods/integration/cucumber/ImapStepdefs.java | 10 +++++----- .../jmap/methods/integration/cucumber/UserStepdefs.java | 12 +++++++++--- 2 files changed, 14 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/42b48071/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java index f135de4..837d394 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java @@ -56,7 +56,7 @@ public class ImapStepdefs { try (IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST, IMAP_PORT);) { assertThat( imapMessageReader.userReceivedMessageInMailbox(userStepdefs.getConnectedUser(), - userStepdefs.passwordByUser.get(userStepdefs.getConnectedUser()), + userStepdefs.getUserPassword(userStepdefs.getConnectedUser()), mailbox)) .isTrue(); } @@ -67,7 +67,7 @@ public class ImapStepdefs { try (IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST, IMAP_PORT);) { assertThat( imapMessageReader.userGetNotifiedForNewMessagesWhenSelectingMailbox(userStepdefs.getConnectedUser(), - userStepdefs.passwordByUser.get(userStepdefs.getConnectedUser()), + userStepdefs.getUserPassword(userStepdefs.getConnectedUser()), numOfNewMessage, mailbox)) .isTrue(); } @@ -78,7 +78,7 @@ public class ImapStepdefs { try (IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST, IMAP_PORT);) { assertThat( imapMessageReader.userDoesNotReceiveMessageInMailbox(userStepdefs.getConnectedUser(), - userStepdefs.passwordByUser.get(userStepdefs.getConnectedUser()), + userStepdefs.getUserPassword(userStepdefs.getConnectedUser()), mailbox)) .isTrue(); } @@ -89,7 +89,7 @@ public class ImapStepdefs { IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST, IMAP_PORT); String login = userStepdefs.getConnectedUser(); - String password = userStepdefs.passwordByUser.get(login); + String password = userStepdefs.getUserPassword(login); imapMessageReader.connectAndSelect(login, password, mailbox); imapConnections.put(mailbox, imapMessageReader); @@ -114,7 +114,7 @@ public class ImapStepdefs { IMAPMessageReader imapMessageReader = new IMAPMessageReader(LOCALHOST, IMAP_PORT); String login = userStepdefs.getConnectedUser(); - String password = userStepdefs.passwordByUser.get(login); + String password = userStepdefs.getUserPassword(login); imapMessageReader.connectAndSelect(login, password, srcMailbox); assertThat(imapMessageReader).isNotNull(); http://git-wip-us.apache.org/repos/asf/james-project/blob/42b48071/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java index 497c337..408f726 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java @@ -49,10 +49,10 @@ public class UserStepdefs { private final MainStepdefs mainStepdefs; - protected Map<String, String> passwordByUser; - protected Set<String> domains; + private Map<String, String> passwordByUser; + private Set<String> domains; private Map<String, AccessToken> tokenByUser; - protected Optional<String> lastConnectedUser; + private Optional<String> lastConnectedUser; @Inject private UserStepdefs(MainStepdefs mainStepdefs) { @@ -79,6 +79,12 @@ public class UserStepdefs { return lastConnectedUser.get(); } + public String getUserPassword(String user) { + Preconditions.checkArgument(passwordByUser.containsKey(user), "User has no password created yet"); + + return passwordByUser.get(user); + } + @Given("^a domain named \"([^\"]*)\"$") public void createDomain(String domain) throws Exception { mainStepdefs.dataProbe.addDomain(domain); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
