diff -r bdc3f1b79fb7 -r a00905527ec2 jdk/test/sanity/client/SwingSet/src/ComboBoxDemoTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sanity/client/SwingSet/src/ComboBoxDemoTest.java	Wed Mar 30 19:05:58 2016 -0700
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2010, 2016, 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.
+ */
+
+import com.sun.swingset3.demos.combobox.ComboBoxDemo;
+import static org.testng.AssertJUnit.*;
+import org.testng.annotations.Test;
+import org.netbeans.jemmy.ClassReference;
+import org.netbeans.jemmy.operators.JComboBoxOperator;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import static com.sun.swingset3.demos.combobox.ComboBoxDemo.*;
+import static org.jemmy2ext.JemmyExt.captureDebugInfoOnFail;
+
+/*
+ * @test
+ * @key headful
+ * @summary Verifies ComboBoxes on SwingSet2 ComboBoxDemo page by selecting
+ *          each value of each ComboBox.
+ *
+ * @library /sanity/client/lib/jemmy/src
+ * @library /sanity/client/lib/Jemmy2Ext/src
+ * @library /sanity/client/lib/SwingSet3/src
+ * @build org.jemmy2ext.JemmyExt
+ * @build com.sun.swingset3.demos.combobox.ComboBoxDemo
+ * @run testng ComboBoxDemoTest
+ */
+public class ComboBoxDemoTest {
+
+    private static enum ComboBoxInfo {
+        PRESETS("Presets:"),
+        HAIR("Hair:"),
+        EYES_N_NOSE("Eyes & Nose:"),
+        MOUTH("Mouth:");
+
+        private final String comboBoxName;
+
+        private ComboBoxInfo(String comboBoxName) {
+            this.comboBoxName = comboBoxName;
+        }
+
+    }
+
+    @Test
+    public void test() throws Exception {
+        captureDebugInfoOnFail(() -> {
+            new ClassReference(ComboBoxDemo.class.getCanonicalName()).startApplication();
+
+            JFrameOperator frame = new JFrameOperator(DEMO_TITLE);
+            for (ComboBoxInfo comboBoxInfo : ComboBoxInfo.values()) {
+                comboBoxChecker(frame, comboBoxInfo);
+            }
+        });
+    }
+
+    private void comboBoxChecker(JFrameOperator jfo, ComboBoxInfo comboBoxInfo) {
+        JComboBoxOperator jcbo = new JComboBoxOperator(jfo, comboBoxInfo.ordinal());
+        for (int i = 0; i < jcbo.getItemCount(); i++) {
+            jcbo.selectItem(i);
+            assertEquals(comboBoxInfo.comboBoxName + " ComboBox SelectedIndex is correct", i, jcbo.getSelectedIndex());
+        }
+    }
+
+}