From 11c210116aaa3f92cc30cb577b289c4a36ece4c7 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Mon, 9 Apr 2018 16:20:57 +0300 Subject: server: fix xmpp tests --- .../src/test/java/com/juick/server/tests/ServerTests.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'juick-server/src/test/java/com/juick/server/tests') diff --git a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java index 1ba65721..d30b1303 100644 --- a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java +++ b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java @@ -125,6 +125,8 @@ public class ServerTests { private ImagesService imagesService; @Value("${hostname:localhost}") private Jid jid; + @Value("${xmppbot_jid:juick@localhost}") + private Jid botJid; @Value("${upload_tmp_dir:#{systemEnvironment['TEMP'] ?: '/tmp'}}") private String tmpDir; @Value("${img_path:#{systemEnvironment['TEMP'] ?: '/tmp'}}") @@ -531,12 +533,10 @@ public class ServerTests { renhaId = userService.createUser("renha", "umnnbt"); Jid from = Jid.of("renha@serverstorageisfull.tld"); jdbcTemplate.update("INSERT INTO jids(user_id,jid,active) VALUES(?,?,?)", renhaId, from.toEscapedString(), 1); - String xmlMessage = "Reply by @LexXПохоже нынче можно публично заявлять о своем веганстве. Your contact offline message queue is full. The message has been discarded."; - Stanza msg = server.parse(xmlMessage); - assertThat(from, equalTo(msg.getFrom())); + String xmlMessage = "Reply by @LexXПохоже нынче можно публично заявлять о своем веганстве. Your contact offline message queue is full. The message has been discarded."; Function isActive = f -> jdbcTemplate.queryForObject("SELECT active FROM jids WHERE user_id=?", Integer.class, f) == 1; assertThat(isActive.apply(renhaId), equalTo(true)); - router.incomingMessage((ServerMessage)msg); + server.onStanzaReceived(xmlMessage); assertThat(isActive.apply(renhaId), equalTo(false)); commandsManager.processCommand(userService.getUserByJID(from.asBareJid().toEscapedString()), "On", URI.create(StringUtils.EMPTY)); assertTrue(isActive.apply(renhaId)); -- cgit v1.2.3