Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ahhh, I just can't go back to EasyMock after having used Mockito 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1074493 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2011-02-25 12:13:16 +00:00
parent 56211032bf
commit 51ef77e7f2
3 changed files with 19 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
httpclient/pom.xml
View File

@ -66,15 +66,9 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.easymock</groupId> <groupId>org.mockito</groupId>
<artifactId>easymock</artifactId> <artifactId>mockito-core</artifactId>
<version>${easymock.version}</version> <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
<version>${easymock.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

47
httpclient/src/test/java/org/apache/http/impl/auth/TestNegotiateScheme.java
View File

@ -58,8 +58,8 @@ import org.ietf.jgss.Oid;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.mockito.Matchers;
import org.easymock.classextension.EasyMock; import org.mockito.Mockito;
/** /**
* Tests for {@link NegotiateScheme}. * Tests for {@link NegotiateScheme}.
@ -97,30 +97,22 @@ public class TestNegotiateScheme extends BasicServerTestBase {
*/ */
private static class NegotiateSchemeWithMockGssManager extends NegotiateScheme { private static class NegotiateSchemeWithMockGssManager extends NegotiateScheme {
GSSManager manager = EasyMock.createNiceMock(GSSManager.class); GSSManager manager = Mockito.mock(GSSManager.class);
GSSName name = EasyMock.createNiceMock(GSSName.class); GSSName name = Mockito.mock(GSSName.class);
GSSContext context = EasyMock.createNiceMock(GSSContext.class); GSSContext context = Mockito.mock(GSSContext.class);
NegotiateSchemeWithMockGssManager() throws Exception { NegotiateSchemeWithMockGssManager() throws Exception {
super(null, true); super(null, true);
Mockito.when(context.initSecContext(
EasyMock.expect(context.initSecContext(EasyMock.<byte[]>anyObject(), Matchers.any(byte[].class), Matchers.anyInt(), Matchers.anyInt()))
EasyMock.anyInt(), EasyMock.anyInt())).andReturn("12345678".getBytes()); .thenReturn("12345678".getBytes());
Mockito.when(manager.createName(
EasyMock.expect(manager.createName(EasyMock.isA(String.class), Matchers.any(String.class), Matchers.any(Oid.class)))
EasyMock.<Oid>anyObject())).andReturn(name); .thenReturn(name);
Mockito.when(manager.createContext(
EasyMock.expect(manager.createContext( Matchers.any(GSSName.class), Matchers.any(Oid.class),
EasyMock.isA(GSSName.class),EasyMock.isA(Oid.class), Matchers.any(GSSCredential.class), Matchers.anyInt()))
EasyMock.<GSSCredential>anyObject(), EasyMock.anyInt())) .thenReturn(context);
.andReturn(context);
EasyMock.expect(name.canonicalize(EasyMock.isA(Oid.class)))
.andReturn(name);
EasyMock.replay(context);
EasyMock.replay(name);
EasyMock.replay(manager);
} }
@Override @Override
@ -128,12 +120,6 @@ public class TestNegotiateScheme extends BasicServerTestBase {
return manager; return manager;
} }
public void verify() {
EasyMock.verify(context);
EasyMock.verify(name);
EasyMock.verify(manager);
}
} }
private static class UseJaasCredentials implements Credentials { private static class UseJaasCredentials implements Credentials {
@ -189,8 +175,6 @@ public class TestNegotiateScheme extends BasicServerTestBase {
HttpResponse response = client.execute(httpget); HttpResponse response = client.execute(httpget);
EntityUtils.consume(response.getEntity()); EntityUtils.consume(response.getEntity());
((NegotiateSchemeFactoryWithMockGssManager)nsf).scheme.verify();
Assert.assertEquals(HttpStatus.SC_UNAUTHORIZED, response.getStatusLine().getStatusCode()); Assert.assertEquals(HttpStatus.SC_UNAUTHORIZED, response.getStatusLine().getStatusCode());
} }
@ -220,7 +204,6 @@ public class TestNegotiateScheme extends BasicServerTestBase {
HttpResponse response = client.execute(httpget); HttpResponse response = client.execute(httpget);
EntityUtils.consume(response.getEntity()); EntityUtils.consume(response.getEntity());
nsf.scheme.verify();
Assert.assertEquals(HttpStatus.SC_UNAUTHORIZED, response.getStatusLine().getStatusCode()); Assert.assertEquals(HttpStatus.SC_UNAUTHORIZED, response.getStatusLine().getStatusCode());
} }

1
pom.xml
View File

@ -75,6 +75,7 @@
<slf4j.version>1.5.11</slf4j.version> <slf4j.version>1.5.11</slf4j.version>
<junit.version>4.8.2</junit.version> <junit.version>4.8.2</junit.version>
<easymock.version>2.5.2</easymock.version> <easymock.version>2.5.2</easymock.version>
<mockito.version>1.8.5</mockito.version>
<comparisonVersion>4.0</comparisonVersion> <comparisonVersion>4.0</comparisonVersion>
</properties> </properties>