From 14d20367b2559f14691a28f55e29bf78102b59f8 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sat, 7 Apr 2018 23:42:46 +0200 Subject: [PATCH] Improve chat2 integration tests - Move in correct package - Use 'timeout' where possible - Introduce AbstractChatIntegrationTest holding the chat managers --- .../chat2/AbstractChatIntegrationTest.java | 35 +++++++++++++++++++ ...ncomingMessageListenerIntegrationTest.java | 13 ++----- ...utgoingMessageListenerIntegrationTest.java | 12 ++----- .../chat => smack/chat2}/package-info.java | 2 +- 4 files changed, 42 insertions(+), 20 deletions(-) create mode 100644 smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/AbstractChatIntegrationTest.java rename smack-integration-test/src/main/java/org/jivesoftware/{smackx/chat => smack/chat2}/IncomingMessageListenerIntegrationTest.java (80%) rename smack-integration-test/src/main/java/org/jivesoftware/{smackx/chat => smack/chat2}/OutgoingMessageListenerIntegrationTest.java (83%) rename smack-integration-test/src/main/java/org/jivesoftware/{smackx/chat => smack/chat2}/package-info.java (94%) diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/AbstractChatIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/AbstractChatIntegrationTest.java new file mode 100644 index 000000000..0d174827b --- /dev/null +++ b/smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/AbstractChatIntegrationTest.java @@ -0,0 +1,35 @@ +/** + * + * Copyright 2018 Florian Schmaus + * + * 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.smack.chat2; + +import org.igniterealtime.smack.inttest.AbstractSmackIntegrationTest; +import org.igniterealtime.smack.inttest.SmackIntegrationTestEnvironment; + +public abstract class AbstractChatIntegrationTest extends AbstractSmackIntegrationTest { + + protected final ChatManager chatManagerOne; + protected final ChatManager chatManagerTwo; + protected final ChatManager chatManagerThree; + + protected AbstractChatIntegrationTest(SmackIntegrationTestEnvironment environment) { + super(environment); + chatManagerOne = ChatManager.getInstanceFor(conOne); + chatManagerTwo = ChatManager.getInstanceFor(conTwo); + chatManagerThree = ChatManager.getInstanceFor(conThree); + } + +} diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/chat/IncomingMessageListenerIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/IncomingMessageListenerIntegrationTest.java similarity index 80% rename from smack-integration-test/src/main/java/org/jivesoftware/smackx/chat/IncomingMessageListenerIntegrationTest.java rename to smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/IncomingMessageListenerIntegrationTest.java index 6ae504072..ca76ab280 100644 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/chat/IncomingMessageListenerIntegrationTest.java +++ b/smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/IncomingMessageListenerIntegrationTest.java @@ -14,21 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.chat; +package org.jivesoftware.smack.chat2; -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 class IncomingMessageListenerIntegrationTest extends AbstractChatIntegrationTest { public IncomingMessageListenerIntegrationTest(SmackIntegrationTestEnvironment environment) { super(environment); @@ -36,9 +32,6 @@ public class IncomingMessageListenerIntegrationTest extends AbstractSmackIntegra @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() { @@ -54,7 +47,7 @@ public class IncomingMessageListenerIntegrationTest extends AbstractSmackIntegra chatManagerTwo.addIncomingListener(listener); Chat chat = chatManagerOne.chatWith(conTwo.getUser().asEntityBareJid()); chat.send(body); - syncPoint.waitForResult(10 * 1000); + syncPoint.waitForResult(timeout); } 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/smack/chat2/OutgoingMessageListenerIntegrationTest.java similarity index 83% rename from smack-integration-test/src/main/java/org/jivesoftware/smackx/chat/OutgoingMessageListenerIntegrationTest.java rename to smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/OutgoingMessageListenerIntegrationTest.java index 3adb2874b..a9221de0c 100644 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/chat/OutgoingMessageListenerIntegrationTest.java +++ b/smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/OutgoingMessageListenerIntegrationTest.java @@ -14,21 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.chat; +package org.jivesoftware.smack.chat2; -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 class OutgoingMessageListenerIntegrationTest extends AbstractChatIntegrationTest { public OutgoingMessageListenerIntegrationTest(SmackIntegrationTestEnvironment environment) { super(environment); @@ -36,8 +32,6 @@ public class OutgoingMessageListenerIntegrationTest extends AbstractSmackIntegra @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() { @@ -55,7 +49,7 @@ public class OutgoingMessageListenerIntegrationTest extends AbstractSmackIntegra chatManagerOne.addOutgoingListener(listener); Chat chat = chatManagerOne.chatWith(peer); chat.send(body); - syncPoint.waitForResult(10 * 1000); + syncPoint.waitForResult(timeout); } 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/smack/chat2/package-info.java similarity index 94% rename from smack-integration-test/src/main/java/org/jivesoftware/smackx/chat/package-info.java rename to smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/package-info.java index 3bc271ea6..a618ef208 100644 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/chat/package-info.java +++ b/smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/package-info.java @@ -18,4 +18,4 @@ /** * Integration Tests for the chat2 API. */ -package org.jivesoftware.smackx.chat; +package org.jivesoftware.smack.chat2;