GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Polishing 

(cherry picked from commit eae079a)
pull/1131/head
Juergen Hoeller 9 years ago
parent
e2ba7c9b8c
commit
4627545a3b
10 changed files with 58 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      spring-test/src/main/java/org/springframework/mock/http/MockHttpInputMessage.java
  2. 29
      spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java
  3. 4
      spring-test/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
  4. 18
      spring-test/src/test/java/org/springframework/test/web/client/match/XpathRequestMatchersTests.java
  5. 1
      spring-test/src/test/java/org/springframework/test/web/client/response/ResponseCreatorsTests.java
  6. 5
      spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/ContentRequestMatchersIntegrationTests.java
  7. 9
      spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/HeaderRequestMatchersIntegrationTests.java
  8. 9
      spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatchersIntegrationTests.java
  9. 8
      spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatchersIntegrationTests.java
  10. 14
      spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatchersIntegrationTests.java

9
spring-test/src/main/java/org/springframework/mock/http/MockHttpInputMessage.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.mock.http; package org.springframework.mock.http;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
@ -37,14 +38,15 @@ public class MockHttpInputMessage implements HttpInputMessage {
public MockHttpInputMessage(byte[] contents) { public MockHttpInputMessage(byte[] contents) {
this.body = (contents != null) ? new ByteArrayInputStream(contents) : null; this.body = (contents != null ? new ByteArrayInputStream(contents) : null);
} }
public MockHttpInputMessage(InputStream body) { public MockHttpInputMessage(InputStream body) {
Assert.notNull(body, "'body' must not be null"); Assert.notNull(body, "InputStream must not be null");
this.body = body; this.body = body;
} }
@Override @Override
public HttpHeaders getHeaders() { public HttpHeaders getHeaders() {
return this.headers; return this.headers;
@ -54,4 +56,5 @@ public class MockHttpInputMessage implements HttpInputMessage {
public InputStream getBody() throws IOException { public InputStream getBody() throws IOException {
return this.body; return this.body;
} }
} }

29
spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -33,14 +33,14 @@ import org.springframework.mock.http.MockHttpOutputMessage;
*/ */
public class MockClientHttpRequest extends MockHttpOutputMessage implements ClientHttpRequest { public class MockClientHttpRequest extends MockHttpOutputMessage implements ClientHttpRequest {
private URI uri;
private HttpMethod httpMethod; private HttpMethod httpMethod;
private boolean executed = false; private URI uri;
private ClientHttpResponse clientHttpResponse; private ClientHttpResponse clientHttpResponse;
private boolean executed = false;
/** /**
* Default constructor. * Default constructor.
@ -56,13 +56,9 @@ public class MockClientHttpRequest extends MockHttpOutputMessage implements Clie
this.uri = uri; this.uri = uri;
} }
@Override
public URI getURI() {
return this.uri;
}
public void setURI(URI uri) { public void setMethod(HttpMethod httpMethod) {
this.uri = uri; this.httpMethod = httpMethod;
} }
@Override @Override
@ -70,8 +66,13 @@ public class MockClientHttpRequest extends MockHttpOutputMessage implements Clie
return this.httpMethod; return this.httpMethod;
} }
public void setMethod(HttpMethod httpMethod) { public void setURI(URI uri) {
this.httpMethod = httpMethod; this.uri = uri;
}
@Override
public URI getURI() {
return this.uri;
} }
public void setResponse(ClientHttpResponse clientHttpResponse) { public void setResponse(ClientHttpResponse clientHttpResponse) {
@ -96,7 +97,6 @@ public class MockClientHttpRequest extends MockHttpOutputMessage implements Clie
/** /**
* The default implementation returns the configured * The default implementation returns the configured
* {@link #setResponse(ClientHttpResponse) response}. * {@link #setResponse(ClientHttpResponse) response}.
*
* <p>Override this method to execute the request and provide a response, * <p>Override this method to execute the request and provide a response,
* potentially different than the configured response. * potentially different than the configured response.
*/ */
@ -104,6 +104,7 @@ public class MockClientHttpRequest extends MockHttpOutputMessage implements Clie
return this.clientHttpResponse; return this.clientHttpResponse;
} }
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@ -114,7 +115,7 @@ public class MockClientHttpRequest extends MockHttpOutputMessage implements Clie
sb.append(" ").append(this.uri); sb.append(" ").append(this.uri);
} }
if (!getHeaders().isEmpty()) { if (!getHeaders().isEmpty()) {
sb.append(", headers : ").append(getHeaders()); sb.append(", headers: ").append(getHeaders());
} }
if (sb.length() == 0) { if (sb.length() == 0) {
sb.append("Not yet initialized"); sb.append("Not yet initialized");

4
spring-test/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
Unescape View File

@ -56,7 +56,7 @@ public class DefaultResponseCreator implements ResponseCreator {
* Use static factory methods in {@link MockRestResponseCreators}. * Use static factory methods in {@link MockRestResponseCreators}.
*/ */
protected DefaultResponseCreator(HttpStatus statusCode) { protected DefaultResponseCreator(HttpStatus statusCode) {
Assert.notNull(statusCode); Assert.notNull(statusCode, "HttpStatus must not be null");
this.statusCode = statusCode; this.statusCode = statusCode;
} }
@ -64,7 +64,7 @@ public class DefaultResponseCreator implements ResponseCreator {
@Override @Override
public ClientHttpResponse createResponse(ClientHttpRequest request) throws IOException { public ClientHttpResponse createResponse(ClientHttpRequest request) throws IOException {
MockClientHttpResponse response; MockClientHttpResponse response;
if (this.contentResource != null ){ if (this.contentResource != null) {
InputStream stream = this.contentResource.getInputStream(); InputStream stream = this.contentResource.getInputStream();
response = new MockClientHttpResponse(stream, this.statusCode); response = new MockClientHttpResponse(stream, this.statusCode);
} }

18
spring-test/src/test/java/org/springframework/test/web/client/match/XpathRequestMatchersTests.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -35,18 +35,20 @@ public class XpathRequestMatchersTests {
private MockClientHttpRequest request; private MockClientHttpRequest request;
@Before @Before
public void setUp() throws IOException { public void setUp() throws IOException {
this.request = new MockClientHttpRequest(); this.request = new MockClientHttpRequest();
this.request.getBody().write(RESPONSE_CONTENT.getBytes()); this.request.getBody().write(RESPONSE_CONTENT.getBytes());
} }
@Test @Test
public void testNodeMatcher() throws Exception { public void testNodeMatcher() throws Exception {
new XpathRequestMatchers("/foo/bar", null).node(Matchers.notNullValue()).match(this.request); new XpathRequestMatchers("/foo/bar", null).node(Matchers.notNullValue()).match(this.request);
} }
@Test(expected=AssertionError.class) @Test(expected = AssertionError.class)
public void testNodeMatcherNoMatch() throws Exception { public void testNodeMatcherNoMatch() throws Exception {
new XpathRequestMatchers("/foo/bar", null).node(Matchers.nullValue()).match(this.request); new XpathRequestMatchers("/foo/bar", null).node(Matchers.nullValue()).match(this.request);
} }
@ -56,7 +58,7 @@ public class XpathRequestMatchersTests {
new XpathRequestMatchers("/foo/bar", null).exists().match(this.request); new XpathRequestMatchers("/foo/bar", null).exists().match(this.request);
} }
@Test(expected=AssertionError.class) @Test(expected = AssertionError.class)
public void testExistsNoMatch() throws Exception { public void testExistsNoMatch() throws Exception {
new XpathRequestMatchers("/foo/Bar", null).exists().match(this.request); new XpathRequestMatchers("/foo/Bar", null).exists().match(this.request);
} }
@ -66,7 +68,7 @@ public class XpathRequestMatchersTests {
new XpathRequestMatchers("/foo/Bar", null).doesNotExist().match(this.request); new XpathRequestMatchers("/foo/Bar", null).doesNotExist().match(this.request);
} }
@Test(expected=AssertionError.class) @Test(expected = AssertionError.class)
public void testDoesNotExistNoMatch() throws Exception { public void testDoesNotExistNoMatch() throws Exception {
new XpathRequestMatchers("/foo/bar", null).doesNotExist().match(this.request); new XpathRequestMatchers("/foo/bar", null).doesNotExist().match(this.request);
} }
@ -76,7 +78,7 @@ public class XpathRequestMatchersTests {
new XpathRequestMatchers("/foo/bar", null).nodeCount(2).match(this.request); new XpathRequestMatchers("/foo/bar", null).nodeCount(2).match(this.request);
} }
@Test(expected=AssertionError.class) @Test(expected = AssertionError.class)
public void testNodeCountNoMatch() throws Exception { public void testNodeCountNoMatch() throws Exception {
new XpathRequestMatchers("/foo/bar", null).nodeCount(1).match(this.request); new XpathRequestMatchers("/foo/bar", null).nodeCount(1).match(this.request);
} }
@ -86,7 +88,7 @@ public class XpathRequestMatchersTests {
new XpathRequestMatchers("/foo/bar[1]", null).string("111").match(this.request); new XpathRequestMatchers("/foo/bar[1]", null).string("111").match(this.request);
} }
@Test(expected=AssertionError.class) @Test(expected = AssertionError.class)
public void testStringNoMatch() throws Exception { public void testStringNoMatch() throws Exception {
new XpathRequestMatchers("/foo/bar[1]", null).string("112").match(this.request); new XpathRequestMatchers("/foo/bar[1]", null).string("112").match(this.request);
} }
@ -96,7 +98,7 @@ public class XpathRequestMatchersTests {
new XpathRequestMatchers("/foo/bar[1]", null).number(111.0).match(this.request); new XpathRequestMatchers("/foo/bar[1]", null).number(111.0).match(this.request);
} }
@Test(expected=AssertionError.class) @Test(expected = AssertionError.class)
public void testNumberNoMatch() throws Exception { public void testNumberNoMatch() throws Exception {
new XpathRequestMatchers("/foo/bar[1]", null).number(111.1).match(this.request); new XpathRequestMatchers("/foo/bar[1]", null).number(111.1).match(this.request);
} }
@ -106,7 +108,7 @@ public class XpathRequestMatchersTests {
new XpathRequestMatchers("/foo/bar[2]", null).booleanValue(true).match(this.request); new XpathRequestMatchers("/foo/bar[2]", null).booleanValue(true).match(this.request);
} }
@Test(expected=AssertionError.class) @Test(expected = AssertionError.class)
public void testBooleanNoMatch() throws Exception { public void testBooleanNoMatch() throws Exception {
new XpathRequestMatchers("/foo/bar[2]", null).booleanValue(false).match(this.request); new XpathRequestMatchers("/foo/bar[2]", null).booleanValue(false).match(this.request);
} }

1
spring-test/src/test/java/org/springframework/test/web/client/response/ResponseCreatorsTests.java
Unescape View File

@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.test.web.client.response; package org.springframework.test.web.client.response;
import java.net.URI; import java.net.URI;

5
spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/ContentRequestMatchersIntegrationTests.java
Unescape View File

@ -39,7 +39,6 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat
* Examples of defining expectations on request content and content type. * Examples of defining expectations on request content and content type.
* *
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
*
* @see JsonPathRequestMatchersIntegrationTests * @see JsonPathRequestMatchersIntegrationTests
* @see XmlContentRequestMatchersIntegrationTests * @see XmlContentRequestMatchersIntegrationTests
* @see XpathRequestMatchersIntegrationTests * @see XpathRequestMatchersIntegrationTests
@ -50,9 +49,10 @@ public class ContentRequestMatchersIntegrationTests {
private RestTemplate restTemplate; private RestTemplate restTemplate;
@Before @Before
public void setup() { public void setup() {
List<HttpMessageConverter<?>> converters = new ArrayList<HttpMessageConverter<?>>(); List<HttpMessageConverter<?>> converters = new ArrayList<>();
converters.add(new StringHttpMessageConverter()); converters.add(new StringHttpMessageConverter());
converters.add(new MappingJackson2HttpMessageConverter()); converters.add(new MappingJackson2HttpMessageConverter());
@ -62,6 +62,7 @@ public class ContentRequestMatchersIntegrationTests {
this.mockServer = MockRestServiceServer.createServer(this.restTemplate); this.mockServer = MockRestServiceServer.createServer(this.restTemplate);
} }
@Test @Test
public void contentType() throws Exception { public void contentType() throws Exception {
this.mockServer.expect(content().contentType("application/json;charset=UTF-8")).andRespond(withSuccess()); this.mockServer.expect(content().contentType("application/json;charset=UTF-8")).andRespond(withSuccess());

9
spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/HeaderRequestMatchersIntegrationTests.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -44,13 +44,15 @@ public class HeaderRequestMatchersIntegrationTests {
private static final String RESPONSE_BODY = "{\"name\" : \"Ludwig van Beethoven\", \"someDouble\" : \"1.6035\"}"; private static final String RESPONSE_BODY = "{\"name\" : \"Ludwig van Beethoven\", \"someDouble\" : \"1.6035\"}";
private MockRestServiceServer mockServer; private MockRestServiceServer mockServer;
private RestTemplate restTemplate; private RestTemplate restTemplate;
@Before @Before
public void setup() { public void setup() {
List<HttpMessageConverter<?>> converters = new ArrayList<HttpMessageConverter<?>>(); List<HttpMessageConverter<?>> converters = new ArrayList<>();
converters.add(new StringHttpMessageConverter()); converters.add(new StringHttpMessageConverter());
converters.add(new MappingJackson2HttpMessageConverter()); converters.add(new MappingJackson2HttpMessageConverter());
@ -60,9 +62,9 @@ public class HeaderRequestMatchersIntegrationTests {
this.mockServer = MockRestServiceServer.createServer(this.restTemplate); this.mockServer = MockRestServiceServer.createServer(this.restTemplate);
} }
@Test @Test
public void testString() throws Exception { public void testString() throws Exception {
this.mockServer.expect(requestTo("/person/1")) this.mockServer.expect(requestTo("/person/1"))
.andExpect(header("Accept", "application/json, application/*+json")) .andExpect(header("Accept", "application/json, application/*+json"))
.andRespond(withSuccess(RESPONSE_BODY, MediaType.APPLICATION_JSON)); .andRespond(withSuccess(RESPONSE_BODY, MediaType.APPLICATION_JSON));
@ -73,7 +75,6 @@ public class HeaderRequestMatchersIntegrationTests {
@Test @Test
public void testStringContains() throws Exception { public void testStringContains() throws Exception {
this.mockServer.expect(requestTo("/person/1")) this.mockServer.expect(requestTo("/person/1"))
.andExpect(header("Accept", containsString("json"))) .andExpect(header("Accept", containsString("json")))
.andRespond(withSuccess(RESPONSE_BODY, MediaType.APPLICATION_JSON)); .andRespond(withSuccess(RESPONSE_BODY, MediaType.APPLICATION_JSON));

9
spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatchersIntegrationTests.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -19,6 +19,7 @@ package org.springframework.test.web.client.samples.matchers;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import org.junit.After; import org.junit.After;
import org.junit.Test; import org.junit.Test;
@ -45,7 +46,7 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat
*/ */
public class JsonPathRequestMatchersIntegrationTests { public class JsonPathRequestMatchersIntegrationTests {
private static final MultiValueMap<String, Person> people = new LinkedMultiValueMap<String, Person>(); private static final MultiValueMap<String, Person> people = new LinkedMultiValueMap<>();
static { static {
people.add("composers", new Person("Johann Sebastian Bach")); people.add("composers", new Person("Johann Sebastian Bach"));
@ -56,7 +57,9 @@ public class JsonPathRequestMatchersIntegrationTests {
people.add("performers", new Person("Yehudi Menuhin")); people.add("performers", new Person("Yehudi Menuhin"));
} }
private final RestTemplate restTemplate = new RestTemplate(Arrays.asList(new MappingJackson2HttpMessageConverter()));
private final RestTemplate restTemplate =
new RestTemplate(Collections.singletonList(new MappingJackson2HttpMessageConverter()));
private final MockRestServiceServer mockServer = MockRestServiceServer.createServer(this.restTemplate); private final MockRestServiceServer mockServer = MockRestServiceServer.createServer(this.restTemplate);

8
spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatchersIntegrationTests.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -57,6 +57,7 @@ public class XmlContentRequestMatchersIntegrationTests {
"<composer><name>Robert Schumann</name><someBoolean>false</someBoolean><someDouble>NaN</someDouble></composer>" + "<composer><name>Robert Schumann</name><someBoolean>false</someBoolean><someDouble>NaN</someDouble></composer>" +
"</composers></people>"; "</composers></people>";
private MockRestServiceServer mockServer; private MockRestServiceServer mockServer;
private RestTemplate restTemplate; private RestTemplate restTemplate;
@ -66,7 +67,6 @@ public class XmlContentRequestMatchersIntegrationTests {
@Before @Before
public void setup() { public void setup() {
List<Person> composers = Arrays.asList( List<Person> composers = Arrays.asList(
new Person("Johann Sebastian Bach").setSomeDouble(21), new Person("Johann Sebastian Bach").setSomeDouble(21),
new Person("Johannes Brahms").setSomeDouble(.0025), new Person("Johannes Brahms").setSomeDouble(.0025),
@ -75,7 +75,7 @@ public class XmlContentRequestMatchersIntegrationTests {
this.people = new PeopleWrapper(composers); this.people = new PeopleWrapper(composers);
List<HttpMessageConverter<?>> converters = new ArrayList<HttpMessageConverter<?>>(); List<HttpMessageConverter<?>> converters = new ArrayList<>();
converters.add(new Jaxb2RootElementHttpMessageConverter()); converters.add(new Jaxb2RootElementHttpMessageConverter());
this.restTemplate = new RestTemplate(); this.restTemplate = new RestTemplate();
@ -97,7 +97,6 @@ public class XmlContentRequestMatchersIntegrationTests {
@Test @Test
public void testHamcrestNodeMatcher() throws Exception { public void testHamcrestNodeMatcher() throws Exception {
this.mockServer.expect(requestTo("/composers")) this.mockServer.expect(requestTo("/composers"))
.andExpect(content().contentType("application/xml")) .andExpect(content().contentType("application/xml"))
.andExpect(content().node(hasXPath("/people/composers/composer[1]"))) .andExpect(content().node(hasXPath("/people/composers/composer[1]")))
@ -128,4 +127,5 @@ public class XmlContentRequestMatchersIntegrationTests {
return this.composers; return this.composers;
} }
} }
} }

14
spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatchersIntegrationTests.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -53,15 +53,16 @@ public class XpathRequestMatchersIntegrationTests {
private static final Map<String, String> NS = private static final Map<String, String> NS =
Collections.singletonMap("ns", "http://example.org/music/people"); Collections.singletonMap("ns", "http://example.org/music/people");
private MockRestServiceServer mockServer; private MockRestServiceServer mockServer;
private RestTemplate restTemplate; private RestTemplate restTemplate;
private PeopleWrapper people; private PeopleWrapper people;
@Before @Before
public void setup() { public void setup() {
List<Person> composers = Arrays.asList( List<Person> composers = Arrays.asList(
new Person("Johann Sebastian Bach").setSomeDouble(21), new Person("Johann Sebastian Bach").setSomeDouble(21),
new Person("Johannes Brahms").setSomeDouble(.0025), new Person("Johannes Brahms").setSomeDouble(.0025),
@ -74,7 +75,7 @@ public class XpathRequestMatchersIntegrationTests {
this.people = new PeopleWrapper(composers, performers); this.people = new PeopleWrapper(composers, performers);
List<HttpMessageConverter<?>> converters = new ArrayList<HttpMessageConverter<?>>(); List<HttpMessageConverter<?>> converters = new ArrayList<>();
converters.add(new Jaxb2RootElementHttpMessageConverter()); converters.add(new Jaxb2RootElementHttpMessageConverter());
this.restTemplate = new RestTemplate(); this.restTemplate = new RestTemplate();
@ -83,9 +84,9 @@ public class XpathRequestMatchersIntegrationTests {
this.mockServer = MockRestServiceServer.createServer(this.restTemplate); this.mockServer = MockRestServiceServer.createServer(this.restTemplate);
} }
@Test @Test
public void testExists() throws Exception { public void testExists() throws Exception {
String composer = "/ns:people/composers/composer[%s]"; String composer = "/ns:people/composers/composer[%s]";
String performer = "/ns:people/performers/performer[%s]"; String performer = "/ns:people/performers/performer[%s]";
@ -105,7 +106,6 @@ public class XpathRequestMatchersIntegrationTests {
@Test @Test
public void testDoesNotExist() throws Exception { public void testDoesNotExist() throws Exception {
String composer = "/ns:people/composers/composer[%s]"; String composer = "/ns:people/composers/composer[%s]";
String performer = "/ns:people/performers/performer[%s]"; String performer = "/ns:people/performers/performer[%s]";
@ -123,7 +123,6 @@ public class XpathRequestMatchersIntegrationTests {
@Test @Test
public void testString() throws Exception { public void testString() throws Exception {
String composerName = "/ns:people/composers/composer[%s]/name"; String composerName = "/ns:people/composers/composer[%s]/name";
String performerName = "/ns:people/performers/performer[%s]/name"; String performerName = "/ns:people/performers/performer[%s]/name";
@ -146,7 +145,6 @@ public class XpathRequestMatchersIntegrationTests {
@Test @Test
public void testNumber() throws Exception { public void testNumber() throws Exception {
String composerDouble = "/ns:people/composers/composer[%s]/someDouble"; String composerDouble = "/ns:people/composers/composer[%s]/someDouble";
this.mockServer.expect(requestTo("/composers")) this.mockServer.expect(requestTo("/composers"))
@ -180,7 +178,6 @@ public class XpathRequestMatchersIntegrationTests {
@Test @Test
public void testNodeCount() throws Exception { public void testNodeCount() throws Exception {
this.mockServer.expect(requestTo("/composers")) this.mockServer.expect(requestTo("/composers"))
.andExpect(content().contentType("application/xml")) .andExpect(content().contentType("application/xml"))
.andExpect(xpath("/ns:people/composers/composer", NS).nodeCount(4)) .andExpect(xpath("/ns:people/composers/composer", NS).nodeCount(4))
@ -223,4 +220,5 @@ public class XpathRequestMatchersIntegrationTests {
return this.performers; return this.performers;
} }
} }
} }

Write Preview
Loading…
Cancel
Save