From 4f8063e9b8bcd1a2831453bed6c5ff17c75e4046 Mon Sep 17 00:00:00 2001
From: Mic <misvy@vmware.com>
Date: Sat, 8 Jun 2013 21:15:34 +0800
Subject: [PATCH] #18 fixing 2 errors related to ValidatorTests

- test didn't have the suffix "Tests" so it was not taken into account
when running Maven in the comand line
- the POM was not configured so it can find Spring config files placed
inside src/test/java
---
 pom.xml                                       | 68 +++----------------
 ...t-config.xml => ValidatorTests-config.xml} |  0
 ...ValidatorTest.java => ValidatorTests.java} |  4 +-
 3 files changed, 13 insertions(+), 59 deletions(-)
 rename src/test/java/org/springframework/samples/petclinic/model/{ValidatorTest-config.xml => ValidatorTests-config.xml} (100%)
 rename src/test/java/org/springframework/samples/petclinic/model/{ValidatorTest.java => ValidatorTests.java} (93%)

diff --git a/pom.xml b/pom.xml
index ddeaeacd7..1cf8cca0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -318,9 +318,19 @@
 
 	</dependencies>
 
-	<!-- all Maven plugin versions are mentioned in order to guarantee the build reproducibility in the long term -->
+	<!-- Maven plugin versions are mentioned in order to guarantee the build reproducibility in the long term -->
 	<build>
 		<defaultGoal>install</defaultGoal>
+		<testResources>
+		  <testResource>
+		  	<!-- declared explicitly so Spring config files can be placed next to their corresponding JUnit test class 
+		  		(see example with ValidatorTests) -->
+		    <directory>${project.basedir}/src/test/java</directory>
+		  </testResource>
+		  <testResource>
+		    <directory>${project.basedir}/src/test/resources</directory>
+		  </testResource>
+		</testResources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -380,20 +390,6 @@
 					</additionalProjectnatures>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.6</version>
-				<executions>
-					<execution>
-						<id>install</id>
-						<phase>install</phase>
-						<goals>
-							<goal>sources</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -415,48 +411,6 @@
 				</configuration>
 			</plugin>
 		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.apache.maven.plugins</groupId>
-										<artifactId>maven-enforcer-plugin</artifactId>
-										<versionRange>[1.0.0,)</versionRange>
-										<goals>
-											<goal>enforce</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<execute />
-									</action>
-								</pluginExecution>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.apache.maven.plugins</groupId>
-										<artifactId>maven-dependency-plugin</artifactId>
-										<versionRange>[2.4,)</versionRange>
-										<goals>
-											<goal>unpack</goal>
-											<goal>sources</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<execute />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 	</build>
 
 </project>
diff --git a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTest-config.xml b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests-config.xml
similarity index 100%
rename from src/test/java/org/springframework/samples/petclinic/model/ValidatorTest-config.xml
rename to src/test/java/org/springframework/samples/petclinic/model/ValidatorTests-config.xml
diff --git a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTest.java b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
similarity index 93%
rename from src/test/java/org/springframework/samples/petclinic/model/ValidatorTest.java
rename to src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
index c3877282e..e15a84907 100644
--- a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTest.java
+++ b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
@@ -20,9 +20,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * (useful when upgrading to a new version of Hibernate Validator/ Bean Validation)
  *
  */
-@ContextConfiguration(locations = {"ValidatorTest-config.xml"})
+@ContextConfiguration(locations = {"ValidatorTests-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
-public class ValidatorTest {
+public class ValidatorTests {
 	
 	@Autowired
     private Validator validator;