LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Isolate Local(Server|)SocketTest CTS tests" am: 85ac7d010e am: 6962425a88

Browse Source 
am: b64304dd62

* commit 'b64304dd6255cf5efa5a2144d84a69520b251464':
  Isolate Local(Server|)SocketTest CTS tests
This commit is contained in:
Neil Fuller
2015-12-19 10:11:07 +00:00
committed by android-build-merger
parent 8555d4b892 b64304dd62
commit 1ca5875aea
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/cts/net/src/android/net/cts/LocalServerSocketTest.java
View File

@@ -15,28 +15,27 @@
*/
package android.net.cts;
import junit.framework.TestCase;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import android.net.LocalServerSocket;
import android.net.LocalSocket;
import android.net.LocalSocketAddress;
import android.test.AndroidTestCase;
public class LocalServerSocketTest extends AndroidTestCase {
public class LocalServerSocketTest extends TestCase {
public void testLocalServerSocket() throws IOException {
LocalServerSocket localServerSocket = new LocalServerSocket(LocalSocketTest.mSockAddr);
String address = "com.android.net.LocalServerSocketTest_testLocalServerSocket";
LocalServerSocket localServerSocket = new LocalServerSocket(address);
assertNotNull(localServerSocket.getLocalSocketAddress());
commonFunctions(localServerSocket);
}
public void commonFunctions(LocalServerSocket localServerSocket) throws IOException {
// create client socket
LocalSocket clientSocket = new LocalSocket();
// establish connection between client and server
clientSocket.connect(new LocalSocketAddress(LocalSocketTest.mSockAddr));
clientSocket.connect(new LocalSocketAddress(address));
LocalSocket serverSocket = localServerSocket.accept();
// send data from client to server

29
tests/cts/net/src/android/net/cts/LocalSocketTest.java
View File

@@ -16,11 +16,12 @@
package android.net.cts;
import junit.framework.TestCase;
import android.net.Credentials;
import android.net.LocalServerSocket;
import android.net.LocalSocket;
import android.net.LocalSocketAddress;
import android.test.AndroidTestCase;
import java.io.FileDescriptor;
import java.io.IOException;
@@ -29,16 +30,17 @@ import java.io.OutputStream;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
public class LocalSocketTest extends AndroidTestCase{
public final static String mSockAddr = "com.android.net.LocalSocketTest";
public class LocalSocketTest extends TestCase {
private final static String ADDRESS_PREFIX = "com.android.net.LocalSocketTest";
public void testLocalConnections() throws IOException{
public void testLocalConnections() throws IOException {
String address = ADDRESS_PREFIX + "_testLocalConnections";
// create client and server socket
LocalServerSocket localServerSocket = new LocalServerSocket(mSockAddr);
LocalServerSocket localServerSocket = new LocalServerSocket(address);
LocalSocket clientSocket = new LocalSocket();
// establish connection between client and server
LocalSocketAddress locSockAddr = new LocalSocketAddress(mSockAddr);
LocalSocketAddress locSockAddr = new LocalSocketAddress(address);
assertFalse(clientSocket.isConnected());
clientSocket.connect(locSockAddr);
assertTrue(clientSocket.isConnected());
@@ -114,9 +116,10 @@ public class LocalSocketTest extends AndroidTestCase{
}
}
public void testAccessors() throws IOException{
public void testAccessors() throws IOException {
String address = ADDRESS_PREFIX + "_testAccessors";
LocalSocket socket = new LocalSocket();
LocalSocketAddress addr = new LocalSocketAddress(mSockAddr);
LocalSocketAddress addr = new LocalSocketAddress(address);
assertFalse(socket.isBound());
socket.bind(addr);
@@ -175,11 +178,12 @@ public class LocalSocketTest extends AndroidTestCase{
}
public void testAvailable() throws Exception {
LocalServerSocket localServerSocket = new LocalServerSocket(mSockAddr);
String address = ADDRESS_PREFIX + "_testAvailable";
LocalServerSocket localServerSocket = new LocalServerSocket(address);
LocalSocket clientSocket = new LocalSocket();
// establish connection between client and server
LocalSocketAddress locSockAddr = new LocalSocketAddress(mSockAddr);
LocalSocketAddress locSockAddr = new LocalSocketAddress(address);
clientSocket.connect(locSockAddr);
assertTrue(clientSocket.isConnected());
LocalSocket serverSocket = localServerSocket.accept();
@@ -204,11 +208,12 @@ public class LocalSocketTest extends AndroidTestCase{
}
public void testFlush() throws Exception {
LocalServerSocket localServerSocket = new LocalServerSocket(mSockAddr);
String address = ADDRESS_PREFIX + "_testFlush";
LocalServerSocket localServerSocket = new LocalServerSocket(address);
LocalSocket clientSocket = new LocalSocket();
// establish connection between client and server
LocalSocketAddress locSockAddr = new LocalSocketAddress(mSockAddr);
LocalSocketAddress locSockAddr = new LocalSocketAddress(address);
clientSocket.connect(locSockAddr);
assertTrue(clientSocket.isConnected());
LocalSocket serverSocket = localServerSocket.accept();