X Tutup
Skip to content

Commit 05765d7

Browse files
philwebbphilwebb
committed
Replace EasyMock with Mockito
Issue: SPR-10126
1 parent a399b13 commit 05765d7

File tree

180 files changed

+2349
-4292
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+2349
-4292
lines changed

‎build.gradle‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ configure(allprojects) { project ->
1313
version = qualifyVersionIfNecessary(version)
1414

1515
ext.aspectjVersion = "1.7.2"
16-
ext.easymockVersion = "2.5.2"
1716
ext.hsqldbVersion = "1.8.0.10"
1817
ext.junitVersion = "4.11"
1918
ext.slf4jVersion = "1.6.1"
@@ -69,13 +68,6 @@ configure(allprojects) { project ->
6968
testCompile("junit:junit:${junitVersion}")
7069
testCompile("org.hamcrest:hamcrest-all:1.3")
7170
testCompile("org.mockito:mockito-core:1.9.5")
72-
if (project.name in ["spring",
73-
"spring-orm-hibernate4", "spring-oxm", "spring-struts",
74-
"spring-test", "spring-test-mvc", "spring-tx", "spring-web",
75-
"spring-webmvc", "spring-webmvc-portlet", "spring-webmvc-tiles3"]) {
76-
testCompile("org.easymock:easymock:${easymockVersion}")
77-
testCompile "org.easymock:easymockclassextension:${easymockVersion}"
78-
}
7971
}
8072

8173
ext.javadocLinks = [

‎spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616

1717
package org.springframework.aop.framework.adapter;
1818

19-
import static org.junit.Assert.assertEquals;
20-
import static org.junit.Assert.fail;
21-
import static org.mockito.BDDMockito.given;
22-
import static org.mockito.Mockito.mock;
23-
2419
import java.io.FileNotFoundException;
2520
import java.io.IOException;
2621
import java.lang.reflect.Method;
@@ -33,6 +28,9 @@
3328
import org.springframework.aop.ThrowsAdvice;
3429
import org.springframework.tests.aop.advice.MethodCounter;
3530

31+
import static org.junit.Assert.*;
32+
import static org.mockito.BDDMockito.*;
33+
3634

3735
/**
3836
* @author Rod Johnson

‎spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,13 @@
1616

1717
package org.springframework.aop.interceptor;
1818

19-
import static org.junit.Assert.*;
20-
import static org.mockito.BDDMockito.given;
21-
import static org.mockito.Matchers.anyString;
22-
import static org.mockito.Matchers.eq;
23-
import static org.mockito.Mockito.mock;
24-
import static org.mockito.Mockito.times;
25-
import static org.mockito.Mockito.verify;
26-
2719
import org.aopalliance.intercept.MethodInvocation;
2820
import org.apache.commons.logging.Log;
2921
import org.junit.Test;
3022

23+
import static org.junit.Assert.*;
24+
import static org.mockito.BDDMockito.*;
25+
3126
/**
3227
* @author Rob Harrop
3328
* @author Rick Evans

‎spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2013 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,18 +16,13 @@
1616

1717
package org.springframework.aop.interceptor;
1818

19-
import static org.junit.Assert.*;
20-
import static org.mockito.BDDMockito.given;
21-
import static org.mockito.Matchers.anyString;
22-
import static org.mockito.Matchers.eq;
23-
import static org.mockito.Mockito.mock;
24-
import static org.mockito.Mockito.times;
25-
import static org.mockito.Mockito.verify;
26-
2719
import org.aopalliance.intercept.MethodInvocation;
2820
import org.apache.commons.logging.Log;
2921
import org.junit.Test;
3022

23+
import static org.junit.Assert.*;
24+
import static org.mockito.BDDMockito.*;
25+
3126
/**
3227
* Unit tests for the {@link DebugInterceptor} class.
3328
*

‎spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2013 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,16 +16,13 @@
1616

1717
package org.springframework.aop.interceptor;
1818

19-
import static org.junit.Assert.*;
20-
import static org.mockito.BDDMockito.given;
21-
import static org.mockito.Matchers.anyString;
22-
import static org.mockito.Mockito.mock;
23-
import static org.mockito.Mockito.verify;
24-
2519
import org.aopalliance.intercept.MethodInvocation;
2620
import org.apache.commons.logging.Log;
2721
import org.junit.Test;
2822

23+
import static org.junit.Assert.*;
24+
import static org.mockito.BDDMockito.*;
25+
2926
/**
3027
* @author Rob Harrop
3128
* @author Rick Evans

‎spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,13 @@
1616

1717
package org.springframework.aop.interceptor;
1818

19-
import static org.junit.Assert.fail;
20-
import static org.mockito.BDDMockito.given;
21-
import static org.mockito.Matchers.anyString;
22-
import static org.mockito.Matchers.eq;
23-
import static org.mockito.Mockito.mock;
24-
import static org.mockito.Mockito.times;
25-
import static org.mockito.Mockito.verify;
26-
2719
import org.aopalliance.intercept.MethodInvocation;
2820
import org.apache.commons.logging.Log;
2921
import org.junit.Test;
3022

23+
import static org.junit.Assert.*;
24+
import static org.mockito.BDDMockito.*;
25+
3126
/**
3227
* Unit tests for the {@link SimpleTraceInterceptor} class.
3328
*

‎spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2013 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,11 +16,11 @@
1616

1717
package org.springframework.aop.scope;
1818

19-
import static org.mockito.Mockito.mock;
20-
2119
import org.junit.Test;
2220
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
2321

22+
import static org.mockito.BDDMockito.*;
23+
2424
/**
2525
* Unit tests for the {@link DefaultScopedObject} class.
2626
*

‎spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@
1616

1717
package org.springframework.aop.support;
1818

19-
import static org.hamcrest.Matchers.instanceOf;
20-
import static org.junit.Assert.assertEquals;
21-
import static org.junit.Assert.assertSame;
22-
import static org.junit.Assert.assertThat;
23-
import static org.junit.Assert.assertTrue;
24-
import static org.mockito.BDDMockito.given;
25-
import static org.mockito.Mockito.mock;
26-
2719
import java.io.Serializable;
2820

2921
import org.aopalliance.intercept.MethodInterceptor;
@@ -41,6 +33,10 @@
4133
import org.springframework.tests.sample.beans.TestBean;
4234
import org.springframework.util.SerializationTestUtils;
4335

36+
import static org.hamcrest.Matchers.*;
37+
import static org.junit.Assert.*;
38+
import static org.mockito.BDDMockito.*;
39+
4440
/**
4541
* @author Rod Johnson
4642
* @author Chris Beams

‎spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,6 @@
1616

1717
package org.springframework.beans.factory;
1818

19-
import static org.hamcrest.CoreMatchers.is;
20-
import static org.hamcrest.Matchers.containsString;
21-
import static org.hamcrest.Matchers.equalTo;
22-
import static org.junit.Assert.assertEquals;
23-
import static org.junit.Assert.assertFalse;
24-
import static org.junit.Assert.assertNotNull;
25-
import static org.junit.Assert.assertNotSame;
26-
import static org.junit.Assert.assertNull;
27-
import static org.junit.Assert.assertSame;
28-
import static org.junit.Assert.assertThat;
29-
import static org.junit.Assert.assertTrue;
30-
import static org.junit.Assert.fail;
31-
import static org.mockito.BDDMockito.given;
32-
import static org.mockito.Matchers.isNull;
33-
import static org.mockito.Mockito.mock;
34-
import static org.mockito.Mockito.never;
35-
import static org.mockito.Mockito.verify;
36-
3719
import java.io.Closeable;
3820
import java.lang.reflect.Field;
3921
import java.net.MalformedURLException;
@@ -104,6 +86,10 @@
10486
import org.springframework.util.StopWatch;
10587
import org.springframework.util.StringValueResolver;
10688

89+
import static org.hamcrest.Matchers.*;
90+
import static org.junit.Assert.*;
91+
import static org.mockito.BDDMockito.*;
92+
10793
/**
10894
* Tests properties population and autowire behavior.
10995
*
@@ -2261,8 +2247,8 @@ public void testContainsBeanReturnsTrueEvenForAbstractBeanDefinition() {
22612247
DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
22622248
bf.registerBeanDefinition("abs", BeanDefinitionBuilder
22632249
.rootBeanDefinition(TestBean.class).setAbstract(true).getBeanDefinition());
2264-
assertThat(bf.containsBean("abs"), is(true));
2265-
assertThat(bf.containsBean("bogus"), is(false));
2250+
assertThat(bf.containsBean("abs"), equalTo(true));
2251+
assertThat(bf.containsBean("bogus"), equalTo(false));
22662252
}
22672253

22682254
@Test

‎spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616

1717
package org.springframework.beans.factory.config;
1818

19-
import static org.junit.Assert.assertTrue;
20-
import static org.mockito.Mockito.mock;
21-
2219
import java.util.HashMap;
2320
import java.util.Map;
2421

2522
import org.junit.Before;
2623
import org.junit.Test;
2724
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
2825

26+
import static org.junit.Assert.*;
27+
import static org.mockito.BDDMockito.*;
28+
2929
/**
3030
* Unit tests for {@link CustomScopeConfigurer}.
3131
*

0 commit comments

Comments
 (0)
X Tutup