+
diff --git a/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp b/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp
index fc68b56d9..54bb10356 100644
--- a/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp
@@ -40,6 +40,9 @@
|
">View as XML
|
+
+ ">Subscribe to Atom feed
+ |
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 2817b8996..79b9bf6ba 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -38,7 +38,7 @@ id="WebApp_ID" version="2.5">
org.springframework.web.servlet.DispatcherServlet
contextConfigLocation
- /WEB-INF/mvc-core-config.xml
+ classpath:spring/mvc-core-config.xml
1
diff --git a/src/test/java/org/springframework/samples/petclinic/web/VisitsAtomViewTest.java b/src/test/java/org/springframework/samples/petclinic/web/VisitsAtomViewTest.java
index c785c5dbf..90b52e0b3 100644
--- a/src/test/java/org/springframework/samples/petclinic/web/VisitsAtomViewTest.java
+++ b/src/test/java/org/springframework/samples/petclinic/web/VisitsAtomViewTest.java
@@ -27,24 +27,9 @@ import java.util.Map;
import org.joda.time.DateTime;
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.samples.petclinic.model.Pet;
import org.springframework.samples.petclinic.model.PetType;
import org.springframework.samples.petclinic.model.Visit;
-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 static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
-import org.springframework.web.context.WebApplicationContext;
-import static org.hamcrest.Matchers.containsString;
import com.sun.syndication.feed.atom.Entry;
import com.sun.syndication.feed.atom.Feed;
@@ -53,44 +38,17 @@ import com.sun.syndication.feed.atom.Feed;
* @author Arjen Poutsma
* @author Michael Isvy
*/
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-// Spring configuration files that are inside WEB-INF folder can be referenced here because they've been
-// added to the classpath inside the Maven pom.xml file (inside ... )
-@ContextConfiguration({"classpath*:mvc-*-config.xml", "classpath*:spring/*-config.xml"})
-@ActiveProfiles("jdbc")
public class VisitsAtomViewTest {
- @Autowired
- private WebApplicationContext webApplicationContext;
-
- private MockMvc mockMvc;
-
- @Before
- public void setup() {
- this.mockMvc = MockMvcBuilders.webAppContextSetup(this.webApplicationContext).build();
- }
-
- private VisitsAtomView visitView;
+ private VetsAtomView visitView;
private Map model;
private Feed feed;
- //@Test
- public void getVisits() throws Exception {
- MediaType mediaType = MediaType.APPLICATION_ATOM_XML;
- ResultActions actions = this.mockMvc.perform(get("/owners/7/pets/9/visits.atom").accept(mediaType));
- actions.andExpect(status().isOk());
- actions.andExpect(content().contentType("application/atom+xml"));
- //actions.andExpect(content().xml("Pet ClinicService Visits"));
- actions.andExpect(xpath("//*").string(containsString("Pet ClinicService Visits")));
-
- }
-
@Before
public void setUp() {
- visitView = new VisitsAtomView();
+ visitView = new VetsAtomView();
PetType dog = new PetType();
dog.setName("dog");
Pet bello = new Pet();
diff --git a/src/test/java/org/springframework/samples/petclinic/web/VisitsAtomViewTestWithContainer-config.xml b/src/test/java/org/springframework/samples/petclinic/web/VisitsAtomViewTestWithContainer-config.xml
new file mode 100644
index 000000000..e0fd0acd0
--- /dev/null
+++ b/src/test/java/org/springframework/samples/petclinic/web/VisitsAtomViewTestWithContainer-config.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
diff --git a/src/test/java/org/springframework/samples/petclinic/web/VisitsAtomViewWithContainerTest.java b/src/test/java/org/springframework/samples/petclinic/web/VisitsAtomViewWithContainerTest.java
new file mode 100644
index 000000000..1cfcdcf88
--- /dev/null
+++ b/src/test/java/org/springframework/samples/petclinic/web/VisitsAtomViewWithContainerTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2002-2009 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.hamcrest.Matchers.containsString;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+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
+// Spring configuration files that are inside WEB-INF folder can be referenced here because they've been
+// added to the classpath inside the Maven pom.xml file (inside ... )
+@ContextConfiguration("VisitsAtomViewTestWithContainer-config.xml")
+@ActiveProfiles("jdbc")
+public class VisitsAtomViewWithContainerTest {
+
+ @Autowired
+ private WebApplicationContext webApplicationContext;
+
+ private MockMvc mockMvc;
+
+ @Before
+ public void setup() {
+ this.mockMvc = MockMvcBuilders.webAppContextSetup(this.webApplicationContext).build();
+ }
+
+ @Test
+ public void getVisits() throws Exception {
+ MediaType mediaType = MediaType.APPLICATION_ATOM_XML;
+ ResultActions actions = this.mockMvc.perform(get("/vets.atom"));
+ actions.andExpect(status().isOk());
+ actions.andExpect(xpath("//*").string(containsString("Pet ClinicService Visits")));
+ actions.andExpect(content().contentType("application/atom+xml"));
+
+ }
+}