From 3ab17252a7d9f6c5834d85d050a19fa41be0c07d Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 19 Dec 2019 13:21:40 +0300 Subject: Send Update activites on message updates --- .../java/com/juick/server/MockUpdateListener.java | 30 ++++++++++++++++++++++ .../java/com/juick/server/tests/ServerTests.java | 12 +++++++++ 2 files changed, 42 insertions(+) create mode 100644 src/test/java/com/juick/server/MockUpdateListener.java (limited to 'src/test') diff --git a/src/test/java/com/juick/server/MockUpdateListener.java b/src/test/java/com/juick/server/MockUpdateListener.java new file mode 100644 index 00000000..08742b12 --- /dev/null +++ b/src/test/java/com/juick/server/MockUpdateListener.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2008-2019, Juick + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package com.juick.server; + +import com.juick.service.activities.UpdateEvent; +import org.springframework.context.ApplicationListener; + +import javax.annotation.Nonnull; + +public class MockUpdateListener implements ApplicationListener { + @Override + public void onApplicationEvent(@Nonnull UpdateEvent event) { + + } +} diff --git a/src/test/java/com/juick/server/tests/ServerTests.java b/src/test/java/com/juick/server/tests/ServerTests.java index 479ec750..01f9812c 100644 --- a/src/test/java/com/juick/server/tests/ServerTests.java +++ b/src/test/java/com/juick/server/tests/ServerTests.java @@ -48,6 +48,8 @@ import com.juick.server.util.HttpUtils; import com.juick.server.util.ImageUtils; import com.juick.server.www.WebApp; import com.juick.service.*; +import com.juick.service.activities.ActivityListener; +import com.juick.service.activities.UpdateEvent; import com.juick.service.component.SystemEvent; import com.juick.test.util.MockUtils; import com.juick.util.DateFormattersHolder; @@ -1301,6 +1303,11 @@ public class ServerTests { assertThat(replyJpgCmyk.getNewMessage().get().getAttachmentType(), is("jpg")); } + @MockBean + private MockUpdateListener activityListener; + @Captor + protected ArgumentCaptor updateEventCaptor; + @Test public void messageEditingSpec() throws Exception { MvcResult result = mockMvc.perform(post("/api/post").with(httpBasic(ugnichName, ugnichPassword)) @@ -1318,6 +1325,11 @@ public class ServerTests { .getNewMessage().get(); assertThat(edited.getText(), equalTo("PEOPLE")); assertThat(edited.getUpdatedAt(), greaterThan(edited.getCreated())); + Mockito.verify(activityListener, Mockito.times(1)) + .onApplicationEvent(updateEventCaptor.capture()); + UpdateEvent updateEvent = updateEventCaptor.getValue(); + assertThat(updateEvent.getUser(), is(ugnich)); + assertThat(activityPubManager.messageUri(original.getMid(), 0), is(updateEvent.getMessageUri())); mockMvc.perform(post("/api/update").with(httpBasic(freefdName, freefdPassword)) .param("mid", String.valueOf(original.getMid())) .param("body", "PEOPLE")).andExpect(status().is(403)); -- cgit v1.2.3