You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by be...@apache.org on 2013/06/09 14:39:45 UTC
git commit: make MUC integration tests pass again
Updated Branches:
refs/heads/master 49d685e68 -> b07fd4682
make MUC integration tests pass again
Project: http://git-wip-us.apache.org/repos/asf/mina-vysper/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-vysper/commit/b07fd468
Tree: http://git-wip-us.apache.org/repos/asf/mina-vysper/tree/b07fd468
Diff: http://git-wip-us.apache.org/repos/asf/mina-vysper/diff/b07fd468
Branch: refs/heads/master
Commit: b07fd46820c1a6aa3d5f446fb44b769e30aaba5f
Parents: 49d685e
Author: Bernd Fondermann <be...@brainlounge.de>
Authored: Sun Jun 9 14:36:31 2013 +0200
Committer: Bernd Fondermann <be...@brainlounge.de>
Committed: Sun Jun 9 14:36:31 2013 +0200
----------------------------------------------------------------------
.../inttest/AbstractIntegrationTestCase.java | 12 ++++++++----
.../inttest/AbstractMUCIntegrationTestCase.java | 5 +++--
2 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-vysper/blob/b07fd468/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractIntegrationTestCase.java
----------------------------------------------------------------------
diff --git a/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractIntegrationTestCase.java b/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractIntegrationTestCase.java
index 686bf44..3d42e16 100644
--- a/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractIntegrationTestCase.java
+++ b/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractIntegrationTestCase.java
@@ -47,6 +47,10 @@ public abstract class AbstractIntegrationTestCase extends TestCase {
private final Logger logger = LoggerFactory.getLogger(AbstractIntegrationTestCase.class);
+ protected static final String TLS_CERTIFICATE_PATH = "src/main/config/bogus_mina_tls.cert";
+
+ protected static final String TLS_CERTIFICATE_PASSWORD = "boguspw";
+
protected static final String SERVER_DOMAIN = "vysper.org";
protected static final String TEST_USERNAME1 = "test1@vysper.org";
@@ -95,7 +99,7 @@ public abstract class AbstractIntegrationTestCase extends TestCase {
server.addEndpoint(endpoint);
server.setStorageProviderRegistry(providerRegistry);
- server.setTLSCertificateInfo(new File("src/main/config/bogus_mina_tls.cert"), "boguspw");
+ server.setTLSCertificateInfo(new File(TLS_CERTIFICATE_PATH), TLS_CERTIFICATE_PASSWORD);
server.start();
@@ -111,9 +115,9 @@ public abstract class AbstractIntegrationTestCase extends TestCase {
connectionConfiguration.setSecurityMode(ConnectionConfiguration.SecurityMode.required);
connectionConfiguration.setSASLAuthenticationEnabled(true);
connectionConfiguration.setDebuggerEnabled(false);
- connectionConfiguration.setKeystorePath("src/main/config/bogus_mina_tls.cert");
- connectionConfiguration.setTruststorePath("src/main/config/bogus_mina_tls.cert");
- connectionConfiguration.setTruststorePassword("boguspw");
+ connectionConfiguration.setKeystorePath(TLS_CERTIFICATE_PATH);
+ connectionConfiguration.setTruststorePath(TLS_CERTIFICATE_PATH);
+ connectionConfiguration.setTruststorePassword(TLS_CERTIFICATE_PASSWORD);
XMPPConnection.DEBUG_ENABLED = true;
XMPPConnection client = new XMPPConnection(connectionConfiguration);
http://git-wip-us.apache.org/repos/asf/mina-vysper/blob/b07fd468/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractMUCIntegrationTestCase.java
----------------------------------------------------------------------
diff --git a/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractMUCIntegrationTestCase.java b/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractMUCIntegrationTestCase.java
index 7f27f5e..60ecc52 100644
--- a/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractMUCIntegrationTestCase.java
+++ b/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractMUCIntegrationTestCase.java
@@ -19,6 +19,7 @@
*/
package org.apache.vysper.xmpp.modules.extension.xep0045_muc.inttest;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.MUCFeatures;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.MUCModule;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Conference;
import org.apache.vysper.xmpp.server.XMPPServer;
@@ -27,7 +28,7 @@ import org.jivesoftware.smackx.muc.MultiUserChat;
/**
*/
-public class AbstractMUCIntegrationTestCase extends AbstractIntegrationTestCase {
+public abstract class AbstractMUCIntegrationTestCase extends AbstractIntegrationTestCase {
protected static final String NICK1 = "Nick";
@@ -37,7 +38,7 @@ public class AbstractMUCIntegrationTestCase extends AbstractIntegrationTestCase
protected static final String ROOM_JID = "room@chat.vysper.org";
- protected Conference conference = new Conference("test conference");
+ protected Conference conference = new Conference("test conference", new MUCFeatures());
protected XMPPConnection client2;