Skip to content
This repository was archived by the owner on Aug 8, 2023. It is now read-only.

Commit 4dfbc0f

Browse files
committed
Updating HttpClient version
1 parent 39e7dff commit 4dfbc0f

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

Diff for: .gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ target
22
.settings
33
.classpath
44
.project
5+
*.iml
6+
.idea

Diff for: core/src/main/java/net/javacrumbs/mocksocket/socket/AbstractMockSocketImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
public abstract class AbstractMockSocketImpl extends SocketImpl {
2626

2727
/**
28-
* Onvoked on a connect method call.
28+
* Invoked on a connect method call.
2929
* @param address host:port
3030
*/
3131
protected abstract void onConnect(String address);

Diff for: core/src/test/java/net/javacrumbs/mocksocket/SampleTest.java

+4
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,16 @@ public void testConditionalData() throws Exception
9494
@Test
9595
public void testRequest() throws Exception
9696
{
97+
//prepare mock
9798
byte[] dataToWrite = new byte[]{5,4,3,2};
9899
expectCall().andReturn(emptyResponse());
99100

101+
//do test
100102
Socket socket = SocketFactory.getDefault().createSocket("example.org", 1234);
101103
IOUtils.write(dataToWrite, socket.getOutputStream());
102104
socket.close();
105+
106+
//verify data sent
103107
assertThat(recordedConnections().get(0), data(is(dataToWrite)));
104108
assertThat(recordedConnections().get(0), address(is("example.org:1234")));
105109
}

Diff for: http/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>org.apache.httpcomponents</groupId>
3333
<artifactId>httpclient</artifactId>
34-
<version>4.1.1</version>
34+
<version>4.3.6</version>
3535
<scope>test</scope>
3636
</dependency>
3737
</dependencies>

Diff for: pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>org.sonatype.oss</groupId>
1212
<artifactId>oss-parent</artifactId>
13-
<version>7</version>
13+
<version>9</version>
1414
</parent>
1515

1616
<modules>
@@ -43,8 +43,8 @@
4343
<artifactId>maven-compiler-plugin</artifactId>
4444
<version>2.3.2</version>
4545
<configuration>
46-
<source>1.5</source>
47-
<target>1.5</target>
46+
<source>1.7</source>
47+
<target>1.7</target>
4848
</configuration>
4949
</plugin>
5050
<plugin>

0 commit comments

Comments
 (0)