Cleaned up RequestProcessor and fixed few tests

Resolves #193
This commit is contained in:
Oleg Zhurakousky
2018-07-31 19:14:05 +02:00
parent 7dd38edf84
commit 947f4f6b71
4 changed files with 197 additions and 216 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2017 the original author or authors.
* Copyright 2016-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,36 +15,36 @@
*/
package com.example;
import static org.assertj.core.api.Assertions.assertThat;
import java.net.URI;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.http.MediaType;
import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.MvcResult;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.asyncDispatch;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
/**
* @author Dave Syer
*/
@RunWith(SpringRunner.class)
@WebMvcTest
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
public class SampleApplicationMvcTests {
@Autowired
private MockMvc mockMvc;
private TestRestTemplate rest;
@Test
public void words() throws Exception {
MvcResult mvcResult = mockMvc
.perform(get("/words").accept(MediaType.APPLICATION_JSON)).andReturn();
mockMvc.perform(asyncDispatch(mvcResult))
.andExpect(content().string("[{\"value\":\"foo\"},{\"value\":\"bar\"}]"));
ResponseEntity<String> result = rest.exchange(RequestEntity.get(new URI("/words"))
.accept(MediaType.APPLICATION_JSON).build(), String.class);
assertThat(result.getBody()).isEqualTo("[{\"value\":\"foo\"},{\"value\":\"bar\"}]");
}
}

View File

@@ -15,6 +15,7 @@
*/
package com.example;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;