Reinstate code in Data REST sample that went AWOL in 1ce617f1

spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/rest/SampleDataRestApplicationTests.java

@@ -0,0 +1,88 @@
+/*
+ * Copyright 2012-2015 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 sample.data.rest;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.test.context.ActiveProfiles;
+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.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+import sample.data.rest.SampleDataRestApplication;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+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.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+/**
+ * Integration test to run the application.
+ *
+ * @author Oliver Gierke
+ * @author Andy Wilkinson
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = SampleDataRestApplication.class)
+@WebAppConfiguration
+@ActiveProfiles("scratch")
+// Separate profile for web tests to avoid clashing databases
+public class SampleDataRestApplicationTests {
+
+	@Autowired
+	private WebApplicationContext context;
+
+	private MockMvc mvc;
+
+	@Before
+	public void setUp() {
+		this.mvc = MockMvcBuilders.webAppContextSetup(this.context).build();
+	}
+
+	@Test
+	public void testHome() throws Exception {
+
+		this.mvc.perform(get("/api")).andExpect(status().isOk())
+				.andExpect(content().string(containsString("hotels")));
+	}
+
+	@Test
+	public void findByNameAndCountry() throws Exception {
+
+		this.mvc.perform(
+				get("/api/cities/search/findByNameAndCountryAllIgnoringCase?name=Melbourne&country=Australia"))
+				.andExpect(status().isOk())
+				.andExpect(jsonPath("state", equalTo("Victoria")))
+				.andExpect(jsonPath("name", equalTo("Melbourne")));
+	}
+
+	@Test
+	public void findByContaining() throws Exception {
+
+		this.mvc.perform(
+				get("/api/cities/search/findByNameContainingAndCountryContainingAllIgnoringCase?name=&country=UK"))
+				.andExpect(status().isOk())
+				.andExpect(jsonPath("_embedded.citys", hasSize(3)));
+	}
+}

spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/rest/service/CityRepositoryIntegrationTests.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2012-2015 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 sample.data.rest.service;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import sample.data.rest.SampleDataRestApplication;
+import sample.data.rest.domain.City;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
+/**
+ * Integration tests for {@link CityRepository}.
+ *
+ * @author Oliver Gierke
+ * @author Andy Wilkinson
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = SampleDataRestApplication.class)
+public class CityRepositoryIntegrationTests {
+
+	@Autowired
+	CityRepository repository;
+
+	@Test
+	public void findsFirstPageOfCities() {
+
+		Page<City> cities = this.repository.findAll(new PageRequest(0, 10));
+		assertThat(cities.getTotalElements(), is(greaterThan(20L)));
+	}
+
+	@Test
+	public void findByNameAndCountry() {
+		City city = this.repository.findByNameAndCountryAllIgnoringCase("Melbourne",
+				"Australia");
+		assertThat(city, notNullValue());
+		assertThat(city.getName(), is(equalTo("Melbourne")));
+	}
+
+	@Test
+	public void findContaining() {
+		Page<City> cities = this.repository
+				.findByNameContainingAndCountryContainingAllIgnoringCase("", "UK",
+						new PageRequest(0, 10));
+		assertThat(cities.getTotalElements(), is(equalTo(3L)));
+	}
+}