am 10a6f377: am b23c9498: Merge "Fix missing socket closure in LocalSocketTest"
* commit '10a6f37757a36a2a05bd1b60af8b67d21d094a78': Fix missing socket closure in LocalSocketTest
This commit is contained in:
@@ -116,7 +116,7 @@ public class LocalSocketTest extends AndroidTestCase{
|
|||||||
|
|
||||||
public void testAccessors() throws IOException{
|
public void testAccessors() throws IOException{
|
||||||
LocalSocket socket = new LocalSocket();
|
LocalSocket socket = new LocalSocket();
|
||||||
LocalSocketAddress addr = new LocalSocketAddress("secondary");
|
LocalSocketAddress addr = new LocalSocketAddress(mSockAddr);
|
||||||
|
|
||||||
assertFalse(socket.isBound());
|
assertFalse(socket.isBound());
|
||||||
socket.bind(addr);
|
socket.bind(addr);
|
||||||
@@ -170,6 +170,8 @@ public class LocalSocketTest extends AndroidTestCase{
|
|||||||
} catch (UnsupportedOperationException e) {
|
} catch (UnsupportedOperationException e) {
|
||||||
// expected
|
// expected
|
||||||
}
|
}
|
||||||
|
|
||||||
|
socket.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testAvailable() throws Exception {
|
public void testAvailable() throws Exception {
|
||||||
@@ -198,6 +200,7 @@ public class LocalSocketTest extends AndroidTestCase{
|
|||||||
|
|
||||||
clientSocket.close();
|
clientSocket.close();
|
||||||
serverSocket.close();
|
serverSocket.close();
|
||||||
|
localServerSocket.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testFlush() throws Exception {
|
public void testFlush() throws Exception {
|
||||||
@@ -220,6 +223,7 @@ public class LocalSocketTest extends AndroidTestCase{
|
|||||||
|
|
||||||
clientSocket.close();
|
clientSocket.close();
|
||||||
serverSocket.close();
|
serverSocket.close();
|
||||||
|
localServerSocket.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void testFlushWorks(OutputStream outputStream, InputStream inputStream)
|
private void testFlushWorks(OutputStream outputStream, InputStream inputStream)
|
||||||
|
|||||||
Reference in New Issue
Block a user