1 files changed, 0 insertions, 81 deletions
diff --git a/src/test/java/com/juick/server/tests/ServerTests.java b/src/test/java/com/juick/server/tests/ServerTests.java
index 32afd4f96..620e210c3 100644
--- a/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/src/test/java/com/juick/server/tests/ServerTests.java
@@ -42,8 +42,6 @@ import com.juick.server.api.xnodeinfo2.model.NodeInfo;
 import com.juick.server.util.HttpUtils;
 import com.juick.server.util.ImageUtils;
 import com.juick.server.www.WebApp;
-import com.juick.server.xmpp.helpers.XMPPStatus;
-import com.juick.server.xmpp.s2s.ConnectionIn;
 import com.juick.service.*;
 import com.juick.service.component.MessageEvent;
 import com.juick.util.DateFormattersHolder;
@@ -51,7 +49,6 @@ import com.juick.util.MessageUtils;
 import com.mitchellbosecke.pebble.PebbleEngine;
 import com.mitchellbosecke.pebble.error.PebbleException;
 import com.mitchellbosecke.pebble.template.PebbleTemplate;
-import org.apache.commons.codec.CharEncoding;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.IteratorUtils;
 import org.apache.commons.io.IOUtils;
@@ -162,8 +159,6 @@ public class ServerTests {
     @Inject
     private ObjectMapper jsonMapper;
     @Inject
-    private XMPPServer server;
-    @Inject
     private CommandsManager commandsManager;
     @Inject
     private XMPPConnection router;
@@ -687,63 +682,6 @@ public class ServerTests {
                 .andExpect(xpath("/rss/channel/description").string("The latest messages at Juick"));
     }
     @Test
-    public void statusPageIsUp() throws Exception {
-        mockMvc.perform(get("/api/status").with(httpBasic(ugnichName, ugnichPassword))).andExpect(status().isOk());
-        assertThat(server.getJid(), equalTo(jid));
-    }
-    @Test
-    public void botIsUpAndProcessingResourceConstraints() throws Exception {
-        jdbcTemplate.execute("DELETE FROM users WHERE nick='renha'");
-        int 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);
-        rocks.xmpp.core.stanza.model.Message xmppMessage = new rocks.xmpp.core.stanza.model.Message();
-        xmppMessage.setType(rocks.xmpp.core.stanza.model.Message.Type.ERROR);
-        xmppMessage.setFrom(from);
-        xmppMessage.setTo(botJid);
-        StanzaError err = new StanzaError(StanzaError.Type.CANCEL, Condition.RESOURCE_CONSTRAINT);
-        xmppMessage.setError(err);
-        Function<Integer, Boolean> isActive = f -> jdbcTemplate.queryForObject("SELECT active FROM jids WHERE user_id=?", Integer.class, f) == 1;
-        assertThat(isActive.apply(renhaId), equalTo(true));
-        ClientMessage result = router.incomingMessage(xmppMessage);
-        assertNull(result);
-        assertThat(isActive.apply(renhaId), equalTo(false));
-        xmppMessage.setError(null);
-        xmppMessage.setType(rocks.xmpp.core.stanza.model.Message.Type.CHAT);
-        xmppMessage.setBody("On");
-        result = router.incomingMessage(xmppMessage);
-        assertThat(result.getBody(), equalTo("XMPP notifications are activated"));
-        assertTrue(isActive.apply(renhaId));
-        xmppMessage.setBody("*test test");
-        result = router.incomingMessage(xmppMessage);
-        assertThat(result.getBody(), startsWith("New message posted"));
-        xmppMessage.setFrom(from);
-        xmppMessage.setBody("PING");
-        result = router.incomingMessage(xmppMessage);
-        assertThat(result.getBody(), equalTo("PONG"));
-        int secretlySadId = userService.createUser("secretlysad", "bbk");
-        xmppMessage.setTo(botJid.withLocal("secretlysad"));
-        xmppMessage.setBody("What's up?");
-        result = router.incomingMessage(xmppMessage);
-        assertThat(result, is(nullValue()));
-        xmppMessage.setTo(botJid);
-        xmppMessage.setBody("@secretlysad Hey!");
-        result = router.incomingMessage(xmppMessage);
-        assertThat(result.getBody(), is("Private message sent"));
-        assertThat(pmQueriesService.getPMMessages(renhaId, secretlySadId).size(), is(2));
-        String xml = "<message xmlns=\"jabber:server\" from=\"" + botJid + "\" to=\"renha@serverstorageisfull.tld\" type=\"chat\"><body>@yo:\n" +
-                "343432434\n" +
-                "\n" +
-                "#2 http://juick.com/2</body><thread>juick-2</thread><juick xmlns=\"http://juick.com/message\" mid=\"2\" privacy=\"1\" quote=\"\" replyto=\"0\" rid=\"0\" ts=\"2018-04-10 06:58:23\"><body>343432434</body><updated></updated><user xmlns=\"http://juick.com/user\" uname=\"yo\" uid=\"2\"></user></juick><nick xmlns=\"http://jabber.org/protocol/nick\">@yo</nick></message>";
-        result = router.incomingMessage((rocks.xmpp.core.stanza.model.Message)server.parse(xml));
-        String active = "<message xmlns=\"jabber:server\" from=\"renha@serverstorageisfull.tld/work\" to=\""
-                + botJid.asBareJid().toEscapedString() + "\" type=\"chat\" id=\"purple553384c6\"><active xmlns=\"http://jabber.org/protocol/chatstates\"></active></message>";
-        result = router.incomingMessage((rocks.xmpp.core.stanza.model.Message)server.parse(active));
-        xmppMessage.setFrom(botJid);
-        // TODO: assert events
-    }
-    @Test
     public void botCommandsTests() throws Exception {
         assertThat(commandsManager.processCommand(AnonymousUser.INSTANCE, "PING", emptyUri).getText(), is("PONG"));
         // subscription commands have two lines, others have 1
@@ -1328,25 +1266,6 @@ public class ServerTests {
         assertThat(subscriptionService.getUsersSubscribedToComments(msg, reply).size(), is(0));
     }
     @Test
-    public void xmppStatusApi() throws Exception {
-        Supplier<XMPPStatus> getStatus = () -> {
-            try {
-                MvcResult result = mockMvc.perform(get("/api/xmpp-status").with(httpBasic(ugnichName, ugnichPassword)))
-                        .andExpect(status().isOk()).andReturn();
-                return jsonMapper.readValue(result.getResponse().getContentAsString(), XMPPStatus.class);
-            } catch (Exception e) {
-                e.printStackTrace();
-                return null;
-            }
-        };
-        assertThat(getStatus.get().getInbound(), is(nullValue()));
-        ConnectionIn test = new ConnectionIn(server, new Socket("localhost", server.getServerPort()));
-        test.from.add(Jid.of("test"));
-        server.getInConnections().clear();
-        server.addConnectionIn(test);
-        assertThat(getStatus.get().getInbound().size(), is(1));
-    }
-    @Test
     public void credentialsShouldNeverBeSerialized() throws Exception {
         int uid = userService.createUser("yyy", "xxxx");
         User yyy = userService.getUserByUID(uid).get();