--- /dev/null	2019-07-24 16:12:24.284000000 -0700
+++ new/test/langtools/tools/javac/processing/model/util/elements/TestGetModuleOf.java	2019-08-30 10:54:45.416057070 -0700
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2006, 2019, 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 8230337
+ * @summary Test Elements.getModuleOf
+ * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
+ * @build   JavacTestingAbstractProcessor TestGetModuleOf
+ * @compile -processor TestGetModuleOf -proc:only TestGetModuleOf.java
+ * @compile -processor TestGetModuleOf -proc:only -source 8 TestGetModuleOf.java
+ */
+
+// Also run test under -source 8 to test old behavior pre-modules.
+
+import java.util.*;
+import javax.annotation.processing.*;
+import javax.lang.model.SourceVersion;
+import static javax.lang.model.SourceVersion.*;
+import javax.lang.model.element.*;
+import javax.lang.model.util.*;
+import static javax.lang.model.util.ElementFilter.*;
+import static javax.tools.Diagnostic.Kind.*;
+import static javax.tools.StandardLocation.*;
+
+/**
+ * Test basic workings of Elements.getModuleOf
+ */
+public class TestGetModuleOf extends JavacTestingAbstractProcessor {
+    /**
+     * Check expected behavior on classes and packages and other elements.
+     */
+    public boolean process(Set<? extends TypeElement> annotations,
+                           RoundEnvironment roundEnv) {
+        if (!roundEnv.processingOver()) {
+            TypeElement    charElt     = eltUtils.getTypeElement("java.lang.Character");
+            PackageElement javaLangPkg = eltUtils.getPackageElement("java.lang");
+            ModuleElement  expectedMod = enclosingToModule(javaLangPkg);
+
+            checkMod(charElt, expectedMod);
+            checkMod(javaLangPkg, expectedMod);
+
+            // The module of fields and methods and nested types of
+            // java.lang.Character should match the module of
+            // java.lang.
+            for (Element e : charElt.getEnclosedElements()) {
+                checkMod(e, expectedMod);
+            }
+
+            // A module of a module is itself
+            if (expectedMod != null)
+                checkMod(expectedMod, expectedMod);
+        }
+        return true;
+    }
+
+    private ModuleElement enclosingToModule(Element e) {
+        Element enclosing = e.getEnclosingElement();
+        if (enclosing == null)
+            return null;
+        else
+            return ElementFilter.modulesIn(List.of(enclosing)).get(0);
+    }
+
+    private void checkMod(Element e, ModuleElement expectedMod) {
+        ModuleElement actualMod = eltUtils.getModuleOf(e);
+        if (!Objects.equals(actualMod, expectedMod)) {
+            throw new RuntimeException(String.format("Unexpected module ``%s''' for %s %s, expected ``%s''%n",
+                                                     actualMod, e.getKind(), e.toString(), expectedMod));
+        }
+    }
+}