--- /dev/null	Tue Apr  8 17:15:23 2014
+++ new/test/java/net/SocketOption/OptionsTest.java	Tue Apr  8 17:15:22 2014
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8036979
+ * @run main/othervm -Xcheck:jni OptionsTest
+ */
+
+import java.net.*;
+import java.util.*;
+
+public class OptionsTest {
+
+    static class Test {
+	Test(SocketOption<?> option, Object testValue) {
+	    this.option = option;
+	    this.testValue = testValue;
+	}
+	static Test create (SocketOption<?> option, Object testValue) {
+	    return new Test(option, testValue);
+	}
+	Object option;
+	Object testValue;
+    };
+	
+    // The tests set the option using the new API, read back the set value
+    // which could be diferent, and then use the legacy get API to check
+    // these values are the same 
+
+    static Test[] socketTests = new Test[] {
+	Test.create(StandardSocketOptions.SO_KEEPALIVE, Boolean.TRUE),
+	Test.create(StandardSocketOptions.SO_SNDBUF, Integer.valueOf(10 * 100)),
+	Test.create(StandardSocketOptions.SO_RCVBUF, Integer.valueOf(8 * 100)),
+	Test.create(StandardSocketOptions.SO_REUSEADDR, Boolean.FALSE),
+	Test.create(StandardSocketOptions.SO_LINGER, Integer.valueOf(80)),
+	Test.create(StandardSocketOptions.IP_TOS, Integer.valueOf(100))
+    };
+
+    static Test[] serverSocketTests = new Test[] {
+	Test.create(StandardSocketOptions.SO_RCVBUF, Integer.valueOf(8 * 100)),
+	Test.create(StandardSocketOptions.SO_REUSEADDR, Boolean.FALSE)
+    };
+
+    static Test[] dgSocketTests = new Test[] {
+	Test.create(StandardSocketOptions.SO_SNDBUF, Integer.valueOf(10 * 100)),
+	Test.create(StandardSocketOptions.SO_RCVBUF, Integer.valueOf(8 * 100)),
+	Test.create(StandardSocketOptions.SO_REUSEADDR, Boolean.FALSE),
+	Test.create(StandardSocketOptions.IP_TOS, Integer.valueOf(100))
+    };
+
+    static Test[] mcSocketTests = new Test[] {
+	Test.create(StandardSocketOptions.IP_MULTICAST_IF, getNetworkInterface()),
+	Test.create(StandardSocketOptions.IP_MULTICAST_TTL, Integer.valueOf(10)),
+	Test.create(StandardSocketOptions.IP_MULTICAST_LOOP, Boolean.TRUE)
+    };
+
+    static NetworkInterface getNetworkInterface() {
+	try {
+	    Enumeration<NetworkInterface> nifs = NetworkInterface.getNetworkInterfaces();
+	    if (nifs.hasMoreElements()) {
+	        return (NetworkInterface)nifs.nextElement();
+	    } 
+	} catch (Exception e) {
+    	}
+	return null;
+    }
+
+    static void doSocketTests() throws Exception {
+	try (
+	    ServerSocket srv = new ServerSocket(0);
+	    Socket c = new Socket("127.0.0.1", srv.getLocalPort());
+	    Socket s = srv.accept();
+   	) 
+	{
+	    for (int i=0; i<socketTests.length; i++) {
+		Test test = socketTests[i];
+	        c.setOption((SocketOption)test.option, test.testValue);
+		Object getval = c.getOption((SocketOption)test.option);
+		Object legacyget = legacyGetOption(Socket.class, c,test.option);
+	        if (!getval.equals(legacyget)) {
+		    Formatter f = new Formatter();
+		    f.format("S Err %d: %s/%s", i, getval, legacyget);
+		    throw new RuntimeException(f.toString());
+	        }
+	    }
+	}
+    }
+	    
+    static void doDgSocketTests() throws Exception {
+        try (
+            DatagramSocket c = new DatagramSocket(0);
+        )
+        {
+            for (int i=0; i<dgSocketTests.length; i++) {
+                Test test = dgSocketTests[i];
+                c.setOption((SocketOption)test.option, test.testValue);
+                Object getval = c.getOption((SocketOption)test.option);
+                Object legacyget = legacyGetOption(DatagramSocket.class, c,test.option);
+                if (!getval.equals(legacyget)) {
+                    Formatter f = new Formatter();
+                    f.format("DG Err %d: %s/%s", i, getval, legacyget);
+                    throw new RuntimeException(f.toString());
+                }
+            }
+        }
+    }
+
+    static void doMcSocketTests() throws Exception {
+        try (
+            MulticastSocket c = new MulticastSocket(0);
+        )
+        {
+            for (int i=0; i<mcSocketTests.length; i++) {
+                Test test = mcSocketTests[i];
+                c.setOption((SocketOption)test.option, test.testValue);
+                Object getval = c.getOption((SocketOption)test.option);
+                Object legacyget = legacyGetOption(MulticastSocket.class, c,test.option);
+                if (!getval.equals(legacyget)) {
+                    Formatter f = new Formatter();
+                    f.format("MC Err %d: %s/%s", i, getval, legacyget);
+                    throw new RuntimeException(f.toString());
+                }
+            }
+        }
+    }
+
+    static void doServerSocketTests() throws Exception {
+	try (
+	    ServerSocket c = new ServerSocket(0);
+   	) 
+	{
+	    for (int i=0; i<serverSocketTests.length; i++) {
+		Test test = serverSocketTests[i];
+	        c.setOption((SocketOption)test.option, test.testValue);
+		Object getval = c.getOption((SocketOption)test.option);
+		Object legacyget = legacyGetOption(
+		    ServerSocket.class, c, test.option
+		);
+	        if (!getval.equals(legacyget)) {
+		    Formatter f = new Formatter();
+		    f.format("SS Err %d: %s/%s", i, getval, legacyget);
+		    throw new RuntimeException(f.toString());
+	        }
+	    }
+	}
+    }
+
+    static Object legacyGetOption(
+	Class<?> type, Object s, Object option) 
+
+	throws Exception
+    {
+	if (type.equals(Socket.class)) {
+	    Socket socket = (Socket)s;
+
+	    if (option.equals(StandardSocketOptions.SO_KEEPALIVE)) {
+		return Boolean.valueOf(socket.getKeepAlive());
+	    } else if (option.equals(StandardSocketOptions.SO_SNDBUF)) {
+		return Integer.valueOf(socket.getSendBufferSize());
+	    } else if (option.equals(StandardSocketOptions.SO_RCVBUF)) {
+		return Integer.valueOf(socket.getReceiveBufferSize());
+	    } else if (option.equals(StandardSocketOptions.SO_REUSEADDR)) {
+		return Boolean.valueOf(socket.getReuseAddress());
+	    } else if (option.equals(StandardSocketOptions.SO_LINGER)) {
+		return Integer.valueOf(socket.getSoLinger());
+	    } else if (option.equals(StandardSocketOptions.IP_TOS)) {
+		return Integer.valueOf(socket.getTrafficClass());
+	    } else if (option.equals(StandardSocketOptions.TCP_NODELAY)) {
+		return Boolean.valueOf(socket.getTcpNoDelay());
+	    } else {
+	    	throw new RuntimeException("unexecpted socket option");
+	    }
+	} else if  (type.equals(ServerSocket.class)) {
+	    ServerSocket socket = (ServerSocket)s;
+	    if (option.equals(StandardSocketOptions.SO_RCVBUF)) {
+		return Integer.valueOf(socket.getReceiveBufferSize());
+	    } else if (option.equals(StandardSocketOptions.SO_REUSEADDR)) {
+		return Boolean.valueOf(socket.getReuseAddress());
+            } else {
+                throw new RuntimeException("unexecpted socket option");
+            }
+	} else if  (type.equals(DatagramSocket.class)) {
+            DatagramSocket socket = (DatagramSocket)s;
+
+	    if (option.equals(StandardSocketOptions.SO_SNDBUF)) {
+		return Integer.valueOf(socket.getSendBufferSize());
+	    } else if (option.equals(StandardSocketOptions.SO_RCVBUF)) {
+		return Integer.valueOf(socket.getReceiveBufferSize());
+	    } else if (option.equals(StandardSocketOptions.SO_REUSEADDR)) {
+		return Boolean.valueOf(socket.getReuseAddress());
+	    } else if (option.equals(StandardSocketOptions.IP_TOS)) {
+		return Integer.valueOf(socket.getTrafficClass());
+            } else {
+                throw new RuntimeException("unexecpted socket option");
+            }
+
+	} else if  (type.equals(MulticastSocket.class)) {
+            MulticastSocket socket = (MulticastSocket)s;
+
+	    if (option.equals(StandardSocketOptions.SO_SNDBUF)) {
+		return Integer.valueOf(socket.getSendBufferSize());
+	    } else if (option.equals(StandardSocketOptions.SO_RCVBUF)) {
+		return Integer.valueOf(socket.getReceiveBufferSize());
+	    } else if (option.equals(StandardSocketOptions.SO_REUSEADDR)) {
+		return Boolean.valueOf(socket.getReuseAddress());
+	    } else if (option.equals(StandardSocketOptions.IP_TOS)) {
+		return Integer.valueOf(socket.getTrafficClass());
+            } else if (option.equals(StandardSocketOptions.IP_MULTICAST_IF)) {
+                return socket.getNetworkInterface();
+	    } else if (option.equals(StandardSocketOptions.IP_MULTICAST_TTL)) {
+		return Integer.valueOf(socket.getTimeToLive());
+            } else if (option.equals(StandardSocketOptions.IP_MULTICAST_LOOP)) {
+                return Boolean.valueOf(socket.getLoopbackMode());
+            } else {
+                throw new RuntimeException("unexecpted socket option");
+            }
+	}
+	throw new RuntimeException("unexecpted socket type");
+    }
+	
+    public static void main(String args[]) throws Exception {
+	doSocketTests();
+	doServerSocketTests();
+	doDgSocketTests();
+	doMcSocketTests();
+    }
+}