From 2a56b24929eb09dc97b6d421f5e2f38e92e9c6ad Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Wed, 4 Apr 2018 15:41:59 +0200 Subject: [PATCH] Add IntegrationTests for chat2 API --- ...ncomingMessageListenerIntegrationTest.java | 63 ++++++++++++++++++ ...utgoingMessageListenerIntegrationTest.java | 64 +++++++++++++++++++ .../smackx/chat/package-info.java | 21 ++++++ 3 files changed, 148 insertions(+) create mode 100644 smack-integration-test/src/main/java/org/jivesoftware/smackx/chat/IncomingMessageListenerIntegrationTest.java create mode 100644 smack-integration-test/src/main/java/org/jivesoftware/smackx/chat/OutgoingMessageListenerIntegrationTest.java create mode 100644 smack-integration-test/src/main/java/org/jivesoftware/smackx/chat/package-info.java diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/chat/IncomingMessageListenerIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/chat/IncomingMessageListenerIntegrationTest.java new file mode 100644 index 000000000..6ae504072 --- /dev/null +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/chat/IncomingMessageListenerIntegrationTest.java @@ -0,0 +1,63 @@ +/** + * + * Copyright 2018 Paul Schaub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jivesoftware.smackx.chat; + +import org.jivesoftware.smack.chat2.Chat; +import org.jivesoftware.smack.chat2.ChatManager; +import org.jivesoftware.smack.chat2.IncomingChatMessageListener; +import org.jivesoftware.smack.packet.Message; +import org.jivesoftware.smack.util.StringUtils; + +import org.igniterealtime.smack.inttest.AbstractSmackIntegrationTest; +import org.igniterealtime.smack.inttest.SmackIntegrationTest; +import org.igniterealtime.smack.inttest.SmackIntegrationTestEnvironment; +import org.igniterealtime.smack.inttest.util.SimpleResultSyncPoint; +import org.jxmpp.jid.EntityBareJid; + +public class IncomingMessageListenerIntegrationTest extends AbstractSmackIntegrationTest { + + public IncomingMessageListenerIntegrationTest(SmackIntegrationTestEnvironment environment) { + super(environment); + } + + @SmackIntegrationTest + public void test() throws Exception { + ChatManager chatManagerOne = ChatManager.getInstanceFor(conOne); + ChatManager chatManagerTwo = ChatManager.getInstanceFor(conTwo); + + final String body = StringUtils.randomString(16); + final SimpleResultSyncPoint syncPoint = new SimpleResultSyncPoint(); + final IncomingChatMessageListener listener = new IncomingChatMessageListener() { + @Override + public void newIncomingMessage(EntityBareJid from, Message message, Chat chat) { + if (body.equals(message.getBody())) { + syncPoint.signal(); + } + } + }; + + try { + chatManagerTwo.addIncomingListener(listener); + Chat chat = chatManagerOne.chatWith(conTwo.getUser().asEntityBareJid()); + chat.send(body); + syncPoint.waitForResult(10 * 1000); + } + finally { + chatManagerTwo.removeIncomingListener(listener); + } + } +} diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/chat/OutgoingMessageListenerIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/chat/OutgoingMessageListenerIntegrationTest.java new file mode 100644 index 000000000..3adb2874b --- /dev/null +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/chat/OutgoingMessageListenerIntegrationTest.java @@ -0,0 +1,64 @@ +/** + * + * Copyright 2018 Paul Schaub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jivesoftware.smackx.chat; + +import org.jivesoftware.smack.chat2.Chat; +import org.jivesoftware.smack.chat2.ChatManager; +import org.jivesoftware.smack.chat2.OutgoingChatMessageListener; +import org.jivesoftware.smack.packet.Message; +import org.jivesoftware.smack.util.StringUtils; + +import org.igniterealtime.smack.inttest.AbstractSmackIntegrationTest; +import org.igniterealtime.smack.inttest.SmackIntegrationTest; +import org.igniterealtime.smack.inttest.SmackIntegrationTestEnvironment; +import org.igniterealtime.smack.inttest.util.SimpleResultSyncPoint; +import org.jxmpp.jid.EntityBareJid; + +public class OutgoingMessageListenerIntegrationTest extends AbstractSmackIntegrationTest { + + public OutgoingMessageListenerIntegrationTest(SmackIntegrationTestEnvironment environment) { + super(environment); + } + + @SmackIntegrationTest + public void outgoingMessageListenerTest() throws Exception { + ChatManager chatManagerOne = ChatManager.getInstanceFor(conOne); + + final String body = StringUtils.randomString(16); + final SimpleResultSyncPoint syncPoint = new SimpleResultSyncPoint(); + final OutgoingChatMessageListener listener = new OutgoingChatMessageListener() { + @Override + public void newOutgoingMessage(EntityBareJid to, Message message, Chat chat) { + if (message.getBody().equals(body)) { + syncPoint.signal(); + } + } + }; + + EntityBareJid peer = conTwo.getUser().asEntityBareJid(); + + try { + chatManagerOne.addOutgoingListener(listener); + Chat chat = chatManagerOne.chatWith(peer); + chat.send(body); + syncPoint.waitForResult(10 * 1000); + } + finally { + chatManagerOne.removeOutgoingListener(listener); + } + } +} diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/chat/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/chat/package-info.java new file mode 100644 index 000000000..3bc271ea6 --- /dev/null +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/chat/package-info.java @@ -0,0 +1,21 @@ +/** + * + * Copyright 2018 Paul Schaub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Integration Tests for the chat2 API. + */ +package org.jivesoftware.smackx.chat;