diff --git a/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTests-config.xml b/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTests-config.xml deleted file mode 100644 index 8458ba2ec9682a3e9fa9cc3db33b365a258cf53d..0000000000000000000000000000000000000000 --- a/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTests-config.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - DispatcherServlet application context for PetClinic's web tier. ---> -<beans xmlns="http://www.springframework.org/schema/beans" - 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.xsd"> - - <import resource="classpath:spring/business-config.xml"/> - <import resource="classpath:spring/mvc-core-config.xml"/> - -</beans> diff --git a/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTests.java b/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTests.java deleted file mode 100644 index b2e953c255f6dd0387def43225e2c6d08f6c657f..0000000000000000000000000000000000000000 --- a/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTests.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright 2002-2013 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.samples.petclinic.web; - -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.xpath; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import org.springframework.test.context.ActiveProfiles; -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.ResultActions; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; - - -/** - * @author Arjen Poutsma - * @author Michael Isvy - */ -@RunWith(SpringJUnit4ClassRunner.class) -@WebAppConfiguration -@ContextConfiguration("VisitsViewTests-config.xml") -@ActiveProfiles("jdbc") -public class VisitsViewTests { - - @Autowired - private WebApplicationContext webApplicationContext; - - private MockMvc mockMvc; - - @Before - public void setup() { - this.mockMvc = MockMvcBuilders.webAppContextSetup(this.webApplicationContext).build(); - } - - @Test - public void shouldFindVisitsInXmlFormat() throws Exception { - ResultActions actions = this.mockMvc.perform(get("/vets.xml").accept(MediaType.TEXT_XML)); - actions.andDo(print()); // action is logged into the console - - // 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"))); - - } -}