Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Upgraded Spring version to 3.0.0

  • Loading branch information...
commit 69507a4c9c40aebb007dda1ac62283f56ffc9ad0 1 parent dc0fd63
Andrey Paramonov authored
View
18 pom.xml
@@ -6,7 +6,7 @@
<version>1.0-SNAPSHOT</version>
<properties>
- <spring.version>2.5.6</spring.version>
+ <spring.version>3.0.0.BUILD-20090716035705</spring.version>
</properties>
<build>
@@ -26,10 +26,15 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
+ <version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.7</version>
@@ -37,12 +42,17 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>org.springframework.beans</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.context</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
+ <artifactId>org.springframework.test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
View
3  src/test/java/com/ndpar/springtest/MockDatabaseTest.java
@@ -12,6 +12,7 @@
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations={"classpath:appclicationContext.xml"})
+@DirtiesContext
public class MockDatabaseTest {
private Database mockDatabase;
@@ -24,7 +25,7 @@ public void setUp() {
application.setDatabase(mockDatabase);
}
- @Test @DirtiesContext
+ @Test
public void test() {
application.businessMethod("input");
verify(mockDatabase, times(1)).persist("Processed input");
View
3  src/test/java/com/ndpar/springtest/MockWebServiceTest.java
@@ -12,6 +12,7 @@
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations={"classpath:appclicationContext.xml"})
+@DirtiesContext
public class MockWebServiceTest {
private WebService mockWebService;
@@ -24,7 +25,7 @@ public void setUp() {
application.setWebService(mockWebService);
}
- @Test @DirtiesContext
+ @Test
public void test() {
application.businessMethod("input");
verify(mockWebService, times(1)).call("input");
Please sign in to comment.
Something went wrong with that request. Please try again.