--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/jdk/jshell/AnalyzeSnippetTest.java	Tue Sep 12 19:03:39 2017 +0200
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2017, 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 8182270
+ * @summary test non-eval Snippet analysis
+ * @build KullaTesting TestingInputStream
+ * @run testng AnalyzeSnippetTest
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.List;
+import jdk.jshell.Snippet;
+import jdk.jshell.DeclarationSnippet;
+import org.testng.annotations.Test;
+
+import jdk.jshell.JShell;
+import jdk.jshell.MethodSnippet;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.assertEquals;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import jdk.jshell.ErroneousSnippet;
+import jdk.jshell.ExpressionSnippet;
+import jdk.jshell.ImportSnippet;
+import jdk.jshell.Snippet.SubKind;
+import jdk.jshell.SourceCodeAnalysis;
+import jdk.jshell.StatementSnippet;
+import jdk.jshell.TypeDeclSnippet;
+import jdk.jshell.VarSnippet;
+import static jdk.jshell.Snippet.SubKind.*;
+
+@Test
+public class AnalyzeSnippetTest {
+
+    JShell state;
+    SourceCodeAnalysis sca;
+
+    @BeforeMethod
+    public void setUp() {
+        state = JShell.builder()
+                .out(new PrintStream(new ByteArrayOutputStream()))
+                .err(new PrintStream(new ByteArrayOutputStream()))
+                .build();
+        sca = state.sourceCodeAnalysis();
+    }
+
+    @AfterMethod
+    public void tearDown() {
+        if (state != null) {
+            state.close();
+        }
+        state = null;
+        sca = null;
+    }
+
+    public void testImport() {
+        ImportSnippet sn = (ImportSnippet) assertSnippet("import java.util.List;",
+                SubKind.SINGLE_TYPE_IMPORT_SUBKIND);
+        assertEquals(sn.name(), "List");
+        sn = (ImportSnippet) assertSnippet("import static java.nio.file.StandardOpenOption.CREATE;",
+                SubKind.SINGLE_STATIC_IMPORT_SUBKIND);
+        assertTrue(sn.isStatic());
+    }
+
+    public void testClass() {
+        TypeDeclSnippet sn = (TypeDeclSnippet) assertSnippet("class C {}",
+                SubKind.CLASS_SUBKIND);
+        assertEquals(sn.name(), "C");
+        sn = (TypeDeclSnippet) assertSnippet("enum EE {A, B , C}",
+                SubKind.ENUM_SUBKIND);
+    }
+
+    public void testMethod() {
+        MethodSnippet sn = (MethodSnippet) assertSnippet("int m(int x) { return x + x; }",
+                SubKind.METHOD_SUBKIND);
+        assertEquals(sn.name(), "m");
+        assertEquals(sn.signature(), "(int)int");
+    }
+
+    public void testVar() {
+        VarSnippet sn = (VarSnippet) assertSnippet("int i;",
+                SubKind.VAR_DECLARATION_SUBKIND);
+        assertEquals(sn.name(), "i");
+        assertEquals(sn.typeName(), "int");
+        sn = (VarSnippet) assertSnippet("int jj = 6;",
+                SubKind.VAR_DECLARATION_WITH_INITIALIZER_SUBKIND);
+        sn = (VarSnippet) assertSnippet("2 + 2",
+                SubKind.TEMP_VAR_EXPRESSION_SUBKIND);
+    }
+
+    public void testExpression() {
+        state.eval("int aa = 10;");
+        ExpressionSnippet sn = (ExpressionSnippet) assertSnippet("aa",
+                SubKind.VAR_VALUE_SUBKIND);
+        assertEquals(sn.name(), "aa");
+        assertEquals(sn.typeName(), "int");
+        sn = (ExpressionSnippet) assertSnippet("aa;",
+                SubKind.VAR_VALUE_SUBKIND);
+        assertEquals(sn.name(), "aa");
+        assertEquals(sn.typeName(), "int");
+        sn = (ExpressionSnippet) assertSnippet("aa = 99",
+                SubKind.ASSIGNMENT_SUBKIND);
+    }
+
+    public void testStatement() {
+        StatementSnippet sn = (StatementSnippet) assertSnippet("System.out.println(33)",
+                SubKind.STATEMENT_SUBKIND);
+        sn = (StatementSnippet) assertSnippet("if (true) System.out.println(33);",
+                SubKind.STATEMENT_SUBKIND);
+    }
+
+    public void testErroneous() {
+        ErroneousSnippet sn = (ErroneousSnippet) assertSnippet("+++",
+                SubKind.UNKNOWN_SUBKIND);
+        sn = (ErroneousSnippet) assertSnippet("abc",
+                SubKind.UNKNOWN_SUBKIND);
+    }
+
+    public void testNoStateChange() {
+        assertSnippet("int a = 5;", SubKind.VAR_DECLARATION_WITH_INITIALIZER_SUBKIND);
+        assertSnippet("a", SubKind.UNKNOWN_SUBKIND);
+        VarSnippet vsn = (VarSnippet) state.eval("int aa = 10;").get(0).snippet();
+        assertSnippet("++aa;", SubKind.TEMP_VAR_EXPRESSION_SUBKIND);
+        assertEquals(state.varValue(vsn), "10");
+        assertSnippet("class CC {}", SubKind.CLASS_SUBKIND);
+        assertSnippet("new CC();", SubKind.UNKNOWN_SUBKIND);
+    }
+
+    private Snippet assertSnippet(String input, SubKind sk) {
+        List<Snippet> sns = sca.sourceToSnippets(input);
+        assertEquals(sns.size(), 1, "snippet count");
+        Snippet sn = sns.get(0);
+        assertEquals(sn.id(), "*UNASSOCIATED*");
+        assertEquals(sn.subKind(), sk);
+        return sn;
+    }
+}