- Revision
- 515
- Author
- mauro
- Date
- 2007-12-19 02:42:51 -0600 (Wed, 19 Dec 2007)
Log Message
WAFFLE-51: Upgraded to surefire-2.3.1.
Modified Paths
Diff
Modified: trunk/integration/waffle-taglib/pom.xml (514 => 515)
--- trunk/integration/waffle-taglib/pom.xml 2007-12-19 06:28:59 UTC (rev 514) +++ trunk/integration/waffle-taglib/pom.xml 2007-12-19 08:42:51 UTC (rev 515) @@ -34,11 +34,6 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.openqa.selenium.client-drivers</groupId> <artifactId>selenium-java-client-driver</artifactId> <version>0.9.2</version>
Modified: trunk/pom.xml (514 => 515)
--- trunk/pom.xml 2007-12-19 06:28:59 UTC (rev 514) +++ trunk/pom.xml 2007-12-19 08:42:51 UTC (rev 515) @@ -118,21 +118,8 @@ <groupId>org.jmock</groupId> <artifactId>jmock-junit4</artifactId> <version>2.4.0</version> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit-dep</artifactId> - </exclusion> - </exclusions> <scope>test</scope> </dependency> - <dependency> - <!-- junit:junit is required by surefire until 2.3.1 or 2.4 is released and it can be configured to use junit:junit-dep --> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - <scope>test</scope> - </dependency> </dependencies> </dependencyManagement> @@ -141,10 +128,6 @@ <groupId>org.jmock</groupId> <artifactId>jmock-junit4</artifactId> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> </dependencies> <build> @@ -174,8 +157,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.3</version> + <version>2.3.1</version> <configuration> + <junitArtifactName>junit:junit-dep</junitArtifactName> <includes> <include>**/*Test.java</include> </includes>
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/action/ParanamerMethodDefinitionFinderTest.java (514 => 515)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/action/ParanamerMethodDefinitionFinderTest.java 2007-12-19 06:28:59 UTC (rev 514) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/action/ParanamerMethodDefinitionFinderTest.java 2007-12-19 08:42:51 UTC (rev 515) @@ -37,6 +37,7 @@ private ActionMonitor monitor = new SilentMonitor(); + @Test public void testDefaultMethodReturned() throws NoSuchMethodException { // Mock HttpServletRequest final HttpServletRequest request = mockery.mock(HttpServletRequest.class); @@ -114,12 +115,10 @@ // Mock MethodNameResolver final MethodNameResolver methodNameResolver = mockery.mock(MethodNameResolver.class); - mockery.checking(new Expectations() { - { - exactly(2).of(methodNameResolver).resolve(with(same(request))); - will(returnValue(null)); - } - }); + mockery.checking(new Expectations() {{ + exactly(2).of(methodNameResolver).resolve(with(same(request))); + will(returnValue(null)); + }}); // Mock StringTransmuter final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
To unsubscribe from this list please visit:
