aboutsummaryrefslogtreecommitdiff
path: root/juick-www/src/test/java/com/juick
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2017-09-06 12:04:40 +0300
committerGravatar Vitaly Takmazov2017-09-06 12:04:40 +0300
commit346c39037d6e5e9c2d006ac43439f865f418a62c (patch)
treec09726aaa433e10aaa6b529940008646fa5c80e9 /juick-www/src/test/java/com/juick
parent09b1795a7ab08b334dfd3ce94f343caa86f926a6 (diff)
api and www: cleanup tests and tests configuration
Diffstat (limited to 'juick-www/src/test/java/com/juick')
-rw-r--r--juick-www/src/test/java/com/juick/www/WebAppTests.java20
1 files changed, 12 insertions, 8 deletions
diff --git a/juick-www/src/test/java/com/juick/www/WebAppTests.java b/juick-www/src/test/java/com/juick/www/WebAppTests.java
index 464e9416..c5e9eb6a 100644
--- a/juick-www/src/test/java/com/juick/www/WebAppTests.java
+++ b/juick-www/src/test/java/com/juick/www/WebAppTests.java
@@ -26,7 +26,6 @@ import com.juick.Message;
import com.juick.Tag;
import com.juick.User;
import com.juick.configuration.MockDataConfiguration;
-import com.juick.server.configuration.BaseWebConfiguration;
import com.juick.service.MessagesService;
import com.juick.service.UserService;
import com.juick.test.util.MockUtils;
@@ -41,6 +40,7 @@ import org.apache.commons.text.StringEscapeUtils;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.ContextConfiguration;
@@ -48,6 +48,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
import org.springframework.test.web.servlet.htmlunit.MockMvcWebClientBuilder;
import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import javax.inject.Inject;
import java.io.IOException;
@@ -73,8 +74,10 @@ import static org.mockito.Mockito.when;
@ContextConfiguration
public class WebAppTests {
@Configuration
+ @EnableWebMvc
+ @ComponentScan(basePackages = "com.juick.www.controllers")
@Import(value = {
- BaseWebConfiguration.class, WwwServletConfiguration.class, WwwAppConfiguration.class, SapeConfiguration.class,
+ WwwServletConfiguration.class, WwwAppConfiguration.class, SapeConfiguration.class,
MockDataConfiguration.class
})
static class Config {}
@@ -201,10 +204,9 @@ public class WebAppTests {
assertThat(output, equalTo("<a href=\"/ugnich/?tag=%26gt%3B_%26lt%3B\">&gt;_&lt;</a>"));
}
- public DomElement fetchMeta(String url, String name) throws IOException {
- HtmlPage threadPage = webClient.getPage(url);
+ public DomElement fetchMeta(HtmlPage page, String name) throws IOException {
DomElement emptyMeta = new DomElement("", "meta", null, null);
- return threadPage.getElementsByTagName("meta").stream()
+ return page.getElementsByTagName("meta").stream()
.filter(t -> t.getAttribute("name").equals(name)).findFirst().orElse(emptyMeta);
}
@Test
@@ -235,12 +237,14 @@ public class WebAppTests {
when(messagesService.canViewThread(1, 0)).thenReturn(true);
when(messagesService.getMessage(1)).thenReturn(msg);
- assertThat(fetchMeta("http://localhost:8080/ugnich/1", "twitter:card")
+ HtmlPage threadPage = webClient.getPage("http://localhost:8080/ugnich/1");
+
+ assertThat(fetchMeta(threadPage, "twitter:card")
.getAttribute("content"), equalTo("summary"));
msg.setAttachmentType("png");
- assertThat(fetchMeta("http://localhost:8080/ugnich/1", "twitter:card")
+ assertThat(fetchMeta(threadPage, "twitter:card")
.getAttribute("content"), equalTo("summary_large_image"));
- assertThat(fetchMeta("http://localhost:8080/ugnich/1", "og:description")
+ assertThat(fetchMeta(threadPage, "og:description")
.getAttribute("content"),
startsWith(StringEscapeUtils.escapeHtml4(MessageUtils.getMessageHashTags(msg))));