From cc6ef438b2fa9bbdd7fde2160f67f7c4878eb88b Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Wed, 25 Apr 2018 19:56:46 +0300 Subject: server: drop www processing part from xmpp processing --- .../src/test/java/com/juick/server/tests/ServerTests.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'juick-server/src/test/java') 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 9b9722b2..64f92863 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 @@ -60,7 +60,6 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.util.FileSystemUtils; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.util.UriComponents; @@ -637,7 +636,7 @@ public class ServerTests { xmppMessage.setBody("*test test"); result = router.incomingMessage(xmppMessage); assertThat(result.getBody(), startsWith("New message posted")); - xmppMessage.setFrom(Jid.of(String.valueOf(renhaId), "uid.juick.com", "perl")); + xmppMessage.setFrom(from); xmppMessage.setBody("PING"); result = router.incomingMessage(xmppMessage); assertThat(result.getBody(), equalTo("PONG")); @@ -655,12 +654,6 @@ public class ServerTests { + botJid.asBareJid().toEscapedString() + "\" type=\"chat\" id=\"purple553384c6\">"; result = router.incomingMessage((rocks.xmpp.core.stanza.model.Message)server.parse(active)); xmppMessage.setFrom(botJid); - xmppMessage.setTo(botJid.withLocal("pm")); - Message pm = new Message(); - pm.setUser(userService.getUserByJID(from.toEscapedString())); - pm.setTo(userService.getUserByUID(secretlySadId).orElseThrow(IllegalAccessError::new)); - xmppMessage.addExtension(pm); - result = router.incomingMessage(xmppMessage); // TODO: assert events } @Test -- cgit v1.2.3