/country/{id}: show 404 page when country not found.

Author: php-coder

src/main/java/ru/mystamps/web/controller/InfoCountryController.java

@@ -18,16 +18,20 @@
 
 package ru.mystamps.web.controller;
 
+import java.io.IOException;
+
 import javax.inject.Inject;
+import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import ru.mystamps.web.Url;
+import ru.mystamps.web.entity.Country;
 import ru.mystamps.web.service.CountryService;
+import ru.mystamps.web.Url;
 
 @Controller
 @RequestMapping(Url.INFO_COUNTRY_PAGE)
@@ -41,8 +45,18 @@ public class InfoCountryController {
 	}
 
 	@RequestMapping(method = RequestMethod.GET)
-	public String showInfo(@PathVariable("id") final Integer id, final Model model) {
-		model.addAttribute("country", countryService.findById(id));
+	public String showInfo(
+		@PathVariable("id") final Integer id,
+		final Model model,
+		final HttpServletResponse response) throws IOException {
+		
+		final Country country = countryService.findById(id);
+		if (country == null) {
+			response.sendError(HttpServletResponse.SC_NOT_FOUND);
+			return null;
+		}
+		
+		model.addAttribute("country", country);
 		return "country/info";
 	}
 

src/test/config/testng.xml

@@ -38,6 +38,12 @@
 		</classes>
 	</test>
 
+	<test name="When user open not existing country page">
+		<classes>
+			<class name="ru.mystamps.web.tests.cases.WhenUserOpenNotExistingCountryPage" />
+		</classes>
+	</test>
+	
 	<test name="When user add series">
 		<classes>
 			<class name="ru.mystamps.web.tests.cases.WhenUserAddSeries" />

src/test/java/ru/mystamps/web/tests/cases/WhenUserOpenNotExistingCountryPage.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2012 Slava Semushin <slava.semushin@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package ru.mystamps.web.tests.cases;
+
+import java.net.HttpURLConnection;
+
+import static org.fest.assertions.api.Assertions.assertThat;
+
+import org.testng.annotations.Test;
+
+import ru.mystamps.web.tests.page.NotFoundErrorPage;
+import ru.mystamps.web.Url;
+
+import static ru.mystamps.web.tests.TranslationUtils.tr;
+
+public class WhenUserOpenNotExistingCountryPage extends WhenUserAtAnyPage<NotFoundErrorPage> {
+	
+	public WhenUserOpenNotExistingCountryPage() {
+		super(NotFoundErrorPage.class);
+		hasTitleWithoutStandardPrefix(tr("t_404_title"));
+		hasResponseServerCode(HttpURLConnection.HTTP_NOT_FOUND);
+	}
+	
+	@Test(groups = "logic")
+	public void shouldShow404Page() {
+		final String absentCountryId = "999";
+		page.open(Url.INFO_COUNTRY_PAGE.replace("{id}", absentCountryId));
+		
+		checkStandardStructure();
+		
+		assertThat(page.getErrorMessage()).isEqualTo(tr("t_404_description", "\n"));
+		assertThat(page.getErrorCode()).isEqualTo("404");
+	}
+	
+}