--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/jshell/ModifiersTest.java	Mon Oct 19 19:15:16 2015 +0200
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2015, 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
+ * @summary Tests for modifiers
+ * @build KullaTesting TestingInputStream ExpectedDiagnostic
+ * @run testng ModifiersTest
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.tools.Diagnostic;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+@Test
+public class ModifiersTest extends KullaTesting {
+
+    @DataProvider(name = "ignoredModifiers")
+    public Object[][] getTestCases() {
+        List<Object[]> testCases = new ArrayList<>();
+        String[] ignoredModifiers = new String[] {
+            "public", "protected", "private", "static", "final"
+        };
+        for (String ignoredModifier : ignoredModifiers) {
+            for (ClassType classType : ClassType.values()) {
+                testCases.add(new Object[] { ignoredModifier, classType });
+            }
+        }
+        return testCases.toArray(new Object[testCases.size()][]);
+    }
+
+    @Test(dataProvider = "ignoredModifiers")
+    public void ignoredModifiers(String modifier, ClassType classType) {
+        assertDeclareWarn1(
+                String.format("%s %s A {}", modifier, classType), "jdk.eval.warn.illegal.modifiers");
+        assertNumberOfActiveClasses(1);
+        assertClasses(clazz(classType, "A"));
+        assertActiveKeys();
+    }
+
+    public void accessToStaticFieldsOfClass() {
+        assertEval("class A {" +
+                "int x = 14;" +
+                "static int y = 18;" +
+                " }");
+        assertDeclareFail("A.x;",
+                new ExpectedDiagnostic("compiler.err.non-static.cant.be.ref", 0, 3, 1, -1, -1, Diagnostic.Kind.ERROR));
+        assertEval("A.y;", "18");
+        assertEval("new A().x;", "14");
+        assertEval("A.y = 88;", "88");
+        assertActiveKeys();
+    }
+
+    public void accessToStaticMethodsOfClass() {
+        assertEval("class A {" +
+                "void x() {}" +
+                "static void y() {}" +
+                " }");
+        assertDeclareFail("A.x();",
+                new ExpectedDiagnostic("compiler.err.non-static.cant.be.ref", 0, 3, 1, -1, -1, Diagnostic.Kind.ERROR));
+        assertEval("A.y();");
+        assertActiveKeys();
+    }
+
+    public void accessToStaticFieldsOfInterface() {
+        assertEval("interface A {" +
+                "int x = 14;" +
+                "static int y = 18;" +
+                " }");
+        assertEval("A.x;", "14");
+        assertEval("A.y;", "18");
+
+        assertDeclareFail("A.x = 18;",
+                new ExpectedDiagnostic("compiler.err.cant.assign.val.to.final.var", 0, 3, 1, -1, -1, Diagnostic.Kind.ERROR));
+        assertDeclareFail("A.y = 88;",
+                new ExpectedDiagnostic("compiler.err.cant.assign.val.to.final.var", 0, 3, 1, -1, -1, Diagnostic.Kind.ERROR));
+        assertActiveKeys();
+    }
+
+    public void accessToStaticMethodsOfInterface() {
+        assertEval("interface A { static void x() {} }");
+        assertEval("A.x();");
+        assertActiveKeys();
+    }
+
+    public void finalMethod() {
+        assertEval("class A { final void f() {} }");
+        assertDeclareFail("class B extends A { void f() {} }",
+                new ExpectedDiagnostic("compiler.err.override.meth", 20, 31, 25, -1, -1, Diagnostic.Kind.ERROR));
+        assertActiveKeys();
+    }
+
+    //TODO: is this the right semantics?
+    public void finalConstructor() {
+        assertDeclareFail("class A { final A() {} }",
+                new ExpectedDiagnostic("compiler.err.mod.not.allowed.here", 10, 22, 16, -1, -1, Diagnostic.Kind.ERROR));
+        assertActiveKeys();
+    }
+
+    //TODO: is this the right semantics?
+    public void finalDefaultMethod() {
+        assertDeclareFail("interface A { final default void a() {} }",
+                new ExpectedDiagnostic("compiler.err.mod.not.allowed.here", 14, 39, 33, -1, -1, Diagnostic.Kind.ERROR));
+        assertActiveKeys();
+    }
+}