Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
7d09a2c3df
@ -0,0 +1,15 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml"
|
||||||
|
xmlns:th="http://www.thymeleaf.org">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<form action="#" th:action="@{/message/processForm}" method="post">
|
||||||
|
Message: <input type="text" value="message" id="message" name="message"/>
|
||||||
|
<input type="submit" />
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<span th:text="${message}" id="received"></span>
|
||||||
|
</body>
|
||||||
|
</html>
|
@ -0,0 +1,31 @@
|
|||||||
|
package com.baeldung.htmlunit;
|
||||||
|
|
||||||
|
import org.junit.Assert;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import com.gargoylesoftware.htmlunit.WebClient;
|
||||||
|
import com.gargoylesoftware.htmlunit.html.HtmlPage;
|
||||||
|
|
||||||
|
public class HtmlUnitAndJUnitTest {
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void init() throws Exception {
|
||||||
|
webClient = new WebClient();
|
||||||
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
public void close() throws Exception {
|
||||||
|
webClient.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void givenAClient_whenEnteringBaeldung_thenPageTitleIsOk()
|
||||||
|
throws Exception {
|
||||||
|
webClient.getOptions().setThrowExceptionOnScriptError(false);
|
||||||
|
HtmlPage page = webClient.getPage("http://www.baeldung.com/");
|
||||||
|
Assert.assertEquals(
|
||||||
|
"Baeldung | Java, Spring and Web Development tutorials",
|
||||||
|
page.getTitleText());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -1,72 +0,0 @@
|
|||||||
package com.baeldung.htmlunit;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.net.MalformedURLException;
|
|
||||||
|
|
||||||
import org.junit.Assert;
|
|
||||||
import org.junit.Before;
|
|
||||||
import org.junit.Ignore;
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.junit.runner.RunWith;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.test.context.ContextConfiguration;
|
|
||||||
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 com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
|
|
||||||
import com.gargoylesoftware.htmlunit.WebClient;
|
|
||||||
import com.gargoylesoftware.htmlunit.html.HtmlForm;
|
|
||||||
import com.gargoylesoftware.htmlunit.html.HtmlPage;
|
|
||||||
import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
|
|
||||||
import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
|
|
||||||
|
|
||||||
@RunWith(SpringJUnit4ClassRunner.class)
|
|
||||||
@WebAppConfiguration
|
|
||||||
@ContextConfiguration(classes = { TestConfig.class })
|
|
||||||
public class HtmlUnitAndSpringIntegrationTest {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private WebApplicationContext wac;
|
|
||||||
|
|
||||||
private WebClient webClient;
|
|
||||||
|
|
||||||
@Before
|
|
||||||
public void setup() {
|
|
||||||
webClient = MockMvcWebClientBuilder.webAppContextSetup(wac).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@Ignore("Related view message.html does not exist check MessageController")
|
|
||||||
public void givenAMessage_whenSent_thenItShows() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
|
|
||||||
final String text = "Hello world!";
|
|
||||||
final HtmlPage page = webClient.getPage("http://localhost/message/showForm");
|
|
||||||
System.out.println(page.asXml());
|
|
||||||
|
|
||||||
final HtmlTextInput messageText = page.getHtmlElementById("message");
|
|
||||||
messageText.setValueAttribute(text);
|
|
||||||
|
|
||||||
final HtmlForm form = page.getForms().get(0);
|
|
||||||
final HtmlSubmitInput submit = form.getOneHtmlElementByAttribute("input", "type", "submit");
|
|
||||||
final HtmlPage newPage = submit.click();
|
|
||||||
|
|
||||||
final String receivedText = newPage.getHtmlElementById("received").getTextContent();
|
|
||||||
|
|
||||||
Assert.assertEquals(receivedText, text);
|
|
||||||
System.out.println(newPage.asXml());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void givenAClient_whenEnteringBaeldung_thenPageTitleIsCorrect() throws Exception {
|
|
||||||
try (final WebClient client = new WebClient()) {
|
|
||||||
webClient.getOptions().setThrowExceptionOnScriptError(false);
|
|
||||||
|
|
||||||
final HtmlPage page = webClient.getPage("http://www.baeldung.com/");
|
|
||||||
Assert.assertEquals("Baeldung | Java, Spring and Web Development tutorials", page.getTitleText());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -0,0 +1,61 @@
|
|||||||
|
package com.baeldung.htmlunit;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
import org.junit.Assert;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Ignore;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.test.context.ContextConfiguration;
|
||||||
|
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 com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
|
||||||
|
import com.gargoylesoftware.htmlunit.WebClient;
|
||||||
|
import com.gargoylesoftware.htmlunit.html.HtmlForm;
|
||||||
|
import com.gargoylesoftware.htmlunit.html.HtmlPage;
|
||||||
|
import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
|
||||||
|
import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
|
||||||
|
|
||||||
|
@RunWith(SpringJUnit4ClassRunner.class)
|
||||||
|
@WebAppConfiguration
|
||||||
|
@ContextConfiguration(classes = { TestConfig.class })
|
||||||
|
public class HtmlUnitAndSpringTest {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private WebApplicationContext wac;
|
||||||
|
|
||||||
|
private WebClient webClient;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setup() {
|
||||||
|
webClient = MockMvcWebClientBuilder
|
||||||
|
.webAppContextSetup(wac).build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void givenAMessage_whenSent_thenItShows() throws Exception {
|
||||||
|
String text = "Hello world!";
|
||||||
|
HtmlPage page;
|
||||||
|
|
||||||
|
String url = "http://localhost/message/showForm";
|
||||||
|
page = webClient.getPage(url);
|
||||||
|
|
||||||
|
HtmlTextInput messageText = page.getHtmlElementById("message");
|
||||||
|
messageText.setValueAttribute(text);
|
||||||
|
|
||||||
|
HtmlForm form = page.getForms().get(0);
|
||||||
|
HtmlSubmitInput submit = form.getOneHtmlElementByAttribute(
|
||||||
|
"input", "type", "submit");
|
||||||
|
HtmlPage newPage = submit.click();
|
||||||
|
|
||||||
|
String receivedText = newPage.getHtmlElementById("received")
|
||||||
|
.getTextContent();
|
||||||
|
|
||||||
|
Assert.assertEquals(receivedText, text);
|
||||||
|
}
|
||||||
|
}
|
@ -1,21 +0,0 @@
|
|||||||
package com.baeldung.htmlunit;
|
|
||||||
|
|
||||||
import org.junit.Assert;
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
import com.gargoylesoftware.htmlunit.WebClient;
|
|
||||||
import com.gargoylesoftware.htmlunit.html.HtmlPage;
|
|
||||||
|
|
||||||
public class HtmlUnitTest {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void givenAClient_whenEnteringBaeldung_thenPageTitleIsCorrect() throws Exception {
|
|
||||||
try (final WebClient webClient = new WebClient()) {
|
|
||||||
webClient.getOptions().setThrowExceptionOnScriptError(false);
|
|
||||||
|
|
||||||
final HtmlPage page = webClient.getPage("http://www.baeldung.com/");
|
|
||||||
Assert.assertEquals("Baeldung | Java, Spring and Web Development tutorials", page.getTitleText());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -5,36 +5,38 @@ import java.util.List;
|
|||||||
import com.gargoylesoftware.htmlunit.WebClient;
|
import com.gargoylesoftware.htmlunit.WebClient;
|
||||||
import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
|
import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
|
||||||
import com.gargoylesoftware.htmlunit.html.HtmlHeading1;
|
import com.gargoylesoftware.htmlunit.html.HtmlHeading1;
|
||||||
import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
|
|
||||||
import com.gargoylesoftware.htmlunit.html.HtmlPage;
|
import com.gargoylesoftware.htmlunit.html.HtmlPage;
|
||||||
|
|
||||||
public class HtmlUnitWebScraping {
|
public class HtmlUnitWebScraping {
|
||||||
|
|
||||||
public static void main(final String[] args) throws Exception {
|
private WebClient webClient;
|
||||||
try (final WebClient webClient = new WebClient()) {
|
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void init() throws Exception {
|
||||||
|
webClient = new WebClient();
|
||||||
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
public void close() throws Exception {
|
||||||
|
webClient.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void givenBaeldungArchive_whenRetrievingArticle_thenHasH1()
|
||||||
|
throws Exception {
|
||||||
webClient.getOptions().setCssEnabled(false);
|
webClient.getOptions().setCssEnabled(false);
|
||||||
webClient.getOptions().setJavaScriptEnabled(false);
|
webClient.getOptions().setJavaScriptEnabled(false);
|
||||||
|
|
||||||
final HtmlPage page = webClient.getPage("http://www.baeldung.com/full_archive");
|
String url = "http://www.baeldung.com/full_archive";
|
||||||
final HtmlAnchor latestPostLink = (HtmlAnchor) page.getByXPath("(//ul[@class='car-monthlisting']/li)[1]/a").get(0);
|
HtmlPage page = webClient.getPage(url);
|
||||||
|
String xpath = "(//ul[@class='car-monthlisting']/li)[1]/a";
|
||||||
|
HtmlAnchor latestPostLink
|
||||||
|
= (HtmlAnchor) page.getByXPath(xpath).get(0);
|
||||||
|
HtmlPage postPage = latestPostLink.click();
|
||||||
|
|
||||||
System.out.println("Entering: " + latestPostLink.getHrefAttribute());
|
List<HtmlHeading1> h1
|
||||||
|
= (List<HtmlHeading1>) postPage.getByXPath("//h1");
|
||||||
|
|
||||||
final HtmlPage postPage = latestPostLink.click();
|
Assert.assertTrue(h1.size() > 0);
|
||||||
|
|
||||||
final HtmlHeading1 heading1 = (HtmlHeading1) postPage.getByXPath("//h1").get(0);
|
|
||||||
System.out.println("Title: " + heading1.getTextContent());
|
|
||||||
|
|
||||||
final List<HtmlHeading2> headings2 = (List<HtmlHeading2>) postPage.getByXPath("//h2");
|
|
||||||
|
|
||||||
final StringBuilder sb = new StringBuilder(heading1.getTextContent());
|
|
||||||
for (final HtmlHeading2 h2 : headings2) {
|
|
||||||
sb.append("\n").append(h2.getTextContent());
|
|
||||||
}
|
|
||||||
|
|
||||||
System.out.println(sb.toString());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
|
@ -220,6 +220,13 @@
|
|||||||
<version>${springfox-swagger.version}</version>
|
<version>${springfox-swagger.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>commons-fileupload</groupId>
|
||||||
|
<artifactId>commons-fileupload</artifactId>
|
||||||
|
<version>1.3.2</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
@ -0,0 +1,24 @@
|
|||||||
|
package org.baeldung.web.controller;
|
||||||
|
|
||||||
|
import java.util.concurrent.Callable;
|
||||||
|
|
||||||
|
import org.springframework.stereotype.Controller;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMethod;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
|
@Controller
|
||||||
|
public class AsyncController {
|
||||||
|
|
||||||
|
@RequestMapping(method = RequestMethod.POST, value = "/upload")
|
||||||
|
public Callable<Boolean> processUpload(final MultipartFile file) {
|
||||||
|
|
||||||
|
return new Callable<Boolean>() {
|
||||||
|
public Boolean call() throws Exception {
|
||||||
|
// ...
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -3,4 +3,8 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd">
|
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd">
|
||||||
|
|
||||||
|
<bean id="multipartResolver"
|
||||||
|
class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
|
||||||
|
<property name="maxUploadSize" value="1000000" />
|
||||||
|
</bean>
|
||||||
</beans>
|
</beans>
|
@ -1,9 +1,10 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
|
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
|
||||||
xsi:schemaLocation="
|
xsi:schemaLocation="
|
||||||
http://java.sun.com/xml/ns/javaee
|
http://java.sun.com/xml/ns/javaee
|
||||||
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
|
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
|
||||||
>
|
id="WebApp_ID" version="3.0">
|
||||||
|
|
||||||
<display-name>Spring MVC Application</display-name>
|
<display-name>Spring MVC Application</display-name>
|
||||||
|
|
||||||
@ -45,6 +46,8 @@
|
|||||||
<filter-mapping>
|
<filter-mapping>
|
||||||
<filter-name>springSecurityFilterChain</filter-name>
|
<filter-name>springSecurityFilterChain</filter-name>
|
||||||
<url-pattern>/*</url-pattern>
|
<url-pattern>/*</url-pattern>
|
||||||
|
<dispatcher>REQUEST</dispatcher>
|
||||||
|
<dispatcher>ASYNC</dispatcher>
|
||||||
</filter-mapping>
|
</filter-mapping>
|
||||||
|
|
||||||
<!-- <welcome-file-list> -->
|
<!-- <welcome-file-list> -->
|
||||||
|
@ -0,0 +1,51 @@
|
|||||||
|
package org.baeldung.web;
|
||||||
|
|
||||||
|
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||||
|
|
||||||
|
import org.baeldung.spring.ClientWebConfig;
|
||||||
|
import org.baeldung.spring.SecurityJavaConfig;
|
||||||
|
import org.baeldung.spring.WebConfig;
|
||||||
|
import org.baeldung.web.controller.AsyncController;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.mock.web.MockHttpSession;
|
||||||
|
import org.springframework.mock.web.MockMultipartFile;
|
||||||
|
import org.springframework.test.context.ContextConfiguration;
|
||||||
|
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
|
||||||
|
import org.springframework.test.context.web.WebAppConfiguration;
|
||||||
|
import org.springframework.test.web.servlet.MockMvc;
|
||||||
|
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
|
||||||
|
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
|
||||||
|
import org.springframework.web.context.WebApplicationContext;
|
||||||
|
|
||||||
|
@RunWith(SpringJUnit4ClassRunner.class)
|
||||||
|
@WebAppConfiguration
|
||||||
|
@ContextConfiguration(classes = { ClientWebConfig.class, SecurityJavaConfig.class, WebConfig.class})
|
||||||
|
public class AsyncControllerTest {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
WebApplicationContext wac;
|
||||||
|
@Autowired
|
||||||
|
MockHttpSession session;
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
AsyncController controller;
|
||||||
|
|
||||||
|
private MockMvc mockMvc;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setup() {
|
||||||
|
mockMvc = MockMvcBuilders.webAppContextSetup(wac).build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testProcessUpload() throws Exception {
|
||||||
|
MockMultipartFile jsonFile = new MockMultipartFile("json", "", "application/json",
|
||||||
|
"{\"json\": \"someValue\"}".getBytes());
|
||||||
|
mockMvc.perform(MockMvcRequestBuilders.fileUpload("/upload").file(jsonFile)).andExpect(status().isOk());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -1,10 +1,19 @@
|
|||||||
package org.baeldung.web;
|
package org.baeldung.web;
|
||||||
|
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.ComponentScan;
|
import org.springframework.context.annotation.ComponentScan;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.web.multipart.MultipartResolver;
|
||||||
|
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@ComponentScan({ "org.baeldung.web" })
|
@ComponentScan({ "org.baeldung.web" })
|
||||||
public class TestConfig {
|
public class TestConfig {
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public MultipartResolver multipartResolver() {
|
||||||
|
CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver();
|
||||||
|
return multipartResolver;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user