From 36eb8823fefa8daf0949c8f5d804f4e59825be6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Sun, 13 Dec 2009 21:52:49 +0100 Subject: [PATCH] ItEr38S17ArquitecturaServidorItEr37S07: OrderModelTest needed to load spring security config file. I couldn't guess the reason. From eclipse the tests pass, but not from maven. --- .../src/main/java/org/navalplanner/web/WebappGlobalNames.java | 3 +++ .../test/java/org/navalplanner/web/orders/OrderModelTest.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/WebappGlobalNames.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/WebappGlobalNames.java index 0491d44da..96f5b1b0b 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/WebappGlobalNames.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/WebappGlobalNames.java @@ -20,6 +20,7 @@ package org.navalplanner.web; + /** * A class containing constants for global names. * @@ -32,4 +33,6 @@ public class WebappGlobalNames { public final static String WEBAPP_SPRING_CONFIG_FILE = "classpath:/navalplanner-webapp-spring-config.xml"; + public final static String WEBAPP_SPRING_SECURITY_CONFIG_FILE = "classpath:/navalplanner-webapp-spring-security-config.xml"; + } diff --git a/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderModelTest.java b/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderModelTest.java index 2307e8236..6eded79a9 100644 --- a/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderModelTest.java +++ b/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderModelTest.java @@ -27,6 +27,7 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.navalplanner.business.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_FILE; import static org.navalplanner.web.WebappGlobalNames.WEBAPP_SPRING_CONFIG_FILE; +import static org.navalplanner.web.WebappGlobalNames.WEBAPP_SPRING_SECURITY_CONFIG_FILE; import static org.navalplanner.web.test.WebappGlobalNames.WEBAPP_SPRING_CONFIG_TEST_FILE; import java.util.Calendar; @@ -74,7 +75,8 @@ import org.springframework.transaction.annotation.Transactional; */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = { BUSINESS_SPRING_CONFIG_FILE, - WEBAPP_SPRING_CONFIG_FILE, WEBAPP_SPRING_CONFIG_TEST_FILE }) + WEBAPP_SPRING_CONFIG_FILE, WEBAPP_SPRING_CONFIG_TEST_FILE, + WEBAPP_SPRING_SECURITY_CONFIG_FILE }) @Transactional public class OrderModelTest {