Patrick.Sy/spring-petclinic
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-17 13:25:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from spring-projects/master

Browse source 
Rebasing
This commit is contained in:
Singularity.SG 2014-12-05 22:49:48 +08:00
commit f833af5194
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pom.xml
View file

@ -17,7 +17,7 @@
<!-- Spring -->
<spring-framework.version>4.1.1.RELEASE</spring-framework.version>
<spring-data-jpa.version>1.7.0.RELEASE</spring-data-jpa.version>
<spring-data-jpa.version>1.7.1.RELEASE</spring-data-jpa.version>
<!-- Java EE / Java SE dependencies -->
@ -38,7 +38,7 @@
<hsqldb.version>2.3.2</hsqldb.version>
<!-- AOP -->
<aspectj.version>1.8.2</aspectj.version>
<aspectj.version>1.8.4</aspectj.version>
<!-- Logging -->
<logback.version>1.1.2</logback.version>

10
src/test/java/org/springframework/samples/petclinic/web/VisitsViewTests.java
View file

@ -60,11 +60,13 @@ public class VisitsViewTests {
@Test
public void getVisitsXml() throws Exception {
ResultActions actions = this.mockMvc.perform(get("/vets.xml").accept(MediaType.APPLICATION_XML));
ResultActions actions = this.mockMvc.perform(get("/vets.xml").accept(MediaType.TEXT_XML));
actions.andDo(print()); // action is logged into the console
actions.andExpect(status().isOk());
actions.andExpect(content().contentType("application/xml"));
actions.andExpect(xpath("/vets/vetList[id=1]/firstName").string(containsString("James")));
// TODO: there seems to be a conflict between this code and the new namespace <mvc:content-negotiation />
// actions.andExpect(status().isOk());
//actions.andExpect(content().contentType("application/xml"));
// actions.andExpect(xpath("/vets/vetList[id=1]/firstName").string(containsString("James")));
}
}